tugboat 2.2.2 → 2.2.3

data/lib/tugboat/middleware/find_image.rb

@@ -11,7 +11,7 @@ module Tugboat
         # First, if nothing is provided to us, we should quit and
         # let the user know.
         if !user_fuzzy_name && !user_image_name && !user_image_id
-          say "Tugboat attempted to find an image with no arguments.", :red
+          say 'Tugboat attempted to find an image with no arguments.', :red
           say "Try running `tugboat #{env['tugboat_action']} imagename`", :green
           say "For more help run: `tugboat help #{env['tugboat_action']}`", :blue
           exit 1
@@ -24,7 +24,7 @@ module Tugboat
 
         # Easy for us if they provide an id. Just set it to the image_id
         if user_image_id
-          say "Image id provided. Finding Image...", nil, false
+          say 'Image id provided. Finding Image...', nil, false
           response = ocean.image.show user_image_id
 
           unless response.success?
@@ -32,26 +32,26 @@ module Tugboat
             exit 1
           end
 
-          env["image_id"] = response.image.id
-          env["image_name"] = "(#{response.image.name})"
+          env['image_id'] = response.image.id
+          env['image_name'] = "(#{response.image.name})"
         end
 
         # If they provide a name, we need to get the ID for it.
         # This requires a lookup.
-        if user_image_name && !env["image_id"]
-          say "Image name provided. Finding Image...", nil, false
+        if user_image_name && !env['image_id']
+          say 'Image name provided. Finding Image...', nil, false
 
           # Look for the image by an exact name match.
           ocean.image.all['images'].each do |d|
             if d.name == user_image_name
-              env["image_id"] = d.id
-              env["image_name"] = "(#{d.name})"
+              env['image_id'] = d.id
+              env['image_name'] = "(#{d.name})"
             end
           end
 
           # If we coulnd't find it, tell the user and drop out of the
           # sequence.
-          if !env["image_id"]
+          unless env['image_id']
             say "error\nUnable to find an image named '#{user_image_name}'.", :red
             exit 1
           end
@@ -62,61 +62,55 @@ module Tugboat
         # with a flag.
         #
         # This requires a lookup.
-        if user_fuzzy_name && !env["image_id"]
-          say "Image fuzzy name provided. Finding image ID...", nil, false
+        if user_fuzzy_name && !env['image_id']
+          say 'Image fuzzy name provided. Finding image ID...', nil, false
 
           found_images = []
           choices = []
 
-          ocean.image.all['images'].each_with_index do |d, i|
-
+          ocean.image.all['images'].each_with_index do |d, _i|
             # Check to see if one of the image names have the fuzzy string.
-            if d.name.upcase.include? user_fuzzy_name.upcase
-              found_images << d
-            end
+            found_images << d if d.name.upcase.include? user_fuzzy_name.upcase
 
             unless d.slug.nil?
-              if d.slug.upcase.include? user_fuzzy_name.upcase
-                found_images << d
-              end
+              found_images << d if d.slug.upcase.include? user_fuzzy_name.upcase
             end
           end
 
           # Check to see if we have more then one image, and prompt
           # a user to choose otherwise.
           if found_images.length == 1
-            env["image_id"] = found_images.first.id
-            env["image_name"] = "(#{found_images.first.name})"
+            env['image_id'] = found_images.first.id
+            env['image_name'] = "(#{found_images.first.name})"
           elsif found_images.length > 1
             # Did we run the multiple questionairre?
             did_run_multiple = true
 
-            say "Multiple images found."
+            say 'Multiple images found.'
             say
             found_images.each_with_index do |d, i|
               say "#{i}) #{d.name} (#{d.id})"
               choices << i.to_s
             end
             say
-            choice = ask "Please choose a image:", :limited_to => choices
-            env["image_id"] = found_images[choice.to_i].id
-            env["image_name"] = found_images[choice.to_i].name
+            choice = ask 'Please choose a image:', limited_to: choices
+            env['image_id'] = found_images[choice.to_i].id
+            env['image_name'] = found_images[choice.to_i].name
           end
 
           # If we coulnd't find it, tell the user and drop out of the
           # sequence.
-          if !env["image_id"]
+          unless env['image_id']
             say "error\nUnable to find an image named '#{user_fuzzy_name}'.", :red
             exit 1
           end
         end
 
-        if !did_run_multiple
-          say "done#{CLEAR}, #{env["image_id"]} #{env["image_name"]}", :green
+        unless did_run_multiple
+          say "done#{CLEAR}, #{env['image_id']} #{env['image_name']}", :green
         end
         @app.call(env)
       end
     end
   end
 end
-

data/lib/tugboat/middleware/halt_droplet.rb

@@ -4,19 +4,19 @@ module Tugboat
       def call(env)
         ocean = env['barge']
 
-        response = if env["user_droplet_hard"]
-          say "Queuing hard shutdown for #{env["droplet_id"]} #{env["droplet_name"]}...", nil, false
-          ocean.droplet.power_off env["droplet_id"]
-        else
-          say "Queuing shutdown for #{env["droplet_id"]} #{env["droplet_name"]}...", nil, false
-          ocean.droplet.shutdown env["droplet_id"]
+        response = if env['user_droplet_hard']
+                     say "Queuing hard shutdown for #{env['droplet_id']} #{env['droplet_name']}...", nil, false
+                     ocean.droplet.power_off env['droplet_id']
+                   else
+                     say "Queuing shutdown for #{env['droplet_id']} #{env['droplet_name']}...", nil, false
+                     ocean.droplet.shutdown env['droplet_id']
         end
 
-        unless response.success?
+        if response.success?
+          say 'Halt successful!', :green
+        else
           say "Failed to halt on Droplet: #{response.message}", :red
           exit 1
-        else
-          say "Halt successful!", :green
         end
 
         @app.call(env)
@@ -24,4 +24,3 @@ module Tugboat
     end
   end
 end
-

data/lib/tugboat/middleware/info_droplet.rb

@@ -4,7 +4,7 @@ module Tugboat
       def call(env)
         ocean = env['barge']
 
-        response = ocean.droplet.show env["droplet_id"]
+        response = ocean.droplet.show env['droplet_id']
 
         check_response_success('get info for Droplet', response)
 
@@ -15,45 +15,45 @@ module Tugboat
           exit 1
         end
 
-        if droplet.status == "active"
-          status_color = GREEN
-        else
-          status_color = RED
-        end
+        status_color = if droplet.status == 'active'
+                         GREEN
+                       else
+                         RED
+                       end
 
-        attribute = env["user_attribute"]
+        attribute = env['user_attribute']
 
-        droplet_ip4_public = droplet.networks.v4.detect { |address| address.type == 'public' }.ip_address
-        droplet_ip6_public = droplet.networks.v6.detect { |address| address.type == 'public' }.ip_address unless droplet.networks.v6.empty?
-        check_private_ip   = droplet.networks.v4.detect { |address| address.type == 'private' }
+        droplet_ip4_public = droplet.networks.v4.find { |address| address.type == 'public' }.ip_address
+        droplet_ip6_public = droplet.networks.v6.find { |address| address.type == 'public' }.ip_address unless droplet.networks.v6.empty?
+        check_private_ip   = droplet.networks.v4.find { |address| address.type == 'private' }
         droplet_private_ip = check_private_ip.ip_address if check_private_ip
 
         attributes_list = [
-          ["name",  droplet.name],
-          ["id",  droplet.id],
-          ["status",  droplet.status],
-          ["ip4",  droplet_ip4_public],
-          ["ip6",  droplet_ip6_public],
-          ["private_ip",  droplet_private_ip],
-          ["region",  droplet.region.slug],
-          ["image",  droplet.image.id],
-          ["size",  droplet.size_slug],
-          ["backups_active",  !droplet.backup_ids.empty?]
+          ['name', droplet.name],
+          ['id', droplet.id],
+          ['status', droplet.status],
+          ['ip4',  droplet_ip4_public],
+          ['ip6',  droplet_ip6_public],
+          ['private_ip', droplet_private_ip],
+          ['region', droplet.region.slug],
+          ['image', droplet.image.id],
+          ['size', droplet.size_slug],
+          ['backups_active', !droplet.backup_ids.empty?]
         ]
         attributes = Hash[*attributes_list.flatten(1)]
 
         if attribute
-          if attributes.has_key? attribute
+          if attributes.key? attribute
             say attributes[attribute]
           else
             say "Invalid attribute \"#{attribute}\"", :red
-            say "Provide one of the following:", :red
+            say 'Provide one of the following:', :red
             attributes_list.each { |a| say "    #{a[0]}", :red }
             exit 1
           end
         else
-          if env["user_porcelain"]
-            attributes_list.select{ |a| a[1] != nil }.each{ |a| say "#{a[0]} #{a[1]}"}
+          if env['user_porcelain']
+            attributes_list.select { |a| !a[1].nil? }.each { |a| say "#{a[0]} #{a[1]}" }
           else
             say
             say "Name:             #{droplet.name}"
@@ -62,15 +62,13 @@ module Tugboat
             say "IP4:              #{droplet_ip4_public}"
             say "IP6:              #{droplet_ip6_public}" unless droplet.networks.v6.empty?
 
-            if droplet_private_ip
-              say "Private IP:       #{droplet_private_ip}"
-            end
+            say "Private IP:       #{droplet_private_ip}" if droplet_private_ip
 
-            if droplet.image.slug.nil?
-              image_description  = droplet.image.name
-            else
-              image_description = droplet.image.slug
-            end
+            image_description = if droplet.image.slug.nil?
+                                  droplet.image.name
+                                else
+                                  droplet.image.slug
+                                end
 
             say "Region:           #{droplet.region.name} - #{droplet.region.slug}"
             say "Image:            #{droplet.image.id} - #{image_description}"
@@ -84,4 +82,3 @@ module Tugboat
     end
   end
 end
-

data/lib/tugboat/middleware/info_image.rb

@@ -4,7 +4,7 @@ module Tugboat
       def call(env)
         ocean = env['barge']
 
-        response = ocean.image.show env["image_id"]
+        response = ocean.image.show env['image_id']
 
         unless response.success?
           say "Failed to get info for Image: #{response.message}", :red

data/lib/tugboat/middleware/inject_client.rb

@@ -5,19 +5,17 @@ module Tugboat
   module Middleware
     # Inject the digital ocean client into the environment
     class InjectClient < Base
+      def call(env)
+        # Sets the digital ocean client into the environment for use
+        # later.
+        @access_token = env['config'].access_token
 
-        def call(env)
-          # Sets the digital ocean client into the environment for use
-          # later.
-          @access_token = env["config"].access_token
+        env['barge'] = Barge::Client.new(access_token: @access_token)
 
-          env['barge'] = Barge::Client.new(:access_token => @access_token)
+        env['barge'].faraday.use CustomLogger if ENV['DEBUG']
 
-          env['barge'].faraday.use CustomLogger if ENV['DEBUG']
-
-          @app.call(env)
-        end
+        @app.call(env)
+      end
     end
   end
 end
-

data/lib/tugboat/middleware/inject_configuration.rb

@@ -5,11 +5,10 @@ module Tugboat
       def call(env)
         config = Tugboat::Configuration.instance
 
-        env["config"] = config
+        env['config'] = config
 
         @app.call(env)
       end
     end
   end
 end
-

data/lib/tugboat/middleware/list_droplets.rb

@@ -13,22 +13,22 @@ module Tugboat
         droplet_list.each do |droplet|
           has_one = true
 
-          private_addr = droplet.networks.v4.detect { |address| address.type == 'private' }
+          private_addr = droplet.networks.v4.find { |address| address.type == 'private' }
           if private_addr
             private_ip = ", private_ip: #{private_addr.ip_address}"
           end
 
-          if droplet.status == "active"
-            status_color = GREEN
-          else
-            status_color = RED
-          end
+          status_color = if droplet.status == 'active'
+                           GREEN
+                         else
+                           RED
+                         end
 
-          public_addr = droplet.networks.v4.detect { |address| address.type == 'public' }
-          say "#{droplet.name} (ip: #{public_addr.ip_address}#{private_ip}, status: #{status_color}#{droplet.status}#{CLEAR}, region: #{droplet.region.slug}, id: #{droplet.id}#{env["include_urls"] ? droplet_id_to_url(droplet.id) : '' })"
+          public_addr = droplet.networks.v4.find { |address| address.type == 'public' }
+          say "#{droplet.name} (ip: #{public_addr.ip_address}#{private_ip}, status: #{status_color}#{droplet.status}#{CLEAR}, region: #{droplet.region.slug}, id: #{droplet.id}#{env['include_urls'] ? droplet_id_to_url(droplet.id) : ''})"
         end
 
-        if not has_one
+        unless has_one
           say "You don't appear to have any droplets.", :red
           say "Try creating one with #{GREEN}\`tugboat create\`#{CLEAR}"
         end
@@ -44,4 +44,3 @@ module Tugboat
     end
   end
 end
-

data/lib/tugboat/middleware/list_images.rb

@@ -3,33 +3,33 @@ module Tugboat
     class ListImages < Base
       def call(env)
         ocean = env['barge']
-        my_images = ocean.image.all(:private => true)
+        my_images = ocean.image.all(private: true)
         public_images = ocean.image.all.images - my_images.images
 
         if env['user_show_just_private_images']
-          say "Showing just private images", :green
-          say "Private Images:", :blue
+          say 'Showing just private images', :green
+          say 'Private Images:', :blue
           my_images_list = my_images.images
           if my_images_list.nil? || my_images_list.empty?
-            say "No private images found"
+            say 'No private images found'
           else
             my_images_list.each do |image|
               say "#{image.name} (id: #{image.id}, distro: #{image.distribution})"
             end
           end
         else
-          say "Showing both private and public images"
-          say "Private Images:", :blue
+          say 'Showing both private and public images'
+          say 'Private Images:', :blue
           my_images_list = my_images.images
           if my_images_list.nil? || my_images_list.empty?
-            say "No private images found"
+            say 'No private images found'
           else
             my_images_list.each do |image|
               say "#{image.name} (id: #{image.id}, distro: #{image.distribution})"
             end
           end
           say ''
-          say "Public Images:", :blue
+          say 'Public Images:', :blue
           public_images.each do |image|
             say "#{image.name} (slug: #{image.slug}, id: #{image.id}, distro: #{image.distribution})"
           end
@@ -39,4 +39,4 @@ module Tugboat
       end
     end
   end
-end
+end

data/lib/tugboat/middleware/list_regions.rb

@@ -5,7 +5,7 @@ module Tugboat
         ocean = env['barge']
         regions = ocean.region.all.regions.sort_by(&:name)
 
-        say "Regions:"
+        say 'Regions:'
         regions.each do |region|
           say "#{region.name} (slug: #{region.slug})"
         end

data/lib/tugboat/middleware/list_sizes.rb

@@ -5,7 +5,7 @@ module Tugboat
         ocean = env['barge']
         sizes = ocean.size.all.sizes
 
-        say "Sizes:"
+        say 'Sizes:'
         sizes.each do |size|
           say "Disk: #{size.disk}GB, Memory: #{size.memory.round}MB (slug: #{size.slug})"
         end

data/lib/tugboat/middleware/list_ssh_keys.rb

@@ -2,11 +2,10 @@ module Tugboat
   module Middleware
     class ListSSHKeys < Base
       def call(env)
-
         ocean = env['barge']
         ssh_keys = ocean.key.all.ssh_keys
 
-        say "SSH Keys:"
+        say 'SSH Keys:'
         ssh_keys.each do |key|
           say "Name: #{key.name}, (id: #{key.id}), fingerprint: #{key.fingerprint}"
         end
@@ -16,4 +15,3 @@ module Tugboat
     end
   end
 end
-

data/lib/tugboat/middleware/password_reset.rb

@@ -4,15 +4,15 @@ module Tugboat
       def call(env)
         ocean = env['barge']
 
-        say "Queuing password reset for #{env["droplet_id"]} #{env["droplet_name"]}...", nil, false
-        response = ocean.droplet.password_reset env["droplet_id"]
+        say "Queuing password reset for #{env['droplet_id']} #{env['droplet_name']}...", nil, false
+        response = ocean.droplet.password_reset env['droplet_id']
 
-        unless response.success?
+        if response.success?
+          say 'Password reset successful!', :green
+          say 'Your new root password will be emailed to you', :green
+        else
           say "Failed to reset password on Droplet: #{response.message}", :red
           exit 1
-        else
-          say "Password reset successful!", :green
-          say "Your new root password will be emailed to you", :green
         end
 
         @app.call(env)
@@ -20,4 +20,3 @@ module Tugboat
     end
   end
 end
-