Dahistory 0.2.1 → 0.2.2

data/README.md

@@ -41,6 +41,8 @@ Override the default settings:
       
     }
 
-**Note:** Both **def Dahistory** and **class Dahistory** are defined. 
-All the code is in one file and less than 150 lines: [lib/Dahistory.rb](https://github.com/da99/Dahistory/blob/master/lib/Dahistory.rb)
+**Note:** 
+Both **def Dahistory** and **class Dahistory** are defined. 
+All the code is in one file and less than 150 lines: 
+[lib/Dahistory.rb](https://github.com/da99/Dahistory/blob/master/lib/Dahistory.rb)
 

data/lib/Dahistory/version.rb

@@ -1,3 +1,3 @@
 class Dahistory
-  VERSION = "0.2.1"
+  VERSION = "0.2.2"
 end

data/lib/Dahistory.rb

@@ -13,7 +13,7 @@ end # === def
 class Dahistory
  
   Pending = Class.new(RuntimeError)
-  
+
   module Base
     
     def initialize file_path = nil
@@ -34,63 +34,60 @@ class Dahistory
       @dirs = args.flatten.map { |dir| File.expand_path dir }
     end
 
-    def pending_dir dir = :RETURN
+    def pending_dir dir 
       @pending_dir = File.expand_path(dir)
     end
 
+    # 
+    #  My alternative to :attr_accessors:
+    #
+    #  Previous methods were setters.  
+    #  Alias the methods as #{name}_set
+    #  and create reader/setter methods.
+    #
     (public_instance_methods - old_meths ).each { |name| 
 
       alias_method :"#{name}_set", name
 
       eval %~
-      def #{name} *args, &blok
+        def #{name} *args, &blok
 
-        if args.empty?
+          if args.empty?
 
-          unless instance_variable_defined?(:@#{name})
-            raise ArgumentError, "Instance variable not set: @#{name}"
-          end
-          @#{name}
+            unless instance_variable_defined?(:@#{name})
+              raise ArgumentError, "Instance variable not set: @#{name}"
+            end
+            @#{name}
 
-        else
+          else
 
-          #{name}_set(*args, &blok)
+            #{name}_set(*args, &blok)
 
-        end
+          end
 
-      end # === def
-          ~
+        end # === def
+      ~
 
     }
 
     def backup_file str = :RETURN
       if str == :RETURN
         @backup_file ||= "#{`hostname`.strip}-#{file.gsub('/',',')}.#{Time.now.utc.strftime "%Y.%m.%d.%H.%M.%S"}"
-        return @backup_file
+        return File.join( pending_dir, @backup_file )
       end
 
       @backup_file = str
     end
 
-    def source_files
-      dirs.map { |path| 
-        full = File.join( File.expand_path(path), "/*")
-        files = Dir.glob( full, File::FNM_DOTMATCH ).select { |unk| File.file?(unk) }
-      }.flatten
-    end
-
     def save 
 
       content  = File.read(file)
       standard = content.gsub("\r", '')
 
-      old = source_files.detect { |path| 
-        raw = File.read(path) 
-        raw.gsub("\r","") == standard
-      }
+      old = self.class.find_file_copy file, dirs
 
       if !old
-        File.write(backup_file, content)
+        File.write(backup_file, content) unless self.class.find_file_copy(file, pending_dir)
         raise Pending, backup_file
       end
 
@@ -99,5 +96,30 @@ class Dahistory
   end # === Base
   
   include Base
+  
+  class << self
+    
+    def find_file_copy file, *raw_dirs
+      standard = File.read(file).gsub("\r", "")
+      found    = nil
+      dirs     = raw_dirs.flatten
+      
+      dirs.each { |path| 
+        full = File.join( File.expand_path(path), "/*")
+        files = Dir.glob( full, File::FNM_DOTMATCH ).select { |unk| File.file?(unk) }
+
+        found = files.detect { |f| 
+          raw = File.read(f)
+          raw.gsub("\r", "") == standard
+        }
+
+        break if found
+      }
+
+      found
+    end # === def
+    
+  end # === class
 
 end # === class Dahistory
+

data/spec/tests/Dashistory.rb

@@ -14,24 +14,55 @@ describe "Dahistory" do
   
 end # === Dahistory
 
-describe "Dahistory: new pending file" do
+describe "Dahistory: pending file" do
 
   before { reset_dirs }
   
   it "copies file to pending dir" do
-
     file = "files/a.txt"
     target = rand(1000).to_s
     chdir {
       File.write(file, target)
       pending = begin
-                  Dahistory "files/a.txt" 
+                  Dahistory file
                 rescue Dahistory::Pending => e
                   e.message
                 end
-      File.read(pending).should == target
+      name = File.basename(pending)
+      File.read(File.join "pending", name).should == target
+    }
+  end
+
+  it "does not copy file if file is already in ./pending" do
+    file = "files/#{rand 1000}.txt"
+    target = rand(10000).to_s
+    chdir {
+      File.write(file, target)
+      File.write(file.sub('files', 'pending'), target)
+      begin
+        Dahistory file
+      rescue Dahistory::Pending => e
+      end
+      Dir.glob("pending/*").size.should == 1
+    }
+  end
+  
+end # === Dahistory: pending file
+
+describe "Dahistory: existing file in ./history" do
+  
+  before { reset_dirs }
+
+  it "does not raise any error" do
+    file = "files/#{rand 10000}.txt"
+    target = rand(10000).to_s
+    chdir {
+      File.write file, target
+      File.write file.sub("files", "history"), target
+      should.not.raise { Dahistory file }
     }
+    
   end
   
-end # === Dahistory: new pending file
+end # === Dahistory: existing file in ./history
 

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: Dahistory
 version: !ruby/object:Gem::Version
-  version: 0.2.1
+  version: 0.2.2
   prerelease: 
 platform: ruby
 authors: