tugboat 2.2.0 → 2.2.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: f8c7f40ec8f57278de6f0554c189d74fda010d97
-  data.tar.gz: 4be4fefc1760f3b2a4caaa4bcab754147b273084
+  metadata.gz: 191f8c580acdb8df43570f84c9c5874e13012eb7
+  data.tar.gz: 924a5452cc0ee37b4b884468e2d89c2df15adbe2
 SHA512:
-  metadata.gz: 7525344456c0cc885294bfb17dde276f99277fc16f3ed5779c2a9d1a976872a7a67e475651ff75808dae0f2a3ed8d1311536389b35afb957518dcb49da443863
-  data.tar.gz: f3a895a5877808d06976d96b99531b58555f2aa6ecaa73886be28479ee78abb67f9ec29811da6b6ac2fced4062839f08839642f898288559e51ef5aaacf06c4f
+  metadata.gz: 7b9e6ee471a18dc45eb233798c7e4b123b862a1527b57a313efa52c5b7fab5fd8c8e68e2847e22445f1d2975b0c9dda54499af126266404552e055cb99a3719a
+  data.tar.gz: 5952037dadf29db13e4893de10e7ea9537a0952afe9729204d1226b882e82cdcb0573bcb7c98c7373dfcc743dd5b5846e405790420bbe47b4589aa9b681ea825

data/CHANGELOG.md

@@ -1,5 +1,29 @@
 # Change Log
 
+## [v2.2.0](https://github.com/pearkes/tugboat/tree/v2.2.0) (2016-01-30)
+
+[Full Changelog](https://github.com/pearkes/tugboat/compare/v2.1.0...v2.2.0)
+
+**Merged pull requests:**
+
+- Configuration support for IPv6 [\#233](https://github.com/pearkes/tugboat/pull/233) ([petems](https://github.com/petems))
+
+- Add Regions to info\_image [\#232](https://github.com/pearkes/tugboat/pull/232) ([bmamlin](https://github.com/bmamlin))
+
+- Install dependencies locally when developing [\#231](https://github.com/pearkes/tugboat/pull/231) ([else](https://github.com/else))
+
+- Adds simplecov-console for terminal coverage info [\#229](https://github.com/pearkes/tugboat/pull/229) ([petems](https://github.com/petems))
+
+- Updated simplecov's Multiple Formatters definition [\#228](https://github.com/pearkes/tugboat/pull/228) ([jasnow](https://github.com/jasnow))
+
+- Add Bundler.require\(:development\) for default rake tasks [\#227](https://github.com/pearkes/tugboat/pull/227) ([andrehjr](https://github.com/andrehjr))
+
+- Add debug logging [\#226](https://github.com/pearkes/tugboat/pull/226) ([petems](https://github.com/petems))
+
+- Refactor the response.success? into helper [\#225](https://github.com/pearkes/tugboat/pull/225) ([petems](https://github.com/petems))
+
+- Improves wait spec to actually perform wait [\#224](https://github.com/pearkes/tugboat/pull/224) ([petems](https://github.com/petems))
+
 ## [v2.1.0](https://github.com/pearkes/tugboat/tree/v2.1.0) (2015-12-01)
 
 [Full Changelog](https://github.com/pearkes/tugboat/compare/v2.0.1...v2.1.0)
@@ -336,7 +360,7 @@
 
 - region one unavailable on some clients, use NYC 2 [\#144](https://github.com/pearkes/tugboat/pull/144) ([Thetoxicarcade](https://github.com/Thetoxicarcade))
 
-- Load config file from current directory, if not exit load from defaults [\#123](https://github.com/pearkes/tugboat/pull/123) ([tg0](https://github.com/tg0))
+- Load config file from current directory, if not exit load from defaults [\#123](https://github.com/pearkes/tugboat/pull/123) ([tggo](https://github.com/tggo))
 
 - improves droplets list/info prints [\#115](https://github.com/pearkes/tugboat/pull/115) ([petems](https://github.com/petems))
 

data/README.md

@@ -36,6 +36,28 @@ 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.
 
+An example of a `.tugboat` file:
+
+```yaml
+---
+authentication:
+  access_token: f8sazukxeh729ggxh9gjavvzw5cabdpq95txpzhz6ep6jvtquxztfkf2chyejcsg5
+ssh:
+  ssh_user: root
+  ssh_key_path: "~/.ssh/id_rsa"
+  ssh_port: '22'
+defaults:
+  region: nyc2
+  image: ubuntu-14-04-x64
+  size: 512mb
+  ssh_key: ['1234','5678']
+  private_networking: 'false'
+  backups_enabled: 'false'
+  ip6: 'false'
+```
+
+
+
 ## Usage
 
 ### Retrieve a list of your droplets
@@ -510,4 +532,4 @@ Request Body:
 
 ## Contributing
 
-See the [contributing guide](CONTRIBUTING.md).
+See the [contributing guide](CONTRIBUTING.md).

data/features/cassettes/config/Array_of_SSH_Keys_in_Config.yml

@@ -0,0 +1,68 @@
+---
+http_interactions:
+- request:
+    method: post
+    uri: https://api.digitalocean.com/v2/droplets
+    body:
+      encoding: UTF-8
+      string: '{"name":"droplet-with-array-of-keys","size":"512mb","image":"ubuntu-14-04-x64","region":"nyc2","ssh_keys":["1234","5678"],"private_networking":"false","backups_enabled":"false","ipv6":"false","user_data":null}'
+    headers:
+      Authorization:
+      - Bearer f8sazukxeh729ggxh9gjavvzw5cabdpq95txpzhz6ep6jvtquxztfkf2chyejcsg5
+      Content-Type:
+      - application/json
+      User-Agent:
+      - Faraday v0.9.2
+      Accept-Encoding:
+      - gzip;q=1.0,deflate;q=0.6,identity;q=0.3
+      Accept:
+      - "*/*"
+  response:
+    status:
+      code: 202
+      message: Accepted
+    headers:
+      Server:
+      - cloudflare-nginx
+      Date:
+      - Tue, 16 Feb 2016 10:10:51 GMT
+      Content-Type:
+      - application/json; charset=utf-8
+      Transfer-Encoding:
+      - chunked
+      Connection:
+      - keep-alive
+      Set-Cookie:
+      - __cfduid=hm6ha3pvo7hm6ha3pvo7hm6ha3pvo7; expires=Wed, 15-Feb-17
+        10:10:50 GMT; path=/; domain=.digitalocean.com; HttpOnly
+      Status:
+      - 202 Accepted
+      X-Frame-Options:
+      - SAMEORIGIN
+      X-Xss-Protection:
+      - 1; mode=block
+      X-Content-Type-Options:
+      - nosniff
+      Ratelimit-Limit:
+      - '5000'
+      Ratelimit-Remaining:
+      - '4994'
+      Ratelimit-Reset:
+      - '1455617507'
+      Cache-Control:
+      - no-cache
+      X-Request-Id:
+      - 8d869cf8-bbeb-48fa-ae84-32f1b01ebab6
+      X-Runtime:
+      - '0.246402'
+      Cf-Ray:
+      - 27587709cabc1377-LHR
+    body:
+      encoding: UTF-8
+      string: '{"droplet":{"id":276961,"name":"droplet-with-array-of-keys","memory":512,"vcpus":1,"disk":20,"locked":true,"status":"new","kernel":{"id":6297,"name":"Ubuntu
+        14.04 x64 vmlinuz-3.13.0-71-generic","version":"3.13.0-71-generic"},"created_at":"2016-02-16T10:10:50Z","features":["virtio"],"backup_ids":[],"next_backup_window":null,"snapshot_ids":[],"image":{"id":14782728,"name":"14.04.3
+        x64","distribution":"Ubuntu","slug":"ubuntu-14-04-x64","public":true,"regions":["nyc1","sfo1","nyc2","ams2","sgp1","lon1","nyc3","ams3","fra1","tor1"],"created_at":"2015-12-10T16:42:21Z","min_disk_size":20,"type":"snapshot"},"size":{"slug":"512mb","memory":512,"vcpus":1,"disk":20,"transfer":1.0,"price_monthly":5.0,"price_hourly":0.00744,"regions":["ams1","ams2","ams3","fra1","lon1","nyc1","nyc2","nyc3","sfo1","sgp1","tor1"],"available":true},"size_slug":"512mb","networks":{"v4":[],"v6":[]},"region":{"name":"New
+        York 2","slug":"nyc2","sizes":["1gb","2gb","4gb","8gb","32gb","64gb","512mb","48gb","16gb"],"features":["private_networking","backups","ipv6","metadata"],"available":true},"tags":[]},"links":{"actions":[{"id":84162954,"rel":"create","href":"https://api.digitalocean.com/v2/actions/27624451"}]}}'
+    http_version:
+  recorded_at: Tue, 16 Feb 2016 10:10:51 GMT
+recorded_with: VCR 2.9.3

data/features/step_definitions/steps.rb

@@ -0,0 +1,6 @@
+require 'erb'
+
+Given(/^a '\.tugboat' config with data:$/) do |data_str|
+  data = ERB.new(data_str).result(binding)
+  File.write("#{Dir.pwd}/tmp/aruba/.tugboat", data)
+end

data/features/support/env.rb

@@ -1,9 +1,40 @@
 require 'aruba/cucumber'
+require 'aruba/in_process'
+require 'aruba/spawn_process'
+require 'vcr'
+require 'webmock'
+require 'tugboat'
 
-Before do
+VCR.configure do |c|
+  c.hook_into :webmock
+  c.cassette_library_dir     = 'features/cassettes'
+  c.default_cassette_options = { :record => :new_episodes }
+end
 
+VCR.cucumber_tags do |t|
+  t.tag  '@vcr', :use_scenario_name => true
 end
 
-After do
+class VcrFriendlyMain
+  def initialize(argv, stdin, stdout, stderr, kernel)
+    @argv, @stdin, @stdout, @stderr, @kernel = argv, stdin, stdout, stderr, kernel
+  end
+
+  def execute!
+    $stdin = @stdin
+    $stdout = @stdout
+    Tugboat::CLI.start(@argv)
+  end
+end
+
+Before('@vcr') do
+  Aruba::InProcess.main_class = VcrFriendlyMain
+  Aruba.process = Aruba::InProcess
+end
 
+After('@vcr') do
+  Aruba.process = Aruba::SpawnProcess
+  $stdin = STDIN
+  $stdout = STDOUT
+  VCR.eject_cassette
 end

data/features/tugboat/config_array_of_ssh_keys.feature

@@ -0,0 +1,28 @@
+Feature: config
+  In order to have an easier time connecting to droplets
+  As a user
+  I should be able to supply an array of ssh keys for a machine
+
+  @vcr
+  Scenario: Array of SSH Keys in Config
+    Given a '.tugboat' config with data:
+"""
+---
+authentication:
+  access_token: f8sazukxeh729ggxh9gjavvzw5cabdpq95txpzhz6ep6jvtquxztfkf2chyejcsg5
+ssh:
+  ssh_user: bobby_sousa
+  ssh_key_path: "~/.ssh/id_rsa"
+  ssh_port: '22'
+defaults:
+  region: nyc2
+  image: ubuntu-14-04-x64
+  size: 512mb
+  ssh_key: ['1234','5678']
+  private_networking: 'false'
+  backups_enabled: 'false'
+  ip6: 'false'
+"""
+    When I run `tugboat create droplet-with-array-of-keys`
+    Then the exit status should not be 1
+    And the output should contain "Queueing creation of droplet 'droplet-with-array-of-keys'...Droplet created!"

data/features/tugboat/config_current_directory.feature

@@ -3,25 +3,27 @@ Feature: 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:
-      """
+  Scenario: Read config from current directory
+    Given a '.tugboat' config with data:
+"""
 ---
 authentication:
-  client_key: FOO
-  api_key: BAR
+  access_token: FOO
 ssh:
   ssh_user: janedoe
   ssh_key_path: "/Users/janedoe/.ssh/id_rsa"
   ssh_port: '22'
 defaults:
-  region: '8'
-  image: '9801950'
-  size: '66'
-  ssh_key: ''
+  region: nyc2
+  image: ubuntu-14-04-x64
+  size: 512mb
+  ssh_key: ['1234','5678']
   private_networking: 'false'
   backups_enabled: 'false'
-      """
+  ip6: 'false'
+"""
     When I run `tugboat config`
     Then the exit status should not be 1
     And the output should contain "ssh_user: janedoe"
+    And the output should contain "'1234'"
+    And the output should contain "'5678'"

data/lib/tugboat/middleware/create_droplet.rb

@@ -47,10 +47,11 @@ module Tugboat
         droplet_backups_enabled = env["create_droplet_backups_enabled"] :
         droplet_backups_enabled = env["config"].default_backups_enabled
 
-        droplet_key_array = droplet_ssh_key_ids.split(',')
-
-        droplet_key_array = nil if [droplet_key_array].empty?
-
+        if droplet_ssh_key_ids.kind_of?(Array)
+          droplet_key_array = droplet_ssh_key_ids
+        else
+          droplet_key_array = droplet_ssh_key_ids.split(',')
+        end
 
         create_opts = {
           :name               => env["create_droplet_name"],

data/lib/tugboat/version.rb

@@ -1,3 +1,3 @@
 module Tugboat
-  VERSION = "2.2.0"
+  VERSION = "2.2.1"
 end

data/tugboat.gemspec

@@ -30,8 +30,9 @@ Gem::Specification.new do |gem|
   gem.add_development_dependency 'simplecov', '0.10'
   gem.add_development_dependency 'simplecov-console', '0.2.0'
   gem.add_development_dependency 'coveralls', '~> 0.6.7'
-  gem.add_development_dependency 'aruba', '~> 0.6.2'
+  gem.add_development_dependency 'aruba', '0.7.4'
   gem.add_development_dependency 'pry'
+  gem.add_development_dependency 'vcr', '2.9.3'
 
   gem.post_install_message = '***************************************'
   gem.post_install_message = '   .  o ..                            '

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: tugboat
 version: !ruby/object:Gem::Version
-  version: 2.2.0
+  version: 2.2.1
 platform: ruby
 authors:
 - Jack Pearkes
@@ -10,7 +10,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-01-30 00:00:00.000000000 Z
+date: 2016-02-16 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: thor
@@ -170,16 +170,16 @@ dependencies:
   name: aruba
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - '='
       - !ruby/object:Gem::Version
-        version: 0.6.2
+        version: 0.7.4
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - '='
       - !ruby/object:Gem::Version
-        version: 0.6.2
+        version: 0.7.4
 - !ruby/object:Gem::Dependency
   name: pry
   requirement: !ruby/object:Gem::Requirement
@@ -194,6 +194,20 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: '0'
+- !ruby/object:Gem::Dependency
+  name: vcr
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - '='
+      - !ruby/object:Gem::Version
+        version: 2.9.3
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - '='
+      - !ruby/object:Gem::Version
+        version: 2.9.3
 description: A command line tool for interacting with your DigitalOcean droplets.
 email:
 - jackpearkes@gmail.com
@@ -212,8 +226,10 @@ files:
 - README.md
 - Rakefile
 - bin/tugboat
+- features/cassettes/config/Array_of_SSH_Keys_in_Config.yml
 - features/step_definitions/steps.rb
 - features/support/env.rb
+- features/tugboat/config_array_of_ssh_keys.feature
 - features/tugboat/config_current_directory.feature
 - lib/tugboat.rb
 - lib/tugboat/cli.rb
@@ -352,8 +368,10 @@ signing_key:
 specification_version: 4
 summary: A command line tool for interacting with your DigitalOcean droplets.
 test_files:
+- features/cassettes/config/Array_of_SSH_Keys_in_Config.yml
 - features/step_definitions/steps.rb
 - features/support/env.rb
+- features/tugboat/config_array_of_ssh_keys.feature
 - features/tugboat/config_current_directory.feature
 - spec/cli/add_key_spec.rb
 - spec/cli/authorize_cli_spec.rb