brightbox-cli 3.3.0 → 4.0.0.rc2

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

@@ -1,10 +1,8 @@
 module Brightbox
   command [:"firewall-policies"] do |cmd|
-
     cmd.desc I18n.t("firewall.policies.show.desc")
     cmd.arg_name "firewall-policy-id"
     cmd.command [:show] do |c|
-
       c.action do |global_options, _options, args|
         raise "You must specify server groups to show" if args.empty?
 
@@ -14,12 +12,12 @@ module Brightbox
 
         table_opts = global_options.update(
           :vertical => true,
-          :fields => [
-            :id,
-            :server_group,
-            :default,
-            :name,
-            :description
+          :fields => %i[
+            id
+            server_group
+            default
+            name
+            description
           ]
         )
 

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

@@ -1,15 +1,13 @@
 module Brightbox
   command [:"firewall-policies"] do |cmd|
-
     cmd.desc I18n.t("firewall.policies.update.desc")
     cmd.arg_name "firewall-policy-id"
     cmd.command [:update] do |c|
-
       c.desc I18n.t("options.name.desc")
-      c.flag [:n, :name]
+      c.flag %i[n name]
 
       c.desc I18n.t("options.description.desc")
-      c.flag [:d, :description]
+      c.flag %i[d description]
 
       c.action do |global_options, options, args|
         policy_id = args.shift

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

@@ -1,28 +1,26 @@
 module Brightbox
   desc I18n.t("firewall.rules.desc")
   command [:"firewall-rules"] do |cmd|
-
     cmd.desc I18n.t("firewall.rules.create.desc")
     cmd.arg_name "[firewall-policy-id...]"
     cmd.command [:create] do |c|
-
       c.desc "Protocol - [tcp/udp/icmp/Protocol numbers]"
-      c.flag [:p, :protocol]
+      c.flag %i[p protocol]
 
       c.desc "Source - IPv4/IPv6 address or range (CIDR notation), 'any' for combined IPv4/IPv6 wildcard, server group identifer, server identifier."
-      c.flag [:s, :source]
+      c.flag %i[s source]
 
       c.desc "Source Port"
-      c.flag [:t, :sport]
+      c.flag %i[t sport]
 
       c.desc "Destination. IPv4/IPv6 address or range (CIDR notation), 'any' for combined IPv4/IPv6 wildcard, server group identifer, server identifier."
-      c.flag [:d, :destination]
+      c.flag %i[d destination]
 
       c.desc "Destination Port"
-      c.flag [:e, :dport]
+      c.flag %i[e dport]
 
       c.desc "Icmp Type name"
-      c.flag [:i, :icmptype]
+      c.flag %i[i icmptype]
 
       c.desc I18n.t("options.description.desc")
       c.flag :description

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

@@ -1,10 +1,8 @@
 module Brightbox
   command [:"firewall-rules"] do |cmd|
-
     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?
 

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

@@ -1,12 +1,10 @@
 module Brightbox
   command [:"firewall-rules"] do |cmd|
-
     cmd.default_command :list
 
     cmd.desc I18n.t("firewall.rules.list.desc")
     cmd.arg_name "[firewall-policy-id...]"
     cmd.command [:list] do |c|
-
       c.action do |global_options, _options, args|
         if args.empty?
           raise "You must specify the firewall policy id as the first argument"

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

@@ -1,10 +1,8 @@
 module Brightbox
   command [:"firewall-rules"] do |cmd|
-
     cmd.desc I18n.t("firewall.rules.show.desc")
     cmd.arg_name "firewall-rule-id"
     cmd.command [:show] do |c|
-
       c.action do |global_options, _options, args|
         raise "You must specify server groups to show" if args.empty?
 
@@ -13,13 +11,13 @@ module Brightbox
         end
 
         display_options = {
-          :fields => [
-            :id, :protocol,
-            :source, :sport,
-            :destination, :dport,
-            :icmp_type,
-            :firewall_policy,
-            :description
+          :fields => %i[
+            id protocol
+            source sport
+            destination dport
+            icmp_type
+            firewall_policy
+            description
           ],
           :vertical => true
         }

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

@@ -1,27 +1,25 @@
 module Brightbox
   command [:"firewall-rules"] do |cmd|
-
     cmd.desc I18n.t("firewall.rules.update.desc")
     cmd.arg_name "[firewall-rule-id...]"
     cmd.command [:update] do |c|
-
       c.desc "Protocol - [tcp/udp/icmp/Protocol numbers]"
-      c.flag [:p, :protocol]
+      c.flag %i[p protocol]
 
       c.desc "Source - IPv4/IPv6 address or range (CIDR notation), 'any' for combined IPv4/IPv6 wildcard, server group identifer, server identifier."
-      c.flag [:s, :source]
+      c.flag %i[s source]
 
       c.desc "Source Port"
-      c.flag [:t, :sport]
+      c.flag %i[t sport]
 
       c.desc "Destination. IPv4/IPv6 address or range (CIDR notation), 'any' for combined IPv4/IPv6 wildcard, server group identifer, server identifier."
-      c.flag [:d, :destination]
+      c.flag %i[d destination]
 
       c.desc "Destination Port"
-      c.flag [:e, :dport]
+      c.flag %i[e dport]
 
       c.desc "Icmp Type name"
-      c.flag [:i, :icmptype]
+      c.flag %i[i icmptype]
 
       c.desc I18n.t("options.description.desc")
       c.flag :description
@@ -29,6 +27,7 @@ module Brightbox
       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
         raise "Could not find firewall rule with #{firewall_rule_id}" unless firewall_rule
 

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

@@ -1,11 +1,9 @@
 module Brightbox
   desc I18n.t("groups.desc")
   command [:groups] do |cmd|
-
     cmd.desc I18n.t("groups.add_servers.desc")
     cmd.arg_name "grp-id [srv-id...]"
     cmd.command [:add_servers] do |c|
-
       c.action do |global_options, _options, args|
         grp_id = args.shift
         raise "You must specify the server group and then the server ids to add" unless grp_id && grp_id[/^grp-/] && !args.empty?

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

@@ -1,13 +1,12 @@
 module Brightbox
   command [:groups] do |cmd|
-
     cmd.desc I18n.t("groups.create.desc")
     cmd.command [:create] do |c|
       c.desc I18n.t("options.name.desc")
-      c.flag [:n, :name]
+      c.flag %i[n name]
 
       c.desc I18n.t("options.description.desc")
-      c.flag [:d, :description]
+      c.flag %i[d description]
 
       c.action do |global_options, options, _args|
         params = {}

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

@@ -1,11 +1,9 @@
 module Brightbox
   command [:groups] do |cmd|
-
     cmd.desc I18n.t("groups.destroy.desc")
     cmd.arg_name "grp-id..."
     # TODO: add option to remove all servers from group before destroying
     cmd.command [:destroy] do |c|
-
       c.action do |_global_options, _options, args|
         raise "You must specify the server groups to destroy" if args.empty?
 

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

@@ -1,6 +1,5 @@
 module Brightbox
   command [:groups] do |cmd|
-
     cmd.default_command :list
 
     cmd.desc I18n.t("groups.list.desc")

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

@@ -1,14 +1,13 @@
 module Brightbox
   command [:groups] do |cmd|
-
     cmd.desc I18n.t("groups.move_servers.desc")
     cmd.arg_name "srv-id ..."
     cmd.command [:move_servers] do |c|
       c.desc "Source Server Group"
-      c.flag [:f, :from]
+      c.flag %i[f from]
 
       c.desc "Target Server Group"
-      c.flag [:t, :to]
+      c.flag %i[t to]
 
       c.action do |global_options, options, args|
         unless args && !args.empty?

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

@@ -1,12 +1,10 @@
 module Brightbox
   command [:groups] do |cmd|
-
     cmd.desc I18n.t("groups.remove_servers.desc")
     cmd.arg_name "grp-id [srv-id...]"
     cmd.command [:remove_servers] do |c|
-
       c.desc "Remove all servers from group"
-      c.switch [:a, :all], :negatable => false
+      c.switch %i[a all], :negatable => false
 
       c.action do |global_options, options, args|
         grp_id = args.shift
@@ -25,7 +23,7 @@ module Brightbox
         if servers.empty?
           info "Server group #{sg} already contains zero servers"
         else
-          info "Removing#{" all" if options[:a]} #{servers.size} servers from server group #{sg}"
+          info "Removing#{' all' if options[:a]} #{servers.size} servers from server group #{sg}"
           sg.remove_servers servers
         end
 

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

@@ -1,10 +1,8 @@
 module Brightbox
   command [:groups] do |cmd|
-
     cmd.desc I18n.t("groups.show.desc")
     cmd.arg_name "[grp-id..]"
     cmd.command [:show] do |c|
-
       c.action do |global_options, _options, args|
         raise "You must specify server groups to show" if args.empty?
 

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

@@ -1,14 +1,13 @@
 module Brightbox
   command [:groups] do |cmd|
-
     cmd.desc I18n.t("groups.update.desc")
     cmd.arg_name "grp-id"
     cmd.command [:update] do |c|
       c.desc I18n.t("options.name.desc")
-      c.flag [:n, :name]
+      c.flag %i[n name]
 
       c.desc I18n.t("options.description.desc")
-      c.flag [:d, :description]
+      c.flag %i[d description]
 
       c.action do |global_options, options, args|
         grp_id = args.shift

data/lib/brightbox-cli/commands/images/destroy.rb

@@ -1,13 +1,10 @@
 module Brightbox
   desc I18n.t("images.desc")
   command [:images] do |cmd|
-
     cmd.desc I18n.t("images.destroy.desc")
     cmd.arg_name "image-id..."
     cmd.command [:destroy] do |c|
-
       c.action do |global_options, _options, args|
-
         if args.empty?
           raise "You must specify the images you want to destroy"
         end
@@ -23,7 +20,6 @@ module Brightbox
         end
 
         render_table(images, global_options)
-
       end
     end
   end

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

@@ -1,23 +1,21 @@
 module Brightbox
   command [:images] do |cmd|
-
     cmd.default_command :list
 
     cmd.desc I18n.t("images.list.desc")
     cmd.arg_name "[image-id...]"
     cmd.command [:list] do |c|
-
       c.desc "Show all public images from all accounts"
       c.switch [:a, "show-all"], :negatable => false
 
       c.desc "Show only images of a given type"
-      c.flag [:t, :type]
+      c.flag %i[t type]
 
       c.desc "Show only images of a given status"
-      c.flag [:s, :status]
+      c.flag %i[s status]
 
       c.desc "Show only images for a given account identifier"
-      c.flag [:l, :account]
+      c.flag %i[l account]
 
       c.action do |global_options, options, args|
         images = Image.find_all_or_warn(args)

data/lib/brightbox-cli/commands/images/register.rb

@@ -1,14 +1,12 @@
 module Brightbox
   command [:images] do |cmd|
-
     cmd.desc I18n.t("images.register.desc")
     cmd.command [:register] do |c|
-
       c.desc I18n.t("options.name.desc")
-      c.flag [:n, :name]
+      c.flag %i[n name]
 
       c.desc I18n.t("options.description.desc")
-      c.flag [:d, :description]
+      c.flag %i[d description]
 
       c.desc "Image Username"
       c.flag [:u, "username"]
@@ -27,36 +25,30 @@ module Brightbox
       c.default_value "false"
       c.flag [:p, "public"]
 
-      c.action do |global_options, options, _args|
+      c.desc "Set minimum amount of RAM required by this image (MB)"
+      c.flag ["min-ram"]
 
+      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 "Mode must be 'virtio' or 'compatibility'" unless options[:m] == "virtio" || options[:m] == "compatibility"
         raise "Public must be true or false" unless options[:p] == "true" || options[:p] == "false"
 
-        if options[:m] == "compatibility"
-          compatibility_flag = true
-        else
-          compatibility_flag = false
-        end
+        compatibility_flag = options[:m] == "compatibility"
 
-        if options[:p] == "true"
-          public_flag = true
-        else
-          public_flag = false
-        end
+        public_flag = options[:p] == "true"
 
         image_options = {
           :name => options[:n], :arch => options[:a],
           :username => options[:u], :source => options[:s],
           :compatibility_mode => compatibility_flag,
-          :description => options[:d], :public => public_flag
+          :description => options[:d], :public => public_flag,
+          :min_ram => options["min-ram"].to_i
         }
 
         image = Image.register(image_options)
 
         render_table([image], global_options)
-
       end
     end
   end

data/lib/brightbox-cli/commands/images/show.rb

@@ -1,33 +1,32 @@
 module Brightbox
   command [:images] do |cmd|
-
     cmd.desc I18n.t("images.show.desc")
     cmd.arg_name "image-id..."
     cmd.command [:show] do |c|
-
       c.action do |global_options, _options, args|
         images = Image.find_all_or_warn(args)
 
         display_options = {
           :vertical => true,
-          :fields => [
-            :id,
-            :type,
-            :owner,
-            :created_at,
-            :status,
-            :locked,
-            :arch,
-            :name,
-            :description,
-            :username,
-            :virtual_size,
-            :disk_size,
-            :public,
-            :"compatibility_mode",
-            :official,
-            :ancestor_id,
-            :licence_name
+          :fields => %i[
+            id
+            type
+            owner
+            created_at
+            status
+            locked
+            arch
+            name
+            description
+            username
+            virtual_size
+            disk_size
+            public
+            compatibility_mode
+            official
+            ancestor_id
+            licence_name
+            min_ram
           ]
         }
 

data/lib/brightbox-cli/commands/images/update.rb

@@ -1,15 +1,13 @@
 module Brightbox
   command [:images] do |cmd|
-
     cmd.desc I18n.t("images.update.desc")
     cmd.arg_name "img-id"
     cmd.command [:update] do |c|
-
       c.desc I18n.t("options.name.desc")
-      c.flag [:n, :name]
+      c.flag %i[n name]
 
       c.desc I18n.t("options.description.desc")
-      c.flag [:d, :description]
+      c.flag %i[d description]
 
       c.desc "Architecture of the image (i686 or x86_64)"
       c.flag [:a, "arch"]
@@ -20,6 +18,9 @@ module Brightbox
       c.desc "Set image to be publicly visible (true or false)"
       c.flag [:p, "public"]
 
+      c.desc "Set minimum amount of RAM required by this image (MB)"
+      c.flag ["min-ram"]
+
       c.desc "Set image to be deprecated (true or false)"
       c.flag "deprecated"
 
@@ -29,11 +30,12 @@ module Brightbox
       c.action do |global_options, options, args|
         img_id = args.shift
         raise "You must specify the image to update as the first argument" unless img_id =~ /^img-/
-        if options[:m]
-          raise "Mode must be 'virtio' or 'compatibility'" unless options[:m] == "virtio" || options[:m] == "compatibility"
+
+        if options[:m] && !(options[:m] == "virtio" || options[:m] == "compatibility")
+          raise "Mode must be 'virtio' or 'compatibility'"
         end
-        if options[:p]
-          raise "Public must be true or false" unless options[:p] == "true" || options[:p] == "false"
+        if options[:p] && !(options[:p] == "true" || options[:p] == "false")
+          raise "Public must be true or false"
         end
 
         params = NilableHash.new
@@ -49,6 +51,8 @@ module Brightbox
         params[:public] = true if options[:p] == "true"
         params[:public] = false if options[:p] == "false"
 
+        params[:min_ram] = options["min-ram"].to_i if options["min-ram"]
+
         # If options[:deprecated] isn't specified, leave the status alone
         params[:status] = "deprecated" if options[:deprecated] == "true"
         params[:status] = "available" if options[:deprecated] == "false"

data/lib/brightbox-cli/commands/lbs/{add-nodes.rb → add_nodes.rb}

@@ -1,13 +1,10 @@
 module Brightbox
   desc I18n.t("lbs.desc")
   command [:lbs] do |cmd|
-
     cmd.desc I18n.t("lbs.add_nodes.desc")
     cmd.arg_name "lb-id node-id..."
     cmd.command [:add_nodes] do |c|
-
       c.action do |global_options, _options, args|
-
         raise "You must specify the load balancer and the node ids to add" if args.size < 2
 
         lb = LoadBalancer.find(args.shift)

data/lib/brightbox-cli/commands/lbs/create.rb

@@ -1,21 +1,19 @@
 module Brightbox
   command [:lbs] do |cmd|
-
     cmd.desc I18n.t("lbs.create.desc")
     cmd.long_desc I18n.t("lbs.create.long_desc")
     cmd.arg_name "srv-id..."
     cmd.command [:create] do |c|
-
       c.desc I18n.t("options.name.desc")
-      c.flag [:n, :name]
+      c.flag %i[n name]
 
       c.desc "Load balancer policy"
       c.default_value "least-connections"
-      c.flag [:p, :policy]
+      c.flag %i[p policy]
 
       c.desc "Listeners. Format: in-port:out-port:type:timeout. Comma separated multiple listeners. Protocols can be tcp, http or http+ws and timeouts are in milliseconds."
       c.default_value "80:80:http:50000,443:443:tcp:50000"
-      c.flag [:l, :listeners]
+      c.flag %i[l listeners]
 
       c.desc "Healthcheck port. Defaults to first listener out port."
       c.flag [:k, "hc-port"]
@@ -60,12 +58,12 @@ module Brightbox
       c.switch ["sslv3"]
 
       c.action do |global_options, options, args|
-
         raise "You must specify which servers to balance connections to" if args.empty?
 
         listeners = options[:l].split(",").map do |l|
           inport, outport, protocol, timeout = l.split ":"
           raise "listener '#{l}' is invalid" if inport.nil? || outport.nil? || protocol.nil?
+
           { :in => inport, :out => outport, :protocol => protocol, :timeout => timeout }
         end
 
@@ -92,7 +90,7 @@ module Brightbox
 
         healthcheck = {}
 
-        options.keys.each do |k|
+        options.each_key do |k|
           if options[k] && hc_arg_lookup[k]
             healthcheck[hc_arg_lookup[k]] = options[k]
           end

data/lib/brightbox-cli/commands/lbs/destroy.rb

@@ -1,12 +1,9 @@
 module Brightbox
   command [:lbs] do |cmd|
-
     cmd.desc I18n.t("lbs.destroy.desc")
     cmd.arg_name "lb-id..."
     cmd.command [:destroy] do |c|
-
       c.action do |_global_options, _options, args|
-
         raise "You must specify the load balancers to destroy" if args.empty?
 
         lbs = LoadBalancer.find_or_call(args) do |id|

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

@@ -1,6 +1,5 @@
 module Brightbox
   command [:lbs] do |cmd|
-
     cmd.default_command :list
 
     cmd.desc I18n.t("lbs.list.desc")

data/lib/brightbox-cli/commands/lbs/{remove-nodes.rb → remove_nodes.rb}

@@ -1,12 +1,9 @@
 module Brightbox
   command [:lbs] do |cmd|
-
     cmd.desc I18n.t("lbs.remove_nodes.desc")
     cmd.arg_name "lb-id node-id..."
     cmd.command [:remove_nodes] do |c|
-
       c.action do |global_options, _options, args|
-
         raise "You must specify the load balancer and the node ids to remove" if args.size < 2
 
         lb = LoadBalancer.find(args.shift)