ebs_snapper 0.0.9 → 0.0.10

checksums.yaml

@@ -0,0 +1,7 @@
+---
+SHA1:
+  metadata.gz: cb6f5bd627a4e313748244d4b636a7cf304123b5
+  data.tar.gz: a7e27644727f54cfde5dc9068df90141319f0371
+SHA512:
+  metadata.gz: f507337479c0be1df17d56e3bc922d004422ac89b3e25a3a1522c46f6ab4c511d532de431b61b9fc21080f08656e99aaa255dbb4b9a07f47b3533a8e1c7807c5
+  data.tar.gz: c6d1d8a4c14526bbbf04a272cf2eb5c4f8846467c420172c847ea337e45be660efe2a2f780da70e4800af1e45025683690dc73609a9681082af37d7efb1897c7

data/ebs_snapper.gemspec

@@ -15,11 +15,14 @@ Gem::Specification.new do |s|
   s.name          = "ebs_snapper"
   s.require_paths = ["lib"]
   s.version       = EbsSnapper::VERSION
-  
-  s.add_runtime_dependency "aws-sdk", "~> 1.31.3"
-  
+
+#  s.add_runtime_dependency "aws-sdk", "~> 2.0"
+  s.add_runtime_dependency "aws-sdk", '~> 1.57.0'
+  s.add_runtime_dependency "aws-sdk-v1"
+
   s.add_development_dependency "rake"
   s.add_development_dependency "rspec"
+  s.add_development_dependency "rspec-mocks" 
   s.add_development_dependency "fakeweb"
-  
+
 end

data/lib/ebs_snapper/version.rb

@@ -1,11 +1,11 @@
 # Copyright 2012 NeuStar, Inc. All rights reserved.
-# 
+#
 # Licensed under the Apache License, Version 2.0 (the "License");
 # you may not use this file except in compliance with the License.
 # You may obtain a copy of the License at
-# 
+#
 #     http://www.apache.org/licenses/LICENSE-2.0
-# 
+#
 # Unless required by applicable law or agreed to in writing, software
 # distributed under the License is distributed on an "AS IS" BASIS,
 # WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
@@ -13,5 +13,5 @@
 # limitations under the License.
 
 module EbsSnapper
-  VERSION = "0.0.9"
+  VERSION = "0.0.10"
 end

data/spec/lib/ebs_spec.rb

@@ -1,11 +1,11 @@
 # Copyright 2012 NeuStar, Inc. All rights reserved.
-# 
+#
 # Licensed under the Apache License, Version 2.0 (the "License");
 # you may not use this file except in compliance with the License.
 # You may obtain a copy of the License at
-# 
+#
 #     http://www.apache.org/licenses/LICENSE-2.0
-# 
+#
 # Unless required by applicable law or agreed to in writing, software
 # distributed under the License is distributed on an "AS IS" BASIS,
 # WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
@@ -16,106 +16,106 @@ require 'spec_helper'
 require 'fakeweb'
 require 'ostruct'
 
-describe EbsSnapper::Ebs do 
+describe EbsSnapper::Ebs do
   DEFAULT_TAG_NAME = EbsSnapper::Ebs::DEFAULT_TAG_NAME
-  
-  
+
+
   it "should run purge_old_snapshots in dry mode" do
     ebs = EbsSnapper::Ebs.new({}, true)
     ttl = EbsSnapper::Ebs::TTL.new("1.day") # 1 day
     region = OpenStruct.new
-    
+
     snapshot_old = OpenStruct.new
     snapshot_old.status = :complete
     snapshot_old.tags = {DEFAULT_TAG_NAME => Time.now.utc.to_i - (86400 * 2)}
-    snapshot_old.should_not_receive(:delete)
-    
+    expect(snapshot_old).to_not receive(:delete)
+
     region.snapshots = [snapshot_old]
     region.snapshots.stub(:filter).and_return(region.snapshots)
-    
+
     ebs.purge_old_snapshots(ttl, region, 2)
   end
-  
+
   it "should run snapshot_volume in dry mode" do
     ebs = EbsSnapper::Ebs.new({}, true)
-    
+
     region = OpenStruct.new
     region.tags = []
     region.id = '999'
-    
+
     volume = OpenStruct.new
     volume.should_not_receive(:create_snapshot)
     region.volumes = {3 => volume}
-    
-    ebs.snapshot_volume(region, 3).should == true
+
+    expect(ebs.snapshot_volume(region, 3)).to eql(true)
   end
-  
+
   it "should find tagged volumes in a region" do
     ebs = EbsSnapper::Ebs.new
-    
+
     tag = OpenStruct.new
     tag.resource = OpenStruct.new(:id => 1)
-    
+
     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
+    expect(vols.size).to eql(1)
+
+    expect(vols[0][:region].id).to eql(region.id)
+    expect(vols[0][:volume_id]).to be == tag.resource.id
+    expect(vols[0][:ttl]).to_not be == nil
 
-    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
+    expect(vols[0][:ttl].cut_off).to be > span_begin
+    expect(vols[0][:ttl].cut_off).to be < 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
     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
     ttl = EbsSnapper::Ebs::TTL.new("1.day") # 1 day
     ttl.purge?(Time.now.utc.to_i - (3600)).should == false
@@ -124,19 +124,19 @@ describe EbsSnapper::Ebs do
     # we give it 1 hr around the timestamp
     ttl.purge?(Time.now.utc.to_i - 86400).should == false
   end
-  
+
   it "should convert day ttls to seconds" do
     ttl = EbsSnapper::Ebs::TTL.new("1.day") # 1 day
     ttl.convert_to_seconds("1.day").should == 86400 + 3600
     cut_off_10 = ttl.convert_to_seconds("10.days")
-    cut_off_10.should == (86400 * 10) + 3600  
+    cut_off_10.should == (86400 * 10) + 3600
   end
-  
+
   it "should convert hour ttls to seconds" do
-    ttl = EbsSnapper::Ebs::TTL.new() 
+    ttl = EbsSnapper::Ebs::TTL.new()
     ttl.convert_to_seconds("3.hours").should == (3600 * 3)
   end
-  
+
   it "should set default ttl to seconds" do
     ten_days_secs = (86400 * 10) + 3600
     between_a = Time.now.utc.to_i - ten_days_secs
@@ -145,69 +145,69 @@ describe EbsSnapper::Ebs do
     between_b = tm - ten_days_secs
     ttl.cut_off.should >= between_a
     ttl.cut_off.should <= between_b
-    
+
     ttl.convert_to_seconds("asfljasdfjl").should == ten_days_secs
   end
-  
+
   it "should snapshot a volume" do
-    
+
     ebs = EbsSnapper::Ebs.new
-    
+
     tag = OpenStruct.new
     tag.resource = OpenStruct.new(:id => 1)
-    
+
     tags = [tag]
     tags.stub(:filter).and_return(tags)
-    
+
     region = OpenStruct.new
     region.tags = tags
     region.id = '999'
-    
+
     snapshot = Object.new
-    snapshot.should_receive(:tag).with(DEFAULT_TAG_NAME, 
-      hash_including(:value => RSpec::Mocks::ArgumentMatchers::RegexpMatcher.new(/^\d+/))) {true}
-      
+    expect(snapshot).to receive(:tag).with(DEFAULT_TAG_NAME,
+      hash_including(:value => match(/^\d+/))) {true}
+
     volume = OpenStruct.new
-    volume.should_receive(:create_snapshot) {snapshot}
+    expect(volume).to receive(:create_snapshot) {snapshot}
     region.volumes = {3 => volume}
     ebs.snapshot_volume(region, 3).should == true
 
     # id 1 is not found (nil)
     ebs.snapshot_volume(region, 1).should == true
   end
-  
+
   it "should purge old snapshots" do
     ebs = EbsSnapper::Ebs.new
     ttl = EbsSnapper::Ebs::TTL.new("1.day") # 1 day
     region = OpenStruct.new
-    
+
     snapshot_old = OpenStruct.new
     snapshot_old.status = :complete
     snapshot_old.tags = {DEFAULT_TAG_NAME => Time.now.utc.to_i - (86400 * 2)}
-    snapshot_old.should_receive(:delete)
+    expect(snapshot_old).to receive(:delete)
 
     snapshot_old_error = OpenStruct.new
     snapshot_old_error.status = :error
     snapshot_old_error.tags = {DEFAULT_TAG_NAME => Time.now.utc.to_i - (86400 * 2)}
-    snapshot_old_error.should_receive(:delete)
-    
-    
+    expect(snapshot_old_error).to receive(:delete)
+
+
     snapshot_new = OpenStruct.new
     snapshot_new.status = :complete
     snapshot_new.tags = {DEFAULT_TAG_NAME => Time.now.utc.to_i - (3600 * 3)}
-    snapshot_new.should_receive(:delete).never
-    
+    expect(snapshot_new).to_not receive(:delete)
+
     snapshot_pending = OpenStruct.new
     snapshot_pending.status = :pending
     snapshot_pending.tags = {DEFAULT_TAG_NAME => Time.now.utc.to_i - (86400 * 3)}
-    snapshot_pending.should_receive(:delete).never
-    
+    expect(snapshot_pending).to_not receive(:delete)
+
     region.snapshots = [snapshot_old, snapshot_new, snapshot_pending, snapshot_old_error]
     region.snapshots.stub(:filter).and_return(region.snapshots)
-    
+
     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([{
@@ -215,9 +215,9 @@ describe EbsSnapper::Ebs do
       :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()
+
+    expect(ebs).to receive(:snapshot_volume).with(anything(), anything()).once
+    expect(ebs).to receive(:purge_old_snapshots).with(anything(), anything(), anything()).once
 
     ebs.snapshot_and_purge()
   end

metadata

@@ -1,78 +1,97 @@
 --- !ruby/object:Gem::Specification
 name: ebs_snapper
 version: !ruby/object:Gem::Version
-  version: 0.0.9
-  prerelease: 
+  version: 0.0.10
 platform: ruby
 authors:
 - ultradns
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-01-14 00:00:00.000000000 Z
+date: 2014-10-24 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: aws-sdk
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: 1.31.3
+        version: 1.57.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: 1.31.3
+        version: 1.57.0
+- !ruby/object:Gem::Dependency
+  name: aws-sdk-v1
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: rake
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
   name: rspec
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+- !ruby/object:Gem::Dependency
+  name: rspec-mocks
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
   name: fakeweb
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
 description: Manage snapshots of EBS volumes
@@ -83,7 +102,7 @@ executables:
 extensions: []
 extra_rdoc_files: []
 files:
-- .gitignore
+- ".gitignore"
 - Gemfile
 - LICENSE
 - README.md
@@ -99,33 +118,26 @@ files:
 - spec/spec_helper.rb
 homepage: https://github.com/ultradns/ebs_snapper
 licenses: []
+metadata: {}
 post_install_message: 
 rdoc_options: []
 require_paths:
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement
-  none: false
   requirements:
-  - - ! '>='
+  - - ">="
     - !ruby/object:Gem::Version
       version: '0'
-      segments:
-      - 0
-      hash: 1635891677389619037
 required_rubygems_version: !ruby/object:Gem::Requirement
-  none: false
   requirements:
-  - - ! '>='
+  - - ">="
     - !ruby/object:Gem::Version
       version: '0'
-      segments:
-      - 0
-      hash: 1635891677389619037
 requirements: []
 rubyforge_project: 
-rubygems_version: 1.8.24
+rubygems_version: 2.2.2
 signing_key: 
-specification_version: 3
+specification_version: 4
 summary: Manage snapshots of EBS volumes
 test_files:
 - spec/lib/ebs_spec.rb