tugboat 3.1.0 → 4.0.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 5b8787d22acda9fd2e2ac560566728409455b1bf
-  data.tar.gz: 1e500c05d736053ed3ace1361be8ccf2ccdf8a78
+  metadata.gz: fbcf98dca8237e5bfd743b99bff3f3a328adef69
+  data.tar.gz: 8a9d169c00582cc9c71de34f38573d35cfe1fee5
 SHA512:
-  metadata.gz: 8289a445f4e81da10750403d750d78ae98a434131a4423e0bb4bb2acaf39912af9b9671b8e18f60f9696f8ab805e2cfa9b8acfd1a4e79eae6325829f5fcd9815
-  data.tar.gz: 180d935cb0b0690b60971e253212525978a2a87d8655e7b941a09ec056f956b268857576c243c1fb50277cb12090f4d5210ded93fc7503b42d6a32fc30ca3b5e
+  metadata.gz: 8cce0f1c41b15927f149aa687b5f9e2f3edf05e50da812f54cac4ba69253f64a92bc792f9a77d79e8a09103e4c804f20172c121bc1da5337465b82ff1304a9aa
+  data.tar.gz: e0dc3a1f73e12a0da367269228fbcb79edcd58c995f1186e642f7be8283cf0a11a0924308e3ef05337deb471a131942ec5c1d30bcedf23bd91df3344891398c7

data/CHANGELOG.md

@@ -2,6 +2,27 @@
 
 All notable changes to this project will be documented in this file.
 
+## [v4.0.0](https://github.com/petems/tugboat/tree/v4.0.0) (2017-12-03)
+[Full Changelog](https://github.com/petems/tugboat/compare/v3.1.0...v4.0.0)
+
+**Fixed bugs:**
+
+- snapshot not working [\#280](https://github.com/petems/tugboat/issues/280)
+- Release Tugboat for 2.4.1 support [\#279](https://github.com/petems/tugboat/issues/279)
+- Timeout while executing tugboat wait [\#71](https://github.com/petems/tugboat/issues/71)
+
+**Merged pull requests:**
+
+- Removing `Assigned but unused variable` warnings [\#292](https://github.com/petems/tugboat/pull/292) ([petems](https://github.com/petems))
+- Adds helper for showing snapshot parameter [\#290](https://github.com/petems/tugboat/pull/290) ([petems](https://github.com/petems))
+- Updates Faraday middleware gem [\#289](https://github.com/petems/tugboat/pull/289) ([petems](https://github.com/petems))
+- Create CODE\_OF\_CONDUCT.md [\#288](https://github.com/petems/tugboat/pull/288) ([petems](https://github.com/petems))
+- Add Size Slug [\#287](https://github.com/petems/tugboat/pull/287) ([petems](https://github.com/petems))
+- Changes debug output to allow multiple regex [\#286](https://github.com/petems/tugboat/pull/286) ([petems](https://github.com/petems))
+- Switches `$stdout` redirection to rspec method [\#285](https://github.com/petems/tugboat/pull/285) ([petems](https://github.com/petems))
+- Change listing droplets to use DK [\#284](https://github.com/petems/tugboat/pull/284) ([petems](https://github.com/petems))
+- Add configurable timeout to config file [\#283](https://github.com/petems/tugboat/pull/283) ([petems](https://github.com/petems))
+
 ## [v3.1.0](https://github.com/petems/tugboat/tree/v3.1.0) (2017-07-13)
 [Full Changelog](https://github.com/petems/tugboat/compare/v3.0.0...v3.1.0)
 
@@ -334,7 +355,7 @@ All notable changes to this project will be documented in this file.
 
 - destroy and info command [\#91](https://github.com/petems/tugboat/pull/91) ([PierreFrisch](https://github.com/PierreFrisch))
 - Add rebuild command [\#90](https://github.com/petems/tugboat/pull/90) ([PierreFrisch](https://github.com/PierreFrisch))
-- Fuzzy name searching is now case insensitive [\#88](https://github.com/petems/tugboat/pull/88) ([Vel0x](https://github.com/Vel0x))
+- Fuzzy name searching is now case insensitive [\#88](https://github.com/petems/tugboat/pull/88) ([dalemyers](https://github.com/dalemyers))
 - global: add a -q/--quiet flag [\#87](https://github.com/petems/tugboat/pull/87) ([pearkes](https://github.com/pearkes))
 - Add backups\_enabled option on droplet creation \(-b true\) [\#82](https://github.com/petems/tugboat/pull/82) ([4n3w](https://github.com/4n3w))
 

data/CODE_OF_CONDUCT.md

@@ -0,0 +1,46 @@
+# Contributor Covenant Code of Conduct
+
+## Our Pledge
+
+In the interest of fostering an open and welcoming environment, we as contributors and maintainers pledge to making participation in our project and our community a harassment-free experience for everyone, regardless of age, body size, disability, ethnicity, gender identity and expression, level of experience, nationality, personal appearance, race, religion, or sexual identity and orientation.
+
+## Our Standards
+
+Examples of behavior that contributes to creating a positive environment include:
+
+* Using welcoming and inclusive language
+* Being respectful of differing viewpoints and experiences
+* Gracefully accepting constructive criticism
+* Focusing on what is best for the community
+* Showing empathy towards other community members
+
+Examples of unacceptable behavior by participants include:
+
+* The use of sexualized language or imagery and unwelcome sexual attention or advances
+* Trolling, insulting/derogatory comments, and personal or political attacks
+* Public or private harassment
+* Publishing others' private information, such as a physical or electronic address, without explicit permission
+* Other conduct which could reasonably be considered inappropriate in a professional setting
+
+## Our Responsibilities
+
+Project maintainers are responsible for clarifying the standards of acceptable behavior and are expected to take appropriate and fair corrective action in response to any instances of unacceptable behavior.
+
+Project maintainers have the right and responsibility to remove, edit, or reject comments, commits, code, wiki edits, issues, and other contributions that are not aligned to this Code of Conduct, or to ban temporarily or permanently any contributor for other behaviors that they deem inappropriate, threatening, offensive, or harmful.
+
+## Scope
+
+This Code of Conduct applies both within project spaces and in public spaces when an individual is representing the project or its community. Examples of representing a project or community include using an official project e-mail address, posting via an official social media account, or acting as an appointed representative at an online or offline event. Representation of a project may be further defined and clarified by project maintainers.
+
+## Enforcement
+
+Instances of abusive, harassing, or otherwise unacceptable behavior may be reported by contacting the project team at webmaster@petersouter.co.uk. The project team will review and investigate all complaints, and will respond in a way that it deems appropriate to the circumstances. The project team is obligated to maintain confidentiality with regard to the reporter of an incident. Further details of specific enforcement policies may be posted separately.
+
+Project maintainers who do not follow or enforce the Code of Conduct in good faith may face temporary or permanent repercussions as determined by other members of the project's leadership.
+
+## Attribution
+
+This Code of Conduct is adapted from the [Contributor Covenant][homepage], version 1.4, available at [http://contributor-covenant.org/version/1/4][version]
+
+[homepage]: http://contributor-covenant.org
+[version]: http://contributor-covenant.org/version/1/4/

data/lib/tugboat/cli.rb

@@ -66,11 +66,17 @@ module Tugboat
                   default: false,
                   aliases: '-i',
                   desc: 'Include URLs for the droplets (can be opened in a browser)'
+    method_option 'per_page',
+                  type: :boolean,
+                  default: 20,
+                  aliases: '-p',
+                  desc: 'Chose how many results to fetch from the DigitalOcean API (larger is slower)'
     desc 'droplets [OPTIONS]', 'Retrieve a list of your droplets'
     def droplets
       Middleware.sequence_list_droplets.call('tugboat_action' => __method__,
                                              'user_quiet' => options[:quiet],
-                                             'include_urls' => options['include_urls'])
+                                             'include_urls' => options['include_urls'],
+                                             'per_page' => options['per_page'],)
     end
 
     desc 'images [OPTIONS]', 'Retrieve a list of images'

data/lib/tugboat/config.rb

@@ -20,6 +20,7 @@ module Tugboat
     DEFAULT_PRIVATE_NETWORKING = 'false'.freeze
     DEFAULT_BACKUPS_ENABLED = 'false'.freeze
     DEFAULT_USER_DATA = nil
+    DEFAULT_TIMEOUT = 10
 
     # Load config file from current directory, if not exit load from user's home directory
     def initialize
@@ -95,6 +96,10 @@ module Tugboat
       ENV['DO_API_TOKEN'] unless ENV['DO_API_TOKEN'].to_s.empty?
     end
 
+    def timeout
+      @data['connection'].nil? || @data['connection']['timeout'].nil? ? DEFAULT_TIMEOUT : @data['connection']['timeout']
+    end
+
     # Re-runs initialize
     def reset!
       send(:initialize)
@@ -106,7 +111,7 @@ module Tugboat
     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)
+    def create_config_file(access_token, ssh_key_path, ssh_user, ssh_port, region, image, size, ssh_key, private_networking, backups_enabled, ip6, timeout)
       # Default SSH Key path
       ssh_key_path = File.join('~', DEFAULT_SSH_KEY_PATH) if ssh_key_path.empty?
 
@@ -130,12 +135,17 @@ module Tugboat
 
       ip6 = DEFAULT_IP6 if ip6.empty?
 
+      timeout = DEFAULT_TIMEOUT if timeout.empty?
+
       require 'yaml'
       File.open(@path, File::RDWR | File::TRUNC | File::CREAT, 0o600) do |file|
         data = {
           'authentication' => {
             'access_token' => access_token
           },
+          'connection' => {
+            'timeout' => timeout
+          },
           'ssh' => {
             'ssh_user' => ssh_user,
             'ssh_key_path' => ssh_key_path,

data/lib/tugboat/middleware.rb

@@ -9,6 +9,7 @@ module Tugboat
     autoload :CheckCredentials, 'tugboat/middleware/check_credentials'
     autoload :CheckDropletActive, 'tugboat/middleware/check_droplet_active'
     autoload :CheckDropletInactive, 'tugboat/middleware/check_droplet_inactive'
+    autoload :CheckSnapshotParameters, 'tugboat/middleware/check_snapshot_parameters'
     autoload :Config, 'tugboat/middleware/config'
     autoload :ConfirmAction, 'tugboat/middleware/confirm_action'
     autoload :CreateDroplet, 'tugboat/middleware/create_droplet'
@@ -197,6 +198,7 @@ module Tugboat
     # Snapshot a droplet
     def self.sequence_snapshot_droplet
       ::Middleware::Builder.new do
+        use CheckSnapshotParameters
         use InjectConfiguration
         use CheckConfiguration
         use InjectClient

data/lib/tugboat/middleware/ask_for_credentials.rb

@@ -6,6 +6,7 @@ module Tugboat
         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:'
+        timeout = ask 'Enter your default timeout for connections in seconds (optional, defaults to 10):'
         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):'
@@ -23,7 +24,7 @@ module Tugboat
         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)
+        env['config'].create_config_file(access_token, ssh_key_path, ssh_user, ssh_port, region, image, size, ssh_key, private_networking, backups_enabled, ip6, timeout)
         env['config'].reload!
 
         @app.call(env)

data/lib/tugboat/middleware/base.rb

@@ -31,18 +31,29 @@ module Tugboat
 
       def verify_credentials(ocean, say_success = false)
         begin
-          response = ocean.droplet.all(per_page: '1', page: '1')
+          if ocean.is_a?(DropletKit::Client)
+            response = ocean.droplets.all(per_page: '1', page: '1')
+
+            begin
+              response.first
+            rescue DropletKit::Error => e
+              say "Failed to connect to DigitalOcean. Reason given from API:\n#{e}", :red
+              exit 1
+            end
+          else
+            response = ocean.droplet.all(per_page: '1', page: '1')
+
+            unless response.success?
+              say "Failed to connect to DigitalOcean. Reason given from API: #{response.id} - #{response.message}", :red
+              exit 1
+            end
+          end
         rescue Faraday::ClientError => e
           say 'Authentication with DigitalOcean failed at an early stage'
           say "Error was: #{e}"
           exit 1
         end
 
-        unless response.success?
-          say "Failed to connect to DigitalOcean. Reason given from API: #{response.id} - #{response.message}", :red
-          exit 1
-        end
-
         say 'Authentication with DigitalOcean was successful.', :green if say_success
       end
 
@@ -80,19 +91,26 @@ module Tugboat
       end
 
       # Get all pages of droplets
-      def get_droplet_list(ocean)
+      def get_droplet_list(ocean, per_page = 20)
         verify_credentials(ocean)
 
-        page = ocean.droplet.all(per_page: 200, page: 1)
-        return page.droplets unless page.paginated?
+        # Allow both Barge and DropletKit usage
+        if ocean.is_a?(DropletKit::Client)
+          # DropletKit self-paginates
+          ocean.droplets.all(per_page: per_page)
+        else
+          page = ocean.droplet.all(per_page: 200, page: 1)
+          return page.droplets unless page.paginated?
 
-        Enumerator.new do |enum|
-          page.droplets.each { |drop| enum.yield drop }
-          for page_num in 2..page.last_page
-            page = ocean.droplet.all(per_page: 200, page: page_num)
+          Enumerator.new do |enum|
             page.droplets.each { |drop| enum.yield drop }
+            for page_num in 2..page.last_page
+              page = ocean.droplet.all(per_page: 200, page: page_num)
+              page.droplets.each { |drop| enum.yield drop }
+            end
           end
         end
+
       end
     end
   end

data/lib/tugboat/middleware/check_snapshot_parameters.rb

@@ -0,0 +1,16 @@
+module Tugboat
+  module Middleware
+    # Check if the droplet in the environment is active
+    class CheckSnapshotParameters < Base
+      def call(env)
+        unless env['user_droplet_id'] || env['user_droplet_name'] || env['user_droplet_fuzzy_name']
+          say 'You must provide a snapshot name followed by the droplet\'s name.', :red
+          say "For example: `tugboat snapshot #{env['user_snapshot_name']} example-node.com`", :green
+          exit 1
+        end
+
+        @app.call(env)
+      end
+    end
+  end
+end

data/lib/tugboat/middleware/info_droplet.rb

@@ -23,7 +23,7 @@ module Tugboat
 
         attribute = env['user_attribute']
 
-        droplet_ip4_public = droplet.networks.v4.find { |address| address.type == 'public' }.ip_address
+        droplet_ip4_public = droplet.networks.v4.find { |address| address.type == 'public' }.ip_address unless droplet.networks.v4.empty?
         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
@@ -59,7 +59,7 @@ module Tugboat
             say "Name:             #{droplet.name}"
             say "ID:               #{droplet.id}"
             say "Status:           #{status_color}#{droplet.status}#{CLEAR}"
-            say "IP4:              #{droplet_ip4_public}"
+            say "IP4:              #{droplet_ip4_public}" unless droplet.networks.v4.empty?
             say "IP6:              #{droplet_ip6_public}" unless droplet.networks.v6.empty?
 
             say "Private IP:       #{droplet_private_ip}" if droplet_private_ip

data/lib/tugboat/middleware/inject_client.rb

@@ -10,13 +10,22 @@ module Tugboat
         # Sets the digital ocean client into the environment for use
         # later.
         @access_token = env['config'].access_token
+        config_timeout = env['config'].timeout
+
+        env['barge'] = Barge::Client.new(access_token: @access_token,
+                                         timeout: config_timeout,
+                                         open_timeout: config_timeout)
 
-        env['barge'] = Barge::Client.new(access_token: @access_token)
         env['droplet_kit'] = DropletKit::Client.new(access_token: @access_token)
 
+        env['droplet_kit'].connection.options.timeout       = config_timeout.to_i
+        env['droplet_kit'].connection.options.open_timeout  = config_timeout.to_i
+
         env['barge'].faraday.use CustomLogger if ENV['DEBUG']
         env['droplet_kit'].connection.use CustomLogger if ENV['DEBUG']
 
+        env['droplet_kit'].connection
+
         @app.call(env)
       end
     end

data/lib/tugboat/middleware/list_droplets.rb

@@ -3,13 +3,14 @@ module Tugboat
     # Check if the client has set-up configuration yet.
     class ListDroplets < Base
       def call(env)
-        ocean = env['barge']
+        ocean = env['droplet_kit']
 
         verify_credentials(ocean)
 
-        droplet_list = get_droplet_list ocean
+        droplet_list = get_droplet_list(ocean, env['per_page'])
 
         has_one = false
+
         droplet_list.each do |droplet|
           has_one = true
 
@@ -25,7 +26,8 @@ module Tugboat
                          end
 
           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) : ''})"
+
+          say "#{droplet.name} (ip: #{public_addr.ip_address}#{private_ip}, status: #{status_color}#{droplet.status}#{CLEAR}, region: #{droplet.region.slug}, size: #{droplet.size_slug}, id: #{droplet.id}#{env['include_urls'] ? droplet_id_to_url(droplet.id) : ''})"
         end
 
         unless has_one

data/lib/tugboat/version.rb

@@ -1,3 +1,3 @@
 module Tugboat
-  VERSION = '3.1.0'.freeze
+  VERSION = '4.0.0'.freeze
 end

data/spec/cli/add_key_spec.rb

@@ -23,15 +23,16 @@ describe Tugboat::CLI do
         to_return(status: 201, body: fixture('create_ssh_key'), headers: {})
 
       cli.options = cli.options.merge(key: ssh_public_key.to_s)
-      cli.add_key(ssh_key_name)
 
-      expect($stdout.string).to eq <<-eos
+      add_key_with_name_and_keystring = <<-eos
 Queueing upload of SSH key 'macbook_pro'...SSH Key uploaded
 
 Name: macbook_pro
 ID: 3
       eos
 
+      expect { cli.add_key(ssh_key_name) }.to output(add_key_with_name_and_keystring).to_stdout
+
       expect(a_request(:post, 'https://api.digitalocean.com/v2/account/keys')).to have_been_made
     end
 
@@ -52,23 +53,20 @@ ID: 3
              headers: { 'Accept' => '*/*', 'Authorization' => 'Bearer foo', 'Content-Type' => 'application/json' }).
         to_return(status: 201, body: fixture('create_ssh_key_from_file'), headers: {})
 
-      expect($stdout).to receive(:print).exactly(4).times
-      expect($stdout).to receive(:print).with('Enter the path to your SSH key: ')
-      expect($stdout).to receive(:print).with("Queueing upload of SSH key '#{ssh_key_name}'...")
       expect($stdin).to receive(:gets).and_return("#{fake_home}/.ssh/id_rsa.pub")
 
-      cli.add_key(ssh_key_name)
-
-      expect($stdout.string).to eq <<-eos
+      with_name_prompts_from_file_folder_stdout = <<-eos
 Possible public key paths from #{fake_home}/.ssh:
 
 #{fake_home}/.ssh/id_rsa.pub
 
-SSH Key uploaded
+Enter the path to your SSH key: Queueing upload of SSH key 'macbook_pro'...SSH Key uploaded
 
 Name: cool_key
 ID: 5
       eos
+
+      expect { cli.add_key(ssh_key_name) }.to output(with_name_prompts_from_file_folder_stdout).to_stdout
     end
 
     after do

data/spec/cli/authorize_cli_spec.rb

@@ -14,35 +14,20 @@ describe Tugboat::CLI do
         with(headers: { 'Accept' => '*/*', 'Accept-Encoding' => 'gzip;q=1.0,deflate;q=0.6,identity;q=0.3', 'Authorization' => 'Bearer foo', 'Content-Type' => 'application/json', 'User-Agent' => 'Faraday v0.9.2' }).
         to_return(status: 200, body: fixture('show_droplets'), headers: {})
 
-      expect($stdout).to receive(:print).exactly(6).times
-      expect($stdout).to receive(:print).with('Enter your access token: ')
       expect($stdin).to receive(:gets).and_return(access_token)
-      expect($stdout).to receive(:print).with('Enter your SSH key path (optional, defaults to ~/.ssh/id_rsa): ')
+      expect($stdin).to receive(:gets).and_return(timeout)
       expect($stdin).to receive(:gets).and_return(ssh_key_path)
-      expect($stdout).to receive(:print).with('Enter your SSH user (optional, defaults to root): ')
       expect($stdin).to receive(:gets).and_return(ssh_user)
-      expect($stdout).to receive(:print).with('Enter your SSH port number (optional, defaults to 22): ')
       expect($stdin).to receive(:gets).and_return(ssh_port)
-      expect($stdout).to receive(:print).with('Enter your default region (optional, defaults to nyc1): ')
       expect($stdin).to receive(:gets).and_return(region)
-      expect($stdout).to receive(:print).with('Enter your default image ID or image slug (optional, defaults to ubuntu-14-04-x64): ')
       expect($stdin).to receive(:gets).and_return(image)
-      expect($stdout).to receive(:print).with('Enter your default size (optional, defaults to 512mb)): ')
       expect($stdin).to receive(:gets).and_return(size)
-      expect($stdout).to receive(:print).with("Enter your default ssh key IDs (optional, defaults to none, array of IDs of ssh keys eg. ['1234']): ")
       expect($stdin).to receive(:gets).and_return(ssh_key_id)
-      expect($stdout).to receive(:print).with('Enter your default for private networking (optional, defaults to false): ')
       expect($stdin).to receive(:gets).and_return(private_networking)
-      expect($stdout).to receive(:print).with('Enter your default for enabling backups (optional, defaults to false): ')
       expect($stdin).to receive(:gets).and_return(backups_enabled)
-      expect($stdout).to receive(:print).with('Enter your default for IPv6 (optional, defaults to false): ')
       expect($stdin).to receive(:gets).and_return(ip6)
 
-      cli.authorize
-
-      expect($stdout.string).to include('Note: You can get your Access Token from https://cloud.digitalocean.com/settings/tokens/new')
-      expect($stdout.string).to include("To retrieve region, image, size and key ID's, you can use the corresponding tugboat command, such as `tugboat images`.")
-      expect($stdout.string).to include('Defaults can be changed at any time in your ~/.tugboat configuration file.')
+      expect { cli.authorize }.to output(/Note: You can get your Access Token from https:\/\/cloud.digitalocean.com\/settings\/tokens\/new/).to_stdout
 
       config = YAML.load_file(tmp_path)
 
@@ -63,35 +48,20 @@ describe Tugboat::CLI do
         with(headers: { 'Accept' => '*/*', 'Accept-Encoding' => 'gzip;q=1.0,deflate;q=0.6,identity;q=0.3', 'Authorization' => %r{Bearer}, 'Content-Type' => 'application/json', 'User-Agent' => 'Faraday v0.9.2' }).
         to_return(status: 200, body: fixture('show_droplets'), headers: {})
 
-      expect($stdout).to receive(:print).exactly(6).times
-      expect($stdout).to receive(:print).with('Enter your access token: ')
       expect($stdin).to receive(:gets).and_return('')
-      expect($stdout).to receive(:print).with('Enter your SSH key path (optional, defaults to ~/.ssh/id_rsa): ')
       expect($stdin).to receive(:gets).and_return('')
-      expect($stdout).to receive(:print).with('Enter your SSH user (optional, defaults to root): ')
       expect($stdin).to receive(:gets).and_return('')
-      expect($stdout).to receive(:print).with('Enter your SSH port number (optional, defaults to 22): ')
       expect($stdin).to receive(:gets).and_return('')
-      expect($stdout).to receive(:print).with('Enter your default region (optional, defaults to nyc1): ')
       expect($stdin).to receive(:gets).and_return('')
-      expect($stdout).to receive(:print).with('Enter your default image ID or image slug (optional, defaults to ubuntu-14-04-x64): ')
       expect($stdin).to receive(:gets).and_return('')
-      expect($stdout).to receive(:print).with('Enter your default size (optional, defaults to 512mb)): ')
       expect($stdin).to receive(:gets).and_return('')
-      expect($stdout).to receive(:print).with("Enter your default ssh key IDs (optional, defaults to none, array of IDs of ssh keys eg. ['1234']): ")
       expect($stdin).to receive(:gets).and_return('')
-      expect($stdout).to receive(:print).with('Enter your default for private networking (optional, defaults to false): ')
       expect($stdin).to receive(:gets).and_return('')
-      expect($stdout).to receive(:print).with('Enter your default for enabling backups (optional, defaults to false): ')
       expect($stdin).to receive(:gets).and_return('')
-      expect($stdout).to receive(:print).with('Enter your default for IPv6 (optional, defaults to false): ')
+      expect($stdin).to receive(:gets).and_return('')
       expect($stdin).to receive(:gets).and_return('')
 
-      cli.authorize
-
-      expect($stdout.string).to include('Note: You can get your Access Token from https://cloud.digitalocean.com/settings/tokens/new')
-      expect($stdout.string).to include("To retrieve region, image, size and key ID's, you can use the corresponding tugboat command, such as `tugboat images`.")
-      expect($stdout.string).to include('Defaults can be changed at any time in your ~/.tugboat configuration file.')
+      expect { cli.authorize }.to output(/Note: You can get your Access Token from https:\/\/cloud.digitalocean.com\/settings\/tokens\/new/).to_stdout
 
       config = YAML.load_file(tmp_path)