brightbox-cli 1.1.0 → 1.2.0

data/lib/brightbox-cli/commands/{accounts-accept-invite.rb → accounts/accept-invite.rb}

@@ -1,9 +1,8 @@
 module Brightbox
-
-  desc "Manages the accounts"
+  desc I18n.t("accounts.desc")
   command [:accounts] do |cmd|
 
-    cmd.desc "Accept invitation to collaborate with account"
+    cmd.desc I18n.t("accounts.accept_invite.desc")
     cmd.arg_name "account_id"
     cmd.command [:accept_invite] do |c|
       c.action do |global_options, options, args|

data/lib/brightbox-cli/commands/{accounts-default.rb → accounts/default.rb}

@@ -1,13 +1,11 @@
 module Brightbox
-  
   command [:accounts] do |cmd|
 
-    cmd.desc "Set a default account"
+    cmd.desc I18n.t("accounts.default.desc")
     cmd.arg_name "account-id"
     cmd.command [:default] do |c|
 
       c.action do |global_options, options, args|
-
         if args.empty?
           raise "You must specify the account-id to set as default."
         end

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

@@ -3,7 +3,7 @@ module Brightbox
 
     cmd.default_command :list
 
-    cmd.desc "List accounts"
+    cmd.desc I18n.t("accounts.list.desc")
     cmd.arg_name "[account-id...]"
     cmd.command [:list] do |c|
 

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

@@ -1,8 +1,7 @@
 module Brightbox
-
   command [:accounts] do |cmd|
 
-    cmd.desc "Refuses or removes an account collaboration"
+    cmd.desc I18n.t("accounts.remove.desc")
     cmd.arg_name "account_id"
     cmd.command [:remove] do |c|
       c.action do |global_options, options, args|

data/lib/brightbox-cli/commands/{accounts-reset-ftp-password.rb → accounts/reset-ftp-password.rb}

@@ -1,7 +1,7 @@
 module Brightbox
   command [:accounts] do |cmd|
 
-    cmd.desc "Reset FTP Library password"
+    cmd.desc I18n.t("accounts.reset_ftp_password.desc")
     cmd.arg_name "account-id..."
     cmd.command [:reset_ftp_password] do |c|
 
@@ -25,13 +25,18 @@ module Brightbox
           rows << o
         end
 
-        table_opts = global_options.merge({
+        table_opts = global_options.merge(
           :vertical => true,
-          :fields => [:id, :name, :library_ftp_host, :library_ftp_user, :library_ftp_password ]
-        })
+          :fields => [
+            :id,
+            :name,
+            :library_ftp_host,
+            :library_ftp_user,
+            :library_ftp_password
+          ]
+        )
 
         render_table(rows, table_opts)
-
       end
     end
   end

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

@@ -1,7 +1,7 @@
 module Brightbox
   command [:accounts] do |cmd|
 
-    cmd.desc "Show detailed account info"
+    cmd.desc I18n.t("accounts.show.desc")
     cmd.arg_name "account-id..."
     cmd.command [:show] do |c|
 
@@ -15,14 +15,22 @@ module Brightbox
           warn "Couldn't find account #{id}"
         end
 
-        table_opts = global_options.merge({
+        table_opts = global_options.merge(
           :vertical => true,
-          :fields => [:id, :name, :cloud_ip_limit, :ram_limit, :ram_used, :lb_limit,
-                      :ram_free, :library_ftp_host, :library_ftp_user ]
-        })
+          :fields => [
+            :id,
+            :name,
+            :cloud_ip_limit,
+            :ram_limit,
+            :ram_used,
+            :lb_limit,
+            :ram_free,
+            :library_ftp_host,
+            :library_ftp_user
+          ]
+        )
 
         render_table(accounts, table_opts)
-
       end
     end
   end

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

@@ -1,18 +1,18 @@
 module Brightbox
-  desc "Manages an account's cloud IP addresses"
+  desc I18n.t("cloudips.desc")
   command [:cloudips] do |cmd|
 
-    cmd.desc "Create a new Cloud IP address"
+    cmd.desc I18n.t("cloudips.create.desc")
     cmd.command [:create] do |c|
 
       c.desc "Number of Cloud IPs to create"
       c.default_value 1
       c.flag [:i, "count"]
 
-      c.desc "Friendly name of the Cloud IP"
+      c.desc I18n.t("options.name.desc")
       c.flag [:n, :name]
 
-      c.desc "Cloud IP translators. Format: in-port:out-port:protocol. Comma separate multiple translators. Protocol can be tcp or udp."
+      c.desc I18n.t("cloudips.options.port_translators.desc")
       c.flag [:t, :"port-translators"]
 
       c.action do |global_options, options, args|

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

@@ -1,7 +1,7 @@
 module Brightbox
   command [:cloudips] do |cmd|
 
-    cmd.desc "destroy Cloud IPs"
+    cmd.desc I18n.t("cloudips.destroy.desc")
     cmd.arg_name "[cloudip-id...]"
     cmd.command [:destroy] do |c|
 

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

@@ -3,20 +3,12 @@ module Brightbox
 
     cmd.default_command :list
 
-    cmd.desc "List Cloud IPs"
+    cmd.desc I18n.t("cloudips.list.desc")
     cmd.arg_name "[cloudip-id...]"
     cmd.command [:list] do |c|
 
       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}"
-          end
-        end
-
+        ips = CloudIP.find_all_or_warn(args)
         render_table(ips.sort, global_options)
       end
     end

data/lib/brightbox-cli/commands/{cloudips-map.rb → cloudips/map.rb}

@@ -1,7 +1,7 @@
 module Brightbox
   command [:cloudips] do |cmd|
 
-    cmd.desc "map Cloud IPs"
+    cmd.desc I18n.t("cloudips.map.desc")
     cmd.arg_name "cloudip-id destination"
     cmd.command [:map] do |c|
 
@@ -28,14 +28,8 @@ module Brightbox
           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}"
-        when /grp\-/
-          group = ServerGroup.find destination_id
-          info "Mapping #{ip} to server group #{group}"
         else
-          raise "Unknown destination '#{destination_id}'"
+          info "Mapping #{ip} to destination #{destination_id}"
         end
 
         if ip.mapped?

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

@@ -1,7 +1,7 @@
 module Brightbox
   command [:cloudips] do |cmd|
 
-    cmd.desc "show details on Cloud IPs"
+    cmd.desc I18n.t("cloudips.show.desc")
     cmd.arg_name "cloudip-id..."
     cmd.command [:show] do |c|
 
@@ -15,9 +15,19 @@ module Brightbox
           warn "Couldn't find Cloud IP #{id}"
         end
 
-        fields = [:id, :name, :reverse_dns, :status, :public_ip, :reverse_dns, :destination, :interface_id, :port_translators]
+        fields = [
+          :id,
+          :name,
+          :reverse_dns,
+          :status,
+          :public_ip,
+          :reverse_dns,
+          :destination,
+          :interface_id,
+          :port_translators
+        ]
 
-        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/brightbox-cli/commands/{cloudips-unmap.rb → cloudips/unmap.rb}

@@ -1,7 +1,7 @@
 module Brightbox
   command [:cloudips] do |cmd|
 
-    cmd.desc "unmap Cloud IPs"
+    cmd.desc I18n.t("cloudips.map.desc")
     cmd.arg_name "cloudip-id..."
     cmd.command [:unmap] do |c|
 

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

@@ -1,7 +1,7 @@
 module Brightbox
   command [:cloudips] do |cmd|
 
-    cmd.desc "update Cloud IPs"
+    cmd.desc I18n.t("cloudips.update.desc")
     cmd.arg_name "cloudip-id"
     cmd.command [:update] do |c|
 
@@ -11,23 +11,22 @@ module Brightbox
       c.desc "Delete the reverse DNS for this Cloud IP"
       c.switch ["delete-reverse-dns"], :negatable => false
 
-      c.desc "Friendly name of the Cloud IP"
+      c.desc I18n.t("options.name.desc")
       c.flag [:n, :name]
 
-      c.desc "Cloud IP translators. Format: in-port:out-port:protocol. Comma separate multiple translators. Protocol can be tcp or udp."
+      c.desc I18n.t("cloudips.options.port_translators.desc")
       c.flag [:t, :"port-translators"]
 
       c.action do |global_options, options, args|
         cip_id = args.shift
         raise "You must specify the Cloud IP id as the first argument" unless cip_id =~ /^cip-/
 
-          if options[:r] && options[:r] != "" && options[:"delete-reverse-dns"]
-            raise "You must either specify a reverse DNS record or --delete-reverse-dns"
+        if options[:r] && options[:r] != "" && options[:"delete-reverse-dns"]
+          raise "You must either specify a reverse DNS record or --delete-reverse-dns"
         end
 
         cip = CloudIP.find cip_id
 
-
         cip.update(options)
         cip.reload
 

data/lib/brightbox-cli/commands/collaborations.rb

@@ -8,13 +8,7 @@ module Brightbox
     cmd.arg_name "[collaboration-id...]"
     cmd.command [:list] do |c|
       c.action do |global_options, options, args|
-        if args.empty?
-          collaborations = Collaboration.find(:all)
-        else
-          collaborations = Collaboration.find_or_call(args) do |id|
-            warn "Couldn't find collaboration #{id}"
-          end
-        end
+        collaborations = Collaboration.find_all_or_warn(args)
         render_table(collaborations, global_options)
       end
     end
@@ -42,7 +36,7 @@ module Brightbox
         collaborations = Collaboration.find_or_call(args) do |id|
           warn "Couldn't find collaboration #{id}"
         end
-        collaborations.each {|col| col.resend }
+        collaborations.each { |col| col.resend }
         render_table(collaborations, global_options)
       end
     end
@@ -65,7 +59,7 @@ module Brightbox
         collaborations = Collaboration.find_or_call(args) do |id|
           warn "Couldn't find collaboration #{id}"
         end
-        collaborations.each {|col| col.destroy }
+        collaborations.each { |col| col.destroy }
         render_table(collaborations, global_options)
       end
     end

data/lib/brightbox-cli/commands/{config-client-add.rb → config/client-add.rb}

@@ -1,8 +1,8 @@
 module Brightbox
-  desc "Manages local configuration settings and credentials"
+  desc I18n.t("config.desc")
   command [:config] do |cmd|
 
-    cmd.desc "Add new api client details to config"
+    cmd.desc I18n.t("config.client_add.desc")
     cmd.arg_name "client-id secret [api_url, auth_url]"
     cmd.command [:client_add] do |c|
 

data/lib/brightbox-cli/commands/{config-client-default.rb → config/client-default.rb}

@@ -1,7 +1,7 @@
 module Brightbox
   command [:config] do |cmd|
 
-    cmd.desc "Set the default api client in the config"
+    cmd.desc I18n.t("config.client_default.desc")
     cmd.arg_name "alias"
     cmd.command [:client_default] do |c|
 

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

@@ -3,19 +3,19 @@ module Brightbox
 
     cmd.default_command :client_list
 
-    cmd.desc "Lists the api clients defined in the config"
+    cmd.desc I18n.t("config.client_list.desc")
     cmd.command [:client_list] do |c|
 
       c.action do |global_options, options, args|
 
         info "Using config file #{$config.config_filename}"
 
-        clients = $config.clients.collect do |cid|
+        clients = $config.clients.map do |cid|
           c = $config[cid]
           calias = c["alias"] || cid
 
           # Append a star for the configured default client
-          if $config.default_client == cid and $config.has_multiple_clients?
+          if $config.default_client == cid && $config.has_multiple_clients?
             calias = "*#{calias}"
           end
 

data/lib/brightbox-cli/commands/{config-client-remove.rb → config/client-remove.rb}

@@ -15,7 +15,10 @@ module Brightbox
           raise "You must specify the api alias you want to remove"
         end
 
-        client_config = $config.clients.detect{|c| $config[c]["alias"] == calias}
+        client_config = $config.clients.find do |config|
+          $config[config]["alias"] == calias
+        end
+
         if client_config.nil?
           raise "An api client with the alias #{calias} does not exist in the config"
         end

data/lib/brightbox-cli/commands/{config-user-add.rb → config/user-add.rb}

@@ -1,7 +1,7 @@
 module Brightbox
   command [:config] do |cmd|
 
-    cmd.desc "Add new user credentials to config"
+    cmd.desc I18n.t("config.user_add.desc")
     cmd.arg_name "email client-id secret [api_url auth_url]"
     cmd.command [:user_add] do |c|
 

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

@@ -1,8 +1,8 @@
 module Brightbox
-  desc "Manages an account's firewall policies"
+  desc I18n.t("firewall.policies.desc")
   command [:"firewall-policies"] do |cmd|
 
-    cmd.desc "Apply firewall policy to a server group"
+    cmd.desc I18n.t("firewall.policies.apply.desc")
     cmd.arg_name "firewall-policy-id server-group-id"
     cmd.command [:apply] do |c|
 
@@ -22,13 +22,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.apply_to(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-create.rb → firewall/policies-create.rb}

@@ -1,14 +1,14 @@
 module Brightbox
   command [:"firewall-policies"] do |cmd|
 
-    cmd.desc "Create Firewall Policy"
+    cmd.desc I18n.t("firewall.policies.create.desc")
     cmd.arg_name "[server-group-id...]"
     cmd.command [:create] do |c|
 
-      c.desc "Name of firewall policy"
+      c.desc I18n.t("options.name.desc")
       c.flag [:n, :name]
 
-      c.desc "Description of firewall policy"
+      c.desc I18n.t("options.description.desc")
       c.flag [:d, :description]
 
       c.action do |global_options, options, args|
@@ -23,7 +23,6 @@ module Brightbox
           server_group = ServerGroup.find(server_group_id)
         end
 
-
         name = options[:n]
         description = options[:d]
 

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

@@ -1,7 +1,7 @@
 module Brightbox
   command [:"firewall-policies"] do |cmd|
 
-    cmd.desc "Destroy Firewall Policy"
+    cmd.desc I18n.t("firewall.policies.destroy.desc")
     cmd.arg_name "[firewall-policy-id...]"
     cmd.command [:destroy] do |c|
 
@@ -17,11 +17,10 @@ module Brightbox
           info "Destroying firewall policy #{firewall_policy}"
           begin
             firewall_policy.destroy
-          rescue Brightbox::Api::Conflict => e
+          rescue Brightbox::Api::Conflict
             error "Could not destroy #{firewall_policy}"
           end
         end
-
       end
     end
   end