engineyard-backup 0.0.3 → 0.0.4

data/README.txt

@@ -1,5 +1,5 @@
 backup
-    by Jamie van Dyke - Engine Yard Inc.
+    by Engine Yard Inc.
 
 == DESCRIPTION:
 

data/lib/backup.rb

@@ -5,5 +5,37 @@ APP_ROOT = File.expand_path('../') unless defined?(APP_ROOT)
 
 require 'date'
 require 'fileutils'
+require 'highline/import'
 
-require 'backup/backup.rb'
+require 'backup/backup.rb'
+
+# Set debug options
+debug = {
+  "1" => "DEBUG",
+  "2" => "STANDARD"
+}
+puts "DEBUG IS TURNED TO #{debug[ENV['DEBUG']]}" if ENV['DEBUG']
+$debug = ENV['DEBUG']
+
+# Debug command defined
+def debug(text)
+  say text if $debug
+end
+
+# Highline options
+SEP = '='*72 unless defined? SEP
+CLEAR = "\e[H\e[2J" unless defined? CLEAR
+HighLine.track_eof = false # highline has an issue with threading
+ft = HighLine::ColorScheme.new do |cs|
+       cs[:headline]        = [ :bold, :yellow, :on_black ]
+       cs[:horizontal_line] = [ :bold, :white ]
+       cs[:even_row]        = [ :red ]
+       cs[:odd_row]         = [ :yellow ]
+       cs[:debug]           = [ :yellow ]
+       cs[:warn]            = [ :cyan ]
+       cs[:info]            = [ :white ]
+       cs[:critical]        = [ :red ]
+       cs[:pass]            = [ :green ]
+       cs[:fail]            = [ :red ]
+     end
+HighLine.color_scheme = ft

data/lib/backup/backup.rb

@@ -4,7 +4,7 @@ module EngineYard
     attr_reader :filename, :backups
     attr_accessor :releases
     
-    VERSION   = "0.0.3"
+    VERSION   = "0.0.4"
     TIMESTAMP = "%Y%m%d%H%M%S"
     
     # Pass in a filename, Backup will set the directory it works in from this file
@@ -12,7 +12,8 @@ module EngineYard
     #   Backup.new("/my/file")
     #   # adjust the class to keep 3 releases
     #   Backup.new("/my/file", 3)
-    def initialize(file, releases = 5)
+    def initialize( file, releases = 5 )
+      debug "initialized with #{file} and handling #{releases} releases"
       raise Errno::ENOENT, "#{file}", caller unless File.file?(file)
       @filename, @backups = file, []
       @releases = releases
@@ -22,20 +23,22 @@ module EngineYard
     # Options:
     # + operation = :move or :copy
     # + skip_cleanup = :yes or :no
-    def run(operation = :copy, skip_cleanup = :no)
-      move_current if operation == :move
+    def run( operation = :copy, skip_cleanup = :no )
+      debug "operation is #{operation.to_s}"
+      debug "skip_cleanup is #{skip_cleanup.to_s}"
+      move_current( operation )
       cleanup unless skip_cleanup == :yes
     end
     
     # Look for releases and delete the oldest ones outside of the X releases threshold
     def cleanup
       find_all_releases
-      delete_list.each {|f| File.delete(f) }
+      delete_list.each {|f| File.delete( f ) }
     end
     
     # Returns an array of files that will be kept
     def keep_list
-      @backups.first(@releases)
+      @backups.first( @releases )
     end
     
     # Returns an array of files that will be deleted
@@ -53,7 +56,7 @@ module EngineYard
       @backups = backups
       case format
       when :datetime
-        @backups.collect { |b| d = date_from(b.split(".").last); d.strftime("%Y/%m/%d %H:%M:%S") }
+        @backups.collect { |b| d = date_from(b.split(".").last); d.strftime(TIMESTAMP) }
       when :filename
         backups
       end
@@ -62,13 +65,15 @@ module EngineYard
   private    
 
     def remove_faults(backups)
+      remove_list = []
       backups.each do |backup|
         begin
           Date.strptime(backup.split(".").last, TIMESTAMP)
         rescue ArgumentError
-          backups.delete(backup)
+          remove_list << backup
         end
       end
+      backups -= remove_list
       backups
     end
     
@@ -76,8 +81,13 @@ module EngineYard
       DateTime.strptime(string, TIMESTAMP)
     end
     
-    def move_current
-      FileUtils.mv(@filename, "#{@filename}.#{Time.now.strftime(TIMESTAMP)}")
+    def move_current( operation = :move )
+      case operation
+      when :move
+        FileUtils.mv(@filename, "#{@filename}.#{Time.now.strftime(TIMESTAMP)}")
+      when :copy
+        FileUtils.cp(@filename, "#{@filename}.#{Time.now.strftime(TIMESTAMP)}")
+      end
     end
         
   end

data/spec/backup/backup_spec.rb

@@ -25,7 +25,8 @@ describe Backup do
       end
       
       it "should save a new file and delete all backups out of the threshold" do
-        FileUtils.expects( :mv ).times( 1 )
+        FileUtils.expects( :mv ).times( 0 )
+        FileUtils.expects( :cp ).times( 1 )
         valid_backups( 9, :chronological ).last( 4 ).each do |backup|
           File.expects( :delete ).with( backup ).returns( 1 )
         end
@@ -33,8 +34,9 @@ describe Backup do
       end
       
       it "should not raise errors with zero current backups" do
+        FileUtils.expects( :mv ).times( 0 )
+        FileUtils.expects( :cp ).times( 1 )
         Dir.stubs( :glob ).returns( [] )
-        FileUtils.expects( :mv )
         File.expects( :delete ).times( 0 ).returns( 1 )
         @backup.run
       end
@@ -49,7 +51,7 @@ describe Backup do
         it "should sort them into chronological order" do
           @backup.backups.should == valid_backups( 9, :chronological )
         end
-      
+              
         it "should keep the 5 newest releases when creating a new backup" do
           @backup.keep_list.should == valid_backups( 5, :chronological )
         end
@@ -65,11 +67,18 @@ describe Backup do
           backup.keep_list.should == valid_backups( 4, :chronological )
         end
         
-        it "should not delete old files if told not to" do
-          backup = Backup.new( "ey_my.cnf", 4 )
+        it "should by default, copy the file not move" do
           FileUtils.expects( :mv ).times( 0 )
-          backup.expects( :delete_old_backups ).times( 0 )
-          backup.run( :move )
+          FileUtils.expects( :cp ).times( 1 )
+          File.expects( :delete ).times( 4 )
+          @backup.run
+        end
+        
+        it "should delete the original file if told to move instead of copy" do
+          FileUtils.expects( :mv ).times( 1 )
+          FileUtils.expects( :cp ).times( 0 )
+          File.expects( :delete ).times( 4 )
+          @backup.run( :move )
         end
       end
       

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: engineyard-backup
 version: !ruby/object:Gem::Version 
-  version: 0.0.3
+  version: 0.0.4
 platform: ruby
 authors: 
 - Jamie van Dyke
@@ -10,18 +10,10 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2008-05-21 00:00:00 -07:00
+date: 2008-06-11 00:00:00 -07:00
 default_executable: 
-dependencies: 
-- !ruby/object:Gem::Dependency 
-  name: mocha
-  version_requirement: 
-  version_requirements: !ruby/object:Gem::Requirement 
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
-        version: 0.5.6
-    version: 
+dependencies: []
+
 description: Backup is a Ruby library to ease the backup of files, keeping the latest X releases.  Just require it and go.
 email: jvandyke@engineyard.com
 executables: []