45 |
46 |
47 |
48 |
49 |
50 |
51 |
--------------------------------------------------------------------------------
/README.md:
--------------------------------------------------------------------------------
1 | 
2 |
3 | ## #EasyGitDeploy
4 |
5 | Tired of complex shell scripts for managing GIT on your web server?
6 | This tool has exactly one button for each direction. That's all!
7 |
8 | EasyGitDeploy targets the following setup: Your are developing with git and remote repository (e.g. GitHub or BitBucket). To handle deployments for smaller projects (e.g. Static websites, **Angular apps, Wordpress**, etc.) you would like to deploy a branch directly to the webserver (by default 'master' is used). As soon as everything works as expected, you just have to use the _PULL_ button to either create a new git-driven directory on the webserver or to update the existing directory. This works as long as no file-changes were made on the webserver (e.g. automatic wordpress updates or uploaded user-content).
9 |
10 | If there are any conflicting changes, the _PUSH_ button is here to rescue. It creates a new branch and pushes the changes to the remote repository. Now it’s up to you to merge the new branch back to master. As soon as this was made, _PULL_ will work again and brings the project on the webserver back to the latest version.
11 |
12 |
13 | ## Requirements on the web server
14 | * Linux / Unix (or [Cygwin](http://www.cygwin.com/) on Windows)
15 | * PHP 5.4
16 | * git command line tool
17 |
18 | ## Expected Conflict resolvements
19 |
20 | | Dev | Live | Push Button | Pull Button | What to do? |
21 | |:--------------- |:--------------|:-----------------------|:-------------------------------------------------------------------------------------------------------------------|:-------------------------------------------------------------------------------------------|
22 | | Unchanged | Unchanged | New Branch (unchanged) | No changes | |
23 | | Unchanged | **Changes** | New Branch | If on other Branch with open changes, cannot checkout master, nothing happens. | Nothing to do, but if you are not sure if dev is unchanged do 1st push and 2nd pull again. |
24 | | **New Commits** | Unchanged | New Branch (unchanged) | Live receives latest version of master branch. | |
25 | | **New Commits** | **Changes** | New Branch | 1. On master: updates or conflicts. 2. On other Branch with open changes, cannot checkout master, nothing happens. | On any problems, push first, maybe resolve conflicts on dev and pull again. |
26 |
27 | ## Licence
28 |
29 | The MIT License (MIT), Copyright (c) 2017 Johannes Hoppe
30 | see [License text](LICENSE)
31 |
32 | Many thanks to Brandon Summers for the [initial code](http://brandonsummers.name/blog/2012/02/10/using-bitbucket-for-automated-deployments/).
33 | Thanks to [Pascal Dittrich](http://www.pad-soft.de/) for feedback and code attributions.
34 |
--------------------------------------------------------------------------------
/easy-git-deploy/inc/VcsAbstract.php:
--------------------------------------------------------------------------------
1 | $value) {
63 | if (in_array($option, $available_options)) {
64 | $this->{'_' . $option} = $value;
65 | }
66 | }
67 | }
68 |
69 | /**
70 | * Writes a message to the log file.
71 | *
72 | * @param array|string $message The message(s) to write
73 | * @param string $type The type of log message (e.g. INFO, DEBUG, ERROR, etc.)
74 | */
75 | public function log($message, $type = 'INFO') {
76 | if ($this->_log) {
77 | // Set the name of the log file
78 | $filename = $this->_log;
79 |
80 | if (!file_exists($filename)) {
81 | // Create the log file
82 | file_put_contents($filename, '');
83 |
84 | // Allow anyone to write to log files
85 | chmod($filename, 0666);
86 | }
87 |
88 | if (is_array($message)) {
89 | $message = implode("\n\t", $message);
90 | }
91 |
92 | $formatted = date($this->_date_format) . ' --- ' . $type . ': ' . $message . "\n";
93 | file_put_contents($filename, $formatted, FILE_APPEND);
94 |
95 | $this->_log_messages .= $formatted;
96 | $this->_log_messages .= "-------------------------------------------------------------------------------\n";
97 | }
98 | }
99 |
100 | /**
101 | * Calls exec and logs its input and output
102 | * @param string $description The description of the command
103 | * @param string $command The command to execute
104 | */
105 | public function exec_and_log($description, $command) {
106 | $output = array();
107 | exec($command . ' 2>&1', $output);
108 |
109 | $messages = array_merge(array($description, $command), $output);
110 | $this->log($messages);
111 | }
112 |
113 | /**
114 | * @return bool
115 | */
116 | protected function has_base_directory() {
117 | return file_exists($this->_directory);
118 | }
119 |
120 | protected function is_sha1($str) {
121 | return (bool) preg_match('/^[0-9a-f]{40}$/i', $str);
122 | }
123 | }
--------------------------------------------------------------------------------