Dahistory 0.3.1 → 0.4.0

data/Dahistory.gemspec

@@ -24,5 +24,5 @@ Gem::Specification.new do |s|
   
   # s.rubyforge_project = "Dahistory"
   # specify any dependencies here; for example:
-  # s.add_runtime_dependency "rest-client"
+  s.add_runtime_dependency "Exit_Zero"
 end

data/README.md

@@ -15,20 +15,22 @@ Installation
 
     gem 'Dahistory'
 
-Usage
+Useage
 ------
 
-    require "Dahistory"
+    # In your Chef-Solo recipe or your Ruby code...
 
+    require "Dahistory"
+    
     Dahistory "some/file.txt" 
     
     # Checks your 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"
-
+    #
     # You review the file,
     #   move the file from the pending directory to your source/history dir, and 
-    #   re-do your last command (Capistrano, Chef, Puppet, etc.)
+    #   run your recipe/code again.
 
 Override the default settings:
 
@@ -49,6 +51,45 @@ 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)
 
+Useage: Dahistory + Git
+-----------------------
+
+Dahistory has some methods that can be used as shortcuts when using git.
+
+    Dahistory { |o|
+    
+      o.file "some/file.txt"
+
+      o.git_add_commit
+
+      # ... is a shortcut for:
+      o.on_raise_pending {
+        `git add #{o.backup_file}`
+        `git commit -m "Backup: #{o.backup_file}"`
+      }
+
+    }
+ 
+`git_push` does the same above, but with "git push":
+
+    o.git_add_commit_push
+    
+    # or...
+    o.git_add_commit_push 'my_remote my_branch' 
+
+You can specify the git repo:
+
+    Dahistory { |o|
+
+      o.file "some/file.txt"
+
+       Dir.chdir("/path/to/project") {
+         o.git_add_commit
+         # or... 
+         o.git_add_commit_push
+       }
+    }
+
 Run Tests
 ---------
 

data/lib/Dahistory/version.rb

@@ -1,3 +1,3 @@
 class Dahistory
-  VERSION = "0.3.1"
+  VERSION = "0.4.0"
 end

data/lib/Dahistory.rb

@@ -1,4 +1,5 @@
 require 'Dahistory/version'
+require 'Exit_Zero'
 
 def Dahistory file = nil
   da = Dahistory.new { |o| 
@@ -17,6 +18,7 @@ class Dahistory
   module Base
     
     def initialize file_path = nil
+      @git = false
       @file = nil
       file!(file_path) if file_path
       dirs         './history'
@@ -84,6 +86,14 @@ class Dahistory
       @backup_file = str
     end
 
+    def git_add_commit
+      @git = :commit
+    end
+
+    def git_add_commit_push args = ""
+      @git = args
+    end
+
     def save 
 
       content  = File.read(file)
@@ -93,6 +103,17 @@ class Dahistory
 
       if !old
         File.write(backup_file, content) unless self.class.find_file_copy(file, pending_dir)
+        
+        
+        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
+        
         on_raise_pending.call if on_raise_pending
         raise Pending, backup_file
       end

data/spec/main.rb

@@ -12,18 +12,43 @@ def chdir
 end
 
 def reset_dirs
-  `rm -rf #{FOLDER}`
-  `mkdir #{FOLDER}`
-  `mkdir #{FOLDER}/files`
-  `mkdir #{FOLDER}/history`
-  `mkdir #{FOLDER}/history/blue`
-  `mkdir #{FOLDER}/history/red`
-  `mkdir #{FOLDER}/history/yellow`
-  `mkdir #{FOLDER}/pending`
+  Exit_Zero "rm -rf #{FOLDER}"
+  Exit_Zero "mkdir #{FOLDER}"
+  Exit_Zero "mkdir #{FOLDER}/files"
+  Exit_Zero "mkdir #{FOLDER}/history"
+  Exit_Zero "mkdir #{FOLDER}/history/blue"
+  Exit_Zero "mkdir #{FOLDER}/history/red"
+  Exit_Zero "mkdir #{FOLDER}/history/yellow"
+  Exit_Zero "mkdir #{FOLDER}/pending"
 end
 
 reset_dirs
 
+shared( "git" ) {
+
+  before {
+    @proj     = "#{FOLDER}/project_#{rand 1000}"
+    @git_repo = "#{@proj}.git"
+    Exit_Zero "mkdir -p #{@git_repo}"
+    Exit_Zero "cd #{@git_repo} && git init --bare"
+    Exit_Zero "mkdir -p #{@proj}"
+    
+    Dir.chdir(@proj) {
+      Exit_Zero "mkdir files"
+      Exit_Zero "mkdir history"
+      Exit_Zero "mkdir pending"
+      Exit_Zero "git init"
+      Exit_Zero "git remote add origin #{@git_repo}"
+      Exit_Zero "touch README.md"
+      Exit_Zero "git add ."
+      Exit_Zero %! git commit -m "First commit." !
+      Exit_Zero "git push -u origin master"
+    }
+    @file    = "files/#{rand 1000}.txt"
+  }
+
+}
+
 # ======== Include the tests.
 if ARGV.size > 1 && ARGV[1, ARGV.size - 1].detect { |a| File.exists?(a) }
   # Do nothing. Bacon grabs the file.

data/spec/tests/Dashistory.rb

@@ -84,3 +84,59 @@ describe "Dahistory: existing file in ./history" do
   
 end # === Dahistory: existing file in ./history
 
+describe "Dahistory :git_add_commit" do
+  
+  behaves_like "git"
+  
+  it "adds backup file as a commit" do
+    target = nil
+
+    Dir.chdir(@proj) {
+      File.write @file, @file
+      Dahistory { |o|
+        o.file @file
+        o.git_add_commit
+        target = "Backup: #{o.backup_file}"
+      } rescue nil
+      
+      Exit_Zero('git log -n 1 --oneline --decorate=short')
+      .out[target].should == target
+    }
+  end
+    
+end # === Dahistory :git_add_commit
+
+describe "Dahistory :git_add_commit_push" do
+  
+  behaves_like "git"
+  
+  it "pushs git repo to remote" do
+    target = "Backup: #{@file}"
+    
+    Dir.chdir(@proj) {
+      File.write @file, @file
+      Dahistory { |o|
+        o.file @file
+        o.git_add_commit_push
+      } rescue nil
+      
+      Exit_Zero('git push 2>&1').out["Everything up-to-date"].should == "Everything up-to-date"
+    }
+  end
+  
+  it "passes argument to 'git push'" do
+    target = "Backup: #{@file}"
+    
+    Dir.chdir(@proj) {
+      File.write @file, @file
+      should.raise(Exit_Zero::Non_Zero) {
+        Dahistory { |o|
+          o.file @file
+          o.git_add_commit_push "old_remote someting"
+        }
+      }.message.should.match %r!'old_remote' does not appear to be a git repository!
+    }
+  end
+  
+end # === Dahistory :git_add_commit_push
+

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: Dahistory
 version: !ruby/object:Gem::Version
-  version: 0.3.1
+  version: 0.4.0
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-03-23 00:00:00.000000000 Z
+date: 2012-04-11 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bacon
@@ -75,6 +75,22 @@ dependencies:
     - - ! '>='
       - !ruby/object:Gem::Version
         version: '0'
+- !ruby/object:Gem::Dependency
+  name: Exit_Zero
+  requirement: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
 description: Compares file to other files in specified dir(s) and backups if it does
   not exist.
 email: