ebs_snapper 0.0.3 → 0.0.4

data/lib/ebs_snapper/ebs.rb

@@ -42,8 +42,13 @@ class EbsSnapper::Ebs
     each_region do |r|
       r.tags.filter('resource-type', 'volume').filter('key', @tag_name).each do |tag|
         # if the tag exists, it's using the default retention (TTL)
+        ttl_value = @retain
+        if tag.value != nil && !tag.value.strip.empty?
+          ttl_value = tag.value.strip
+        end
+        
         volumes << {
-          :ttl => TTL.new(@retain),
+          :ttl => TTL.new(ttl_value),
           :region => r,
           :volume_id => tag.resource.id # volume id
         }

data/lib/ebs_snapper/version.rb

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

data/spec/lib/ebs_spec.rb

@@ -40,6 +40,42 @@ describe EbsSnapper::Ebs do
     vols[0][:region].id.should == region.id
     vols[0][:volume_id].should == tag.resource.id
     vols[0][:ttl].should_not == nil
+    
+    two_days_secs = EbsSnapper::Ebs::TTL.new().convert_to_seconds(0).to_i
+    span_begin = (Time.now.utc.to_i - two_days_secs) - 10
+    span_end = (Time.now.utc.to_i - two_days_secs) + 1
+    vols[0][:ttl].cut_off.should > span_begin
+    vols[0][:ttl].cut_off.should < span_end
+  end
+  
+  it "should use retention from the tag in a volume in a region" do
+    ebs = EbsSnapper::Ebs.new
+    
+    tag = OpenStruct.new
+    tag.resource = OpenStruct.new(:id => 1)
+    tag.value = "2.days"
+    
+    tags = [tag]
+    tags.stub(:filter).and_return(tags)
+    
+    region = OpenStruct.new
+    region.tags = tags
+    region.id = '999'
+    
+    ebs.stub(:each_region).and_yield(region)
+    
+    vols = ebs.tagged_volumes
+    vols.size.should == 1
+
+    vols[0][:region].id.should == region.id
+    vols[0][:volume_id].should == tag.resource.id
+    vols[0][:ttl].should_not == nil
+    
+    two_days_secs = EbsSnapper::Ebs::TTL.new().convert_to_seconds('2.days').to_i
+    span_begin = (Time.now.utc.to_i - two_days_secs) - 10
+    span_end = (Time.now.utc.to_i - two_days_secs) + 1
+    vols[0][:ttl].cut_off.should > span_begin
+    vols[0][:ttl].cut_off.should < span_end
   end
   
   it "should pruge old timestamps" do

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: ebs_snapper
 version: !ruby/object:Gem::Version
-  version: 0.0.3
+  version: 0.0.4
   prerelease: 
 platform: ruby
 authors:
@@ -13,7 +13,7 @@ date: 2012-07-23 00:00:00.000000000Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: aws-sdk
-  requirement: &2157108240 !ruby/object:Gem::Requirement
+  requirement: &2153739880 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -21,10 +21,10 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *2157108240
+  version_requirements: *2153739880
 - !ruby/object:Gem::Dependency
   name: rake
-  requirement: &2157106140 !ruby/object:Gem::Requirement
+  requirement: &2153739420 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -32,10 +32,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *2157106140
+  version_requirements: *2153739420
 - !ruby/object:Gem::Dependency
   name: rspec
-  requirement: &2157104840 !ruby/object:Gem::Requirement
+  requirement: &2153738940 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -43,10 +43,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *2157104840
+  version_requirements: *2153738940
 - !ruby/object:Gem::Dependency
   name: fakeweb
-  requirement: &2157103500 !ruby/object:Gem::Requirement
+  requirement: &2153738480 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -54,7 +54,7 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *2157103500
+  version_requirements: *2153738480
 description: Manage snapshots of EBS volumes
 email:
 - ultradns@neustar.biz