Dahistory 0.4.2 → 0.4.3

data/lib/Dahistory.rb

@@ -100,19 +100,24 @@ class Dahistory
       standard = content.gsub("\r", '')
 
       old = self.class.find_file_copy file, dirs
+      in_pending = self.class.find_file_copy file, pending_dir
 
-      if !old
-        File.write(backup_file, content) unless self.class.find_file_copy(file, pending_dir)
+      if !old 
         
-        
-        if @git
-          Exit_Zero "git add #{backup_file}"
-          Exit_Zero %! git commit -m "Backup: #{backup_file}"!
-        end
-        
-        if @git.is_a?(String)
-          Exit_Zero %! git push #{@git} !
-        end
+        if !in_pending
+          
+          File.write(backup_file, content) 
+
+          if @git
+            Exit_Zero "git add #{backup_file}"
+            Exit_Zero %! git commit -m "Backup: #{backup_file}"!
+          end
+
+          if @git.is_a?(String)
+            Exit_Zero %! git push #{@git} !
+          end
+          
+        end # === if !in_pending
         
         on_raise_pending.call if on_raise_pending
         raise Pending, backup_file

data/lib/Dahistory/version.rb

@@ -1,3 +1,3 @@
 class Dahistory
-  VERSION = "0.4.2"
+  VERSION = "0.4.3"
 end

data/spec/tests/Dashistory.rb

@@ -87,6 +87,22 @@ end # === Dahistory: existing file in ./history
 describe "Dahistory :git_add_commit" do
   
   behaves_like "git"
+
+  it "does not add file to working tree if already pending" do
+    Dir.chdir(@proj) {
+      
+      File.write @file, @file
+      File.write(@file.sub('files', 'pending'), @file)
+      target = `git status`
+      lambda {
+        Dahistory { |o| 
+          o.file @file
+          o.git_add_commit
+        }
+      }.should.raise Dahistory::Pending
+      `git status`.should == target
+    }
+  end
   
   it "adds backup file as a commit" do
     target = nil

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: Dahistory
 version: !ruby/object:Gem::Version
-  version: 0.4.2
+  version: 0.4.3
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-04-11 00:00:00.000000000 Z
+date: 2012-04-13 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bacon