bbcloud 0.11.2 → 0.12.0

data/lib/bbcloud/commands/config-client-default.rb

@@ -1,24 +1,26 @@
-desc 'Set the default api client in the config'
-arg_name 'alias'
-command [:client_default] do |c|
+module Brightbox
+  desc 'Set the default api client in the config'
+  arg_name 'alias'
+  command [:client_default] do |c|
 
-  c.action do |global_options, options, args|
+    c.action do |global_options, options, args|
 
-    info "Using config file #{CONFIG.config_filename}"
-    calias = args.shift
+      info "Using config file #{CONFIG.config_filename}"
+      calias = args.shift
 
-    if calias.nil?
-      raise "You must specify the api alias you want to set as the default"
-    end
+      if calias.nil?
+        raise "You must specify the api alias you want to set as the default"
+      end
 
-    client_config = CONFIG[calias]
-    if client_config.empty?
-      raise "An api client with the alias #{calias} does not exist in the config"
-    end
+      client_config = CONFIG[calias]
+      if client_config.empty?
+        raise "An api client with the alias #{calias} does not exist in the config"
+      end
 
-    info "Setting #{calias} as default api client"
-    CONFIG['core']['default_client'] = calias
-    CONFIG.save!
+      info "Setting #{calias} as default api client"
+      CONFIG['core']['default_client'] = calias
+      CONFIG.save!
 
+    end
   end
 end

data/lib/bbcloud/commands/config-client-list.rb

@@ -1,22 +1,25 @@
-desc 'Lists the api clients defined in the config'
-command [:client_list] do |c|
+module Brightbox
+  desc 'Lists the api clients defined in the config'
+  command [:client_list] do |c|
 
-  c.action do |global_options, options, args|
+    c.action do |global_options, options, args|
 
-    info "Using config file #{CONFIG.config_filename}"
+      info "Using config file #{CONFIG.config_filename}"
 
-    clients = CONFIG.clients.collect do |calias|
-      c = CONFIG[calias]
-      calias = calias + "*" if CONFIG.client_name == calias and CONFIG.clients.size > 1
-      { 
-        :alias => calias,
-        :client_id => c["client_id"],
-        :secret => c["secret"],
-        :api_url => c["api_url"],
-        :auth_url => c["auth_url"] || c["api_url"]
-      }
-    end
+      clients = CONFIG.clients.collect do |calias|
+        c = CONFIG[calias]
+        calias = calias + "*" if CONFIG.client_name == calias and CONFIG.clients.size > 1
+        { 
+          :alias => calias,
+          :client_id => c["client_id"],
+          :secret => c["secret"],
+          :api_url => c["api_url"],
+          :auth_url => c["auth_url"] || c["api_url"]
+        }
+      end
 
-    render_table clients, :fields => [:alias, :client_id, :secret, :api_url, :auth_url]
+      render_table clients, :fields => [:alias, :client_id, :secret, :api_url, :auth_url]
+    end
   end
+  
 end

data/lib/bbcloud/commands/config-client-remove.rb

@@ -1,25 +1,27 @@
-desc 'Remove api client details from config'
-arg_name 'alias'
-command [:client_remove] do |c|
+module Brightbox
+  desc 'Remove api client details from config'
+  arg_name 'alias'
+  command [:client_remove] do |c|
 
-  c.action do |global_options, options, args|
+    c.action do |global_options, options, args|
 
-    info "Using config file #{CONFIG.config_filename}"
+      info "Using config file #{CONFIG.config_filename}"
 
-    calias = args.shift
+      calias = args.shift
 
-    if calias.nil?
-      raise "You must specify the api alias you want to remove"
-    end
+      if calias.nil?
+        raise "You must specify the api alias you want to remove"
+      end
 
-    client_config = CONFIG[calias]
-    if client_config.empty?
-      raise "An api client with alias #{calias} does not exist in the config"
-    end
+      client_config = CONFIG[calias]
+      if client_config.empty?
+        raise "An api client with alias #{calias} does not exist in the config"
+      end
 
-    info "Removing api client #{calias}"
-    CONFIG.delete_section calias
-    CONFIG.save!
+      info "Removing api client #{calias}"
+      CONFIG.delete_section calias
+      CONFIG.save!
 
+    end
   end
 end

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

@@ -1,24 +1,26 @@
-desc 'Destroy images'
-arg_name 'image-id...'
-command [:destroy] do |c|
+module Brightbox
+  desc 'Destroy images'
+  arg_name 'image-id...'
+  command [:destroy] do |c|
 
-  c.action do |global_options,options,args|
+    c.action do |global_options,options,args|
 
-    if args.empty?
-      raise "You must specify the images you want to destroy"
-    end
+      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 = Image.find_or_call(args) do |id|
+        raise "Couldn't find image #{id}"
+      end
 
-    images.each do |i|
-      info "Destroying image #{i}"
-      i.destroy
-      i.reload
-    end
+      images.each do |i|
+        info "Destroying image #{i}"
+        i.destroy
+        i.reload
+      end
 
-    render_table(images)
+      render_table(images)
 
+    end
   end
 end

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

@@ -1,26 +1,28 @@
-desc 'List available images'
-arg_name '[image-id...]'
-command [:list] do |c|
-  c.action do |global_options, options, args|
+module Brightbox
+  desc 'List available images'
+  arg_name '[image-id...]'
+  command [:list] do |c|
+    c.action do |global_options, options, args|
 
-    if args.empty?
-      images = Image.find(:all)
-    else
-      images = Image.find_or_call(args) do |id|
-        warn "Couldn't find image #{id}"
+      if args.empty?
+        images = Image.find(:all)
+      else
+        images = Image.find_or_call(args) do |id|
+          warn "Couldn't find image #{id}"
+        end
       end
-    end
 
-    snapshots = images.select { |i| i.source_type == 'snapshot' }
+      snapshots = images.select { |i| i.source_type == 'snapshot' }
 
-    images = images - snapshots
+      images = images - snapshots
 
-    images.sort! do |a,b|
-      [a.official ? 0 : 1, a.name, a.arch] <=> [b.official ? 0 : 1, b.name, b.arch]
-    end
+      images.sort! do |a,b|
+        [a.official ? 0 : 1, a.name, a.arch] <=> [b.official ? 0 : 1, b.name, b.arch]
+      end
 
-    snapshots.sort! { |a, b| a.created_at <=> b.created_at }
-    
-    render_table(images + snapshots, global_options)
+      snapshots.sort! { |a, b| a.created_at <=> b.created_at }
+      
+      render_table(images + snapshots, global_options)
+    end
   end
 end

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

@@ -1,31 +1,33 @@
-desc 'Register an image'
-command [:register] do |c|
+module Brightbox
+  desc 'Register an image'
+  command [:register] do |c|
 
-  c.desc "Name to give the image"
-  c.flag [:n, "name"]
+    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 "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.desc "Source filename of the image you uploaded to the image library"
+    c.flag [:s, "source"]
 
-  c.desc "This image does not support virtio so needs 'compatibility mode'"
-  c.switch [:c, "compatibility"]
+    c.desc "This image does not support virtio so needs 'compatibility mode'"
+    c.switch [:c, "compatibility"]
 
-  c.desc "Image description"
-  c.flag [:d, "description"]
+    c.desc "Image description"
+    c.flag [:d, "description"]
 
-  c.action do |global_options,options,args|
+    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]
+      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], :compatibility_mode => options[:c],
-    :description => options[:d]
+      image = Image.register :name => options[:n], :arch => options[:a], 
+      :source => options[:s], :compatibility_mode => options[:c],
+      :description => options[:d]
 
-    render_table([image])
+      render_table([image])
 
+    end
   end
 end

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

@@ -1,23 +1,25 @@
-desc 'Show detailed image info'
-arg_name 'image-id...'
-command [:show] do |c|
+module Brightbox
+  desc 'Show detailed image info'
+  arg_name 'image-id...'
+  command [:show] do |c|
 
-  c.action do |global_options,options,args|
+    c.action do |global_options,options,args|
 
-    if args.empty?
-      raise "You must specify the images you want to show"
-    end
+      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
+      images = Image.find_or_call(args) do |id|
+        warn "Couldn't find image #{id}"
+      end
 
-    table_opts = global_options.merge({
-      :vertical => true,
-      :fields => [:id, :type, :owner, :created_at, :status, :arch, :name, :description, :virtual_size, :disk_size, "compatibility_mode", :official, :ancestor_id ]
-    })
+      table_opts = global_options.merge({
+                                          :vertical => true,
+                                          :fields => [:id, :type, :owner, :created_at, :status, :arch, :name, :description, :virtual_size, :disk_size, "compatibility_mode", :official, :ancestor_id ]
+                                        })
 
-    render_table(images, table_opts)
+      render_table(images, table_opts)
 
+    end
   end
 end

data/lib/bbcloud/commands/lbs-add-nodes.rb

@@ -1,20 +1,22 @@
-desc 'Add nodes to a load balancer'
-arg_name 'lb-id node-id...'
-command [:add_nodes] do |c|
+module Brightbox
+  desc 'Add nodes to a load balancer'
+  arg_name 'lb-id node-id...'
+  command [:add_nodes] do |c|
 
-  c.action do |global_options, options, args|
+    c.action do |global_options, options, args|
 
-    raise "You must specify the load balancer and the node ids to add" if args.size < 2
+      raise "You must specify the load balancer and the node ids to add" if args.size < 2
 
-    lb = LoadBalancer.find(args.shift)
+      lb = LoadBalancer.find(args.shift)
 
-    nodes = Server.find_or_call(args) do |id|
-      raise "Couldn't find server #{id}"
-    end
+      nodes = Server.find_or_call(args) do |id|
+        raise "Couldn't find server #{id}"
+      end
 
-    info "Adding #{nodes.size} nodes to load balancer #{lb.id}"
-    lb.add_nodes nodes
-    lb.reload
-    render_table([lb], global_options)
+      info "Adding #{nodes.size} nodes to load balancer #{lb.id}"
+      lb.add_nodes nodes
+      lb.reload
+      render_table([lb], global_options)
+    end
   end
 end

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

@@ -1,87 +1,89 @@
-desc 'Create a load balancer'
-long_desc "All intervals and timeouts are in milliseconds"
-arg_name 'srv-id...'
-command [:create] do |c|
+module Brightbox
+  desc 'Create a load balancer'
+  long_desc "All intervals and timeouts are in milliseconds"
+  arg_name 'srv-id...'
+  command [:create] do |c|
 
-  c.desc "Friendly name of load balancer"
-  c.flag [:n, :name]
+    c.desc "Friendly name of load balancer"
+    c.flag [:n, :name]
 
-  c.desc "Load balancer policy"
-  c.default_value "least-connections"
-  c.flag [:p, :policy]
+    c.desc "Load balancer policy"
+    c.default_value "least-connections"
+    c.flag [:p, :policy]
 
-  c.desc "Listeners. Format: in-port:out-port:type. Comma separate multiple listeners."
-  c.default_value "80:80:http,443:443:tcp"
-  c.flag [:l, :listeners]
+    c.desc "Listeners. Format: in-port:out-port:type. Comma separate multiple listeners."
+    c.default_value "80:80:http,443:443:tcp"
+    c.flag [:l, :listeners]
 
-  c.desc "Healthcheck port. Defaults to first listener out port."
-  c.flag [:k, "hc-port"]
+    c.desc "Healthcheck port. Defaults to first listener out port."
+    c.flag [:k, "hc-port"]
 
-  c.desc "Healthcheck type. Defaults to first listener protocol."
-  c.flag [:y, "hc-type"]
+    c.desc "Healthcheck type. Defaults to first listener protocol."
+    c.flag [:y, "hc-type"]
 
-  c.desc "Healthcheck timeout"
-  c.default_value "5000"
-  c.flag [:t, "hc-timeout"]
+    c.desc "Healthcheck timeout"
+    c.default_value "5000"
+    c.flag [:t, "hc-timeout"]
 
-  c.desc "Healthcheck request. When the type is 'http' this is the url to request."
-  c.default_value "/"
-  c.flag [:s, "hc-request"]
+    c.desc "Healthcheck request. When the type is 'http' this is the url to request."
+    c.default_value "/"
+    c.flag [:s, "hc-request"]
 
-  c.desc "Healthcheck interval"
-  c.default_value "5000"
-  c.flag [:e, "hc-interval"]
+    c.desc "Healthcheck interval"
+    c.default_value "5000"
+    c.flag [:e, "hc-interval"]
 
-  c.desc "Healthcheck threshold up. Number of successful healthchecks for the node to be considered up."
-  c.default_value "3"
-  c.flag [:u, "hc-up"]
+    c.desc "Healthcheck threshold up. Number of successful healthchecks for the node to be considered up."
+    c.default_value "3"
+    c.flag [:u, "hc-up"]
 
-  c.desc "Healthcheck threshold down. Number of failed healthchecks for the node to be considered down."
-  c.default_value "3"
-  c.flag [:d, "hc-down"]
+    c.desc "Healthcheck threshold down. Number of failed healthchecks for the node to be considered down."
+    c.default_value "3"
+    c.flag [:d, "hc-down"]
 
-  c.action do |global_options, options, args|
+    c.action do |global_options, options, args|
 
-    raise "You must specify which servers to balance connections to" if args.empty?
+      raise "You must specify which servers to balance connections to" if args.empty?
 
-    listeners = options[:l].split(",").collect do |l|
-      inport, outport, protocol = l.split ":"
-      raise "listener '#{l}' is invalid" if inport.nil? or outport.nil? or protocol.nil?
-      { :in => inport, :out => outport, :protocol => protocol }
-    end
+      listeners = options[:l].split(",").collect do |l|
+        inport, outport, protocol = l.split ":"
+        raise "listener '#{l}' is invalid" if inport.nil? or outport.nil? or protocol.nil?
+        { :in => inport, :out => outport, :protocol => protocol }
+      end
 
-    raise "You must specify at least one listener" if listeners.empty?
+      raise "You must specify at least one listener" if listeners.empty?
 
-    # Setup default healthcheck port if not specified
-    if options[:k].nil?
-      options[:k] = listeners.first[:out]
-    end
+      # Setup default healthcheck port if not specified
+      if options[:k].nil?
+        options[:k] = listeners.first[:out]
+      end
 
-    if options[:y].nil?
-      options[:y] = listeners.first[:protocol]
-    end
+      if options[:y].nil?
+        options[:y] = listeners.first[:protocol]
+      end
 
-    hc_arg_lookup = { :k => :port, :y => :type, :t => :timeout, :s =>
-      :request, :e => :interval, :u => :threshold_up, :d =>
-      :threshold_down }
+      hc_arg_lookup = { :k => :port, :y => :type, :t => :timeout, :s =>
+        :request, :e => :interval, :u => :threshold_up, :d =>
+        :threshold_down }
 
-    healthcheck = {}
+      healthcheck = {}
 
-    options.keys.each do |k|
-      if options[k] and hc_arg_lookup[k]
-        healthcheck[hc_arg_lookup[k]] = options[k]
+      options.keys.each do |k|
+        if options[k] and hc_arg_lookup[k]
+          healthcheck[hc_arg_lookup[k]] = options[k]
+        end
       end
-    end
 
-    nodes = args.collect { |i| { :node => i } }
+      nodes = args.collect { |i| { :node => i } }
 
-    msg = "Creating a new load balancer"
-    info msg
-    lb = LoadBalancer.create(:policy => options[:policy],
-                             :name => options[:n],
-                             :healthcheck => healthcheck,
-                             :listeners => listeners,
-                             :nodes => nodes)
-    render_table([lb], global_options)
+      msg = "Creating a new load balancer"
+      info msg
+      lb = LoadBalancer.create(:policy => options[:policy],
+                        :name => options[:n],
+                        :healthcheck => healthcheck,
+                        :listeners => listeners,
+                        :nodes => nodes)
+      render_table([lb], global_options)
+    end
   end
 end