tugboat 2.2.2 → 2.2.3

data/lib/tugboat/config.rb

@@ -9,25 +9,25 @@ module Tugboat
     attr_reader :data
     attr_reader :path
 
-    FILE_NAME = '.tugboat'
-    DEFAULT_SSH_KEY_PATH = '.ssh/id_rsa'
-    DEFAULT_SSH_PORT = '22'
-    DEFAULT_REGION = 'nyc2'
-    DEFAULT_IMAGE = 'ubuntu-14-04-x64'
-    DEFAULT_SIZE = '512mb'
-    DEFAULT_SSH_KEY = ''
-    DEFAULT_IP6 = 'false'
-    DEFAULT_PRIVATE_NETWORKING = 'false'
-    DEFAULT_BACKUPS_ENABLED = 'false'
+    FILE_NAME = '.tugboat'.freeze
+    DEFAULT_SSH_KEY_PATH = '.ssh/id_rsa'.freeze
+    DEFAULT_SSH_PORT = '22'.freeze
+    DEFAULT_REGION = 'nyc2'.freeze
+    DEFAULT_IMAGE = 'ubuntu-14-04-x64'.freeze
+    DEFAULT_SIZE = '512mb'.freeze
+    DEFAULT_SSH_KEY = ''.freeze
+    DEFAULT_IP6 = 'false'.freeze
+    DEFAULT_PRIVATE_NETWORKING = 'false'.freeze
+    DEFAULT_BACKUPS_ENABLED = 'false'.freeze
     DEFAULT_USER_DATA = nil
 
     # Load config file from current directory, if not exit load from user's home directory
     def initialize
-      @path = File.join(File.expand_path("."), FILE_NAME)
-      unless File.exists?(@path)
-        @path = ( ENV["TUGBOAT_CONFIG_PATH"] || File.join(File.expand_path("~"), FILE_NAME) )
+      @path = File.join(File.expand_path('.'), FILE_NAME)
+      unless File.exist?(@path)
+        @path = (ENV['TUGBOAT_CONFIG_PATH'] || File.join(File.expand_path('~'), FILE_NAME))
       end
-      @data = self.load_config_file
+      @data = load_config_file
     end
 
     # If we can't load the config file, self.data is nil, which we can
@@ -97,80 +97,62 @@ module Tugboat
 
     # Re-runs initialize
     def reset!
-      self.send(:initialize)
+      send(:initialize)
     end
 
     # Re-loads the config
     def reload!
-      @data = self.load_config_file
+      @data = load_config_file
     end
 
     # Writes a config file
     def create_config_file(access_token, ssh_key_path, ssh_user, ssh_port, region, image, size, ssh_key, private_networking, backups_enabled, ip6)
       # Default SSH Key path
-      if ssh_key_path.empty?
-        ssh_key_path = File.join("~", DEFAULT_SSH_KEY_PATH)
-      end
+      ssh_key_path = File.join('~', DEFAULT_SSH_KEY_PATH) if ssh_key_path.empty?
 
-      if ssh_user.empty?
-        ssh_user = 'root'
-      end
+      ssh_user = 'root' if ssh_user.empty?
 
-      if ssh_port.empty?
-        ssh_port = DEFAULT_SSH_PORT
-      end
+      ssh_port = DEFAULT_SSH_PORT if ssh_port.empty?
 
-      if region.empty?
-        region = DEFAULT_REGION
-      end
+      region = DEFAULT_REGION if region.empty?
 
-      if image.empty?
-        image = DEFAULT_IMAGE
-      end
+      image = DEFAULT_IMAGE if image.empty?
 
-      if size.empty?
-        size = DEFAULT_SIZE
-      end
+      size = DEFAULT_SIZE if size.empty?
 
-      if ssh_key.empty?
-        default_ssh_key = DEFAULT_SSH_KEY
-      end
+      default_ssh_key = DEFAULT_SSH_KEY if ssh_key.empty?
 
       if private_networking.empty?
         private_networking = DEFAULT_PRIVATE_NETWORKING
       end
 
-      if backups_enabled.empty?
-        backups_enabled = DEFAULT_BACKUPS_ENABLED
-      end
+      backups_enabled = DEFAULT_BACKUPS_ENABLED if backups_enabled.empty?
 
-      if ip6.empty?
-        ip6 = DEFAULT_IP6
-      end
+      ip6 = DEFAULT_IP6 if ip6.empty?
 
       require 'yaml'
-      File.open(@path, File::RDWR|File::TRUNC|File::CREAT, 0600) do |file|
+      File.open(@path, File::RDWR | File::TRUNC | File::CREAT, 0o600) do |file|
         data = {
-                "authentication" => {
-                  "access_token" => access_token
-                },
-                "ssh" => {
-                  "ssh_user" => ssh_user,
-                  "ssh_key_path" => ssh_key_path ,
-                  "ssh_port" => ssh_port },
-                "defaults" => {
-                  "region" => region,
-                  "image" => image,
-                  "size" => size,
-                  "ssh_key" => ssh_key,
-                  "private_networking" => private_networking,
-                  "backups_enabled" => backups_enabled,
-                  "ip6" => ip6,
-                }
+          'authentication' => {
+            'access_token' => access_token
+          },
+          'ssh' => {
+            'ssh_user' => ssh_user,
+            'ssh_key_path' => ssh_key_path,
+            'ssh_port' => ssh_port
+          },
+          'defaults' => {
+            'region' => region,
+            'image' => image,
+            'size' => size,
+            'ssh_key' => ssh_key,
+            'private_networking' => private_networking,
+            'backups_enabled' => backups_enabled,
+            'ip6' => ip6
+          }
         }
         file.write data.to_yaml
       end
     end
-
   end
 end

data/lib/tugboat/middleware.rb

@@ -1,39 +1,39 @@
-require "middleware"
+require 'middleware'
 
 module Tugboat
   module Middleware
-    autoload :AddKey, "tugboat/middleware/add_key"
-    autoload :AskForCredentials, "tugboat/middleware/ask_for_credentials"
-    autoload :Base, "tugboat/middleware/base"
-    autoload :CheckConfiguration, "tugboat/middleware/check_configuration"
-    autoload :CheckCredentials, "tugboat/middleware/check_credentials"
-    autoload :CheckDropletActive, "tugboat/middleware/check_droplet_active"
-    autoload :CheckDropletInactive, "tugboat/middleware/check_droplet_inactive"
-    autoload :Config, "tugboat/middleware/config"
-    autoload :ConfirmAction, "tugboat/middleware/confirm_action"
-    autoload :CreateDroplet, "tugboat/middleware/create_droplet"
-    autoload :RebuildDroplet, "tugboat/middleware/rebuild_droplet"
-    autoload :DestroyDroplet, "tugboat/middleware/destroy_droplet"
-    autoload :DestroyImage, "tugboat/middleware/destroy_image"
-    autoload :FindDroplet, "tugboat/middleware/find_droplet"
-    autoload :FindImage, "tugboat/middleware/find_image"
-    autoload :HaltDroplet, "tugboat/middleware/halt_droplet"
-    autoload :InfoDroplet, "tugboat/middleware/info_droplet"
-    autoload :InfoImage, "tugboat/middleware/info_image"
-    autoload :InjectClient, "tugboat/middleware/inject_client"
-    autoload :InjectConfiguration, "tugboat/middleware/inject_configuration"
-    autoload :ListDroplets, "tugboat/middleware/list_droplets"
-    autoload :ListImages, "tugboat/middleware/list_images"
-    autoload :ListRegions, "tugboat/middleware/list_regions"
-    autoload :ListSizes, "tugboat/middleware/list_sizes"
-    autoload :ListSSHKeys, "tugboat/middleware/list_ssh_keys"
-    autoload :PasswordReset, "tugboat/middleware/password_reset"
-    autoload :ResizeDroplet, "tugboat/middleware/resize_droplet"
-    autoload :RestartDroplet, "tugboat/middleware/restart_droplet"
-    autoload :SnapshotDroplet, "tugboat/middleware/snapshot_droplet"
-    autoload :SSHDroplet, "tugboat/middleware/ssh_droplet"
-    autoload :StartDroplet, "tugboat/middleware/start_droplet"
-    autoload :WaitForState, "tugboat/middleware/wait_for_state"
+    autoload :AddKey, 'tugboat/middleware/add_key'
+    autoload :AskForCredentials, 'tugboat/middleware/ask_for_credentials'
+    autoload :Base, 'tugboat/middleware/base'
+    autoload :CheckConfiguration, 'tugboat/middleware/check_configuration'
+    autoload :CheckCredentials, 'tugboat/middleware/check_credentials'
+    autoload :CheckDropletActive, 'tugboat/middleware/check_droplet_active'
+    autoload :CheckDropletInactive, 'tugboat/middleware/check_droplet_inactive'
+    autoload :Config, 'tugboat/middleware/config'
+    autoload :ConfirmAction, 'tugboat/middleware/confirm_action'
+    autoload :CreateDroplet, 'tugboat/middleware/create_droplet'
+    autoload :RebuildDroplet, 'tugboat/middleware/rebuild_droplet'
+    autoload :DestroyDroplet, 'tugboat/middleware/destroy_droplet'
+    autoload :DestroyImage, 'tugboat/middleware/destroy_image'
+    autoload :FindDroplet, 'tugboat/middleware/find_droplet'
+    autoload :FindImage, 'tugboat/middleware/find_image'
+    autoload :HaltDroplet, 'tugboat/middleware/halt_droplet'
+    autoload :InfoDroplet, 'tugboat/middleware/info_droplet'
+    autoload :InfoImage, 'tugboat/middleware/info_image'
+    autoload :InjectClient, 'tugboat/middleware/inject_client'
+    autoload :InjectConfiguration, 'tugboat/middleware/inject_configuration'
+    autoload :ListDroplets, 'tugboat/middleware/list_droplets'
+    autoload :ListImages, 'tugboat/middleware/list_images'
+    autoload :ListRegions, 'tugboat/middleware/list_regions'
+    autoload :ListSizes, 'tugboat/middleware/list_sizes'
+    autoload :ListSSHKeys, 'tugboat/middleware/list_ssh_keys'
+    autoload :PasswordReset, 'tugboat/middleware/password_reset'
+    autoload :ResizeDroplet, 'tugboat/middleware/resize_droplet'
+    autoload :RestartDroplet, 'tugboat/middleware/restart_droplet'
+    autoload :SnapshotDroplet, 'tugboat/middleware/snapshot_droplet'
+    autoload :SSHDroplet, 'tugboat/middleware/ssh_droplet'
+    autoload :StartDroplet, 'tugboat/middleware/start_droplet'
+    autoload :WaitForState, 'tugboat/middleware/wait_for_state'
 
     # Start the authorization flow.
     # This writes a ~/.tugboat file, which can be edited manually.

data/lib/tugboat/middleware/add_key.rb

@@ -4,40 +4,40 @@ module Tugboat
       def call(env)
         ocean = env['barge']
 
-        if env["add_key_pub_key"]
-          pub_key_string = env["add_key_pub_key"]
+        if env['add_key_pub_key']
+          pub_key_string = env['add_key_pub_key']
         else
-          if env["add_key_file_path"]
-            pub_key_string = File.read(env["add_key_file_path"])
+          if env['add_key_file_path']
+            pub_key_string = File.read(env['add_key_file_path'])
           else
             possible_keys = Dir.glob("#{ENV['HOME']}/.ssh/*.pub")
 
             # Only show hinted keys if the user has any
-            if possible_keys.size > 0
+            unless possible_keys.empty?
               say "Possible public key paths from #{ENV['HOME']}/.ssh:"
               say
               possible_keys.each do |key_file|
-                say "#{key_file}"
+                say key_file.to_s
               end
               say
             end
 
-            ssh_key_file = ask "Enter the path to your SSH key:"
-            pub_key_string = File.read("#{ssh_key_file}")
+            ssh_key_file = ask 'Enter the path to your SSH key:'
+            pub_key_string = File.read(ssh_key_file.to_s)
           end
         end
 
-        say "Queueing upload of SSH key '#{env["add_key_name"]}'...", nil, false
+        say "Queueing upload of SSH key '#{env['add_key_name']}'...", nil, false
 
-        response = ocean.key.create :name => env["add_key_name"],
-                               :public_key  => pub_key_string
+        response = ocean.key.create name: env['add_key_name'],
+                                    public_key: pub_key_string
 
         unless response.success?
           say "Failed to create key: #{response.message}", :red
           exit 1
         end
 
-        say "SSH Key uploaded", :green
+        say 'SSH Key uploaded', :green
         say
         say "Name: #{response.ssh_key.name}"
         say "ID: #{response.ssh_key.id}"
@@ -47,4 +47,3 @@ module Tugboat
     end
   end
 end
-

data/lib/tugboat/middleware/ask_for_credentials.rb

@@ -3,24 +3,24 @@ module Tugboat
     # Ask for user credentials from the command line, then write them out.
     class AskForCredentials < Base
       def call(env)
-        say "Note: You can get your Access Token from https://cloud.digitalocean.com/settings/tokens/new", :yellow
+        say 'Note: You can get your Access Token from https://cloud.digitalocean.com/settings/tokens/new', :yellow
         say
-        access_token = ask "Enter your access token:"
+        access_token = ask 'Enter your access token:'
         access_token.strip!
-        ssh_key_path = ask "Enter your SSH key path (optional, defaults to ~/.ssh/id_rsa):"
-        ssh_user = ask "Enter your SSH user (optional, defaults to root):"
-        ssh_port = ask "Enter your SSH port number (optional, defaults to 22):"
+        ssh_key_path = ask 'Enter your SSH key path (optional, defaults to ~/.ssh/id_rsa):'
+        ssh_user = ask 'Enter your SSH user (optional, defaults to root):'
+        ssh_port = ask 'Enter your SSH port number (optional, defaults to 22):'
         say
         say "To retrieve region, image, size and key ID's, you can use the corresponding tugboat command, such as `tugboat images`."
-        say "Defaults can be changed at any time in your ~/.tugboat configuration file."
+        say 'Defaults can be changed at any time in your ~/.tugboat configuration file.'
         say
-        region   = ask "Enter your default region (optional, defaults to nyc1):"
-        image    = ask "Enter your default image ID or image slug (optional, defaults to ubuntu-14-04-x64):"
-        size     = ask "Enter your default size (optional, defaults to 512mb)):"
+        region   = ask 'Enter your default region (optional, defaults to nyc1):'
+        image    = ask 'Enter your default image ID or image slug (optional, defaults to ubuntu-14-04-x64):'
+        size     = ask 'Enter your default size (optional, defaults to 512mb)):'
         ssh_key  = ask "Enter your default ssh key IDs (optional, defaults to none, array of IDs of ssh keys eg. ['1234']):"
-        private_networking = ask "Enter your default for private networking (optional, defaults to false):"
-        backups_enabled = ask "Enter your default for enabling backups (optional, defaults to false):"
-        ip6      = ask "Enter your default for IPv6 (optional, defaults to false):"
+        private_networking = ask 'Enter your default for private networking (optional, defaults to false):'
+        backups_enabled = ask 'Enter your default for enabling backups (optional, defaults to false):'
+        ip6 = ask 'Enter your default for IPv6 (optional, defaults to false):'
 
         # Write the config file.
         env['config'].create_config_file(access_token, ssh_key_path, ssh_user, ssh_port, region, image, size, ssh_key, private_networking, backups_enabled, ip6)
@@ -31,4 +31,3 @@ module Tugboat
     end
   end
 end
-

data/lib/tugboat/middleware/base.rb

@@ -3,10 +3,10 @@ module Tugboat
     # A base middleware class to initalize.
     class Base
       # Some colors for making things pretty.
-      CLEAR      = "\e[0m"
-      RED        = "\e[31m"
-      GREEN      = "\e[32m"
-      YELLOW     = "\e[33m"
+      CLEAR      = "\e[0m".freeze
+      RED        = "\e[31m".freeze
+      GREEN      = "\e[32m".freeze
+      YELLOW     = "\e[33m".freeze
 
       # We want access to all of the fun thor cli helper methods,
       # like say, yes?, ask, etc.
@@ -15,7 +15,7 @@ module Tugboat
       def initialize(app)
         @app = app
         # This resets the color to "clear" on the user's terminal.
-        say "", :clear, false
+        say '', :clear, false
       end
 
       def check_response_success(task_string, response)
@@ -29,11 +29,11 @@ module Tugboat
         @app.call(env)
       end
 
-      def verify_credentials(ocean, say_success=false)
+      def verify_credentials(ocean, say_success = false)
         begin
-          response = ocean.droplet.all({:per_page =>'1', :page =>'1'})
+          response = ocean.droplet.all(per_page: '1', page: '1')
         rescue Faraday::ClientError => e
-          say "Authentication with DigitalOcean failed at an early stage"
+          say 'Authentication with DigitalOcean failed at an early stage'
           say "Error was: #{e}"
           exit 1
         end
@@ -43,25 +43,25 @@ module Tugboat
           exit 1
         end
 
-        say "Authentication with DigitalOcean was successful.", :green if say_success
+        say 'Authentication with DigitalOcean was successful.', :green if say_success
       end
 
-      def wait_for_state(droplet_id, desired_state,ocean)
+      def wait_for_state(droplet_id, desired_state, ocean)
         start_time = Time.now
 
         response = ocean.droplet.show droplet_id
 
-        say ".", nil, false
+        say '.', nil, false
 
-        if !response.success?
+        unless response.success?
           say "Failed to get status of Droplet: #{response.message}", :red
           exit 1
         end
 
-        while response.droplet.status != desired_state do
+        while response.droplet.status != desired_state
           sleep 2
           response = ocean.droplet.show droplet_id
-          say ".", nil, false
+          say '.', nil, false
         end
 
         total_time = (Time.now - start_time).to_i
@@ -69,15 +69,22 @@ module Tugboat
         say "done#{CLEAR} (#{total_time}s)", :green
       end
 
+      def restart_droplet(hard_restart, ocean, droplet_id = '', droplet_name = '')
+        if hard_restart
+          say "Queuing hard restart for #{droplet_id} #{droplet_name}...", nil, false
+          ocean.droplet.power_cycle droplet_id
+        else
+          say "Queuing restart for #{droplet_id} #{droplet_name}...", nil, false
+          ocean.droplet.reboot droplet_id
+        end
+      end
+
       # Get all pages of droplets
       def get_droplet_list(ocean)
-
         verify_credentials(ocean)
 
         page = ocean.droplet.all(per_page: 200, page: 1)
-        if not page.paginated?
-          return page.droplets
-        end
+        return page.droplets unless page.paginated?
 
         Enumerator.new do |enum|
           page.droplets.each { |drop| enum.yield drop }
@@ -88,7 +95,5 @@ module Tugboat
         end
       end
     end
-
   end
 end
-

data/lib/tugboat/middleware/check_configuration.rb

@@ -3,22 +3,19 @@ module Tugboat
     # Check if the client has set-up configuration yet.
     class CheckConfiguration < Base
       def call(env)
-        config = env["config"]
+        config = env['config']
 
         if !config || !config.data || !config.access_token
-          say "You must run `tugboat authorize` in order to connect to DigitalOcean", :red
+          say 'You must run `tugboat authorize` in order to connect to DigitalOcean', :red
           exit 1
         end
 
         # If the user passes the global `-q/--quiet` flag, redirect
         # stdout
-        if env["user_quiet"]
-          $stdout = File.new('/dev/null', 'w')
-        end
+        $stdout = File.new('/dev/null', 'w') if env['user_quiet']
 
         @app.call(env)
       end
     end
   end
 end
-