tugboat 1.2.0 → 1.3.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: d29e3739288b2b4fe84d466672dc840926521529
-  data.tar.gz: 0431588980b59d18c1ef6dff0f22d17001c29c94
+  metadata.gz: 675f0544eb2cd135f849db7e54875a7997ff81ff
+  data.tar.gz: 5e7ef404c16d2b0b5da797927b0f4a93edb54d30
 SHA512:
-  metadata.gz: ffa3baacba280f38ef8666561c319276e0197345575f333b47351b464b38111bacf2b02d63d76568a848de38f7aed5cfeb3ff8836f7efe1093c0886f9a06e688
-  data.tar.gz: 32c0e440603dc9b66142519b5c30fd39845567179380a20cca65d90c28388cb7b1026466fcc43ecdbf5ca0cb21a137598910b8df2b2da043dc8a0cbf127c12b0
+  metadata.gz: 1d50761d516a571e9c996e73913677a253ae0323efb3b937db13602a19128245152f2773337630b3735891bd3d8b2a70a468c9d99f2790541034777cc5b1fa71
+  data.tar.gz: 6e79dcd03a37ffbed67c672d358c92174d7ca2faf19dfd3080328e1a3db1931e365fd21bad60a7be3dbb6e93cca951a72863408712530e2285bb77b943edfff8

data/CHANGELOG.md

@@ -1,8 +1,8 @@
 # Change Log
 
-## [Unreleased](https://github.com/pearkes/tugboat/tree/HEAD)
+## [v1.2.0](https://github.com/pearkes/tugboat/tree/v1.2.0) (2015-07-18)
 
-[Full Changelog](https://github.com/pearkes/tugboat/compare/v1.1.0...HEAD)
+[Full Changelog](https://github.com/pearkes/tugboat/compare/v1.1.0...v1.2.0)
 
 **Fixed bugs:**
 
@@ -10,15 +10,23 @@
 
 **Closed issues:**
 
-- Unable to bundle to run tugboat from git repo version for testing  [\#171](https://github.com/pearkes/tugboat/issues/171)
+- Image list and authorize [\#163](https://github.com/pearkes/tugboat/issues/163)
 
 **Merged pull requests:**
 
-- Update ssh to private ip [\#172](https://github.com/pearkes/tugboat/pull/172) ([petems](https://github.com/petems))
+- Adds flavour text for listing global images [\#167](https://github.com/pearkes/tugboat/pull/167) ([petems](https://github.com/petems))
+
+## [v1.1.0](https://github.com/pearkes/tugboat/tree/v1.1.0) (2015-07-18)
+
+[Full Changelog](https://github.com/pearkes/tugboat/compare/v2.0.0.ALPHA...v1.1.0)
 
 **Closed issues:**
 
-- 1.0.0 Release [\#125](https://github.com/pearkes/tugboat/issues/125)
+- Unable to bundle to run tugboat from git repo version for testing  [\#171](https://github.com/pearkes/tugboat/issues/171)
+
+**Merged pull requests:**
+
+- Update ssh to private ip [\#172](https://github.com/pearkes/tugboat/pull/172) ([petems](https://github.com/petems))
 
 ## [v1.0.0](https://github.com/pearkes/tugboat/tree/v1.0.0) (2015-05-26)
 

data/README.md

@@ -99,6 +99,24 @@ match.
     Size ID:          66
     Backups Active:   false
 
+Print info in machine-readable format. The ``--porcelain`` flag silences extra output for easy parsing. Fuzzy name matching is not supported with the ``--porcelain`` flag.
+
+    $ tugboat info -n pearkes-admin-001 --attribute ip --porcelain
+    name pearkes-admin-001
+    id 13231512
+    status active
+    ip 30.30.30.3
+    region_id 1
+    image_id 25489
+    size_id 66
+    backups_active false
+
+Print a single attribute.
+
+    $ tugboat info -n pearkes-admin-001 --attribute ip --porcelain
+    30.30.30.3
+
+
 ### Destroy a droplet
 
     $ tugboat destroy pearkes-www-002

data/lib/tugboat/cli.rb

@@ -308,12 +308,21 @@ module Tugboat
                   :type => :string,
                   :aliases => "-n",
                   :desc => "The exact name of the droplet"
+    method_option "attribute",
+                  :type => :string,
+                  :aliases => "-a",
+                  :desc => "The name of the attribute to print."
+    method_option "porcelain",
+                  :type => :boolean,
+                  :desc => "Give the output in an easy-to-parse format for scripts."
     def info(name=nil)
       Middleware.sequence_info_droplet.call({
         "user_droplet_id" => options[:id],
         "user_droplet_name" => options[:name],
         "user_droplet_fuzzy_name" => name,
-        "user_quiet" => options[:quiet]
+        "user_quiet" => options[:quiet],
+        "user_attribute" => options[:attribute],
+        "user_porcelain" => options[:porcelain]
       })
     end
 

data/lib/tugboat/middleware/find_droplet.rb

@@ -7,6 +7,7 @@ module Tugboat
         user_fuzzy_name = env['user_droplet_fuzzy_name']
         user_droplet_name = env['user_droplet_name']
         user_droplet_id = env['user_droplet_id']
+        porcelain = env['user_porcelain']
 
         # First, if nothing is provided to us, we should quit and
         # let the user know.
@@ -15,6 +16,11 @@ module Tugboat
           exit 1
         end
 
+        if porcelain && (!(user_droplet_name || user_droplet_id) || user_fuzzy_name)
+          say "Tugboat expects an exact droplet ID or droplet name for porcelain mode.", :red
+          exit 1
+        end
+
         # If you were to `tugboat restart foo -n foo-server-001` then we'd use
         # 'foo-server-001' without looking up the fuzzy name.
         #
@@ -22,7 +28,9 @@ 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
+          if !porcelain
+            say "Droplet id provided. Finding Droplet...", nil, false
+          end
           req = ocean.droplets.show user_droplet_id
 
           if req.status == "ERROR"
@@ -40,7 +48,9 @@ module Tugboat
         # If they provide a name, we need to get the ID for it.
         # This requires a lookup.
         if user_droplet_name && !env["droplet_id"]
-          say "Droplet name provided. Finding droplet ID...", nil, false
+          if !porcelain
+            say "Droplet name provided. Finding droplet ID...", nil, false
+          end
 
           # Look for the droplet by an exact name match.
           ocean.droplets.list.droplets.each do |d|
@@ -115,7 +125,9 @@ module Tugboat
         end
 
         if !did_run_multiple
-          say "done#{CLEAR}, #{env["droplet_id"]} #{env["droplet_name"]}", :green
+          if !porcelain
+            say "done#{CLEAR}, #{env["droplet_id"]} #{env["droplet_name"]}", :green
+          end
         end
         @app.call(env)
       end

data/lib/tugboat/middleware/info_droplet.rb

@@ -19,20 +19,49 @@ module Tugboat
             status_color = RED
           end
 
-        say
-        say "Name:             #{droplet.name}"
-        say "ID:               #{droplet.id}"
-        say "Status:           #{status_color}#{droplet.status}#{CLEAR}"
-        say "IP:               #{droplet.ip_address}"
-
-        if droplet.private_ip_address
-	        say "Private IP:       #{droplet.private_ip_address}"
-	      end
-
-        say "Region ID:        #{droplet.region_id}"
-        say "Image ID:         #{droplet.image_id}"
-        say "Size ID:          #{droplet.size_id}"
-        say "Backups Active:   #{droplet.backups_active || false}"
+        attribute = env["user_attribute"]
+
+        attributes_list = [
+          ["name",  droplet.name],
+          ["id",  droplet.id],
+          ["status",  droplet.status],
+          ["ip",  droplet.ip_address],
+          ["private_ip",  droplet.private_ip_address],
+          ["region_id",  droplet.region_id],
+          ["image_id",  droplet.image_id],
+          ["size_id",  droplet.size_id],
+          ["backups_active",  (droplet.backups_active || false)]
+        ]
+        attributes = Hash[*attributes_list.flatten(1)]
+
+        if attribute
+          if attributes.has_key? attribute
+            say attributes[attribute]
+          else
+            say "Invalid attribute \"#{attribute}\"", :red
+            say "Provide one of the following:", :red
+            attributes_list.keys.each { |a| say "    #{a[0]}", :red }
+          end
+        else
+          if env["user_porcelain"]
+            attributes_list.select{ |a| a[1] != nil }.each{ |a| say "#{a[0]} #{a[1]}"}
+          else
+            say
+            say "Name:             #{droplet.name}"
+            say "ID:               #{droplet.id}"
+            say "Status:           #{status_color}#{droplet.status}#{CLEAR}"
+            say "IP:               #{droplet.ip_address}"
+
+            if droplet.private_ip_address
+    	        say "Private IP:       #{droplet.private_ip_address}"
+    	      end
+
+            say "Region ID:        #{droplet.region_id}"
+            say "Image ID:         #{droplet.image_id}"
+            say "Size ID:          #{droplet.size_id}"
+            say "Backups Active:   #{droplet.backups_active || false}"
+          end
+        end
 
         @app.call(env)
       end

data/lib/tugboat/version.rb

@@ -1,3 +1,3 @@
 module Tugboat
-  VERSION = "1.2.0"
+  VERSION = "1.3.0"
 end

data/spec/cli/info_cli_spec.rb

@@ -104,7 +104,7 @@ Droplet fuzzy name provided. Finding droplet ID...Multiple droplets found.
 0) test222 (100823)
 1) test223 (100824)
 
-Please choose a droplet: ["0", "1"] 
+Please choose a droplet: ["0", "1"]\x20
 Name:             test222
 ID:               100823
 Status:           \e[32mactive\e[0m
@@ -121,4 +121,130 @@ Backups Active:   false
 
   end
 
-end
+  it "shows a droplet with an id under porcelain mode" do
+      stub_request(:get, "https://api.digitalocean.com/droplets/#{droplet_id}?api_key=#{api_key}&client_id=#{client_key}").
+           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(:headers => {'Content-Type' => 'application/json'}, :status => 200, :body => fixture("show_droplet"))
+
+      @cli.options = @cli.options.merge(:id => droplet_id, :porcelain => true)
+      @cli.info
+
+      expect($stdout.string).to eq <<-eos
+name foo
+id 100823
+status active
+ip 33.33.33.10
+private_ip 10.20.30.40
+region_id 1
+image_id 420
+size_id 33
+backups_active false
+      eos
+
+      expect(a_request(:get, "https://api.digitalocean.com/droplets/100823?api_key=#{api_key}&client_id=#{client_key}")).to have_been_made
+      expect(a_request(:get, "https://api.digitalocean.com/droplets/#{droplet_id}?api_key=#{api_key}&client_id=#{client_key}")).to have_been_made
+    end
+
+    it "shows a droplet with a name under porcelain mode" do
+      stub_request(:get, "https://api.digitalocean.com/droplets?api_key=#{api_key}&client_id=#{client_key}").
+           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(:headers => {'Content-Type' => 'application/json'}, :status => 200, :body => fixture("show_droplet"))
+
+      @cli.options = @cli.options.merge(:name => droplet_name, :porcelain => true)
+      @cli.info
+
+      expect($stdout.string).to eq <<-eos
+name foo
+id 100823
+status active
+ip 33.33.33.10
+private_ip 10.20.30.40
+region_id 1
+image_id 420
+size_id 33
+backups_active false
+      eos
+
+      expect(a_request(:get, "https://api.digitalocean.com/droplets/100823?api_key=#{api_key}&client_id=#{client_key}")).to have_been_made
+      expect(a_request(:get, "https://api.digitalocean.com/droplets?api_key=#{api_key}&client_id=#{client_key}")).to have_been_made
+    end
+
+  it "shows a droplet attribute with an id" do
+    stub_request(:get, "https://api.digitalocean.com/droplets/#{droplet_id}?api_key=#{api_key}&client_id=#{client_key}").
+         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(:headers => {'Content-Type' => 'application/json'}, :status => 200, :body => fixture("show_droplet"))
+
+    @cli.options = @cli.options.merge(:id => droplet_id, :attribute => "ip")
+    @cli.info
+
+    expect($stdout.string).to eq <<-eos
+Droplet id provided. Finding Droplet...done\e[0m, 100823 (foo)
+33.33.33.10
+    eos
+
+    expect(a_request(:get, "https://api.digitalocean.com/droplets/100823?api_key=#{api_key}&client_id=#{client_key}")).to have_been_made
+    expect(a_request(:get, "https://api.digitalocean.com/droplets/#{droplet_id}?api_key=#{api_key}&client_id=#{client_key}")).to have_been_made
+  end
+
+  it "shows a droplet attribute with a name" do
+    stub_request(:get, "https://api.digitalocean.com/droplets?api_key=#{api_key}&client_id=#{client_key}").
+         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(:headers => {'Content-Type' => 'application/json'}, :status => 200, :body => fixture("show_droplet"))
+
+    @cli.options = @cli.options.merge(:name => droplet_name, :attribute => "ip")
+    @cli.info
+
+    expect($stdout.string).to eq <<-eos
+Droplet name provided. Finding droplet ID...done\e[0m, 100823 (foo)
+33.33.33.10
+    eos
+
+    expect(a_request(:get, "https://api.digitalocean.com/droplets/100823?api_key=#{api_key}&client_id=#{client_key}")).to have_been_made
+    expect(a_request(:get, "https://api.digitalocean.com/droplets?api_key=#{api_key}&client_id=#{client_key}")).to have_been_made
+  end
+
+  it "shows a droplet attribute with an id under porcelain mode" do
+      stub_request(:get, "https://api.digitalocean.com/droplets/#{droplet_id}?api_key=#{api_key}&client_id=#{client_key}").
+           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(:headers => {'Content-Type' => 'application/json'}, :status => 200, :body => fixture("show_droplet"))
+
+      @cli.options = @cli.options.merge(:id => droplet_id, :porcelain => true, :attribute => "ip")
+      @cli.info
+
+      expect($stdout.string).to eq <<-eos
+33.33.33.10
+      eos
+
+      expect(a_request(:get, "https://api.digitalocean.com/droplets/100823?api_key=#{api_key}&client_id=#{client_key}")).to have_been_made
+      expect(a_request(:get, "https://api.digitalocean.com/droplets/#{droplet_id}?api_key=#{api_key}&client_id=#{client_key}")).to have_been_made
+    end
+
+    it "shows a droplet attribute with a name under porcelain mode" do
+      stub_request(:get, "https://api.digitalocean.com/droplets?api_key=#{api_key}&client_id=#{client_key}").
+           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(:headers => {'Content-Type' => 'application/json'}, :status => 200, :body => fixture("show_droplet"))
+
+      @cli.options = @cli.options.merge(:name => droplet_name, :porcelain => true, :attribute => "ip")
+      @cli.info
+
+      expect($stdout.string).to eq <<-eos
+33.33.33.10
+      eos
+
+      expect(a_request(:get, "https://api.digitalocean.com/droplets/100823?api_key=#{api_key}&client_id=#{client_key}")).to have_been_made
+      expect(a_request(:get, "https://api.digitalocean.com/droplets?api_key=#{api_key}&client_id=#{client_key}")).to have_been_made
+    end
+
+end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: tugboat
 version: !ruby/object:Gem::Version
-  version: 1.2.0
+  version: 1.3.0
 platform: ruby
 authors:
 - Jack Pearkes
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-07-18 00:00:00.000000000 Z
+date: 2015-07-19 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: thor