automan 2.3.5 → 2.3.6

data/spec/rds/snapshot_spec.rb

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

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: automan
 version: !ruby/object:Gem::Version
-  version: 2.3.5
+  version: 2.3.6
 platform: ruby
 authors:
 - Chris Chalfant
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-08-28 00:00:00.000000000 Z
+date: 2015-10-16 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -45,42 +45,42 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '3'
+        version: 2.12.2
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '3'
+        version: 2.12.2
 - !ruby/object:Gem::Dependency
   name: rspec-mocks
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '3'
+        version: 2.12.2
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '3'
+        version: 2.12.2
 - !ruby/object:Gem::Dependency
   name: rspec-expectations
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '3'
+        version: 2.12.1
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '3'
+        version: 2.12.1
 - !ruby/object:Gem::Dependency
   name: aws-sdk
   requirement: !ruby/object:Gem::Requirement
@@ -166,9 +166,6 @@ extensions: []
 extra_rdoc_files: []
 files:
 - ".gitignore"
-- ".ruby-gemset"
-- ".ruby-version"
-- ".travis.yml"
 - Gemfile
 - LICENSE.txt
 - README.md
@@ -207,7 +204,6 @@ files:
 - lib/automan/ec2/errors.rb
 - lib/automan/ec2/image.rb
 - lib/automan/ec2/instance.rb
-- lib/automan/elasticache/router.rb
 - lib/automan/mixins/aws_caller.rb
 - lib/automan/mixins/utils.rb
 - lib/automan/rds/errors.rb
@@ -232,17 +228,9 @@ files:
 - spec/cloudformation/uploader_spec.rb
 - spec/ec2/image_spec.rb
 - spec/ec2/instance_spec.rb
-- spec/elasticache/router_spec.rb
 - spec/mixins/aws_caller_spec.rb
 - spec/mixins/utils_spec.rb
 - spec/rds/snapshot_spec.rb
-- 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.tt
 homepage: ''
 licenses: []
 metadata: {}
@@ -262,7 +250,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.2.2
+rubygems_version: 2.4.8
 signing_key: 
 specification_version: 4
 summary: Automates common AWS ops
@@ -283,7 +271,6 @@ test_files:
 - spec/cloudformation/uploader_spec.rb
 - spec/ec2/image_spec.rb
 - spec/ec2/instance_spec.rb
-- spec/elasticache/router_spec.rb
 - spec/mixins/aws_caller_spec.rb
 - spec/mixins/utils_spec.rb
 - spec/rds/snapshot_spec.rb

data/.ruby-gemset

@@ -1 +0,0 @@
-automan

data/.ruby-version

@@ -1 +0,0 @@
-ruby-2.1.2

data/.travis.yml

@@ -1,5 +0,0 @@
-language: ruby
-rvm:
-  - "2.1.2"
-# uncomment this line if your project needs to run something other than `rake`:
-# script: bundle exec rspec spec

data/lib/automan/elasticache/router.rb

@@ -1,79 +0,0 @@
-require 'automan'
-
-module Automan::ElastiCache
-  class Router < Automan::Base
-
-    add_option :environment,
-    :hosted_zone_name,
-    :redis_host
-
-    def node_name_from_elasticache_environment(env)
-
-      opts = {
-        cache_cluster_id: "redis-#{env}",
-        show_cache_node_info: true
-      }
-
-      response = ec.client.describe_cache_clusters opts
-
-      unless response.successful?
-        raise RequestFailedError, "describe_cache_clusters failed: #{response.error}"
-      end
-
-      cluster=response.data[:cache_clusters]
-      if cluster.empty?
-        return nil
-      end
-
-      nodes=Hash[*cluster][:cache_nodes]
-      if nodes.empty?
-        return nil
-      end
-
-      endpoint=Hash[*nodes][:endpoint]
-      if endpoint.empty?
-        return nil
-      end
-
-      logger.info "found redis endpoint at #{endpoint[:address]}"
-      endpoint[:address]
-    end
-
-    # be sure alias_name ends in period
-    def update_dns_alias(zone_name, redis_cname, primary_endpoint)
-      zone = r53.hosted_zones.select {|z| z.name == zone_name}.first
-      rrset = zone.rrsets[redis_cname + '.', 'CNAME']
-
-      if rrset.exists?
-        logger.info "removing old record at #{redis_cname}"
-        rrset.delete
-      end
-
-      logger.info "creating record #{redis_cname} -> #{primary_endpoint}"
-      zone.rrsets.create(
-        redis_cname + '.',
-        'CNAME',
-        :ttl => 300,
-        :resource_records => [{:value => primary_endpoint}]
-        )
-    end
-
-    def run
-      log_options
-
-      logger.info "getting redis primary node name..."
-      primary_endpoint = node_name_from_elasticache_environment environment
-
-      if primary_endpoint.nil?
-        false
-      else
-        update_dns_alias(
-          hosted_zone_name,
-          redis_host,
-          primary_endpoint
-          )
-        true
-      end
-    end
-  end
-end

data/spec/elasticache/router_spec.rb

@@ -1,29 +0,0 @@
-require 'automan'
-
-describe Automan::ElastiCache::Router do
-  it { is_expected.to respond_to :run }
-  it { is_expected.to respond_to :environment }
-  it { is_expected.to respond_to :hosted_zone_name }
-  it { is_expected.to respond_to :redis_host }
-
-  describe '#run' do
-    subject() do
-      AWS.stub!
-      r = Automan::ElastiCache::Router.new
-      r.ec = AWS::ElastiCache::Client.new
-      r.environment = 'foo'
-      r.hosted_zone_name = 'foo.com'
-      r.redis_host       = 'redis.foo.com'
-      r.logger = Logger.new('/dev/null')
-      r
-    end
-
-    it "raises error if it never finds a name" do
-      allow(subject).to receive(:node_name_from_elasticache_environment).and_return(nil)
-      expect {
-        subject.run
-      }.not_to raise_error
-    end
-
-  end
-end

data/templates/stacker/.env.example

@@ -1,14 +0,0 @@
-#
-# example .env file
-# cp .env.example .env
-#
-# Set environment variables for all template parameters here.
-# This .env file is in gitignore to help keep application
-# secrets from leaking out into source code control.
-#
-export VPC_ID=vpc-foo
-export SUBNET_ID=subnet-foo
-export REMOTE_ACCESS_SG=sg-foo
-export KEYPAIR_NAME=fookey
-export INSTANCE_TYPE=m3.medium
-export IMAGE_ID=ami-foo

data/templates/stacker/.gitignore

@@ -1,2 +0,0 @@
-.env
-*.json