brightbox-cli 1.1.0 → 1.2.0

data/lib/brightbox-cli/server_groups.rb

@@ -1,6 +1,7 @@
 module Brightbox
   class ServerGroup < Api
     def self.require_account?; true; end
+
     def self.all
       conn.server_groups
     end
@@ -18,14 +19,14 @@ module Brightbox
     end
 
     def firewall_policy
-      FirewallPolicy.all.detect do |policy|
-        policy.server_group_id == self.id
+      FirewallPolicy.all.find do |policy|
+        policy.server_group_id == id
       end
     end
 
     def update(options)
       self.class.conn.update_server_group(id, options)
-      self.reload
+      reload
       self
     end
 
@@ -45,7 +46,7 @@ module Brightbox
     end
 
     def server_ids
-      attributes[:server_ids].map{|id| id.is_a?(Hash) ? id['id'] : id }
+      attributes[:server_ids].map { |id| id.is_a?(Hash) ? id['id'] : id }
     end
 
     def server_count
@@ -55,6 +56,5 @@ module Brightbox
     def server_string
       server_ids.respond_to?(:join) ? server_ids.join(" ") : ""
     end
-
   end
 end

data/lib/brightbox-cli/servers.rb

@@ -1,8 +1,9 @@
 module Brightbox
   class Server < Api
     def self.require_account?; true; end
-    def self.create_servers(count,options)
-      (0...count).map {|i| create(options) }
+
+    def self.create_servers(count, options)
+      (0...count).map { |i| create(options) }
     end
 
     def self.create(options)
@@ -21,9 +22,9 @@ module Brightbox
       [:id, :status, :type, :zone, :created_on, :image_id, :cloud_ip_ids, :name]
     end
 
-    def update options
+    def update(options)
       self.class.conn.update_server id, options
-      self.reload
+      reload
       self
     end
 
@@ -39,20 +40,20 @@ module Brightbox
       a = fog_model.attributes
       a[:image] = image_id
       a[:created_at] = created_at
-      a[:created_on] = fog_model.created_at.strftime("%Y-%m-%d")
+      a[:created_on] = created_on
       a[:type] = server_type['handle']
       a[:status] = fog_model.state
       a[:zone] = zone && zone['handle']
       a[:hostname] = id
       a[:public_hostname] = "public.#{fqdn}" unless cloud_ips.empty?
-      a[:ipv6_hostname] = ipv6_fqdn if interfaces.any? {|i| i['ipv6_address'] }
+      a[:ipv6_hostname] = ipv6_fqdn if interfaces.any? { |i| i['ipv6_address'] }
       a
     end
 
     def to_row
       o = attributes
-      o[:cloud_ip_ids] = cloud_ips.collect { |i| i['id'] }
-      o[:ips] = interfaces.collect { |i| i['ipv4_address'] }.join(', ')
+      o[:cloud_ip_ids] = cloud_ips.map { |i| i['id'] }
+      o[:ips] = interfaces.map { |i| i['ipv4_address'] }.join(', ')
       o
     end
 
@@ -64,5 +65,4 @@ module Brightbox
       "ipv6.#{fqdn}"
     end
   end
-
 end

data/lib/brightbox-cli/tables.rb

@@ -1,7 +1,6 @@
 require 'hirb'
 
 module Brightbox
-
   # Hack to set ascii art table cell width due to limitations in Hirb
   class Hirb::Helpers::Table
     remove_const :BORDER_LENGTH
@@ -11,9 +10,9 @@ module Brightbox
   # Remove most of the ascii art table output
   class SimpleTable < Hirb::Helpers::Table
     def render_table_header
-      title_row = ' ' + @fields.map {|f|
+      title_row = ' ' + @fields.map do |f|
         format_cell(@headers[f], @field_lengths[f])
-      }.join('  ')
+      end.join('  ')
       ["", title_row, render_border]
     end
 
@@ -22,30 +21,30 @@ module Brightbox
     end
 
     def render_border
-      '-' + @fields.map {|f| '-' * @field_lengths[f] }.join('--') + '-'
+      '-' + @fields.map { |f| '-' * @field_lengths[f] }.join('--') + '-'
     end
 
     def render_rows
       @rows.map do |row|
-        row = ' ' + @fields.map {|f|
+        row = ' ' + @fields.map do |f|
           format_cell(row[f], @field_lengths[f])
-        }.join('  ')
+        end.join('  ')
       end
     end
 
-  def enforce_field_constraints
-    max_fields.each {|k,max| @field_lengths[k] = max if @field_lengths[k].to_i > max }
-    # Never shrink the id field
-    @field_lengths[:id] = IDENTIFIER_SIZE if @field_lengths[:id]
-  end
-
+    def enforce_field_constraints
+      max_fields.each do |k, max|
+        @field_lengths[k] = max if @field_lengths[k].to_i > max
+      end
+      # Never shrink the id field
+      @field_lengths[:id] = IDENTIFIER_SIZE if @field_lengths[:id]
+    end
   end
 
   # Vertical table for "show" views
   class ShowTable < Hirb::Helpers::Table
-
-    def self.render(rows, options={})
-      new(rows, {:escape_special_chars=>false, :resize=>false}.merge(options)).render
+    def self.render(rows, options = {})
+      new(rows, { :escape_special_chars => false, :resize => false }.merge(options)).render
     end
 
     def setup_field_lengths
@@ -53,40 +52,40 @@ module Brightbox
     end
 
     def render_header; []; end
+
     def render_footer; []; end
 
     def render_rows
-      longest_header = Hirb::String.size @headers.values.sort_by {|e| Hirb::String.size(e) }.last
+      longest_header = Hirb::String.size @headers.values.sort_by { |e| Hirb::String.size(e) }.last
       @rows.map do |row|
-        fields = @fields.map {|f|
+        fields = @fields.map do |f|
           "#{Hirb::String.rjust(@headers[f], longest_header)}: #{row[f]}"
-        }
+        end
         fields << "" if @rows.size > 1
         fields.compact.join("\n")
       end
     end
   end
 
-
   # Print nice ascii tables (or tab separated lists, depending on mode)
   # Has lots of magic.
   def render_table(rows, options = {})
     options = { :description => false }.merge options
     # Figure out the fields from the :model option
-    if options[:model] and options[:fields].nil?
+    if options[:model] && options[:fields].nil?
       options[:fields] = options[:model].default_field_order
     end
     # Figure out the fields from the first row
-    if options[:fields].nil? and rows.first.class.respond_to?(:default_field_order)
+    if options[:fields].nil? && rows.first.class.respond_to?(:default_field_order)
       options[:fields] = rows.first.class.default_field_order
     end
     # Call to_row on all the rows
-    rows = rows.collect do |row|
+    rows = rows.map do |row|
       row.respond_to?(:to_row) ? row.to_row : row
     end
     # Call render_cell on all the cells
     rows.each do |row|
-      # FIXME default Api subclasses do not respond to #keys so specialising
+      # FIXME: default Api subclasses do not respond to #keys so specialising
       #   #to_row is required to not break the following
       row.keys.each do |k|
         row[k] = row[k].render_cell if row[k].respond_to? :render_cell
@@ -96,9 +95,9 @@ module Brightbox
       # Simple output
       rows.each do |row|
         if options[:vertical]
-          data options[:fields].collect { |k| [k, row[k]].join("\t") }.join("\n")
+          data options[:fields].map { |k| [k, row[k]].join("\t") }.join("\n")
         else
-          data options[:fields].collect { |k| row[k].is_a?(Array) ? row[k].join(',') : row[k] }.join("\t")
+          data options[:fields].map { |k| row[k].is_a?(Array) ? row[k].join(',') : row[k] }.join("\t")
         end
       end
     else

data/lib/brightbox-cli/types.rb

@@ -1,6 +1,7 @@
 module Brightbox
   class Type < Api
     def self.require_account?; true; end
+
     def attributes
       o = fog_model.attributes
       o[:ram] = ram
@@ -28,7 +29,7 @@ module Brightbox
       conn.flavors
     end
 
-    def self.get id
+    def self.get(id)
       conn.flavors.get id
     end
 
@@ -36,11 +37,11 @@ module Brightbox
       [:id, :name, :handle, :ram, :disk, :cores]
     end
 
-    def <=>(b)
-      if b.is_a? Type
-        self.ram <=> b.ram
+    def <=>(other)
+      if other.is_a? Type
+        ram <=> other.ram
       else
-        self.ram <=> b
+        ram <=> other
       end
     end
   end

data/lib/brightbox-cli/user_collaboration.rb

@@ -1,10 +1,9 @@
 module Brightbox
   # These are collaborations from the perspective of the invited user so all
-  # that is expected is listing, getting details, accepting, rejecting and 
+  # that is expected is listing, getting details, accepting, rejecting and
   # destroying them.
   #
   class UserCollaboration < Api
-
     def self.all
       conn.user_collaborations
     end
@@ -25,7 +24,7 @@ module Brightbox
     #
     def self.get_for_account(account_id)
       collaborations = conn.user_collaborations
-      open_collaborations = collaborations.select {|col| ["pending", "accepted"].include?(col.status) }
+      open_collaborations = collaborations.select { |col| %w{pending accepted}.include?(col.status) }
       collaboration = open_collaborations.find do |col|
         col.account_id == account_id
       end

data/lib/brightbox-cli/users.rb

@@ -5,7 +5,7 @@ module Brightbox
     end
 
     def to_row
-      attributes.merge({ :accounts => accounts.size })
+      attributes.merge(:accounts => accounts.size)
     end
 
     def self.all
@@ -14,7 +14,7 @@ module Brightbox
 
     def self.get(id)
       u = conn.users.get id
-      (u.nil? or u.id != id) ? nil : u
+      u.nil? || u.id != id ? nil : u
     end
 
     def self.default_field_order
@@ -22,7 +22,7 @@ module Brightbox
     end
 
     def accounts
-      @accounts ||= fog_model.accounts.collect { |a| Account.new(a["id"]) }
+      @accounts ||= fog_model.accounts.map { |a| Account.new(a["id"]) }
     end
 
     def to_s

data/lib/brightbox-cli/version.rb

@@ -1,3 +1,3 @@
 module Brightbox
-  VERSION = "1.1.0" unless defined?(Brightbox::VERSION)
+  VERSION = "1.2.0" unless defined?(Brightbox::VERSION)
 end

data/lib/brightbox_cli.rb

@@ -20,12 +20,17 @@ Dir.glob(vendor_dir + '/*').each do |f|
   $:.unshift File.join(f, 'lib')
 end
 
-
-require "json"
+require "multi_json"
 require 'date'
 require 'gli'
+require "i18n"
 require "fog/brightbox/compute"
 
+# I18n stuff to clean up scattered text everywhere
+I18n.enforce_available_locales = false
+I18n.default_locale = :en
+I18n.load_path = [File.join(File.dirname(__FILE__) + "/../locales/en.yml")]
+
 module Brightbox
   DEFAULT_API_ENDPOINT = "https://api.gb1.brightbox.com"
 
@@ -46,6 +51,9 @@ module Brightbox
   autoload :FirewallRules, File.expand_path("../brightbox-cli/firewall_rules", __FILE__)
   autoload :Collaboration, File.expand_path("../brightbox-cli/collaboration", __FILE__)
   autoload :UserCollaboration, File.expand_path("../brightbox-cli/user_collaboration", __FILE__)
+  autoload :DatabaseType, File.expand_path("../brightbox-cli/database_type", __FILE__)
+  autoload :DatabaseServer, File.expand_path("../brightbox-cli/database_server", __FILE__)
+  autoload :DatabaseSnapshot, File.expand_path("../brightbox-cli/database_snapshot", __FILE__)
 
   module Config
     autoload :SectionNameDeduplicator, File.expand_path("../brightbox-cli/config/section_name_deduplicator", __FILE__)

data/locales/en.yml

@@ -0,0 +1,205 @@
+en:
+  options:
+    description:
+      desc: Description
+    name:
+      desc: Name
+  accounts:
+    desc: Manage accounts
+    accept_invite:
+      desc: Accept invitation to collaborate on account
+    default:
+      desc: Set a default account
+    list:
+      desc: List accounts
+    remove:
+      desc: Refuses or removes an account collaboration
+    reset_ftp_password:
+      desc: Reset an account's FTP Library password
+    show:
+      desc: Show accounts
+  cloudips:
+    desc: Manage an account's Cloud IPs
+    options:
+      port_translators:
+        desc: |
+          Cloud IP translators. Format: in-port:out-port:protocol. Comma
+          separate multiple translators. Protocol can be tcp or udp.
+    create:
+      desc: Create Cloud IPs
+    destroy:
+      desc: Destroy Cloud IPs
+    list:
+      desc: List Cloud IPs
+    map:
+      desc: Map a Cloud IP
+    show:
+      desc: Show Cloud IPs
+    unmap:
+      desc: Unmap Cloud IPs
+    update:
+      desc: Update a Cloud IP
+  config:
+    desc: Manage CLI configuration settings and credentials
+    client_add:
+      desc: Add new API client details to config
+    client_default:
+      desc: Set the default API client in the config
+    client_list:
+      desc: List API clients defined in the config
+    client_remove:
+      desc: Remove an API client from config
+    user_add:
+      desc: Add new user credentials to config
+  firewall:
+    policies:
+      desc: Manage firewall policies
+      apply:
+        desc: Apply firewall policy to a server group
+      create:
+        desc: Create firewall policy
+      destroy:
+        desc: Destroy firewall policy
+      list:
+        desc: List firewall policies
+      remove:
+        desc: Remove a firewall policy from a server group
+      show:
+        desc: Show firewall policies
+      update:
+        desc: Update a firewall policy
+    rules:
+      desc: Manages an account's firewall rules for a policy
+      create:
+        desc: Create a firewall rule
+      destroy:
+        desc: Destroy firewall rules
+      list:
+        desc: List firewall rules
+      show:
+        desc: Show firewall rules
+      update:
+        desc: Update firewall rule
+  groups:
+    desc: Manage an account's server groups
+    add_servers:
+      desc: Add servers to a server group
+    create:
+      desc: Create a server group
+    destroy:
+      desc: Destroy a number of empty server groups
+    list:
+      desc: List server groups
+    move_servers:
+      desc: Move servers from one server group to another
+    remove_servers:
+      desc: Remove servers from a server group
+    show:
+      desc: Show server groups
+    update:
+      desc: Update a server group
+  images:
+    desc: See official and public images and manage an account's images
+    destroy:
+      desc: Destroy images
+    list:
+      desc: List images
+    register:
+      desc: Register an image in the image library
+    show:
+      desc: Show images
+    update:
+      desc: Update an image
+  lbs:
+    desc: Manage an account's load balancers
+    add_nodes:
+      desc: Add servers to a load balancer
+    create:
+      desc: Create a load balancer
+      long_desc: All intervals and timeouts are in milliseconds
+    destroy:
+      desc: Destroy load balancers
+    list:
+      desc: List load balancers
+    remove_nodes:
+      desc: Remove servers from a load balancer
+    show:
+      desc: Show load balancers
+    update:
+      desc: Update a load balancer
+      long_desc: All intervals and timeouts are in milliseconds
+  servers:
+    desc: Manage an account's servers
+    activate_console:
+      desc: Activate web consoles for a number of servers
+    create:
+      desc: Create servers
+    destroy:
+      desc: Destroy servers
+    show:
+      desc: Show servers
+    shutdown:
+      desc: Shutdown servers with equivalent of `shutdown` command
+    snapshot:
+      desc: Snapshot servers (creating new images)
+    start:
+      desc: Start servers
+    stop:
+      desc: Stop servers with equivalent of powering off
+    update:
+      desc: Update a server
+  sql:
+    desc: Manage an account's Cloud SQL instances and snapshots
+    instances:
+      desc: Manage Cloud SQL instances
+      options:
+        allow_access:
+          desc: Comma separated list of IPs or IDs for servers or groups to allow access
+        engine:
+          desc: The database engine to use for the SQL instance (e.g. 'mysql')
+        engine_version:
+          desc: The version of the engine to use (e.g. '5.6')
+        snapshot:
+          desc: ID of a Cloud SQL snapshot to create new instance from
+        type:
+          desc: ID of a Cloud SQL type
+        zone:
+          desc: Zone to locate the instance in
+      create:
+        desc: Create a new Cloud SQL instance
+      destroy:
+        desc: Destroy Cloud SQL instances
+      list:
+        desc: List Cloud SQL instances
+      reset_password:
+        desc: Reset the admin password of a Cloud SQL instance
+      show:
+        desc: Show details of Cloud SQL instances
+      snapshot:
+        desc: Create a new Cloud SQL snapshot from an instance
+      update:
+        desc: Update a Cloud SQL instance
+    snapshots:
+      desc: Manage Cloud SQL snapshots
+      list:
+        desc: List Cloud SQL snapshots
+      destroy:
+        desc: Destroy a number of Cloud SQL snapshots
+      show:
+        desc: Show details of Cloud SQL snapshots
+      update:
+        desc: Update a Cloud SQL snapshot's metadata
+    types:
+      desc: List the Cloud SQL types
+      list:
+        desc: List the available Cloud SQL sizes for new instances
+      show:
+        desc: Show details of Cloud SQL types
+  users:
+    desc: List the users associated with an account
+    list:
+      desc: List users
+    show:
+      desc: Show users
+    update:
+      desc: Update a user