automan 2.1.3 → 2.2.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 5ff89fd6445234583d2dde7e5fa84d345cfdc736
-  data.tar.gz: bf206d9978acd7cb472388df2bc8073b23af6443
+  metadata.gz: cc78fb2a5418be62e64d661b9c1f65704b069277
+  data.tar.gz: 5e13ddb9c298a1968b9398199e35a2ff4190800c
 SHA512:
-  metadata.gz: ce434b18f4b4dd0a597a075719088fa4258bd2196baeca16668e3218099c5b232397f22a136001d0514e41dcf19b0a6e7e0e538c373e463d744d3aaa4c35af46
-  data.tar.gz: 85a6e482d61a528271e3736b9c425b5976174986410992532a84b34e602d0690c393216dadf6b91f12e3e448bdaab7c48147b6f67bad3431206f1e72863ff96b
+  metadata.gz: 87496bd4374b42164b02c3da1d2fb2dde94ec72af45c7d4b705cb3cf51f31f65aa7272b2228c29288947ff7e3b33085d5c5215ed74bf200b2f436752140d9bfb
+  data.tar.gz: 14cdfb13a45f54d5de9f43278e140faaf60e11716fd8d839b6c2328839666d1c852e2a94756f76c4986abe81abacff4e70e164b02aa481d668283e3b6d0a95e4

data/.rvmrc

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

data/.travis.yml

@@ -0,0 +1,5 @@
+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/Rakefile

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

data/lib/automan/base.rb

@@ -12,11 +12,9 @@ module Automan
 
     include Automan::Mixins::AwsCaller
 
-    def initialize(options=nil)
+    def initialize(options={})
       $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|
@@ -24,6 +22,12 @@ 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=nil)
+    def initialize(options={})
       @number_to_keep = 0
       super
     end

data/lib/automan/beanstalk/router.rb

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

data/lib/automan/cli/snapper.rb

@@ -37,8 +37,8 @@ module Automan::Cli
         exit 1
       end
 
+      options[:log_aws] = true
       s = Automan::RDS::Snapshot.new(options)
-      s.log_aws_calls = true
       s.prune_snapshots if options[:prune]
       s.create
     end
@@ -74,26 +74,5 @@ 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/cloudformation/launcher.rb

@@ -16,7 +16,7 @@ module Automan::Cloudformation
 
     include Automan::Mixins::Utils
 
-    def initialize(options=nil)
+    def initialize(options={})
       @wait_for_completion = false
       super
       @wait = Wait.new({

data/lib/automan/cloudformation/replacer.rb

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

data/lib/automan/mixins/aws_caller.rb

@@ -8,14 +8,20 @@ module Automan
         ENV['AWS_ACCOUNT_ID']
       end
 
-      attr_reader :log_aws_calls
-      def log_aws_calls=(value)
-        if value == true
-          AWS.config(logger: @logger)
-        else
-          AWS.config(logger: nil)
+      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
         end
-        @log_aws_calls = value
+
+        AWS.config(options)
       end
 
       attr_writer :eb

data/lib/automan/rds/snapshot.rb

@@ -12,7 +12,7 @@ module Automan::RDS
 
     attr_accessor :max_snapshots
 
-    def initialize(options=nil)
+    def initialize(options={})
       @prune = true
       @wait_for_completion = false
       super
@@ -63,7 +63,7 @@ module Automan::RDS
     end
 
     def snapshot_count
-      rds.db_instances[find_db.id].snapshots.count
+      rds.db_instances[database].snapshots.count
     end
 
     def create
@@ -204,14 +204,12 @@ module Automan::RDS
     end
 
     def get_all_snapshots
-      rds.db_instances[find_db.id].snapshots
+      rds.db_snapshots
     end
 
     def prunable_snapshots
-      AWS.memoize do
-        snapshots = get_all_snapshots
-        snapshots.select { |s| can_prune?(s) }
-      end
+      snapshots = get_all_snapshots
+      snapshots.select { |s| can_prune?(s) }
     end
 
     def oldest_prunable_snapshot
@@ -235,17 +233,6 @@ module Automan::RDS
       end
     end
 
-    def count_snapshots
-      log_options
-      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
-
     def latest
       log_options
       db = find_db
@@ -254,4 +241,4 @@ module Automan::RDS
       logger.info "Most recent snapshot is #{s.id}"
     end
   end
-end
+end

data/lib/automan/version.rb

@@ -1,3 +1,3 @@
 module Automan
-  VERSION = "2.1.3"
+  VERSION = "2.2.2"
 end

data/spec/beanstalk/router_spec.rb

@@ -17,7 +17,6 @@ describe Automan::Beanstalk::Router do
         r.environment_name = 'foo'
         r.hosted_zone_name = 'foo.com'
         r.hostname         = 'www.foo.com'
-        r.log_aws_calls = false
         r.logger = Logger.new('/dev/null')
         r.wait = Wait.new(delay: 0.01, rescuer: WaitRescuer.new(AWS::Route53::Errors::InvalidChangeBatch))
         r

data/spec/beanstalk/version_spec.rb

@@ -16,7 +16,6 @@ describe Automan::Beanstalk::Version do
       v.eb = AWS::ElasticBeanstalk::Client.new
       v.application = 'foo'
       v.label = 'v4'
-      v.log_aws_calls = false
       v.logger = Logger.new('/dev/null')
       v
     end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: automan
 version: !ruby/object:Gem::Version
-  version: 2.1.3
+  version: 2.2.2
 platform: ruby
 authors:
 - Chris Chalfant
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-10-16 00:00:00.000000000 Z
+date: 2015-01-26 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -166,6 +166,8 @@ extensions: []
 extra_rdoc_files: []
 files:
 - ".gitignore"
+- ".rvmrc"
+- ".travis.yml"
 - Gemfile
 - LICENSE.txt
 - README.md
@@ -250,7 +252,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.4.8
+rubygems_version: 2.2.2
 signing_key: 
 specification_version: 4
 summary: Automates common AWS ops