tugboat 2.2.2 → 2.2.3

data/lib/tugboat/middleware/check_credentials.rb

@@ -14,4 +14,3 @@ module Tugboat
     end
   end
 end
-

data/lib/tugboat/middleware/check_droplet_active.rb

@@ -3,10 +3,9 @@ module Tugboat
     # Check if the droplet in the environment is active
     class CheckDropletActive < Base
       def call(env)
-
         unless env['user_droplet_ssh_wait']
-          if env["droplet_status"] != "active"
-            say "Droplet must be on for this operation to be successful.", :red
+          if env['droplet_status'] != 'active'
+            say 'Droplet must be on for this operation to be successful.', :red
             exit 1
           end
         end
@@ -16,4 +15,3 @@ module Tugboat
     end
   end
 end
-

data/lib/tugboat/middleware/check_droplet_inactive.rb

@@ -3,9 +3,8 @@ module Tugboat
     # Check if the droplet in the environment is inactive, or "off"
     class CheckDropletInactive < Base
       def call(env)
-
-        if env["droplet_status"] != "off"
-          say "Droplet must be off for this operation to be successful.", :red
+        if env['droplet_status'] != 'off'
+          say 'Droplet must be off for this operation to be successful.', :red
           exit 1
         end
 
@@ -14,4 +13,3 @@ module Tugboat
     end
   end
 end
-

data/lib/tugboat/middleware/config.rb

@@ -3,16 +3,15 @@ module Tugboat
     # Check if the droplet in the environment is inactive, or "off"
     class Config < Base
       def call(env)
-
         config = Tugboat::Configuration.instance
 
         keys_retracted = ''
 
-        config_data = config.data.to_yaml.gsub(/"/,'')
+        config_data = config.data.to_yaml.delete('"')
 
-        if env["user_hide_keys"]
+        if env['user_hide_keys']
           keys_retracted = '(Keys Redacted)'
-          config_data = config_data.gsub(/(access_token: )([a-zA-Z0-9]+)/,'\1 [REDACTED]')
+          config_data = config_data.gsub(%r{(access_token: )([a-zA-Z0-9]+)}, '\1 [REDACTED]')
         end
 
         say "Current Config #{keys_retracted}\n", :green
@@ -25,4 +24,3 @@ module Tugboat
     end
   end
 end
-

data/lib/tugboat/middleware/confirm_action.rb

@@ -2,12 +2,11 @@ module Tugboat
   module Middleware
     class ConfirmAction < Base
       def call(env)
+        unless env['user_confirm_action']
+          response = yes? 'Warning! Potentially destructive action. Please confirm [y/n]:'
 
-        if !env["user_confirm_action"]
-          response = yes? "Warning! Potentially destructive action. Please confirm [y/n]:"
-
-          if !response
-            say "Aborted due to user request.", :red
+          unless response
+            say 'Aborted due to user request.', :red
             # Quit
             exit 1
           end
@@ -19,4 +18,3 @@ module Tugboat
     end
   end
 end
-

data/lib/tugboat/middleware/create_droplet.rb

@@ -4,65 +4,49 @@ module Tugboat
       def call(env)
         ocean = env['barge']
 
-        say "Queueing creation of droplet '#{env["create_droplet_name"]}'...", nil, false
+        say "Queueing creation of droplet '#{env['create_droplet_name']}'...", nil, false
 
-        env["create_droplet_region_slug"] ?
-        droplet_region_slug = env["create_droplet_region_slug"] :
-        droplet_region_slug = env["config"].default_region
+        droplet_region_slug = env['create_droplet_region_slug'] ? env['create_droplet_region_slug'] : env['config'].default_region
 
-        env["create_droplet_image_slug"] ?
-        droplet_image_slug = env["create_droplet_image_slug"] :
-        droplet_image_slug = env["config"].default_image
+        droplet_image_slug = env['create_droplet_image_slug'] ? env['create_droplet_image_slug'] : env['config'].default_image
 
-        env["create_droplet_size_slug"] ?
-        droplet_size_slug = env["create_droplet_size_slug"] :
-        droplet_size_slug = env["config"].default_size
+        droplet_size_slug = env['create_droplet_size_slug'] ? env['create_droplet_size_slug'] : env['config'].default_size
 
-        env["create_droplet_ssh_key_ids"] ?
-        droplet_ssh_key_ids = env["create_droplet_ssh_key_ids"] :
-        droplet_ssh_key_ids = env["config"].default_ssh_key
+        droplet_ssh_key_ids = env['create_droplet_ssh_key_ids'] ? env['create_droplet_ssh_key_ids'] : env['config'].default_ssh_key
 
-        env["create_droplet_private_networking"] ?
-        droplet_private_networking = env["create_droplet_private_networking"] :
-        droplet_private_networking = env["config"].default_private_networking
+        droplet_private_networking = env['create_droplet_private_networking'] ? env['create_droplet_private_networking'] : env['config'].default_private_networking
 
-        env["create_droplet_ip6"] ?
-        droplet_ip6 = env["create_droplet_ip6"] :
-        droplet_ip6 = env["config"].default_ip6
+        droplet_ip6 = env['create_droplet_ip6'] ? env['create_droplet_ip6'] : env['config'].default_ip6
 
-        env["create_droplet_user_data"] ?
-        droplet_user_data = env["create_droplet_user_data"] :
-        droplet_user_data = env["config"].default_user_data
+        droplet_user_data = env['create_droplet_user_data'] ? env['create_droplet_user_data'] : env['config'].default_user_data
 
         if droplet_user_data
-          unless File.file?(droplet_user_data)
+          if File.file?(droplet_user_data)
+            user_data_string = File.open(droplet_user_data, 'rb', &:read)
+          else
             say "Could not find file: #{droplet_user_data}, check your user_data setting"
             exit 1
-          else
-            user_data_string = File.open(droplet_user_data, 'rb') { |f| f.read }
           end
         end
 
-        env["create_droplet_backups_enabled"] ?
-        droplet_backups_enabled = env["create_droplet_backups_enabled"] :
-        droplet_backups_enabled = env["config"].default_backups_enabled
+        droplet_backups_enabled = env['create_droplet_backups_enabled'] ? env['create_droplet_backups_enabled'] : env['config'].default_backups_enabled
 
-        if droplet_ssh_key_ids.kind_of?(Array)
-          droplet_key_array = droplet_ssh_key_ids
-        else
-          droplet_key_array = droplet_ssh_key_ids.to_s.split(',')
-        end
+        droplet_key_array = if droplet_ssh_key_ids.is_a?(Array)
+                              droplet_ssh_key_ids
+                            else
+                              droplet_ssh_key_ids.to_s.split(',')
+                            end
 
         create_opts = {
-          :name               => env["create_droplet_name"],
-          :size               => droplet_size_slug,
-          :image              => "#{droplet_image_slug}",
-          :region             => droplet_region_slug,
-          :ssh_keys           => droplet_key_array,
-          :private_networking => droplet_private_networking,
-          :backups_enabled    => droplet_backups_enabled,
-          :ipv6               => droplet_ip6,
-          :user_data          => user_data_string,
+          name: env['create_droplet_name'],
+          size: droplet_size_slug,
+          image: droplet_image_slug.to_s,
+          region: droplet_region_slug,
+          ssh_keys: droplet_key_array,
+          private_networking: droplet_private_networking,
+          backups_enabled: droplet_backups_enabled,
+          ipv6: droplet_ip6,
+          user_data: user_data_string
         }
 
         response = ocean.droplet.create(create_opts)
@@ -72,11 +56,10 @@ module Tugboat
           exit 1
         end
 
-        say "Droplet created!"
+        say 'Droplet created!'
 
         @app.call(env)
       end
     end
   end
 end
-

data/lib/tugboat/middleware/custom_logger.rb

@@ -1,58 +1,57 @@
 module Tugboat
   class CustomLogger < Faraday::Middleware
-      extend Forwardable
-      def_delegators :@logger, :debug, :info, :warn, :error, :fatal
+    extend Forwardable
+    def_delegators :@logger, :debug, :info, :warn, :error, :fatal
 
-      def initialize(app, options = {})
-        @app = app
-        @logger = options.fetch(:logger) {
-          require 'logger'
-          ::Logger.new($stdout)
-        }
+    def initialize(app, options = {})
+      @app = app
+      @logger = options.fetch(:logger) do
+        require 'logger'
+        ::Logger.new($stdout)
       end
+    end
 
-      def call(env)
-        start_time = Time.now
-        info  { request_info(env) }
-        debug { request_debug(env) }
-        @app.call(env).on_complete do
-          end_time = Time.now
-          response_time = end_time - start_time
-          info  { response_info(env, response_time) }
-          debug { response_debug(env) }
-        end
+    def call(env)
+      start_time = Time.now
+      info  { request_info(env) }
+      debug { request_debug(env) }
+      @app.call(env).on_complete do
+        end_time = Time.now
+        response_time = end_time - start_time
+        info  { response_info(env, response_time) }
+        debug { response_debug(env) }
       end
+    end
 
-      private
+    private
 
-      def filter(output)
-        if ENV['DEBUG'].to_i == 2
-          output = output.to_s.gsub(/Bearer [a-zA-Z0-9]*/,'Bearer [TOKEN REDACTED]')
-          output = output.to_s.gsub(/_digitalocean2_session_v2=[a-zA-Z0-9%-]*/,'_digitalocean2_session_v2=[SESSION_COOKIE]')
-        else
-          output
-        end
+    def filter(output)
+      if ENV['DEBUG'].to_i == 2
+        output = output.to_s.gsub(%r{Bearer [a-zA-Z0-9]*}, 'Bearer [TOKEN REDACTED]')
+        output = output.to_s.gsub(%r{_digitalocean2_session_v2=[a-zA-Z0-9%-]*}, '_digitalocean2_session_v2=[SESSION_COOKIE]')
+      else
+        output
       end
+    end
 
-      def request_info(env)
-        "Started %s request to: %s" % [ env[:method].to_s.upcase, filter(env[:url]) ]
-      end
+    def request_info(env)
+      format('Started %s request to: %s', env[:method].to_s.upcase, filter(env[:url]))
+    end
 
-      def response_info(env, response_time)
-        "Response from %s; Status: %d; Time: %.1fms" % [ filter(env[:url]), env[:status], (response_time * 1_000.0) ]
-      end
+    def response_info(env, response_time)
+      format('Response from %s; Status: %d; Time: %.1fms', filter(env[:url]), env[:status], (response_time * 1_000.0))
+    end
 
-      def request_debug(env)
-        debug_message("Request", env[:request_headers], env[:body])
-      end
-
-      def response_debug(env)
-        debug_message("Response", env[:response_headers], env[:body])
-      end
+    def request_debug(env)
+      debug_message('Request', env[:request_headers], env[:body])
+    end
 
-      def debug_message(name, headers, body)
+    def response_debug(env)
+      debug_message('Response', env[:response_headers], env[:body])
+    end
 
-        main_message = <<-MESSAGE.gsub(/^ +([^ ])/m, '\\1')
+    def debug_message(name, headers, body)
+      main_message = <<-MESSAGE.gsub(%r{^ +([^ ])}m, '\\1')
         #{name} Headers:
         ----------------
         #{format_headers(headers)}
@@ -60,20 +59,19 @@ module Tugboat
         #{name} Body:
         -------------
         MESSAGE
-        main_message + pretty_body(body)
-      end
-
-      def pretty_body(body)
-        body_json = JSON.parse(body)
-        JSON.pretty_generate(body_json)
-      rescue JSON::ParserError => e
-        body
-      end
+      main_message + pretty_body(body)
+    end
 
-      def format_headers(headers)
-        length = headers.map {|k,v| k.to_s.size }.max
-        headers.map { |name, value| "#{name.to_s.ljust(length)} : #{filter(value)}" }.join("\n")
-      end
+    def pretty_body(body)
+      body_json = JSON.parse(body)
+      JSON.pretty_generate(body_json)
+    rescue JSON::ParserError
+      body
+    end
 
+    def format_headers(headers)
+      length = headers.map { |k, _v| k.to_s.size }.max
+      headers.map { |name, value| "#{name.to_s.ljust(length)} : #{filter(value)}" }.join("\n")
+    end
   end
 end

data/lib/tugboat/middleware/destroy_droplet.rb

@@ -4,15 +4,15 @@ module Tugboat
       def call(env)
         ocean = env['barge']
 
-        say "Queuing destroy for #{env["droplet_id"]} #{env["droplet_name"]}...", nil, false
+        say "Queuing destroy for #{env['droplet_id']} #{env['droplet_name']}...", nil, false
 
-        response = ocean.droplet.destroy env["droplet_id"]
+        response = ocean.droplet.destroy env['droplet_id']
 
-        unless response.success?
+        if response.success?
+          say 'Deletion Successful!', :green
+        else
           say "Failed to destroy Droplet: #{response.message}", :red
           exit 1
-        else
-          say "Deletion Successful!", :green
         end
 
         @app.call(env)
@@ -20,4 +20,3 @@ module Tugboat
     end
   end
 end
-

data/lib/tugboat/middleware/destroy_image.rb

@@ -4,15 +4,15 @@ module Tugboat
       def call(env)
         ocean = env['barge']
 
-        say "Queuing destroy image for #{env["image_id"]} #{env["image_name"]}...", nil, false
+        say "Queuing destroy image for #{env['image_id']} #{env['image_name']}...", nil, false
 
-        response = ocean.image.destroy env["image_id"]
+        response = ocean.image.destroy env['image_id']
 
-        unless response.success?
+        if response.success?
+          say 'Image deletion successful!', :green
+        else
           say "Failed to destroy image: #{response.message}", :red
           exit 1
-        else
-          say 'Image deletion successful!', :green
         end
 
         @app.call(env)
@@ -20,4 +20,3 @@ module Tugboat
     end
   end
 end
-

data/lib/tugboat/middleware/find_droplet.rb

@@ -3,15 +3,15 @@ module Tugboat
     # Check if the client has set-up configuration yet.
     class FindDroplet < Base
       def get_public_ip(networks)
-        get_ip_per_network_type networks, "public"
+        get_ip_per_network_type networks, 'public'
       end
 
       def get_private_ip(networks)
-        get_ip_per_network_type networks, "private"
+        get_ip_per_network_type networks, 'private'
       end
 
       def get_ip_per_network_type(networks, type)
-        found_network = networks.detect { |n| n.type == type }
+        found_network = networks.find { |n| n.type == type }
         found_network.ip_address if found_network
       end
 
@@ -26,14 +26,14 @@ module Tugboat
         # let the user know.
         if !user_fuzzy_name && !user_droplet_name && !user_droplet_id
 
-          say "Tugboat attempted to find a droplet with no arguments.", :red
+          say 'Tugboat attempted to find a droplet with no arguments.', :red
           say "Try running `tugboat #{env['tugboat_action']} dropletname`", :green
           say "For more help run: `tugboat help #{env['tugboat_action']}`", :blue
           exit 1
         end
 
         if porcelain && (!(user_droplet_name || user_droplet_id) || user_fuzzy_name)
-          say "Tugboat expects an exact droplet ID or droplet name for porcelain mode.", :red
+          say 'Tugboat expects an exact droplet ID or droplet name for porcelain mode.', :red
           exit 1
         end
 
@@ -45,8 +45,8 @@ module Tugboat
         # Easy for us if they provide an id. Just set it to the droplet_id
         if user_droplet_id
 
-          if !porcelain
-            say "Droplet id provided. Finding Droplet...", nil, false
+          unless porcelain
+            say 'Droplet id provided. Finding Droplet...', nil, false
           end
           response = ocean.droplet.show user_droplet_id
 
@@ -55,34 +55,33 @@ module Tugboat
             exit 1
           end
 
-          env["droplet_id"] = response.droplet.id
-          env["droplet_name"] = "(#{response.droplet.name})"
-          env["droplet_ip"] = get_public_ip response.droplet.networks.v4
-          env["droplet_ip_private"] = get_private_ip response.droplet.networks.v4
-          env["droplet_status"] = response.droplet.status
+          env['droplet_id'] = response.droplet.id
+          env['droplet_name'] = "(#{response.droplet.name})"
+          env['droplet_ip'] = get_public_ip response.droplet.networks.v4
+          env['droplet_ip_private'] = get_private_ip response.droplet.networks.v4
+          env['droplet_status'] = response.droplet.status
         end
 
         # If they provide a name, we need to get the ID for it.
         # This requires a lookup.
-        if user_droplet_name && !env["droplet_id"]
-          if !porcelain
-            say "Droplet name provided. Finding droplet ID...", nil, false
+        if user_droplet_name && !env['droplet_id']
+          unless porcelain
+            say 'Droplet name provided. Finding droplet ID...', nil, false
           end
 
           # Look for the droplet by an exact name match.
           (get_droplet_list ocean).each do |d|
-            if d.name == user_droplet_name
-              env["droplet_id"] = d.id
-              env["droplet_name"] = "(#{d.name})"
-              env["droplet_ip"] = get_public_ip d.networks.v4
-              env["droplet_ip_private"] = get_private_ip d.networks.v4
-              env["droplet_status"] = d.status
-            end
+            next unless d.name == user_droplet_name
+            env['droplet_id'] = d.id
+            env['droplet_name'] = "(#{d.name})"
+            env['droplet_ip'] = get_public_ip d.networks.v4
+            env['droplet_ip_private'] = get_private_ip d.networks.v4
+            env['droplet_status'] = d.status
           end
 
           # If we coulnd't find it, tell the user and drop out of the
           # sequence.
-          if !env["droplet_id"]
+          unless env['droplet_id']
             say "error\nUnable to find a droplet named '#{user_droplet_name}'.", :red
             exit 1
           end
@@ -93,17 +92,15 @@ module Tugboat
         # with a flag.
         #
         # This requires a lookup.
-        if user_fuzzy_name && !env["droplet_id"]
-          say "Droplet fuzzy name provided. Finding droplet ID...", nil, false
+        if user_fuzzy_name && !env['droplet_id']
+          say 'Droplet fuzzy name provided. Finding droplet ID...', nil, false
 
           found_droplets = []
           choices = []
 
           (get_droplet_list ocean).each do |d|
             # Check to see if one of the droplet names have the fuzzy string.
-            if d.name.upcase.include? user_fuzzy_name.upcase
-              found_droplets << d
-            end
+            found_droplets << d if d.name.upcase.include? user_fuzzy_name.upcase
           end
 
           # Check to see if we have more then one droplet, and prompt
@@ -111,46 +108,46 @@ module Tugboat
           if found_droplets.length == 1
             droplet_return = found_droplets.first
 
-            env["droplet_id"] = droplet_return.id
-            env["droplet_name"] = "(#{droplet_return.name})"
+            env['droplet_id'] = droplet_return.id
+            env['droplet_name'] = "(#{droplet_return.name})"
             if droplet_return.networks.v4.empty?
-              env["droplet_ip"] = '' # No Network Yet
-              env["droplet_ip_private"] = '' # No Network Yet
+              env['droplet_ip'] = '' # No Network Yet
+              env['droplet_ip_private'] = '' # No Network Yet
             else
-              env["droplet_ip"] = get_public_ip droplet_return.networks.v4
-              env["droplet_ip_private"] = get_private_ip droplet_return.networks.v4
+              env['droplet_ip'] = get_public_ip droplet_return.networks.v4
+              env['droplet_ip_private'] = get_private_ip droplet_return.networks.v4
             end
-            env["droplet_status"] = droplet_return.status
+            env['droplet_status'] = droplet_return.status
           elsif found_droplets.length > 1
             # Did we run the multiple questionairre?
             did_run_multiple = true
 
-            say "Multiple droplets found."
+            say 'Multiple droplets found.'
             say
             found_droplets.each_with_index do |d, i|
               say "#{i}) #{d.name} (#{d.id})"
               choices << i.to_s
             end
             say
-            choice = ask "Please choose a droplet:", :limited_to => choices
-            env["droplet_id"] = found_droplets[choice.to_i].id
-            env["droplet_name"] = found_droplets[choice.to_i].name
-            env["droplet_ip"] = get_public_ip found_droplets[choice.to_i].networks.v4
-            env["droplet_ip_private"] = get_private_ip found_droplets[choice.to_i].networks.v4
-            env["droplet_status"] = found_droplets[choice.to_i].status
+            choice = ask 'Please choose a droplet:', limited_to: choices
+            env['droplet_id'] = found_droplets[choice.to_i].id
+            env['droplet_name'] = found_droplets[choice.to_i].name
+            env['droplet_ip'] = get_public_ip found_droplets[choice.to_i].networks.v4
+            env['droplet_ip_private'] = get_private_ip found_droplets[choice.to_i].networks.v4
+            env['droplet_status'] = found_droplets[choice.to_i].status
           end
 
           # If we coulnd't find it, tell the user and drop out of the
           # sequence.
-          if !env["droplet_id"]
+          unless env['droplet_id']
             say "error\nUnable to find a droplet named '#{user_fuzzy_name}'.", :red
             exit 1
           end
         end
 
-        if !did_run_multiple
-          if !porcelain
-            say "done#{CLEAR}, #{env["droplet_id"]} #{env["droplet_name"]}", :green
+        unless did_run_multiple
+          unless porcelain
+            say "done#{CLEAR}, #{env['droplet_id']} #{env['droplet_name']}", :green
           end
         end
         @app.call(env)
@@ -158,4 +155,3 @@ module Tugboat
     end
   end
 end
-