gitdocs 0.1.3 → 0.1.4

data/lib/gitdocs/runner.rb

@@ -12,13 +12,15 @@ module Gitdocs
 
     def run
       info("Running gitdocs!", "Running gitdocs in `#{@root}'")
+      @current_remote   = sh_string("git config branch.`git branch | grep '^\*' | sed -e 's/\* //'`.remote", "origin")
+      @current_branch   = sh_string("git branch | grep '^\*' | sed -e 's/\* //'", "master")
       @current_revision = sh("git rev-parse HEAD").strip rescue nil
       mutex = Mutex.new
       Thread.new do
         loop do
           mutex.synchronize do
             begin
-              out, status = sh_with_code("git fetch --all && git merge origin/master")
+              out, status = sh_with_code("git fetch --all && git merge #{@current_remote}/#{@current_branch}")
               if status.success?
                 changes = get_latest_changes
                 unless changes.empty?
@@ -55,7 +57,7 @@ module Gitdocs
       # TODO make this message nicer
       sh "git commit -a -m'Auto-commit from gitdocs'" unless sh("git status -s").strip.empty?
       if @current_revision.nil?
-        out, code = sh_with_code("git push origin master")
+        out, code = sh_with_code("git push #{@current_remote} #{@current_branch}")
         if code.success?
           changes = get_latest_changes
           info("Pushed #{changes.size} change#{changes.size == 1 ? '' : 's'}", "`#{@root}' has been pushed")
@@ -116,6 +118,12 @@ module Gitdocs
       raise
     end
 
+    # sh_string("git config branch.`git branch | grep '^\*' | sed -e 's/\* //'`.remote", "origin")
+    def sh_string(cmd, default)
+      val = sh(cmd).strip rescue nil
+      (val.nil? || val.empty?) ? default : val
+    end
+
     def sh(cmd)
       out, code = sh_with_code(cmd)
       code == 0 ? out : raise(out.empty? ? "Running `#{cmd}' failed. Run this command directly for more detailed output." : out)

data/lib/gitdocs/version.rb

@@ -1,3 +1,3 @@
 module Gitdocs
-  VERSION = "0.1.3"
+  VERSION = "0.1.4"
 end

metadata

@@ -2,7 +2,7 @@
 name: gitdocs
 version: !ruby/object:Gem::Version 
   prerelease: 
-  version: 0.1.3
+  version: 0.1.4
 platform: ruby
 authors: 
 - Josh Hull