automan 2.3.1 → 2.3.2

data/spec/mixins/utils_spec.rb

@@ -1,44 +1,43 @@
 require 'automan/mixins/utils'
 
 describe Automan::Mixins::Utils do
-  let(:s) { (Class.new { include Automan::Mixins::Utils }).new }
+  subject() { (Class.new { include Automan::Mixins::Utils }).new }
 
   it "adds String#underscore" do
-    s = String.new
-    s.should respond_to :underscore
+    expect(String.new).to respond_to :underscore
   end
 
   describe "String#underscore" do
     it "underscore's like a boss" do
-      "Namespace".underscore.should eq "namespace"
-      "OptionName".underscore.should eq "option_name"
-      "Value".underscore.should eq "value"
+      expect("Namespace".underscore).to eq "namespace"
+      expect("OptionName".underscore).to eq "option_name"
+      expect("Value".underscore).to eq "value"
     end
   end
 
-  it { s.should respond_to :region_from_az }
+  it { is_expected.to respond_to :region_from_az }
 
   it "returns az properly" do
-    s.region_from_az("us-east-1a").should eq 'us-east-1'
-    s.region_from_az("us-east-1b").should eq 'us-east-1'
-    s.region_from_az("us-east-1c").should eq 'us-east-1'
-    s.region_from_az("us-east-1d").should eq 'us-east-1'
-    s.region_from_az("ap-northeast-1a").should eq 'ap-northeast-1'
-    s.region_from_az("ap-northeast-1b").should eq 'ap-northeast-1'
-    s.region_from_az("ap-northeast-1c").should eq 'ap-northeast-1'
-    s.region_from_az("sa-east-1a").should eq 'sa-east-1'
-    s.region_from_az("sa-east-1b").should eq 'sa-east-1'
-    s.region_from_az("ap-southeast-1a").should eq 'ap-southeast-1'
-    s.region_from_az("ap-southeast-1b").should eq 'ap-southeast-1'
-    s.region_from_az("ap-southeast-2a").should eq 'ap-southeast-2'
-    s.region_from_az("ap-southeast-2b").should eq 'ap-southeast-2'
-    s.region_from_az("us-west-2a").should eq 'us-west-2'
-    s.region_from_az("us-west-2b").should eq 'us-west-2'
-    s.region_from_az("us-west-2c").should eq 'us-west-2'
-    s.region_from_az("us-west-1a").should eq 'us-west-1'
-    s.region_from_az("us-west-1c").should eq 'us-west-1'
-    s.region_from_az("eu-west-1a").should eq 'eu-west-1'
-    s.region_from_az("eu-west-1b").should eq 'eu-west-1'
-    s.region_from_az("eu-west-1c").should eq 'eu-west-1'
+    expect(subject.region_from_az("us-east-1a")).to eq 'us-east-1'
+    expect(subject.region_from_az("us-east-1b")).to eq 'us-east-1'
+    expect(subject.region_from_az("us-east-1c")).to eq 'us-east-1'
+    expect(subject.region_from_az("us-east-1d")).to eq 'us-east-1'
+    expect(subject.region_from_az("ap-northeast-1a")).to eq 'ap-northeast-1'
+    expect(subject.region_from_az("ap-northeast-1b")).to eq 'ap-northeast-1'
+    expect(subject.region_from_az("ap-northeast-1c")).to eq 'ap-northeast-1'
+    expect(subject.region_from_az("sa-east-1a")).to eq 'sa-east-1'
+    expect(subject.region_from_az("sa-east-1b")).to eq 'sa-east-1'
+    expect(subject.region_from_az("ap-southeast-1a")).to eq 'ap-southeast-1'
+    expect(subject.region_from_az("ap-southeast-1b")).to eq 'ap-southeast-1'
+    expect(subject.region_from_az("ap-southeast-2a")).to eq 'ap-southeast-2'
+    expect(subject.region_from_az("ap-southeast-2b")).to eq 'ap-southeast-2'
+    expect(subject.region_from_az("us-west-2a")).to eq 'us-west-2'
+    expect(subject.region_from_az("us-west-2b")).to eq 'us-west-2'
+    expect(subject.region_from_az("us-west-2c")).to eq 'us-west-2'
+    expect(subject.region_from_az("us-west-1a")).to eq 'us-west-1'
+    expect(subject.region_from_az("us-west-1c")).to eq 'us-west-1'
+    expect(subject.region_from_az("eu-west-1a")).to eq 'eu-west-1'
+    expect(subject.region_from_az("eu-west-1b")).to eq 'eu-west-1'
+    expect(subject.region_from_az("eu-west-1c")).to eq 'eu-west-1'
   end
 end

data/spec/rds/snapshot_spec.rb

@@ -4,35 +4,35 @@ require 'logger'
 ENV['MAX_SNAPSHOTS'] = "50"
 
 describe Automan::RDS::Snapshot do
-  it { should respond_to :rds }
-  it { should respond_to :create }
-  it { should respond_to :delete }
-  it { should respond_to :prune }
-  it { should respond_to :latest }
-  it { should respond_to :default_snapshot_name }
+  it { is_expected.to respond_to :rds }
+  it { is_expected.to respond_to :create }
+  it { is_expected.to respond_to :delete }
+  it { is_expected.to respond_to :prune }
+  it { is_expected.to respond_to :latest }
+  it { is_expected.to respond_to :default_snapshot_name }
 
   describe '#default_snapshot_name' do
-    subject(:s) do
+    subject() do
       AWS.stub!
       s = Automan::RDS::Snapshot.new
       s.logger = Logger.new('/dev/null')
-      s.stub(:db_environment).and_return('dev1')
+      allow(s).to receive(:db_environment).and_return('dev1')
       s
     end
 
     it "never returns nil" do
-      s.default_snapshot_name('somedb').should_not be_nil
+      expect(subject.default_snapshot_name('somedb')).to_not be_nil
     end
 
     it "returns environment dash time string" do
-      name = s.default_snapshot_name('somedb')
-      name.should match /^dev1-(\d{4})-(\d{2})-(\d{2})T(\d{2})-(\d{2})/
+      name = subject.default_snapshot_name('somedb')
+      expect(name).to match /^dev1-(\d{4})-(\d{2})-(\d{2})T(\d{2})-(\d{2})/
     end
 
   end
 
   describe '#create' do
-    subject(:s) do
+    subject() do
       AWS.stub!
       s = Automan::RDS::Snapshot.new
       s.logger = Logger.new('/dev/null')
@@ -40,56 +40,56 @@ describe Automan::RDS::Snapshot do
     end
 
     it "raises error if could not find database" do
-      s.stub(:find_db).and_return(nil)
+      allow(subject).to receive(:find_db).and_return(nil)
       expect {
-        s.create
+        subject.create
       }.to raise_error Automan::RDS::DatabaseDoesNotExistError
     end
 
     it "raises error if RDS says database does not exist" do
       db = double(:db)
-      db.stub(:exists?).and_return(false)
-      s.stub(:find_db).and_return(db)
+      allow(db).to receive(:exists?).and_return(false)
+      allow(subject).to receive(:find_db).and_return(db)
 
       expect {
-        s.create
+        subject.create
       }.to raise_error Automan::RDS::DatabaseDoesNotExistError
     end
 
   end
 
   describe '#tagged_can_prune?' do
-    subject(:s) do
+    subject() do
       AWS.stub!
       s = Automan::RDS::Snapshot.new
       s.logger = Logger.new('/dev/null')
-      s.stub(:snapshot_arn)
+      allow(s).to receive(:snapshot_arn)
       s
     end
 
     it 'returns true if snapshot is tagged with CanPrune=yes' do
-      s.stub(:tags).and_return( {'CanPrune' => 'yes'} )
-      s.tagged_can_prune?( double() ).should be_true
+      allow(subject).to receive(:tags).and_return( {'CanPrune' => 'yes'} )
+      expect(subject.tagged_can_prune?( double() )).to be_truthy
     end
 
     it 'returns false if snapshot is missing CanPrune tag' do
-      s.stub(:tags).and_return( {} )
-      s.tagged_can_prune?( double() ).should be_false
+      allow(subject).to receive(:tags).and_return( {} )
+      expect(subject.tagged_can_prune?( double() )).to be_falsey
     end
 
     it 'returns false if snapshot is tagged with CanPrune=nil' do
-      s.stub(:tags).and_return( {'CanPrune' => nil} )
-      s.tagged_can_prune?( double() ).should be_false
+      allow(subject).to receive(:tags).and_return( {'CanPrune' => nil} )
+      expect(subject.tagged_can_prune?( double() )).to be_falsey
     end
 
     it 'returns false if snapshot is tagged with CanPrune=foo' do
-      s.stub(:tags).and_return( {'CanPrune' => 'foo'} )
-      s.tagged_can_prune?( double() ).should be_false
+      allow(subject).to receive(:tags).and_return( {'CanPrune' => 'foo'} )
+      expect(subject.tagged_can_prune?( double() )).to be_falsey
     end
   end
 
   describe '#available?' do
-    subject(:s) do
+    subject() do
       AWS.stub!
       s = Automan::RDS::Snapshot.new
       s.logger = Logger.new('/dev/null')
@@ -97,21 +97,19 @@ describe Automan::RDS::Snapshot do
     end
 
     it 'returns true if status is "available"' do
-      snap = double(:snap)
-      snap.stub(:status).and_return('available')
-      s.available?(snap).should be_true
+      snap = double(status: 'available')
+      expect(subject.available?(snap)).to be_truthy
     end
 
     it 'returns false if status is foo' do
-      snap = double(:snap)
-      snap.stub(:status).and_return('foo')
-      s.available?(snap).should be_false
+      snap = double(status: 'foo')
+      expect(subject.available?(snap)).to be_falsey
     end
   end
 
   describe '#manual?' do
     let(:snap) { double }
-    subject(:s) do
+    subject() do
       AWS.stub!
       s = Automan::RDS::Snapshot.new
       s.logger = Logger.new('/dev/null')
@@ -119,34 +117,34 @@ describe Automan::RDS::Snapshot do
     end
 
     it 'returns true if type is "manual"' do
-      snap.stub(:snapshot_type).and_return('manual')
-      s.manual?(snap).should be_true
+      allow(snap).to receive(:snapshot_type).and_return('manual')
+      expect(subject.manual?(snap)).to be_truthy
     end
 
     it 'returns false if type is foo' do
-      snap.stub(:snapshot_type).and_return('foo')
-      s.manual?(snap).should be_false
+      allow(snap).to receive(:snapshot_type).and_return('foo')
+      expect(subject.manual?(snap)).to be_falsey
     end
   end
 
   describe '#prunable_snapshots' do
     let(:snap) { double }
-    subject(:s) do
+    subject() do
       AWS.stub!
       s = Automan::RDS::Snapshot.new
       s.logger = Logger.new('/dev/null')
-      s.stub(:get_all_snapshots).and_return( [ snap ] )
+      allow(s).to receive(:get_all_snapshots).and_return( [ snap ] )
       s
     end
 
     it 'includes snapshots which can be pruned' do
-      s.stub(:can_prune?).and_return(true)
-      s.prunable_snapshots.should include(snap)
+      allow(subject).to receive(:can_prune?).and_return(true)
+      expect(subject.prunable_snapshots).to include(snap)
     end
 
     it 'excludes snapshots which should not be pruned' do
-      s.stub(:can_prune?).and_return(false)
-      s.prunable_snapshots.should_not include(snap)
+      allow(subject).to receive(:can_prune?).and_return(false)
+      expect(subject.prunable_snapshots).to_not include(snap)
     end
   end
 end

data/templates/stacker/.ruby-version

@@ -0,0 +1 @@
+2.2.2

data/templates/stacker/bin/{launch_%app_name%.sh → launch_%app_name%.sh.tt}

@@ -2,11 +2,11 @@
 # To set template parameters, add the -p options
 # to the end of the stacker command:
 #
-# stacker launch -n <%= app_name %> -t <%= app_name %>.json --disable-rollback \
+# stacker launch -n <%= @app_name %> -t <%= @app_name %>.json --disable-rollback \
 # -p VpcId:$VPC_ID \
 # SubnetId:$SUBNET_ID \
 # RemoteAccessSG:$REMOTE_ACCESS_SG \
 # KeyPairName:$KEYPAIR_NAME \
 # InstanceType:$INSTANCE_TYPE \
 # ImageId:$IMAGE_ID
-stacker launch -n <%= app_name %> -t <%= app_name %>.json --disable-rollback
+stacker launch -n <%= @app_name %> -t <%= @app_name %>.json --disable-rollback

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: automan
 version: !ruby/object:Gem::Version
-  version: 2.3.1
+  version: 2.3.2
 platform: ruby
 authors:
 - Chris Chalfant
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-06-10 00:00:00.000000000 Z
+date: 2015-06-19 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -45,42 +45,42 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 2.12.2
+        version: '3'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 2.12.2
+        version: '3'
 - !ruby/object:Gem::Dependency
   name: rspec-mocks
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 2.12.2
+        version: '3'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 2.12.2
+        version: '3'
 - !ruby/object:Gem::Dependency
   name: rspec-expectations
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 2.12.1
+        version: '3'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 2.12.1
+        version: '3'
 - !ruby/object:Gem::Dependency
   name: aws-sdk
   requirement: !ruby/object:Gem::Requirement
@@ -166,7 +166,8 @@ extensions: []
 extra_rdoc_files: []
 files:
 - ".gitignore"
-- ".rvmrc"
+- ".ruby-gemset"
+- ".ruby-version"
 - ".travis.yml"
 - Gemfile
 - LICENSE.txt
@@ -236,9 +237,10 @@ files:
 - templates/stacker/.env.example
 - templates/stacker/.gitignore
 - templates/stacker/.ruby-gemset.tt
+- templates/stacker/.ruby-version
 - templates/stacker/Gemfile
 - templates/stacker/bin/%app_name%.tt
-- templates/stacker/bin/launch_%app_name%.sh
+- templates/stacker/bin/launch_%app_name%.sh.tt
 homepage: ''
 licenses: []
 metadata: {}

data/.rvmrc

@@ -1 +0,0 @@
-rvm --create use ruby-2.1.2@automan