brightbox-cli 1.1.0 → 1.2.0

data/lib/brightbox-cli/config.rb

@@ -69,9 +69,7 @@ module Brightbox
       return @config_file if @config_file
       return {} if @config_file == false
 
-      unless config_directory_exists?
-        create_directory
-      end
+      create_directory unless config_directory_exists?
 
       @config_file ||= Ini.new(config_filename)
       @config_file
@@ -79,7 +77,6 @@ module Brightbox
       raise BBConfigError, "Config problem in #{config_filename}: #{e}"
     end
 
-
     # Write out the configuration file to disk
     def save
       if dirty? && config.respond_to?(:write)
@@ -111,14 +108,14 @@ module Brightbox
       config["core"][key] = value
     end
 
-  private
+    private
 
     def default_config_dir
-      File.join(ENV['HOME'],'.brightbox')
+      File.join(ENV['HOME'], '.brightbox')
     end
 
     def configured?
-      configured = client_name != nil && !clients.empty?
+      configured = !client_name.nil? && !clients.empty?
       if configured && (selected_config.nil? || selected_config.empty?)
         raise BBConfigError, "client id or alias #{client_name.inspect} not defined in config"
       end

data/lib/brightbox-cli/config/accounts.rb

@@ -1,7 +1,6 @@
 module Brightbox
   module Config
     module Accounts
-
       def save_default_account(account_id)
         dirty! unless account_id == selected_config["default_account"]
         selected_config['default_account'] = account_id
@@ -38,17 +37,15 @@ module Brightbox
       #   excess traffic for certain use cases on all commands.
       #
       def find_or_set_default_account
-        # FIXME API clients are scoped to their account so this code should
+        # FIXME: API clients are scoped to their account so this code should
         #   never need to run for them.
         unless default_account
           begin
             service = Fog::Compute.new(to_fog)
             accounts = service.accounts
 
-            @account = accounts.select {|acc| ["pending", "active"].include?(acc.status) }.first.id
-            if @account
-              save_default_account(@account)
-            end
+            @account = accounts.select { |acc| %w{pending active}.include?(acc.status) }.first.id
+            save_default_account(@account) if @account
           rescue Brightbox::BBConfigError
             # We can't get a suitable fog connection so we can't select an
             # account

data/lib/brightbox-cli/config/api_client.rb

@@ -18,22 +18,30 @@ module Brightbox
           :brightbox_auth_url => selected_config['auth_url'] || selected_config['api_url'],
           :brightbox_client_id => selected_config['client_id'],
           :brightbox_secret => selected_config['secret'],
-          :persistent => (selected_config["persistent"] != nil ? selected_config["persistent"] : true)
+          :persistent => persistent?
         }
       end
 
       def valid?
         NON_BLANK_KEYS.all? do |key|
-          selected_config.has_key?(key) && ! selected_config[key].to_s.empty?
+          selected_config.key?(key) && !selected_config[key].to_s.empty?
         end
       end
 
-    private
+      private
+
+      def persistent?
+        if selected_config["persistent"]
+          selected_config["persistent"]
+        else
+          true
+        end
+      end
 
       def check_required_params
         unless valid?
           NON_BLANK_KEYS.each do |key|
-            unless selected_config.has_key?(key) && ! selected_config[key].to_s.empty?
+            unless selected_config.key?(key) && !selected_config[key].to_s.empty?
               raise Brightbox::BBConfigError, "#{key} option missing from config in section #{client_name}"
             end
           end

data/lib/brightbox-cli/config/authentication_tokens.rb

@@ -103,16 +103,13 @@ module Brightbox
         end
       end
 
-      #
       def update_stored_tokens(new_access_token, new_refresh_token = nil)
         save_access_token(new_access_token)
-        unless new_refresh_token.nil?
-          save_refresh_token(new_refresh_token)
-        end
+        save_refresh_token(new_refresh_token) unless new_refresh_token.nil?
         debug_tokens
       end
 
-    private
+      private
 
       # This stores the access token for the Fog service currently in use to
       # authenticate with the API.
@@ -170,7 +167,7 @@ module Brightbox
         user_application = Brightbox::Config::UserApplication.new(selected_config, client_name)
 
         fog_options = user_application.to_fog
-        # FIXME UserApplication#to_fog should include refresh token but does not
+        # FIXME: UserApplication#to_fog should include refresh token but does not
         # have the correct scope to it
         fog_options.merge!(:brightbox_refresh_token => refresh_token)
 
@@ -185,18 +182,16 @@ module Brightbox
         require "highline"
         highline = HighLine.new
         highline.say("Your API credentials have expired, enter your password to update them.")
-        # FIXME Capture interupts if user aborts
+        # FIXME: Capture interupts if user aborts
         highline.ask("Enter your password : ") { |q| q.echo = false }
       end
 
       def update_tokens_with_user_credentials(password = nil)
         user_application = Brightbox::Config::UserApplication.new(selected_config, client_name)
 
-        unless password
-          password = prompt_for_password
-        end
+        password = prompt_for_password unless password
 
-        # FIXME options are required to work
+        # FIXME: options are required to work
         options = {
           :client_id => client_name,
           :email => selected_config["username"],
@@ -218,18 +213,17 @@ module Brightbox
       # Blanks access token in memory and on disk
       def flush_access_token!
         @access_token = nil
-        #persist_token(oauth_token_filename, nil)
       end
 
       # Saves
       def persist_token(filename, token)
         token = "" if token.nil?
         # Write out a token file for this process
-        File.open(filename + ".#{$$}", "w") do |f|
+        File.open(filename + ".#{$PID}", "w") do |f|
           f.write token
         end
         # Move process version into place
-        FileUtils.mv filename + ".#{$$}", filename
+        FileUtils.mv filename + ".#{$PID}", filename
       end
 
       def cached_access_token

data/lib/brightbox-cli/config/clients.rb

@@ -1,7 +1,6 @@
 module Brightbox
   module Config
     module Clients
-
       # Is the currently selected config using API client details?
       def using_api_client?
         config_identifier_match_prefix?("cli")
@@ -28,14 +27,14 @@ module Brightbox
       #
       def client_alias
         return nil if selected_config.nil?
-        # FIXME The 'alias' field is redundant because we are using the section
+        # FIXME: The 'alias' field is redundant because we are using the section
         #   heading for the not ID value but we worry about it for now
         selected_config["alias"] || client_name
       end
 
       # Returns a client name or raises depending on a number of factors.
       #
-      # FIXME This combines too much decision making into what appears to be a
+      # FIXME: This combines too much decision making into what appears to be a
       # getter.
       #
       # If a default_client is not set and there are more than one client it
@@ -55,7 +54,7 @@ module Brightbox
           @client_name
         else
           # If we do not require a default client do not error if one is not set
-          # TODO Remove when certain unused
+          # TODO: Remove when certain unused
           if @options[:force_default_config] == false
             @client_name = default_client
           else
@@ -76,7 +75,7 @@ module Brightbox
       # @todo Account for "core" section
       # @return [Boolean] +true+ if a client (section) has that name
       def client_named?(name)
-        raw_sections.any? {|k,v| v["alias"] == name || k == name }
+        raw_sections.any? { |k, v| v["alias"] == name || k == name }
       end
 
       # @param [String] client_alias the name of the client to make the default
@@ -98,14 +97,14 @@ module Brightbox
       end
 
       def clear_default_client
-        if config["core"].has_key?("default_client")
+        if config["core"].key?("default_client")
           config["core"].delete("default_client")
           dirty!
         end
         @default_client = nil
       end
 
-    private
+      private
 
       # If the prefix is in the client ID (identifier not alias) be +true+
       def config_identifier_match_prefix?(prefix)

data/lib/brightbox-cli/config/section_name_deduplicator.rb

@@ -7,7 +7,6 @@ module Brightbox
     # If the name is not in use then it is returned unchanged.
     #
     class SectionNameDeduplicator
-
       # @param [String] name The name to deduplicate
       # @param [Array<String>] in_use The names already in use in the config
       #
@@ -22,7 +21,7 @@ module Brightbox
       def next
         # Sanity check. If the name is not in use, offer it back
         if @in_use.include?(@name)
-          existing_matches = @in_use.sort.select do |name|
+          @in_use.sort.select do |name|
             name == @name
           end
 
@@ -32,7 +31,7 @@ module Brightbox
         end
       end
 
-    private
+      private
 
       # Returns name with no numerical suffix (_\d+)
       def normalised_name
@@ -42,12 +41,12 @@ module Brightbox
       # Find any names in use fitting the name_suffix pattern to determine which
       # suffix values are in use
       def related_names_in_use
-        @in_use.map {|n| /\A#{normalised_name}_(\d+)\z/.match(n) }.compact
+        @in_use.map { |n| /\A#{normalised_name}_(\d+)\z/.match(n) }.compact
       end
 
       # Find the largest number suffix used
       def max_suffix_value
-        related_names_in_use.map {|match| match.captures.first.to_i }.max
+        related_names_in_use.map { |match| match.captures.first.to_i }.max
       end
 
       # Find and increment the suffix

data/lib/brightbox-cli/config/sections.rb

@@ -1,7 +1,6 @@
 module Brightbox
   module Config
     module Sections
-
       #
       # @param [String] client_alias
       # @param [String] client_id
@@ -14,7 +13,9 @@ module Brightbox
       #
       def add_section(client_alias, client_id, secret, options)
         client_config = config[client_alias]
-        unless client_config.empty?
+        if client_config.empty?
+          info "Creating new client config #{client_alias}"
+        else
           old_calias = client_alias
 
           deduplicator = Brightbox::Config::SectionNameDeduplicator.new(client_alias, clients)
@@ -23,8 +24,6 @@ module Brightbox
           client_config = config[client_alias]
 
           info "A client config named #{old_calias} already exists using #{client_alias} instead"
-        else
-          info "Creating new client config #{client_alias}"
         end
 
         client_config["alias"] = client_alias
@@ -46,14 +45,12 @@ module Brightbox
         end
 
         # Try to determine a default account
-        if default_account = self.find_or_set_default_account
+        unless default_account == find_or_set_default_account
           info "The default account of #{default_account} has been selected"
         end
 
         # If only client then set it as the default
-        unless default_client
-          set_default_client(client_alias)
-        end
+        set_default_client(client_alias) unless default_client
 
         # Ensure all our config changes are now saved
         save
@@ -94,10 +91,10 @@ module Brightbox
       #
       def clients
         # Exclude the global "core" section
-        config.sections.find_all { |s| s != 'core' }
+        config.sections.select { |s| s != 'core' }
       end
 
-    private
+      private
 
       # To compensate for Ini gem, this gets the hash it holds because it's
       # #each interface isn't much use

data/lib/brightbox-cli/config/user_application.rb

@@ -1,7 +1,7 @@
 module Brightbox
   module Config
     class UserApplication
-      # FIXME api_url should use fog's underlying default
+      # FIXME: api_url should use fog's underlying default
       #
       NON_BLANK_KEYS = %w{api_url client_id secret username}
 
@@ -21,7 +21,7 @@ module Brightbox
           :brightbox_auth_url => selected_config['auth_url'] || selected_config['api_url'],
           :brightbox_client_id => selected_config['client_id'],
           :brightbox_secret => selected_config['secret'],
-          :persistent => (selected_config["persistent"] != nil ? selected_config["persistent"] : true)
+          :persistent => persistent?
         }
       end
 
@@ -31,11 +31,11 @@ module Brightbox
       #
       def valid?
         NON_BLANK_KEYS.all? do |key|
-          selected_config.has_key?(key) && ! selected_config[key].to_s.empty?
+          selected_config.key?(key) && !selected_config[key].to_s.empty?
         end
       end
 
-      # FIXME This calls the underlying fog methods which also resets the access
+      # FIXME: This calls the underlying fog methods which also resets the access
       # token but this method does not expose that token.
       #
       def fetch_refresh_token(options)
@@ -53,7 +53,15 @@ module Brightbox
         connection
       end
 
-    private
+      private
+
+      def persistent?
+        if selected_config["persistent"]
+          selected_config["persistent"]
+        else
+          true
+        end
+      end
 
       def password_auth_params
         {
@@ -63,14 +71,14 @@ module Brightbox
           :brightbox_client_id => selected_config['client_id'],
           :brightbox_secret => selected_config['secret'],
           :brightbox_username => selected_config["username"],
-          :persistent => (selected_config["persistent"] != nil ? selected_config["persistent"] : true)
+          :persistent => persistent?
         }
       end
 
       def check_required_params
         unless valid?
           NON_BLANK_KEYS.each do |key|
-            unless selected_config.has_key?(key) && ! selected_config[key].to_s.empty?
+            unless selected_config.key?(key) && !selected_config[key].to_s.empty?
               raise Brightbox::BBConfigError, "#{key} option missing from config in section #{client_name}"
             end
           end

data/lib/brightbox-cli/connection_manager.rb

@@ -1,6 +1,5 @@
 module Brightbox
   class ConnectionManager
-
     def initialize(connection_options)
       @connection_options = connection_options
       @connection = nil
@@ -14,7 +13,7 @@ module Brightbox
       end
     end
 
-  private
+    private
 
     def connection_with_account
       if @connection

data/lib/brightbox-cli/database_server.rb

@@ -0,0 +1,100 @@
+module Brightbox
+  class DatabaseServer < Api
+    def self.require_account?
+      true
+    end
+
+    def self.create(options)
+      new(conn.database_servers.create(options))
+    end
+
+    def self.all
+      conn.database_servers.all
+    end
+
+    def self.get(id)
+      conn.database_servers.get(id)
+    end
+
+    def update(options)
+      self.class.conn.update_database_server(id, options)
+      reload
+      self
+    end
+
+    def reset_password
+      fog_model.reset_password
+    end
+
+    def destroy
+      fog_model.destroy
+    end
+
+    def self.default_field_order
+      [
+        :id,
+        :status,
+        :type,
+        :db_engine,
+        :zone,
+        :created_on,
+        :cloud_ip_ids,
+        :name
+      ]
+    end
+
+    # These are all the fields show in the longer table form
+    def self.detailed_fields
+      [
+        :id, :name, :description, :status,
+        :type, :engine, :version,
+        :zone,
+        :created_on,
+        :admin_username, :admin_password,
+        :allow_access,
+        :cloud_ip_ids, :cloud_ips
+      ]
+    end
+
+    def type_identifier
+      if fog_model.attributes.key?("database_server_type")
+        fog_model.attributes["database_server_type"]["id"]
+      end
+    end
+
+    def zone_handle
+      if fog_model.attributes.key?("zone")
+        fog_model.attributes["zone"]["handle"]
+      end
+    end
+
+    def to_row
+      a = fog_model.attributes
+      a[:status] = fog_model.state
+      a[:type] = type_identifier
+      a[:db_engine] = engine_version
+      a[:engine] = database_engine
+      a[:version] = database_version
+      a[:zone] = zone_handle
+      a[:created_on] = created_on
+      a[:allow_access] = allow_access
+      a[:cloud_ip_ids] = cloud_ip_ids
+      a[:cloud_ips] = cloud_ip_addresses
+      a
+    end
+
+    def engine_version
+      [database_engine, database_version].join("-")
+    end
+
+    # Lists the CIP identifiers (cip-12345)
+    def cloud_ip_ids
+      cloud_ips.map { |cip| cip["id"] }
+    end
+
+    # Lists the CIP IP addresses
+    def cloud_ip_addresses
+      cloud_ips.map { |cip| cip["public_ip"] }
+    end
+  end
+end