bbcloud 0.8.2 → 0.9

data/bbcloud.gemspec

@@ -19,9 +19,14 @@ Gem::Specification.new do |s|
   s.executables   = `git ls-files -- bin/*`.split("\n").map{ |f| File.basename(f) }
   s.require_paths = ["lib"]
 
+	# To work around a bug with json using the wrong json_pure
+	s.add_dependency 'json', '=1.4.6'
+	s.add_dependency 'json_pure', '=1.4.6'
+
 	s.add_dependency 'gli', '1.1.2'
 	s.add_dependency 'hirb', '0.3.5'
 	s.add_dependency 'fog', '=0.3.23'
 	s.add_dependency 'excon', '>=0.2.4'
 	s.add_dependency 'ini', '0.1.1'
+
 end

data/lib/bbcloud/api.rb

@@ -6,6 +6,7 @@ module Brightbox
     class Conflict < ApiError ; end
     class InvalidRecord < ApiError ; end
     class Forbidden < ApiError ; end
+    class InvalidArguments < ApiError ; end
 
     @@api = nil
 
@@ -14,18 +15,21 @@ module Brightbox
         @@api
       else
         @@api = Fog::Brightbox::Compute.new CONFIG.to_fog
+        @@api.oauth_token = CONFIG.oauth_token
+        @@api
       end
     end
 
     def initialize(m = nil)
       if m.is_a? String
         @id = m
-      elsif !m.nil?
+      elsif m.respond_to? :attributes and 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 unless @id.nil?
-      @id
+      CONFIG.cache_id @id
     end
 
     def fog_model
@@ -43,38 +47,58 @@ module Brightbox
     end
 
     def self.find(args = :all, options = {})
-      return nil if args.nil?
+      raise InvalidArguments, "find(nil)" if args.nil?
+      raise InvalidArguments, "find([])" if args.respond_to?(:empty?) and args.empty?
       options = {
         :order => :created_at,
       }.merge options
-      objects = []
+      objects = nil
+      object = nil
       # get the data from the Api
-      if args == :all or (args.respond_to?(:empty?) and args.empty?)
+      if args == :all
         objects = all
+      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|
-          cached_get(arg)
+          o = cached_get(arg.to_s)
+          raise NotFound, "Couldn't find '#{arg.to_s}'" if o.nil?
+          o
         end
-      elsif args.respond_to? :to_s
-        objects = [cached_get(args.to_s)]
+      else
+        raise InvalidArguments, "Couldn't find '#{arg.class}'"
       end
-      # wrap in our objects
-      objects.collect! { |o| new(o) unless o.nil? }
-      # Sort
-      objects.sort! do |a,b| 
-        sort_method = options[:order]
-        begin
-          a.send(sort_method) <=> b.send(sort_method)
-        rescue NoMethodError
-          0
+      if objects
+        # wrap in our objects
+        objects.collect! { |o| new(o) }
+        # Sort
+        objects.sort! do |a,b| 
+          sort_method = options[:order]
+          begin
+            a.send(sort_method) <=> b.send(sort_method)
+          rescue NoMethodError
+            0
+          end
         end
-      end
-      if objects.size <= 1 and args.is_a? String
-        # This was a single lookup
-        objects.first
-      else
         objects
+      elsif object
+        new(object)
+      end
+    end
+
+    # Find each id in the given array.  Yield the block with any ids
+    # that couldn't be found
+    def self.find_or_call(ids, &block)
+      objects = []
+      ids.each do |id|
+        begin
+          objects << find(id)
+        rescue Api::NotFound
+          yield id
+        end
       end
+      objects
     end
 
     def method_missing(m, *args)
@@ -97,7 +121,9 @@ module Brightbox
     end
 
     def self.find_by_handle(h)
-      find(:all).find { |o| o.handle == h }
+      object = find(:all).find { |o| o.handle == h }
+      raise Api::NotFound, h if object.nil?
+      object
     end
 
     def self.cache_all!

data/lib/bbcloud/cli.rb

@@ -3,6 +3,8 @@ require os_config if File.exist? os_config
 
 unless defined?(DISABLE_RUBYGEMS)
   require "rubygems" 
+	gem "json", "=1.4.6"
+	gem "json_pure", "=1.4.6"
   gem "fog", "=0.3.23"
 end
 
@@ -22,6 +24,26 @@ require 'gli'
 require 'bbcloud/tables'
 require 'fog'
 
+# 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
+
 %w{api servers images types zones cloud_ips users accounts config version}.each do |f|
   require File.join(File.dirname(__FILE__), f)
 end
@@ -128,3 +150,5 @@ command [:version] do |c|
 end
 
 run ARGV
+
+CONFIG.finish

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

@@ -3,7 +3,14 @@ arg_name '[account-id...]'
 command [:list] do |c|
   c.action do |global_options, options, args|
 
-    accounts = Account.find(args).compact
+    if args.empty?
+      accounts = Account.find(:all)
+    else
+      accounts = Account.find_or_call(args) do |id|
+        warn "Couldn't find account #{id}"
+      end
+    end
+
     render_table(accounts, global_options)
   end
 end

data/lib/bbcloud/commands/accounts-reset-ftp-password.rb

@@ -4,7 +4,13 @@ command [:reset_ftp_password] do |c|
 
   c.action do |global_options,options,args|
 
-    accounts = Account.find(args)
+    if args.empty?
+      raise "You must specify the accounts to reset ftp passwords for"
+    end
+
+    accounts = Account.find_or_call(args) do |id|
+      raise "Couldn't find account #{id}"
+    end
 
     rows = []
 

data/lib/bbcloud/commands/accounts-show.rb

@@ -4,7 +4,13 @@ command [:show] do |c|
 
   c.action do |global_options,options,args|
 
-    accounts = Account.find(args).compact
+    if args.empty?
+      raise "You must specify the accounts to show"
+    end
+
+    accounts = Account.find_or_call(args) do |id|
+      warn "Couldn't find account #{id}"
+    end
 
     table_opts = global_options.merge({
       :vertical => true,

data/lib/bbcloud/commands/cloudips-destroy.rb

@@ -6,15 +6,15 @@ command [:destroy] do |c|
 
   c.action do |global_options,options,args|
 
-    if args.size < 1
-      raise "You must specify the cloud ip id you want to destroy"
+    if args.empty?
+      raise "You must specify the cloud ips you want to destroy"
     end
 
-    args.each do |ip_id|
-
-      ip = CloudIP.find ip_id
+    ips = CloudIP.find_or_call(args) do |id|
+      raise "Couldn't find cloud ip #{id}"
+    end
 
-      raise "Cannot find cloud ip #{ip_id}" if ip.nil?
+    ips.each do |ip|
 
       if ip.mapped?
         if options[:u]
@@ -29,7 +29,7 @@ command [:destroy] do |c|
           raise "Cannot destroy mapped cloud ip #{ip}"
         end
       end
-      info "Destroying cloud ip #{ip.public_ip} (#{ip})"
+      info "Destroying cloud ip #{ip}"
       ip.destroy
     end
 

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

@@ -4,8 +4,14 @@ command [:list] do |c|
 
   c.action do |global_options,options,args|
 
-    ips = CloudIP.find args
+    if args.empty?
+      ips = CloudIP.find(:all)
+    else
+      ips = CloudIP.find_or_call(args) do |id|
+        warn "Couldn't find cloud ip #{id}"
+      end
+    end
 
-    render_table(ips.compact.sort, global_options)
+    render_table(ips.sort, global_options)
   end
 end

data/lib/bbcloud/commands/cloudips-map.rb

@@ -18,8 +18,6 @@ command [:map] do |c|
 
     ip = CloudIP.find ip_id
 
-    raise "Cannot find ip #{ip_id}" if ip.nil?
-
     if ip.mapped?
       if options[:u]
         info "Unmapping ip #{ip}"
@@ -36,7 +34,6 @@ command [:map] do |c|
 
     server_id = args.last
     server = Server.find server_id
-    raise "Cannot find server #{server_id}" if server.nil?
     
     interface_id = server.interfaces.first["id"]
     info "Mapping #{ip} to interface #{interface_id} on #{server}"
@@ -45,9 +42,9 @@ command [:map] do |c|
 
     # Wait up to 3 seconds for mapping to complete
     3.times do
-      sleep 1
       ip.reload
       break if ip.mapped?
+      sleep 1
     end
 
     render_table([ip], global_options)

data/lib/bbcloud/commands/cloudips-show.rb

@@ -4,7 +4,13 @@ command [:show] do |c|
 
   c.action do |global_options,options,args|
 
-    ips = CloudIP.find args
+    if args.empty?
+      raise "You must specify the cloud ips you want to show"
+    end
+
+    ips = CloudIP.find_or_call(args) do |id|
+      warn "Couldn't find cloud ip #{id}"
+    end
 
     fields = [:id, :status, :public_ip, :reverse_dns, :server_id, :interface_id]
 

data/lib/bbcloud/commands/cloudips-unmap.rb

@@ -4,11 +4,13 @@ command [:unmap] do |c|
 
   c.action do |global_options,options,args|
 
-    raise "you must specify the cloud ip ids to unmap as arguments" if args.empty?
-
-    ips = CloudIP.find args
+    if args.empty?
+      raise "You must specify the cloud ips you want to unmap"
+    end
 
-    ips.compact!
+    ips = CloudIP.find_or_call(args) do |id|
+      raise "Couldn't find cloud ip #{id}"
+    end
 
     ips.each do |ip|
       if ip.mapped?

data/lib/bbcloud/commands/images-destroy.rb

@@ -4,7 +4,13 @@ command [:destroy] do |c|
 
   c.action do |global_options,options,args|
 
-    images = Image.find(args).compact
+    if args.empty?
+      raise "You must specify the images you want to destroy"
+    end
+
+    images = Image.find_or_call(args) do |id|
+      raise "Couldn't find image #{id}"
+    end
 
     images.each do |i|
       info "Destroying image #{i}"

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

@@ -2,7 +2,14 @@ desc 'List available images'
 arg_name '[image-id...]'
 command [:list] do |c|
   c.action do |global_options, options, args|
-    images = Image.find args
+
+    if args.empty?
+      images = Image.find(:all)
+    else
+      images = Image.find_or_call(args) do |id|
+        warn "Couldn't find image #{id}"
+      end
+    end
 
     snapshots = images.select { |i| i.source_type == 'snapshot' }
 

data/lib/bbcloud/commands/images-register.rb

@@ -0,0 +1,24 @@
+desc 'Register an image'
+command [:register] do |c|
+
+  c.desc "Name to give the image"
+  c.flag [:n, "name"]
+
+  c.desc "Archtecture of the image (i686 or x86_64)"
+  c.flag [:a, "arch"]
+
+  c.desc "Source filename of the image you uploaded to the image library"
+  c.flag [:s, "source"]
+
+  c.action do |global_options,options,args|
+
+    raise "You must specify the architecture" unless options[:a]
+    raise "You must specify the source filename" unless options[:s]
+
+    image = Image.register :name => options[:n], :arch => options[:a], 
+    :source => options[:s]
+
+    render_table([image])
+
+  end
+end

data/lib/bbcloud/commands/images-show.rb

@@ -4,7 +4,13 @@ command [:show] do |c|
 
   c.action do |global_options,options,args|
 
-    images = Image.find(args).compact
+    if args.empty?
+      raise "You must specify the images you want to show"
+    end
+
+    images = Image.find_or_call(args) do |id|
+      warn "Couldn't find image #{id}"
+    end
 
     table_opts = global_options.merge({
       :vertical => true,

data/lib/bbcloud/commands/servers-create.rb

@@ -39,7 +39,6 @@ command [:create] do |c|
 
     image_id = args.shift
     image = Image.find image_id
-    raise "Couldn't find image #{image_id}" unless image
     
     type_id = options[:t]
     if type_id =~ /^typ\-/
@@ -47,7 +46,6 @@ command [:create] do |c|
     else
       type = Type.find_by_handle type_id
     end
-    raise "Couldn't find server type #{type_id}" unless type
 
     if options[:z]
       zone = options[:z]
@@ -57,7 +55,6 @@ command [:create] do |c|
         zone = Zone.find_by_handle zone
       end
     end
-    raise "Couldn't find server type #{type_id}" unless type
 
     user_data = options[:m]
     user_data_file = options[:f]
@@ -81,7 +78,7 @@ command [:create] do |c|
     msg = "Creating #{options[:i] > 1 ? options[:i] : 'a'} #{type.handle} (#{type.id})"
     msg << " server#{options[:i] > 1 ? 's' : ''} with image #{image.name.strip} (#{image.id})"
     msg << " in zone #{zone.handle} (#{zone})" if zone
-    msg << " with #{user_data.size / 1024}k of user data" if user_data
+    msg << " with %.2fk of user data" % (user_data.size / 1024.0) if user_data
     info msg
     servers = []
     options[:i].times do

data/lib/bbcloud/commands/servers-destroy.rb

@@ -3,23 +3,20 @@ arg_name '[server-id...]'
 command [:destroy] do |c|
   c.action do |global_options, options, args|
 
-    if args.empty?
-      raise "you must specify the id of the server(s) you want to destroy"
+    raise "You must specify servers to destroy" if args.empty?
+
+    servers = Server.find_or_call(args) do |id|
+      raise "Couldn't find server #{id}"
     end
 
-    servers = args.collect do |sid|
-      info "Destroying server #{sid}"
-      server = Server.find sid
-      raise "Server #{sid} does not exist" if server.nil?
+    servers.each do |server|
+      info "Destroying server #{server}"
       begin
         server.destroy
       rescue Brightbox::Api::Conflict => e
-        error "Could not destroy #{sid}"
+        error "Could not destroy #{server}"
       end
-      server.reload
-      server
     end
 
-    render_table(servers, global_options)
   end
 end

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

@@ -6,7 +6,13 @@ command [:list] do |c|
     Type.cache_all!
     Zone.cache_all!
 
-    servers = Server.find(args).compact
+    if args.empty?
+      servers = Server.find(:all)
+    else
+      servers = Server.find_or_call(args) do |id|
+        warn "Couldn't find server #{id}"
+      end
+    end
 
     render_table(servers, global_options)
   end

data/lib/bbcloud/commands/servers-show.rb

@@ -3,14 +3,15 @@ arg_name 'server-id...'
 command [:show] do |c|
 
   c.action do |global_options,options,args|
-    
-    servers = Server.find(args).compact
+
+    raise "You must specify servers to show" if args.empty?
+
+    servers = Server.find_or_call(args) do |id|
+      raise "Couldn't find server #{id}"
+    end
+
     rows = []
     servers.each do |s|
-      if s.is_a? String
-        error "Could not find server #{s}"
-        next
-      end
       o = s.to_row
       if s.server_type.exists?
         o[:type] = s.server_type.id
@@ -21,7 +22,7 @@ command [:show] do |c|
         o[:disk] = s.server_type.disk.to_i
       end
 
-      if s.image.exists? and false
+      if s.image.exists?
         o[:image_name] = s.image.name
         o[:arch] = s.image.arch
       end

data/lib/bbcloud/commands/servers-shutdown.rb

@@ -3,15 +3,16 @@ arg_name 'server-id...'
 command [:shutdown] do |c|
   c.action do |global_options,options,args|
 
-    servers = Server.find(args).compact
+    raise "You must specify servers to shutdown" if args.empty?
+
+    servers = Server.find_or_call(args) do |id|
+      raise "Couldn't find server #{id}"
+    end
 
     servers.each do |s|
       info "Shutting down server #{s}"
       s.shutdown
-      s.reload
     end
 
-    render_table(servers)
-
   end
 end

data/lib/bbcloud/commands/servers-snapshot.rb

@@ -4,14 +4,16 @@ command [:snapshot] do |c|
 
   c.action do |global_options,options,args|
 
-    servers = Server.find(args).compact
+    raise "You must specify servers to snapshot" if args.empty?
+
+    servers = Server.find_or_call(args) do |id|
+      raise "Couldn't find server #{id}"
+    end
 
     servers.each do |s|
       info "Snapshotting server #{s}"
       s.snapshot
     end
 
-    render_table(servers)
-
   end
 end

data/lib/bbcloud/commands/servers-start.rb

@@ -4,15 +4,16 @@ command [:start] do |c|
 
   c.action do |global_options,options,args|
     
-    servers = Server.find(args).compact
+    raise "You must specify servers to start" if args.empty?
+
+    servers = Server.find_or_call(args) do |id|
+      raise "Couldn't find server #{id}"
+    end
 
     servers.each do |s|
       info "Starting server #{s}"
       s.start
-      s.reload
     end
 
-    render_table(servers)
-
   end
 end

data/lib/bbcloud/commands/servers-stop.rb

@@ -4,15 +4,15 @@ command [:stop] do |c|
 
   c.action do |global_options,options,args|
     
-    servers = Server.find(args).compact
+    raise "You must specify servers to stop" if args.empty?
+
+    servers = Server.find_or_call(args) do |id|
+      raise "Couldn't find server #{id}"
+    end
 
     servers.each do |s|
       info "Stopping server #{s}"
       s.stop
-      s.reload
     end
-
-    render_table(servers)
-
   end
 end

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

@@ -3,7 +3,13 @@ arg_name '[type-id...]'
 command [:list] do |c|
   c.action do |global_options,options,args|
 
-    types = Type.find args, :order => :ram
+    if args.empty?
+      types = Type.find :all
+    else
+      types = Type.find_or_call(args) do |id|
+        warn "Couldn't find type #{id}"
+      end
+    end
 
     render_table(types, global_options)
   end

data/lib/bbcloud/commands/types-show.rb

@@ -4,11 +4,12 @@ command [:show] do |c|
 
   c.action do |global_options,options,args|
     
-    types = Type.find(args)
-    rows = []
-    types.each do |t|
-      next if t.nil?
-      rows << t
+    if args.empty?
+      raise "You must specify the types you want to show"
+    end
+
+    types = Type.find_or_call(args) do |id|
+      warn "Couldn't find type #{id}"
     end
 
     table_opts = global_options.merge({
@@ -16,7 +17,7 @@ command [:show] do |c|
       :fields => [:id, :handle, :status, :name, :ram, :disk, :cores, :description]
     })
 
-    render_table(rows, table_opts)
+    render_table(types, table_opts)
 
   end
 end

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

@@ -3,7 +3,13 @@ arg_name '[user-id...]'
 command [:list] do |c|
   c.action do |global_options, options, args|
 
-    users = User.find args
+    if args.empty?
+      users = User.find(:all)
+    else
+      users = User.find_or_call(args) do |id|
+        warn "Couldn't find user #{id}"
+      end
+    end
 
     render_table(users, global_options)
   end

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

@@ -4,16 +4,12 @@ command [:show] do |c|
 
   c.action do |global_options,options,args|
 
-    users = User.find(args)
-
-    rows = []
+    if args.empty?
+      raise "You must specify the users you want to show"
+    end
 
-    users.each do |s|
-      s.reload # to get ssh_key
-      o = s.to_row
-      o[:ssh_key] = s.ssh_key.to_s.strip
-      o[:accounts] = s.accounts.collect { |a| a.id }.join(", ")
-      rows << o
+    users = User.find_or_call(args) do |id|
+      warn "Couldn't find user #{id}"
     end
 
     table_opts = global_options.merge({
@@ -21,7 +17,7 @@ command [:show] do |c|
       :fields => [:id, :name, :email_address, :accounts, :ssh_key ]
     })
 
-    render_table(rows, table_opts)
+    render_table(users, table_opts)
 
   end
 end

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

@@ -13,8 +13,6 @@ command [:update] do |c|
     raise "You must specify the user id as the first argument" if args.empty?
 
     user = User.find args.first
-
-    raise "Could not find user #{args.first}" if user.nil?
       
     if options[:f] == '-'
       user.ssh_key = STDIN.read

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

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

data/lib/bbcloud/config.rb

@@ -36,6 +36,10 @@ class BBConfig
     @config_filename
   end
 
+  def oauth_token_filename
+    @oauth_token_filename ||= File.join(dir, client_name + '.oauth_token')
+  end
+
   def cache_path
     if @cache_path
       @cache_path
@@ -107,5 +111,33 @@ class BBConfig
     }
   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
+        end
+        @oauth_token
+      else
+        @oauth_token = false
+      end
+    else
+      @oauth_token ? @oauth_token : nil
+    end
+  end
+
+  def finish
+    begin
+      if @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
+    rescue StandardError => e
+      warn "Error writing auth token #{oauth_token_filename}: #{e.class}: #{e}"
+    end
+
+  end
 
 end

data/lib/bbcloud/images.rb

@@ -25,6 +25,11 @@ module Brightbox
       o
     end
 
+    def self.register(options = {})
+      image = conn.create_image(options)
+      find image['id']
+    end
+
     def public?
       public
     end

data/lib/bbcloud/types.rb

@@ -21,11 +21,7 @@ module Brightbox
     end
 
     def render_cell
-      handle
-    end
-
-    def id
-      fog_model.id
+      fog_model.handle
     end
 
     def self.all

data/lib/bbcloud/version.rb

@@ -1,3 +1,3 @@
 module Brightbox
-  VERSION = "0.8.2"
+  VERSION = "0.9"
 end

data/lib/bbcloud/zones.rb

@@ -17,11 +17,11 @@ module Brightbox
     end
 
     def to_s
-      @id
+      id
     end
 
     def render_cell
-      handle if fog_model
+      handle
     end
   end
 end

metadata

@@ -4,9 +4,8 @@ version: !ruby/object:Gem::Version
   prerelease: false
   segments: 
   - 0
-  - 8
-  - 2
-  version: 0.8.2
+  - 9
+  version: "0.9"
 platform: ruby
 authors: 
 - John Leach
@@ -14,13 +13,43 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-11-21 00:00:00 +00:00
+date: 2010-11-26 00:00:00 +00:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
-  name: gli
+  name: json
   prerelease: false
   requirement: &id001 !ruby/object:Gem::Requirement 
+    none: false
+    requirements: 
+    - - "="
+      - !ruby/object:Gem::Version 
+        segments: 
+        - 1
+        - 4
+        - 6
+        version: 1.4.6
+  type: :runtime
+  version_requirements: *id001
+- !ruby/object:Gem::Dependency 
+  name: json_pure
+  prerelease: false
+  requirement: &id002 !ruby/object:Gem::Requirement 
+    none: false
+    requirements: 
+    - - "="
+      - !ruby/object:Gem::Version 
+        segments: 
+        - 1
+        - 4
+        - 6
+        version: 1.4.6
+  type: :runtime
+  version_requirements: *id002
+- !ruby/object:Gem::Dependency 
+  name: gli
+  prerelease: false
+  requirement: &id003 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - "="
@@ -31,11 +60,11 @@ dependencies:
         - 2
         version: 1.1.2
   type: :runtime
-  version_requirements: *id001
+  version_requirements: *id003
 - !ruby/object:Gem::Dependency 
   name: hirb
   prerelease: false
-  requirement: &id002 !ruby/object:Gem::Requirement 
+  requirement: &id004 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - "="
@@ -46,11 +75,11 @@ dependencies:
         - 5
         version: 0.3.5
   type: :runtime
-  version_requirements: *id002
+  version_requirements: *id004
 - !ruby/object:Gem::Dependency 
   name: fog
   prerelease: false
-  requirement: &id003 !ruby/object:Gem::Requirement 
+  requirement: &id005 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - "="
@@ -61,11 +90,11 @@ dependencies:
         - 23
         version: 0.3.23
   type: :runtime
-  version_requirements: *id003
+  version_requirements: *id005
 - !ruby/object:Gem::Dependency 
   name: excon
   prerelease: false
-  requirement: &id004 !ruby/object:Gem::Requirement 
+  requirement: &id006 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ">="
@@ -76,11 +105,11 @@ dependencies:
         - 4
         version: 0.2.4
   type: :runtime
-  version_requirements: *id004
+  version_requirements: *id006
 - !ruby/object:Gem::Dependency 
   name: ini
   prerelease: false
-  requirement: &id005 !ruby/object:Gem::Requirement 
+  requirement: &id007 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - "="
@@ -91,7 +120,7 @@ dependencies:
         - 1
         version: 0.1.1
   type: :runtime
-  version_requirements: *id005
+  version_requirements: *id007
 description: Scripts to interact with the Brightbox cloud API
 email: 
 - john@brightbox.co.uk
@@ -142,6 +171,7 @@ files:
 - lib/bbcloud/commands/config-client-remove.rb
 - lib/bbcloud/commands/images-destroy.rb
 - lib/bbcloud/commands/images-list.rb
+- lib/bbcloud/commands/images-register.rb
 - lib/bbcloud/commands/images-show.rb
 - lib/bbcloud/commands/servers-create.rb
 - lib/bbcloud/commands/servers-destroy.rb