brightbox-cli 1.1.0 → 1.2.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 0678676cc55013c6898bee325427d0c02bb2fe54
-  data.tar.gz: b5239144c91e70eefd0af9b738a93e951da60412
+  metadata.gz: 73df8b7f77b6cece4674c53c522638a9133c2589
+  data.tar.gz: 9c520fe03b2f3600b5cb2994410bbd4e5751ed66
 SHA512:
-  metadata.gz: c686363ed9d54106512b609ea7bb999fae4cdb2acdf59cbe52fb8f187d8c7b0e14746f9940b1840bffff964b257be3b76b0c3ac0810bfe329a4d6699e7657157
-  data.tar.gz: 124cf8b8199b53f2eb08039b296a4fe396c8f7e1b1b718457b6845638e06010890c2493b4c31109970c194137a558d96312add6ff5c0d037449352daef346045
+  metadata.gz: e640fa3bf32d12fd90f5419dfce32d30b0a9308c3785532f9d7d6e225a3cf5ac78dec8340a362fc31ab762a0b2aec56d43ba1625f45ec5b0f9370d16739a4552
+  data.tar.gz: 26f3462157989d251640ff7480f947516479f386862a738ab7e23aecc978ad275875c58761e71b26a7ffe9870a95a686cc10aa0b520943c8f325d1d24eb7074d

data/.travis.yml

@@ -5,4 +5,5 @@ rvm:
   - 1.9.2
   - 1.9.3
   - 2.0.0
+  - 2.1.0
 

data/CHANGELOG.md

@@ -0,0 +1,18 @@
+### v1.2.0 / 2014-03-10
+[Full Changelog](https://github.com/brightbox/brightbox-cli/compare/v1.1.0...v1.2.0)
+
+Enhancements:
+
+* Adds support for Cloud SQL instances to the CLI.
+* Uses modular `fog-brightbox` gem to cut down on unnecessary dependencies
+  included using full `fog` gem.
+* Can view more details related to SSL certificates on load balancers.
+* Rely on API output to check which resources can have Cloud IPs mapped.
+* `json` gem is no longer a hard dependency. If faster versions are available
+  they should be detected automatically.
+
+Bug Fixes:
+
+* `brightbox images show` and `brightbox lbs show` no longer error when
+   identifiers are not passed but display all resources like other commands.
+* Help instructions for option arguments are correct following GLI update.

data/Gemfile.lock

@@ -1,15 +1,14 @@
 PATH
   remote: .
   specs:
-    brightbox-cli (1.1.0)
-      excon
-      fog (~> 1.17.0)
-      gli (~> 2.8)
+    brightbox-cli (1.2.0)
+      fog-brightbox
+      gli (~> 2.9)
       highline (~> 1.6)
       hirb (~> 0.6)
-      json
+      i18n
       mime-types (~> 1.25)
-      nokogiri (~> 1.5.0)
+      multi_json
 
 GEM
   remote: https://rubygems.org/
@@ -17,32 +16,33 @@ GEM
     builder (3.2.2)
     coderay (1.0.9)
     diff-lcs (1.2.4)
-    excon (0.27.6)
-    fog (1.17.0)
+    excon (0.31.0)
+    fog-brightbox (0.0.1)
+      fog-core
+      fog-json
+    fog-core (1.21.0)
       builder
-      excon (~> 0.27.0)
+      excon (~> 0.31.0)
       formatador (~> 0.2.0)
       mime-types
-      multi_json (~> 1.0)
       net-scp (~> 1.1)
       net-ssh (>= 2.1.3)
-      nokogiri (~> 1.5)
-      ruby-hmac
+    fog-json (1.0.0)
+      multi_json (~> 1.0)
     formatador (0.2.4)
-    gli (2.8.1)
+    gli (2.9.0)
     highline (1.6.20)
     hirb (0.7.1)
-    json (1.8.1)
+    i18n (0.6.9)
     metaclass (0.0.1)
     method_source (0.8.1)
-    mime-types (1.25)
+    mime-types (1.25.1)
     mocha (0.14.0)
       metaclass (~> 0.0.1)
-    multi_json (1.8.2)
+    multi_json (1.9.0)
     net-scp (1.1.2)
       net-ssh (>= 2.6.5)
-    net-ssh (2.7.0)
-    nokogiri (1.5.10)
+    net-ssh (2.8.0)
     pry (0.9.12.2)
       coderay (~> 1.0.5)
       method_source (~> 0.8)
@@ -56,7 +56,6 @@ GEM
     rspec-expectations (2.14.0)
       diff-lcs (>= 1.1.3, < 2.0)
     rspec-mocks (2.14.1)
-    ruby-hmac (0.4.0)
     slop (3.4.5)
     vcr (2.5.0)
 

data/bin/_brightbox-bash-completer

@@ -420,6 +420,48 @@ SPEC = { "brightbox" =>
             "start" => find_identifiers("srv-"),
             "stop" => find_identifiers("srv-")
            },
+           "sql" => {
+             "instances" => {
+               "create" => {
+                 "-n=" => "--name=",
+                 "--name" => true,
+                 "-d=" => "--description",
+                 "--description" => true,
+                 "-t" => "--type",
+                 "--type" => true,
+                 "--allow-access" => true,
+                 "--snapshot" => find_identifiers("dbi-")
+               },
+               "destroy" => find_identifiers("dbs-"),
+               "list" => find_identifiers("dbs-"),
+               "reset_password" => find_identifiers("dbs-"),
+               "show" => find_identifiers("dbs-"),
+               "snapshot" => find_identifiers("dbs-"),
+               "update" => {
+                 "-n=" => "--name=",
+                 "--name" => true,
+                 "-d=" => "--description",
+                 "--description" => true,
+                 "--allow-access" => true,
+                 :include => find_identifiers("dbs-")
+               },
+             },
+             "snapshots" => {
+               "destroy" => find_identifiers("dbi-"),
+               "list" => find_identifiers("dbi-"),
+               "update" => {
+                 "-n=" => "--name=",
+                 "--name" => true,
+                 "-d=" => "--description",
+                 "--description" => true,
+                 :include => find_identifiers("dbi-")
+               },
+             },
+             "types" => {
+               "list" => find_identifiers("dbt-"),
+               "show" => find_identifiers("dbt-")
+             },
+           },
          "types" =>
            {
             "list" => find_server_types,

data/brightbox-cli.gemspec

@@ -19,12 +19,12 @@ Gem::Specification.new do |s|
   s.executables   = `git ls-files -- bin/*`.split("\n").map{ |f| File.basename(f) }
   s.require_paths = ["lib"]
 
-  s.add_dependency "gli", "~> 2.8"
-  s.add_dependency "fog", "~> 1.17.0"
-  s.add_dependency "nokogiri", "~> 1.5.0" # 1.5.x last versions with 1.8.7 support
+  s.add_dependency "gli", "~> 2.9"
+  s.add_dependency "fog-brightbox"
+  s.add_dependency "multi_json"
   s.add_dependency "mime-types", "~> 1.25"
-  s.add_dependency "excon"
-  s.add_dependency "json"
+
+  s.add_dependency "i18n"
 
   s.add_dependency('hirb','~> 0.6')
   s.add_dependency('highline', '~> 1.6')

data/lib/brightbox-cli/accounts.rb

@@ -1,6 +1,5 @@
 module Brightbox
   class Account < Api
-
     def ram_free
       [ram_limit.to_i - ram_used.to_i, 0].max
     end
@@ -32,7 +31,7 @@ module Brightbox
         a = conn.account
       end
 
-      if a and a.id == id
+      if a && a.id == id
         a
       else
         nil
@@ -46,6 +45,5 @@ module Brightbox
     def to_s
       @id
     end
-
   end
 end

data/lib/brightbox-cli/api.rb

@@ -40,19 +40,19 @@ module Brightbox
     # @return [String] the 'name' of the class
     #
     def self.klass_name
-      name.split("::").last()
+      name.split("::").last
     end
 
     def initialize(m = nil)
       if m.is_a? String
         @id = m
-      elsif m.respond_to? :attributes and m.respond_to? :id
+      elsif m.respond_to?(:attributes) && m.respond_to?(:id)
         @fog_model = m
         @id = m.id
       else
         raise InvalidArguments, "Can't initialize #{self.class} with #{m.inspect}"
       end
-      $config.cache_id @id
+      $config.cache_id(@id) if $config.respond_to?(:cache_id)
     end
 
     def fog_model
@@ -69,6 +69,20 @@ module Brightbox
       @id
     end
 
+    # Will return everything unless a subset has been passed in
+    #
+    # @param [Array<String>] identifiers series of values to call to call
+    #
+    def self.find_all_or_warn(identifiers)
+      if identifiers.empty?
+        find(:all)
+      else
+        find_or_call(identifiers) do |identifier|
+          warn "Could not find anything with ID #{identifier}"
+        end
+      end
+    end
+
     # General finder to return instances based on identifiers or all.
     #
     # @param args    [Array<Object>, Object] Search settings. Passing +:all+
@@ -84,7 +98,7 @@ module Brightbox
     #
     def self.find(args = :all, options = {})
       raise InvalidArguments, "find(nil)" if args.nil?
-      raise InvalidArguments, "find([])" if args.respond_to?(:empty?) and args.empty?
+      raise InvalidArguments, "find([])" if args.respond_to?(:empty?) && args.empty?
       options = {
         :order => :created_at,
       }.merge options
@@ -97,8 +111,8 @@ module Brightbox
       elsif args.is_a? String
         object = cached_get(args.to_s)
         raise NotFound, "Couldn't find '#{args.to_s}'" if object.nil?
-      elsif args.respond_to? :collect
-        objects = args.collect do |arg|
+      elsif args.respond_to? :map
+        objects = args.map do |arg|
           o = cached_get(arg.to_s)
           raise NotFound, "Couldn't find '#{arg.to_s}'" if o.nil?
           o
@@ -108,9 +122,9 @@ module Brightbox
       end
       if objects
         # wrap in our objects
-        objects.collect! { |o| new(o) }
+        objects.map! { |o| new(o) }
         # Sort
-        objects.sort! do |a,b| 
+        objects.sort! do |a, b|
           sort_method = options[:order]
           begin
             a.send(sort_method) <=> b.send(sort_method)
@@ -171,5 +185,10 @@ module Brightbox
       end
     end
 
+    # Displays creation date in ISO 8601 Complete date format
+    #
+    def created_on
+      fog_model.created_at.strftime("%Y-%m-%d")
+    end
   end
 end

data/lib/brightbox-cli/cloud_ips.rb

@@ -1,7 +1,8 @@
 module Brightbox
   class CloudIP < Api
     def self.require_account?; true; end
-    def self.get id
+
+    def self.get(id)
       conn.cloud_ips.get id
     end
 
@@ -24,21 +25,15 @@ module Brightbox
 
     def self.format_translators_for_api(translators)
       translators.split(",").map do |t|
-        incoming,outgoing,protocol = t.split(":")
+        incoming, outgoing, protocol = t.split(":")
         raise "translator #{t} is invalid" if incoming.nil? || outgoing.nil? || protocol.nil?
-        {:incoming => incoming, :outgoing => outgoing, :protocol => protocol}
+        { :incoming => incoming, :outgoing => outgoing, :protocol => protocol }
       end
     end
 
     def attributes
       a = fog_model.attributes
-      if(lb_id = a[:load_balancer] || a["load_balancer"])
-        a[:destination] = lb_id
-      elsif(server_group_id = a[:server_group] || a["server_group"])
-        a[:destination] = server_group
-      else
-        a[:destination] = a[:server_id]
-      end
+      a[:destination] = destination_id
       a
     end
 
@@ -54,7 +49,9 @@ module Brightbox
 
     def translators(raw_attributes)
       if translators = (raw_attributes[:port_translators] || raw_attributes['port_translators'])
-        translators.map {|t| [t['incoming'],t['outgoing'],t['protocol']].join(":") }
+        translators.map do |t|
+          [t['incoming'], t['outgoing'], t['protocol']].join(":")
+        end
       else
         nil
       end
@@ -64,8 +61,8 @@ module Brightbox
       [:id, :status, :public_ip, :destination, :reverse_dns, :name]
     end
 
-    def <=>(b)
-      self.status <=> b.status
+    def <=>(other)
+      status <=> other.status
     end
 
     def update(options)
@@ -87,9 +84,8 @@ module Brightbox
       end
 
       self.class.conn.update_cloud_ip(id, params)
-      self.reload
+      reload
       self
     end
-
   end
 end

data/lib/brightbox-cli/collaborating_account.rb

@@ -1,40 +1,37 @@
 module Brightbox
-
   # A Collaborating account combines all of a users own accounts and those that
   # they have access to via an open collaboration.
   #
   class CollaboratingAccount < Account
     def self.all
-      begin
-        accounts = conn.accounts.all
-        collaborations = conn.user_collaborations.all
-
-        accepted_collaborations = collaborations.select do |col|
-          col.status == "accepted"
-        end
+      accounts = conn.accounts.all
+      collaborations = conn.user_collaborations.all
 
-        pending_collaborations = collaborations.select do |col|
-          col.status == "pending"
-        end
+      accepted_collaborations = collaborations.select do |col|
+        col.status == "accepted"
+      end
 
-        col_accounts = []
+      pending_collaborations = collaborations.select do |col|
+        col.status == "pending"
+      end
 
-        accepted_collaboration_ids = accepted_collaborations.map(&:account_id)
-        accounts.each do |acc|
-          if accepted_collaboration_ids.include?(acc.id)
-            collab = accepted_collaborations.detect {|col| col.account_id == acc.id }
-            col_accounts << new(acc, collab)
-          else
-            col_accounts << new(acc)
-          end
-        end
+      col_accounts = []
 
-        pending_collaborations.each do |col|
-          col_accounts << new(col)
+      accepted_collaboration_ids = accepted_collaborations.map(&:account_id)
+      accounts.each do |acc|
+        if accepted_collaboration_ids.include?(acc.id)
+          collab = accepted_collaborations.find { |col| col.account_id == acc.id }
+          col_accounts << new(acc, collab)
+        else
+          col_accounts << new(acc)
         end
+      end
 
-        col_accounts
+      pending_collaborations.each do |col|
+        col_accounts << new(col)
       end
+
+      col_accounts
     end
 
     # Simpler initialiser than the superclass.
@@ -98,7 +95,7 @@ module Brightbox
 
     def ram_free
       if account?
-       [ram_limit.to_i - ram_used.to_i, 0].max
+        [ram_limit.to_i - ram_used.to_i, 0].max
       else
         ""
       end
@@ -139,7 +136,7 @@ module Brightbox
       [:id, :cloud_ips_limit, :lb_limit, :ram_limit, :ram_used, :ram_free, :role, :name]
     end
 
-  private
+    private
 
     # A collaboration has access to the accounts details by nesting
     def acc_details(key)

data/lib/brightbox-cli/collaboration.rb

@@ -7,7 +7,7 @@ module Brightbox
     def self.require_account?; true; end
 
     def self.invite(email, role)
-      options = {:email => email, :role => role}
+      options = { :email => email, :role => role }
       data = conn.create_collaboration(options)
       model = Fog::Compute::Brightbox::Collaboration.new(data)
       new(model)