tugboat 1.3.1 → 2.0.0.RC1

data/lib/tugboat/middleware/info_droplet.rb

@@ -2,35 +2,46 @@ module Tugboat
   module Middleware
     class InfoDroplet < Base
       def call(env)
-        ocean = env["ocean"]
+        ocean = env['barge']
 
-        req = ocean.droplets.show env["droplet_id"]
+        response = ocean.droplet.show env["droplet_id"]
 
-        if req.status == "ERROR"
-          say "#{req.status}: #{req.error_message}", :red
+        unless response.success?
+          say "Failed to get info for Droplet: #{response.message}", :red
           exit 1
         end
 
-        droplet = req.droplet
+        droplet = response.droplet
 
-          if droplet.status == "active"
-            status_color = GREEN
-          else
-            status_color = RED
-          end
+        unless response.success?
+          say "Failed to find droplet: #{response.message}", :red
+          exit 1
+        end
+
+        if droplet.status == "active"
+          status_color = GREEN
+        else
+          status_color = RED
+        end
 
         attribute = env["user_attribute"]
 
+        droplet_ip4_public = droplet.networks.v4.detect { |address| address.type == 'public' }.ip_address
+        droplet_ip6_public = droplet.networks.v6.detect { |address| address.type == 'public' }.ip_address unless droplet.networks.v6.empty?
+        check_private_ip   = droplet.networks.v4.detect { |address| address.type == 'private' }
+        droplet_private_ip = check_private_ip.ip_address if check_private_ip
+
         attributes_list = [
           ["name",  droplet.name],
           ["id",  droplet.id],
           ["status",  droplet.status],
-          ["ip",  droplet.ip_address],
-          ["private_ip",  droplet.private_ip_address],
-          ["region_id",  droplet.region_id],
-          ["image_id",  droplet.image_id],
-          ["size_id",  droplet.size_id],
-          ["backups_active",  (droplet.backups_active || false)]
+          ["ip4",  droplet_ip4_public],
+          ["ip6",  droplet_ip6_public],
+          ["private_ip",  droplet_private_ip],
+          ["region",  droplet.region.slug],
+          ["Image",  droplet.image.id],
+          ["size",  droplet.size_slug],
+          ["backups_active",  !droplet.backup_ids.empty?]
         ]
         attributes = Hash[*attributes_list.flatten(1)]
 
@@ -40,7 +51,8 @@ module Tugboat
           else
             say "Invalid attribute \"#{attribute}\"", :red
             say "Provide one of the following:", :red
-            attributes_list.keys.each { |a| say "    #{a[0]}", :red }
+            attributes_list.each { |a| say "    #{a[0]}", :red }
+            exit 1
           end
         else
           if env["user_porcelain"]
@@ -50,16 +62,17 @@ module Tugboat
             say "Name:             #{droplet.name}"
             say "ID:               #{droplet.id}"
             say "Status:           #{status_color}#{droplet.status}#{CLEAR}"
-            say "IP:               #{droplet.ip_address}"
+            say "IP4:              #{droplet_ip4_public}"
+            say "IP6:              #{droplet_ip6_public}" unless droplet.networks.v6.empty?
 
-            if droplet.private_ip_address
-    	        say "Private IP:       #{droplet.private_ip_address}"
-    	      end
+            if droplet_private_ip
+              say "Private IP:       #{droplet_private_ip}"
+            end
 
-            say "Region ID:        #{droplet.region_id}"
-            say "Image ID:         #{droplet.image_id}"
-            say "Size ID:          #{droplet.size_id}"
-            say "Backups Active:   #{droplet.backups_active || false}"
+            say "Region:           #{droplet.region.name} - #{droplet.region.slug}"
+            say "Image:            #{droplet.image.id} - #{droplet.image.name}"
+            say "Size:             #{droplet.size_slug.upcase}"
+            say "Backups Active:   #{!droplet.backup_ids.empty?}"
           end
         end
 

data/lib/tugboat/middleware/info_image.rb

@@ -2,16 +2,16 @@ module Tugboat
   module Middleware
     class InfoImage < Base
       def call(env)
-        ocean = env["ocean"]
+        ocean = env['barge']
 
-        req = ocean.images.show env["image_id"]
+        response = ocean.image.show env["image_id"]
 
-        if req.status == "ERROR"
-          say "#{req.status}: #{req.error_message}", :red
+        unless response.success?
+          say "Failed to get info for Image: #{response.message}", :red
           exit 1
         end
 
-        image = req.image
+        image = response.image
 
         say
         say "Name:             #{image.name}"

data/lib/tugboat/middleware/inject_client.rb

@@ -1,6 +1,4 @@
-require 'digital_ocean'
-require File.expand_path('../authentication_middleware', __FILE__)
-require File.expand_path('../custom_logger', __FILE__)
+require 'barge'
 
 module Tugboat
   module Middleware
@@ -22,13 +20,9 @@ module Tugboat
         def call(env)
           # Sets the digital ocean client into the environment for use
           # later.
-          @client_id = env["config"].client_key
-          @api_key   = env["config"].api_key
+          @access_token = env["config"].access_token
 
-          env["ocean"]  = DigitalOcean::API.new \
-                             :client_id => @client_id,
-                             :api_key   => @api_key,
-                             :faraday => tugboat_faraday
+          env['barge'] = Barge::Client.new(:access_token => @access_token)
 
           @app.call(env)
         end

data/lib/tugboat/middleware/list_droplets.rb

@@ -3,9 +3,9 @@ module Tugboat
     # Check if the client has set-up configuration yet.
     class ListDroplets < Base
       def call(env)
-        ocean = env["ocean"]
+        ocean = env['barge']
 
-        droplet_list = ocean.droplets.list.droplets
+        droplet_list = ocean.droplet.all.droplets
 
         if droplet_list.empty?
           say "You don't appear to have any droplets.", :red
@@ -14,7 +14,8 @@ module Tugboat
           droplet_list.each do |droplet|
 
             if droplet.private_ip_address
-              private_ip = ", privateip: #{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"
@@ -23,7 +24,8 @@ module Tugboat
               status_color = RED
             end
 
-            say "#{droplet.name} (ip: #{droplet.ip_address}#{private_ip}, status: #{status_color}#{droplet.status}#{CLEAR}, region: #{droplet.region_id}, id: #{droplet.id})"
+            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})"
           end
         end
 

data/lib/tugboat/middleware/list_images.rb

@@ -2,30 +2,36 @@ module Tugboat
   module Middleware
     class ListImages < Base
       def call(env)
-        ocean = env["ocean"]
-        my_images = ocean.images.list :filter => "my_images"
-        if env["user_show_global_images"]
-          global = ocean.images.list :filter => "global"
-        else
-          say "Listing Your Images"
-          say "(Use `tugboat images --global` to show all images)"
-        end
+        ocean = env['barge']
+        my_images = ocean.image.all(:private => true)
+        public_images = ocean.image.all.images - my_images.images
 
-        say "My Images:"
-        my_images_list = my_images.images
-        if my_images_list.empty?
-          say "No images found"
+        if env['user_show_just_private_images']
+          say "Showing just private images", :green
+          say "Private Images:", :blue
+          my_images_list = my_images.images
+          if my_images_list.nil? || my_images_list.empty?
+            say "No private images found"
+          else
+            my_images_list.each do |image|
+              say "#{image.name} (id: #{image.id}, distro: #{image.distribution})"
+            end
+          end
         else
-          my_images_list.each do |image|
-            say "#{image.name} (id: #{image.id}, distro: #{image.distribution})"
+          say "Showing both private and public images"
+          say "Private Images:", :blue
+          my_images_list = my_images.images
+          if my_images_list.nil? || my_images_list.empty?
+            say "No private images found"
+          else
+            my_images_list.each do |image|
+              say "#{image.name} (id: #{image.id}, distro: #{image.distribution})"
+            end
           end
-        end
-
-        if env["user_show_global_images"]
-          say
-          say "Global Images:"
-          global.images.each do |image|
-            say "#{image.name} (id: #{image.id}, distro: #{image.distribution})"
+          say ''
+          say "Public Images:", :blue
+          public_images.each do |image|
+            say "#{image.name} (slug: #{image.slug}, id: #{image.id}, distro: #{image.distribution})"
           end
         end
 
@@ -33,5 +39,4 @@ module Tugboat
       end
     end
   end
-end
-
+end

data/lib/tugboat/middleware/list_regions.rb

@@ -2,12 +2,12 @@ module Tugboat
   module Middleware
     class ListRegions < Base
       def call(env)
-        ocean = env["ocean"]
-        regions = ocean.regions.list.regions.sort_by(&:name)
+        ocean = env['barge']
+        regions = ocean.region.all.regions.sort_by(&:name)
 
         say "Regions:"
         regions.each do |region|
-          say "#{region.name} (id: #{region.id}) (slug: #{region.slug})"
+          say "#{region.name} (slug: #{region.slug})"
         end
 
         @app.call(env)

data/lib/tugboat/middleware/list_sizes.rb

@@ -2,12 +2,12 @@ module Tugboat
   module Middleware
     class ListSizes < Base
       def call(env)
-        ocean = env["ocean"]
-        sizes = ocean.sizes.list.sizes
+        ocean = env['barge']
+        sizes = ocean.size.all.sizes
 
         say "Sizes:"
         sizes.each do |size|
-          say "#{size.name} (id: #{size.id})"
+          say "Disk: #{size.disk}GB, Memory: #{size.memory.round}MB (slug: #{size.slug})"
         end
 
         @app.call(env)

data/lib/tugboat/middleware/list_ssh_keys.rb

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

data/lib/tugboat/middleware/password_reset.rb

@@ -2,19 +2,19 @@ module Tugboat
   module Middleware
     class PasswordReset < Base
       def call(env)
-        ocean = env["ocean"]
+        ocean = env['barge']
 
         say "Queuing password reset for #{env["droplet_id"]} #{env["droplet_name"]}...", nil, false
-        res = ocean.droplets.password_reset env["droplet_id"]
+        response = ocean.droplet.password_reset env["droplet_id"]
 
-        if res.status == "ERROR"
-          say res.error_message, :red
+        unless response.success?
+          say "Failed to reset password on Droplet: #{response.message}", :red
           exit 1
+        else
+          say "Password reset successful!", :green
+          say "Your new root password will be emailed to you", :green
         end
 
-        say "done", :green
-        say "Your new root password will be emailed to you"
-
         @app.call(env)
       end
     end

data/lib/tugboat/middleware/rebuild_droplet.rb

@@ -2,20 +2,20 @@ module Tugboat
   module Middleware
     class RebuildDroplet < Base
       def call(env)
-        ocean = env["ocean"]
+        ocean = env['barge']
 
         say "Queuing rebuild for droplet #{env["droplet_id"]} #{env["droplet_name"]} with image #{env["image_id"]} #{env["image_name"]}...", nil, false
-        
-        req = ocean.droplets.rebuild env["droplet_id"],
-                                     :image_id => env["image_id"]
 
-        if req.status == "ERROR"
-          say req.error_message, :red
+        response = ocean.droplet.rebuild env["droplet_id"],
+        :image_id => env["image_id"]
+
+        unless response.success?
+          say "Failed to rebuild Droplet: #{response.message}", :red
           exit 1
+        else
+          say "Rebuild complete", :green
         end
 
-        say "done", :green
-
         @app.call(env)
       end
     end

data/lib/tugboat/middleware/resize_droplet.rb

@@ -2,20 +2,20 @@ module Tugboat
   module Middleware
     class ResizeDroplet < Base
       def call(env)
-        ocean = env["ocean"]
+        ocean = env['barge']
 
         say "Queuing resize for #{env["droplet_id"]} #{env["droplet_name"]}...", nil, false
 
-        res = ocean.droplets.resize env["droplet_id"],
-                                    :size_id => env["user_droplet_size"]
+        response = ocean.droplet.resize env["droplet_id"],
+                                    :size => env["user_droplet_size"]
 
-        if res.status == "ERROR"
-          say "#{res.status}: #{res.error_message}", :red
+        unless response.success?
+          say "Failed to resize Droplet: #{response.message}", :red
           exit 1
+        else
+          say "Resize complete!", :green
         end
 
-        say "done", :green
-
         @app.call(env)
       end
     end

data/lib/tugboat/middleware/restart_droplet.rb

@@ -2,23 +2,23 @@ module Tugboat
   module Middleware
     class RestartDroplet < Base
       def call(env)
-        ocean = env["ocean"]
+        ocean = env['barge']
 
-        req = if env["user_droplet_hard"]
+        response = if env["user_droplet_hard"]
           say "Queuing hard restart for #{env["droplet_id"]} #{env["droplet_name"]}...", nil, false
-          ocean.droplets.power_cycle env["droplet_id"]
+          ocean.droplet.power_cycle env["droplet_id"]
         else
           say "Queuing restart for #{env["droplet_id"]} #{env["droplet_name"]}...", nil, false
-          ocean.droplets.reboot env["droplet_id"]
+          ocean.droplet.reboot env["droplet_id"]
         end
 
-        if req.status == "ERROR"
-          say "#{req.status}: #{req.error_message}", :red
+        unless response.success?
+          say "Failed to restart Droplet: #{response.message}", :red
           exit 1
+        else
+          say "Restart complete!", :green
         end
 
-        say "done", :green
-
         @app.call(env)
       end
     end

data/lib/tugboat/middleware/snapshot_droplet.rb

@@ -2,7 +2,7 @@ module Tugboat
   module Middleware
     class SnapshotDroplet < Base
       def call(env)
-        ocean = env["ocean"]
+        ocean = env['barge']
         # Right now, the digital ocean API doesn't return an error
         # when your droplet is not powered off and you try to snapshot.
         # This is a temporary measure to let the user know.
@@ -10,16 +10,16 @@ module Tugboat
 
         say "Queuing snapshot '#{env["user_snapshot_name"]}' for #{env["droplet_id"]} #{env["droplet_name"]}...", nil, false
 
-        req = ocean.droplets.snapshot env["droplet_id"],
+        response = ocean.droplet.snapshot env["droplet_id"],
                                 :name => env["user_snapshot_name"]
 
-        if req.status == "ERROR"
-          say "#{req.status}: #{req.error_message}", :red
+        unless response.success?
+          say "Failed to snapshot Droplet: #{response.message}", :red
           exit 1
+        else
+          say "Snapshot successful!", :red
         end
 
-        say "done", :green
-
         @app.call(env)
       end
     end

data/lib/tugboat/middleware/ssh_droplet.rb

@@ -35,8 +35,10 @@ module Tugboat
         if env["droplet_ip_private"]
           say "This droplet has a private IP, checking if you asked to use the Private IP..."
           if env["user_droplet_use_private_ip"]
-            say "You did! Using private IP for ssh..."
+            say "You did! Using private IP for ssh...", :yellow
             host_ip = env["droplet_ip_private"]
+          else
+            say "You didn't! Using public IP for ssh...", :yellow
           end
         end
 

data/lib/tugboat/middleware/start_droplet.rb

@@ -2,18 +2,18 @@ module Tugboat
   module Middleware
     class StartDroplet < Base
       def call(env)
-        ocean = env["ocean"]
+        ocean = env['barge']
 
         say "Queuing start for #{env["droplet_id"]} #{env["droplet_name"]}...", nil, false
-        req = ocean.droplets.power_on env["droplet_id"]
+        response = ocean.droplet.power_on env["droplet_id"]
 
-        if req.status == "ERROR"
-          say "#{req.status}: #{req.error_message}", :red
+        unless response.success?
+          say "Failed to start Droplet: #{response.message}", :red
           exit 1
+        else
+          say "Start complete!", :green
         end
 
-        say "done", :green
-
         @app.call(env)
       end
     end

data/lib/tugboat/middleware/wait_for_state.rb

@@ -2,24 +2,24 @@ module Tugboat
   module Middleware
     class WaitForState < Base
       def call(env)
-        ocean = env["ocean"]
+        ocean = env['barge']
 
         say "Waiting for droplet to become #{env["user_droplet_desired_state"]}.", nil, false
 
         start_time = Time.now
 
-        req = ocean.droplets.show env["droplet_id"]
+        response = ocean.droplet.show env["droplet_id"]
 
         say ".", nil, false
 
-        if req.status == "ERROR"
-          say req.error_message, :red
+        if !response.success?
+          say "Failed to get status of Droplet: #{response.message}", :red
           exit 1
         end
 
-        while req.droplet.status != env["user_droplet_desired_state"] do
+        while response.droplet.status != env["user_droplet_desired_state"] do
           sleep 2
-          req = ocean.droplets.show env["droplet_id"]
+          response = ocean.droplet.show env["droplet_id"]
           say ".", nil, false
         end
 

data/lib/tugboat/version.rb

@@ -1,3 +1,3 @@
 module Tugboat
-  VERSION = "1.3.1"
+  VERSION = "2.0.0.RC1"
 end

data/spec/cli/add_key_spec.rb

@@ -19,17 +19,21 @@ describe Tugboat::CLI do
   describe "add-key" do
     it "with a name and key string" do
 
-      stub_request(:get, "https://api.digitalocean.com/ssh_keys/new?api_key=#{api_key}&client_id=#{client_key}&name=#{ssh_key_name}&ssh_pub_key=#{ssh_public_key}").
-      to_return(:headers => {'Content-Type' => 'application/json'}, :status => 200, :body => fixture("create_ssh_key"))
+      stub_request(:post, "https://api.digitalocean.com/v2/account/keys").
+         with(:body => "{\"name\":\"macbook_pro\",\"public_key\":\"ssh-dss A123= user@host\"}").
+         to_return(:status => 201, :body => fixture('create_ssh_key'), :headers => {})
 
       @cli.options = @cli.options.merge(:key => "#{ssh_public_key}")
       @cli.add_key(ssh_key_name)
 
       expect($stdout.string).to eq <<-eos
-Queueing upload of SSH key '#{ssh_key_name}'...done
+Queueing upload of SSH key 'macbook_pro'...SSH Key uploaded
+
+Name: macbook_pro
+ID: 3
       eos
 
-      expect(a_request(:get, "https://api.digitalocean.com/ssh_keys/new?api_key=#{api_key}&client_id=#{client_key}&name=#{ssh_key_name}&ssh_pub_key=#{ssh_public_key}")).to have_been_made
+      expect(a_request(:post, "https://api.digitalocean.com/v2/account/keys")).to have_been_made
     end
 
     before :each do
@@ -41,8 +45,10 @@ Queueing upload of SSH key '#{ssh_key_name}'...done
     end
 
     it "with name, prompts from file folder" do
-      stub_request(:get, "https://api.digitalocean.com/ssh_keys/new?api_key=#{api_key}&client_id=#{client_key}&name=#{ssh_key_name}&ssh_pub_key=ssh-dss%20A456=%20user@host").
-      to_return(:headers => {'Content-Type' => 'application/json'}, :status => 200, :body => fixture("create_ssh_key"))
+      stub_request(:post, "https://api.digitalocean.com/v2/account/keys").
+         with(:body => "{\"name\":\"macbook_pro\",\"public_key\":\"ssh-dss A456= user@host\"}",
+              :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: ")
@@ -56,10 +62,11 @@ Possible public key paths from #{fake_home}/.ssh:
 
 #{fake_home}/.ssh/id_rsa.pub
 
-done
-      eos
+SSH Key uploaded
 
-      expect(a_request(:get, "https://api.digitalocean.com/ssh_keys/new?api_key=#{api_key}&client_id=#{client_key}&name=#{ssh_key_name}&ssh_pub_key=ssh-dss%20A456=%20user@host")).to have_been_made
+Name: cool_key
+ID: 5
+      eos
     end
 
     after :each do