tugboat 2.0.0 → 2.0.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 7d9cd87077814b0c15d54c53ba161fffdf4adcd5
-  data.tar.gz: cea9da9936b38ff7b773643406cbf2ed6ac8b844
+  metadata.gz: dff182303d9c37521cf816ceb57e0b5b73c9f60f
+  data.tar.gz: 98b25bcaa9909fcf9dbdc20a23e3db937e77148f
 SHA512:
-  metadata.gz: 04e3dd2f82fc781620cdea6ec5966b4e6ac836333d276f541bccfd526cc051d06adcbcfe25975ae5677757d046f52bd8d04e8bd911d33e8fac85e22a9e395ffb
-  data.tar.gz: 59aebcb1e96713bd589e071088a4c35af544b8b2d065ba0ef3e54f696622bb14edfaca431b8b19f3258f3796132182f717a4af3207781da8b028a57d2be9da44
+  metadata.gz: 84eed42cf4f8fbb5927b667bf05f243c34e070c58b9813150c790687fb1e5ed89958644f3c90b789e25e60f4797545f68f6684d7507239ea6fca76c01c9e2ce8
+  data.tar.gz: 5ccd3c89a919f5a47bd71792effca44afb6c552a1d64d3a085f012cd6846eed8bedb2e191cc961a4570a8b90c33e6af56bfb1a1f76e887beb402016a8df39aff

data/CHANGELOG.md

@@ -1,11 +1,89 @@
 # Change Log
 
+## [Unreleased](https://github.com/pearkes/tugboat/tree/HEAD)
+
+[Full Changelog](https://github.com/pearkes/tugboat/compare/v2.0.0...HEAD)
+
+## [v2.0.0](https://github.com/pearkes/tugboat/tree/v2.0.0) (2015-11-03)
+
+[Full Changelog](https://github.com/pearkes/tugboat/compare/v2.0.0.RC1...v2.0.0)
+
+**Implemented enhancements:**
+
+- Setting client\_id and api\_key as environment variables in shell [\#176](https://github.com/pearkes/tugboat/issues/176)
+
+- API v2.0 Support [\#122](https://github.com/pearkes/tugboat/issues/122)
+
+- If a command that requires arguments is entered without arguments, print the help for that. [\#191](https://github.com/pearkes/tugboat/issues/191)
+
+- Support traditional `-y` for automatically confirming a destructive action. [\#190](https://github.com/pearkes/tugboat/issues/190)
+
+- Allow specification of user data in create command [\#162](https://github.com/pearkes/tugboat/issues/162)
+
+- Multiple default SSH keys \(for new droplets\)? [\#142](https://github.com/pearkes/tugboat/issues/142)
+
+- tugboat info should show IPv6 address [\#119](https://github.com/pearkes/tugboat/issues/119)
+
+- Allow configuring IPv6 in create command [\#118](https://github.com/pearkes/tugboat/issues/118)
+
+- Allow resize -s to take a string size rather than ID [\#101](https://github.com/pearkes/tugboat/issues/101)
+
+- Machine Readable Flag [\#6](https://github.com/pearkes/tugboat/issues/6)
+
+**Fixed bugs:**
+
+- New Droplets dont have IP address immediatly, so the info command fails [\#198](https://github.com/pearkes/tugboat/issues/198)
+
+- Ipv6 changes broke ssh [\#192](https://github.com/pearkes/tugboat/issues/192)
+
+- tugboat doesn't work with team accounts, because they use api v2 [\#168](https://github.com/pearkes/tugboat/issues/168)
+
+- tugboat ssh not using ssh-agent? [\#160](https://github.com/pearkes/tugboat/issues/160)
+
+**Merged pull requests:**
+
+- Fixes multiple keys for droplet creation [\#201](https://github.com/pearkes/tugboat/pull/201) ([petems](https://github.com/petems))
+
+- Gives more specific output for ssh [\#199](https://github.com/pearkes/tugboat/pull/199) ([petems](https://github.com/petems))
+
+- Allow setting user data for droplet creation [\#197](https://github.com/pearkes/tugboat/pull/197) ([petems](https://github.com/petems))
+
+- Hacky way to get the ips for find droplet [\#196](https://github.com/pearkes/tugboat/pull/196) ([petems](https://github.com/petems))
+
+- Better help message [\#195](https://github.com/pearkes/tugboat/pull/195) ([petems](https://github.com/petems))
+
+- Add -y flag to skip confirmation [\#194](https://github.com/pearkes/tugboat/pull/194) ([petems](https://github.com/petems))
+
+- Add Min Disk Size to info\_image [\#193](https://github.com/pearkes/tugboat/pull/193) ([bmamlin](https://github.com/bmamlin))
+
+- Adds ability to enable IP6 on new droplets [\#189](https://github.com/pearkes/tugboat/pull/189) ([petems](https://github.com/petems))
+
+- Readme fixes API2 [\#188](https://github.com/pearkes/tugboat/pull/188) ([petems](https://github.com/petems))
+
+- Info droplet API2 changes [\#187](https://github.com/pearkes/tugboat/pull/187) ([petems](https://github.com/petems))
+
+- Fix references to id to slugs [\#186](https://github.com/pearkes/tugboat/pull/186) ([petems](https://github.com/petems))
+
+- Add "include\_urls" option to "droplets" command [\#185](https://github.com/pearkes/tugboat/pull/185) ([FreedomBen](https://github.com/FreedomBen))
+
+- Adds ability to use environment variable for key [\#184](https://github.com/pearkes/tugboat/pull/184) ([petems](https://github.com/petems))
+
+- Proper 2.0.0 release [\#183](https://github.com/pearkes/tugboat/pull/183) ([petems](https://github.com/petems))
+
+- Add UI System [\#200](https://github.com/pearkes/tugboat/pull/200) ([petems](https://github.com/petems))
+
 ## [v2.0.0.RC1](https://github.com/pearkes/tugboat/tree/v2.0.0.RC1) (2015-10-20)
 
 [Full Changelog](https://github.com/pearkes/tugboat/compare/v1.3.1...v2.0.0.RC1)
 
 **Closed issues:**
 
+- API 2.0 Release Candidate Guinea Pigs and Feedback [\#182](https://github.com/pearkes/tugboat/issues/182)
+
+- API 2.0 Switchover [\#161](https://github.com/pearkes/tugboat/issues/161)
+
+- API v2 Support [\#102](https://github.com/pearkes/tugboat/issues/102)
+
 - Possible to delete an image/snapshot? [\#177](https://github.com/pearkes/tugboat/issues/177)
 
 **Merged pull requests:**
@@ -20,7 +98,7 @@
 
 ## [v1.3.1](https://github.com/pearkes/tugboat/tree/v1.3.1) (2015-08-02)
 
-[Full Changelog](https://github.com/pearkes/tugboat/compare/v2.1.0.ALPHA...v1.3.1)
+[Full Changelog](https://github.com/pearkes/tugboat/compare/v1.3.0...v1.3.1)
 
 **Closed issues:**
 
@@ -30,10 +108,6 @@
 
 - Removes wrong help messages for `images`. [\#173](https://github.com/pearkes/tugboat/pull/173) ([haihappen](https://github.com/haihappen))
 
-## [v2.1.0.ALPHA](https://github.com/pearkes/tugboat/tree/v2.1.0.ALPHA) (2015-07-20)
-
-[Full Changelog](https://github.com/pearkes/tugboat/compare/v1.3.0...v2.1.0.ALPHA)
-
 ## [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)

data/lib/tugboat/cli.rb

@@ -144,15 +144,15 @@ module Tugboat
 
     desc "create NAME", "Create a droplet."
     method_option  "size",
-                   :type => :numeric,
+                   :type => :string,
                    :aliases => "-s",
                    :desc => "The size slug of the droplet"
     method_option  "image",
-                   :type => :numeric,
+                   :type => :string,
                    :aliases => "-i",
                    :desc => "The image slug of the droplet"
     method_option  "region",
-                   :type => :numeric,
+                   :type => :string,
                    :aliases => "-r",
                    :desc => "The region slug of the droplet"
     method_option  "keys",
@@ -474,10 +474,10 @@ module Tugboat
                   :aliases => "-n",
                   :desc => "The exact name of the droplet"
     method_option "size",
-                  :type => :numeric,
+                  :type => :string,
                   :aliases => "-s",
                   :required => true,
-                  :desc => "The size_id to resize the droplet to"
+                  :desc => "The size slug to resize the droplet to"
     def resize(name=nil)
       Middleware.sequence_resize_droplet.call({
         "tugboat_action" => __method__,

data/lib/tugboat/middleware/find_droplet.rb

@@ -100,9 +100,14 @@ module Tugboat
 
             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
+            if droplet_return.networks.v4.empty?
+              env["droplet_ip"] = '' # No Network Yet
+              env["droplet_ip_private"] = '' # No Network Yet
+            else
+              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
+            end
             env["droplet_status"] = droplet_return.status
           elsif found_droplets.length > 1
             # Did we run the multiple questionairre?

data/lib/tugboat/version.rb

@@ -1,3 +1,3 @@
 module Tugboat
-  VERSION = "2.0.0"
+  VERSION = "2.0.1"
 end

data/spec/cli/create_cli_spec.rb

@@ -73,7 +73,23 @@ Queueing creation of droplet 'example.com'...Could not find file: /foo/bar/baz.s
     end
 
     it "doesn't create a droplet when mistyping help command" do
-      help_text = "Usage:\n  rspec create NAME\n\nOptions:\n  -s, [--size=N]               # The size slug of the droplet\n  -i, [--image=N]              # The image slug of the droplet\n  -r, [--region=N]             # The region slug of the droplet\n  -k, [--keys=KEYS]            # A comma separated list of SSH key ids to add to the droplet\n  -p, [--private-networking]   # Enable private networking on the droplet\n  -l, [--ip6]                  # Enable IP6 on the droplet\n  -u, [--user-data=USER_DATA]  # Location of a file to read and use as user data\n  -b, [--backups-enabled]      # Enable backups on the droplet\n  -q, [--quiet]                \n\nCreate a droplet.\n"
+      help_text = <<-eos
+Usage:
+  rspec create NAME
+
+Options:
+  -s, [--size=SIZE]            # The size slug of the droplet
+  -i, [--image=IMAGE]          # The image slug of the droplet
+  -r, [--region=REGION]        # The region slug of the droplet
+  -k, [--keys=KEYS]            # A comma separated list of SSH key ids to add to the droplet
+  -p, [--private-networking]   # Enable private networking on the droplet
+  -l, [--ip6]                  # Enable IP6 on the droplet
+  -u, [--user-data=USER_DATA]  # Location of a file to read and use as user data
+  -b, [--backups-enabled]      # Enable backups on the droplet
+  -q, [--quiet]               \x20
+
+Create a droplet.
+eos
 
       @cli.create('help')
       expect($stdout.string).to eq help_text

data/spec/fixtures/droplet_no_network.json

@@ -0,0 +1,103 @@
+{
+  "droplet": {
+    "id": 6918990,
+    "name": "example.com",
+    "memory": 512,
+    "vcpus": 1,
+    "disk": 20,
+    "locked": true,
+    "status": "active",
+    "kernel": {
+      "id": 5175,
+      "name": "Ubuntu 14.04 x64 vmlinuz-3.13.0-57-generic",
+      "version": "3.13.0-57-generic"
+    },
+    "created_at": "2015-11-03T14:13:53Z",
+    "features": [
+      "virtio"
+    ],
+    "backup_ids": [
+
+    ],
+    "next_backup_window": null,
+    "snapshot_ids": [
+
+    ],
+    "image": {
+      "id": 13089493,
+      "name": "14.04 x64",
+      "distribution": "Ubuntu",
+      "slug": "ubuntu-14-04-x64",
+      "public": true,
+      "regions": [
+        "nyc1",
+        "ams1",
+        "sfo1",
+        "nyc2",
+        "ams2",
+        "sgp1",
+        "lon1",
+        "nyc3",
+        "ams3",
+        "fra1",
+        "tor1"
+      ],
+      "created_at": "2015-08-10T21:30:19Z",
+      "min_disk_size": 20,
+      "type": "snapshot"
+    },
+    "size": {
+      "slug": "512mb",
+      "memory": 512,
+      "vcpus": 1,
+      "disk": 20,
+      "transfer": 1,
+      "price_monthly": 5,
+      "price_hourly": 0.00744,
+      "regions": [
+        "nyc1",
+        "sgp1",
+        "sfo1",
+        "nyc2",
+        "lon1",
+        "nyc3",
+        "ams3",
+        "ams2",
+        "fra1",
+        "tor1"
+      ],
+      "available": true
+    },
+    "size_slug": "512mb",
+    "networks": {
+      "v4": [
+
+      ],
+      "v6": [
+
+      ]
+    },
+    "region": {
+      "name": "London 1",
+      "slug": "lon1",
+      "sizes": [
+        "512mb",
+        "1gb",
+        "2gb",
+        "4gb",
+        "8gb",
+        "32gb",
+        "48gb",
+        "64gb",
+        "16gb"
+      ],
+      "features": [
+        "private_networking",
+        "backups",
+        "ipv6",
+        "metadata"
+      ],
+      "available": true
+    }
+  }
+}

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: tugboat
 version: !ruby/object:Gem::Version
-  version: 2.0.0
+  version: 2.0.1
 platform: ruby
 authors:
 - Jack Pearkes
@@ -10,7 +10,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-11-03 00:00:00.000000000 Z
+date: 2015-11-10 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: thor
@@ -258,6 +258,7 @@ files:
 - spec/fixtures/create_droplet.json
 - spec/fixtures/create_ssh_key.json
 - spec/fixtures/create_ssh_key_from_file.json
+- spec/fixtures/droplet_no_network.json
 - spec/fixtures/droplet_start_response.json
 - spec/fixtures/not_found.json
 - spec/fixtures/password_reset_response.json
@@ -355,6 +356,7 @@ test_files:
 - spec/fixtures/create_droplet.json
 - spec/fixtures/create_ssh_key.json
 - spec/fixtures/create_ssh_key_from_file.json
+- spec/fixtures/droplet_no_network.json
 - spec/fixtures/droplet_start_response.json
 - spec/fixtures/not_found.json
 - spec/fixtures/password_reset_response.json