tugboat 2.1.0 → 2.2.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 915e7c6438004c7d7e4f44e862b5b25805dfb3ba
-  data.tar.gz: 5ff32fa64a881616643aab6c263046b7ddccdcf5
+  metadata.gz: f8c7f40ec8f57278de6f0554c189d74fda010d97
+  data.tar.gz: 4be4fefc1760f3b2a4caaa4bcab754147b273084
 SHA512:
-  metadata.gz: 94024933ca93615895225b97192bf3e6cbd29f960b8168cee9dd7611398a287e276eb3cec308bfebcd65a95b7e74dc91b6f5a20427f296af692c66ec8cca9726
-  data.tar.gz: 8c3ceb32fa4a6ffd82e49875646a7914e2aec85e5a4dd75d50eeca1175ed33b811c4857accccb569e15d9e9e9096f49e39dcb75ea36047986286ba46cdf1d303
+  metadata.gz: 7525344456c0cc885294bfb17dde276f99277fc16f3ed5779c2a9d1a976872a7a67e475651ff75808dae0f2a3ed8d1311536389b35afb957518dcb49da443863
+  data.tar.gz: f3a895a5877808d06976d96b99531b58555f2aa6ecaa73886be28479ee78abb67f9ec29811da6b6ac2fced4062839f08839642f898288559e51ef5aaacf06c4f

data/.gitignore

@@ -11,3 +11,5 @@ doc/*
 log/*
 pkg/*
 tmp/*
+# Added file to not force other to use it.
+.overcommit.yml

data/CHANGELOG.md

@@ -1,19 +1,81 @@
 # Change Log
 
-## [Unreleased](https://github.com/pearkes/tugboat/tree/HEAD)
+## [v2.1.0](https://github.com/pearkes/tugboat/tree/v2.1.0) (2015-12-01)
 
-[Full Changelog](https://github.com/pearkes/tugboat/compare/v2.0.1...HEAD)
+[Full Changelog](https://github.com/pearkes/tugboat/compare/v2.0.1...v2.1.0)
+
+**Implemented enhancements:**
+
+- --wait option would be useful for ssh [\#133](https://github.com/pearkes/tugboat/issues/133)
+
+**Fixed bugs:**
+
+- Show private ip alongside public ip in droplets list [\#220](https://github.com/pearkes/tugboat/issues/220)
+
+- bug in connect [\#211](https://github.com/pearkes/tugboat/issues/211)
+
+- Wrong color for successful snapshot creation? [\#209](https://github.com/pearkes/tugboat/issues/209)
+
+- Seems to be a limit to the number of retrieved droplets [\#205](https://github.com/pearkes/tugboat/issues/205)
+
+- tugboat ssh not using ssh-agent? [\#160](https://github.com/pearkes/tugboat/issues/160)
+
+**Closed issues:**
+
+- 'fuzzy name' message shows up even when full name is used [\#132](https://github.com/pearkes/tugboat/issues/132)
+
+**Merged pull requests:**
+
+- Add specs to private ip in droplet list fix from \#222 [\#223](https://github.com/pearkes/tugboat/pull/223) ([petems](https://github.com/petems))
+
+- Lock simplecov version [\#222](https://github.com/pearkes/tugboat/pull/222) ([petems](https://github.com/petems))
+
+- Fix showing of private ips when running 'tugboat droplets' [\#221](https://github.com/pearkes/tugboat/pull/221) ([mtbottle](https://github.com/mtbottle))
+
+- Check credentials for all find droplets [\#219](https://github.com/pearkes/tugboat/pull/219) ([petems](https://github.com/petems))
+
+- Fix v2 API changes [\#218](https://github.com/pearkes/tugboat/pull/218) ([pchaussalet](https://github.com/pchaussalet))
+
+- Fixing error checking with new API 2.0 [\#217](https://github.com/pearkes/tugboat/pull/217) ([petems](https://github.com/petems))
+
+- Changes logic when no ssh\_key\_path has been set [\#216](https://github.com/pearkes/tugboat/pull/216) ([petems](https://github.com/petems))
+
+- Rename features folder [\#215](https://github.com/pearkes/tugboat/pull/215) ([petems](https://github.com/petems))
+
+- Add SSH -w command [\#214](https://github.com/pearkes/tugboat/pull/214) ([petems](https://github.com/petems))
+
+- Changes colour of successful snapshot to green [\#213](https://github.com/pearkes/tugboat/pull/213) ([petems](https://github.com/petems))
+
+- Pagination regression fix for API 2.0 [\#212](https://github.com/pearkes/tugboat/pull/212) ([petems](https://github.com/petems))
+
+- Fixes tests for each help text [\#208](https://github.com/pearkes/tugboat/pull/208) ([petems](https://github.com/petems))
+
+- Enable pagination for Droplets list [\#210](https://github.com/pearkes/tugboat/pull/210) ([lachesis](https://github.com/lachesis))
 
 ## [v2.0.1](https://github.com/pearkes/tugboat/tree/v2.0.1) (2015-11-10)
 
 [Full Changelog](https://github.com/pearkes/tugboat/compare/v2.0.0...v2.0.1)
 
+**Implemented enhancements:**
+
+- Setting client\_id and api\_key as environment variables in shell [\#176](https://github.com/pearkes/tugboat/issues/176)
+
+- API v2.0 Support [\#122](https://github.com/pearkes/tugboat/issues/122)
+
 **Fixed bugs:**
 
 - Slugs don't work [\#204](https://github.com/pearkes/tugboat/issues/204)
 
 - New Droplets dont have IP address immediatly, so the info command fails [\#198](https://github.com/pearkes/tugboat/issues/198)
 
+**Closed issues:**
+
+- API 2.0 Release Candidate Guinea Pigs and Feedback [\#182](https://github.com/pearkes/tugboat/issues/182)
+
+- API 2.0 Switchover [\#161](https://github.com/pearkes/tugboat/issues/161)
+
+- API v2 Support [\#102](https://github.com/pearkes/tugboat/issues/102)
+
 **Merged pull requests:**
 
 - Fixes format for creating droplets [\#207](https://github.com/pearkes/tugboat/pull/207) ([petems](https://github.com/petems))
@@ -26,10 +88,6 @@
 
 **Implemented enhancements:**
 
-- Setting client\_id and api\_key as environment variables in shell [\#176](https://github.com/pearkes/tugboat/issues/176)
-
-- API v2.0 Support [\#122](https://github.com/pearkes/tugboat/issues/122)
-
 - If a command that requires arguments is entered without arguments, print the help for that. [\#191](https://github.com/pearkes/tugboat/issues/191)
 
 - Support traditional `-y` for automatically confirming a destructive action. [\#190](https://github.com/pearkes/tugboat/issues/190)
@@ -48,8 +106,6 @@
 
 **Fixed bugs:**
 
-- New Droplets dont have IP address immediatly, so the info command fails [\#198](https://github.com/pearkes/tugboat/issues/198)
-
 - Ipv6 changes broke ssh [\#192](https://github.com/pearkes/tugboat/issues/192)
 
 - tugboat doesn't work with team accounts, because they use api v2 [\#168](https://github.com/pearkes/tugboat/issues/168)
@@ -92,12 +148,6 @@
 
 **Closed issues:**
 
-- API 2.0 Release Candidate Guinea Pigs and Feedback [\#182](https://github.com/pearkes/tugboat/issues/182)
-
-- API 2.0 Switchover [\#161](https://github.com/pearkes/tugboat/issues/161)
-
-- API v2 Support [\#102](https://github.com/pearkes/tugboat/issues/102)
-
 - Possible to delete an image/snapshot? [\#177](https://github.com/pearkes/tugboat/issues/177)
 
 **Merged pull requests:**

data/CONTRIBUTING.md

@@ -12,7 +12,7 @@
 To add a feature, fix a bug, or to run a development build of Tugboat
 on your machine, clone down the repo and run:
 
-    $ bundle
+    $ bundle install --path vendor/bundle
 
 You can then execute tugboat:
 
@@ -21,6 +21,8 @@ You can then execute tugboat:
 As well as run the tests:
 
     $ bundle exec rspec
+Or
+	$ rake spec
 
 To install the gem on your system from source:
 

data/README.md

@@ -243,7 +243,270 @@ After installation, source the bundle path in your `.bash_profile`/`.bashrc`:
 
 Yes, please!
 
-You can create a new issue [here](https://github.com/pearkes/tugboat/issues/new). Thank you!
+You can create a new issue [here](https://github.com/pearkes/tugboat/issues/new). To help with the investigation of your issue, you can set the environment variable DEBUG to give verbose Faraday logging.
+
+* DEBUG=1 is full unredacted
+* DEBUG=2 redacts private keys from the log.
+
+Example:
+
+```bash
+DEBUG=2 bundle exec tugboat regions
+I, [2015-12-06T12:04:27.148922 #92772]  INFO -- : Started GET request to: https://api.digitalocean.com/v2/regions?per_page=200
+D, [2015-12-06T12:04:27.149334 #92772] DEBUG -- : Request Headers:
+----------------
+Authorization : Bearer [TOKEN REDACTED]
+Content-Type  : application/json
+User-Agent    : Faraday v0.9.2
+
+Request Body:
+-------------
+{
+  "regions": [
+    {
+      "name": "New York 1",
+      "slug": "nyc1",
+      "sizes": [
+        "32gb",
+        "16gb",
+        "2gb",
+        "1gb",
+        "4gb",
+        "8gb",
+        "512mb",
+        "64gb",
+        "48gb"
+      ],
+      "features": [
+        "private_networking",
+        "backups",
+        "ipv6",
+        "metadata"
+      ],
+      "available": true
+    },
+    {
+      "name": "Amsterdam 1",
+      "slug": "ams1",
+      "sizes": [
+        "16gb",
+        "2gb",
+        "1gb",
+        "4gb",
+        "8gb",
+        "512mb"
+      ],
+      "features": [
+        "backups"
+      ],
+      "available": true
+    },
+    {
+      "name": "San Francisco 1",
+      "slug": "sfo1",
+      "sizes": [
+        "32gb",
+        "16gb",
+        "2gb",
+        "1gb",
+        "4gb",
+        "8gb",
+        "512mb",
+        "64gb",
+        "48gb"
+      ],
+      "features": [
+        "private_networking",
+        "backups",
+        "ipv6",
+        "metadata"
+      ],
+      "available": true
+    },
+    {
+      "name": "New York 2",
+      "slug": "nyc2",
+      "sizes": [
+        "32gb",
+        "16gb",
+        "2gb",
+        "1gb",
+        "4gb",
+        "8gb",
+        "512mb",
+        "64gb",
+        "48gb"
+      ],
+      "features": [
+        "private_networking",
+        "backups",
+        "ipv6",
+        "metadata"
+      ],
+      "available": true
+    },
+    {
+      "name": "Amsterdam 2",
+      "slug": "ams2",
+      "sizes": [
+        "32gb",
+        "16gb",
+        "2gb",
+        "1gb",
+        "4gb",
+        "8gb",
+        "512mb",
+        "64gb",
+        "48gb"
+      ],
+      "features": [
+        "private_networking",
+        "backups",
+        "ipv6",
+        "metadata"
+      ],
+      "available": true
+    },
+    {
+      "name": "Singapore 1",
+      "slug": "sgp1",
+      "sizes": [
+        "32gb",
+        "16gb",
+        "2gb",
+        "1gb",
+        "4gb",
+        "8gb",
+        "512mb",
+        "64gb",
+        "48gb"
+      ],
+      "features": [
+        "private_networking",
+        "backups",
+        "ipv6",
+        "metadata"
+      ],
+      "available": true
+    },
+    {
+      "name": "London 1",
+      "slug": "lon1",
+      "sizes": [
+        "32gb",
+        "16gb",
+        "2gb",
+        "1gb",
+        "4gb",
+        "8gb",
+        "512mb",
+        "64gb",
+        "48gb"
+      ],
+      "features": [
+        "private_networking",
+        "backups",
+        "ipv6",
+        "metadata"
+      ],
+      "available": true
+    },
+    {
+      "name": "New York 3",
+      "slug": "nyc3",
+      "sizes": [
+        "32gb",
+        "16gb",
+        "2gb",
+        "1gb",
+        "4gb",
+        "8gb",
+        "512mb",
+        "64gb",
+        "48gb"
+      ],
+      "features": [
+        "private_networking",
+        "backups",
+        "ipv6",
+        "metadata"
+      ],
+      "available": true
+    },
+    {
+      "name": "Amsterdam 3",
+      "slug": "ams3",
+      "sizes": [
+        "32gb",
+        "16gb",
+        "2gb",
+        "1gb",
+        "4gb",
+        "8gb",
+        "512mb",
+        "64gb",
+        "48gb"
+      ],
+      "features": [
+        "private_networking",
+        "backups",
+        "ipv6",
+        "metadata"
+      ],
+      "available": true
+    },
+    {
+      "name": "Frankfurt 1",
+      "slug": "fra1",
+      "sizes": [
+        "32gb",
+        "16gb",
+        "2gb",
+        "1gb",
+        "4gb",
+        "8gb",
+        "512mb",
+        "64gb",
+        "48gb"
+      ],
+      "features": [
+        "private_networking",
+        "backups",
+        "ipv6",
+        "metadata"
+      ],
+      "available": true
+    },
+    {
+      "name": "Toronto 1",
+      "slug": "tor1",
+      "sizes": [
+        "32gb",
+        "16gb",
+        "2gb",
+        "1gb",
+        "4gb",
+        "8gb",
+        "512mb",
+        "64gb",
+        "48gb"
+      ],
+      "features": [
+        "private_networking",
+        "backups",
+        "ipv6",
+        "metadata"
+      ],
+      "available": true
+    }
+  ],
+  "links": {
+  },
+  "meta": {
+    "total": 11
+  }
+}
+```
 
 ## Contributing
 

data/Rakefile

@@ -1,3 +1,6 @@
+require 'bundler'
+Bundler.require(:development)
+
 require 'bundler/gem_tasks'
 require 'rspec/core/rake_task'
 require 'cucumber/rake/task'

data/lib/tugboat/config.rb

@@ -106,7 +106,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)
+    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)
@@ -144,6 +144,10 @@ module Tugboat
         backups_enabled = DEFAULT_BACKUPS_ENABLED
       end
 
+      if ip6.empty?
+        ip6 = DEFAULT_IP6
+      end
+
       require 'yaml'
       File.open(@path, File::RDWR|File::TRUNC|File::CREAT, 0600) do |file|
         data = {
@@ -160,7 +164,8 @@ module Tugboat
                   "size" => size,
                   "ssh_key" => ssh_key,
                   "private_networking" => private_networking,
-                  "backups_enabled" => backups_enabled
+                  "backups_enabled" => backups_enabled,
+                  "ip6" => ip6,
                 }
         }
         file.write data.to_yaml

data/lib/tugboat/middleware/ask_for_credentials.rb

@@ -20,9 +20,10 @@ module Tugboat
         ssh_key  = ask "Enter your default ssh key IDs (optional, defaults to none, comma separated string):"
         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)
+        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'].reload!
 
         @app.call(env)

data/lib/tugboat/middleware/base.rb

@@ -18,6 +18,13 @@ module Tugboat
         say "", :clear, false
       end
 
+      def check_response_success(task_string, response)
+        unless response.success?
+          say "Failed to #{task_string}: #{response.message}", :red
+          exit 1
+        end
+      end
+
       def call(env)
         @app.call(env)
       end

data/lib/tugboat/middleware/custom_logger.rb

@@ -27,8 +27,7 @@ module Tugboat
 
       def filter(output)
         if ENV['DEBUG'].to_i == 2
-          output = output.to_s.gsub(/client_id=[a-zA-Z0-9]*/,'client_id=[CLIENT-ID]')
-          output = output.to_s.gsub(/api_key=[a-zA-Z0-9]*/,'api_key=[API-KEY]')
+          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
@@ -52,15 +51,23 @@ module Tugboat
       end
 
       def debug_message(name, headers, body)
-        <<-MESSAGE.gsub(/^ +([^ ])/m, '\\1')
+
+        main_message = <<-MESSAGE.gsub(/^ +([^ ])/m, '\\1')
         #{name} Headers:
         ----------------
         #{format_headers(headers)}
 
         #{name} Body:
         -------------
-        #{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
 
       def format_headers(headers)

data/lib/tugboat/middleware/info_droplet.rb

@@ -6,10 +6,7 @@ module Tugboat
 
         response = ocean.droplet.show env["droplet_id"]
 
-        unless response.success?
-          say "Failed to get info for Droplet: #{response.message}", :red
-          exit 1
-        end
+        check_response_success('get info for Droplet', response)
 
         droplet = response.droplet
 

data/lib/tugboat/middleware/info_image.rb

@@ -18,6 +18,7 @@ module Tugboat
         say "ID:               #{image.id}"
         say "Distribution:     #{image.distribution}"
         say "Min Disk Size:    #{image.min_disk_size}GB"
+        say "Regions:          #{image.regions.join(',')}"
 
         @app.call(env)
       end

data/lib/tugboat/middleware/inject_client.rb

@@ -1,22 +1,11 @@
 require 'barge'
+require File.expand_path('../custom_logger', __FILE__)
 
 module Tugboat
   module Middleware
     # Inject the digital ocean client into the environment
     class InjectClient < Base
 
-      def tugboat_faraday
-        Faraday.new(:url => 'https://api.digitalocean.com/') do |faraday|
-          faraday.use AuthenticationMiddleware, @client_id, @api_key
-          faraday.use Faraday::Response::RaiseError
-          faraday.use CustomLogger if ENV['DEBUG']
-          faraday.request  :url_encoded
-          faraday.response :rashify
-          faraday.response :json, :content_type => /\b(json|json-home)$/
-          faraday.adapter Faraday.default_adapter
-        end
-      end
-
         def call(env)
           # Sets the digital ocean client into the environment for use
           # later.
@@ -24,6 +13,8 @@ module Tugboat
 
           env['barge'] = Barge::Client.new(:access_token => @access_token)
 
+          env['barge'].faraday.use CustomLogger if ENV['DEBUG']
+
           @app.call(env)
         end
     end

data/lib/tugboat/version.rb

@@ -1,3 +1,3 @@
 module Tugboat
-  VERSION = "2.1.0"
+  VERSION = "2.2.0"
 end

data/spec/cli/authorize_cli_spec.rb

@@ -36,6 +36,8 @@ describe Tugboat::CLI do
       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
 
@@ -54,6 +56,7 @@ describe Tugboat::CLI do
       expect(config["defaults"]["ssh_key"]).to eq ssh_key_id
       expect(config["defaults"]["private_networking"]).to eq private_networking
       expect(config["defaults"]["backups_enabled"]).to eq backups_enabled
+      expect(config["defaults"]["ip6"]).to eq ip6
     end
 
     it "sets defaults if no input given" do
@@ -82,6 +85,8 @@ describe Tugboat::CLI do
       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('')
 
       @cli.authorize
 
@@ -98,6 +103,9 @@ describe Tugboat::CLI do
       expect(config["ssh"]["ssh_key_path"]).to eq "~/.ssh/id_rsa"
       expect(config["ssh"]["ssh_port"]).to eq "22"
       expect(config["defaults"]["ssh_key"]).to eq ""
+      expect(config["defaults"]["private_networking"]).to eq 'false'
+      expect(config["defaults"]["backups_enabled"]).to eq 'false'
+      expect(config["defaults"]["ip6"]).to eq 'false'
     end
   end
 

data/spec/cli/config_cli_spec.rb

@@ -25,6 +25,7 @@ defaults:
   ssh_key: '1234'
   private_networking: 'false'
   backups_enabled: 'false'
+  ip6: 'false'
       eos
     end
 
@@ -50,6 +51,7 @@ defaults:
   ssh_key: '1234'
   private_networking: 'false'
   backups_enabled: 'false'
+  ip6: 'false'
       eos
     end
   end

data/spec/cli/create_cli_spec.rb

@@ -6,7 +6,7 @@ describe Tugboat::CLI do
   describe "create a droplet" do
     it "with a name, uses defaults from configuration" do
       stub_request(:post, "https://api.digitalocean.com/v2/droplets").
-         with(:body => "{\"name\":\"foo\",\"size\":\"512mb\",\"image\":\"ubuntu-14-04-x64\",\"region\":\"nyc2\",\"ssh_keys\":[\"1234\"],\"private_networking\":\"false\",\"backups_enabled\":\"false\",\"ipv6\":null,\"user_data\":null}",
+         with(:body => "{\"name\":\"foo\",\"size\":\"512mb\",\"image\":\"ubuntu-14-04-x64\",\"region\":\"nyc2\",\"ssh_keys\":[\"1234\"],\"private_networking\":\"false\",\"backups_enabled\":\"false\",\"ipv6\":\"false\",\"user_data\":null}",
               :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('create_droplet'), :headers => {})
 
@@ -19,7 +19,7 @@ Queueing creation of droplet '#{droplet_name}'...Droplet created!
 
     it "with args does not use defaults from configuration" do
       stub_request(:post, "https://api.digitalocean.com/v2/droplets").
-         with(:body => "{\"name\":\"example.com\",\"size\":\"1gb\",\"image\":\"ubuntu-12-04-x64\",\"region\":\"nyc3\",\"ssh_keys\":[\"foo_bar_key\"],\"private_networking\":\"false\",\"backups_enabled\":\"false\",\"ipv6\":null,\"user_data\":null}",
+         with(:body => "{\"name\":\"example.com\",\"size\":\"1gb\",\"image\":\"ubuntu-12-04-x64\",\"region\":\"nyc3\",\"ssh_keys\":[\"foo_bar_key\"],\"private_networking\":\"false\",\"backups_enabled\":\"false\",\"ipv6\":\"false\",\"user_data\":null}",
               :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('create_droplet'), :headers => {})
 
@@ -49,7 +49,7 @@ Queueing creation of droplet 'example.com'...Droplet created!
 
     it "with user data args" do
       stub_request(:post, "https://api.digitalocean.com/v2/droplets").
-         with(:body => "{\"name\":\"example.com\",\"size\":\"512mb\",\"image\":\"ubuntu-14-04-x64\",\"region\":\"nyc2\",\"ssh_keys\":[\"1234\"],\"private_networking\":\"false\",\"backups_enabled\":\"false\",\"ipv6\":null,\"user_data\":\"#!/bin/bash\\n\\necho \\\"Hello world\\\"\"}",
+         with(:body => "{\"name\":\"example.com\",\"size\":\"512mb\",\"image\":\"ubuntu-14-04-x64\",\"region\":\"nyc2\",\"ssh_keys\":[\"1234\"],\"private_networking\":\"false\",\"backups_enabled\":\"false\",\"ipv6\":\"false\",\"user_data\":\"#!/bin/bash\\n\\necho \\\"Hello world\\\"\"}",
               :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('create_droplet'), :headers => {})
 
@@ -103,7 +103,7 @@ eos
 
     it "does not clobber named droplets that contain the word help" do
       stub_request(:post, "https://api.digitalocean.com/v2/droplets").
-         with(:body => "{\"name\":\"somethingblahblah--help\",\"size\":\"512mb\",\"image\":\"ubuntu-14-04-x64\",\"region\":\"nyc2\",\"ssh_keys\":[\"1234\"],\"private_networking\":\"false\",\"backups_enabled\":\"false\",\"ipv6\":null,\"user_data\":null}",
+         with(:body => "{\"name\":\"somethingblahblah--help\",\"size\":\"512mb\",\"image\":\"ubuntu-14-04-x64\",\"region\":\"nyc2\",\"ssh_keys\":[\"1234\"],\"private_networking\":\"false\",\"backups_enabled\":\"false\",\"ipv6\":\"false\",\"user_data\":null}",
               :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('create_droplet'), :headers => {})
 

data/spec/cli/debug_cli_spec.rb

@@ -8,14 +8,24 @@ describe Tugboat::CLI do
       allow(ENV).to receive(:[]).with('HOME').and_return('/tmp/fake_home')
       allow(ENV).to receive(:[]).with('DEBUG').and_return(1)
       allow(ENV).to receive(:[]).with('http_proxy').and_return(nil)
+      allow(ENV).to receive(:[]).with('DO_API_TOKEN').and_return(nil)
     end
 
     it "gives full faraday logs" do
-      pending 'Debug flag not avaliable yet'
-stub_request(:get, "https://api.digitalocean.com/v2/droplets?page=1&per_page=200").
-         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 => {})
+      stub_request(:get, "https://api.digitalocean.com/v2/droplets?page=1&per_page=1").
+        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 => {})
+
+      stub_request(:get, "https://api.digitalocean.com/v2/droplets?page=1&per_page=200").
+        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 => {})
+
       @cli.droplets
+
+      expect($stdout.string).to include "Started GET request to: https://api.digitalocean.com/v2/droplets?page=1&per_page=200"
+      expect($stdout.string).to include "DEBUG -- : Request Headers:"
+
+      expect($stdout.string).to include "Bearer foo"
     end
   end
 
@@ -24,15 +34,25 @@ stub_request(:get, "https://api.digitalocean.com/v2/droplets?page=1&per_page=200
       allow(ENV).to receive(:[]).with('HOME').and_return('/tmp/fake_home')
       allow(ENV).to receive(:[]).with('DEBUG').and_return(2)
       allow(ENV).to receive(:[]).with('http_proxy').and_return(nil)
+      allow(ENV).to receive(:[]).with('DO_API_TOKEN').and_return(nil)
     end
 
     it "gives full faraday logs with redacted API keys" do
-      pending 'Debug flag not avaliable yet'
-stub_request(:get, "https://api.digitalocean.com/v2/droplets?page=1&per_page=200").
+      stub_request(:get, "https://api.digitalocean.com/v2/droplets?page=1&per_page=1").
+        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 => {})
+
+      stub_request(:get, "https://api.digitalocean.com/v2/droplets?page=1&per_page=200").
          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 => {})
       @cli.droplets
+
+      expect($stdout.string).to include "Started GET request to: https://api.digitalocean.com/v2/droplets?page=1&per_page=200"
+      expect($stdout.string).to include "DEBUG -- : Request Headers:"
+
+      expect($stdout.string).to_not include "Bearer foo"
     end
   end
+
 end
 

data/spec/cli/env_variable_spec.rb

@@ -12,6 +12,7 @@ describe Tugboat::CLI do
       allow(ENV).to receive(:[]).with('HOME').and_return('/tmp/fake_home')
       allow(ENV).to receive(:[]).with('DO_API_TOKEN').and_return('env_variable')
       allow(ENV).to receive(:[]).with('http_proxy').and_return(nil)
+      allow(ENV).to receive(:[]).with('DEBUG').and_return(nil)
 
       @cli.verify
       expect($stdout.string).to eq "Authentication with DigitalOcean was successful.\n"
@@ -26,6 +27,7 @@ describe Tugboat::CLI do
       allow(ENV).to receive(:[]).with('HOME').and_return('/tmp/fake_home')
       allow(ENV).to receive(:[]).with('DO_API_TOKEN').and_return('')
       allow(ENV).to receive(:[]).with('http_proxy').and_return(nil)
+      allow(ENV).to receive(:[]).with('DEBUG').and_return(nil)
 
       @cli.verify
       expect($stdout.string).to eq "Authentication with DigitalOcean was successful.\n"

data/spec/cli/info_cli_spec.rb

@@ -4,6 +4,26 @@ describe Tugboat::CLI do
   include_context "spec"
 
   describe "info" do
+    it "shows an error if response is not successful" do
+      stub_request(:get, "https://api.digitalocean.com/v2/droplets?page=1&per_page=1").
+         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 => {})
+
+      stub_request(:get, "https://api.digitalocean.com/v2/droplets/6918990?per_page=200").
+         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 => 404, :body => fixture('not_found'), :headers => {})
+
+      @cli.options = @cli.options.merge(:id => 6918990)
+
+      expect {@cli.info}.to raise_error(SystemExit)
+
+      expect($stdout.string).to eq <<-eos
+Droplet id provided. Finding Droplet...Failed to find Droplet: The resource you were accessing could not be found.
+      eos
+
+      expect(a_request(:get, "https://api.digitalocean.com/v2/droplets/6918990?per_page=200")).to have_been_made
+    end
+
     it "shows a droplet with a fuzzy name" do
       stub_request(:get, "https://api.digitalocean.com/v2/droplets?page=1&per_page=1").
          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'}).

data/spec/cli/info_image_cli_spec.rb

@@ -22,6 +22,7 @@ Name:             745.1.0 (alpha)
 ID:               12789325
 Distribution:     CoreOS
 Min Disk Size:    20GB
+Regions:          nyc1,sfo1,nyc2,ams2,sgp1,lon1,nyc3,ams3,fra1
       eos
     end
 
@@ -44,6 +45,7 @@ Name:             Redmine on 14.04
 ID:               12438838
 Distribution:     Ubuntu
 Min Disk Size:    20GB
+Regions:          nyc1,ams1,sfo1,nyc2,ams2,sgp1,lon1,nyc3,ams3,fra1
       eos
     end
 
@@ -66,6 +68,7 @@ Name:             Redmine on 14.04
 ID:               12438838
 Distribution:     Ubuntu
 Min Disk Size:    20GB
+Regions:          nyc1,ams1,sfo1,nyc2,ams2,sgp1,lon1,nyc3,ams3,fra1
       eos
     end
 
@@ -143,6 +146,7 @@ Name:             14.10 x32
 ID:               9801951
 Distribution:     Ubuntu
 Min Disk Size:    20GB
+Regions:          nyc1,ams1,sfo1,nyc2,ams2,sgp1,lon1,nyc3,ams3,fra1
       eos
     end
 

data/spec/cli/wait_cli_spec.rb

@@ -37,19 +37,17 @@ eos
 
       stub_request(:get, "https://api.digitalocean.com/v2/droplets/6918990?per_page=200").
          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_droplet_inactive'), :headers => {})
-
-
-      stub_request(:get, "https://api.digitalocean.com/v2/droplets/6918990?per_page=200").
-         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_droplet'), :headers => {})
+         to_return(
+            {:status => 200, :body => fixture('show_droplet_inactive'), :headers => {}},
+            {:status => 200, :body => fixture('show_droplet'), :headers => {}}
+          )
 
       @cli.options = @cli.options.merge(:state => "active")
       @cli.wait("example.com")
 
       expect($stdout.string).to eq <<-eos
 Droplet fuzzy name provided. Finding droplet ID...done\e[0m, 6918990 (example.com)
-Waiting for droplet to become active..done\e[0m (0s)
+Waiting for droplet to become active...done\e[0m (2s)
 eos
     end
 

data/spec/config_spec.rb

@@ -33,12 +33,13 @@ describe Tugboat::Configuration do
     let(:ssh_key_id)         { '1234' }
     let(:private_networking) { 'false' }
     let(:backups_enabled)    { 'false' }
+    let(:ip6)                { 'false' }
 
     let(:config)           { config = Tugboat::Configuration.instance }
 
     before :each do
       # Create a temporary file
-      config.create_config_file(access_token, ssh_key_path, ssh_user, ssh_port, region, image, size, ssh_key_id, private_networking, backups_enabled)
+      config.create_config_file(access_token, ssh_key_path, ssh_user, ssh_port, region, image, size, ssh_key_id, private_networking, backups_enabled, ip6)
     end
 
     it "can be created" do
@@ -105,6 +106,7 @@ describe Tugboat::Configuration do
     let(:config_default_ssh_key)    { Tugboat::Configuration::DEFAULT_SSH_KEY }
     let(:config_default_networking) { Tugboat::Configuration::DEFAULT_PRIVATE_NETWORKING }
     let(:config_default_backups)    { Tugboat::Configuration::DEFAULT_BACKUPS_ENABLED }
+    let(:config_default_ip6)    	{ Tugboat::Configuration::DEFAULT_IP6 }
     let(:backwards_config) {
       {
                 'authentication' => { 'client_key' => client_key, 'api_key' => api_key },
@@ -151,5 +153,10 @@ describe Tugboat::Configuration do
       expect(backups_enabled).to eql config_default_backups
     end
 
+    it "should use default ip6 if not in the configuration" do
+      ip6 = config.default_ip6
+      expect(ip6).to eql config_default_ip6
+    end
+
   end
 end

data/spec/shared/environment.rb

@@ -19,6 +19,7 @@ shared_context "spec" do
   let(:ssh_public_key)     { 'ssh-dss A123= user@host' }
   let(:private_networking) { 'false'}
   let(:backups_enabled)    { 'false'}
+  let(:ip6)                { 'false' }
   let(:ocean)              { Barge::Client.new(:access_token => access_token) }
   let(:app)                { lambda { |env| } }
   let(:env)                { {} }
@@ -30,7 +31,7 @@ shared_context "spec" do
     @cli = Tugboat::CLI.new
 
     # Set a temprary project path and create fake config.
-    config.create_config_file(access_token, ssh_key_path, ssh_user, ssh_port, region, image, size, ssh_key_id, private_networking, backups_enabled)
+    config.create_config_file(access_token, ssh_key_path, ssh_user, ssh_port, region, image, size, ssh_key_id, private_networking, backups_enabled, ip6)
     config.reload!
 
     # Keep track of the old stderr / out

data/spec/spec_helper.rb

@@ -1,7 +1,10 @@
 require 'simplecov'
+require 'simplecov-console'
 require 'coveralls'
-SimpleCov.formatter = SimpleCov::Formatter::MultiFormatter[
+
+SimpleCov.formatters = [
   SimpleCov::Formatter::HTMLFormatter,
+  SimpleCov::Formatter::Console,
   Coveralls::SimpleCov::Formatter
 ]
 SimpleCov.start do

data/tugboat.gemspec

@@ -19,7 +19,7 @@ Gem::Specification.new do |gem|
   gem.required_ruby_version = '>= 1.9.2'
 
   gem.add_dependency 'thor', '~> 0.18.1'
-  gem.add_dependency 'barge', '~> 0.10.0'
+  gem.add_dependency 'barge', '~> 0.12.0'
   gem.add_dependency 'middleware', '~> 0.1.0'
 
   gem.add_development_dependency 'rake'
@@ -28,6 +28,7 @@ Gem::Specification.new do |gem|
   gem.add_development_dependency 'rspec-mocks', '~> 2.14.0'
   gem.add_development_dependency 'webmock', '~> 1.11.0'
   gem.add_development_dependency 'simplecov', '0.10'
+  gem.add_development_dependency 'simplecov-console', '0.2.0'
   gem.add_development_dependency 'coveralls', '~> 0.6.7'
   gem.add_development_dependency 'aruba', '~> 0.6.2'
   gem.add_development_dependency 'pry'

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: tugboat
 version: !ruby/object:Gem::Version
-  version: 2.1.0
+  version: 2.2.0
 platform: ruby
 authors:
 - Jack Pearkes
@@ -10,7 +10,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-12-01 00:00:00.000000000 Z
+date: 2016-01-30 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: thor
@@ -32,14 +32,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.10.0
+        version: 0.12.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.10.0
+        version: 0.12.0
 - !ruby/object:Gem::Dependency
   name: middleware
   requirement: !ruby/object:Gem::Requirement
@@ -138,6 +138,20 @@ dependencies:
     - - '='
       - !ruby/object:Gem::Version
         version: '0.10'
+- !ruby/object:Gem::Dependency
+  name: simplecov-console
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - '='
+      - !ruby/object:Gem::Version
+        version: 0.2.0
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - '='
+      - !ruby/object:Gem::Version
+        version: 0.2.0
 - !ruby/object:Gem::Dependency
   name: coveralls
   requirement: !ruby/object:Gem::Requirement
@@ -207,7 +221,6 @@ files:
 - lib/tugboat/middleware.rb
 - lib/tugboat/middleware/add_key.rb
 - lib/tugboat/middleware/ask_for_credentials.rb
-- lib/tugboat/middleware/authentication_middleware.rb
 - lib/tugboat/middleware/base.rb
 - lib/tugboat/middleware/check_configuration.rb
 - lib/tugboat/middleware/check_credentials.rb
@@ -334,7 +347,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.4.8
+rubygems_version: 2.5.1
 signing_key: 
 specification_version: 4
 summary: A command line tool for interacting with your DigitalOcean droplets.

data/lib/tugboat/middleware/authentication_middleware.rb

@@ -1,40 +0,0 @@
-module Tugboat
-  class AuthenticationMiddleware < Faraday::Middleware
-    extend Forwardable
-    def_delegators :'Faraday::Utils', :parse_query, :build_query
-    RED        = "\e[31m"
-    CLEAR      = "\e[0m"
-
-    def initialize(app, client_id, api_key)
-      @client_id = client_id
-      @api_key   = api_key
-
-      super(app)
-    end
-
-    def call(env)
-      params = { 'client_id' => @client_id, 'api_key' => @api_key }.update query_params(env[:url])
-
-      env[:url].query = build_query params
-
-      begin
-        @app.call(env)
-      rescue Faraday::Error::ClientError => e
-        puts "#{RED}#{e}!#{CLEAR}\n"
-        if env[:body].is_a?(Hashie::Rash)
-          puts "\n#{RED}#{env[:body].error_message}#{CLEAR}\n\n"
-        end
-        puts "Double-check your parameters and configuration (in your ~/.tugboat file)" if env[:status] == 401
-        exit 1
-      end
-    end
-
-    def query_params(url)
-      if url.query.nil? or url.query.empty?
-        {}
-      else
-        parse_query url.query
-      end
-    end
-  end
-end