refactor: use PHP git library https://github.com/kbjr/Git.php

Author: pascalmh

.gitmodules

@@ -0,0 +1,3 @@
+[submodule "Git.php"]
+	path = Git.php
+	url = https://github.com/kbjr/Git.php.git

Git.php

@@ -1,25 +1,53 @@
 <?php
+
+require_once('Git.php/Git.php');
+
 /**
-* Compose Commit message, appends " by Username"
-*
-* @param string $commitMessage
-* @return false
-*/
+ * Compose Commit message, appends " by Username"
+ *
+ * @param string $commitMessage
+ * @return false
+ */
 function gitCommit($commitMessage) {
-    $branch = c::get('gcapc-branch') || 'master';
-    $pull = c::get('gcapc-pull') || true;
-    $push = c::get('gcapc-push') || true;
-    $commit = c::get('gcapc-commit') || true;
-    $pushCommand = c::get('gcapc-pushCommand') || 'git push';
-
-    exec(
-        'cd ../content/' .
-        ' && git checkout -b ' . $branch . '' .
-        $pull ? ' && git pull' : '' .
-        $commit ? ' && git add -A' : '' .
-        $commit ? ' && git commit -m "' . $commitMessage . ' by ' . site()->user() . '"' : '' .
-        $push ? ' && ' . $pushCommand : ''
-    );
+    $branch = c::get('gcapc-branch', 'master');
+    $pull = c::get('gcapc-pull', true);
+    $push = c::get('gcapc-push', true);
+    $commit = c::get('gcapc-commit', true);
+    $gitBin = c::get('gcapc-gitBin', '');
+    $windowsMode = c::get('gcapc-windowsMode', false);
+
+    /*
+     * Setup git environment
+     */
+    if($windowsMode) {
+        Git::windows_mode();
+    }
+    if ($gitBin) {
+        Git::set_bin('/usr/local/bin/git');
+    }
+
+    $repo = Git::open('../content');
+
+    // We are in the panel-Folder - go into content-Folder
+    chdir('../content');
+
+    /*
+     * Git Pull, Commit and Push
+     */
+    if ($pull) {
+        $repo->checkout($branch);
+        $repo->pull('origin', $branch);
+    }
+    if ($commit) {
+        $repo->add('.');
+        $repo->commit($commitMessage . ' by ' . site()->user());
+    }
+    if ($push) {
+        $repo->push('origin', $branch);
+    }
+
+    // Go back into panel-Folder
+    chdir('../panel');
 
     return false;
 }

helpers.php

@@ -34,7 +34,10 @@ git push origin master
 
 ### Download and configure the Plugin
 
-Go into your `site/plugins/` folder and  `git clone https://github.com/Pascalmh/kirby-git-commit-and-push-content git-commit-and-push-content`.
+Go into your `site/plugins/` folder and  
+```
+git submodule add --name git-commit-and-push-content https://github.com/Pascalmh/kirby-git-commit-and-push-content.git site/plugins/git-commit-and-push-content
+```
 
 Or: Put all the files into your `site/plugins/git-commit-and-push-content/` folder. If the `git-commit-and-push-content/` plugin folder doesn't exist then create it.
 
@@ -44,7 +47,7 @@ You can use the following [Options](http://getkirby.com/docs/advanced/options) -
 
 #### gcapc-branch
 Type: `String`
-Default value: `master`
+Default value: `'master'`
 
 branch name to be checked out
 
@@ -66,11 +69,20 @@ Default value: `true`
 
 Push your changes to remote?
 
-#### gcapc-pushCommand
+#### gcapc-gitBin
 Type: `String`
-Default value: `git push`
+Default value: `''`
+
+Sets the location where git can be found 
+
+[See Git.php](http://kbjr.github.io/Git.php/) `void Git::set_bin ( string $path )`
+
+
+#### gcapc-windowsMode
+Type: `Boolean`
+Default value: `false`
 
-[git push](http://git-scm.com/docs/git-push)
+[See Git.php](http://kbjr.github.io/Git.php/) `void Git::windows_mode ( void )`
 
 ## Author