tugboat 0.2.0 → 1.0.0

data/CHANGELOG_old.md

@@ -0,0 +1,150 @@
+## 0.2.1 (UNRELEASED)
+
+
+## 0.2.0 (Feburary 15, 2014)
+
+FEATURES:
+
+  - [Pierre](https://github.com/spearway) added an `info-image` and `destroy-image`
+  command, letting you deal with your images from Tugboat. It's great. [GH-91]
+  - [Pierre](https://github.com/spearway) also added a `rebuild` command,
+  letting you take an existing droplet and recreate it from scratch. [GH-90]
+
+IMPROVEMENTS:
+
+  - [Dale](https://github.com/Vel0x) made it so fuzzy name searching
+  is case insensitive. We wonder why we didn't do this earlier, really. [GH-88]
+  - There is now a `--quiet/-q` flag, which makes Tugboat be silent, as it
+  can get a little obnoxious. [GH-87]
+  - [Andrew](https://github.com/4n3w) hooked up a `backups_enabled` option
+  for creating droplets. [GH-82]
+
+
+## 0.0.9 (December 24, 2013)
+
+FEATURES:
+
+  - [Pete](https://github.com/petems) added the ability to add an
+  ssh key to your account. [GH-64]
+  - [Caleb](https://github.com/calebreach) gave us an easy way
+  to pass a command through to a machine with the `-c` command. [GH-73]
+
+IMPROVEMENTS:
+
+  - [Andrew](https://github.com/4n3w) added a private networking option. [GH-75]
+
+BUG FIXES:
+
+  - [Zo](https://github.com/obradovic) made our default image 13.04 [GH-76]
+  - Issues with the JSON dependency in 2.0.0 were resolved. [GH-80]
+
+
+## 0.0.8 (September 7, 2013)
+
+FEATURES:
+
+  - [Pete](https://github.com/petems) added configuration defaults
+  that you can set. [GH-61]
+  - [Pete](https://github.com/petems) added log filtering to debug output.
+  `DEBUG=1` now gives you filtered logs, `DEBUG=2`, raw. [GH-58]
+
+IMPROVEMENTS:
+
+  - Error messages are now caught at the Faraday level and displayed
+  back to the user.
+
+BUG FIXES:
+
+  - [Ørjan](https://github.com/blom) added a color reset on the `list`
+  command. [GH-57]
+
+## 0.0.7 (August 2, 2013)
+
+IMPROVEMENTS:
+
+  - [Pete](https://github.com/petems) made it clearer to the user
+  if they don't have any droplets or images. [GH-48], [GH-49]
+
+BUG FIXES:
+
+  - Fix the initial check for authorization after `authorize` [GH-41]
+
+## 0.0.6 (June 25, 2013)
+
+FEATURES:
+
+  - [Ørjan](https://github.com/blom) added a `start` command, which
+  let's you start a droplet. [GH-30]
+  - [Ørjan](https://github.com/blom) added a `resize` command, which
+  let's you resize a droplet. [GH-40]
+  - [Ørjan](https://github.com/blom) added a `password-reset` command
+  [GH-45]
+  - Added a the `wait` command, allowing you to "wait" for a droplet
+  to enter a state. [GH-46]
+
+IMPROVEMENTS:
+
+  - [Ørjan](https://github.com/blom) added an `--ssh-opts` flag, for the
+  `ssh` command. [GH-38]
+  - Droplet state is checked for some commands. For example, a droplet
+  can't be started if it's active. [GH-31]
+
+BUG FIXES:
+
+  - DigitalOcean changed their `image_id`'s, so the defaults for `create`
+  were updated. [GH-39]
+
+## 0.0.5 (May 4, 2013)
+
+FEATURES:
+
+  - [Ørjan](https://github.com/blom) added a `regions` command, which
+  returns a list of available DigitalOcean regions. You can specify
+  which region to use while creating: `tugboat create foobar -r 2`. [GH-18]
+  - [Ørjan](https://github.com/blom) added an ssh_user option to the
+  `ssh` command. This lets you specify the user to connect as on
+  a per-command basis, as well as in your `.tugboat`.
+  - [Ørjan](https://github.com/blom) added a `sizes` command, which
+  returns a list of available sizes. You can specify which size to
+  use while creating: `tugboat create foobar -s 66` [GH-19]
+  - [Ørjan](https://github.com/blom) added a `hard` flag to
+  `halt` and `restart`. This cycles the Droplet's power. `tugboat restart --hard` [GH-27]
+
+IMPROVEMENTS:
+
+  - Tugboat now returns proper status codes for successes and failures.
+  [GH-21]
+  - Support for MRI 1.8.7
+  - CTRL+C's, SIG-INT's are now caught and quietly kill Tugboat without
+  a stacktrace.
+
+## 0.0.4 (April 23, 2013)
+
+BUG FIXES:
+
+  - Fix a syntax error caused by the order of arguments on `snapshot`.
+  This changes the argument order and is a breaking change [GH-10].
+  - Fix an issue with looking up a droplet by it's `--name`. A variable
+  was changed, and because it was shadowed passed inspection.
+
+IMPROVEMENTS:
+
+  - Added a warning for snapshotting a droplet in a non-powered off
+  state. DigitalOcean currently doesn't return an error from their API.
+  - Added a `--confirm` or `-c` to confirmed actions, like destroy. [GH-7]
+  - [Ørjan](https://github.com/blom) added a `--version` command to see
+  what version of Tugboat you're using.
+  - Substantially more test coverage - all of the commands (except `ssh` are
+  now integration tested. [GH-15]
+
+FEATURES:
+
+  - Optionally add a list of ssh_key_ids when creating a droplet. These
+  SSH keys will automatically be added to your droplet.
+  - Show a list of SSH keys on your account with `tugboat keys`
+  - [Phil](https://github.com/PhilETaylor) added the ability to specify
+  an `--ssh-port` on `tugboat ssh`, as well as set a default in your `.tugboat` [GH-13]
+
+## 0.0.3 (April 15, 2013)
+
+Initial release.

data/Gemfile

@@ -2,3 +2,9 @@ source 'https://rubygems.org'
 
 # Specify your gem's dependencies in tugboat.gemspec
 gemspec
+
+group :development do
+  # Random order is not in the Aruba Cucumber yet...
+  gem 'cucumber', git: 'https://github.com/cucumber/cucumber.git', tag: 'v2.0.0.beta.2'
+  gem 'cucumber-core', git: 'https://github.com/cucumber/cucumber-core.git', tag: 'v1.0.0.beta.2'
+end

data/README.md

@@ -8,10 +8,12 @@ A command line tool for interacting with your [DigitalOcean](https://www.digital
 
     gem install tugboat
 
+Please note that Tugboat version 0.2.0 and up requires Ruby 1.9 or higher.
+
 ## Configuration
 
 Run the configuration utility, `tugboat authorize`. You can grab your keys
-[here](https://www.digitalocean.com/api_access).
+[here](https://cloud.digitalocean.com/api_access).
 
     $ tugboat authorize
     Enter your client key: foo
@@ -30,6 +32,10 @@ Run the configuration utility, `tugboat authorize`. You can grab your keys
 
     Authentication with DigitalOcean was successful!
 
+This will create a .tugboat file in your home folder (eg. ~/.tugboat).
+
+Tugboat will look for a .tugboat config file first in the current directory you're running it in, then will look for one in the home directory.
+
 ## Usage
 
 ### Retrieve a list of your droplets
@@ -153,9 +159,9 @@ Optionally, list images provided by DigitalOcean as well.
 
     $ tugboat regions
     Regions:
-    New York 1 (id: 1)
-    Amsterdam 1 (id: 2)
-    San Francisco 1 (id: 3)
+    New York 1 (id: 1) (slug: nyc1)
+    Amsterdam 1 (id: 2) (slug: ams1)
+    San Francisco 1 (id: 3) (slug: sfo1)
 
 ### List SSH Keys
 
@@ -188,9 +194,9 @@ ask tugboat about it.
 For a complete overview of all of the available commands, run:
 
     $ tugboat help
-    
 
-Depending on your local configuration, you may need to install a CA bundle (OS X only) using [homebrew](http://brew.sh/) to commmunicate with DigitalOcean through SSL/TLS:
+
+Depending on your local configuration, you may need to install a CA bundle (OS X only) using [homebrew](http://brew.sh/) to communicate with DigitalOcean through SSL/TLS:
 
     $ brew install curl-ca-bundle
 

data/Rakefile

@@ -1,7 +1,11 @@
-require "bundler/gem_tasks"
+require 'bundler/gem_tasks'
 require 'rspec/core/rake_task'
-
+require 'cucumber/rake/task'
 
 RSpec::Core::RakeTask.new(:spec)
 
-task :default => :spec
+Cucumber::Rake::Task.new(:features) do |t|
+  t.cucumber_opts = %w(--format pretty --order random)
+end
+
+task :default => [:spec, :features]

data/features/support/env.rb

@@ -0,0 +1,9 @@
+require 'aruba/cucumber'
+
+Before do
+
+end
+
+After do
+
+end

data/features/vagrant-adam/config_current_directory.feature

@@ -0,0 +1,27 @@
+Feature: config
+  In order to easily load DigitalOcean config
+  As a user
+  I should be able to load tugboat config from a .tugboat in the current directory
+
+  Scenario:
+    Given a file named ".tugboat" with:
+      """
+---
+authentication:
+  client_key: FOO
+  api_key: BAR
+ssh:
+  ssh_user: janedoe
+  ssh_key_path: "/Users/janedoe/.ssh/id_rsa"
+  ssh_port: '22'
+defaults:
+  region: '8'
+  image: '9801950'
+  size: '66'
+  ssh_key: ''
+  private_networking: 'false'
+  backups_enabled: 'false'
+      """
+    When I run `tugboat config`
+    Then the exit status should not be 1
+    And the output should contain "ssh_user: janedoe"

data/lib/tugboat/cli.rb

@@ -28,7 +28,7 @@ module Tugboat
     details to tugboat. First, you are asked for your API and Client keys,
     which are stored in ~/.tugboat.
 
-    You can retrieve your credentials from digitalocean.com/api_access.
+    You can retrieve your credentials from https://cloud.digitalocean.com/api_access
 
     Optionally, you can configure the default SSH key path and username
     used for `tugboat ssh`. These default to '~/.ssh/id_rsa' and the
@@ -40,6 +40,21 @@ module Tugboat
         })
     end
 
+    desc "config", "Show your current config information"
+    long_desc "This shows the current information in the .tugboat config
+    being used by the app
+    "
+    method_option "hide",
+                  :type => :boolean,
+                  :default => true,
+                  :aliases => "-h",
+                  :desc => "Hide your API keys"
+    def config
+      Middleware.sequence_config.call({
+        "user_hide_keys" => options[:hide],
+        })
+    end
+
     desc "verify", "Check your DigitalOcean credentials"
     long_desc "This tests that your credentials created by the \`authorize\`
     command that are stored in ~/.tugboat are correct and allow you to connect
@@ -58,7 +73,7 @@ module Tugboat
         })
     end
 
-    desc "images", "Retrieve a list of your images"
+    desc "images [OPTIONS]", "Retrieve a list of your images"
     method_option "global",
                   :type => :boolean,
                   :default => false,
@@ -84,6 +99,10 @@ module Tugboat
                   :type => :string,
                   :aliases => "-p",
                   :desc => "The custom SSH Port to connect to"
+    method_option "use_public_ip",
+                  :type => :boolean,
+                  :aliases => "-e",
+                  :desc => "Use public IP while private IP is present"
     method_option "ssh_user",
                   :type => :string,
                   :aliases => "-u",
@@ -103,6 +122,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_public_ip" => options[:use_public_ip],
         "user_droplet_ssh_opts" => options[:ssh_opts],
         "user_droplet_ssh_command" => options[:ssh_command],
         "user_quiet" => options[:quiet]
@@ -136,6 +156,11 @@ module Tugboat
                    :desc => "Enable backups on the droplet"
 
     def create(name)
+      if name =~ /^(-{0,2}help|-{1,2}h)/
+        help('create')
+        return
+      end
+
       Middleware.sequence_create_droplet.call({
         "create_droplet_size_id" => options[:size],
         "create_droplet_image_id" => options[:image],
@@ -334,7 +359,10 @@ module Tugboat
       Middleware.sequence_ssh_keys.call({})
     end
 
-    desc "add-key NAME", "Upload an ssh public key."
+    desc "add-key KEY-NAME", "Upload an ssh public key to DigitalOcean, to be assigned to a droplet later"
+    long_desc "This uploads a ssh-key to DigitalOcean, which you can then assign to a droplet at
+    creation time so you can connect to it with the key rather than a password.
+    "
     method_option  "key",
                    :type => :string,
                    :aliases => "-k",

data/lib/tugboat/config.rb

@@ -12,15 +12,19 @@ module Tugboat
     FILE_NAME = '.tugboat'
     DEFAULT_SSH_KEY_PATH = '.ssh/id_rsa'
     DEFAULT_SSH_PORT = '22'
-    DEFAULT_REGION = '1'
-    DEFAULT_IMAGE = '350076'
+    DEFAULT_REGION = '8'
+    DEFAULT_IMAGE = '9801950'
     DEFAULT_SIZE = '66'
     DEFAULT_SSH_KEY = ''
     DEFAULT_PRIVATE_NETWORKING = 'false'
     DEFAULT_BACKUPS_ENABLED = 'false'
 
+    # Load config file from current directory, if not exit load from user's home directory
     def initialize
-      @path = ENV["TUGBOAT_CONFIG_PATH"] || File.join(File.expand_path("~"), FILE_NAME)
+      @path = File.join(File.expand_path("."), FILE_NAME)
+      unless File.exists?(@path)
+        @path = ( ENV["TUGBOAT_CONFIG_PATH"] || File.join(File.expand_path("~"), FILE_NAME) )
+      end
       @data = self.load_config_file
     end
 
@@ -53,6 +57,10 @@ module Tugboat
       @data['ssh']['ssh_port']
     end
 
+    def use_public_ip
+      @data['use_public_ip']
+    end
+
     def default_region
       @data['defaults'].nil? ? DEFAULT_REGION : @data['defaults']['region']
     end
@@ -91,11 +99,11 @@ module Tugboat
     def create_config_file(client, api, 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(File.expand_path("~"), DEFAULT_SSH_KEY_PATH)
+        ssh_key_path = File.join("~", DEFAULT_SSH_KEY_PATH)
       end
 
       if ssh_user.empty?
-        ssh_user = ENV['USER']
+        ssh_user = 'root'
       end
 
       if ssh_port.empty?

data/lib/tugboat/middleware.rb

@@ -9,6 +9,7 @@ module Tugboat
     autoload :CheckCredentials, "tugboat/middleware/check_credentials"
     autoload :CheckDropletActive, "tugboat/middleware/check_droplet_active"
     autoload :CheckDropletInactive, "tugboat/middleware/check_droplet_inactive"
+    autoload :Config, "tugboat/middleware/config"
     autoload :ConfirmAction, "tugboat/middleware/confirm_action"
     autoload :CreateDroplet, "tugboat/middleware/create_droplet"
     autoload :RebuildDroplet, "tugboat/middleware/rebuild_droplet"
@@ -267,6 +268,13 @@ module Tugboat
       end
     end
 
+    # Returns current used config
+    def self.sequence_config
+      ::Middleware::Builder.new do
+        use Config
+      end
+    end
+
     # Wait for a droplet to enter a desired state
     def self.sequence_wait
       ::Middleware::Builder.new do

data/lib/tugboat/middleware/ask_for_credentials.rb

@@ -3,19 +3,20 @@ 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 digitalocean.com/api_access", :yellow
+        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
         client_key = ask "Enter your client key:"
         api_key = ask "Enter your API key:"
         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 #{ENV['USER']}):"
+        ssh_user = ask "Enter your SSH user (optional, defaults to root):"
         ssh_port = ask "Enter your SSH port number (optional, defaults to 22):"
         say
         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 1 (New York)):"
-        image    = ask "Enter your default image ID (optional, defaults to 350076 (Ubuntu 13.04 x64)):"
+        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)):"
         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):"

data/lib/tugboat/middleware/authentication_middleware.rb

@@ -21,10 +21,10 @@ module Tugboat
         @app.call(env)
       rescue Faraday::Error::ClientError => e
         puts "#{RED}#{e}!#{CLEAR}\n"
-        if env[:body].status == "ERROR"
+        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)"
+        puts "Double-check your parameters and configuration (in your ~/.tugboat file)" if env[:status] == 401
         exit 1
       end
     end