tugboat 0.0.2 → 0.0.3

data/lib/tugboat/cli.rb

@@ -101,11 +101,11 @@ module Tugboat
                   :aliases => "-n",
                   :desc => "The exact name of the droplet"
     def destroy(name=nil)
-        Middleware.sequence_destroy_droplet.call({
-          "user_droplet_id" => options[:id],
-          "user_droplet_name" => options[:name],
-          "user_droplet_fuzzy_name" => name
-        })
+      Middleware.sequence_destroy_droplet.call({
+        "user_droplet_id" => options[:id],
+        "user_droplet_name" => options[:name],
+        "user_droplet_fuzzy_name" => name
+      })
     end
 
     desc "restart FUZZY_NAME", "Restart a droplet"
@@ -135,11 +135,11 @@ module Tugboat
                   :aliases => "-n",
                   :desc => "The exact name of the droplet"
     def halt(name=nil)
-        Middleware.sequence_halt_droplet.call({
-          "user_droplet_id" => options[:id],
-          "user_droplet_name" => options[:name],
-          "user_droplet_fuzzy_name" => name
-        })
+      Middleware.sequence_halt_droplet.call({
+        "user_droplet_id" => options[:id],
+        "user_droplet_name" => options[:name],
+        "user_droplet_fuzzy_name" => name
+      })
     end
 
     desc "info FUZZY_NAME [OPTIONS]", "Show a droplet's information"
@@ -152,11 +152,11 @@ module Tugboat
                   :aliases => "-n",
                   :desc => "The exact name of the droplet"
     def info(name=nil)
-        Middleware.sequence_info_droplet.call({
-          "user_droplet_id" => options[:id],
-          "user_droplet_name" => options[:name],
-          "user_droplet_fuzzy_name" => name
-        })
+      Middleware.sequence_info_droplet.call({
+        "user_droplet_id" => options[:id],
+        "user_droplet_name" => options[:name],
+        "user_droplet_fuzzy_name" => name
+      })
     end
 
     desc "snapshot FUZZY_NAME [OPTIONS]", "Queue a snapshot of the droplet."
@@ -173,12 +173,12 @@ module Tugboat
                   :aliases => "-s",
                   :desc => "The name of the snapshot"
     def snapshot(name=nil, snapshot_name)
-        Middleware.sequence_snapshot_droplet.call({
-          "user_droplet_id" => options[:id],
-          "user_droplet_name" => options[:name],
-          "user_droplet_fuzzy_name" => name,
-          "user_snapshot_name" => snapshot_name
-        })
+      Middleware.sequence_snapshot_droplet.call({
+        "user_droplet_id" => options[:id],
+        "user_droplet_name" => options[:name],
+        "user_droplet_fuzzy_name" => name,
+        "user_snapshot_name" => snapshot_name
+      })
     end
   end
 end

data/lib/tugboat/middleware/find_droplet.rb

@@ -23,11 +23,16 @@ module Tugboat
         # Easy for us if they provide an id. Just set it to the droplet_id
         if user_droplet_id
           say "Droplet id provided. Finding Droplet...", nil, false
-          droplet = ocean.droplets.show user_droplet_id
+          req = ocean.droplets.show user_droplet_id
 
-          env["droplet_id"] = droplet.id
-          env["droplet_name"] = "(#{droplet.name})"
-          env["droplet_ip"] = droplet.ip_address
+          if req.status == "ERROR"
+            say "#{req.status}: #{req.error_message}", :red
+            return
+          end
+
+          env["droplet_id"] = req.droplet.id
+          env["droplet_name"] = "(#{req.droplet.name})"
+          env["droplet_ip"] = req.droplet.ip_address
         end
 
         # If they provide a name, we need to get the ID for it.

data/lib/tugboat/version.rb

@@ -1,3 +1,3 @@
 module Tugboat
-  VERSION = "0.0.2"
+  VERSION = "0.0.3"
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: tugboat
 version: !ruby/object:Gem::Version
-  version: 0.0.2
+  version: 0.0.3
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-04-14 00:00:00.000000000 Z
+date: 2013-04-15 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: thor