tugboat 2.0.1 → 2.1.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: dff182303d9c37521cf816ceb57e0b5b73c9f60f
-  data.tar.gz: 98b25bcaa9909fcf9dbdc20a23e3db937e77148f
+  metadata.gz: 915e7c6438004c7d7e4f44e862b5b25805dfb3ba
+  data.tar.gz: 5ff32fa64a881616643aab6c263046b7ddccdcf5
 SHA512:
-  metadata.gz: 84eed42cf4f8fbb5927b667bf05f243c34e070c58b9813150c790687fb1e5ed89958644f3c90b789e25e60f4797545f68f6684d7507239ea6fca76c01c9e2ce8
-  data.tar.gz: 5ccd3c89a919f5a47bd71792effca44afb6c552a1d64d3a085f012cd6846eed8bedb2e191cc961a4570a8b90c33e6af56bfb1a1f76e887beb402016a8df39aff
+  metadata.gz: 94024933ca93615895225b97192bf3e6cbd29f960b8168cee9dd7611398a287e276eb3cec308bfebcd65a95b7e74dc91b6f5a20427f296af692c66ec8cca9726
+  data.tar.gz: 8c3ceb32fa4a6ffd82e49875646a7914e2aec85e5a4dd75d50eeca1175ed33b811c4857accccb569e15d9e9e9096f49e39dcb75ea36047986286ba46cdf1d303

data/CHANGELOG.md

@@ -2,7 +2,23 @@
 
 ## [Unreleased](https://github.com/pearkes/tugboat/tree/HEAD)
 
-[Full Changelog](https://github.com/pearkes/tugboat/compare/v2.0.0...HEAD)
+[Full Changelog](https://github.com/pearkes/tugboat/compare/v2.0.1...HEAD)
+
+## [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)
+
+**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)
+
+**Merged pull requests:**
+
+- Fixes format for creating droplets [\#207](https://github.com/pearkes/tugboat/pull/207) ([petems](https://github.com/petems))
+
+- Fixes issue with new machines having no network [\#203](https://github.com/pearkes/tugboat/pull/203) ([petems](https://github.com/petems))
 
 ## [v2.0.0](https://github.com/pearkes/tugboat/tree/v2.0.0) (2015-11-03)
 
@@ -38,8 +54,6 @@
 
 - tugboat doesn't work with team accounts, because they use api v2 [\#168](https://github.com/pearkes/tugboat/issues/168)
 
-- tugboat ssh not using ssh-agent? [\#160](https://github.com/pearkes/tugboat/issues/160)
-
 **Merged pull requests:**
 
 - Fixes multiple keys for droplet creation [\#201](https://github.com/pearkes/tugboat/pull/201) ([petems](https://github.com/petems))

data/lib/tugboat/cli.rb

@@ -127,6 +127,10 @@ module Tugboat
                   :type => :string,
                   :aliases => [ "-c", "-y" ,],
                   :desc => "Command to run on the droplet"
+    method_option "wait",
+                  :type => :boolean,
+                  :aliases => '-w',
+                  :desc => 'Wait for droplet to become active before trying to SSH'
     def ssh(name=nil)
       Middleware.sequence_ssh_droplet.call({
         "tugboat_action" => __method__,
@@ -138,7 +142,8 @@ module Tugboat
         "user_droplet_use_private_ip" => options[:use_private_ip],
         "user_droplet_ssh_opts" => options[:ssh_opts],
         "user_droplet_ssh_command" => options[:ssh_command],
-        "user_quiet" => options[:quiet]
+        "user_droplet_ssh_wait"  => options[:wait],
+        "user_quiet" => options[:quiet],
       })
     end
 

data/lib/tugboat/middleware/base.rb

@@ -22,7 +22,66 @@ module Tugboat
         @app.call(env)
       end
 
+      def verify_credentials(ocean, say_success=false)
+        begin
+          response = ocean.droplet.all({:per_page =>'1', :page =>'1'})
+        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
+
+      def wait_for_state(droplet_id, desired_state,ocean)
+        start_time = Time.now
+
+        response = ocean.droplet.show droplet_id
+
+        say ".", nil, false
+
+        if !response.success?
+          say "Failed to get status of Droplet: #{response.message}", :red
+          exit 1
+        end
+
+        while response.droplet.status != desired_state do
+          sleep 2
+          response = ocean.droplet.show droplet_id
+          say ".", nil, false
+        end
+
+        total_time = (Time.now - start_time).to_i
+
+        say "done#{CLEAR} (#{total_time}s)", :green
+      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
+
+        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_credentials.rb

@@ -7,16 +7,7 @@ module Tugboat
       def call(env)
         # We use a harmless API call to check if the authentication will
         # work.
-        begin
-          env['barge'].droplet.all.list
-        rescue Faraday::Error::ClientError => e
-          say "Authentication with DigitalOcean failed."
-          say "Error was: #{e}"
-          say "Try re-running `tugboat authorize`", :red
-          exit 1
-        end
-
-        say "Authentication with DigitalOcean was successful.", :green
+        verify_credentials(env['barge'], true)
 
         @app.call(env)
       end

data/lib/tugboat/middleware/find_droplet.rb

@@ -2,6 +2,19 @@ module Tugboat
   module Middleware
     # Check if the client has set-up configuration yet.
     class FindDroplet < Base
+      def get_public_ip(networks)
+        get_ip_per_network_type networks, "public"
+      end
+
+      def get_private_ip(networks)
+        get_ip_per_network_type networks, "private"
+      end
+
+      def get_ip_per_network_type(networks, type)
+        found_network = networks.detect { |n| n.type == type }
+        found_network.ip_address if found_network
+      end
+
       def call(env)
         ocean = env['barge']
         user_fuzzy_name = env['user_droplet_fuzzy_name']
@@ -44,8 +57,8 @@ module Tugboat
 
           env["droplet_id"] = response.droplet.id
           env["droplet_name"] = "(#{response.droplet.name})"
-          env["droplet_ip"] = response.droplet.ip_address
-          env["droplet_ip_private"] = response.droplet.private_ip_address
+          env["droplet_ip"] = get_public_ip response.droplet.networks.v4
+          env["droplet_ip_private"] = get_private_ip response.droplet.networks.v4
           env["droplet_status"] = response.droplet.status
         end
 
@@ -57,12 +70,12 @@ module Tugboat
           end
 
           # Look for the droplet by an exact name match.
-          ocean.droplet.all.droplets.each do |d|
+          (get_droplet_list ocean).each do |d|
             if d.name == user_droplet_name
               env["droplet_id"] = d.id
               env["droplet_name"] = "(#{d.name})"
-              env["droplet_ip"] = d.ip_address
-              env["droplet_ip_private"] = d.private_ip_address
+              env["droplet_ip"] = get_public_ip d.networks.v4
+              env["droplet_ip_private"] = get_private_ip d.networks.v4
               env["droplet_status"] = d.status
             end
           end
@@ -86,7 +99,7 @@ module Tugboat
           found_droplets = []
           choices = []
 
-          ocean.droplet.all.droplets.each_with_index do |d, i|
+          (get_droplet_list ocean).each do |d|
             # Check to see if one of the droplet names have the fuzzy string.
             if d.name.upcase.include? user_fuzzy_name.upcase
               found_droplets << d
@@ -104,9 +117,8 @@ module Tugboat
               env["droplet_ip"] = '' # No Network Yet
               env["droplet_ip_private"] = '' # No Network Yet
             else
-              env["droplet_ip"] = droplet_return.networks.v4.detect { |address| address.type == 'public' }.ip_address
-              check_private_ip = droplet_return.networks.v4.detect { |address| address.type == 'private' }
-              env["droplet_ip_private"] = check_private_ip.ip_address if check_private_ip
+              env["droplet_ip"] = get_public_ip droplet_return.networks.v4
+              env["droplet_ip_private"] = get_private_ip droplet_return.networks.v4
             end
             env["droplet_status"] = droplet_return.status
           elsif found_droplets.length > 1
@@ -121,17 +133,10 @@ module Tugboat
             end
             say
             choice = ask "Please choose a droplet:", :limited_to => choices
-            for ip_list in found_droplets[choice.to_i].networks.v4 do
-              if ip_list.type == "private"
-                private_ip = ip_list.ip_address
-              elsif ip_list.type == "public"
-                public_ip = ip_list.ip_address
-              end
-            end
             env["droplet_id"] = found_droplets[choice.to_i].id
             env["droplet_name"] = found_droplets[choice.to_i].name
-            env["droplet_ip"] = public_ip
-            env["droplet_ip_private"] = private_ip
+            env["droplet_ip"] = get_public_ip found_droplets[choice.to_i].networks.v4
+            env["droplet_ip_private"] = get_private_ip found_droplets[choice.to_i].networks.v4
             env["droplet_status"] = found_droplets[choice.to_i].status
           end
 

data/lib/tugboat/middleware/list_droplets.rb

@@ -5,28 +5,32 @@ module Tugboat
       def call(env)
         ocean = env['barge']
 
-        droplet_list = ocean.droplet.all.droplets
+        verify_credentials(ocean)
 
-        if droplet_list.empty?
+        droplet_list = get_droplet_list ocean
+
+        has_one = false
+        droplet_list.each do |droplet|
+          has_one = true
+
+          private_addr = droplet.networks.v4.detect { |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
+
+          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) : '' })"
+        end
+
+        if not has_one
           say "You don't appear to have any droplets.", :red
           say "Try creating one with #{GREEN}\`tugboat create\`#{CLEAR}"
-        else
-          droplet_list.each do |droplet|
-
-            if droplet.private_ip_address
-              private_addr = droplet.networks.v4.detect { |address| address.type == 'private' }
-              private_ip = ", privateip: #{private_addr.ip_address}"
-            end
-
-            if droplet.status == "active"
-              status_color = GREEN
-            else
-              status_color = 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) : '' })"
-          end
         end
 
         @app.call(env)

data/lib/tugboat/middleware/rebuild_droplet.rb

@@ -7,7 +7,7 @@ module Tugboat
         say "Queuing rebuild for droplet #{env["droplet_id"]} #{env["droplet_name"]} with image #{env["image_id"]} #{env["image_name"]}...", nil, false
 
         response = ocean.droplet.rebuild env["droplet_id"],
-        :image_id => env["image_id"]
+        :image => env["image_id"]
 
         unless response.success?
           say "Failed to rebuild Droplet: #{response.message}", :red

data/lib/tugboat/middleware/snapshot_droplet.rb

@@ -17,7 +17,7 @@ module Tugboat
           say "Failed to snapshot Droplet: #{response.message}", :red
           exit 1
         else
-          say "Snapshot successful!", :red
+          say "Snapshot successful!", :green
         end
 
         @app.call(env)

data/lib/tugboat/middleware/ssh_droplet.rb

@@ -5,11 +5,17 @@ module Tugboat
         say "Executing SSH on Droplet #{env["droplet_name"]}..."
 
         options = [
-          "-o", "IdentitiesOnly=yes",
           "-o", "LogLevel=ERROR",
           "-o", "StrictHostKeyChecking=no",
           "-o", "UserKnownHostsFile=/dev/null",
-          "-i", File.expand_path(env["config"].ssh_key_path.to_s)]
+        ]
+
+        if env["config"].ssh_key_path.nil? || env["config"].ssh_key_path.empty?
+          options.push("-o", "IdentitiesOnly=no")
+        else
+          options.push("-o", "IdentitiesOnly=yes")
+          options.push("-i", File.expand_path(env["config"].ssh_key_path.to_s))
+        end
 
         if env["user_droplet_ssh_port"]
           options.push("-p", env["user_droplet_ssh_port"].to_s)
@@ -44,6 +50,11 @@ module Tugboat
 
         host_string = "#{ssh_user}@#{host_ip}"
 
+        if env['user_droplet_ssh_wait']
+          say "Wait flag given, waiting for droplet to become active"
+          wait_for_state(env["droplet_id"],'active',env['barge'])
+        end
+
         say "Attempting SSH: #{host_string}"
 
         options << host_string
@@ -52,6 +63,8 @@ module Tugboat
           options.push(env["user_droplet_ssh_command"])
         end
 
+        say "SShing with options: #{options.join(" ")}"
+
         Kernel.exec("ssh", *options)
 
         @app.call(env)

data/lib/tugboat/middleware/wait_for_state.rb

@@ -6,26 +6,7 @@ module Tugboat
 
         say "Waiting for droplet to become #{env["user_droplet_desired_state"]}.", nil, false
 
-        start_time = Time.now
-
-        response = ocean.droplet.show env["droplet_id"]
-
-        say ".", nil, false
-
-        if !response.success?
-          say "Failed to get status of Droplet: #{response.message}", :red
-          exit 1
-        end
-
-        while response.droplet.status != env["user_droplet_desired_state"] do
-          sleep 2
-          response = ocean.droplet.show env["droplet_id"]
-          say ".", nil, false
-        end
-
-        total_time = (Time.now - start_time).to_i
-
-        say "done#{CLEAR} (#{total_time}s)", :green
+        wait_for_state(env["droplet_id"],env["user_droplet_desired_state"],ocean)
 
         @app.call(env)
       end

data/lib/tugboat/version.rb

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

data/spec/cli/authorize_cli_spec.rb

@@ -11,7 +11,7 @@ describe Tugboat::CLI do
     end
 
     it "asks the right questions and checks credentials" do
-      stub_request(:get, "https://api.digitalocean.com/v2/droplets?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 => {})
 
@@ -57,7 +57,7 @@ describe Tugboat::CLI do
     end
 
     it "sets defaults if no input given" do
-      stub_request(:get, "https://api.digitalocean.com/v2/droplets?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/, 'Content-Type'=>'application/json', 'User-Agent'=>'Faraday v0.9.2'}).
          to_return(:status => 200, :body => fixture('show_droplets'), :headers => {})
 

data/spec/cli/create_cli_spec.rb

@@ -72,8 +72,12 @@ Queueing creation of droplet 'example.com'...Could not find file: /foo/bar/baz.s
 
     end
 
-    it "doesn't create a droplet when mistyping help command" do
-      help_text = <<-eos
+    context "doesn't create a droplet when mistyping help command" do
+
+      ['help','--help','-h'].each do |help_attempt|
+        it "tugboat create #{help_attempt}" do
+
+          help_text = <<-eos
 Usage:
   rspec create NAME
 
@@ -91,14 +95,10 @@ Options:
 Create a droplet.
 eos
 
-      @cli.create('help')
-      expect($stdout.string).to eq help_text
-
-      @cli.create('--help')
-      expect($stdout.string).to eq help_text + help_text
-
-      @cli.create('-h')
-      expect($stdout.string).to eq help_text + help_text + help_text
+          @cli.create(help_attempt)
+          expect($stdout.string).to eq help_text
+        end
+      end
     end
 
     it "does not clobber named droplets that contain the word help" do

data/spec/cli/debug_cli_spec.rb

@@ -12,7 +12,7 @@ describe Tugboat::CLI do
 
     it "gives full faraday logs" do
       pending 'Debug flag not avaliable yet'
-stub_request(:get, "https://api.digitalocean.com/v2/droplets?per_page=200").
+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
@@ -28,7 +28,7 @@ stub_request(:get, "https://api.digitalocean.com/v2/droplets?per_page=200").
 
     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?per_page=200").
+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