brightbox-cli 3.1.0 → 4.0.0.rc2

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)

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

@@ -1,37 +1,35 @@
 module Brightbox
   command [:lbs] do |cmd|
-
     cmd.desc I18n.t("lbs.show.desc")
     cmd.arg_name "lbs-id..."
     cmd.command [:show] do |c|
-
       c.action do |global_options, _options, args|
         lbs = LoadBalancer.find_all_or_warn(args)
 
         table_opts = global_options.merge(
           :vertical => true,
-          :fields => [
-            :id,
-            :status,
-            :locked,
-            :name,
-            :created_at,
-            :deleted_at,
-            :policy,
-            :ssl_minimum_version,
-            :ssl_issuer,
-            :ssl_subject,
-            :ssl_valid_from,
-            :ssl_expires_at,
-            :ssl_v3_enabled,
-            :cloud_ips,
-            :nodes,
-            :listeners,
-            :healthcheck
-          ])
+          :fields => %i[
+            id
+            status
+            locked
+            name
+            created_at
+            deleted_at
+            policy
+            ssl_minimum_version
+            ssl_issuer
+            ssl_subject
+            ssl_valid_from
+            ssl_expires_at
+            ssl_v3_enabled
+            cloud_ips
+            nodes
+            listeners
+            healthcheck
+          ]
+        )
 
         render_table(lbs, table_opts)
-
       end
     end
   end

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

@@ -1,19 +1,17 @@
 module Brightbox
   command [:lbs] do |cmd|
-
     cmd.desc I18n.t("lbs.update.desc")
     cmd.long_desc I18n.t("lbs.update.long_desc")
     cmd.arg_name "lba-id [node-id...]"
     cmd.command [:update] do |c|
-
       c.desc I18n.t("options.name.desc")
-      c.flag [:n, :name]
+      c.flag %i[n name]
 
       c.desc "Load balancer policy"
-      c.flag [:p, :policy]
+      c.flag %i[p policy]
 
       c.desc "Listeners (in-port:out-port:protocol:timeout. Comma separate multiple listeners)"
-      c.flag [:l, :listeners]
+      c.flag %i[l listeners]
 
       c.desc "Healthcheck port"
       c.flag [:k, "hc-port"]
@@ -55,7 +53,6 @@ module Brightbox
       c.switch ["sslv3"]
 
       c.action do |global_options, options, args|
-
         lb_id = args.shift
         raise "You must specify the load balancer to update as the first argument" unless lb_id =~ /^lba-/
 
@@ -77,7 +74,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
@@ -131,8 +128,8 @@ module Brightbox
           lbopts[:certificate_private_key] = ""
         end
 
-        if options["ssl-min-ver"]
-          lbopts[:ssl_minimum_version] = options["ssl-min-ver"] unless options["ssl-min-ver"].nil?
+        if options["ssl-min-ver"] && !options["ssl-min-ver"].nil?
+          lbopts[:ssl_minimum_version] = options["ssl-min-ver"]
         end
 
         lbopts.nilify_blanks

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

@@ -21,19 +21,9 @@ module Brightbox
 
       raise "You must specify your email address" if email.nil?
 
-      password = options[:p]
-      password ||= Brightbox.config.gpg_password
-      password ||= Brightbox.config.password_helper_password
-
-      if !password || password.empty?
-        require "highline"
-        highline = HighLine.new
-        password = highline.ask("Enter your password : ") { |q| q.echo = false }
-      end
+      password = Brightbox.config.discover_password(password: options[:p])
       raise "You must specify your Brightbox password." if password.empty?
 
-      password = Brightbox.config.extend_with_two_factor_pin(password)
-
       section_options = {
         :client_name => config_name,
         :alias => config_name,
@@ -49,7 +39,18 @@ module Brightbox
       section_options[:client_id] = options[:"application-id"] if options[:"application-id"]
       section_options[:secret] = options[:"application-secret"] if options[:"application-secret"]
 
-      Brightbox.config.add_login(email, password, section_options)
+      begin
+        Brightbox.config.add_login(email, password, section_options)
+      rescue Fog::Brightbox::OAuth2::TwoFactorMissingError
+        section_options = {
+          :client_name => config_name,
+          :alias => config_name,
+          :username => email,
+          :password => password,
+          :one_time_password => discover_two_factor_pin
+        }
+        Brightbox.config.add_login(email, password, section_options)
+      end
     end
   end
 end

data/lib/brightbox-cli/commands/servers/{activate-console.rb → activate_console.rb}

@@ -3,13 +3,10 @@ require "uri"
 module Brightbox
   desc I18n.t("servers.desc")
   command [:servers] do |cmd|
-
     cmd.desc I18n.t("servers.activate_console.desc")
     cmd.arg_name "server-id..."
     cmd.command [:activate_console] do |c|
-
       c.action do |global_options, _options, args|
-
         raise "You must specify servers to activate the console for" if args.empty?
 
         servers = Server.find_or_call(args) do |id|
@@ -23,13 +20,13 @@ module Brightbox
           r = s.activate_console
 
           uri = URI(r["console_url"])
-          uri.query = "password=#{r["console_token"]}"
+          uri.query = "password=#{r['console_token']}"
 
           expires = Time.parse(r["console_token_expires"])
           consoles << { :url => uri.to_s, :token => r["console_token"], :expires => expires.localtime.to_s }
         end
 
-        render_table(consoles, global_options.merge(:fields => [:url, :token, :expires], :resize => false))
+        render_table(consoles, global_options.merge(:fields => %i[url token expires], :resize => false))
       end
     end
   end

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

@@ -1,12 +1,10 @@
 module Brightbox
   command [:servers] do |cmd|
-
     cmd.desc I18n.t("servers.create.desc")
     cmd.arg_name "image_id"
     cmd.command [:create] do |c|
-
       c.desc I18n.t("options.name.desc")
-      c.flag [:n, :name]
+      c.flag %i[n name]
 
       c.desc "Number of servers to create"
       c.default_value 1
@@ -17,7 +15,7 @@ module Brightbox
 
       c.desc "Type of server to create"
       c.default_value "1gb.ssd"
-      c.flag [:t, :type]
+      c.flag %i[t type]
 
       c.desc "Specify user data"
       c.flag [:m, "user-data"]
@@ -27,7 +25,11 @@ module Brightbox
 
       c.desc "base64 encode the user data"
       c.default_value true
-      c.switch [:e, :base64], :negatable => true
+      c.switch %i[e base64], :negatable => true
+
+      c.desc "Enable encryption at rest for disk"
+      c.default_value false
+      c.switch ["disk-encrypted"], :negatable => false
 
       c.desc "Server groups to place server in - comma delimited list"
       c.flag [:g, "server-groups"]
@@ -36,7 +38,6 @@ module Brightbox
       c.flag ["cloud-ip"]
 
       c.action do |global_options, options, args|
-
         if args.empty?
           raise "You must specify the image_id as the first argument"
         end
@@ -45,19 +46,19 @@ module Brightbox
         image = Image.find image_id
 
         type_id = options[:t]
-        if type_id =~ /^typ\-/
-          type = Type.find type_id
-        else
-          type = Type.find_by_handle type_id
-        end
+        type = if type_id =~ /^typ-/
+                 Type.find type_id
+               else
+                 Type.find_by_handle type_id
+               end
 
         if options[:z]
           zone = options[:z]
-          if zone =~ /^typ\-/
-            zone = Zone.find zone
-          else
-            zone = Zone.find_by_handle zone
-          end
+          zone = if zone =~ /^typ-/
+                   Zone.find zone
+                 else
+                   Zone.find_by_handle zone
+                 end
         end
 
         user_data = options[:m]
@@ -65,9 +66,11 @@ module Brightbox
 
         if user_data_file
           raise "Cannot specify user data on command line and in file at same time" if user_data
+
           # Wot we use to read the data, be it from stdin or a file on disk
           file_handler = lambda do |fh|
             raise "User data file too big (>16k)" if fh.stat.size > 16 * 1024
+
             user_data = fh.read
           end
           # Figure out how to invoke file_handler, and then invoke it
@@ -94,11 +97,11 @@ module Brightbox
         msg = "Creating #{options[:i] > 1 ? options[:i] : 'a'} #{type.handle} (#{type.id})"
         msg << " server#{options[:i] > 1 ? 's' : ''} with image #{image.name.strip} (#{image.id})"
         msg << " in zone #{zone.handle} (#{zone})" if zone
-        msg << " in groups #{server_groups.map(&:id).join(", ")}" unless server_groups.empty?
-        msg << " with %.2fk of user data" % (user_data.size / 1024.0) if user_data
-        if options[:"cloud-ip"] && options[:"cloud-ip"].respond_to?(:start_with?)
+        msg << " in groups #{server_groups.map(&:id).join(', ')}" unless server_groups.empty?
+        msg << format(" with %.2fk of user data", (user_data.size / 1024.0)) if user_data
+        if options[:"cloud-ip"].respond_to?(:start_with?)
           if options[:"cloud-ip"].start_with?("cip-")
-            msg << " mapping #{options[:'cloud-ip']} when built"
+            msg << " mapping #{options[:"cloud-ip"]} when built"
           end
           if options[:"cloud-ip"] == "true"
             msg << " mapping a new cloud IP when built"
@@ -107,15 +110,16 @@ module Brightbox
         info msg
 
         params = {
-          :image_id      => image.id,
-          :flavor_id     => type.id,
-          :zone_id       => zone.to_s,
-          :name          => options[:n],
-          :user_data     => user_data,
+          :image_id => image.id,
+          :flavor_id => type.id,
+          :zone_id => zone.to_s,
+          :name => options[:n],
+          :user_data => user_data,
           :server_groups => server_groups.map(&:id)
         }
 
         params[:cloud_ip] = options[:"cloud-ip"] if options.key?(:"cloud-ip")
+        params[:disk_encrypted] = options[:"disk-encrypted"] if options.key?(:"disk-encrypted")
 
         servers = Server.create_servers options[:i], params
         render_table(servers, global_options)

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

@@ -1,11 +1,9 @@
 module Brightbox
   command [:servers] do |cmd|
-
     cmd.desc I18n.t("servers.destroy.desc")
     cmd.arg_name "[server-id...]"
     cmd.command [:destroy] do |c|
       c.action do |_global_options, _options, args|
-
         raise "You must specify servers to destroy" if args.empty?
 
         servers = Server.find_or_call(args) do |id|
@@ -20,7 +18,6 @@ module Brightbox
             error "Could not destroy #{server}"
           end
         end
-
       end
     end
   end

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

@@ -1,24 +1,23 @@
 module Brightbox
   command [:servers] do |cmd|
-
     cmd.default_command :list
 
     cmd.desc "List servers"
     cmd.arg_name "[server-id...]"
     cmd.command [:list] do |c|
-
       c.desc "Group identifier"
-      c.flag [:g, :group]
+      c.flag %i[g group]
 
       c.action do |global_options, options, args|
         # Check this here before we make any network connections
         raise "A valid server group identifier is required for the group argument" unless options[:g].nil? || options[:g] =~ /^grp-.{5}$/
+
         servers = Server.find_all_or_warn(args)
 
         # Scope by group if a group identifier is specified
         if options[:g]
-          servers = servers.select do
-            |server| server.server_groups.any? do |grp|
+          servers = servers.select do |server|
+            server.server_groups.any? do |grp|
               grp["id"] == options[:g]
             end
           end

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

@@ -1,10 +1,8 @@
 module Brightbox
   command [:servers] do |cmd|
-
     cmd.desc "Show detailed server info"
     cmd.arg_name "server-id..."
     cmd.command [:show] do |c|
-
       c.action do |global_options, _options, args|
         servers = DetailedServer.find_all_or_warn(args)
 

data/lib/brightbox-cli/commands/servers/shutdown.rb

@@ -1,11 +1,9 @@
 module Brightbox
   command [:servers] do |cmd|
-
     cmd.desc I18n.t("servers.shutdown.desc")
     cmd.arg_name "server-id..."
     cmd.command [:shutdown] do |c|
       c.action do |_global_options, _options, args|
-
         raise "You must specify servers to shutdown" if args.empty?
 
         servers = Server.find_or_call(args) do |id|
@@ -16,7 +14,6 @@ module Brightbox
           info "Shutting down server #{s}"
           s.shutdown
         end
-
       end
     end
   end

data/lib/brightbox-cli/commands/servers/snapshot.rb

@@ -1,12 +1,9 @@
 module Brightbox
   command [:servers] do |cmd|
-
     cmd.desc I18n.t("servers.snapshot.desc")
     cmd.arg_name "server-id..."
     cmd.command [:snapshot] do |c|
-
       c.action do |_global_options, _options, args|
-
         raise "You must specify servers to snapshot" if args.empty?
 
         servers = Server.find_or_call(args) do |id|
@@ -17,7 +14,6 @@ module Brightbox
           info "Snapshotting server #{s}"
           s.snapshot
         end
-
       end
     end
   end

data/lib/brightbox-cli/commands/servers/start.rb

@@ -1,12 +1,9 @@
 module Brightbox
   command [:servers] do |cmd|
-
     cmd.desc I18n.t("servers.start.desc")
     cmd.arg_name "server-id..."
     cmd.command [:start] do |c|
-
       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|
@@ -17,7 +14,6 @@ module Brightbox
           info "Starting server #{s}"
           s.start
         end
-
       end
     end
   end

data/lib/brightbox-cli/commands/servers/stop.rb

@@ -1,12 +1,9 @@
 module Brightbox
   command [:servers] do |cmd|
-
     cmd.desc I18n.t("servers.stop.desc")
     cmd.arg_name "server-id..."
     cmd.command [:stop] do |c|
-
       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|

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

@@ -1,12 +1,10 @@
 module Brightbox
   command [:servers] do |cmd|
-
     cmd.desc I18n.t("servers.update.desc")
     cmd.arg_name "server-id"
     cmd.command [:update] do |c|
-
       c.desc I18n.t("options.name.desc")
-      c.flag [:n, :name]
+      c.flag %i[n name]
 
       c.desc "Specify user data"
       c.flag [:m, "user-data"]
@@ -16,7 +14,7 @@ module Brightbox
 
       c.desc "base64 encode the user data"
       c.default_value true
-      c.switch [:e, :base64], :negatable => true
+      c.switch %i[e base64], :negatable => true
 
       c.desc "Use compatibility mode"
       c.switch [:"compatibility-mode"], :negatable => true
@@ -35,9 +33,11 @@ module Brightbox
 
         if user_data_file
           raise "Cannot specify user data on command line and in file at same time" if user_data
+
           # Wot we use to read the data, be it from stdin or a file on disk
           file_handler = lambda do |fh|
             raise "User data file too big (>16k)" if fh.stat.size > 16 * 1024
+
             user_data = fh.read
           end
           # Figure out how to invoke file_handler, and then invoke it
@@ -75,7 +75,7 @@ module Brightbox
 
         params.nilify_blanks
 
-        info "Updating server #{server}#{" with %.2fk of user data" % (user_data.size / 1024.0) if user_data}"
+        info "Updating server #{server}#{format(' with %.2fk of user data', (user_data.size / 1024.0)) if user_data}"
         server.update params
         server.reload
         render_table([server], global_options)

data/lib/brightbox-cli/commands/sql/instances_create.rb

@@ -1,15 +1,12 @@
 module Brightbox
   desc I18n.t("sql.desc")
   command [:sql] do |product|
-
     product.desc I18n.t("sql.instances.desc")
     product.command [:instances] do |cmd|
-
       cmd.desc I18n.t("sql.instances.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"]
@@ -19,7 +16,7 @@ module Brightbox
 
         # Database type
         c.desc I18n.t("sql.instances.options.type.desc")
-        c.flag [:t, :type]
+        c.flag %i[t type]
 
         # Database Engine / Version (e.g. "mysql-5.6"
         c.desc I18n.t("sql.instances.options.engine.desc")
@@ -45,7 +42,7 @@ module Brightbox
         c.desc I18n.t("sql.instances.options.zone.desc")
         c.flag [:z, "zone"]
 
-        c.action do |global_options, options, args|
+        c.action do |global_options, options, _args|
           params = DatabaseServer.clean_arguments(options)
 
           server = DatabaseServer.create(params)