bbcloud 0.11.2 → 0.12.0

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

@@ -1,24 +1,28 @@
-desc 'Show detailed account info'
-arg_name 'account-id...'
-command [:show] do |c|
+module Brightbox
+  desc 'Show detailed account info'
+  arg_name 'account-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 accounts to show"
-    end
+      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
+      accounts = Account.find_or_call(args) do |id|
+        warn "Couldn't find account #{id}"
+      end
 
-    table_opts = global_options.merge({
-      :vertical => true,
-      :fields => [:id, :name, :cloud_ip_limit, :ram_limit, :ram_used, 
-                  :ram_free, :library_ftp_host, :library_ftp_user ]
-    })
+      table_opts = global_options.merge({
+        :vertical => true,
+        :fields => [:id, :name, :cloud_ip_limit, :ram_limit, :ram_used,
+                    :ram_free, :library_ftp_host, :library_ftp_user ]
+      })
 
-    render_table(accounts, table_opts)
+      render_table(accounts, table_opts)
 
+    end
   end
 end
+
+

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

@@ -1,21 +1,23 @@
-desc 'Create a new cloud ip'
-command [:create] do |c|
-  c.desc "Number of cloud ips to create"
-  c.default_value 1
-  c.flag [:i, "count"]
+module Brightbox
+  desc 'Create a new cloud ip'
+  command [:create] do |c|
+    c.desc "Number of cloud ips to create"
+    c.default_value 1
+    c.flag [:i, "count"]
 
-  c.action do |global_options, options, args|
+    c.action do |global_options, options, args|
 
-    if options[:i].to_s !~ /^[0-9]+$/
-      raise "count must be a number"
-    end
+      if options[:i].to_s !~ /^[0-9]+$/
+        raise "count must be a number"
+      end
 
-    options[:i] = options[:i].to_i
+      options[:i] = options[:i].to_i
 
-    ips = []
-    options[:i].times do
-      ips << CloudIP.create
+      ips = []
+      options[:i].times do
+        ips << CloudIP.create
+      end
+      render_table(ips, global_options)
     end
-    render_table(ips, global_options)
   end
 end

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

@@ -1,37 +1,40 @@
-desc 'destroy Cloud IPs'
-arg_name '[cloudip-id...]'
-command [:destroy] do |c|
-  c.desc "Unmap mapped ips before destroying them"
-  c.switch [:u, "unmap"]
+module Brightbox
+  desc 'destroy Cloud IPs'
+  arg_name '[cloudip-id...]'
+  command [:destroy] do |c|
+    c.desc "Unmap mapped ips before destroying them"
+    c.switch [:u, "unmap"]
 
-  c.action do |global_options,options,args|
+    c.action do |global_options,options,args|
 
-    if args.empty?
-      raise "You must specify the cloud ips you want to destroy"
-    end
+      if args.empty?
+        raise "You must specify the cloud ips you want to destroy"
+      end
 
-    ips = CloudIP.find_or_call(args) do |id|
-      raise "Couldn't find cloud ip #{id}"
-    end
+      ips = CloudIP.find_or_call(args) do |id|
+        raise "Couldn't find cloud ip #{id}"
+      end
 
-    ips.each do |ip|
+      ips.each do |ip|
 
-      if ip.mapped?
-        if options[:u]
-          info "Unmapping cloud ip #{ip}"
-          ip.unmap
-          3.times do
-            break unless ip.mapped?
-            sleep 1
-            ip.reload
+        if ip.mapped?
+          if options[:u]
+            info "Unmapping cloud ip #{ip}"
+            ip.unmap
+            3.times do
+              break unless ip.mapped?
+              sleep 1
+              ip.reload
+            end
+          else
+            raise "Cannot destroy mapped cloud ip #{ip}"
           end
-        else
-          raise "Cannot destroy mapped cloud ip #{ip}"
         end
+        info "Destroying cloud ip #{ip}"
+        ip.destroy
       end
-      info "Destroying cloud ip #{ip}"
-      ip.destroy
-    end
 
+    end
   end
+  
 end

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

@@ -1,17 +1,19 @@
-desc 'List CloudIPs'
-arg_name '[cloudip-id...]'
-command [:list] do |c|
+module Brightbox
+  desc 'List CloudIPs'
+  arg_name '[cloudip-id...]'
+  command [:list] do |c|
 
-  c.action do |global_options,options,args|
+    c.action do |global_options,options,args|
 
-    if args.empty?
-      ips = CloudIP.find(:all)
-    else
-      ips = CloudIP.find_or_call(args) do |id|
-        warn "Couldn't find cloud ip #{id}"
+      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
-    end
 
-    render_table(ips.sort, global_options)
+      render_table(ips.sort, global_options)
+    end
   end
 end

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

@@ -1,58 +1,60 @@
-desc 'map Cloud IPs'
-arg_name 'cloudip-id destination'
-command [:map] do |c|
-  c.desc "Unmap mapped ips before remapping them"
-  c.switch [:u, "unmap"]
+module Brightbox
+  desc 'map Cloud IPs'
+  arg_name 'cloudip-id destination'
+  command [:map] do |c|
+    c.desc "Unmap mapped ips before remapping them"
+    c.switch [:u, "unmap"]
 
-  c.action do |global_options,options,args|
+    c.action do |global_options,options,args|
 
-    if args.size > 2
-      raise "Too many arguments"
-    end
+      if args.size > 2
+        raise "Too many arguments"
+      end
 
-    if args.size < 2
-      raise "You must specify the cloud ip id and the destination"
-    end
+      if args.size < 2
+        raise "You must specify the cloud ip id and the destination"
+      end
 
-    ip_id = args.first
-
-    ip = CloudIP.find ip_id
-
-    destination_id = args.last
-    case destination_id
-    when /^srv\-/
-      server = Server.find destination_id
-      destination_id = server.interfaces.first["id"]
-      info "Mapping #{ip} to interface #{destination_id} on #{server}"
-    when /^lba\-/
-      lb = LoadBalancer.find destination_id
-      info "Mapping #{ip} to load balancer #{lb}"
-    else
-      raise "Unknown destination '#{destination_id}'" 
-    end
+      ip_id = args.first
 
-    if ip.mapped?
-      if options[:u]
-        ip.unmap
-        3.times do
-          break unless ip.mapped?
-          sleep 1
-          ip.reload
-        end
+      ip = CloudIP.find ip_id
+
+      destination_id = args.last
+      case destination_id
+      when /^srv\-/
+        server = Server.find destination_id
+        destination_id = server.interfaces.first["id"]
+        info "Mapping #{ip} to interface #{destination_id} on #{server}"
+      when /^lba\-/
+        lb = LoadBalancer.find destination_id
+        info "Mapping #{ip} to load balancer #{lb}"
       else
-        raise "Refusing to map already mapped ip #{ip}"
+        raise "Unknown destination '#{destination_id}'" 
       end
-    end
 
-    ip.map destination_id
+      if ip.mapped?
+        if options[:u]
+          ip.unmap
+          3.times do
+            break unless ip.mapped?
+            sleep 1
+            ip.reload
+          end
+        else
+          raise "Refusing to map already mapped ip #{ip}"
+        end
+      end
 
-    # Wait up to 3 seconds for mapping to complete
-    3.times do
-      ip.reload
-      break if ip.mapped?
-      sleep 1
-    end
+      ip.map destination_id
 
-    render_table([ip], global_options)
+      # Wait up to 3 seconds for mapping to complete
+      3.times do
+        ip.reload
+        break if ip.mapped?
+        sleep 1
+      end
+
+      render_table([ip], global_options)
+    end
   end
 end

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

@@ -1,19 +1,22 @@
-desc 'show details on Cloud IPs'
-arg_name 'cloudip-id...'
-command [:show] do |c|
+module Brightbox
+  desc 'show details on Cloud IPs'
+  arg_name 'cloudip-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 cloud ips you want to show"
-    end
+      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
+      ips = CloudIP.find_or_call(args) do |id|
+        warn "Couldn't find cloud ip #{id}"
+      end
 
-    fields = [:id, :status, :public_ip, :reverse_dns, :destination, :interface_id]
+      fields = [:id, :status, :public_ip, :reverse_dns, :destination, :interface_id]
 
-    render_table(ips.compact, global_options.merge({ :vertical => true, :fields => fields}))                                              
+      render_table(ips.compact, global_options.merge({ :vertical => true, :fields => fields}))                                              
+    end
   end
+  
 end

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

@@ -1,34 +1,37 @@
-desc 'unmap Cloud IPs'
-arg_name 'cloudip-id...'
-command [:unmap] do |c|
+module Brightbox
+  desc 'unmap Cloud IPs'
+  arg_name 'cloudip-id...'
+  command [:unmap] do |c|
 
-  c.action do |global_options,options,args|
+    c.action do |global_options,options,args|
 
-    if args.empty?
-      raise "You must specify the cloud ips you want to unmap"
-    end
+      if args.empty?
+        raise "You must specify the cloud ips you want to unmap"
+      end
 
-    ips = CloudIP.find_or_call(args) do |id|
-      raise "Couldn't find cloud ip #{id}"
-    end
+      ips = CloudIP.find_or_call(args) do |id|
+        raise "Couldn't find cloud ip #{id}"
+      end
 
-    ips.each do |ip|
-      if ip.mapped?
-        info "Unmapping cloud ip #{ip}"
-        ip.unmap
-        ip.reload
-      else
-        warn "Cloud ip #{ip} already unmapped"
+      ips.each do |ip|
+        if ip.mapped?
+          info "Unmapping cloud ip #{ip}"
+          ip.unmap
+          ip.reload
+        else
+          warn "Cloud ip #{ip} already unmapped"
+        end
       end
-    end
 
-    # Wait up to 3 seconds for unmapping to complete
-    3.times do
-      break unless ips.find { |ip| ip.mapped? }
-      sleep 1
-      ips.each { |ip| ip.reload if ip.mapped? }
-    end
+      # Wait up to 3 seconds for unmapping to complete
+      3.times do
+        break unless ips.find { |ip| ip.mapped? }
+        sleep 1
+        ips.each { |ip| ip.reload if ip.mapped? }
+      end
 
-    render_table(ips, global_options)
+      render_table(ips, global_options)
+    end
   end
+  
 end

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

@@ -1,45 +1,47 @@
-desc 'Add new api client details to config'
-arg_name 'client-id secret [api_url, auth_url]'
-command [:client_add] do |c|
+module Brightbox
+  desc 'Add new api client details to config'
+  arg_name 'client-id secret [api_url, auth_url]'
+  command [:client_add] do |c|
 
-  c.desc "api client alias, for local reference (defaults to client-id)"
-  c.flag [:a, "alias"]
+    c.desc "api client alias, for local reference (defaults to client-id)"
+    c.flag [:a, "alias"]
 
-  c.desc "auth url"
-  c.flag [:t, "auth-url"]
+    c.desc "auth url"
+    c.flag [:t, "auth-url"]
 
-  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}"
 
-    client_id = args.shift
-    secret = args.shift
-    api_url = args.shift || "https://api.gb1.brightbox.com"
-    auth_url = args.shift || api_url
-    calias = options[:a] || client_id
+      client_id = args.shift
+      secret = args.shift
+      api_url = args.shift || "https://api.gb1.brightbox.com"
+      auth_url = args.shift || api_url
+      calias = options[:a] || client_id
 
-    if client_id.nil?
-      raise "You must specify the api client-id"
-    end
+      if client_id.nil?
+        raise "You must specify the api client-id"
+      end
 
-    if secret.nil?
-      raise "You must specify the api secret"
-    end
+      if secret.nil?
+        raise "You must specify the api secret"
+      end
 
-    client_config = CONFIG[calias]
-    unless client_config.empty?
-      raise "An api client with the id or alias #{calias} already exists"
-    end
+      client_config = CONFIG[calias]
+      unless client_config.empty?
+        raise "An api client with the id or alias #{calias} already exists"
+      end
 
-    info "Creating new api client config #{calias}"
+      info "Creating new api client config #{calias}"
 
-    client_config['alias'] = calias    
-    client_config['client_id'] = client_id
-    client_config['secret'] = secret
-    client_config['api_url'] = api_url
-    client_config['auth_url'] = auth_url
+      client_config['alias'] = calias    
+      client_config['client_id'] = client_id
+      client_config['secret'] = secret
+      client_config['api_url'] = api_url
+      client_config['auth_url'] = auth_url
 
-    CONFIG.save!
+      CONFIG.save!
 
+    end
   end
 end