automan 2.3.5 → 2.3.6

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 01c86c545002df8eeab70eaa5ed9d85383f7e5b3
-  data.tar.gz: 3db10a2896e2200b1e11c036036e9c83e44909cc
+  metadata.gz: ba8bf0ad1d6385060e00b45ab199391f2520c179
+  data.tar.gz: 54e997202865573a99b4b21005869e79a3374977
 SHA512:
-  metadata.gz: f39d57e90b286ab40593baf3a80230f09fd8cad9b7a1ffd47b8562accb15d1a630d694f1d8ad1593732d97c4a7f452cd441beb1684d882a7c2d0028193f4a842
-  data.tar.gz: d00e9dd6958af11f067eeb8d3fb6a0ba3d6190640b605591a04433c56a7b671fc51778ad166243ce1d19f52a201076f93f560e84c3b54a691c1f17453ca0b7d2
+  metadata.gz: af5c94a4677e630eca5ef7e9d2d4fb47b306b7e7dec0ffaa23246f57009855947b6df6378b31748cb671a7110ed1051b7bbd1b76ac6be857e6f2675f38755713
+  data.tar.gz: a5ca5a4b040037645bd92541bc4e3c1c6800ca6faa3539b28f6cdd7854b192f2c7159a91a3afc39f62eaac25d37f5f52c450c7d45a700a3152f51e1c58362b91

data/Rakefile

@@ -1,6 +1 @@
 require "bundler/gem_tasks"
-require 'rspec/core/rake_task'
-
-RSpec::Core::RakeTask.new(:spec)
-
-task :default => :spec

data/automan.gemspec

@@ -19,9 +19,9 @@ Gem::Specification.new do |spec|
 
   spec.add_development_dependency "bundler", "~> 1.3"
   spec.add_development_dependency "rake"
-  spec.add_development_dependency "rspec-core", "~> 3"
-  spec.add_development_dependency "rspec-mocks", "~> 3"
-  spec.add_development_dependency "rspec-expectations", "~> 3"
+  spec.add_development_dependency "rspec-core", "~> 2.12.2"
+  spec.add_development_dependency "rspec-mocks", "~> 2.12.2"
+  spec.add_development_dependency "rspec-expectations", "~> 2.12.1"
   spec.add_dependency "aws-sdk", "< 2.0"
   spec.add_dependency "thor"
   spec.add_dependency "json"

data/lib/automan.rb

@@ -19,7 +19,6 @@ require 'automan/cloudformation/terminator'
 require 'automan/cloudformation/replacer'
 require 'automan/cloudformation/uploader'
 require 'automan/cloudformation/errors'
-require 'automan/elasticache/router'
 require 'automan/rds/snapshot'
 require 'automan/rds/errors'
 require 'automan/ec2/instance'

data/lib/automan/base.rb

@@ -12,9 +12,11 @@ module Automan
 
     include Automan::Mixins::AwsCaller
 
-    def initialize(options={})
+    def initialize(options=nil)
       $stdout.sync = true
       @logger = Logger.new(STDOUT)
+      @log_aws_calls = false
+      #@wait = Wait.new(rescuer: WaitRescuer.new, logger: @logger)
 
       if !options.nil?
         options.each_pair do |k,v|
@@ -22,12 +24,6 @@ module Automan
           send(accessor, v) if respond_to? accessor
         end
       end
-
-      aws_options = {}
-      if options[:log_aws]
-        aws_options[:logger] = @logger
-      end
-      configure_aws(aws_options)
     end
 
     def self.add_option(*args)

data/lib/automan/beanstalk/deployer.rb

@@ -18,7 +18,7 @@ module Automan::Beanstalk
 
     include Automan::Mixins::Utils
 
-    def initialize(options={})
+    def initialize(options=nil)
       @number_to_keep = 0
       super
     end

data/lib/automan/beanstalk/package.rb

@@ -13,7 +13,7 @@ module Automan::Beanstalk
 
       # verify local package exists
       unless File.exists? source
-        raise MissingPackageFileError, "package file #{source} does not exist"
+        raise MissingPackageFile, "package file #{source} does not exist"
       end
 
       logger.info "Uploading #{source} to #{destination}"

data/lib/automan/beanstalk/router.rb

@@ -10,7 +10,7 @@ module Automan::Beanstalk
 
     attr_accessor :attempts_made
 
-    def initialize(options={})
+    def initialize(options=nil)
       super
       @wait = Wait.new({
         attempts: 10,

data/lib/automan/cli/snapper.rb

@@ -37,9 +37,8 @@ module Automan::Cli
         exit 1
       end
 
-      aws_opts = options.dup
-      aws_opts[:log_aws] = true
-      s = Automan::RDS::Snapshot.new(aws_opts)
+      s = Automan::RDS::Snapshot.new(options)
+      s.log_aws_calls = true
       s.prune_snapshots if options[:prune]
       s.create
     end
@@ -75,5 +74,26 @@ module Automan::Cli
       Automan::RDS::Snapshot.new(options).latest
     end
 
+    desc "count", "return the number of snapshots"
+
+    option :environment,
+      aliases: "-e",
+      desc: "environment of database to snapshot"
+
+    option :database,
+      aliases: "-d",
+      desc: "name of the database to snapshot"
+
+    def count
+
+      if options[:database].nil? && options[:environment].nil?
+        puts "Must specify either database or environment"
+        help "count"
+        exit 1
+      end
+
+      Automan::RDS::Snapshot.new(options).count_snapshots
+    end
+
   end
 end

data/lib/automan/cli/stacker.rb

@@ -102,24 +102,5 @@ module Automan::Cli
       h = Automan::Cloudformation::Launcher.new(options).parse_template_parameters
       say JSON.pretty_generate h
     end
-
-    include Thor::Actions
-    def self.source_root
-      File.join(File.dirname(__FILE__),'..','..', '..')
-    end
-
-    desc "project APP_NAME", "create stacker project"
-
-    attr_reader :app_name
-
-    def project(app_name)
-      @app_name = app_name
-
-      say "\nCreating stacker project: #{app_name}\n", :yellow
-      directory 'templates/stacker', app_name
-      [app_name, "launch_#{app_name}.sh"].each do |file|
-        chmod File.join(app_name, 'bin', file), 0755
-      end
-    end
   end
 end

data/lib/automan/cloudformation/launcher.rb

@@ -16,7 +16,7 @@ module Automan::Cloudformation
 
     include Automan::Mixins::Utils
 
-    def initialize(options={})
+    def initialize(options=nil)
       @wait_for_completion = false
       super
       @wait = Wait.new({
@@ -148,8 +148,6 @@ module Automan::Cloudformation
 
       logger.info "updating stack #{name}"
 
-      no_updates_needed = false
-
       # if cfn determines that no updates are to be performed,
       # it raises a ValidationError
       begin
@@ -159,11 +157,10 @@ module Automan::Cloudformation
           raise e
         else
           logger.info e.message
-          no_updates_needed = true
         end
       end
 
-      if !no_updates_needed && wait_for_completion
+      if wait_for_completion
         logger.info "waiting for stack #{name} to update"
         wait_until { stack_update_complete? }
       end
@@ -196,4 +193,4 @@ module Automan::Cloudformation
     end
   end
 
-end
+end

data/lib/automan/cloudformation/replacer.rb

@@ -5,7 +5,7 @@ module Automan::Cloudformation
   class Replacer < Automan::Base
     add_option :name
 
-    def initialize(options={})
+    def initialize(options=nil)
       super
       @wait = Wait.new({
         delay: 60,

data/lib/automan/cloudformation/terminator.rb

@@ -4,7 +4,7 @@ module Automan::Cloudformation
   class Terminator < Automan::Base
     add_option :name, :wait_for_completion
 
-    def initialize(options={})
+    def initialize(options=nil)
       @wait_for_completion = false
       super
       @wait = Wait.new({

data/lib/automan/ec2/image.rb

@@ -7,7 +7,7 @@ module Automan::Ec2
 
     include Automan::Mixins::Utils
 
-    def initialize(options={})
+    def initialize(options=nil)
       super
       @wait = Wait.new({
         delay: 5,
@@ -45,7 +45,7 @@ module Automan::Ec2
     end
 
     def default_image_name
-      stime = Time.now.utc.iso8601.gsub(/[:+]/, '')
+      stime = Time.new.iso8601.gsub(/:/, '-')
       return name + "-" + stime
     end
 
@@ -134,4 +134,4 @@ module Automan::Ec2
     end
 
   end
-end
+end

data/lib/automan/mixins/aws_caller.rb

@@ -8,20 +8,14 @@ module Automan
         ENV['AWS_ACCOUNT_ID']
       end
 
-      def configure_aws(options={})
-        if ENV['AWS_ROLE']
-          sts = AWS::STS.new
-
-          @logger.info "Assuming role #{ENV['AWS_ROLE']}"
-          provider = AWS::Core::CredentialProviders::AssumeRoleProvider.new(
-            sts: sts,
-            role_arn: ENV['AWS_ROLE'],
-            role_session_name: "automan-aws-sdk"
-          )
-          options[:credential_provider] = provider
+      attr_reader :log_aws_calls
+      def log_aws_calls=(value)
+        if value == true
+          AWS.config(logger: @logger)
+        else
+          AWS.config(logger: nil)
         end
-
-        AWS.config(options)
+        @log_aws_calls = value
       end
 
       attr_writer :eb
@@ -108,14 +102,6 @@ module Automan
         @rds
       end
 
-      attr_writer :ec
-      def ec
-        if @ec.nil?
-          @ec = AWS::ElastiCache.new
-        end
-        @ec
-      end
-
       attr_writer :ec2
       def ec2
         if @ec2.nil?

data/lib/automan/rds/snapshot.rb

@@ -12,7 +12,7 @@ module Automan::RDS
 
     attr_accessor :max_snapshots
 
-    def initialize(options={})
+    def initialize(options=nil)
       @prune = true
       @wait_for_completion = false
       super
@@ -33,8 +33,6 @@ module Automan::RDS
 
     include Automan::Mixins::Utils
 
-    # TODO move this and dependecies to an RDS utils class
-    # so we can re-use it
     def find_db
       db = nil
       if !database.nil?
@@ -65,9 +63,7 @@ module Automan::RDS
     end
 
     def snapshot_count
-      AWS.memoize do
-        rds.db_instances[database].snapshots.count
-      end
+      rds.db_instances[find_db.id].snapshots.count
     end
 
     def create
@@ -97,8 +93,8 @@ module Automan::RDS
       snap = db.create_snapshot(myname)
 
       if prune == true
-        logger.info "Setting snapshot to be prunable and tagging environment"
-        set_prunable_and_env(snap,environment)
+        logger.info "Setting snapshot to be prunable"
+        set_prunable(snap)
       end
 
       if wait_for_completion == true
@@ -124,7 +120,7 @@ module Automan::RDS
 
     def default_snapshot_name(db)
       env   = db_environment db
-      stime = Time.new.strftime("%Y-%m-%dT%H-%M")
+      stime = Time.new.iso8601.gsub(/:/,'-')
 
       return env + "-" + stime
     end
@@ -149,10 +145,10 @@ module Automan::RDS
     end
 
     # tag with CanPrune
-    def set_prunable_and_env(snapshot,environment)
+    def set_prunable(snapshot)
       opts = {
         resource_name: snapshot_arn(snapshot),
-        tags: [ {key: 'CanPrune', value: 'yes'}, {key: 'Environment', value: environment} ]
+        tags: [ {key: 'CanPrune', value: 'yes'} ]
       }
       response = rds.client.add_tags_to_resource opts
 
@@ -189,15 +185,6 @@ module Automan::RDS
       tagged_can_prune?(snapshot) && available?(snapshot) && manual?(snapshot)
     end
 
-    def is_env?(snapshot,environment)
-      tagged_env?(snapshot,environment) && available?(snapshot) && manual?(snapshot)
-    end
-
-    def tagged_env?(snapshot,environment)
-      arn = snapshot_arn(snapshot)
-      tags(arn)['Environment']  == environment
-    end
-
     def tagged_can_prune?(snapshot)
       arn = snapshot_arn(snapshot)
       tags(arn)['CanPrune']  == 'yes'
@@ -217,12 +204,14 @@ module Automan::RDS
     end
 
     def get_all_snapshots
-      rds.db_snapshots
+      rds.db_instances[find_db.id].snapshots
     end
 
     def prunable_snapshots
-      snapshots = get_all_snapshots
-      snapshots.select { |s| can_prune?(s) }
+      AWS.memoize do
+        snapshots = get_all_snapshots
+        snapshots.select { |s| can_prune?(s) }
+      end
     end
 
     def oldest_prunable_snapshot
@@ -246,22 +235,23 @@ module Automan::RDS
       end
     end
 
-    def latest
+    def count_snapshots
       log_options
-      logger.info "Finding most recent snapshot for #{environment}"
-
-      allsnaps=get_all_snapshots
-
-      envsnaps=[]
-      allsnaps.each do |onesnap|
-        if is_env?(onesnap,environment)
-          envsnaps.push(onesnap)
-        end
+      db = find_db
+      if db.nil?
+        logger.info "Database not found"
+      else
+        logger.info "Number of snapshots for database #{db.id} is #{snapshot_count}"
+        logger.info "Number of prunable snapshots for database #{db.id} is #{prunable_snapshots.count}"
       end
+    end
 
-      s=envsnaps.sort_by {|i| i.created_at }.last
+    def latest
+      log_options
+      db = find_db
+      logger.info "Finding most recent snapshot for #{db.id}"
+      s = db.snapshots.sort_by {|i| i.created_at }.last
       logger.info "Most recent snapshot is #{s.id}"
-      s.id
     end
   end
 end

data/lib/automan/s3/downloader.rb

@@ -9,7 +9,7 @@ module Automan::S3
     def download
       log_options
 
-      logger.info "downloading #{s3file} to #{localfile}"
+      logger.info "uploading #{localfile} to #{s3file}"
 
       bucket, key = parse_s3_path s3file
 
@@ -18,16 +18,7 @@ module Automan::S3
           file.write(chunk)
         end
       end
-    end
-
-    def read
-      log_options
-
-      logger.info "returning contents of #{s3file} as string"
-
-      bucket, key = parse_s3_path s3file
 
-      s3.buckets[bucket].objects[key].read
     end
 
   end

data/lib/automan/version.rb

@@ -1,3 +1,3 @@
 module Automan
-  VERSION = "2.3.5"
+  VERSION = "2.3.6"
 end

data/spec/beanstalk/application_spec.rb

@@ -1,12 +1,12 @@
 require "automan"
 
 describe Automan::Beanstalk::Application do
-  it { is_expected.to respond_to :name }
-  it { is_expected.to respond_to :create }
-  it { is_expected.to respond_to :delete }
+  it { should respond_to :name }
+  it { should respond_to :create }
+  it { should respond_to :delete }
 
   describe '#create' do
-    subject() do
+    subject(:a) do
       AWS.stub!
       a = Automan::Beanstalk::Application.new
       a.logger = Logger.new('/dev/null')
@@ -14,20 +14,20 @@ describe Automan::Beanstalk::Application do
     end
 
     it "does not create if the application already exists" do
-      allow(subject).to receive(:application_exists?).and_return(true)
-      expect(subject).to_not receive(:create_application)
-      subject.create
+      a.stub(:application_exists?).and_return(true)
+      a.should_not_receive(:create_application)
+      a.create
     end
 
     it "does create if the application doesn't exist" do
-      allow(subject).to receive(:application_exists?).and_return(false)
-      expect(subject).to receive(:create_application)
-      subject.create
+      a.stub(:application_exists?).and_return(false)
+      a.should_receive(:create_application)
+      a.create
     end
   end
 
   describe '#delete' do
-    subject() do
+    subject(:a) do
       AWS.stub!
       a = Automan::Beanstalk::Application.new
       a.logger = Logger.new('/dev/null')
@@ -35,15 +35,15 @@ describe Automan::Beanstalk::Application do
     end
 
     it "does delete if the application already exists" do
-      allow(subject).to receive(:application_exists?).and_return(true)
-      expect(subject).to receive(:delete_application)
-      subject.delete
+      a.stub(:application_exists?).and_return(true)
+      a.should_receive(:delete_application)
+      a.delete
     end
 
     it "does not delete if the application doesn't exist" do
-      allow(subject).to receive(:application_exists?).and_return(false)
-      expect(subject).to_not receive(:delete_application)
-      subject.delete
+      a.stub(:application_exists?).and_return(false)
+      a.should_not_receive(:delete_application)
+      a.delete
     end
   end
 end