gitdocs 0.0.1 → 0.0.2

data/bin/gitdocs

@@ -2,4 +2,23 @@
 
 require 'gitdocs'
 
-Gitdocs.new(File.expand_path(Dir.pwd, File.dirname(__FILE__))).run
+dirs = ARGV
+dirs << File.expand_path(Dir.pwd, File.dirname(__FILE__)) if dirs.empty?
+
+pids = dirs.map do |dir|
+  fork do
+    Dir.chdir(dir) do
+      Gitdocs.new(Dir.pwd).run
+    end
+  end
+end
+
+pids.each do |pid|
+  Process.waitpid(pid)
+end
+
+at_exit do
+  pids.each do |pid|
+    Process.kill("INT", pid) rescue nil
+  end
+end

data/lib/gitdocs.rb

@@ -19,7 +19,7 @@ class Gitdocs
     Thread.new do
       loop do
         mutex.synchronize do
-          out, status = sh_with_code("git pull")
+          out, status = sh_with_code("git fetch --all && git merge origin/master")
           if status.success?
             changes = get_latest_changes
             unless changes.empty?
@@ -47,8 +47,9 @@ class Gitdocs
   end
 
   def push_changes
-    out, code = sh_with_code("git ls-files -o --exclude-per-directory=.gitignore | git update-index --add --stdin")
-    if system("git commit -a -m'Auto-commit from gitdocs'")
+    out, status = sh_with_code("git ls-files -o --exclude-per-directory=.gitignore | git update-index --add --stdin")
+    unless sh("git status -s").strip.empty?
+      sh "git commit -a -m'Auto-commit from gitdocs'" # TODO make this message nicer
       out, code = sh_with_code("git push")
       changes = get_latest_changes
       info("Pushed #{changes.size} change#{changes.size == 1 ? '' : 's'}", "`#{@root}' has been pushed")

data/lib/gitdocs/version.rb

@@ -1,3 +1,3 @@
 class Gitdocs
-  VERSION = "0.0.1"
+  VERSION = "0.0.2"
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: gitdocs
 version: !ruby/object:Gem::Version
-  version: 0.0.1
+  version: 0.0.2
   prerelease: 
 platform: ruby
 authors:
@@ -13,7 +13,7 @@ date: 2011-11-29 00:00:00.000000000Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rb-fsevent
-  requirement: &70241725236540 !ruby/object:Gem::Requirement
+  requirement: &70199644891480 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -21,10 +21,10 @@ dependencies:
         version: 0.4.3.1
   type: :runtime
   prerelease: false
-  version_requirements: *70241725236540
+  version_requirements: *70199644891480
 - !ruby/object:Gem::Dependency
   name: growl
-  requirement: &70241725235860 !ruby/object:Gem::Requirement
+  requirement: &70199644890720 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -32,10 +32,10 @@ dependencies:
         version: 1.0.3
   type: :runtime
   prerelease: false
-  version_requirements: *70241725235860
+  version_requirements: *70199644890720
 - !ruby/object:Gem::Dependency
   name: yajl-ruby
-  requirement: &70241725235280 !ruby/object:Gem::Requirement
+  requirement: &70199644890140 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -43,7 +43,7 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *70241725235280
+  version_requirements: *70199644890140
 description: Docs + git = gitdocs.
 email:
 - joshbuddy@gmail.com