ebs_snapper 0.0.2 → 0.0.3

data/README.md

@@ -1,6 +1,7 @@
 # EbsSnapper
 
-Take snapshots of EBS volumes and keep them for a period of time.  We use it take nightly snapshots and retain them for a several days before they are purged.
+Take snapshots of EBS volumes and keep them for a period of time.  
+We use this to take nightly snapshots and retain them for several days before being purged.
 
 
 

data/lib/ebs_snapper/ebs.rb

@@ -32,7 +32,7 @@ class EbsSnapper::Ebs
     # now snapshot the list
     tagged_volumes.each do |vol_info|
       snapshot_volume(vol_info[:region], vol_info[:volume_id])
-      purge_old_snapshots(vol_info[:region], vol_info[:volume_id])
+      purge_old_snapshots(vol_info[:ttl], vol_info[:region], vol_info[:volume_id])
     end
   end
   
@@ -69,7 +69,7 @@ class EbsSnapper::Ebs
     region.snapshots.filter('volume-id', vol_id).filter('tag-key', @tag_name).each do |snapshot|
       unless snapshot.status == :pending
         ts = snapshot.tags[@tag_name]
-        if ts > 0 && ttl.purge?(ts)
+        if ttl.purge?(ts)
           @logger.info {"Purging #{vol_id} snapshot: #{snapshot}"}
           snapshot.delete
         end
@@ -98,7 +98,8 @@ class EbsSnapper::Ebs
     end
     
     def purge?(timestamp)
-      timestamp < @cut_off
+      ts = timestamp.to_i
+      ts > 0 && (ts < @cut_off)
     end
     
     def convert_to_seconds(ttl)

data/lib/ebs_snapper/version.rb

@@ -13,5 +13,5 @@
 # limitations under the License.
 
 module EbsSnapper
-  VERSION = "0.0.2"
+  VERSION = "0.0.3"
 end

data/spec/lib/ebs_spec.rb

@@ -46,6 +46,7 @@ describe EbsSnapper::Ebs do
     ttl = EbsSnapper::Ebs::TTL.new("1.day") # 1 day
     ttl.purge?(Time.now.utc.to_i - (86400 * 3)).should == true
     ttl.purge?(Time.now.utc.to_i - (86400 + 3601)).should == true
+    ttl.purge?("#{Time.now.utc.to_i - (86400 + 3601)}").should == true
   end
   
   it "shouldn't pruge new timestamps" do
@@ -140,4 +141,17 @@ describe EbsSnapper::Ebs do
     ebs.purge_old_snapshots(ttl, region, 2)
   end
   
+  it "should flow through snapshot and purge" do
+    ebs = EbsSnapper::Ebs.new
+    ebs.stub(:tagged_volumes).and_return([{
+      :ttl => EbsSnapper::Ebs::TTL.new("1.day"),
+      :region => 'us-east-1',
+      :volume_id => 1
+    }])
+    
+    ebs.should_receive(:snapshot_volume).with(anything(), anything()).once.and_return()
+    ebs.should_receive(:purge_old_snapshots).with(anything(), anything(), anything()).once.and_return()
+
+    ebs.snapshot_and_purge()
+  end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: ebs_snapper
 version: !ruby/object:Gem::Version
-  version: 0.0.2
+  version: 0.0.3
   prerelease: 
 platform: ruby
 authors:
@@ -9,11 +9,11 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-06-21 00:00:00.000000000Z
+date: 2012-07-23 00:00:00.000000000Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: aws-sdk
-  requirement: &2152830900 !ruby/object:Gem::Requirement
+  requirement: &2157108240 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -21,10 +21,10 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *2152830900
+  version_requirements: *2157108240
 - !ruby/object:Gem::Dependency
   name: rake
-  requirement: &2152830480 !ruby/object:Gem::Requirement
+  requirement: &2157106140 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -32,10 +32,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *2152830480
+  version_requirements: *2157106140
 - !ruby/object:Gem::Dependency
   name: rspec
-  requirement: &2152830060 !ruby/object:Gem::Requirement
+  requirement: &2157104840 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -43,10 +43,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *2152830060
+  version_requirements: *2157104840
 - !ruby/object:Gem::Dependency
   name: fakeweb
-  requirement: &2152829640 !ruby/object:Gem::Requirement
+  requirement: &2157103500 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -54,7 +54,7 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *2152829640
+  version_requirements: *2157103500
 description: Manage snapshots of EBS volumes
 email:
 - ultradns@neustar.biz