RubyGems - tugboat - Versions diffs - 0.2.0 → 1.0.0 - Mend

tugboat 0.2.0 → 1.0.0

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.

Files changed (65) hide show

checksums.yaml +4 -4
data/.gitignore +1 -0
data/.travis.yml +5 -4
data/CHANGELOG.md +325 -102
data/CHANGELOG_old.md +150 -0
data/Gemfile +6 -0
data/README.md +12 -6
data/Rakefile +7 -3
data/features/step_definitions/steps.rb +0 -0
data/features/support/env.rb +9 -0
data/features/vagrant-adam/config_current_directory.feature +27 -0
data/lib/tugboat/cli.rb +31 -3
data/lib/tugboat/config.rb +13 -5
data/lib/tugboat/middleware.rb +8 -0
data/lib/tugboat/middleware/ask_for_credentials.rb +5 -4
data/lib/tugboat/middleware/authentication_middleware.rb +2 -2
data/lib/tugboat/middleware/config.rb +29 -0
data/lib/tugboat/middleware/custom_logger.rb +2 -2
data/lib/tugboat/middleware/find_droplet.rb +4 -0
data/lib/tugboat/middleware/info_droplet.rb +5 -0
data/lib/tugboat/middleware/inject_client.rb +1 -1
data/lib/tugboat/middleware/list_droplets.rb +5 -1
data/lib/tugboat/middleware/list_regions.rb +2 -2
data/lib/tugboat/middleware/ssh_droplet.rb +17 -2
data/lib/tugboat/version.rb +1 -1
data/spec/cli/add_key_spec.rb +9 -9
data/spec/cli/authorize_cli_spec.rb +76 -52
data/spec/cli/create_cli_spec.rb +39 -4
data/spec/cli/debug_cli_spec.rb +44 -0
data/spec/cli/destroy_cli_spec.rb +30 -11
data/spec/cli/destroy_image_cli_spec.rb +11 -11
data/spec/cli/droplets_cli_spec.rb +6 -6
data/spec/cli/halt_cli_spec.rb +9 -9
data/spec/cli/images_cli_spec.rb +6 -6
data/spec/cli/info_cli_spec.rb +42 -7
data/spec/cli/info_image_cli_spec.rb +6 -6
data/spec/cli/keys_cli_spec.rb +1 -1
data/spec/cli/password_reset_cli_spec.rb +8 -8
data/spec/cli/rebuild_cli_spec.rb +49 -49
data/spec/cli/regions_cli_spec.rb +4 -4
data/spec/cli/resize_cli_spec.rb +8 -8
data/spec/cli/restart_cli_spec.rb +8 -8
data/spec/cli/sizes_cli_spec.rb +1 -1
data/spec/cli/snapshot_cli_spec.rb +7 -7
data/spec/cli/ssh_cli_spec.rb +4 -4
data/spec/cli/start_cli_spec.rb +7 -7
data/spec/cli/verify_cli_spec.rb +10 -2
data/spec/cli/wait_cli_spec.rb +6 -6
data/spec/fixtures/500.html +68 -0
data/spec/fixtures/show_droplet.json +1 -0
data/spec/fixtures/show_droplet_fuzzy.json +13 -0
data/spec/fixtures/show_droplet_inactive.json +1 -0
data/spec/fixtures/show_droplets.json +2 -0
data/spec/fixtures/show_droplets_fuzzy.json +35 -0
data/spec/fixtures/show_droplets_inactive.json +2 -0
data/spec/fixtures/show_regions.json +9 -6
data/spec/middleware/base_spec.rb +1 -1
data/spec/middleware/check_credentials_spec.rb +1 -1
data/spec/middleware/inject_client_spec.rb +29 -0
data/spec/middleware/inject_configuration_spec.rb +1 -1
data/spec/middleware/ssh_droplet_spec.rb +30 -7
data/spec/shared/environment.rb +1 -0
data/spec/spec_helper.rb +11 -4
data/tugboat.gemspec +9 -7
metadata +64 -33

data/spec/cli/wait_cli_spec.rb CHANGED Viewed

@@ -6,10 +6,10 @@ describe Tugboat::CLI do
   describe "wait" do
     it "waits for a droplet with a fuzzy name" do
       stub_request(:get, "https://api.digitalocean.com/droplets?api_key=#{api_key}&client_id=#{client_key}").
-           to_return(:status => 200, :body => fixture("show_droplets"))
+           to_return(:headers => {'Content-Type' => 'application/json'}, :status => 200, :body => fixture("show_droplets"))
       stub_request(:get, "https://api.digitalocean.com/droplets/100823?api_key=#{api_key}&client_id=#{client_key}").
-           to_return(:status => 200, :body => fixture("show_droplet"))
+           to_return(:headers => {'Content-Type' => 'application/json'}, :status => 200, :body => fixture("show_droplet"))
       @cli.options = @cli.options.merge(:state => "active")
       @cli.wait("foo")
@@ -25,10 +25,10 @@ eos
     it "waits for a droplet with an id" do
       stub_request(:get, "https://api.digitalocean.com/droplets/#{droplet_id}?api_key=#{api_key}&client_id=#{client_key}").
-           to_return(:status => 200, :body => fixture("show_droplet"))
+           to_return(:headers => {'Content-Type' => 'application/json'}, :status => 200, :body => fixture("show_droplet"))
       stub_request(:get, "https://api.digitalocean.com/droplets/100823?api_key=#{api_key}&client_id=#{client_key}").
-           to_return(:status => 200, :body => fixture("show_droplet"))
+           to_return(:headers => {'Content-Type' => 'application/json'}, :status => 200, :body => fixture("show_droplet"))
       @cli.options = @cli.options.merge(:id => droplet_id, :state => "active")
       @cli.wait
@@ -44,10 +44,10 @@ Waiting for droplet to become active..done\e[0m (0s)
     it "waits for a droplet with a name" do
       stub_request(:get, "https://api.digitalocean.com/droplets?api_key=#{api_key}&client_id=#{client_key}").
-           to_return(:status => 200, :body => fixture("show_droplets"))
+           to_return(:headers => {'Content-Type' => 'application/json'}, :status => 200, :body => fixture("show_droplets"))
       stub_request(:get, "https://api.digitalocean.com/droplets/100823?api_key=#{api_key}&client_id=#{client_key}").
-           to_return(:status => 200, :body => fixture("show_droplet"))
+           to_return(:headers => {'Content-Type' => 'application/json'}, :status => 200, :body => fixture("show_droplet"))
       @cli.options = @cli.options.merge(:name => droplet_name, :state => "active")
       @cli.wait

data/spec/fixtures/500.html ADDED Viewed

@@ -0,0 +1,68 @@
+<!DOCTYPE html>
+<html>
+<head>
+  <title>DigitalOcean - Seems we've encountered a problem!</title>
+  <style type="text/css">
+    body {
+      background-color: #27a1e3;
+      margin: 0px;
+      padding: 0px;
+    }
+    div.header{
+      background-color: #E2F4FE;
+      background-image: url('https://assets.digitalocean.com/public/waves.png');
+      background-repeat: repeat-x;
+      background-position: center bottom;
+      padding-top: 150px;
+    }
+    div.main{
+      overflow: auto;
+      width: 960px;
+      margin: auto;
+      margin-top: 50px;
+    }
+    div.text{
+      width: 450px;
+      float: left;
+    }
+    div.text p{
+      color: #fff;
+      font-size: 18pt;
+      font-family: helvetica;
+    }
+    div.mascot{
+      width: 450px;
+      float: right;
+    }
+    div.copyright{
+      clear: both;
+    }
+    div.copyright p{
+      color: #fff;
+      text-align: center;
+      font-size: 10pt;
+      font-family: helvetica;
+      padding-top: 60px;
+    }
+  </style>
+</head>
+<body>
+  <div class="header">
+  </div>
+  <div class="main">
+    <div class="text">
+        <a href="https://www.digitalocean.com"><img src="https://assets.digitalocean.com/public/logo.png"></a>
+        <p>Oh no! It seems as though we've encountered a problem! Please try your request again.</p>
+    </div>
+    <div class="mascot">
+      <img src="https://assets.digitalocean.com/public/mascot.png" />
+    </div>
+  </div>
+  <div class="copyright">
+    <p>&copy;2011-2013 DigitalOcean<sup>TM</sup>, Inc. All Rights Reserved.</p>
+  </div>
+  <div style="display:none">
+    ::CLOUDFLARE_ERROR_500S_BOX::
+  </div>
+</body>

data/spec/fixtures/show_droplet.json CHANGED Viewed

@@ -6,6 +6,7 @@
     "image_id": 420,
     "name": "foo",
     "ip_address": "33.33.33.10",
+    "private_ip_address": "10.20.30.40",
     "region_id": 1,
     "size_id": 33,
     "status": "active"

data/spec/fixtures/show_droplet_fuzzy.json ADDED Viewed

@@ -0,0 +1,13 @@
+{
+  "status": "OK",
+  "droplet": {
+    "backups_active": null,
+    "id": 100823,
+    "image_id": 420,
+    "name": "test222",
+    "ip_address": "33.33.33.10",
+    "region_id": 1,
+    "size_id": 33,
+    "status": "active"
+  }
+}

data/spec/fixtures/show_droplet_inactive.json CHANGED Viewed

@@ -6,6 +6,7 @@
     "image_id": 420,
     "name": "foo",
     "ip_address": "33.33.33.10",
+    "private_ip_address": "10.20.30.40",
     "region_id": 1,
     "size_id": 33,
     "status": "off"

data/spec/fixtures/show_droplets.json CHANGED Viewed

@@ -3,6 +3,7 @@
   "droplets": [
     {
       "ip_address": "33.33.33.10",
+      "private_ip_address": "10.20.30.1",
       "backups_active": null,
       "id": 100823,
       "image_id": 420,
@@ -23,6 +24,7 @@
     },
     {
       "ip_address": "33.33.33.10",
+      "private_ip_address": "10.20.30.40",
       "backups_active": null,
       "id": 100823,
       "image_id": 420,

data/spec/fixtures/show_droplets_fuzzy.json ADDED Viewed

@@ -0,0 +1,35 @@
+{
+  "status": "OK",
+  "droplets": [
+    {
+      "ip_address": "33.33.33.10",
+      "backups_active": null,
+      "id": 100823,
+      "image_id": 420,
+      "name": "test222",
+      "region_id": 1,
+      "size_id": 33,
+      "status": "active"
+    },
+    {
+      "ip_address": "33.33.33.10",
+      "backups_active": null,
+      "id": 100824,
+      "image_id": 420,
+      "name": "test223",
+      "region_id": 1,
+      "size_id": 33,
+      "status": "active"
+    },
+    {
+      "ip_address": "33.33.33.10",
+      "backups_active": null,
+      "id": 100825,
+      "image_id": 420,
+      "name": "foo",
+      "region_id": 1,
+      "size_id": 33,
+      "status": "active"
+    }
+  ]
+}

data/spec/fixtures/show_droplets_inactive.json CHANGED Viewed

@@ -3,6 +3,7 @@
   "droplets": [
     {
       "ip_address": "33.33.33.10",
+      "private_ip_address": "10.20.30.1",
       "backups_active": null,
       "id": 100823,
       "image_id": 420,
@@ -23,6 +24,7 @@
     },
     {
       "ip_address": "33.33.33.10",
+      "private_ip_address": "10.20.30.40",
       "backups_active": null,
       "id": 100823,
       "image_id": 420,

data/spec/fixtures/show_regions.json CHANGED Viewed

@@ -1,17 +1,20 @@
 {
   "status": "OK",
   "regions": [
-    {
-      "id": 1,
-      "name": "Region 1"
-    },
     {
       "id": 2,
-      "name": "Region 2"
+      "name": "Region 2",
+      "slug": "reg2"
     },
     {
       "id": 3,
-      "name": "Region 3"
+      "name": "Region 3",
+      "slug": "reg3"
+    },
+    {
+      "id": 1,
+      "name": "Region 1",
+      "slug": "reg1"
     }
   ]
 }

data/spec/middleware/base_spec.rb CHANGED Viewed

@@ -7,7 +7,7 @@ describe Tugboat::Middleware::Base do
   describe ".initialize" do
     it "prints a clear line" do
-      $stdout.should_receive(:print).with("")
+      expect($stdout).to receive(:print).with("")
       klass.new({})
     end
   end

data/spec/middleware/check_credentials_spec.rb CHANGED Viewed

@@ -6,7 +6,7 @@ describe Tugboat::Middleware::CheckCredentials do
   describe ".call" do
     it "raises SystemExit with no configuration" do
       stub_request(:get, "https://api.digitalocean.com/droplets?api_key=#{api_key}&client_id=#{client_key}").
-         to_return(:status => 200, :body => "<html>You are being redirected...</html>")
+         to_return(:headers => {'Content-Type' => 'application/json'}, :status => 200, :body => "<html>You are being redirected...</html>")
       # Inject the client.
       env["ocean"] = ocean

data/spec/middleware/inject_client_spec.rb ADDED Viewed

@@ -0,0 +1,29 @@
+require 'spec_helper'
+describe Tugboat::Middleware::InjectClient do
+  include_context "spec"
+  let(:tmp_path)             { project_path + "/tmp/tugboat" }
+  before :each do
+    config = Tugboat::Configuration.instance
+    env["config"] = config
+  end
+  describe ".call" do
+    it "loads the client into the environment" do
+      described_class.new(app).call(env)
+      env["ocean"].should be_a DigitalOcean::API
+    end
+    it "creates a client with values from config file" do
+      DigitalOcean::API.should_receive(:new).with(hash_including(:client_id=>"foo", :api_key=>"bar"))
+      described_class.new(app).call(env)
+    end
+  end
+end

data/spec/middleware/inject_configuration_spec.rb CHANGED Viewed

@@ -8,7 +8,7 @@ describe Tugboat::Middleware::InjectConfiguration do
     it "loads the configuration into the environment" do
       described_class.new(app).call(env)
-      env["config"].should == config
+      expect(env["config"]).to eq(config)
     end
   end

data/spec/middleware/ssh_droplet_spec.rb CHANGED Viewed

@@ -4,44 +4,67 @@ describe Tugboat::Middleware::SSHDroplet do
   include_context "spec"
   before do
-    Kernel.stub(:exec)
+    allow(Kernel).to receive(:exec)
   end
   describe ".call" do
     it "exec ssh with correct options" do
-      Kernel.should_receive(:exec).with("ssh",
+      expect(Kernel).to receive(:exec).with("ssh",
                         "-o", "IdentitiesOnly=yes",
                         "-o", "LogLevel=ERROR",
                         "-o", "StrictHostKeyChecking=no",
                         "-o", "UserKnownHostsFile=/dev/null",
-                        "-i", ssh_key_path,
+                        "-i", File.expand_path(ssh_key_path),
                         "-p", ssh_port,
-                        "#{ssh_user}@#{droplet_ip}")
+                        "#{ssh_user}@#{droplet_ip_private}")
       env["droplet_ip"] = droplet_ip
+      env["droplet_ip_private"] = droplet_ip_private
       env["config"] = config
       described_class.new(app).call(env)
     end
     it "executes ssh with custom options" do
-      Kernel.should_receive(:exec).with("ssh",
+      expect(Kernel).to receive(:exec).with("ssh",
                         "-o", "IdentitiesOnly=yes",
                         "-o", "LogLevel=ERROR",
                         "-o", "StrictHostKeyChecking=no",
                         "-o", "UserKnownHostsFile=/dev/null",
-                        "-i", ssh_key_path,
+                        "-i", File.expand_path(ssh_key_path),
                         "-p", ssh_port,
+                        "-e",
                         "-q",
                         "-X",
                         "#{ssh_user}@#{droplet_ip}",
                         "echo hello")
       env["droplet_ip"] = droplet_ip
+      env["droplet_ip_private"] = droplet_ip_private
       env["config"] = config
       env["user_droplet_ssh_command"] = "echo hello"
-      env["user_droplet_ssh_opts"] = "-q -X"
+      env["user_droplet_use_public_ip"] = true
+      env["user_droplet_ssh_opts"] = "-e -q -X"
+      described_class.new(app).call(env)
+    end
+    it "executes ssh using public ip setting from config" do
+      config.data["use_public_ip"] = true
+      expect(Kernel).to receive(:exec).with("ssh",
+                        "-o", "IdentitiesOnly=yes",
+                        "-o", "LogLevel=ERROR",
+                        "-o", "StrictHostKeyChecking=no",
+                        "-o", "UserKnownHostsFile=/dev/null",
+                        "-i", File.expand_path(ssh_key_path),
+                        "-p", ssh_port,
+                        "#{ssh_user}@#{droplet_ip}")
+      env["droplet_ip"] = droplet_ip
+      env["droplet_ip_private"] = droplet_ip_private
+      env["config"] = config
       described_class.new(app).call(env)
     end

data/spec/shared/environment.rb CHANGED Viewed

@@ -10,6 +10,7 @@ shared_context "spec" do
   let(:ssh_key_path)       { "~/.ssh/id_rsa2" }
   let(:droplet_name)       { "foo" }
   let(:droplet_ip)         { "33.33.33.10" }
+  let(:droplet_ip_private) { "10.20.30.40" }
   let(:droplet_id)         { 1234 }
   let(:region)             { '3' }
   let(:image)              { '345791'}

data/spec/spec_helper.rb CHANGED Viewed

@@ -1,5 +1,12 @@
+require 'simplecov'
 require 'coveralls'
-Coveralls.wear! { add_filter '/spec/' }
+SimpleCov.formatter = SimpleCov::Formatter::MultiFormatter[
+  SimpleCov::Formatter::HTMLFormatter,
+  Coveralls::SimpleCov::Formatter
+]
+SimpleCov.start do
+  coverage_dir('coverage/')
+end
 require 'tugboat'
 require 'webmock/rspec'
@@ -8,7 +15,7 @@ require "shared/environment"
 RSpec.configure do |config|
   # Pretty tests
-  config.color_enabled = true
+  config.color = true
   config.order = :random
 end
@@ -17,8 +24,8 @@ def project_path
   File.expand_path("../..", __FILE__)
 end
-def fixture(fixture_name)
-  File.new(project_path + "/spec/fixtures/#{fixture_name}.json")
+def fixture(fixture_name, format='json')
+  File.new(project_path + "/spec/fixtures/#{fixture_name}.#{format}")
 end
 ENV["TUGBOAT_CONFIG_PATH"] = project_path + "/tmp/tugboat"

data/tugboat.gemspec CHANGED Viewed

@@ -12,20 +12,22 @@ Gem::Specification.new do |gem|
   gem.summary       = %q{A command line tool for interacting with your DigitalOcean droplets.}
   gem.homepage      = "https://github.com/pearkes/tugboat"
-  gem.files         = `git ls-files`.split($/)
-  gem.executables   = gem.files.grep(%r{^bin/}).map{ |f| File.basename(f) }
-  gem.test_files    = gem.files.grep(%r{^(test|spec|features)/})
-  gem.require_paths = ["lib"]
+  gem.files                 = `git ls-files`.split($/)
+  gem.executables           = gem.files.grep(%r{^bin/}).map{ |f| File.basename(f) }
+  gem.test_files            = gem.files.grep(%r{^(test|spec|features)/})
+  gem.require_paths         = ["lib"]
+  gem.required_ruby_version = ">= 1.9.2"
   gem.add_dependency "thor", "~> 0.18.1"
   gem.add_dependency "digital_ocean", "~> 1.0.1"
   gem.add_dependency "middleware" , "~> 0.1.0"
   gem.add_development_dependency "rake"
-  gem.add_development_dependency "rspec-core", "~> 2.13.0"
-  gem.add_development_dependency "rspec-expectations", "~> 2.13.0"
-  gem.add_development_dependency "rspec-mocks", "~> 2.13.0"
+  gem.add_development_dependency "rspec-core", "~> 2.14.0"
+  gem.add_development_dependency "rspec-expectations", "~> 2.14.0"
+  gem.add_development_dependency "rspec-mocks", "~> 2.14.0"
   gem.add_development_dependency "webmock", "~> 1.11.0"
   gem.add_development_dependency "coveralls", "~> 0.6.7"
+  gem.add_development_dependency 'aruba', '~> 0.6.2'
 end