Merge pull request #314 from kbrock/rubocop

rubocop fixes

Author: Fryguy

floe.gemspec

@@ -33,14 +33,14 @@ Gem::Specification.new do |spec|
 
   spec.add_dependency "activesupport", ">5.2"
   spec.add_dependency "awesome_spawn", "~>1.6"
+  spec.add_dependency "faraday"
+  spec.add_dependency "faraday-follow_redirects"
   spec.add_dependency "io-wait"
+  spec.add_dependency "json", "~>2.10"
   spec.add_dependency "jsonpath", "~>1.1"
   spec.add_dependency "kubeclient", "~>4.7"
   spec.add_dependency "optimist", "~>3.0"
   spec.add_dependency "parslet", "~>2.0"
-  spec.add_dependency "json", "~>2.10"
-  spec.add_dependency "faraday"
-  spec.add_dependency "faraday-follow_redirects"
 
   spec.add_development_dependency "manageiq-style", ">= 1.5.2"
   spec.add_development_dependency "rake", "~> 13.0"

lib/floe/builtin_runner/methods.rb

@@ -59,8 +59,8 @@ def self.http(params, _secrets, _context)
           connection.response(:follow_redirects)
         end
 
-        response = connection.send(method.downcase) do |request|
-          request.body = body if body
+        response = connection.send(method.downcase) do |faraday_request|
+          faraday_request.body = body if body
         end
 
         output = {"Status" => response.status, "Body" => response.body, "Headers" => response.headers}

lib/floe/builtin_runner/runner.rb

@@ -23,7 +23,7 @@ def cleanup(runner_context)
         method_name = runner_context["method"]
         raise ArgumentError if method_name.nil?
 
-        cleanup_method = "#{method_name}_cleanup"
+        cleanup_method = :"#{method_name}_cleanup"
         return unless Methods.respond_to?(cleanup_method, true)
 
         Methods.send(cleanup_method, runner_context)
@@ -34,7 +34,7 @@ def status!(runner_context)
         raise ArgumentError if method_name.nil?
         return if runner_context["running"] == false
 
-        Methods.send("#{method_name}_status!", runner_context)
+        Methods.send(:"#{method_name}_status!", runner_context)
       end
 
       def running?(runner_context)

lib/floe/container_runner/docker.rb

@@ -183,7 +183,7 @@ def docker_event_status_to_event(status)
       def inspect_container(container_id)
         JSON.parse(docker!("inspect", container_id).output).first
       rescue AwesomeSpawn::CommandResultError => err
-        raise Floe::ExecutionError.new("Failed to get status for container #{container_id}: #{err}")
+        raise Floe::ExecutionError, "Failed to get status for container #{container_id}: #{err}"
       end
 
       def delete_container(container_id)

lib/floe/container_runner/kubernetes.rb

@@ -156,7 +156,7 @@ def wait(timeout: nil, events: %i[create update delete])
       def pod_info(pod_name)
         kubeclient.get_pod(pod_name, namespace)
       rescue Kubeclient::HttpError => err
-        raise Floe::ExecutionError.new("Failed to get status for pod #{namespace}/#{pod_name}: #{err}")
+        raise Floe::ExecutionError, "Failed to get status for pod #{namespace}/#{pod_name}: #{err}"
       end
 
       def pod_running?(context)

lib/floe/workflow/choice_rule/data.rb

@@ -7,9 +7,9 @@ class Data < Floe::Workflow::ChoiceRule
         TYPES      = ["String", "Numeric", "Boolean", "Timestamp", "Present", "Null"].freeze
         COMPARES   = ["Equals", "LessThan", "GreaterThan", "LessThanEquals", "GreaterThanEquals", "Matches"].freeze
         # e.g.: (Is)(String), (Is)(Present)
-        TYPE_CHECK = /^(Is)(#{TYPES.join("|")})$/.freeze
+        TYPE_CHECK = /^(Is)(#{TYPES.join("|")})$/
         # e.g.: (String)(LessThan)(Path), (Numeric)(GreaterThanEquals)()
-        OPERATION  = /^(#{(TYPES - %w[Null Present]).join("|")})(#{COMPARES.join("|")})(Path)?$/.freeze
+        OPERATION  = /^(#{(TYPES - %w[Null Present]).join("|")})(#{COMPARES.join("|")})(Path)?$/
 
         attr_reader :variable, :compare_key, :operation, :type, :compare_predicate, :path
 

lib/floe/workflow/intrinsic_function/transformer.rb

@@ -77,7 +77,7 @@ def check_types(args, function, signature)
         rule(:number   => simple(:v)) { v.match(/[eE.]/) ? Float(v) : Integer(v) }
         rule(:jsonpath => simple(:v)) { Floe::Workflow::Path.value(v.to_s, context, input) }
 
-        STATES_FORMAT_PLACEHOLDER = /(?<!\\)\{\}/.freeze
+        STATES_FORMAT_PLACEHOLDER = /(?<!\\)\{\}/
 
         rule(:states_format => {:args => subtree(:args)}) do
           args = Transformer.process_args(args(), "States.Format", [String, VariadicArgs[[String, TrueClass, FalseClass, Numeric, NilClass]]])

lib/floe/workflow/states/map.rb

@@ -58,7 +58,7 @@ def start(context)
               "Execution" => {
                 "Id" => context.execution["Id"]
               },
-              "Map" => {
+              "Map"       => {
                 "Item" => {"Index" => index, "Value" => item}
               }
             }

spec/spec_helper.rb

@@ -18,8 +18,8 @@
   SimpleCov.start
 end
 
-Dir['./spec/support/**/*.rb'].sort.each { |f| require f }
-Dir['./spec/shared/**/*.rb'].sort.each { |f| require f }
+Dir['./spec/support/**/*.rb'].each { |f| require f }
+Dir['./spec/shared/**/*.rb'].each { |f| require f }
 
 # See https://rubydoc.info/gems/rspec-core/RSpec/Core/Configuration
 RSpec.configure do |config|

spec/workflow/states/task_spec.rb

@@ -240,7 +240,7 @@
         let(:workflow) do
           make_workflow(
             ctx, {
-              "State"         => {
+              "State"        => {
                 "Type"        => "Task",
                 "Resource"    => resource,
                 "Parameters"  => {"var1.$" => "$.foo.bar"},