bbcloud 0.11.2 → 0.12.0

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

@@ -1,22 +1,24 @@
-desc 'Destroy servers'
-arg_name '[server-id...]'
-command [:destroy] do |c|
-  c.action do |global_options, options, args|
+module Brightbox
+  desc 'Destroy servers'
+  arg_name '[server-id...]'
+  command [:destroy] do |c|
+    c.action do |global_options, options, args|
 
-    raise "You must specify servers to destroy" if args.empty?
+      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 = Server.find_or_call(args) do |id|
+        raise "Couldn't find server #{id}"
+      end
 
-    servers.each do |server|
-      info "Destroying server #{server}"
-      begin
-        server.destroy
-      rescue Brightbox::Api::Conflict => e
-        error "Could not destroy #{server}"
+      servers.each do |server|
+        info "Destroying server #{server}"
+        begin
+          server.destroy
+        rescue Brightbox::Api::Conflict => e
+          error "Could not destroy #{server}"
+        end
       end
-    end
 
+    end
   end
 end

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

@@ -1,19 +1,19 @@
-desc 'List servers'
-arg_name '[server-id...]'
-command [:list] do |c|
-  c.action do |global_options,options,args|
+module Brightbox
+  desc 'List servers'
+  arg_name '[server-id...]'
+  command [:list] do |c|
+    c.action do |global_options,options,args|
 
-    Type.cache_all!
-    Zone.cache_all!
-
-    if args.empty?
-      servers = Server.find(:all)
-    else
-      servers = Server.find_or_call(args) do |id|
-        warn "Couldn't find server #{id}"
+      Type.cache_all!
+      Zone.cache_all!
+      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
-
-    render_table(servers, global_options)
   end
 end

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

@@ -1,48 +1,50 @@
-desc 'Show detailed server info'
-arg_name 'server-id...'
-command [:show] do |c|
+module Brightbox
+  desc 'Show detailed server info'
+  arg_name 'server-id...'
+  command [:show] do |c|
 
-  c.action do |global_options,options,args|
+    c.action do |global_options,options,args|
 
-    raise "You must specify servers to show" if args.empty?
+      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|
-      o = s.to_row
-      if s.server_type.exists?
-        o[:type] = s.server_type.id
-        o[:type_handle] = s.server_type.handle
-        o[:type_name] = s.server_type.name
-        o[:ram] = s.server_type.ram
-        o[:cores] = s.server_type.cores
-        o[:disk] = s.server_type.disk.to_i
+      servers = Server.find_or_call(args) do |id|
+        raise "Couldn't find server #{id}"
       end
 
-      if s.image.exists?
-        o[:image_name] = s.image.name
-        o[:arch] = s.image.arch
+      rows = []
+      servers.each do |s|
+        o = s.to_row
+        if s.server_type.exists?
+          o[:type] = s.server_type.id
+          o[:type_handle] = s.server_type.handle
+          o[:type_name] = s.server_type.name
+          o[:ram] = s.server_type.ram
+          o[:cores] = s.server_type.cores
+          o[:disk] = s.server_type.disk.to_i
+        end
+
+        if s.image.exists?
+          o[:image_name] = s.image.name
+          o[:arch] = s.image.arch
+        end
+        o[:private_ips] = s.interfaces.collect { |i| i['ipv4_address'] }.join(", ")
+        o[:cloud_ip_ids] = s.cloud_ips.collect { |i| i['id'] }.join(", ")
+        o[:cloud_ips] = s.cloud_ips.collect { |i| i['public_ip'] }.join(", ")
+        o[:snapshots] = s.snapshots.collect { |i| i['id'] }.join(", ")
+        rows << o
       end
-      o[:private_ips] = s.interfaces.collect { |i| i['ipv4_address'] }.join(", ")
-      o[:cloud_ip_ids] = s.cloud_ips.collect { |i| i['id'] }.join(", ")
-      o[:cloud_ips] = s.cloud_ips.collect { |i| i['public_ip'] }.join(", ")
-      o[:snapshots] = s.snapshots.collect { |i| i['id'] }.join(", ")
-      rows << o
-    end
 
-    table_opts = global_options.merge({
-      :vertical => true,
-      :fields => [:id, :status, :name, :description, :created_at, :deleted_at, 
-                  :zone, :type, :type_name, :type_handle, :ram, :cores, 
-                  :disk, :image, :image_name, :private_ips, :cloud_ips, 
-                  :cloud_ip_ids, :hostname, :public_hostname, :snapshots
-                 ]
-    })
+      table_opts = global_options.merge({
+                                          :vertical => true,
+                                          :fields => [:id, :status, :name, :description, :created_at, :deleted_at, 
+                                            :zone, :type, :type_name, :type_handle, :ram, :cores, 
+                                            :disk, :image, :image_name, :private_ips, :cloud_ips, 
+                                            :cloud_ip_ids, :hostname, :public_hostname, :snapshots
+                                          ]
+                                        })
 
-    render_table(rows, table_opts)
+      render_table(rows, table_opts)
 
+    end
   end
 end

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

@@ -1,18 +1,20 @@
-desc 'Shutdown the specified servers'
-arg_name 'server-id...'
-command [:shutdown] do |c|
-  c.action do |global_options,options,args|
+module Brightbox
+  desc 'Shutdown the specified servers, aka clicking "shutdown" in the OS'
+  arg_name 'server-id...'
+  command [:shutdown] do |c|
+    c.action do |global_options,options,args|
 
-    raise "You must specify servers to shutdown" if args.empty?
+      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 = 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
-    end
+      servers.each do |s|
+        info "Shutting down server #{s}"
+        s.shutdown
+      end
 
+    end
   end
 end

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

@@ -1,19 +1,21 @@
-desc 'Snapshot the specified servers'
-arg_name 'server-id...'
-command [:snapshot] do |c|
+module Brightbox
+  desc 'Snapshot the specified servers'
+  arg_name 'server-id...'
+  command [:snapshot] do |c|
 
-  c.action do |global_options,options,args|
+    c.action do |global_options,options,args|
 
-    raise "You must specify servers to snapshot" if args.empty?
+      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 = 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
+      servers.each do |s|
+        info "Snapshotting server #{s}"
+        s.snapshot
+      end
 
+    end
   end
 end

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

@@ -1,19 +1,21 @@
-desc 'Start the specified servers'
-arg_name 'server-id...'
-command [:start] do |c|
+module Brightbox
+  desc 'Start the specified servers'
+  arg_name 'server-id...'
+  command [:start] do |c|
 
-  c.action do |global_options,options,args|
-    
-    raise "You must specify servers to start" if args.empty?
+    c.action do |global_options,options,args|
+      
+      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 = Server.find_or_call(args) do |id|
+        raise "Couldn't find server #{id}"
+      end
 
-    servers.each do |s|
-      info "Starting server #{s}"
-      s.start
-    end
+      servers.each do |s|
+        info "Starting server #{s}"
+        s.start
+      end
 
+    end
   end
 end

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

@@ -1,18 +1,20 @@
-desc 'Stop the specified servers'
-arg_name 'server-id...'
-command [:stop] do |c|
+module Brightbox
+  desc 'Stop the specified servers, aka turning the power off'
+  arg_name 'server-id...'
+  command [:stop] do |c|
 
-  c.action do |global_options,options,args|
-    
-    raise "You must specify servers to stop" if args.empty?
+    c.action do |global_options,options,args|
+      
+      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 = Server.find_or_call(args) do |id|
+        raise "Couldn't find server #{id}"
+      end
 
-    servers.each do |s|
-      info "Stopping server #{s}"
-      s.stop
+      servers.each do |s|
+        info "Stopping server #{s}"
+        s.stop
+      end
     end
   end
 end

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

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

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

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

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

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

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

@@ -1,23 +1,25 @@
-desc 'Show detailed user info'
-arg_name 'user-id...'
-command [:show] do |c|
+module Brightbox
+  desc 'Show detailed user info'
+  arg_name 'user-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 users you want to show"
-    end
+      if args.empty?
+        raise "You must specify the users you want to show"
+      end
 
-    users = User.find_or_call(args) do |id|
-      warn "Couldn't find user #{id}"
-    end
+      users = User.find_or_call(args) do |id|
+        warn "Couldn't find user #{id}"
+      end
 
-    table_opts = global_options.merge({
-      :vertical => true,
-      :fields => [:id, :name, :email_address, :accounts, :ssh_key ]
-    })
+      table_opts = global_options.merge({
+                                          :vertical => true,
+                                          :fields => [:id, :name, :email_address, :accounts, :ssh_key ]
+                                        })
 
-    render_table(users, table_opts)
+      render_table(users, table_opts)
 
+    end
   end
 end