git-fastclone 1.0.15 → 1.0.16

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 03b562f98b43cc354da19c3d34542285b2530a6c
-  data.tar.gz: 4dbe3c64b9ef3511ee80efd753331613e4f06550
+  metadata.gz: cfb5c1a85a5af61f83695373c9e087a382c7dbf0
+  data.tar.gz: b07120a322ee4ca8ac13d0cd98c1251967a70744
 SHA512:
-  metadata.gz: 15261fcd42f7041597eaee13a64782c4e5a69a9e7bba85b12f6d43a01e73a66b42f858072f843d48f76304741abf3ffdf59cfd80a37e3341983c7ab95e85f811
-  data.tar.gz: b1fb6ddc2c6148031d29cfacb7a77a1e32654fd955fd7bc30f88f028abf1fe40d4bc29964e1f2d54489f38a8f763c5b2e67f94ce48324d2397416e77b5481a8b
+  metadata.gz: 1b5cfe0a83e6232ae2475d284cfca371d840a0a950bcb4de30bca64f2d94f2a55362d242ac6ec8698c5b6d84304c08d1f1e58d990b892cd930faffabff4c89a5
+  data.tar.gz: d5f62ae9d1e60ede4d3e51c991593d4b6874433f8f3c4c55abf17387d1ebdeff19fb9171449e134ba23cef5b5e664a6376fb3f54c5c590d31d1300b6b658c817

data/lib/git-fastclone.rb

@@ -270,7 +270,8 @@ module GitFastClone
       end
     end
 
-    # Stores the fact that our repo has been updated
+    # Creates or updates the mirror repo then stores an indication
+    # that this repo has been updated on this run of fastclone
     def store_updated_repo(url, mirror, repo_name, fail_hard)
       unless Dir.exist?(mirror)
         Cocaine::CommandLine.new('git clone', '--mirror :url :mirror')
@@ -282,6 +283,10 @@ module GitFastClone
       reference_updated[repo_name] = true
 
     rescue Cocaine::ExitStatusError => e
+      # To avoid corruption of the cache, if we failed to update or check out we remove
+      # the cache directory entirely. This may cause the current clone to fail, but if the
+      # underlying error from git is transient it will not affect future clones.
+      FileUtils.remove_entry_secure(mirror, force: true)
       raise e if fail_hard
     end
 

data/lib/git-fastclone/version.rb

@@ -1,3 +1,3 @@
 module GitFastCloneVersion
-  VERSION = '1.0.15'
+  VERSION = '1.0.16'
 end

data/spec/git_fastclone_runner_spec.rb

@@ -203,13 +203,13 @@ describe GitFastClone::Runner do
   describe '.store_updated_repo' do
     context 'when fail_hard is true' do
       it 'should raise a Cocaine error' do
-        pending('TODO: Fix later')
-        fail
-=begin
+        cocaine_commandline_double = double('new_cocaine_commandline')
+        allow(cocaine_commandline_double).to receive(:run) { fail Cocaine::ExitStatusError }
+        allow(Cocaine::CommandLine).to receive(:new) { cocaine_commandline_double }
+        expect(FileUtils).to receive(:remove_entry_secure).with(placeholder_arg, force: true)
         expect do
           subject.store_updated_repo(placeholder_arg, placeholder_arg, placeholder_arg, true)
         end.to raise_error(Cocaine::ExitStatusError)
-=end
       end
     end
 
@@ -218,10 +218,11 @@ describe GitFastClone::Runner do
         cocaine_commandline_double = double('new_cocaine_commandline')
         allow(cocaine_commandline_double).to receive(:run) { fail Cocaine::ExitStatusError }
         allow(Cocaine::CommandLine).to receive(:new) { cocaine_commandline_double }
+        expect(FileUtils).to receive(:remove_entry_secure).with(placeholder_arg, force: true)
 
         expect do
           subject.store_updated_repo(placeholder_arg, placeholder_arg, placeholder_arg, false)
-        end.not_to raise_error(Cocaine::ExitStatusError)
+        end.not_to raise_error
       end
     end
 

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: git-fastclone
 version: !ruby/object:Gem::Version
-  version: 1.0.15
+  version: 1.0.16
 platform: ruby
 authors:
 - Michael Tauraso
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-01-23 00:00:00.000000000 Z
+date: 2016-01-28 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: cocaine