leeroy_app 0.2.0 → 0.2.1

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    leeroy_app (0.1.0)
+    leeroy_app (0.2.1)
       awesome_print (~> 1.6)
       aws-sdk (~> 2)
       chronic (~> 0.10)

data/lib/leeroy/helpers/aws.rb

@@ -27,20 +27,24 @@ module Leeroy
         logger.debug "AWS helpers initialized"
       end
 
-      # EC2
-
-      def ec2Request(method, params = {}, ec2 = self.ec2, options = self.options, global_options = self.global_options)
+      def awsRequest(service, method, params = {}, global_options = self.global_options)
         begin
-          logger.debug "constructing EC2 request for '#{method}'"
+          logger.debug "constructing AWS request for '#{service}: #{method}'"
+
+          client = self.send(service.to_sym)
 
           params_mash = Leeroy::Types::Mash.new(params)
           params = params_mash
 
-          dry_run = global_options[:op] ? false : true
+          # dry_run is an ec2 thing
+          case service.to_sym
+          when :ec2
+            dry_run = global_options[:op] ? false : true
 
-          params.dry_run = dry_run
+            params.dry_run = dry_run
+          end
 
-          resp = ec2.send(method.to_sym, params)
+          resp = client.send(method.to_sym, params)
 
           logger.debug "resp: #{resp.inspect}"
 
@@ -51,7 +55,19 @@ module Leeroy
         end
       end
 
-      def getVpcId(vpcname, ec2 = self.ec2)
+      # EC2
+
+      def ec2Request(method, params = {}, global_options = self.global_options)
+        begin
+          awsRequest(:ec2, method, params, global_options)
+
+        rescue Aws::EC2::Errors::DryRunOperation => e
+          logger.info e.message
+          "DRYRUN_DUMMY_VALUE: #{self.class.to_s}"
+        end
+      end
+
+      def getVpcId(vpcname)
         begin
           logger.debug "getting VPC ID for '#{vpcname}'"
 
@@ -79,7 +95,7 @@ module Leeroy
         end
       end
 
-      def getSgId(sgname, vpcname, vpcid, ec2 = self.ec2)
+      def getSgId(sgname, vpcname, vpcid)
         begin
           logger.debug "getting SG ID for '#{sgname}'"
 
@@ -132,7 +148,7 @@ module Leeroy
 
         rescue Aws::EC2::Errors::DryRunOperation => e
           logger.info e.message
-          "DRYRUN_DUMMY_VALUE: #{self.class.to_s}"
+          "DRYRUN_DUMMY_VALUE: #{self.class}"
 
         rescue StandardError => e
           raise e
@@ -158,7 +174,7 @@ module Leeroy
 
         rescue Aws::EC2::Errors::DryRunOperation => e
           logger.info e.message
-          "DRYRUN_DUMMY_VALUE: #{self.class.to_s}"
+          "DRYRUN_DUMMY_VALUE: #{self.class}"
 
         rescue StandardError => e
           raise e
@@ -166,7 +182,7 @@ module Leeroy
       end
 
 
-      def createTags(tags = {}, resourceids = [], state = self.state, env = self.env, ec2 = self.ec2, options = self.options)
+      def createTags(tags = {}, resourceids = [], state = self.state, env = self.env, options = self.options)
         begin
           if resourceids.length == 0
             if state.instanceid?
@@ -190,7 +206,7 @@ module Leeroy
 
         rescue Aws::EC2::Errors::DryRunOperation => e
           logger.info e.message
-          "DRYRUN_DUMMY_VALUE: #{self.class.to_s}"
+          "DRYRUN_DUMMY_VALUE: #{self.class}"
 
         rescue StandardError => e
           raise e
@@ -210,7 +226,7 @@ module Leeroy
 
         rescue Aws::EC2::Errors::DryRunOperation => e
           logger.info e.message
-          "DRYRUN_DUMMY_VALUE: #{self.class.to_s}"
+          "DRYRUN_DUMMY_VALUE: #{self.class}"
 
         rescue StandardError => e
           raise e
@@ -277,7 +293,8 @@ module Leeroy
         image_names = filterImages(selector, collector)
         image_numbers = image_names.collect do |name|
           if name =~ /(\d+)$/
-            image_number = $1.to_i
+            # extract numeric suffixes of names, convert to Integers
+            $1.to_i
           end
         end
 
@@ -290,27 +307,11 @@ module Leeroy
 
       # RDS
 
-      def rdsRequest(method, params = {}, rds = self.rds, options = self.options, global_options = self.global_options)
-        begin
-          logger.debug "constructing RDS request for '#{method}'"
-
-          params_mash = Leeroy::Types::Mash.new(params)
-          params = params_mash
-
-          logger.debug "params: #{params.inspect}"
-
-          resp = rds.send(method.to_sym, params)
-
-          logger.debug "resp: #{resp.inspect}"
-
-          resp
-
-        rescue StandardError => e
-          raise e
-        end
+      def rdsRequest(method, params = {}, global_options = self.global_options)
+        awsRequest(:rds, method, params, global_options)
       end
 
-      def getRDSInstanceEndpoint(instancename, rds = self.rds)
+      def getRDSInstanceEndpoint(instancename)
         begin
           logger.debug "getting DB Instance Endpoint for '#{instancename}'"
 
@@ -331,24 +332,8 @@ module Leeroy
 
       # S3
 
-      def s3Request(method, params = {}, s3 = self.s3, options = self.options, global_options = self.global_options)
-        begin
-          logger.debug "constructing S3 request for '#{method}'"
-
-          params_mash = Leeroy::Types::Mash.new(params)
-          params = params_mash
-
-          logger.debug "params: #{params.inspect}"
-
-          resp = s3.send(method.to_sym, params)
-
-          logger.debug "resp: #{resp.inspect}"
-
-          resp
-
-        rescue StandardError => e
-          raise e
-        end
+      def s3Request(method, params = {}, global_options = self.global_options)
+        awsRequest(:s3, method, params, global_options)
       end
 
       def buildS3ObjectName(key, type, prefixes = Leeroy::Env::S3_PREFIXES)

data/lib/leeroy/helpers/dumpable.rb

@@ -28,12 +28,8 @@ module Leeroy
               begin
                 raw = self.fetch(property.to_s)
 
-                # logger.debug "raw: #{raw.inspect}"
-
                 cooked = raw.respond_to?(:dumper) ? raw.dumper : raw
 
-                # logger.debug "cooked: #{cooked.inspect}"
-
                 dump_mash.store(property.to_s, cooked)
 
               rescue KeyError => e

data/lib/leeroy/helpers/env.rb

@@ -1,5 +1,3 @@
-require 'awesome_print'
-
 require 'leeroy/env'
 require 'leeroy/helpers'
 

data/lib/leeroy/state.rb

@@ -24,7 +24,7 @@ module Leeroy
         logger.debug e.message
 
         not_found = args[0]
-        logger.info "property '#{not_found}' not found in statedata, checking state"
+        logger.debug "property '#{not_found}' not found in statedata, checking state"
 
         begin
           self.send(not_found.to_sym, &block)

data/lib/leeroy/task/base.rb

@@ -36,10 +36,10 @@ module Leeroy
 
       def perform(args = self.args, options = self.options, global_options = self.global_options)
         begin
-          self.logger.info("performing #{self.class.to_s}")
-          self.logger.debug("args: #{args.inspect}")
-          self.logger.debug("options: #{options.inspect}")
-          self.logger.debug("global_options: #{global_options.inspect}")
+          logger.info("performing #{self.class.to_s}")
+          logger.debug("args: #{args.inspect}")
+          logger.debug("options: #{options.inspect}")
+          logger.debug("global_options: #{global_options.inspect}")
 
         rescue StandardError => e
           raise e

data/lib/leeroy/task/stub.rb

@@ -8,8 +8,6 @@ module Leeroy
         super
 
         begin
-          logger.debug "performing for #{self.class}"
-          logger.debug "state: #{self.state}"
           message = self.state.message
 
           increment = self.options[:increment].to_i
@@ -29,8 +27,6 @@ module Leeroy
 
           dump_state
 
-          logger.debug "done performing for #{self.class}"
-
         rescue StandardError => e
           raise e
         end

data/lib/leeroy/version.rb

@@ -1,3 +1,3 @@
 module Leeroy
-  VERSION = "0.2.0"
+  VERSION = "0.2.1"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: leeroy_app
 version: !ruby/object:Gem::Version
-  version: 0.2.0
+  version: 0.2.1
 platform: ruby
 authors:
 - Steve Huff
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-03-14 00:00:00.000000000 Z
+date: 2016-03-15 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: aruba
@@ -258,8 +258,10 @@ executables:
 extensions: []
 extra_rdoc_files: []
 files:
+- .codeclimate.yml
 - .gitignore
 - .rspec
+- .rubocop.yml
 - .ruby-version
 - Gemfile
 - Gemfile.lock