tugboat 0.0.6 → 0.0.7

data/CHANGELOG.md

@@ -1,3 +1,13 @@
+## 0.0.7 (unreleased)
+
+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:

data/lib/tugboat/middleware/ask_for_credentials.rb

@@ -13,6 +13,7 @@ module Tugboat
 
         # Write the config file.
         env['config'].create_config_file(client_key, api_key, ssh_key_path, ssh_user, ssh_port)
+        env['config'].reload!
 
         @app.call(env)
       end

data/lib/tugboat/middleware/list_droplets.rb

@@ -5,15 +5,22 @@ module Tugboat
       def call(env)
         ocean = env["ocean"]
 
-        ocean.droplets.list.droplets.each do |droplet|
+        droplet_list = ocean.droplets.list.droplets
 
-          if droplet.status == "active"
-            status_color = GREEN
-          else
-            status_color = RED
-          end
+        if droplet_list.empty?
+          say "You don't appear to have any droplets.", :red
+          say "Try creating one with #{GREEN}\`tugboat create\`"
+        else
+          droplet_list.each do |droplet|
+
+            if droplet.status == "active"
+              status_color = GREEN
+            else
+              status_color = RED
+            end
 
-          say "#{droplet.name} (ip: #{droplet.ip_address}, status: #{status_color}#{droplet.status}#{CLEAR}, region: #{droplet.region_id}, id: #{droplet.id})"
+            say "#{droplet.name} (ip: #{droplet.ip_address}, status: #{status_color}#{droplet.status}#{CLEAR}, region: #{droplet.region_id}, id: #{droplet.id})"
+          end
         end
 
         @app.call(env)

data/lib/tugboat/middleware/list_images.rb

@@ -9,8 +9,13 @@ module Tugboat
         end
 
         say "My Images:"
-        my_images.images.each do |image|
-          say "#{image.name} (id: #{image.id}, distro: #{image.distribution})"
+        my_images_list = my_images.images
+        if my_images_list.empty?
+          say "No images found"
+        else
+          my_images_list.each do |image|
+            say "#{image.name} (id: #{image.id}, distro: #{image.distribution})"
+          end
         end
 
         if env["user_show_global_images"]

data/lib/tugboat/version.rb

@@ -1,3 +1,3 @@
 module Tugboat
-  VERSION = "0.0.6"
+  VERSION = "0.0.7"
 end

data/spec/cli/droplets_cli_spec.rb

@@ -4,7 +4,7 @@ describe Tugboat::CLI do
   include_context "spec"
 
   describe "droplets" do
-    it "shows a list" do
+    it "shows a list when droplets exist" 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"))
 
@@ -18,6 +18,20 @@ foo (ip: 33.33.33.10, status: \e[32mactive\e[0m, region: 1, id: 100823)
 
       expect(a_request(:get, "https://api.digitalocean.com/droplets?api_key=#{api_key}&client_id=#{client_key}")).to have_been_made
     end
+
+    it "returns an error when no droplets exist" 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_empty"))
+
+      @cli.droplets
+
+      expect($stdout.string).to eq <<-eos
+You don't appear to have any droplets.
+Try creating one with \e[32m`tugboat create`
+      eos
+
+      expect(a_request(:get, "https://api.digitalocean.com/droplets?api_key=#{api_key}&client_id=#{client_key}")).to have_been_made
+    end
   end
 
 end

data/spec/cli/images_cli_spec.rb

@@ -19,6 +19,44 @@ NLP Final (id: 478, distro: Ubuntu)
       expect(a_request(:get, "https://api.digitalocean.com/images?api_key=#{api_key}&client_id=#{client_key}&filter=my_images")).to have_been_made
     end
 
+    it "acknowledges when my images are empty" do
+      stub_request(:get, "https://api.digitalocean.com/images?api_key=#{api_key}&client_id=#{client_key}&filter=my_images").
+      to_return(:status => 200, :body => fixture("show_images_empty"))
+
+      @cli.images
+
+      expect($stdout.string).to eq <<-eos
+My Images:
+No images found
+      eos
+
+      expect(a_request(:get, "https://api.digitalocean.com/images?api_key=#{api_key}&client_id=#{client_key}&filter=my_images")).to have_been_made
+    end
+
+    it "acknowledges when my images are empty and also shows a global list" do
+      stub_request(:get, "https://api.digitalocean.com/images?api_key=#{api_key}&client_id=#{client_key}&filter=my_images").
+           to_return(:status => 200, :body => fixture("show_images_empty"))
+
+      stub_request(:get, "https://api.digitalocean.com/images?api_key=#{api_key}&client_id=#{client_key}&filter=global").
+           to_return(:status => 200, :body => fixture("show_images_global"))
+
+      @cli.options = @cli.options.merge(:global => true)
+      @cli.images
+
+      expect($stdout.string).to eq <<-eos
+My Images:
+No images found
+
+Global Images:
+NYTD Backup 1-18-2012 (id: 466, distro: Ubuntu)
+NLP Final (id: 478, distro: Ubuntu)
+Global Final (id: 479, distro: Ubuntu)
+      eos
+
+      expect(a_request(:get, "https://api.digitalocean.com/images?api_key=#{api_key}&client_id=#{client_key}&filter=my_images")).to have_been_made
+      expect(a_request(:get, "https://api.digitalocean.com/images?api_key=#{api_key}&client_id=#{client_key}&filter=global")).to have_been_made
+    end
+
     it "shows a global list" do
       stub_request(:get, "https://api.digitalocean.com/images?api_key=#{api_key}&client_id=#{client_key}&filter=my_images").
            to_return(:status => 200, :body => fixture("show_images"))

data/spec/fixtures/show_droplets_empty.json

@@ -0,0 +1,4 @@
+{
+  "status":"OK",
+  "droplets":[]
+}

data/spec/fixtures/show_images_empty.json

@@ -0,0 +1,4 @@
+{
+	"status":"OK",
+	"images":[]
+}

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: tugboat
 version: !ruby/object:Gem::Version
-  version: 0.0.6
+  version: 0.0.7
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-06-25 00:00:00.000000000 Z
+date: 2013-08-02 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: thor
@@ -227,8 +227,10 @@ files:
 - spec/fixtures/show_droplet.json
 - spec/fixtures/show_droplet_inactive.json
 - spec/fixtures/show_droplets.json
+- spec/fixtures/show_droplets_empty.json
 - spec/fixtures/show_droplets_inactive.json
 - spec/fixtures/show_images.json
+- spec/fixtures/show_images_empty.json
 - spec/fixtures/show_images_global.json
 - spec/fixtures/show_keys.json
 - spec/fixtures/show_regions.json
@@ -294,8 +296,10 @@ test_files:
 - spec/fixtures/show_droplet.json
 - spec/fixtures/show_droplet_inactive.json
 - spec/fixtures/show_droplets.json
+- spec/fixtures/show_droplets_empty.json
 - spec/fixtures/show_droplets_inactive.json
 - spec/fixtures/show_images.json
+- spec/fixtures/show_images_empty.json
 - spec/fixtures/show_images_global.json
 - spec/fixtures/show_keys.json
 - spec/fixtures/show_regions.json