gitdocs 0.5.0.pre5 → 0.5.0.pre6

checksums.yaml

@@ -1,15 +1,15 @@
 ---
 !binary "U0hBMQ==":
   metadata.gz: !binary |-
-    YzYxMWM5MTg3ZWYzMzllZDNhY2NiNDdlNTA2NmNmMWEyNTVjMzFkNQ==
+    ZGUwYWI0Y2RjMTNjZGU4YzMzMzkxMTcxOTQ3OGQ2YWY0ZGNmZjg3MA==
   data.tar.gz: !binary |-
-    Njc0MTAxYjFlODI1ZjE5NjdmZGE0YmNmODc2MmJkMDc4NWQ5MzY5Ng==
+    MjZhNjUxNGM4Yjc2Nzk1NWRkYjJiNjNlNzYyNTA3NGEzNjFkMTcyNw==
 !binary "U0hBNTEy":
   metadata.gz: !binary |-
-    NDFkODRiMDJjMGU3MWNkZGY4NjdhZWQ4OTM3N2EyNjRiNjM5MjAwYmQ5NWQ1
-    MTBlZTA5NGFkNWU1ODM2MWJhYmY1NWI0NDg3ZmVhMGI1YTBjODY0MTE1YjQ4
-    Njc1YjIyN2ZjMjAyN2M3YjZiNWM1OGE2ZDViMmZjOTgxZjkwMTY=
+    NWY0NTMyOTQ1NGJhMTg5OTY3OWNhMGE4MzFhYjJjNzA1N2Y4YTgzMWIwMTE4
+    NDZkMWIzMzFlYzNhYzc5MjAyMmQ3NGJiMzY3ZDliMzhkMTE5ZWQxNjE3MTk3
+    Y2E4YTIzZTU2ODg3N2Y5YjRmNDFiNzM1MzZhMzczN2E4Yzk0ODI=
   data.tar.gz: !binary |-
-    NzRjMzZmZDRhZjUzZDAyODNhMzRjNjFmNGRjZmViZmM5OTk1MzkzMWZmYzA2
-    ODMxMmNiY2U0NTVkOGEwODIyM2UxZTJkMTZiN2I2MWE0YzZkMjNjOTM4Mjkx
-    YjUzMzNjMTIzZmUzMzIzZGQ1ZDRkYjQ5OTQxODNiNzE0NTgyNzQ=
+    ODFiYjQ4ZmI3NWVlNzU5ZWY5NDQ3Mzk4OGRhMGNmMWQ5ZDBjNGNmYjcyYzM2
+    N2RhMzZlZDExYzYyOTMyZWE4OWVkYTA1N2Y1NDRiMmFjYTM4YmM3N2QzZWUw
+    OTRlZWZkOGJlMDg1MGQ4NGY4OThjOGRhN2Q1MjI5NzAyODcyZjA=

data/CHANGELOG

@@ -1,3 +1,9 @@
+0.5.0.pre6 (May 24th 2014)
+
+ * Remove the load_browser_on_startup config option (@acant)
+ * Stop the addition of extra conflict markers (@acant)
+ * Separate the commit and push methods in repository (@acant)
+
 0.5.0.pre5 (May 14th 2014)
 
  * Cleanup behavior on empty commits

data/README.md

@@ -197,7 +197,7 @@ but provide the features that makes Dropbox great. If you are interested in othe
 * [git-sync](http://tychoish.com/essay/git-sync/) manual git syncing tool,
   which also use XMPP notifications
 * [git-annex-assistant](http://git-annex.branchable.com/design/assistant/)
-  directory sync tool based on [git-annex](http://git-annex.branchable.com/). (written in Haskel)
+  directory sync tool based on [git-annex](http://git-annex.branchable.com/). (written in Haskell)
 * [BitTorrent Sync](http://www.bittorrent.com/sync) BitTorrent based syncing
   tool, not open source or publicly defined protocol
 * [StrongSync](https://secure.expandrive.com/strongsync) Dropbox clone utility,

data/lib/gitdocs/configuration.rb

@@ -21,7 +21,7 @@ module Gitdocs
     end
 
     class Config < ActiveRecord::Base
-      attr_accessible :load_browser_on_startup, :start_web_frontend, :web_frontend_port
+      attr_accessible :start_web_frontend, :web_frontend_port
     end
 
     def add_path(path, opts = nil)

data/lib/gitdocs/repository.rb

@@ -172,39 +172,46 @@ class Gitdocs::Repository
     @rugged.index.reload
     return e.err unless @rugged.index.conflicts?
 
-    conflicted_paths = @rugged.index.map do |index_entry|
-      filename, extension = index_entry[:path].scan(/(.*?)(|\.[^\.]+)$/).first
-
-      author       = ' original' if index_entry[:stage] == 1
-      short_oid    = index_entry[:oid][0..6]
-      new_filename = "#{filename} (#{short_oid}#{author})#{extension}"
-      File.open(File.join(root, new_filename), 'wb') do |f|
-        f.write(Rugged::Blob.lookup(@rugged, index_entry[:oid]).content)
+    # Collect all the index entries by their paths.
+    index_path_entries = Hash.new { |h, k| h[k] = Array.new }
+    @rugged.index.map do |index_entry|
+      index_path_entries[index_entry[:path]].push(index_entry)
+    end
+
+    # Filter to only the conflicted entries.
+    conflicted_path_entries = index_path_entries.delete_if { |_k, v| v.length == 1 }
+
+    conflicted_path_entries.each_pair do |path, index_entries|
+      # Write out the different versions of the conflicted file.
+      index_entries.each do |index_entry|
+        filename, extension = index_entry[:path].scan(/(.*?)(|\.[^\.]+)$/).first
+        author       = ' original' if index_entry[:stage] == 1
+        short_oid    = index_entry[:oid][0..6]
+        new_filename = "#{filename} (#{short_oid}#{author})#{extension}"
+        File.open(File.join(root, new_filename), 'wb') do |f|
+          f.write(Rugged::Blob.lookup(@rugged, index_entry[:oid]).content)
+        end
       end
 
-      index_entry[:path]
+      # And remove the original.
+      FileUtils.remove(File.join(root, path), force: true)
     end
 
-    conflicted_paths.uniq!
-    conflicted_paths.each { |path| FileUtils.remove(File.join(root, path), force: true) }
-
-    # NOTE: leave the commit until the next push
+    # NOTE: Let commit be handled by the next regular commit.
 
-    conflicted_paths
+    conflicted_path_entries.keys
   end
 
-  # Commit and push the repository
+  # Commit the working directory
+  #
+  # @param [String] message
   #
   # @return [nil] if the repository is invalid
-  # @return [:no_remote] if the remote is not yet set
-  # @return [:nothing] if there was nothing to do
-  # @return [String] if there is an error return the message
-  # @return [:ok] if commited and pushed without errors or conflicts
-  def push(last_synced_oid, message='Auto-commit from gitdocs')
+  # @return [Boolean] whether a commit was made or not
+  def commit(message)
     return nil unless valid?
-    return :no_remote unless has_remote?
 
-    #add and commit
+    # Mark any empty directories so they will be committed
     Find.find(root).each do |path|
       Find.prune if File.basename(path) == '.git'
       if File.directory?(path) && Dir.entries(path).count == 2
@@ -228,16 +235,30 @@ class Gitdocs::Repository
       end
       @rugged.index.write
       @grit.commit_index(message)
+      true
+    else
+      false
     end
+  end
+
+  # Push the repository
+  #
+  # @return [nil] if the repository is invalid
+  # @return [:no_remote] if the remote is not yet set
+  # @return [:nothing] if there was nothing to do
+  # @return [String] if there is an error return the message
+  # @return [:ok] if committed and pushed without errors or conflicts
+  def push
+    return nil unless valid?
+    return :no_remote unless has_remote?
 
     return :nothing if current_oid.nil?
 
-    if last_synced_oid.nil? || remote_branch.nil? || remote_branch.tip.oid != current_oid
+    if remote_branch.nil? || remote_branch.tip.oid != current_oid
       begin
         @grit.git.push({ raise: true }, @remote_name, @branch_name)
         :ok
       rescue Grit::Git::CommandFailed => e
-        return :nothing if last_synced_oid.nil?
         return :conflict if e.err[/\[rejected\]/]
         e.err # return the output on error
       end

data/lib/gitdocs/runner.rb

@@ -102,7 +102,8 @@ module Gitdocs
         message = 'Auto-commit from gitdocs'
       end
 
-      result = @repository.push(@last_synced_revision, message)
+      @repository.commit(message)
+      result = @repository.push
 
       return if result.nil? || result == :no_remote || result == :nothing
       level, title, message = case result

data/lib/gitdocs/version.rb

@@ -1,3 +1,3 @@
 module Gitdocs
-  VERSION = '0.5.0.pre5'
+  VERSION = '0.5.0.pre6'
 end

data/lib/gitdocs/views/settings.haml

@@ -8,11 +8,6 @@
       %dt Web Frontend Port
       %dd
         %input{:type =>'input', :name=>"config[web_frontend_port]", :value => conf.global.web_frontend_port }
-    %p
-      %input{:type =>'hidden', :value => '0', :name=>"config[load_browser_on_startup]"}
-      %input{:type =>'checkbox', :value => '1', :name=>"config[load_browser_on_startup]", :checked => conf.global.load_browser_on_startup ? 'checked' : nil}
-      %span Open browser on startup?
-
   %h2 Shares
   - conf.shares.each_with_index do |share, idx|
     %div{:id => "share-#{idx}", :class => "share #{idx % 2 == 0 ? 'even' : 'odd'}"}

data/test/integration/full_sync_test.rb

@@ -9,7 +9,6 @@ describe 'fully synchronizing repositories' do
     configuration.shares.each do |share|
       share.update_attributes(polling_interval: 0.1, notification: false)
     end
-    configuration.global.update_attributes(load_browser_on_startup: false)
 
     start_cmd = 'gitdocs start --debug --pid=gitdocs.pid --port 7777'
     run(start_cmd, 15)

data/test/repository_test.rb

@@ -276,6 +276,31 @@ describe Gitdocs::Repository do
         it { subject ; local_file_content('file1 (7bfce5c)').must_equal 'dead' }
       end
 
+      describe 'when there is a conflict, with additional files' do
+        before do
+          bare_commit(
+            remote_repo,
+            'file1', 'dead',
+            'second commit',
+            'author@example.com', 'A U Thor'
+          )
+          bare_commit(
+            remote_repo,
+            'file2', 'foo',
+            'second commit',
+            'author@example.com', 'A U Thor'
+          )
+          write_and_commit('file1', 'beef', 'conflict commit', author1)
+        end
+
+        it { subject.must_equal ['file1'] }
+        it { subject ; commit_count(local_repo).must_equal 2 }
+        it { subject ; local_file_count.must_equal 3 }
+        it { subject ; local_file_content('file1 (f6ea049 original)').must_equal 'foobar' }
+        it { subject ; local_file_content('file1 (18ed963)').must_equal 'beef' }
+        it { subject ; local_file_content('file2').must_equal 'foo' }
+      end
+
       describe 'when there is a non-conflicted local commit' do
         before { write_and_commit('file1', 'beef', 'conflict commit', author1) }
         it { subject.must_equal :ok }
@@ -298,8 +323,8 @@ describe Gitdocs::Repository do
     end
   end
 
-  describe '#push' do
-    subject { repository.push(last_oid, 'message') }
+  describe '#commit' do
+    subject { repository.commit('message') }
 
     let(:path_or_share) { stub(
       path:        local_repo_path,
@@ -308,244 +333,129 @@ describe Gitdocs::Repository do
     ) }
 
     describe 'when invalid' do
-      let(:last_oid)      { nil }
       let(:path_or_share) { 'tmp/unit/missing' }
       it { subject.must_be_nil }
     end
 
-    describe 'when no remote' do
-      let(:last_oid) { nil }
-      it { subject.must_equal :no_remote }
-    end
-
-    describe 'remote exists with no commits' do
-      before { create_local_repo_with_remote }
-
-      describe 'last sync is nil' do
-        let(:last_oid) { nil }
-
-        describe 'and there is an error on push' do
-          # Simulate an error occurring during the push
-          before do
-            Grit::Git.any_instance.stubs(:push).raises(
-              Grit::Git::CommandFailed.new('', 1, '')
-            )
-          end
-          it { subject.must_equal :nothing }
-          it { subject ; commit_count(local_repo).must_equal 0 }
-        end
+    describe 'no previous commits' do
+      describe 'nothing to commit' do
+        it { subject.must_equal false }
+      end
 
-        describe 'and there is a conflicted file to push' do
-          before do
-            bare_commit(remote_repo, 'file1', 'dead', 'commit', 'A U Thor', 'author@example.com')
-            write('file1', 'beef')
-          end
-          it { subject ; commit_count(local_repo).must_equal 1 }
-          it { subject ; commit_count(remote_repo).must_equal 1 }
-          it { subject.must_equal :nothing }
+      describe 'changes to commit' do
+        before do
+          write('file1', 'foobar')
+          mkdir('directory')
         end
+        it { subject.must_equal true }
+        it { subject ; local_file_exist?('directory/.gitignore').must_equal true }
+        it { subject ; commit_count(local_repo).must_equal 1 }
+        it { subject ; head_commit(local_repo).message.must_equal "message\n" }
+        it { subject ; local_repo_clean?.must_equal true }
+      end
+    end
 
-        describe 'and there are empty directories to push' do
-          before do
-            mkdir('directory')
-            mkdir('.hidden_empty')
-          end
-          it { subject.must_equal :ok }
-          it { subject ; commit_count(local_repo).must_equal 1 }
-          it { subject ; commit_count(remote_repo).must_equal 1 }
-          it { subject ; head_commit(remote_repo).message.must_equal "message\n" }
-          it { subject ; head_tree_files(remote_repo).count.must_equal 2 }
-          it { subject ; head_tree_files(remote_repo).must_include 'directory' }
-          it { subject ; head_tree_files(remote_repo).must_include '.hidden_empty' }
-          it { subject ; Dir.glob("#{local_repo_path}/**/.gitignore", File::FNM_DOTMATCH).count.must_equal 2 }
-        end
+    describe 'previous commits' do
+      before do
+        write_and_commit('file1', 'foobar', 'initial commit', author1)
+        write_and_commit('file2', 'deadbeef', 'second commit', author1)
+      end
 
-        describe 'and there is a directory with a hidden file' do
-          before do
-            mkdir('directory')
-            write('directory/.hidden', '')
-          end
-          it { subject.must_equal :ok }
-          it { subject ; local_file_exist?('directory', '.gitignore').must_equal false }
-          it { subject ; commit_count(local_repo).must_equal 1 }
-          it { subject ; commit_count(remote_repo).must_equal 1 }
-          it { subject ; head_commit(remote_repo).message.must_equal "message\n" }
-          it { subject ; head_tree_files(remote_repo).count.must_equal 1 }
-          it { subject ; head_tree_files(remote_repo).must_include 'directory' }
-        end
+      describe 'nothing to commit' do
+        it { subject.must_equal false }
+      end
 
-        describe 'and there is a new file to push' do
-          before { write('file2', 'foobar') }
-          it { subject.must_equal :ok }
-          it { subject ; commit_count(local_repo).must_equal 1 }
-          it { subject ; commit_count(remote_repo).must_equal 1 }
-          it { subject ; head_commit(remote_repo).message.must_equal "message\n" }
-          it { subject ; head_tree_files(remote_repo).count.must_equal 1 }
-          it { subject ; head_tree_files(remote_repo).must_include 'file2' }
+      describe 'changes to commit' do
+        before do
+          write('file1', 'foobar')
+          FileUtils.rm_rf(File.join(local_repo_path, 'file2'))
+          write('file3', 'foobar')
+          mkdir('directory')
         end
+        it { subject.must_equal true }
+        it { subject ; local_file_exist?('directory/.gitignore').must_equal true }
+        it { subject ; commit_count(local_repo).must_equal 3 }
+        it { subject ; head_commit(local_repo).message.must_equal "message\n" }
+        it { subject ; local_repo_clean?.must_equal true }
       end
+    end
+  end
 
-      describe 'last sync is not nil' do
-        let(:last_oid) { 'oid' }
+  describe '#push' do
+    subject { repository.push }
 
-        describe 'and this is an error on the push' do
-          before do
-            write('file2', 'foobar')
+    let(:path_or_share) { stub(
+      path:        local_repo_path,
+      remote_name: 'origin',
+      branch_name: 'master'
+    ) }
 
-            # Simulate an error occurring during the push
-            Grit::Git.any_instance.stubs(:push).raises(
-              Grit::Git::CommandFailed.new('', 1, 'error message')
-            )
-          end
-          it { subject.must_equal 'error message' }
-        end
+    describe 'when invalid' do
+      let(:path_or_share) { 'tmp/unit/missing' }
+      it { subject.must_be_nil }
+    end
 
-        describe 'and this is nothing to push' do
-          it { subject.must_equal :nothing }
-          it { subject ; commit_count(local_repo).must_equal 0 }
-        end
+    describe 'when no remote' do
+      it { subject.must_equal :no_remote }
+    end
 
-        describe 'and there is a conflicted commit to push' do
-          before do
-            bare_commit(remote_repo, 'file1', 'dead', 'commit', 'A U Thor', 'author@example.com')
-            write('file1', 'beef')
-          end
-          it { subject ; commit_count(local_repo).must_equal 1 }
-          it { subject ; commit_count(remote_repo).must_equal 1 }
-          it { subject.must_equal :conflict }
-        end
+    describe 'remote exists with no commits' do
+      before { create_local_repo_with_remote }
 
-        describe 'and there is a commit to push' do
-          before { write('file2', 'foobar') }
-          it { subject.must_equal :ok }
-          it { subject ; commit_count(local_repo).must_equal 1 }
-          it { subject ; commit_count(remote_repo).must_equal 1 }
-          it { subject ; head_commit(remote_repo).message.must_equal "message\n" }
-          it { subject ; head_tree_files(remote_repo).count.must_equal 1 }
-          it { subject ; head_tree_files(remote_repo).must_include 'file2' }
-        end
+      describe 'and no local commits' do
+        it { subject.must_equal :nothing }
+        it { subject ; commit_count(remote_repo).must_equal 0 }
       end
-    end
 
-    describe 'remote exists' do
-      before { create_local_repo_with_remote_with_commit }
-
-      describe 'last sync is nil' do
-        let(:last_oid) { nil }
+      describe 'and a local commit' do
+        before { write_and_commit('file2', 'foobar', 'commit', author1) }
 
-        describe 'and there is an error on push' do
+        describe 'and the push fails' do
           # Simulate an error occurring during the push
           before do
-            Grit::Git.any_instance.stubs(:push).raises(
-              Grit::Git::CommandFailed.new('', 1, '')
-            )
-          end
-          it { subject.must_equal :nothing }
-          it { subject ; commit_count(local_repo).must_equal 1 }
-        end
-
-        describe 'and there is a conflicted file to push' do
-          before do
-            bare_commit(remote_repo, 'file1', 'dead', 'commit', 'A U Thor', 'author@example.com')
-            write('file1', 'beef')
-          end
-          it { subject ; commit_count(local_repo).must_equal 2 }
-          it { subject ; commit_count(remote_repo).must_equal 2 }
-          it { subject.must_equal :nothing }
-        end
-
-        describe 'and there are empty directories to push' do
-          before do
-            mkdir('directory')
-            mkdir('.hidden_empty')
+            Grit::Git.any_instance.stubs(:push)
+              .raises(Grit::Git::CommandFailed.new('', 1, 'error message'))
           end
-          it { subject.must_equal :ok }
-          it { subject ; commit_count(local_repo).must_equal 2 }
-          it { subject ; commit_count(remote_repo).must_equal 2 }
-          it { subject ; head_commit(remote_repo).message.must_equal "message\n" }
-          it { subject ; head_tree_files(remote_repo).count.must_equal 3 }
-          it { subject ; head_tree_files(remote_repo).must_include 'file1' }
-          it { subject ; head_tree_files(remote_repo).must_include 'directory' }
-          it { subject ; head_tree_files(remote_repo).must_include '.hidden_empty' }
-          it { subject ; Dir.glob("#{local_repo_path}/**/.gitignore", File::FNM_DOTMATCH).count.must_equal 2 }
+          it { subject.must_equal 'error message' }
         end
 
-        describe 'and there is a directory with a hidden file' do
-          before do
-            mkdir('directory')
-            write('directory/.hidden', '')
-          end
+        describe 'and the push succeeds' do
           it { subject.must_equal :ok }
-          it { subject ; local_file_exist?('directory', '.gitignore').must_equal false }
-          it { subject ; commit_count(local_repo).must_equal 2 }
-          it { subject ; commit_count(remote_repo).must_equal 2 }
-          it { subject ; head_commit(remote_repo).message.must_equal "message\n" }
-          it { subject ; head_tree_files(remote_repo).count.must_equal 2 }
-          it { subject ; head_tree_files(remote_repo).must_include 'file1' }
-          it { subject ; head_tree_files(remote_repo).must_include 'directory' }
+          it { subject ; commit_count(remote_repo).must_equal 1 }
         end
+      end
+    end
 
-        describe 'and there is an existing file update to push' do
-          before { write('file1', 'deadbeef') }
-          it { subject.must_equal :ok }
-          it { subject ; commit_count(local_repo).must_equal 2 }
-          it { subject ; commit_count(remote_repo).must_equal 2 }
-          it { subject ; head_commit(remote_repo).message.must_equal "message\n" }
-          it { subject ; head_tree_files(remote_repo).count.must_equal 1 }
-          it { subject ; head_tree_files(remote_repo).must_include 'file1' }
-        end
+    describe 'remote exists with commits' do
+      before { create_local_repo_with_remote_with_commit }
 
-        describe 'and there is a new file to push' do
-          before { write('file2', 'foobar') }
-          it { subject.must_equal :ok }
-          it { subject ; commit_count(local_repo).must_equal 2 }
-          it { subject ; commit_count(remote_repo).must_equal 2 }
-          it { subject ; head_commit(remote_repo).message.must_equal "message\n" }
-          it { subject ; head_tree_files(remote_repo).count.must_equal 2 }
-          it { subject ; head_tree_files(remote_repo).must_include 'file1' }
-          it { subject ; head_tree_files(remote_repo).must_include 'file2' }
-        end
+      describe 'and no local commits' do
+        it { subject.must_equal :nothing }
+        it { subject ; commit_count(remote_repo).must_equal 1 }
       end
 
-      describe 'last sync is not nil' do
-        let(:last_oid) { 'oid' }
+      describe 'and a local commit' do
+        before { write_and_commit('file2', 'foobar', 'commit', author1) }
 
-        describe 'and this is an error on the push' do
+        describe 'and the push fails' do
+          # Simulate an error occurring during the push
           before do
-            write('file2', 'foobar')
-
-            # Simulate an error occurring during the push
-            Grit::Git.any_instance.stubs(:push).raises(
-              Grit::Git::CommandFailed.new('', 1, 'error message')
-            )
+            Grit::Git.any_instance.stubs(:push)
+              .raises(Grit::Git::CommandFailed.new('', 1, 'error message'))
           end
           it { subject.must_equal 'error message' }
         end
 
-        describe 'and this is nothing to push' do
-          it { subject.must_equal :nothing }
-          it { subject ; commit_count(local_repo).must_equal 1 }
-        end
+        describe 'and the push conflicts' do
+          before { bare_commit(remote_repo, 'file2', 'dead', 'commit', 'A U Thor', 'author@example.com') }
 
-        describe 'and there is a conflicted commit to push' do
-          before do
-            bare_commit(remote_repo, 'file1', 'dead', 'commit', 'A U Thor', 'author@example.com')
-            write('file1', 'beef')
-          end
-          it { subject ; commit_count(local_repo).must_equal 2 }
           it { subject ; commit_count(remote_repo).must_equal 2 }
           it { subject.must_equal :conflict }
         end
 
-        describe 'and there is a commit to push' do
-          before { write('file2', 'foobar') }
+        describe 'and the push succeeds' do
           it { subject.must_equal :ok }
-          it { subject ; commit_count(local_repo).must_equal 2 }
           it { subject ; commit_count(remote_repo).must_equal 2 }
-          it { subject ; head_commit(remote_repo).message.must_equal "message\n" }
-          it { subject ; head_tree_files(remote_repo).count.must_equal 2 }
-          it { subject ; head_tree_files(remote_repo).must_include 'file1' }
-          it { subject ; head_tree_files(remote_repo).must_include 'file2' }
         end
       end
     end
@@ -766,18 +676,20 @@ describe Gitdocs::Repository do
 
   # NOTE: This method is ignoring hidden files.
   def local_file_count
-    files = Dir.chdir(local_repo_path) do
-      Dir.glob('*')
-    end
+    files = Dir.chdir(local_repo_path) { Dir.glob('*') }
     files.count
   end
 
+  def local_repo_clean?
+    local_repo.diff_workdir(local_repo.head.target, include_untracked: true).deltas.empty?
+  end
+
   def local_file_exist?(*path_elements)
     File.exist?(File.join(local_repo_path, *path_elements))
   end
 
   def local_file_content(*path_elements)
-    local_file_exist?(*path_elements).must_equal true
+    return nil unless local_file_exist?
     File.read(File.join(local_repo_path, *path_elements))
   end
 end

data/test/runner_test.rb

@@ -63,7 +63,13 @@ describe 'gitdocs runner' do
   describe '#push_changes' do
     subject { runner.push_changes }
 
-    before { repository.expects(:push).returns(push_result) }
+    before do
+      repository.expects(:commit)
+        .with('Auto-commit from gitdocs')
+        .returns(push_result)
+      repository.expects(:push)
+        .returns(push_result)
+    end
 
     describe 'when invalid' do
       let(:push_result) { nil }
@@ -98,12 +104,15 @@ describe 'gitdocs runner' do
       it { subject.must_equal nil }
     end
 
-    describe 'when merge is ok' do
+    describe 'when push is ok' do
       let(:push_result) { :ok }
       before do
         runner.instance_variable_set(:@last_synced_revision, :oid)
-        repository.stubs(:current_oid).returns(:next_oid)
-        repository.stubs(:author_count).with(:oid).returns('Alice' => 1, 'Bob' => 2)
+        repository.stubs(:current_oid)
+          .returns(:next_oid)
+        repository.stubs(:author_count)
+          .with(:oid)
+          .returns('Alice' => 1, 'Bob' => 2)
         notifier.expects(:info)
           .with('Pushed 3 changes', "'root_path' has been pushed")
       end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: gitdocs
 version: !ruby/object:Gem::Version
-  version: 0.5.0.pre5
+  version: 0.5.0.pre6
 platform: ruby
 authors:
 - Josh Hull
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-05-15 00:00:00.000000000 Z
+date: 2014-05-24 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: joshbuddy-guard