brightbox-cli 1.1.0 → 1.2.0

data/lib/brightbox-cli/commands/{firewall-policies-list.rb → firewall/policies-list.rb}

@@ -3,19 +3,12 @@ module Brightbox
 
     cmd.default_command :list
 
-    cmd.desc "List Firewall Policies"
+    cmd.desc I18n.t("firewall.policies.list.desc")
     cmd.arg_name "[firewall-policy-id...]"
     cmd.command [:list] do |c|
 
       c.action do |global_options, options, args|
-
-        if args.empty?
-          firewall_policies = FirewallPolicy.find(:all)
-        else
-          firewall_policies = FirewallPolicy.find_or_call(args) do |id|
-            warn "Couldn't find firewall policy #{id}"
-          end
-        end
+        firewall_policies = FirewallPolicy.find_all_or_warn(args)
         render_table(firewall_policies, global_options)
       end
     end

data/lib/brightbox-cli/commands/{firewall-policies-remove.rb → firewall/policies-remove.rb}

@@ -1,7 +1,7 @@
 module Brightbox
   command [:"firewall-policies"] do |cmd|
 
-    cmd.desc "Disassociate firewall policy from given server group"
+    cmd.desc I18n.t("firewall.policies.remove.desc")
     cmd.arg_name "firewall-policy-id server-group-id"
     cmd.command [:remove] do |c|
 
@@ -21,13 +21,12 @@ module Brightbox
           raise "Could not find firewall policy with #{firewall_policy_id}"
         end
 
-
         server_group = ServerGroup.find(server_group_id)
         unless server_group
           raise "Can't find group with #{options[:g]}"
         end
         firewall_policy.remove(server_group.id)
-        render_table([firewall_policy],global_options)
+        render_table([firewall_policy], global_options)
       end
     end
   end

data/lib/brightbox-cli/commands/{firewall-policies-show.rb → firewall/policies-show.rb}

@@ -1,7 +1,7 @@
 module Brightbox
   command [:"firewall-policies"] do |cmd|
 
-    cmd.desc "Show Firewall Policy"
+    cmd.desc I18n.t("firewall.policies.show.desc")
     cmd.arg_name "firewall-policy-id"
     cmd.command [:show] do |c|
 
@@ -12,8 +12,16 @@ module Brightbox
           raise "Couldn't find Firewall Policy #{id}"
         end
 
-        table_opts = global_options.update(:vertical => true,
-                                           :fields => [:id, :server_group, :default,:name, :description])
+        table_opts = global_options.update(
+          :vertical => true,
+          :fields => [
+            :id,
+            :server_group,
+            :default,
+            :name,
+            :description
+          ]
+        )
 
         render_table(policies, table_opts)
       end

data/lib/brightbox-cli/commands/{firewall-policies-update.rb → firewall/policies-update.rb}

@@ -1,14 +1,14 @@
 module Brightbox
   command [:"firewall-policies"] do |cmd|
 
-    cmd.desc "Update a firewall policy"
+    cmd.desc I18n.t("firewall.policies.update.desc")
     cmd.arg_name "firewall-policy-id"
     cmd.command [:update] do |c|
 
-      c.desc "Name of policy"
+      c.desc I18n.t("options.name.desc")
       c.flag [:n, :name]
 
-      c.desc "Description of policy"
+      c.desc I18n.t("options.description.desc")
       c.flag [:d, :description]
 
       c.action do |global_options, options, args|

data/lib/brightbox-cli/commands/{firewall-rules-create.rb → firewall/rules-create.rb}

@@ -1,8 +1,8 @@
 module Brightbox
-  desc "Manages an account's firewall rules for a policy"
+  desc I18n.t("firewall.rules.desc")
   command [:"firewall-rules"] do |cmd|
 
-    cmd.desc "Create Firewall Rule"
+    cmd.desc I18n.t("firewall.rules.create.desc")
     cmd.arg_name "[firewall-policy-id...]"
     cmd.command [:create] do |c|
 
@@ -24,7 +24,7 @@ module Brightbox
       c.desc "Icmp Type name"
       c.flag [:i, :icmptype]
 
-      c.desc "Description"
+      c.desc I18n.t("options.description.desc")
       c.flag :description
 
       c.action do |global_options, options, args|
@@ -52,7 +52,7 @@ module Brightbox
 
         create_options[:firewall_policy_id] = firewall_policy.id
         firewall_rule = FirewallRule.create(create_options)
-        render_table([firewall_rule],global_options)
+        render_table([firewall_rule], global_options)
       end
     end
   end

data/lib/brightbox-cli/commands/{firewall-rules-destroy.rb → firewall/rules-destroy.rb}

@@ -1,12 +1,11 @@
 module Brightbox
   command [:"firewall-rules"] do |cmd|
 
-    cmd.desc "Destroy Firewall Rule"
+    cmd.desc I18n.t("firewall.rules.destroy.desc")
     cmd.arg_name "[firewall-rule-id...]"
     cmd.command [:destroy] do |c|
 
       c.action do |global_options, options, args|
-
         raise "You must specify firewall-rule-id to destroy" if args.empty?
 
         firewall_rules = FirewallRule.find_or_call(args) do |id|
@@ -17,11 +16,10 @@ module Brightbox
           info "Destroying firewall rule #{firewall_rule}"
           begin
             firewall_rule.destroy
-          rescue Brightbox::Api::Conflict => e
+          rescue Brightbox::Api::Conflict
             error "Could not destroy #{firewall_rule}"
           end
         end
-
       end
     end
   end

data/lib/brightbox-cli/commands/{firewall-rules-list.rb → firewall/rules-list.rb}

@@ -3,7 +3,7 @@ module Brightbox
 
     cmd.default_command :list
 
-    cmd.desc "List Firewall Rules"
+    cmd.desc I18n.t("firewall.rules.list.desc")
     cmd.arg_name "[firewall-policy-id...]"
     cmd.command [:list] do |c|
 
@@ -15,7 +15,7 @@ module Brightbox
         firewall_policy_id = args.shift
         raise "Invalid firewall policy id" unless firewall_policy_id =~ /^fwp-/
 
-          firewall_policy = FirewallPolicy.find_or_call([firewall_policy_id]) do |id|
+        firewall_policy = FirewallPolicy.find_or_call([firewall_policy_id]) do |id|
           raise "Couldn't find firewall policy #{id}"
         end
         render_table(FirewallRules.from_policy(firewall_policy.first), global_options)

data/lib/brightbox-cli/commands/{firewall-rules-show.rb → firewall/rules-show.rb}

@@ -1,7 +1,7 @@
 module Brightbox
   command [:"firewall-rules"] do |cmd|
 
-    cmd.desc "Show Firewall Rule"
+    cmd.desc I18n.t("firewall.rules.show.desc")
     cmd.arg_name "firewall-rule-id"
     cmd.command [:show] do |c|
 
@@ -12,9 +12,15 @@ module Brightbox
           raise "Couldn't find Firewall Rule #{id}"
         end
 
-        display_options = { :fields => [
-          :id, :protocol,:source, :sport, :destination, :dport, :icmp_type, :firewall_policy, :description
-        ],
+        display_options = {
+          :fields => [
+            :id, :protocol,
+            :source, :sport,
+            :destination, :dport,
+            :icmp_type,
+            :firewall_policy,
+            :description
+          ],
           :vertical => true
         }
         table_opts = global_options.update(display_options)

data/lib/brightbox-cli/commands/{firewall-rules-update.rb → firewall/rules-update.rb}

@@ -1,7 +1,7 @@
 module Brightbox
   command [:"firewall-rules"] do |cmd|
 
-    cmd.desc "Update Firewall Rule"
+    cmd.desc I18n.t("firewall.rules.update.desc")
     cmd.arg_name "[firewall-rule-id...]"
     cmd.command [:update] do |c|
 
@@ -23,13 +23,13 @@ module Brightbox
       c.desc "Icmp Type name"
       c.flag [:i, :icmptype]
 
-      c.desc "Description"
+      c.desc I18n.t("options.description.desc")
       c.flag :description
 
       c.action do |global_options, options, args|
         fwr_id = args.shift
         raise "You must specify a valid firewall rule id as the first argument" unless fwr_id =~ /^fwr-/
-          firewall_rule = FirewallRule.find fwr_id
+        firewall_rule = FirewallRule.find fwr_id
         raise "Could not find firewall rule with #{firewall_rule_id}" unless firewall_rule
 
         params = NilableHash.new

data/lib/brightbox-cli/commands/{groups-add-server.rb → groups/add-server.rb}

@@ -1,8 +1,8 @@
 module Brightbox
-  desc "Manages an account's server groups"
+  desc I18n.t("groups.desc")
   command [:groups] do |cmd|
 
-    cmd.desc "Add servers to a server group"
+    cmd.desc I18n.t("groups.add_servers.desc")
     cmd.arg_name "grp-id [srv-id...]"
     cmd.command [:add_servers] do |c|
 

data/lib/brightbox-cli/commands/{groups-create.rb → groups/create.rb}

@@ -1,12 +1,12 @@
 module Brightbox
   command [:groups] do |cmd|
 
-    cmd.desc "Create a server group"
+    cmd.desc I18n.t("groups.create.desc")
     cmd.command [:create] do |c|
-      c.desc "Name of Server Group"
+      c.desc I18n.t("options.name.desc")
       c.flag [:n, :name]
 
-      c.desc "Server group description"
+      c.desc I18n.t("options.description.desc")
       c.flag [:d, :description]
 
       c.action do |global_options, options, args|

data/lib/brightbox-cli/commands/{groups-destroy.rb → groups/destroy.rb}

@@ -1,9 +1,9 @@
 module Brightbox
   command [:groups] do |cmd|
 
-    cmd.desc "Destroy server groups"
+    cmd.desc I18n.t("groups.destroy.desc")
     cmd.arg_name "grp-id..."
-    # todo: add option to remove all servers from group before destroying
+    # TODO: add option to remove all servers from group before destroying
     cmd.command [:destroy] do |c|
 
       c.action do |global_options, options, args|

data/lib/brightbox-cli/commands/groups/list.rb

@@ -0,0 +1,14 @@
+module Brightbox
+  command [:groups] do |cmd|
+
+    cmd.default_command :list
+
+    cmd.desc I18n.t("groups.list.desc")
+    cmd.command [:list] do |c|
+      c.action do |global_options, options, args|
+        server_groups = ServerGroup.find_all_or_warn(args)
+        render_table(server_groups, global_options)
+      end
+    end
+  end
+end

data/lib/brightbox-cli/commands/{groups-move_servers.rb → groups/move_servers.rb}

@@ -1,7 +1,7 @@
 module Brightbox
   command [:groups] do |cmd|
 
-    cmd.desc "Move servers from one server group to another"
+    cmd.desc I18n.t("groups.move_servers.desc")
     cmd.arg_name "srv-id ..."
     cmd.command [:move_servers] do |c|
       c.desc "Source Server Group"
@@ -10,7 +10,6 @@ module Brightbox
       c.desc "Target Server Group"
       c.flag [:t, :to]
 
-
       c.action do |global_options, options, args|
         unless args && !args.empty?
           raise "You must specify server ids to move"

data/lib/brightbox-cli/commands/{groups-remove-servers.rb → groups/remove-servers.rb}

@@ -1,7 +1,7 @@
 module Brightbox
   command [:groups] do |cmd|
 
-    cmd.desc "Remove servers from a server group"
+    cmd.desc I18n.t("groups.remove_servers.desc")
     cmd.arg_name "grp-id [srv-id...]"
     cmd.command [:remove_servers] do |c|
 

data/lib/brightbox-cli/commands/{groups-show.rb → groups/show.rb}

@@ -1,7 +1,7 @@
 module Brightbox
   command [:groups] do |cmd|
 
-    cmd.desc "Show detailed server group info"
+    cmd.desc I18n.t("groups.show.desc")
     cmd.arg_name "[grp-id..]"
     cmd.command [:show] do |c|
 

data/lib/brightbox-cli/commands/{groups-update.rb → groups/update.rb}

@@ -1,25 +1,20 @@
 module Brightbox
   command [:groups] do |cmd|
 
-    cmd.desc "Update a server group"
+    cmd.desc I18n.t("groups.update.desc")
     cmd.arg_name "grp-id"
     cmd.command [:update] do |c|
-
-      c.desc "Friendly name of server group"
+      c.desc I18n.t("options.name.desc")
       c.flag [:n, :name]
 
-      c.desc "Server group description"
+      c.desc I18n.t("options.description.desc")
       c.flag [:d, :description]
 
       c.action do |global_options, options, args|
         grp_id = args.shift
         raise "You must specify the server group to update as the first argument" unless grp_id =~ /^grp-/
 
-          params = NilableHash.new
-
-        # unless args.empty?
-        #   params[:servers] = args.collect { |a| { :server => a } }
-        # end
+        params = NilableHash.new
 
         if options[:n]
           params[:name] = options[:n]
@@ -35,7 +30,7 @@ module Brightbox
         info "Updating server group #{sg}"
         sg = sg.update(params)
         render_table([sg], global_options)
+      end
     end
   end
 end
-end

data/lib/brightbox-cli/commands/{images-destroy.rb → images/destroy.rb}

@@ -1,8 +1,8 @@
 module Brightbox
-  desc "List official and public images and also manages an account's"
+  desc I18n.t("images.desc")
   command [:images] do |cmd|
 
-    cmd.desc "Destroy images"
+    cmd.desc I18n.t("images.destroy.desc")
     cmd.arg_name "image-id..."
     cmd.command [:destroy] do |c|
 

data/lib/brightbox-cli/commands/{images-list.rb → images/list.rb}

@@ -3,7 +3,7 @@ module Brightbox
 
     cmd.default_command :list
 
-    cmd.desc "List available images"
+    cmd.desc I18n.t("images.list.desc")
     cmd.arg_name "[image-id...]"
     cmd.command [:list] do |c|
 
@@ -20,15 +20,7 @@ module Brightbox
       c.flag [:l, :account]
 
       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}"
-          end
-        end
-
+        images = Image.find_all_or_warn(args)
         images = Image.filter_images(images, options)
         render_table(images, global_options)
       end

data/lib/brightbox-cli/commands/{images-register.rb → images/register.rb}

@@ -1,11 +1,14 @@
 module Brightbox
   command [:images] do |cmd|
 
-    cmd.desc "Register an image"
+    cmd.desc I18n.t("images.register.desc")
     cmd.command [:register] do |c|
 
-      c.desc "Name to give the image"
-      c.flag [:n, "name"]
+      c.desc I18n.t("options.name.desc")
+      c.flag [:n, :name]
+
+      c.desc I18n.t("options.description.desc")
+      c.flag [:d, :description]
 
       c.desc "Image Username"
       c.flag [:u, "username"]
@@ -24,9 +27,6 @@ module Brightbox
       c.default_value "false"
       c.flag [:p, "public"]
 
-      c.desc "Image description"
-      c.flag [:d, "description"]
-
       c.action do |global_options, options, args|
 
         raise "You must specify the architecture" unless options[:a]

data/lib/brightbox-cli/commands/{images-show.rb → images/show.rb}

@@ -1,20 +1,12 @@
 module Brightbox
   command [:images] do |cmd|
 
-    cmd.desc "Show detailed image info"
+    cmd.desc I18n.t("images.show.desc")
     cmd.arg_name "image-id..."
     cmd.command [:show] do |c|
 
       c.action do |global_options, options, args|
-
-        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_all_or_warn(args)
 
         display_options = {
           :vertical => true,
@@ -28,7 +20,6 @@ module Brightbox
         table_opts = global_options.merge(display_options)
 
         render_table(images, table_opts)
-
       end
     end
   end