brightbox-cli 1.1.0 → 1.2.0

data/lib/brightbox-cli/database_snapshot.rb

@@ -0,0 +1,36 @@
+module Brightbox
+  class DatabaseSnapshot < Api
+    def self.require_account?
+      true
+    end
+
+    def self.all
+      conn.database_snapshots.all
+    end
+
+    def self.get(id)
+      conn.database_snapshots.get(id)
+    end
+
+    def update(options)
+      self.class.conn.update_database_snapshot(id, options)
+      reload
+      self
+    end
+
+    def destroy
+      fog_model.destroy
+    end
+
+    def self.default_field_order
+      [:id, :status, :created_on, :name]
+    end
+
+    def to_row
+      a = fog_model.attributes
+      a[:status] = fog_model.state
+      a[:created_on] = fog_model.created_at.strftime("%Y-%m-%d")
+      a
+    end
+  end
+end

data/lib/brightbox-cli/database_type.rb

@@ -0,0 +1,44 @@
+module Brightbox
+  class DatabaseType < Api
+    def self.require_account?; true; end
+
+    def attributes
+      o = fog_model.attributes
+      o[:ram] = ram
+      o[:disk] = disk
+      o
+    end
+
+    def ram
+      fog_model.ram.to_i
+    end
+
+    def disk
+      fog_model.disk.to_i
+    end
+
+    def to_row
+      attributes
+    end
+
+    def self.all
+      conn.database_types
+    end
+
+    def self.get(id)
+      conn.database_types.get id
+    end
+
+    def self.default_field_order
+      [:id, :name, :ram, :disk]
+    end
+
+    def <=>(other)
+      if other.is_a? DatabaseType
+        ram <=> other.ram
+      else
+        ram <=> other
+      end
+    end
+  end
+end

data/lib/brightbox-cli/detailed_server.rb

@@ -19,15 +19,15 @@ module Brightbox
         row_attributes[:arch] = image.arch
       end
 
-      row_attributes[:private_ips] = interfaces.collect { |i| i['ipv4_address'] }.join(", ")
-      row_attributes[:ipv6_address] = interfaces.collect { |i| i['ipv6_address'] }.join(", ")
+      row_attributes[:private_ips] = interfaces.map { |i| i['ipv4_address'] }.join(", ")
+      row_attributes[:ipv6_address] = interfaces.map { |i| i['ipv6_address'] }.join(", ")
 
-      row_attributes[:cloud_ip_ids] = cloud_ips.collect { |i| i['id'] }.join(", ")
-      row_attributes[:cloud_ips] = cloud_ips.collect { |i| i['public_ip'] }.join(", ")
-      row_attributes[:snapshots] = snapshots.collect { |i| i['id'] }.join(", ")
+      row_attributes[:cloud_ip_ids] = cloud_ips.map { |i| i['id'] }.join(", ")
+      row_attributes[:cloud_ips] = cloud_ips.map { |i| i['public_ip'] }.join(", ")
+      row_attributes[:snapshots] = snapshots.map { |i| i['id'] }.join(", ")
 
       if server_groups
-        row_attributes[:server_groups] = server_groups.map { |sg| sg['id']}.join(", ")
+        row_attributes[:server_groups] = server_groups.map { |sg| sg['id'] }.join(", ")
       end
 
       row_attributes
@@ -56,7 +56,8 @@ module Brightbox
         :ipv6_address,
         :cloud_ip_ids,
         :hostname,
-        :fqdn,:public_hostname,
+        :fqdn,
+        :public_hostname,
         :ipv6_hostname,
         :snapshots,
         :server_groups

data/lib/brightbox-cli/error_parser.rb

@@ -17,15 +17,19 @@ module Brightbox
     end
 
     def parse_http_error(e)
-      if e.respond_to?(:response) and e.response.respond_to?(:body)
-        json_response = JSON.parse(e.response.body) rescue {}
-        extract_response_from_json(json_response,e)
+      if e.respond_to?(:response) && e.response.respond_to?(:body)
+        begin
+          json_response = MultiJson.load(e.response.body)
+          extract_response_from_json(json_response, e)
+        rescue
+          {}
+        end
       else
         error "ERROR: #{e}"
       end
     end
 
-    def extract_response_from_json(error_json,e)
+    def extract_response_from_json(error_json, e)
       json_error = error_json['errors'] || error_json['error']
       if json_error && !json_error.empty?
         error_string = Array(json_error).join(" ")

data/lib/brightbox-cli/firewall_rule.rb

@@ -12,9 +12,9 @@ module Brightbox
       conn.firewall_rules.get(id)
     end
 
-    def update params
+    def update(params)
       self.class.conn.update_firewall_rule id, params
-      self.reload
+      reload
       self
     end
 
@@ -29,18 +29,18 @@ module Brightbox
 
     def to_row
       attrs = attributes.dup
-      [:protocol,:source,:sport, :destination, :dport, :icmp_type].each do |key|
+      [:protocol, :source, :sport, :destination, :dport, :icmp_type].each do |key|
         attrs[key] = attributes[key] || '-'
       end
       attrs
     end
 
-    def ret_val(attributes,key)
+    def ret_val(attributes, key)
       attributes[key] || "-"
     end
 
     def self.default_field_order
-      [:id, :protocol,:source, :sport, :destination, :dport, :icmp_type, :description]
+      [:id, :protocol, :source, :sport, :destination, :dport, :icmp_type, :description]
     end
   end
 end

data/lib/brightbox-cli/firewall_rules.rb

@@ -16,11 +16,10 @@ module Brightbox
     end
 
     def self.modify_keys(object, &modifier) #:nodoc:
-      object.inject({}) do |result, (key, value)|
-        new_key   = modifier.call(key)
+      object.reduce({}) do |result, (key, value)|
+        new_key = modifier.call(key)
         result.merge! new_key => value
       end
     end
-
   end
 end

data/lib/brightbox-cli/gli_global_hooks.rb

@@ -5,15 +5,15 @@ module Brightbox
 
   subcommand_option_handling :normal
 
-  # FIXME The official "commands_from" uses require which is slower
+  # FIXME: The official "commands_from" uses require which is slower
   # than require_relative when running under ruby gems. So we'll just
   # implement this ourselves.
   #
   # Need to locate the source of double loading under Aruba
   #
-  subcommand_files = Dir.glob(File.expand_path("../commands/*.rb", __FILE__))
-  subcommand_files.sort.each do |f|
-    require_relative File.join('commands', File.basename(f))
+  subcommand_files = Dir.glob(File.expand_path("../commands/**/*.rb", __FILE__))
+  subcommand_files.sort.each do |cmd_file|
+    require cmd_file
   end
 
   sort_help :manually
@@ -54,7 +54,7 @@ module Brightbox
 
     Excon.defaults[:headers]['User-Agent'] ||= "brightbox-cli/#{Brightbox::VERSION}"
 
-    if global_options[:k] or ENV["INSECURE"]
+    if global_options[:k] || ENV["INSECURE"]
       Excon.defaults[:ssl_verify_peer] = false
     end
 
@@ -85,7 +85,7 @@ module Brightbox
       $config.save
     rescue BBConfigError
     rescue StandardError => e
-      # FIXME Other StandardErrors are available
+      # FIXME: Other StandardErrors are available
       warn "Error writing auth token #{$config.access_token_filename}: #{e.class}: #{e}"
     end
   end
@@ -96,7 +96,7 @@ module Brightbox
       begin
         debug "Refused access token: #{$config.access_token}"
         returned = $config.reauthenticate
-        # FIXME Curious output from info
+        # FIXME: Curious output from info
         info "Your API credentials have been updated, please re-run your command."
         returned
       rescue Brightbox::Api::ApiError

data/lib/brightbox-cli/images.rb

@@ -19,7 +19,7 @@ module Brightbox
     end
 
     # Filter out images that are not of the right type, account or status if the option is passed
-    def self.filter_images(images, options={})
+    def self.filter_images(images, options = {})
       # Remove images that don't match the given type
       if options[:t]
         images.reject! { |i| i.type != options[:t] }
@@ -41,7 +41,7 @@ module Brightbox
 
       unless options[:a]
         account = Account.conn.account
-        images.reject! { |i| !i.official and i.owner_id != account.id  }
+        images.reject! { |i| !i.official && i.owner_id != account.id  }
       end
 
       snapshots = images.select { |i| i.source_type == 'snapshot' }
@@ -52,9 +52,9 @@ module Brightbox
       images + snapshots
     end
 
-    def update options
+    def update(options)
       self.class.conn.update_image(id, options)
-      self.reload
+      reload
       self
     end
 
@@ -68,7 +68,7 @@ module Brightbox
 
     def status
       if fog_model.attributes[:status] == "available"
-        public ? 'public' : 'private'
+        public? ? 'public' : 'private'
       else
         fog_model.attributes[:status]
       end
@@ -85,7 +85,7 @@ module Brightbox
       o[:owner] = "brightbox" if official
       o[:type] = type
       o[:created_at] = created_at
-      o[:created_on] = created_at.to_s.split('T').first
+      o[:created_on] = created_on
       o[:description] = description if description
       o[:licence_name] = licence_name
       o[:size] = virtual_size
@@ -97,9 +97,9 @@ module Brightbox
     end
 
     def status_sort_code
-      case self.status
+      case status
       when 'available'
-        (self.public ? 1 : 2)
+        (public? ? 1 : 2)
       when 'deprecated'
         3
       else
@@ -109,13 +109,12 @@ module Brightbox
 
     def default_sort_fields
       [
-        self.official ? 0 : 1,
-        self.name,
-        self.arch,
-        self.status_sort_code,
-        - self.created_at.to_i
+        official ? 0 : 1,
+        name,
+        arch,
+        status_sort_code,
+        - created_at.to_i
       ]
     end
-
   end
 end

data/lib/brightbox-cli/legacy/args_adjuster.rb

@@ -2,7 +2,6 @@ require "optparse"
 
 module Brightbox
   module Legacy
-
     # This is a simple class to take the ARGV array and inject a command in the
     # correct position (after global options but before anything else)
     #
@@ -17,11 +16,11 @@ module Brightbox
         @globals = []
 
         parser = OptionParser.new do |opts|
-          opts.on("-v", "--version") {|op| @globals << "-v" }
-          opts.on("-s", "--simple") {|op| @globals << "-s" }
-          opts.on("-k", "--insecure") {|op| @globals << "-k" }
-          opts.on("-c", "--client CLIENT") {|op| @globals << "-c" << op }
-          opts.on("--account ACCOUNT") {|op| @globals << "--account" << op }
+          opts.on("-v", "--version") { |op| @globals << "-v" }
+          opts.on("-s", "--simple") { |op| @globals << "-s" }
+          opts.on("-k", "--insecure") { |op| @globals << "-k" }
+          opts.on("-c", "--client CLIENT") { |op| @globals << "-c" << op }
+          opts.on("--account ACCOUNT") { |op| @globals << "--account" << op }
         end
 
         remaining = parser.order(@args)

data/lib/brightbox-cli/load_balancers.rb

@@ -11,7 +11,9 @@ module Brightbox
 
     def to_row
       attributes.merge(
+        :ssl_issuer => certificate_issuer,
         :ssl_subject => certificate_subject,
+        :ssl_valid_from => certificate_valid_from,
         :ssl_expires_at => certificate_expires_at,
         :nodes => node_ids,
         :created_on => created_on,
@@ -20,25 +22,21 @@ module Brightbox
       )
     end
 
-    def created_on
-      attributes["created_at"].to_s.split('T').first
-    end
-
     def node_ids
-      @node_ids ||= attributes[:nodes].collect { |n| n["id"] } if attributes[:nodes]
+      @node_ids ||= attributes[:nodes].map { |n| n["id"] } if attributes[:nodes]
     end
 
     def cloud_ip_ids
-      @cloud_ip_ids ||= attributes["cloud_ips"].collect { |n| n["id"] } if attributes["cloud_ips"]
+      @cloud_ip_ids ||= attributes["cloud_ips"].map { |n| n["id"] } if attributes["cloud_ips"]
     end
 
     def cloud_ips
-      @cloud_ips ||= attributes["cloud_ips"].collect { |n| n["public_ip"] } if attributes["cloud_ips"]
+      @cloud_ips ||= attributes["cloud_ips"].map { |n| n["public_ip"] } if attributes["cloud_ips"]
     end
 
     def listeners
       if attributes[:listeners]
-        attributes[:listeners].collect { |l| [l["in"], l["out"], l["protocol"], l['timeout']].join(":") }
+        attributes[:listeners].map { |l| [l["in"], l["out"], l["protocol"], l['timeout']].join(":") }
       else
         nil
       end
@@ -46,23 +44,23 @@ module Brightbox
 
     def destroy
       fog_model.destroy
-    rescue Excon::Errors::Conflict => e
+    rescue Excon::Errors::Conflict
       raise Conflict, "Cannot delete load balancer #{id}"
     end
 
     def add_nodes(nodes)
-      node_hashes = nodes.collect { |n| { :node => n.id } }
+      node_hashes = nodes.map { |n| { :node => n.id } }
       LoadBalancer.conn.add_nodes_load_balancer(id, :nodes => node_hashes)
     end
 
     def remove_nodes(nodes)
-      node_hashes = nodes.collect { |n| { :node => n.id } }
+      node_hashes = nodes.map { |n| { :node => n.id } }
       LoadBalancer.conn.remove_nodes_load_balancer(id, :nodes => node_hashes)
     end
 
     def update(options)
       LoadBalancer.conn.update_load_balancer(id, options)
-      self.reload
+      reload
       self
     end
 
@@ -77,6 +75,5 @@ module Brightbox
     def self.default_field_order
       [:id, :status, :created_on, :cloud_ips, :nodes, :name]
     end
-
   end
 end

data/lib/brightbox-cli/logging.rb

@@ -6,19 +6,19 @@ module Brightbox
     end
 
     module MixinMethods
-      def error(s='')
+      def error(s = "")
         $stderr.write s
         $stderr.write "\n"
         $stderr.flush
       end
 
-      def info(s='')
+      def info(s = "")
         $stderr.write s
         $stderr.write "\n"
         $stderr.flush
       end
 
-      def warn(s='')
+      def warn(s = "")
         info "WARN: #{s}"
       end
 

data/lib/brightbox-cli/nilable_hash.rb

@@ -4,4 +4,4 @@ class NilableHash < Hash
       self[k] = nil if self[k] == ''
     end
   end
-end
+end

data/lib/brightbox-cli/ruby_core_ext.rb

@@ -1,5 +1,4 @@
 class Time
-
   # Returns a shortened version of ISO 8601 omitting the seconds and timezone
   # information.
   #
@@ -9,7 +8,7 @@ class Time
   # @return [String] A clipped form of date, ISO 8601 without seconds
   #
   def clipped_iso_8601
-    self.strftime(self.utc? ? "%Y-%m-%dT%H:%MZ" : "%Y-%m-%dT%H:%M")
+    strftime(self.utc? ? "%Y-%m-%dT%H:%MZ" : "%Y-%m-%dT%H:%M")
   end
 
   def to_s