tugboat 1.3.1 → 2.0.0.RC1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 6d6756d7aed64e40d62a18350b778ca7a56ddd08
-  data.tar.gz: 4a8e491b6116538bac1325d70a000529be9ffc42
+  metadata.gz: e4a6516497a6285190e53a1e6209f4c3bc7ff38e
+  data.tar.gz: 1deee8b54ce280230929f27e920fef46b6d471ff
 SHA512:
-  metadata.gz: c703030fcc46ddb84eba13cedf3f77b1edf8828c4f8be982f171ba67fb9c12359a80e6141e26b6684b2afd612fe4efbf274350b5d36c13d226f0d5042170055f
-  data.tar.gz: ed1455015c08cc87990f7d837084ce6f0b52f1debb107afc62ff3144246eb582ec4d8e48c603aff1c6ccbdc554bfb1297f02d3c6354e462fd13d6ab5033749b7
+  metadata.gz: 3f275a9150a93971d9a8e0067c09d51727162c2b97bd52c6acd42faead78c8fbcd713212343ace0c296fa347976ada8e9d5d99c2d7b0268d2f53108fe23ac424
+  data.tar.gz: 4a77d1bd1b256ba368d04c722e13b85802f5344d80f69979ce0887517577dcf95a66507730bb350cd7f54a205c43a66e8b04004393b17784407663c5b6d0bc3a

data/.travis.yml

@@ -1,9 +1,9 @@
 sudo: false
 language: ruby
 rvm:
-  - 1.9.3
   - 2.0.0
   - 2.1.0
+  - 2.2.3
 script:
   - "bundle exec rake spec"
   - "bundle exec rake features"

data/CHANGELOG.md

@@ -1,5 +1,17 @@
 # Change Log
 
+## [v1.3.1](https://github.com/pearkes/tugboat/tree/v1.3.1) (2015-08-02)
+
+[Full Changelog](https://github.com/pearkes/tugboat/compare/v1.3.0...v1.3.1)
+
+**Closed issues:**
+
+- Bad documentation string [\#174](https://github.com/pearkes/tugboat/issues/174)
+
+**Merged pull requests:**
+
+- Removes wrong help messages for `images`. [\#173](https://github.com/pearkes/tugboat/pull/173) ([haihappen](https://github.com/haihappen))
+
 ## [v1.3.0](https://github.com/pearkes/tugboat/tree/v1.3.0) (2015-07-19)
 
 [Full Changelog](https://github.com/pearkes/tugboat/compare/v1.2.0...v1.3.0)
@@ -36,14 +48,6 @@
 
 - Update ssh to private ip [\#172](https://github.com/pearkes/tugboat/pull/172) ([petems](https://github.com/petems))
 
-## [v2.0.0.ALPHA](https://github.com/pearkes/tugboat/tree/v2.0.0.ALPHA) (2015-07-18)
-
-[Full Changelog](https://github.com/pearkes/tugboat/compare/v1.0.0...v2.0.0.ALPHA)
-
-**Closed issues:**
-
-- 1.0.0 Release [\#125](https://github.com/pearkes/tugboat/issues/125)
-
 ## [v1.0.0](https://github.com/pearkes/tugboat/tree/v1.0.0) (2015-05-26)
 
 [Full Changelog](https://github.com/pearkes/tugboat/compare/v0.2.0...v1.0.0)

data/lib/tugboat/cli.rb

@@ -73,15 +73,15 @@ module Tugboat
         })
     end
 
-    desc "images [OPTIONS]", "Retrieve a list of your images"
-    method_option "global",
+    desc "images [OPTIONS]", "Retrieve a list of images"
+    method_option "show_just_private_images",
                   :type => :boolean,
                   :default => false,
-                  :aliases => "-g",
-                  :desc => "Show global images"
+                  :aliases => "-p",
+                  :desc => "Show just private images"
     def images
       Middleware.sequence_list_images.call({
-        "user_show_global_images" => options[:global],
+        "user_show_just_private_images" => options[:show_just_private_images],
         "user_quiet" => options[:quiet]
         })
     end
@@ -102,7 +102,8 @@ module Tugboat
     method_option "use_private_ip",
                   :type => :boolean,
                   :aliases => "-t",
-                  :desc => "Use Private IP while private IP is present"
+                  :desc => "Use Private IP while private IP is present",
+                  :default => false
     method_option "ssh_user",
                   :type => :string,
                   :aliases => "-u",
@@ -122,7 +123,7 @@ module Tugboat
         "user_droplet_fuzzy_name" => name,
         "user_droplet_ssh_port" => options[:ssh_port],
         "user_droplet_ssh_user" => options[:ssh_user],
-        "user_droplet_use_private_ip" => options[:use_public_ip],
+        "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]

data/lib/tugboat/config.rb

@@ -12,9 +12,9 @@ module Tugboat
     FILE_NAME = '.tugboat'
     DEFAULT_SSH_KEY_PATH = '.ssh/id_rsa'
     DEFAULT_SSH_PORT = '22'
-    DEFAULT_REGION = '8'
-    DEFAULT_IMAGE = '9801950'
-    DEFAULT_SIZE = '66'
+    DEFAULT_REGION = 'nyc2'
+    DEFAULT_IMAGE = 'ubuntu-14-04-x64'
+    DEFAULT_SIZE = '512mb'
     DEFAULT_SSH_KEY = ''
     DEFAULT_PRIVATE_NETWORKING = 'false'
     DEFAULT_BACKUPS_ENABLED = 'false'
@@ -37,12 +37,8 @@ module Tugboat
       return
     end
 
-    def client_key
-      @data['authentication']['client_key']
-    end
-
-    def api_key
-      @data['authentication']['api_key']
+    def access_token
+      @data['authentication']['access_token']
     end
 
     def ssh_key_path
@@ -96,7 +92,7 @@ module Tugboat
     end
 
     # Writes a config file
-    def create_config_file(client, api, 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)
       # Default SSH Key path
       if ssh_key_path.empty?
         ssh_key_path = File.join("~", DEFAULT_SSH_KEY_PATH)
@@ -138,8 +134,8 @@ module Tugboat
       File.open(@path, File::RDWR|File::TRUNC|File::CREAT, 0600) do |file|
         data = {
                 "authentication" => {
-                  "client_key" => client,
-                  "api_key" => api },
+                  "access_token" => access_token
+                },
                 "ssh" => {
                   "ssh_user" => ssh_user,
                   "ssh_key_path" => ssh_key_path ,

data/lib/tugboat/middleware/add_key.rb

@@ -2,7 +2,7 @@ module Tugboat
   module Middleware
     class AddKey < Base
       def call(env)
-        ocean = env["ocean"]
+        ocean = env['barge']
 
         if env["add_key_pub_key"]
           pub_key_string = env["add_key_pub_key"]
@@ -29,15 +29,18 @@ module Tugboat
 
         say "Queueing upload of SSH key '#{env["add_key_name"]}'...", nil, false
 
-        req = ocean.ssh_keys.add    :name => env["add_key_name"],
-                                    :ssh_pub_key  => pub_key_string
+        response = ocean.key.create :name => env["add_key_name"],
+                               :public_key  => pub_key_string
 
-        if req.status == "ERROR"
-          say req.error_message, :red
+        unless response.success?
+          say "Failed to create key: #{response.message}", :red
           exit 1
         end
 
-        say "done", :green
+        say "SSH Key uploaded", :green
+        say
+        say "Name: #{response.ssh_key.name}"
+        say "ID: #{response.ssh_key.id}"
 
         @app.call(env)
       end

data/lib/tugboat/middleware/ask_for_credentials.rb

@@ -3,11 +3,10 @@ module Tugboat
     # Ask for user credentials from the command line, then write them out.
     class AskForCredentials < Base
       def call(env)
-        say "Note: You can get this information from https://cloud.digitalocean.com/api_access", :yellow
-        say "Also Note: Tugboat is setup to work with v1 of the Digital Ocean API (https://developers.digitalocean.com/v1/)", :yellow
+        say "Note: You can get your Access Token from https://cloud.digitalocean.com/settings/tokens/new", :yellow
         say
-        client_key = ask "Enter your client key:"
-        api_key = ask "Enter your API key:"
+        access_token = ask "Enter your access token:"
+        access_token.strip!
         ssh_key_path = ask "Enter your SSH key path (optional, defaults to ~/.ssh/id_rsa):"
         ssh_user = ask "Enter your SSH user (optional, defaults to root):"
         ssh_port = ask "Enter your SSH port number (optional, defaults to 22):"
@@ -15,15 +14,15 @@ module Tugboat
         say "To retrieve region, image, size and key ID's, you can use the corresponding tugboat command, such as `tugboat images`."
         say "Defaults can be changed at any time in your ~/.tugboat configuration file."
         say
-        region   = ask "Enter your default region ID (optional, defaults to 8 (New York 3)):"
-        image    = ask "Enter your default image ID (optional, defaults to 9801950 (Ubuntu 14.04 x64)):"
-        size     = ask "Enter your default size ID (optional, defaults to 66 (512MB)):"
+        region   = ask "Enter your default region (optional, defaults to nyc1):"
+        image    = ask "Enter your default image ID or image slug (optional, defaults to ubuntu-14-04-x64):"
+        size     = ask "Enter your default size (optional, defaults to 512mb)):"
         ssh_key  = ask "Enter your default ssh key ID (optional, defaults to none):"
         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):"
 
         # Write the config file.
-        env['config'].create_config_file(client_key, api_key, 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)
         env['config'].reload!
 
         @app.call(env)

data/lib/tugboat/middleware/check_configuration.rb

@@ -5,7 +5,7 @@ module Tugboat
       def call(env)
         config = env["config"]
 
-        if !config || !config.data || !config.api_key || !config.client_key
+        if !config || !config.data || !config.access_token
           say "You must run `tugboat authorize` in order to connect to DigitalOcean", :red
           exit 1
         end

data/lib/tugboat/middleware/check_credentials.rb

@@ -8,9 +8,11 @@ module Tugboat
         # We use a harmless API call to check if the authentication will
         # work.
         begin
-          env["ocean"].droplets.list
+          env['barge'].droplet.all.list
         rescue Faraday::Error::ClientError => e
-          say "Authentication with DigitalOcean failed. Run `tugboat authorize`", :red
+          say "Authentication with DigitalOcean failed."
+          say "Error was: #{e}"
+          say "Try re-running `tugboat authorize`", :red
           exit 1
         end
 

data/lib/tugboat/middleware/config.rb

@@ -8,15 +8,14 @@ module Tugboat
 
         keys_retracted = ''
 
-        config_data = config.data.to_yaml
+        config_data = config.data.to_yaml.gsub(/"/,'')
 
         if env["user_hide_keys"]
           keys_retracted = '(Keys Redacted)'
-          config_data = config_data.gsub(/(client_key: )([a-zA-Z0-9]+)/,'\1 [REDACTED]')
-          config_data = config_data.gsub(/(api_key: )([a-zA-Z0-9]+)/,'\1 [REDACTED]')
+          config_data = config_data.gsub(/(access_token: )([a-zA-Z0-9]+)/,'\1 [REDACTED]')
         end
 
-        say "Current Config #{keys_retracted}", :green
+        say "Current Config #{keys_retracted}\n", :green
 
         say "Path: #{config.path}"
         say config_data

data/lib/tugboat/middleware/create_droplet.rb

@@ -2,49 +2,55 @@ module Tugboat
   module Middleware
     class CreateDroplet < Base
       def call(env)
-        ocean = env["ocean"]
+        ocean = env['barge']
 
         say "Queueing creation of droplet '#{env["create_droplet_name"]}'...", nil, false
 
         env["create_droplet_region_id"] ?
-            droplet_region_id = env["create_droplet_region_id"] :
-            droplet_region_id = env["config"].default_region
+        droplet_region_id = env["create_droplet_region_id"] :
+        droplet_region_id = env["config"].default_region
 
         env["create_droplet_image_id"] ?
-            droplet_image_id = env["create_droplet_image_id"] :
-            droplet_image_id = env["config"].default_image
+        droplet_image_id = env["create_droplet_image_id"] :
+        droplet_image_id = env["config"].default_image
 
         env["create_droplet_size_id"] ?
-            droplet_size_id = env["create_droplet_size_id"] :
-            droplet_size_id = env["config"].default_size
+        droplet_size_id = env["create_droplet_size_id"] :
+        droplet_size_id = env["config"].default_size
 
         env["create_droplet_ssh_key_ids"] ?
-            droplet_ssh_key_id = env["create_droplet_ssh_key_ids"] :
-            droplet_ssh_key_id = env["config"].default_ssh_key
+        droplet_ssh_key_id = env["create_droplet_ssh_key_ids"] :
+        droplet_ssh_key_id = env["config"].default_ssh_key
 
         env["create_droplet_private_networking"] ?
-            droplet_private_networking = env["create_droplet_private_networking"] :
-            droplet_private_networking = env["config"].default_private_networking
+        droplet_private_networking = env["create_droplet_private_networking"] :
+        droplet_private_networking = env["config"].default_private_networking
 
         env["create_droplet_backups_enabled"] ?
-            droplet_backups_enabled = env["create_droplet_backups_enabled"] :
-            droplet_backups_enabled = env["config"].default_backups_enabled
-
-
-        req = ocean.droplets.create :name               => env["create_droplet_name"],
-                                    :size_id            => droplet_size_id,
-                                    :image_id           => droplet_image_id,
-                                    :region_id          => droplet_region_id,
-                                    :ssh_key_ids        => droplet_ssh_key_id,
-                                    :private_networking => droplet_private_networking,
-                                    :backups_enabled    => droplet_backups_enabled
-
-        if req.status == "ERROR"
-          say req.error_message, :red
+        droplet_backups_enabled = env["create_droplet_backups_enabled"] :
+        droplet_backups_enabled = env["config"].default_backups_enabled
+
+        droplet_ssh_key_id = nil if droplet_ssh_key_id.empty?
+
+        create_opts = {
+          :name               => env["create_droplet_name"],
+          :size               => droplet_size_id,
+          :image              => "#{droplet_image_id}",
+          :region             => droplet_region_id,
+          :ssh_keys           => [droplet_ssh_key_id],
+          :private_networking => droplet_private_networking,
+          :backups_enabled    => droplet_backups_enabled,
+          :ipv6               => nil,
+        }
+
+        response = ocean.droplet.create(create_opts)
+
+        unless response.success?
+          say "Failed to create Droplet: #{response.message}", :red
           exit 1
         end
 
-        say "done", :green
+        say "Droplet created!"
 
         @app.call(env)
       end

data/lib/tugboat/middleware/destroy_droplet.rb

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

data/lib/tugboat/middleware/destroy_image.rb

@@ -2,19 +2,19 @@ module Tugboat
   module Middleware
     class DestroyImage < Base
       def call(env)
-        ocean = env["ocean"]
+        ocean = env['barge']
 
         say "Queuing destroy image for #{env["image_id"]} #{env["image_name"]}...", nil, false
 
-        req = ocean.images.delete env["image_id"]
+        response = ocean.image.destroy env["image_id"]
 
-        if req.status == "ERROR"
-          say "#{req.status}: #{req.error_message}", :red
+        unless response.success?
+          say "Failed to destroy image: #{response.message}", :red
           exit 1
+        else
+          say 'Image deletion successful!', :green
         end
 
-        say "done", :green
-
         @app.call(env)
       end
     end

data/lib/tugboat/middleware/find_droplet.rb

@@ -3,7 +3,7 @@ module Tugboat
     # Check if the client has set-up configuration yet.
     class FindDroplet < Base
       def call(env)
-        ocean = env["ocean"]
+        ocean = env['barge']
         user_fuzzy_name = env['user_droplet_fuzzy_name']
         user_droplet_name = env['user_droplet_name']
         user_droplet_id = env['user_droplet_id']
@@ -28,21 +28,22 @@ module Tugboat
 
         # Easy for us if they provide an id. Just set it to the droplet_id
         if user_droplet_id
+
           if !porcelain
             say "Droplet id provided. Finding Droplet...", nil, false
           end
-          req = ocean.droplets.show user_droplet_id
+          response = ocean.droplet.show user_droplet_id
 
-          if req.status == "ERROR"
-            say "#{req.status}: #{req.error_message}", :red
+          unless response.success?
+            say "Failed to find Droplet: #{response.message}", :red
             exit 1
           end
 
-          env["droplet_id"] = req.droplet.id
-          env["droplet_name"] = "(#{req.droplet.name})"
-          env["droplet_ip"] = req.droplet.ip_address
-          env["droplet_ip_private"] = req.droplet.private_ip_address
-          env["droplet_status"] = req.droplet.status
+          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_status"] = response.droplet.status
         end
 
         # If they provide a name, we need to get the ID for it.
@@ -53,7 +54,7 @@ module Tugboat
           end
 
           # Look for the droplet by an exact name match.
-          ocean.droplets.list.droplets.each do |d|
+          ocean.droplet.all.droplets.each do |d|
             if d.name == user_droplet_name
               env["droplet_id"] = d.id
               env["droplet_name"] = "(#{d.name})"
@@ -82,7 +83,7 @@ module Tugboat
           found_droplets = []
           choices = []
 
-          ocean.droplets.list.droplets.each_with_index do |d, i|
+          ocean.droplet.all.droplets.each_with_index do |d, i|
             # 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
@@ -92,11 +93,14 @@ module Tugboat
           # Check to see if we have more then one droplet, and prompt
           # a user to choose otherwise.
           if found_droplets.length == 1
-            env["droplet_id"] = found_droplets.first.id
-            env["droplet_name"] = "(#{found_droplets.first.name})"
-            env["droplet_ip"] = found_droplets.first.ip_address
-            env["droplet_ip_private"] = found_droplets.first.private_ip_address
-            env["droplet_status"] = found_droplets.first.status
+            droplet_return = found_droplets.first
+
+            env["droplet_id"] = droplet_return.id
+            env["droplet_name"] = "(#{droplet_return.name})"
+            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_status"] = droplet_return.status
           elsif found_droplets.length > 1
             # Did we run the multiple questionairre?
             did_run_multiple = true

data/lib/tugboat/middleware/find_image.rb

@@ -3,7 +3,7 @@ module Tugboat
     # Check if the client has set-up configuration yet.
     class FindImage < Base
       def call(env)
-        ocean = env["ocean"]
+        ocean = env['barge']
         user_fuzzy_name = env['user_image_fuzzy_name']
         user_image_name = env['user_image_name']
         user_image_id = env['user_image_id']
@@ -23,24 +23,24 @@ module Tugboat
         # Easy for us if they provide an id. Just set it to the image_id
         if user_image_id
           say "Image id provided. Finding Image...", nil, false
-          req = ocean.images.show user_image_id
+          response = ocean.image.show user_image_id
 
-          if req.status == "ERROR"
-            say "#{req.status}: #{req.error_message}", :red
+          unless response.success?
+            say "Failed to find Image: #{response.message}", :red
             exit 1
           end
 
-          env["image_id"] = req.image.id
-          env["image_name"] = "(#{req.image.name})"
+          env["image_id"] = response.image.id
+          env["image_name"] = "(#{response.image.name})"
         end
 
         # If they provide a name, we need to get the ID for it.
         # This requires a lookup.
         if user_image_name && !env["image_id"]
-          say "Image name provided. Finding image ID...", nil, false
+          say "Image name provided. Finding Image...", nil, false
 
           # Look for the image by an exact name match.
-          ocean.images.list.images.each do |d|
+          ocean.image.all['images'].each do |d|
             if d.name == user_image_name
               env["image_id"] = d.id
               env["image_name"] = "(#{d.name})"
@@ -50,7 +50,7 @@ module Tugboat
           # If we coulnd't find it, tell the user and drop out of the
           # sequence.
           if !env["image_id"]
-            say "error\nUnable to find a image named '#{user_image_name}'.", :red
+            say "error\nUnable to find an image named '#{user_image_name}'.", :red
             exit 1
           end
         end
@@ -66,11 +66,18 @@ module Tugboat
           found_images = []
           choices = []
 
-          ocean.images.list.images.each_with_index do |d, i|
+          ocean.image.all['images'].each_with_index do |d, i|
+
             # Check to see if one of the image names have the fuzzy string.
             if d.name.upcase.include? user_fuzzy_name.upcase
               found_images << d
             end
+
+            unless d.slug.nil?
+              if d.slug.upcase.include? user_fuzzy_name.upcase
+                found_images << d
+              end
+            end
           end
 
           # Check to see if we have more then one image, and prompt

data/lib/tugboat/middleware/halt_droplet.rb

@@ -2,23 +2,23 @@ module Tugboat
   module Middleware
     class HaltDroplet < 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 shutdown for #{env["droplet_id"]} #{env["droplet_name"]}...", nil, false
-          ocean.droplets.power_off env["droplet_id"]
+          ocean.droplet.power_off env["droplet_id"]
         else
           say "Queuing shutdown for #{env["droplet_id"]} #{env["droplet_name"]}...", nil, false
-          ocean.droplets.shutdown env["droplet_id"]
+          ocean.droplet.shutdown env["droplet_id"]
         end
 
-        if req.status == "ERROR"
-          say req.error_message, :red
+        unless response.success?
+          say "Failed to halt on Droplet: #{response.message}", :red
           exit 1
+        else
+          say "Halt successful!", :green
         end
 
-        say "done", :green
-
         @app.call(env)
       end
     end