Dahistory 0.4.3 → 1.0.0

data/README.md

@@ -13,7 +13,7 @@ are overwriting a file you have encountered before.
 Installation
 ------------
 
-    gem 'Dahistory'
+    gem install Dahistory
 
 Usage
 ------
@@ -24,7 +24,7 @@ Usage
     
     Dahistory "some/file.txt" 
     
-    # Checks your directory (default "./history").
+    # Checks your history directory (default "./history").
     # If not found there, saves copy of file in ./pending dir and
     #  raises Dahistory::Pending_File, "pending/HOSTNAME,path,some,file.txt.TIMESTAMP"
     #
@@ -32,12 +32,14 @@ Usage
     #   move the file from the pending directory to your source/history dir, and 
     #   run your recipe/code again.
 
-Override the default settings:
+You can also specify different source directories using :dirs.
+Below is how you use :dirs and other settings:
 
     Dahistory { |o|
     
       o.file        "file/name.txt"
-      o.dirs        "dir1", "dir2"  # defaults to "./history"
+      o.dirs        "dir1", "dir2" # -> default: []
+      o.history     "./history" 
       o.pending_dir "./pending"
       o.backup_file "#{`hostname`}.name.txt.#{Time.now.to_i}"
       o.on_raise_pending {

data/lib/Dahistory.rb

@@ -21,7 +21,8 @@ class Dahistory
       @git = false
       @file = nil
       file!(file_path) if file_path
-      dirs         './history'
+      dirs         []
+      history      './history'
       pending_dir  './pending'
       @on_raise_pending = nil
       yield(self) if block_given?
@@ -33,8 +34,12 @@ class Dahistory
       @file = File.expand_path(path)
     end
 
-    def dirs *args
-      @dirs = args.flatten.map { |dir| File.expand_path dir }
+    def dirs *raw
+      @dirs = raw.flatten.map { |dir| File.expand_path dir }
+    end
+
+    def history raw
+      @history = File.expand_path raw 
     end
 
     def pending_dir dir 
@@ -77,6 +82,10 @@ class Dahistory
 
     }
 
+    def backup_basename
+      File.basename( backup_file )
+    end
+
     def backup_file str = :RETURN
       if str == :RETURN
         @backup_file ||= "#{`hostname`.strip}-#{file.gsub('/',',')}.#{Time.now.utc.strftime "%Y.%m.%d.%H.%M.%S"}"
@@ -99,29 +108,34 @@ class Dahistory
       content  = File.read(file)
       standard = content.gsub("\r", '')
 
-      old = self.class.find_file_copy file, dirs
+      in_dirs    = self.class.find_file_copy file, dirs
+      in_history = self.class.find_file_copy file, history
       in_pending = self.class.find_file_copy file, pending_dir
 
-      if !old 
-        
-        if !in_pending
-          
-          File.write(backup_file, content) 
+      return true if in_history
 
-          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
+      if in_dirs
+        File.write(File.join(history, backup_basename), content)
+        return true
       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
 
     end # === def
     

data/lib/Dahistory/version.rb

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

data/spec/tests/Dashistory.rb

@@ -14,6 +14,30 @@ describe "Dahistory" do
   
 end # === Dahistory
 
+describe "Dahistory: source files" do
+
+  before { reset_dirs }
+  
+  it "copies target file from source dir to history dir" do
+    file = "files/a.txt"
+    target = rand(1000).to_s
+    chdir {
+      
+      File.write(file, target)
+      Dahistory { |o|
+        o.file file
+        o.dirs "./files"
+      }
+      
+      name = `ls history`.strip.split.first
+      File.read(File.join "history", name).should == target
+      
+    }
+  end
+  
+end # === Dahistory: source files
+
+
 describe "Dahistory: pending file" do
 
   before { reset_dirs }

metadata

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