brightbox-cli 1.2.2 → 1.3.0

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

@@ -5,15 +5,29 @@ module Brightbox
     cmd.arg_name "image-id..."
     cmd.command [:show] do |c|
 
-      c.action do |global_options, options, args|
+      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, :arch, :name,
-            :description, :username, :virtual_size, :disk_size, :public,
-            :"compatibility_mode", :official, :ancestor_id, :licence_name
+            :id,
+            :type,
+            :owner,
+            :created_at,
+            :status,
+            :locked,
+            :arch,
+            :name,
+            :description,
+            :username,
+            :virtual_size,
+            :disk_size,
+            :public,
+            :"compatibility_mode",
+            :official,
+            :ancestor_id,
+            :licence_name
           ]
         }
 

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

@@ -6,7 +6,7 @@ module Brightbox
     cmd.arg_name "lb-id node-id..."
     cmd.command [:add_nodes] do |c|
 
-      c.action do |global_options, options, args|
+      c.action do |global_options, _options, args|
 
         raise "You must specify the load balancer and the node ids to add" if args.size < 2
 

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

@@ -5,7 +5,7 @@ module Brightbox
     cmd.arg_name "lb-id..."
     cmd.command [:destroy] do |c|
 
-      c.action do |global_options, options, args|
+      c.action do |_global_options, _options, args|
 
         raise "You must specify the load balancers to destroy" if args.empty?
 

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

@@ -6,7 +6,7 @@ module Brightbox
     cmd.desc I18n.t("lbs.list.desc")
     cmd.arg_name "[lb-id...]"
     cmd.command [:list] do |c|
-      c.action do |global_options, options, args|
+      c.action do |global_options, _options, args|
         lbs = LoadBalancer.find_all_or_warn(args)
         render_table(lbs, global_options)
       end

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

@@ -0,0 +1,37 @@
+module Brightbox
+  command [:lbs] do |cmd|
+    cmd.desc I18n.t("lbs.lock.desc")
+    cmd.arg_name "[lbs-id...]"
+    cmd.command [:lock] do |c|
+      c.action do |_global_options, _options, args|
+        raise "You must specify load balancers as arguments" if args.empty?
+
+        balancers = LoadBalancer.find_or_call(args) do |balancer|
+          raise "Couldn't find #{balancer}"
+        end
+
+        balancers.each do |balancer|
+          info "Locking #{balancer}"
+          balancer.lock!
+        end
+      end
+    end
+
+    cmd.desc I18n.t("lbs.unlock.desc")
+    cmd.arg_name "[lbs-id...]"
+    cmd.command [:unlock] do |c|
+      c.action do |_global_options, _options, args|
+        raise "You must specify load balancers as arguments" if args.empty?
+
+        balancers = LoadBalancer.find_or_call(args) do |balancer|
+          raise "Couldn't find #{balancer}"
+        end
+
+        balancers.each do |balancer|
+          info "Unlocking #{balancer}"
+          balancer.unlock!
+        end
+      end
+    end
+  end
+end

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

@@ -5,7 +5,7 @@ module Brightbox
     cmd.arg_name "lb-id node-id..."
     cmd.command [:remove_nodes] do |c|
 
-      c.action do |global_options, options, args|
+      c.action do |global_options, _options, args|
 
         raise "You must specify the load balancer and the node ids to remove" if args.size < 2
 

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

@@ -5,7 +5,7 @@ module Brightbox
     cmd.arg_name "lbs-id..."
     cmd.command [:show] do |c|
 
-      c.action do |global_options, options, args|
+      c.action do |global_options, _options, args|
         lbs = LoadBalancer.find_all_or_warn(args)
 
         table_opts = global_options.merge(
@@ -13,6 +13,7 @@ module Brightbox
           :fields => [
             :id,
             :status,
+            :locked,
             :name,
             :created_at,
             :deleted_at,
@@ -25,7 +26,7 @@ module Brightbox
             :nodes,
             :listeners,
             :healthcheck
-        ])
+          ])
 
         render_table(lbs, table_opts)
 

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

@@ -6,7 +6,7 @@ module Brightbox
     cmd.arg_name "server-id..."
     cmd.command [:activate_console] do |c|
 
-      c.action do |global_options, options, args|
+      c.action do |global_options, _options, args|
 
         raise "You must specify servers to activate the console for" if args.empty?
 

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

@@ -4,7 +4,7 @@ module Brightbox
     cmd.desc I18n.t("servers.destroy.desc")
     cmd.arg_name "[server-id...]"
     cmd.command [:destroy] do |c|
-      c.action do |global_options, options, args|
+      c.action do |_global_options, _options, args|
 
         raise "You must specify servers to destroy" if args.empty?
 

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

@@ -0,0 +1,37 @@
+module Brightbox
+  command [:servers] do |cmd|
+    cmd.desc I18n.t("servers.lock.desc")
+    cmd.arg_name "[server-id...]"
+    cmd.command [:lock] do |c|
+      c.action do |_global_options, _options, args|
+        raise "You must specify server as arguments" if args.empty?
+
+        servers = Server.find_or_call(args) do |server|
+          raise "Couldn't find #{server}"
+        end
+
+        servers.each do |server|
+          info "Locking #{server}"
+          server.lock!
+        end
+      end
+    end
+
+    cmd.desc I18n.t("servers.unlock.desc")
+    cmd.arg_name "[server-id...]"
+    cmd.command [:unlock] do |c|
+      c.action do |_global_options, _options, args|
+        raise "You must specify servers as arguments" if args.empty?
+
+        servers = Server.find_or_call(args) do |server|
+          raise "Couldn't find #{server}"
+        end
+
+        servers.each do |server|
+          info "Unlocking #{server}"
+          server.unlock!
+        end
+      end
+    end
+  end
+end

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

@@ -0,0 +1,20 @@
+module Brightbox
+  command [:servers] do |cmd|
+    cmd.desc I18n.t("servers.reboot.desc")
+    cmd.arg_name "server-id..."
+    cmd.command [:reboot] do |c|
+      c.action do |_global_options, _options, args|
+        raise "You must specify servers to reboot" if args.empty?
+
+        servers = Server.find_or_call(args) do |id|
+          raise "Couldn't find #{id}"
+        end
+
+        servers.each do |server|
+          info "Sending reboot to #{server}"
+          server.reboot(false)
+        end
+      end
+    end
+  end
+end

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

@@ -0,0 +1,20 @@
+module Brightbox
+  command [:servers] do |cmd|
+    cmd.desc I18n.t("servers.reset.desc")
+    cmd.arg_name "server-id..."
+    cmd.command [:reset] do |c|
+      c.action do |_global_options, _options, args|
+        raise "You must specify servers to reset" if args.empty?
+
+        servers = Server.find_or_call(args) do |id|
+          raise "Couldn't find #{id}"
+        end
+
+        servers.each do |server|
+          info "Sending reset to #{server}"
+          server.reboot(true)
+        end
+      end
+    end
+  end
+end

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

@@ -5,7 +5,7 @@ module Brightbox
     cmd.arg_name "server-id..."
     cmd.command [:show] do |c|
 
-      c.action do |global_options, options, args|
+      c.action do |global_options, _options, args|
         servers = DetailedServer.find_all_or_warn(args)
 
         table_opts = global_options.merge(:vertical => true)

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

@@ -4,7 +4,7 @@ module Brightbox
     cmd.desc I18n.t("servers.shutdown.desc")
     cmd.arg_name "server-id..."
     cmd.command [:shutdown] do |c|
-      c.action do |global_options, options, args|
+      c.action do |_global_options, _options, args|
 
         raise "You must specify servers to shutdown" if args.empty?
 

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

@@ -5,7 +5,7 @@ module Brightbox
     cmd.arg_name "server-id..."
     cmd.command [:snapshot] do |c|
 
-      c.action do |global_options, options, args|
+      c.action do |_global_options, _options, args|
 
         raise "You must specify servers to snapshot" if args.empty?
 

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

@@ -5,7 +5,7 @@ module Brightbox
     cmd.arg_name "server-id..."
     cmd.command [:start] do |c|
 
-      c.action do |global_options, options, args|
+      c.action do |_global_options, _options, args|
 
         raise "You must specify servers to start" if args.empty?
 

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

@@ -5,7 +5,7 @@ module Brightbox
     cmd.arg_name "server-id..."
     cmd.command [:stop] do |c|
 
-      c.action do |global_options, options, args|
+      c.action do |_global_options, _options, args|
 
         raise "You must specify servers to stop" if args.empty?
 

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

@@ -35,7 +35,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 = {}
 
           params[:name] = options[:n] if options[:n]

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

@@ -5,7 +5,7 @@ module Brightbox
       cmd.desc I18n.t("sql.instances.destroy.desc")
       cmd.arg_name "[instance-id...]"
       cmd.command [:destroy] do |c|
-        c.action do |global_options, options, args|
+        c.action do |_global_options, _options, args|
 
           raise "You must specify instance IDs to destroy" if args.empty?
 

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

@@ -10,7 +10,7 @@ module Brightbox
       cmd.arg_name "[instance-id...]"
       cmd.command [:list] do |c|
 
-        c.action do |global_options, options, args|
+        c.action do |global_options, _options, args|
           if args.empty?
             servers = DatabaseServer.find(:all)
           else

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

@@ -0,0 +1,39 @@
+module Brightbox
+  command [:sql] do |product|
+    product.command [:instances] do |cmd|
+      cmd.desc I18n.t("sql.instances.lock.desc")
+      cmd.arg_name "[instance-id...]"
+      cmd.command [:lock] do |c|
+        c.action do |_global_options, _options, args|
+          raise "You must specify sql instances as arguments" if args.empty?
+
+          instances = DatabaseServer.find_or_call(args) do |instance|
+            raise "Couldn't find #{instance}"
+          end
+
+          instances.each do |instance|
+            info "Locking #{instance}"
+            instance.lock!
+          end
+        end
+      end
+
+      cmd.desc I18n.t("sql.instances.unlock.desc")
+      cmd.arg_name "[instance-id...]"
+      cmd.command [:unlock] do |c|
+        c.action do |_global_options, _options, args|
+          raise "You must specify sql instances as arguments" if args.empty?
+
+          instances = DatabaseServer.find_or_call(args) do |instance|
+            raise "Couldn't find #{instance}"
+          end
+
+          instances.each do |instance|
+            info "Unlocking #{instance}"
+            instance.unlock!
+          end
+        end
+      end
+    end
+  end
+end

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

@@ -5,7 +5,7 @@ module Brightbox
       cmd.desc I18n.t("sql.instances.reset_password.desc")
       cmd.arg_name "server-id"
       cmd.command [:"reset-password"] do |c|
-        c.action do |global_options, options, args|
+        c.action do |global_options, _options, args|
           dbs_id = args.shift
           unless dbs_id =~ /^dbs-/
             raise "You must specify a valid SQL instance ID as the first argument"

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

@@ -6,7 +6,7 @@ module Brightbox
       cmd.arg_name "instance-id..."
       cmd.command [:show] do |c|
 
-        c.action do |global_options, options, args|
+        c.action do |global_options, _options, args|
 
           raise "You must specify instance IDs to show" if args.empty?
 

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

@@ -6,7 +6,7 @@ module Brightbox
       cmd.arg_name "[instance-id...]"
       cmd.command [:snapshot] do |c|
 
-        c.action do |global_options, options, args|
+        c.action do |_global_options, _options, args|
 
           raise "You must specify SQL instance IDs to snapshot" if args.empty?
 

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

@@ -8,7 +8,7 @@ module Brightbox
       cmd.arg_name "[snapshot-id...]"
 
       cmd.command [:destroy] do |c|
-        c.action do |global_options, options, args|
+        c.action do |_global_options, _options, args|
 
           raise "You must specify snapshots to destroy" if args.empty?
 

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

@@ -8,7 +8,7 @@ module Brightbox
       cmd.arg_name "[snapshot-id...]"
       cmd.command [:list] do |c|
 
-        c.action do |global_options, options, args|
+        c.action do |global_options, _options, args|
           if args.empty?
             snapshots = DatabaseSnapshot.find(:all)
           else

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

@@ -0,0 +1,39 @@
+module Brightbox
+  command [:sql] do |product|
+    product.command [:snapshots] do |cmd|
+      cmd.desc I18n.t("sql.snapshots.lock.desc")
+      cmd.arg_name "[snapshot-id...]"
+      cmd.command [:lock] do |c|
+        c.action do |_global_options, _options, args|
+          raise "You must specify sql snapshots as arguments" if args.empty?
+
+          snapshots = DatabaseSnapshot.find_or_call(args) do |snapshot|
+            raise "Couldn't find #{snapshot}"
+          end
+
+          snapshots.each do |snapshot|
+            info "Locking #{snapshot}"
+            snapshot.lock!
+          end
+        end
+      end
+
+      cmd.desc I18n.t("sql.snapshots.unlock.desc")
+      cmd.arg_name "[snapshot-id...]"
+      cmd.command [:unlock] do |c|
+        c.action do |_global_options, _options, args|
+          raise "You must specify sql snapshots as arguments" if args.empty?
+
+          snapshots = DatabaseSnapshot.find_or_call(args) do |snapshot|
+            raise "Couldn't find #{snapshot}"
+          end
+
+          snapshots.each do |snapshot|
+            info "Unlocking #{snapshot}"
+            snapshot.unlock!
+          end
+        end
+      end
+    end
+  end
+end

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

@@ -6,7 +6,7 @@ module Brightbox
       cmd.arg_name "[snapshot-id...]"
       cmd.command [:show] do |c|
 
-        c.action do |global_options, options, args|
+        c.action do |global_options, _options, args|
 
           raise "You must specify snapshot ids to show" if args.empty?
 
@@ -16,7 +16,14 @@ module Brightbox
 
           table_opts = global_options.merge(
             :vertical => true,
-            :fields => [:id, :name, :description, :status, :created_on]
+            :fields => [
+              :id,
+              :name,
+              :description,
+              :status,
+              :locked,
+              :created_on
+            ]
           )
           render_table(servers, table_opts)
         end

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

@@ -10,7 +10,7 @@ module Brightbox
       cmd.arg_name "[type-id...]"
       cmd.command [:list] do |c|
 
-        c.action do |global_options, options, args|
+        c.action do |global_options, _options, args|
 
           if args.empty?
             types = DatabaseType.find :all
@@ -28,7 +28,7 @@ module Brightbox
       cmd.arg_name "[type-id...]"
       cmd.command [:show] do |c|
 
-        c.action do |global_options, options, args|
+        c.action do |global_options, _options, args|
 
           if args.empty?
             raise "You must specify the types you want to show"

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

@@ -8,7 +8,7 @@ module Brightbox
     cmd.arg_name "[type-id...]"
     cmd.command [:list] do |c|
 
-      c.action do |global_options, options, args|
+      c.action do |global_options, _options, args|
 
         if args.empty?
           types = Type.find :all
@@ -26,7 +26,7 @@ module Brightbox
     cmd.arg_name "type-id..."
     cmd.command [:show] do |c|
 
-      c.action do |global_options, options, args|
+      c.action do |global_options, _options, args|
 
         if args.empty?
           raise "You must specify the types you want to show"

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

@@ -7,7 +7,7 @@ module Brightbox
     cmd.desc "List your collaborations"
     cmd.arg_name "[collaboration-id...]"
     cmd.command [:list] do |c|
-      c.action do |global_options, options, args|
+      c.action do |global_options, _options, args|
         if args.empty?
           collaborations = UserCollaboration.find(:all)
         else
@@ -22,7 +22,7 @@ module Brightbox
     cmd.desc "Show details of collaborations"
     cmd.arg_name "[collaboration-id...]"
     cmd.command [:show] do |c|
-      c.action do |global_options, options, args|
+      c.action do |global_options, _options, args|
         collaborations = UserCollaboration.find_or_call(args) do |id|
           warn "Couldn't find collaboration #{id}"
         end

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

@@ -8,7 +8,7 @@ module Brightbox
     cmd.arg_name "[user-id...]"
     cmd.command [:list] do |c|
 
-      c.action do |global_options, options, args|
+      c.action do |global_options, _options, args|
         users = User.find_all_or_warn(args)
         render_table(users, global_options)
       end

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

@@ -5,7 +5,7 @@ module Brightbox
     cmd.arg_name "user-id..."
     cmd.command [:show] do |c|
 
-      c.action do |global_options, options, args|
+      c.action do |global_options, _options, args|
         users = User.find_all_or_warn(args)
 
         table_opts = global_options.merge(

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

@@ -8,7 +8,7 @@ module Brightbox
     cmd.arg_name "[zone-id...]"
     cmd.command [:list] do |c|
 
-      c.action do |global_options, options, args|
+      c.action do |global_options, _options, args|
 
         if args.empty?
           zones = Zone.find(:all)

data/lib/brightbox-cli/config/accounts.rb

@@ -44,7 +44,7 @@ module Brightbox
             service = Fog::Compute.new(to_fog)
             accounts = service.accounts
 
-            @account = accounts.select { |acc| %w{pending active}.include?(acc.status) }.first.id
+            @account = accounts.select { |acc| %w(pending active).include?(acc.status) }.first.id
             save_default_account(@account) if @account
           rescue Brightbox::BBConfigError
             # We can't get a suitable fog connection so we can't select an

data/lib/brightbox-cli/config/api_client.rb

@@ -1,7 +1,7 @@
 module Brightbox
   module Config
     class ApiClient
-      NON_BLANK_KEYS = %w{api_url client_id secret}
+      NON_BLANK_KEYS = %w(api_url client_id secret)
 
       attr_accessor :selected_config, :client_name
 
@@ -31,8 +31,8 @@ module Brightbox
       private
 
       def persistent?
-        if selected_config["persistent"]
-          selected_config["persistent"]
+        if selected_config["persistent"] == "false"
+          false
         else
           true
         end

data/lib/brightbox-cli/config/authentication_tokens.rb

@@ -12,7 +12,7 @@ module Brightbox
         if defined?(@access_token) && !@access_token.nil?
           return @access_token
         end
-        if File.exists?(access_token_filename)
+        if File.exist?(access_token_filename)
           @access_token = cached_access_token
         else
           @access_token = nil
@@ -28,7 +28,7 @@ module Brightbox
         if defined?(@refresh_token) && !@refresh_token.nil?
           return @refresh_token
         end
-        if File.exists?(refresh_token_filename)
+        if File.exist?(refresh_token_filename)
           @refresh_token = cached_refresh_token
         else
           @refresh_token = nil

data/lib/brightbox-cli/config/cache.rb

@@ -6,7 +6,7 @@ module Brightbox
           @cache_path
         else
           @cache_path = File.join(config_directory, 'cache')
-          unless File.exists? @cache_path
+          unless File.exist? @cache_path
             begin
               FileUtils.mkpath @cache_path
             rescue Errno::EEXIST

data/lib/brightbox-cli/config/dirty.rb

@@ -7,7 +7,7 @@ module Brightbox
     module Dirty
       # @return [Boolean] +true+ if config has been modified since loading
       def dirty?
-        !! @dirty
+        !!@dirty
       end
 
       # Mark the config as being dirty

data/lib/brightbox-cli/config/user_application.rb

@@ -3,7 +3,7 @@ module Brightbox
     class UserApplication
       # FIXME: api_url should use fog's underlying default
       #
-      NON_BLANK_KEYS = %w{api_url client_id secret username}
+      NON_BLANK_KEYS = %w(api_url client_id secret username)
 
       attr_accessor :selected_config, :client_name
 
@@ -56,8 +56,8 @@ module Brightbox
       private
 
       def persistent?
-        if selected_config["persistent"]
-          selected_config["persistent"]
+        if selected_config["persistent"] == "false"
+          false
         else
           true
         end