bbcloud 0.11.2 → 0.12.0

data/lib/bbcloud/commands/users-update.rb

@@ -1,37 +1,39 @@
-desc 'Update user details'
-arg_name 'user-id...'
-command [:update] do |c|
-  c.desc "Path to public ssh key file"
-  c.long_desc "This is the path to the public ssh key that you'd like to use for new servers. You can specify '-' to read from stdin"
-  c.flag [:f, "ssh-key"]
+module Brightbox
+  desc 'Update user details'
+  arg_name 'user-id...'
+  command [:update] do |c|
+    c.desc "Path to public ssh key file"
+    c.long_desc "This is the path to the public ssh key that you'd like to use for new servers. You can specify '-' to read from stdin"
+    c.flag [:f, "ssh-key"]
 
-  c.desc "Name"
-  c.flag [:n, "name"]
+    c.desc "Name"
+    c.flag [:n, "name"]
 
-  c.action do |global_options, options, args|
+    c.action do |global_options, options, args|
 
-    raise "You must specify the user id as the first argument" if args.empty?
+      raise "You must specify the user id as the first argument" if args.empty?
 
-    user = User.find args.first
+      user = User.find args.first
       
-    if options[:f] == '-'
-      user.ssh_key = STDIN.read
-    elsif options[:f]
-      File.open(File.expand_path(options[:f])) { |f| user.ssh_key = f.read }
-    end
+      if options[:f] == '-'
+        user.ssh_key = STDIN.read
+      elsif options[:f]
+        File.open(File.expand_path(options[:f])) { |f| user.ssh_key = f.read }
+      end
 
-    if options[:n]
-      user.name = options[:n]
-    end
+      if options[:n]
+        user.name = options[:n]
+      end
 
-    user.save
+      user.save
 
-    table_opts = global_options.merge({
-      :vertical => true,
-      :fields => [:id, :name, :email_address, :ssh_key ]
-    })
+      table_opts = global_options.merge({
+                                          :vertical => true,
+                                          :fields => [:id, :name, :email_address, :ssh_key ]
+                                        })
 
-    render_table([user], table_opts)
+      render_table([user], table_opts)
 
+    end
   end
 end

data/lib/bbcloud/commands/zones-list.rb

@@ -1,16 +1,18 @@
-desc 'List zones'
-arg_name '[zone-id...]'
-command [:list] do |c|
-  c.action do |global_options, options, args|
+module Brightbox
+  desc 'List zones'
+  arg_name '[zone-id...]'
+  command [:list] do |c|
+    c.action do |global_options, options, args|
 
-    if args.empty?
-      zones = Zone.find(:all)
-    else
-      zones = Zone.find_or_call(args) do |id|
-        warn "Couldn't find zone #{id}"
+      if args.empty?
+        zones = Zone.find(:all)
+      else
+        zones = Zone.find_or_call(args) do |id|
+          warn "Couldn't find zone #{id}"
+        end
       end
-    end
 
-    render_table(zones, global_options)
+      render_table(zones, global_options)
+    end
   end
 end

data/lib/bbcloud/config.rb

@@ -1,148 +1,162 @@
-class BBConfigError < StandardError ; end
+module Brightbox
+  class BBConfigError < StandardError ; end
 
-class BBConfig
-  require 'fileutils'
-  require 'ini'
+  class BBConfig
+    require 'fileutils'
+    require 'ini'
 
-  attr_writer :client_name
+    attr_writer :client_name
 
-  def initialize(options = {})
-    @options = options
-  end
+    def initialize(options = {})
+      @options = options
+    end
 
-  def dir
-    return @dir if @dir
-    return nil if @dir == false
-    @dir = File.expand_path(@options[:dir] || "~/.brightbox")
-    @config_filename = File.join(@dir, 'config')
-    # Make the directory if necessary
-    unless File.exists? @dir
-      begin
-        FileUtils.mkdir @dir
-      rescue Errno::EEXIST
-      end
+    def self.config
+      Brightbox.const_set(:CONFIG, new())
+      require "bbcloud/gli_global_hooks"
+      yield
+    ensure
+      CONFIG.finish()
     end
-    # 
-    if File.directory? @dir
-      @dir
-    else
-      @dir = false
-      nil
+
+    def dir
+      return @dir if @dir
+      return nil if @dir == false
+      @dir = File.expand_path(@options[:dir] || default_config_dir)
+      @config_filename = File.join(@dir, 'config')
+      # Make the directory if necessary
+      unless File.exists? @dir
+        begin
+          FileUtils.mkdir @dir
+        rescue Errno::EEXIST
+        end
+      end
+      # 
+      if File.directory? @dir
+        @dir
+      else
+        @dir = false
+        nil
+      end
     end
-  end
 
-  def config_filename
-    dir
-    @config_filename
-  end
+    def config_filename
+      dir
+      @config_filename
+    end
 
-  def oauth_token_filename
-    @oauth_token_filename ||= File.join(dir, client_name + '.oauth_token')
-  end
+    def oauth_token_filename
+      @oauth_token_filename ||= File.join(dir, client_name + '.oauth_token')
+    end
 
-  def cache_path
-    if @cache_path
-      @cache_path
-    else
-      @cache_path = File.join(@dir, 'cache')
-      unless File.exists? @cache_path
-        begin
-          FileUtils.mkdir @cache_path
-        rescue Errno::EEXIST
+    def cache_path
+      if @cache_path
+        @cache_path
+      else
+        @cache_path = File.join(@dir, 'cache')
+        unless File.exists? @cache_path
+          begin
+            FileUtils.mkdir @cache_path
+          rescue Errno::EEXIST
+          end
         end
+        @cache_path
       end
-      @cache_path
     end
-  end
 
-  def cache_id(cid)
-    FileUtils.touch(File.join(cache_path, cid)) unless cid.nil?
-  end
+    def cache_id(cid)
+      FileUtils.touch(File.join(cache_path, cid)) unless cid.nil?
+    end
 
-  def config
-    return @config if @config
-    return {} if @config == false
-    @config ||= Ini.new config_filename
-    @config
-  rescue Ini::Error => e
-    raise BBConfigError, "Config problem in #{config_filename}: #{e}"
-  end
+    def config
+      return @config if @config
+      return {} if @config == false
+      @config ||= Ini.new config_filename
+      @config
+    rescue Ini::Error => e
+      raise BBConfigError, "Config problem in #{config_filename}: #{e}"
+    end
 
-  def [](k)
-    config[k]
-  end
+    def [](k)
+      config[k]
+    end
 
-  def delete_section(name)
-    config.delete_section name
-  end
+    def delete_section(name)
+      config.delete_section name
+    end
 
-  def save!
-    if @config.is_a? Ini
-      @config.write
+    def save!
+      if @config.is_a? Ini
+        @config.write
+      end
     end
-  end
 
-  def clients
-    config.sections.find_all { |s| s != 'core' }
-  end
+    def clients
+      config.sections.find_all { |s| s != 'core' }
+    end
 
-  def client_name
-    if @client_name
-      @client_name
-    else
-      default_client = config['core']['default_client']
-      @client_name = default_client || clients.first
+    def client_name
+      if @client_name
+        @client_name
+      else
+        default_client = config['core']['default_client']
+        @client_name = default_client || clients.first
+      end
     end
-  end
 
-  def to_fog
-    raise Ini::Error, "No api client configured" unless configured?
-    c = config[client_name]
-    %w{api_url client_id secret}.each do |k|
-      if c[k].to_s.empty?
-        raise BBConfigError, "#{k} option missing from config in section #{client_name}"
+    def to_fog
+      raise Ini::Error, "No api client configured" unless configured?
+      c = config[client_name]
+      %w{api_url client_id secret}.each do |k|
+        if c[k].to_s.empty?
+          raise BBConfigError, "#{k} option missing from config in section #{client_name}"
+        end
       end
+      { 
+        :provider => 'Brightbox',
+        :brightbox_api_url => c['api_url'],
+        :brightbox_auth_url => c['auth_url'] || c['api_url'],
+        :brightbox_client_id => c['client_id'],
+        :brightbox_secret => c['secret']
+      }
     end
-    { 
-      :provider => 'Brightbox',
-      :brightbox_api_url => c['api_url'],
-      :brightbox_auth_url => c['auth_url'] || c['api_url'],
-      :brightbox_client_id => c['client_id'],
-      :brightbox_secret => c['secret']
-    }
-  end
 
-  def oauth_token
-    if @oauth_token.nil?
-      if File.exists? oauth_token_filename
-        File.open(oauth_token_filename, "r") do |f|
-          @oauth_token = f.read.chomp
+    def oauth_token
+      if @oauth_token.nil?
+        if File.exists? oauth_token_filename
+          File.open(oauth_token_filename, "r") do |f|
+            @oauth_token = f.read.chomp
+          end
+          @oauth_token
+        else
+          @oauth_token = false
         end
-        @oauth_token
       else
-        @oauth_token = false
+        @oauth_token ? @oauth_token : nil
       end
-    else
-      @oauth_token ? @oauth_token : nil
     end
-  end
 
-  def finish
-    begin
-      if configured? and @oauth_token != Api.conn.oauth_token
-        File.open(oauth_token_filename + ".#{$$}", "w") do |f|
-          f.write Api.conn.oauth_token
+    def finish
+      begin
+        if configured? and @oauth_token != Api.conn.oauth_token
+          File.open(oauth_token_filename + ".#{$$}", "w") do |f|
+            f.write Api.conn.oauth_token
+          end
+          FileUtils.mv oauth_token_filename + ".#{$$}", oauth_token_filename
         end
-        FileUtils.mv oauth_token_filename + ".#{$$}", oauth_token_filename
+      rescue StandardError => e
+        warn "Error writing auth token #{oauth_token_filename}: #{e.class}: #{e}"
       end
-    rescue StandardError => e
-      warn "Error writing auth token #{oauth_token_filename}: #{e.class}: #{e}"
     end
 
-  end
+    def configured?
+      client_name != nil and !clients.empty?
+    end
 
-  def configured?
-    client_name != nil and !clients.empty?
-  end
+    private
+    def default_config_dir
+      File.join(ENV['HOME'],'.brightbox')
+    end
 
+  end
 end

data/lib/bbcloud/error_parser.rb

@@ -0,0 +1,34 @@
+module Brightbox
+  class ErrorParser
+    include Brightbox::Logging
+    attr_accessor :socket_error
+
+    def initialize(socket_error)
+      @socket_error = socket_error
+    end
+
+    def pretty_print
+      case socket_error
+      when Excon::Errors::ServiceUnavailable
+        error "Api currently unavailable"
+      when Excon::Errors::Error
+        parse_http_error(socket_error)
+      else
+        error "ERROR: #{socket_error}"
+      end
+    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 {}
+        if json_error = json_response['errors']
+          error "ERROR: #{json_error.join(" ")}"
+        else
+          error "ERROR: #{e}"
+        end
+      else
+        error "ERROR: #{e}"
+      end
+    end
+  end
+end

data/lib/bbcloud/fog_extensions.rb

@@ -0,0 +1,19 @@
+# Hack to force persistent connections in fog
+module Fog
+  class Connection
+    def initialize(url, persistent=false)
+      @excon = Excon.new(url)
+      @persistent = true
+    end
+  end
+end
+
+module Fog
+  module Brightbox
+    class Compute
+      class Real
+        attr_accessor :oauth_token
+      end
+    end
+  end
+end

data/lib/bbcloud/gli_global_hooks.rb

@@ -0,0 +1,56 @@
+module Brightbox
+  extend GLI
+  # Global options
+  desc "Simple output (tab separated, don't draw fancy tables)"
+  switch [:s, :simple]
+
+  desc "Set the api client to use (named in #{CONFIG.config_filename})"
+  flag [:c, :client]
+
+  desc "Disable peer SSL certificate verification"
+  switch [:k, :insecure]
+
+  desc "Display Help"
+  switch [:h, :help]
+
+  # Load the command libraries for the current group
+  cmd_group_name = File.basename($0).gsub(/brightbox\-/, '')
+  cmd_group_files = File.join(File.dirname(__FILE__), "commands/#{cmd_group_name}*.rb")
+  Dir.glob(cmd_group_files).each do |f|
+    load f
+  end
+
+  pre do |global_options, command, options, args|
+    CONFIG.client_name = ENV["CLIENT"] if ENV["CLIENT"]
+    CONFIG.client_name = global_options[:c] if global_options[:c]
+
+    if global_options[:k] or ENV["INSECURE"]
+      Excon.ssl_verify_peer = false
+      # FIXME: Overriding this here is not good.  Excon calls
+      # post_connection_check so it should have an option not to.
+      class OpenSSL::SSL::SSLSocket
+        def post_connection_check(hostname)
+          true
+        end
+      end
+    end
+    command = commands[:help] if global_options[:h]
+    info "INFO: client_id: #{CONFIG.client_name}" if CONFIG.clients.size > 1
+    true
+  end
+
+  on_error do |e|
+    ErrorParser.new(e).pretty_print()
+    debug e
+    debug e.class.to_s
+    debug e.backtrace.join("\n")
+    exit 1
+  end
+
+  desc 'Display version information'
+  command [:version] do |c|
+    c.action do |global_options, options, args|
+      info "Brightbox CLI version: #{Brightbox::VERSION}, Fog version: #{Fog::VERSION}"
+    end
+  end
+end