brightbox-cli 1.1.0 → 1.2.0

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

@@ -1,12 +1,15 @@
 module Brightbox
   command [:images] do |cmd|
 
-    cmd.desc "Update an image"
+    cmd.desc I18n.t("images.update.desc")
     cmd.arg_name "img-id"
     cmd.command [:update] 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 "Architecture of the image (i686 or x86_64)"
       c.flag [:a, "arch"]
@@ -20,17 +23,14 @@ module Brightbox
       c.desc "Set image to be deprecated (true or false)"
       c.flag "deprecated"
 
-      c.desc "Image description"
-      c.flag [:d, "description"]
-
       c.desc "Image Username"
       c.flag [:u, "username"]
 
       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]
+          raise "Mode must be 'virtio' or 'compatibility'" unless options[:m] == "virtio" || options[:m] == "compatibility"
         end
         if options[:p]
           raise "Public must be true or false" unless options[:p] == "true" || options[:p] == "false"

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

@@ -1,8 +1,8 @@
 module Brightbox
-  desc "Manages an account's load balancers"
+  desc I18n.t("lbs.desc")
   command [:lbs] do |cmd|
 
-    cmd.desc "Add nodes to a load balancer"
+    cmd.desc I18n.t("lbs.add_nodes.desc")
     cmd.arg_name "lb-id node-id..."
     cmd.command [:add_nodes] do |c|
 

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

@@ -1,12 +1,12 @@
 module Brightbox
   command [:lbs] do |cmd|
 
-    cmd.desc "Create a load balancer"
-    cmd.long_desc "All intervals and timeouts are in milliseconds"
+    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 "Friendly name of load balancer"
+      c.desc I18n.t("options.name.desc")
       c.flag [:n, :name]
 
       c.desc "Load balancer policy"
@@ -53,9 +53,9 @@ module Brightbox
 
         raise "You must specify which servers to balance connections to" if args.empty?
 
-        listeners = options[:l].split(",").collect do |l|
+        listeners = options[:l].split(",").map do |l|
           inport, outport, protocol, timeout = l.split ":"
-          raise "listener '#{l}' is invalid" if inport.nil? or outport.nil? or protocol.nil?
+          raise "listener '#{l}' is invalid" if inport.nil? || outport.nil? || protocol.nil?
           { :in => inport, :out => outport, :protocol => protocol, :timeout => timeout }
         end
 
@@ -70,14 +70,20 @@ module Brightbox
           options[:y] = listeners.first[:protocol]
         end
 
-        hc_arg_lookup = { :k => :port, :y => :type, :t => :timeout, :s =>
-                          :request, :e => :interval, :u => :threshold_up, :d =>
-                          :threshold_down }
+        hc_arg_lookup = {
+          :k => :port,
+          :y => :type,
+          :t => :timeout,
+          :s => :request,
+          :e => :interval,
+          :u => :threshold_up,
+          :d => :threshold_down
+        }
 
         healthcheck = {}
 
         options.keys.each do |k|
-          if options[k] and hc_arg_lookup[k]
+          if options[k] && hc_arg_lookup[k]
             healthcheck[hc_arg_lookup[k]] = options[k]
           end
         end
@@ -94,7 +100,7 @@ module Brightbox
           ssl_key = File.read(File.expand_path(ssl_key_path))
         end
 
-        nodes = args.collect { |i| { :node => i } }
+        nodes = args.map { |i| { :node => i } }
 
         msg = "Creating a new load balancer"
         info msg

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

@@ -1,7 +1,7 @@
 module Brightbox
   command [:lbs] do |cmd|
 
-    cmd.desc "Destroy load balancers"
+    cmd.desc I18n.t("lbs.destroy.desc")
     cmd.arg_name "lb-id..."
     cmd.command [:destroy] do |c|
 

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

@@ -3,19 +3,11 @@ module Brightbox
 
     cmd.default_command :list
 
-    cmd.desc "List load balancers"
+    cmd.desc I18n.t("lbs.list.desc")
     cmd.arg_name "[lb-id...]"
     cmd.command [:list] do |c|
       c.action do |global_options, options, args|
-
-        if args.empty?
-          lbs = LoadBalancer.find(:all)
-        else
-          lbs = LoadBalancer.find_or_call(args) do |id|
-            warn "Couldn't find load balancer #{id}"
-          end
-        end
-
+        lbs = LoadBalancer.find_all_or_warn(args)
         render_table(lbs, global_options)
       end
     end

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

@@ -1,7 +1,7 @@
 module Brightbox
   command [:lbs] do |cmd|
 
-    cmd.desc "Remove nodes from a load balancer"
+    cmd.desc I18n.t("lbs.remove_nodes.desc")
     cmd.arg_name "lb-id node-id..."
     cmd.command [:remove_nodes] do |c|
 
@@ -13,7 +13,7 @@ module Brightbox
 
         # We don't want to check servers exist as you can remove deleted
         # servers from a load balancer.
-        nodes = args.collect { |a| Server.new(a) }
+        nodes = args.map { |a| Server.new(a) }
 
         info "Removing #{nodes.size} nodes from load balancer #{lb.id}"
         lb.remove_nodes nodes

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

@@ -1,17 +1,12 @@
 module Brightbox
   command [:lbs] do |cmd|
 
-    cmd.desc "Show detailed load balancer info"
+    cmd.desc I18n.t("lbs.show.desc")
     cmd.arg_name "lbs-id..."
     cmd.command [:show] do |c|
 
       c.action do |global_options, options, args|
-
-        raise "You must specify load balancers to show" if args.empty?
-
-        lbs = LoadBalancer.find_or_call(args) do |id|
-          raise "Couldn't find lb #{id}"
-        end
+        lbs = LoadBalancer.find_all_or_warn(args)
 
         table_opts = global_options.merge(
           :vertical => true,
@@ -22,7 +17,9 @@ module Brightbox
             :created_at,
             :deleted_at,
             :policy,
+            :ssl_issuer,
             :ssl_subject,
+            :ssl_valid_from,
             :ssl_expires_at,
             :cloud_ips,
             :nodes,

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

@@ -1,12 +1,12 @@
 module Brightbox
   command [:lbs] do |cmd|
 
-    cmd.desc "Update a load balancer"
-    cmd.long_desc "All intervals and timeouts are in milliseconds"
+    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 "Friendly name of load balancer"
+      c.desc I18n.t("options.name.desc")
       c.flag [:n, :name]
 
       c.desc "Load balancer policy"
@@ -50,20 +50,26 @@ module Brightbox
         lb_id = args.shift
         raise "You must specify the load balancer to update as the first argument" unless lb_id =~ /^lba-/
 
-          lbopts = NilableHash.new
+        lbopts = NilableHash.new
 
         unless args.empty?
-          lbopts[:nodes] = args.collect { |a| { :node => a } }
+          lbopts[:nodes] = args.map { |a| { :node => a } }
         end
 
-        hc_arg_lookup = { :k => :port, :y => :type, :t => :timeout, :s =>
-                          :request, :e => :interval, :u => :threshold_up, :d =>
-                          :threshold_down }
+        hc_arg_lookup = {
+          :k => :port,
+          :y => :type,
+          :t => :timeout,
+          :s => :request,
+          :e => :interval,
+          :u => :threshold_up,
+          :d => :threshold_down
+        }
 
         healthcheck = {}
 
         options.keys.each do |k|
-          if options[k] and hc_arg_lookup[k]
+          if options[k] && hc_arg_lookup[k]
             healthcheck[hc_arg_lookup[k]] = options[k]
           end
         end
@@ -73,7 +79,7 @@ module Brightbox
         end
 
         if options[:l]
-          lbopts[:listeners] = options[:l].split(",").collect do |l|
+          lbopts[:listeners] = options[:l].split(",").map do |l|
             inport, output, protocol, timeout = l.split ":"
             { :in => inport, :out => output, :protocol => protocol, :timeout => timeout }
           end

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

@@ -1,8 +1,8 @@
 module Brightbox
-  desc "Manages an account's servers"
+  desc I18n.t("servers.desc")
   command [:servers] do |cmd|
 
-    cmd.desc "Activate the console service for one or more servers"
+    cmd.desc I18n.t("servers.activate_console.desc")
     cmd.arg_name "server-id..."
     cmd.command [:activate_console] do |c|
 
@@ -20,7 +20,7 @@ module Brightbox
           info "Activating console for server #{s}"
           r = s.activate_console
           url = "#{r["console_url"]}/?password=#{r["console_token"]}"
-            expires = Time.parse(r["console_token_expires"])
+          expires = Time.parse(r["console_token_expires"])
           consoles << { :url => url, :token => r["console_token"], :expires => expires.localtime.to_s }
         end
 

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

@@ -1,10 +1,13 @@
 module Brightbox
   command [:servers] do |cmd|
 
-    cmd.desc "Create servers"
+    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.desc "Number of servers to create"
       c.default_value 1
       c.flag [:i, "server-count"], :type => Integer
@@ -16,9 +19,6 @@ module Brightbox
       c.default_value "nano"
       c.flag [:t, :type]
 
-      c.desc "Friendly name of server"
-      c.flag [:n, :name]
-
       c.desc "Specify user data"
       c.flag [:m, "user-data"]
 

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

@@ -1,7 +1,7 @@
 module Brightbox
   command [:servers] do |cmd|
 
-    cmd.desc "Destroy servers"
+    cmd.desc I18n.t("servers.destroy.desc")
     cmd.arg_name "[server-id...]"
     cmd.command [:destroy] do |c|
       c.action do |global_options, options, args|
@@ -16,7 +16,7 @@ module Brightbox
           info "Destroying server #{server}"
           begin
             server.destroy
-          rescue Brightbox::Api::Conflict => e
+          rescue Brightbox::Api::Conflict
             error "Could not destroy #{server}"
           end
         end

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

@@ -13,18 +13,17 @@ module Brightbox
       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)
 
-          if args.empty?
-            servers = Server.find(:all)
-        else
-          servers = Server.find_or_call(args) do |id|
-            warn "Couldn't find server #{id}"
+        # Scope by group if a group identifier is specified
+        if options[:g]
+          servers = servers.select do
+            |server| server.server_groups.any? do |grp|
+              grp["id"] == options[:g]
+            end
           end
         end
 
-        # Scope by group if a group identifier is specified
-        servers = servers.select {|server| server.server_groups.any? {|grp| grp["id"] == options[:g] } } if options[:g]
-
         render_table(servers, global_options)
       end
     end

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

@@ -6,12 +6,7 @@ module Brightbox
     cmd.command [:show] do |c|
 
       c.action do |global_options, options, args|
-
-        raise "You must specify servers to show" if args.empty?
-
-        servers = DetailedServer.find_or_call(args) do |id|
-          raise "Couldn't find server #{id}"
-        end
+        servers = DetailedServer.find_all_or_warn(args)
 
         table_opts = global_options.merge(:vertical => true)
         render_table(servers, table_opts)

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

@@ -1,7 +1,7 @@
 module Brightbox
   command [:servers] do |cmd|
 
-    cmd.desc "Shutdown the specified servers, aka clicking 'shutdown' in the OS"
+    cmd.desc I18n.t("servers.shutdown.desc")
     cmd.arg_name "server-id..."
     cmd.command [:shutdown] do |c|
       c.action do |global_options, options, args|

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

@@ -1,7 +1,7 @@
 module Brightbox
   command [:servers] do |cmd|
 
-    cmd.desc "Snapshot the specified servers"
+    cmd.desc I18n.t("servers.snapshot.desc")
     cmd.arg_name "server-id..."
     cmd.command [:snapshot] do |c|
 

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

@@ -1,7 +1,7 @@
 module Brightbox
   command [:servers] do |cmd|
 
-    cmd.desc "Start the specified servers"
+    cmd.desc I18n.t("servers.start.desc")
     cmd.arg_name "server-id..."
     cmd.command [:start] do |c|
 

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

@@ -1,7 +1,7 @@
 module Brightbox
   command [:servers] do |cmd|
 
-    cmd.desc "Stop the specified servers, aka turning the power off"
+    cmd.desc I18n.t("servers.stop.desc")
     cmd.arg_name "server-id..."
     cmd.command [:stop] do |c|
 

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

@@ -1,11 +1,11 @@
 module Brightbox
   command [:servers] do |cmd|
 
-    cmd.desc "Update a server"
+    cmd.desc I18n.t("servers.update.desc")
     cmd.arg_name "server-id"
     cmd.command [:update] do |c|
 
-      c.desc "Friendly name of server"
+      c.desc I18n.t("options.name.desc")
       c.flag [:n, :name]
 
       c.desc "Specify user data"

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

@@ -0,0 +1,66 @@
+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.desc I18n.t("options.description.desc")
+        c.flag [:d, "description"]
+
+        c.desc I18n.t("sql.instances.options.allow_access.desc")
+        c.flag [:"allow-access"]
+
+        # Database type
+        c.desc I18n.t("sql.instances.options.type.desc")
+        c.flag [:t, :type]
+
+        # Database Engine / Version (e.g. "mysql-5.6"
+        c.desc I18n.t("sql.instances.options.engine.desc")
+        c.flag [:engine]
+        c.desc I18n.t("sql.instances.options.engine_version.desc")
+        c.flag ["engine-version"]
+
+        # Snapshot
+        c.desc I18n.t("sql.instances.options.snapshot.desc")
+        c.flag [:snapshot]
+
+        # Zone
+        c.desc I18n.t("sql.instances.options.zone.desc")
+        c.flag [:z, "zone"]
+
+        c.action do |global_options, options, args|
+          params = {}
+
+          params[:name] = options[:n] if options[:n]
+          params[:description] = options[:d] if options[:d]
+
+          if options[:"allow-access"]
+            access_items = options[:"allow-access"].split(",")
+            params[:allow_access] = access_items
+          end
+
+          params[:database_engine] = options[:engine] if options[:engine]
+          params[:database_version] = options["engine-version"] if options["engine-version"]
+          params[:snapshot_id] = options[:snapshot] if options[:snapshot]
+          params[:flavor_id] = options[:type] if options[:type]
+          params[:zone_id] = options[:zone] if options[:zone]
+
+          server = DatabaseServer.create(params)
+          table_options = global_options.merge(
+            :vertical => true,
+            :fields => DatabaseServer.detailed_fields
+          )
+
+          render_table([server], table_options)
+        end
+      end
+    end
+  end
+end