brightbox-cli 1.2.2 → 1.3.0

data/lib/brightbox-cli/config.rb

@@ -50,7 +50,7 @@ module Brightbox
     #
     # @return [Boolean]
     def config_directory_exists?
-      File.exists?(config_directory) && File.directory?(config_directory)
+      File.exist?(config_directory) && File.directory?(config_directory)
     end
 
     # The String path to the configuration file itself (in .ini format)
@@ -126,7 +126,7 @@ module Brightbox
     # in
     #
     def create_directory
-      unless File.exists? config_directory
+      unless File.exist? config_directory
         begin
           FileUtils.mkdir config_directory
         rescue Errno::EEXIST

data/lib/brightbox-cli/database_server.rb

@@ -46,7 +46,7 @@ module Brightbox
     # These are all the fields show in the longer table form
     def self.detailed_fields
       [
-        :id, :name, :description, :status,
+        :id, :name, :description, :status, :locked,
         :type, :engine, :version,
         :zone,
         :created_on,
@@ -71,6 +71,7 @@ module Brightbox
     def to_row
       a = fog_model.attributes
       a[:status] = fog_model.state
+      a[:locked] = locked?
       a[:type] = type_identifier
       a[:db_engine] = engine_version
       a[:engine] = database_engine

data/lib/brightbox-cli/database_snapshot.rb

@@ -29,6 +29,7 @@ module Brightbox
     def to_row
       a = fog_model.attributes
       a[:status] = fog_model.state
+      a[:locked] = locked?
       a[:created_on] = fog_model.created_at.strftime("%Y-%m-%d")
       a
     end

data/lib/brightbox-cli/detailed_server.rb

@@ -37,6 +37,7 @@ module Brightbox
       [
         :id,
         :status,
+        :locked,
         :name,
         :created_at,
         :deleted_at,

data/lib/brightbox-cli/gli_global_hooks.rb

@@ -32,7 +32,7 @@ module Brightbox
   desc "Disable peer SSL certificate verification"
   switch [:k, :insecure], :negatable => false
 
-  pre do |global_options, command, options, args|
+  pre do |global_options, command, _options, _args|
     if command.topmost_ancestor.name == :config
       force_default_config = false
     else
@@ -73,7 +73,7 @@ module Brightbox
     true
   end
 
-  post do |global_options, command, options, args|
+  post do |_global_options, _command, _options, _args|
     begin
       # Api.conn is another global which holds the authentication tokens so
       # we need to shuffle data between globals at a higher level rather than

data/lib/brightbox-cli/images.rb

@@ -45,7 +45,7 @@ module Brightbox
       end
 
       snapshots = images.select { |i| i.source_type == 'snapshot' }
-      images = images - snapshots
+      images -= snapshots
 
       images.sort! { |a, b| a.default_sort_fields <=> b.default_sort_fields }
       snapshots.sort! { |a, b| a.created_at <=> b.created_at }
@@ -78,6 +78,7 @@ module Brightbox
       o = fog_model.attributes
       o[:id] = fog_model.id
       o[:status] = status
+      o[:locked] = locked?
       o[:username] = username
       o[:arch] = arch
       o[:name] = name.to_s + " (#{arch})"

data/lib/brightbox-cli/legacy/args_adjuster.rb

@@ -16,9 +16,9 @@ module Brightbox
         @globals = []
 
         parser = OptionParser.new do |opts|
-          opts.on("-v", "--version") { |op| @globals << "-v" }
-          opts.on("-s", "--simple") { |op| @globals << "-s" }
-          opts.on("-k", "--insecure") { |op| @globals << "-k" }
+          opts.on("-v", "--version") { |_op| @globals << "-v" }
+          opts.on("-s", "--simple") { |_op| @globals << "-s" }
+          opts.on("-k", "--insecure") { |_op| @globals << "-k" }
           opts.on("-c", "--client CLIENT") { |op| @globals << "-c" << op }
           opts.on("--account ACCOUNT") { |op| @globals << "--account" << op }
         end

data/lib/brightbox-cli/load_balancers.rb

@@ -11,6 +11,7 @@ module Brightbox
 
     def to_row
       attributes.merge(
+        :locked => locked?,
         :ssl_issuer => certificate_issuer,
         :ssl_subject => certificate_subject,
         :ssl_valid_from => certificate_valid_from,

data/lib/brightbox-cli/servers.rb

@@ -3,7 +3,7 @@ module Brightbox
     def self.require_account?; true; end
 
     def self.create_servers(count, options)
-      (0...count).map { |i| create(options) }
+      (0...count).map { |_i| create(options) }
     end
 
     def self.create(options)
@@ -43,6 +43,7 @@ module Brightbox
       a[:created_on] = created_on
       a[:type] = server_type['handle']
       a[:status] = fog_model.state
+      a[:locked] = locked?
       a[:zone] = zone && zone['handle']
       a[:hostname] = id
       a[:public_hostname] = "public.#{fqdn}" unless cloud_ips.empty?

data/lib/brightbox-cli/user_collaboration.rb

@@ -24,7 +24,7 @@ module Brightbox
     #
     def self.get_for_account(account_id)
       collaborations = conn.user_collaborations
-      open_collaborations = collaborations.select { |col| %w{pending accepted}.include?(col.status) }
+      open_collaborations = collaborations.select { |col| %w(pending accepted).include?(col.status) }
       collaboration = open_collaborations.find do |col|
         col.account_id == account_id
       end

data/lib/brightbox-cli/version.rb

@@ -1,3 +1,3 @@
 module Brightbox
-  VERSION = "1.2.2" unless defined?(Brightbox::VERSION)
+  VERSION = "1.3.0" unless defined?(Brightbox::VERSION)
 end

data/lib/brightbox_cli.rb

@@ -10,14 +10,14 @@ lib_dir = File.expand_path(File.dirname(__FILE__))
 
 $LOAD_PATH.unshift lib_dir unless $LOAD_PATH.include?(lib_dir)
 
-os_config = File.join(lib_dir,"brightbox-cli","os_config.rb")
+os_config = File.join(lib_dir, "brightbox-cli", "os_config.rb")
 require os_config if File.exist? os_config
 
-vendor_dir = File.expand_path(File.join(lib_dir, 'brightbox-cli','vendor'))
+vendor_dir = File.expand_path(File.join(lib_dir, 'brightbox-cli', 'vendor'))
 
 # Add any vendored libraries into search path
 Dir.glob(vendor_dir + '/*').each do |f|
-  $:.unshift File.join(f, 'lib')
+  $LOAD_PATH.unshift File.join(f, 'lib')
 end
 
 require "multi_json"

data/locales/en.yml

@@ -104,10 +104,14 @@ en:
       desc: Destroy images
     list:
       desc: List images
+    lock:
+      desc: Lock images
     register:
       desc: Register an image in the image library
     show:
       desc: Show images
+    unlock:
+      desc: Unlock images
     update:
       desc: Update an image
   lbs:
@@ -121,10 +125,14 @@ en:
       desc: Destroy load balancers
     list:
       desc: List load balancers
+    lock:
+      desc: Lock load balancers
     remove_nodes:
       desc: Remove servers from a load balancer
     show:
       desc: Show load balancers
+    unlock:
+      desc: Unlock load balancers
     update:
       desc: Update a load balancer
       long_desc: All intervals and timeouts are in milliseconds
@@ -136,6 +144,12 @@ en:
       desc: Create servers
     destroy:
       desc: Destroy servers
+    lock:
+      desc: Lock servers
+    reboot:
+      desc: Reboot servers (OS reboot issued)
+    reset:
+      desc: Reset servers (Hardward reset issued)
     show:
       desc: Show servers
     shutdown:
@@ -146,6 +160,8 @@ en:
       desc: Start servers
     stop:
       desc: Stop servers with equivalent of powering off
+    unlock:
+      desc: Unlock servers
     update:
       desc: Update a server
   sql:
@@ -169,6 +185,8 @@ en:
         desc: Create a new Cloud SQL instance
       destroy:
         desc: Destroy Cloud SQL instances
+      lock:
+        desc: Lock Cloud SQL instances
       list:
         desc: List Cloud SQL instances
       reset_password:
@@ -177,16 +195,22 @@ en:
         desc: Show details of Cloud SQL instances
       snapshot:
         desc: Create a new Cloud SQL snapshot from an instance
+      unlock:
+        desc: Unlock Cloud SQL instances
       update:
         desc: Update a Cloud SQL instance
     snapshots:
       desc: Manage Cloud SQL snapshots
       list:
         desc: List Cloud SQL snapshots
+      lock:
+        desc: Lock Cloud SQL snapshots
       destroy:
         desc: Destroy a number of Cloud SQL snapshots
       show:
         desc: Show details of Cloud SQL snapshots
+      unlock:
+        desc: Unlock Cloud SQL snapshots
       update:
         desc: Update a Cloud SQL snapshot's metadata
     types:

data/spec/commands/accounts/default_spec.rb

@@ -3,12 +3,12 @@ require "spec_helper"
 describe "brightbox accounts" do
 
   describe "default" do
-    let(:output) { FauxIO.new { Brightbox::run(argv) } }
+    let(:output) { FauxIO.new { Brightbox.run(argv) } }
     let(:stdout) { output.stdout }
     let(:stderr) { output.stderr }
 
     context "" do
-      let(:argv) { ["accounts", "default"] }
+      let(:argv) { %w(accounts default) }
 
       it "does not error" do
         expect { output }.to_not raise_error

data/spec/commands/accounts/list_spec.rb

@@ -3,12 +3,12 @@ require "spec_helper"
 describe "brightbox accounts" do
 
   describe "list" do
-    let(:output) { FauxIO.new { Brightbox::run(argv) } }
+    let(:output) { FauxIO.new { Brightbox.run(argv) } }
     let(:stdout) { output.stdout }
     let(:stderr) { output.stderr }
 
     context "", :vcr do
-      let(:argv) { ["accounts", "list"] }
+      let(:argv) { %w(accounts list) }
 
       it "does not error" do
         expect { output }.to_not raise_error
@@ -18,7 +18,7 @@ describe "brightbox accounts" do
     context "(when no tokens)", :vcr do
       let(:password) { default_test_password }
 
-      let(:argv) { ["accounts", "list"] }
+      let(:argv) { %w(accounts list) }
 
       before do
         config_from_contents(USER_APP_CONFIG_CONTENTS)
@@ -37,7 +37,7 @@ describe "brightbox accounts" do
     context "(when no tokens and password incorrect)", :vcr do
       let(:password) { "wrong" }
 
-      let(:argv) { ["accounts", "list"] }
+      let(:argv) { %w(accounts list) }
 
       before do
         config_from_contents(USER_APP_CONFIG_CONTENTS)
@@ -56,7 +56,7 @@ describe "brightbox accounts" do
     context "(when access token expired)", :vcr do
       let(:password) { default_test_password }
 
-      let(:argv) { ["accounts", "list"] }
+      let(:argv) { %w(accounts list) }
 
       before do
         config = config_from_contents(USER_APP_CONFIG_CONTENTS)
@@ -74,7 +74,7 @@ describe "brightbox accounts" do
     context "(when both tokens expired)", :vcr do
       let(:password) { default_test_password }
 
-      let(:argv) { ["accounts", "list"] }
+      let(:argv) { %w(accounts list) }
 
       before do
         config = config_from_contents(USER_APP_CONFIG_CONTENTS)
@@ -93,7 +93,7 @@ describe "brightbox accounts" do
     context "(when invalid tokens)", :vcr do
       let(:password) { default_test_password }
 
-      let(:argv) { ["accounts", "list"] }
+      let(:argv) { %w(accounts list) }
 
       before do
         config = config_from_contents(USER_APP_CONFIG_CONTENTS)

data/spec/commands/accounts/reset_ftp_password_spec.rb

@@ -3,12 +3,12 @@ require "spec_helper"
 describe "brightbox accounts" do
 
   describe "reset_ftp_password" do
-    let(:output) { FauxIO.new { Brightbox::run(argv) } }
+    let(:output) { FauxIO.new { Brightbox.run(argv) } }
     let(:stdout) { output.stdout }
     let(:stderr) { output.stderr }
 
     context "" do
-      let(:argv) { ["accounts", "reset_ftp_password"] }
+      let(:argv) { %w(accounts reset_ftp_password) }
 
       it "does not error" do
         expect { output }.to_not raise_error

data/spec/commands/accounts/show_spec.rb

@@ -3,12 +3,12 @@ require "spec_helper"
 describe "brightbox accounts" do
 
   describe "show" do
-    let(:output) { FauxIO.new { Brightbox::run(argv) } }
+    let(:output) { FauxIO.new { Brightbox.run(argv) } }
     let(:stdout) { output.stdout }
     let(:stderr) { output.stderr }
 
     context "" do
-      let(:argv) { ["accounts", "show"] }
+      let(:argv) { %w(accounts show) }
 
       it "does not error" do
         expect { output }.to_not raise_error

data/spec/commands/cloudips/create_spec.rb

@@ -3,12 +3,12 @@ require "spec_helper"
 describe "brightbox cloudips" do
 
   describe "create" do
-    let(:output) { FauxIO.new { Brightbox::run(argv) } }
+    let(:output) { FauxIO.new { Brightbox.run(argv) } }
     let(:stdout) { output.stdout }
     let(:stderr) { output.stderr }
 
     context "" do
-      let(:argv) { ["cloudips", "create"] }
+      let(:argv) { %w(cloudips create) }
 
       it "does not error" do
         expect { output }.to_not raise_error

data/spec/commands/cloudips/destroy_spec.rb

@@ -3,12 +3,12 @@ require "spec_helper"
 describe "brightbox cloudips" do
 
   describe "destroy" do
-    let(:output) { FauxIO.new { Brightbox::run(argv) } }
+    let(:output) { FauxIO.new { Brightbox.run(argv) } }
     let(:stdout) { output.stdout }
     let(:stderr) { output.stderr }
 
     context "" do
-      let(:argv) { ["cloudips", "destroy"] }
+      let(:argv) { %w(cloudips destroy) }
 
       it "does not error" do
         expect { output }.to_not raise_error

data/spec/commands/cloudips/list_spec.rb

@@ -3,12 +3,12 @@ require "spec_helper"
 describe "brightbox cloudips" do
 
   describe "list" do
-    let(:output) { FauxIO.new { Brightbox::run(argv) } }
+    let(:output) { FauxIO.new { Brightbox.run(argv) } }
     let(:stdout) { output.stdout }
     let(:stderr) { output.stderr }
 
     context "" do
-      let(:argv) { ["cloudips", "list"] }
+      let(:argv) { %w(cloudips list) }
 
       it "does not error" do
         expect { output }.to_not raise_error

data/spec/commands/cloudips/map_spec.rb

@@ -3,7 +3,7 @@ require "spec_helper"
 describe "brightbox cloudips" do
 
   describe "map" do
-    let(:output) { FauxIO.new { Brightbox::run(argv) } }
+    let(:output) { FauxIO.new { Brightbox.run(argv) } }
     let(:stdout) { output.stdout }
     let(:stderr) { output.stderr }
 
@@ -15,7 +15,7 @@ describe "brightbox cloudips" do
     end
 
     context "when destination is a server ID", :vcr do
-      let(:argv) { %w{cloudips map cip-12345 srv-12345} }
+      let(:argv) { %w(cloudips map cip-12345 srv-12345) }
       let(:target) { "int-12345" }
 
       it "passes the interface identifier to the API" do
@@ -26,7 +26,7 @@ describe "brightbox cloudips" do
 
     context "when destination is another value", :vcr do
       let(:target) { "res-12345" }
-      let(:argv) { %w{cloudips map cip-12345 res-12345} }
+      let(:argv) { %w(cloudips map cip-12345 res-12345) }
 
       it "passes the identifier to the API" do
         expect_any_instance_of(Brightbox::CloudIP).to receive(:map).with(target)

data/spec/commands/cloudips/show_spec.rb

@@ -3,12 +3,12 @@ require "spec_helper"
 describe "brightbox cloudips" do
 
   describe "show" do
-    let(:output) { FauxIO.new { Brightbox::run(argv) } }
+    let(:output) { FauxIO.new { Brightbox.run(argv) } }
     let(:stdout) { output.stdout }
     let(:stderr) { output.stderr }
 
     context "" do
-      let(:argv) { ["cloudips", "show"] }
+      let(:argv) { %w(cloudips show) }
 
       it "does not error" do
         expect { output }.to_not raise_error

data/spec/commands/cloudips/unmap_spec.rb

@@ -3,12 +3,12 @@ require "spec_helper"
 describe "brightbox cloudips" do
 
   describe "unmap" do
-    let(:output) { FauxIO.new { Brightbox::run(argv) } }
+    let(:output) { FauxIO.new { Brightbox.run(argv) } }
     let(:stdout) { output.stdout }
     let(:stderr) { output.stderr }
 
     context "" do
-      let(:argv) { ["cloudips", "unmap"] }
+      let(:argv) { %w(cloudips unmap) }
 
       it "does not error" do
         expect { output }.to_not raise_error

data/spec/commands/cloudips/update_spec.rb

@@ -3,12 +3,12 @@ require "spec_helper"
 describe "brightbox cloudips" do
 
   describe "update" do
-    let(:output) { FauxIO.new { Brightbox::run(argv) } }
+    let(:output) { FauxIO.new { Brightbox.run(argv) } }
     let(:stdout) { output.stdout }
     let(:stderr) { output.stderr }
 
     context "" do
-      let(:argv) { ["cloudips", "update"] }
+      let(:argv) { %w(cloudips update) }
 
       it "does not error" do
         expect { output }.to_not raise_error

data/spec/commands/config/client_add_spec.rb

@@ -3,7 +3,7 @@ require "spec_helper"
 describe "brightbox config" do
 
   describe "client_add" do
-    let(:output) { FauxIO.new { Brightbox::run(argv) } }
+    let(:output) { FauxIO.new { Brightbox.run(argv) } }
     let(:stdout) { output.stdout }
     let(:stderr) { output.stderr }
 
@@ -14,7 +14,7 @@ describe "brightbox config" do
     let(:default_account) { "acc-12345" }
 
     context "" do
-      let(:argv) { ["config", "client_add"] }
+      let(:argv) { %w(config client_add) }
 
       it "does not error" do
         expect { output }.to_not raise_error

data/spec/commands/config/client_default_spec.rb

@@ -3,12 +3,12 @@ require "spec_helper"
 describe "brightbox config" do
 
   describe "client_default" do
-    let(:output) { FauxIO.new { Brightbox::run(argv) } }
+    let(:output) { FauxIO.new { Brightbox.run(argv) } }
     let(:stdout) { output.stdout }
     let(:stderr) { output.stderr }
 
     context "" do
-      let(:argv) { ["config", "client_default"] }
+      let(:argv) { %w(config client_default) }
 
       it "does not error" do
         expect { output }.to_not raise_error

data/spec/commands/config/client_list_spec.rb

@@ -3,12 +3,12 @@ require "spec_helper"
 describe "brightbox config" do
 
   describe "client_list" do
-    let(:output) { FauxIO.new { Brightbox::run(argv) } }
+    let(:output) { FauxIO.new { Brightbox.run(argv) } }
     let(:stdout) { output.stdout }
     let(:stderr) { output.stderr }
 
     context "" do
-      let(:argv) { ["config", "client_list"] }
+      let(:argv) { %w(config client_list) }
 
       it "does not error" do
         expect { output }.to_not raise_error

data/spec/commands/config/client_remove_spec.rb

@@ -3,12 +3,12 @@ require "spec_helper"
 describe "brightbox config" do
 
   describe "client_remove" do
-    let(:output) { FauxIO.new { Brightbox::run(argv) } }
+    let(:output) { FauxIO.new { Brightbox.run(argv) } }
     let(:stdout) { output.stdout }
     let(:stderr) { output.stderr }
 
     context "" do
-      let(:argv) { ["config", "client_remove"] }
+      let(:argv) { %w(config client_remove) }
 
       it "does not error" do
         expect { output }.to_not raise_error

data/spec/commands/config/user_add_spec.rb

@@ -7,7 +7,7 @@ require "spec_helper"
 describe "brightbox config" do
 
   describe "user_add" do
-    let(:output) { FauxIO.new { Brightbox::run(argv) } }
+    let(:output) { FauxIO.new { Brightbox.run(argv) } }
     let(:stdout) { output.stdout }
     let(:stderr) { output.stderr }
 
@@ -21,7 +21,7 @@ describe "brightbox config" do
     let(:client_alias) { email }
 
     context "" do
-      let(:argv) { ["config", "user_add"] }
+      let(:argv) { %w(config user_add) }
 
       it "does not error" do
         expect { output }.to_not raise_error
@@ -34,7 +34,7 @@ describe "brightbox config" do
       before do
         config_file = File.join(ENV["HOME"], ".brightbox", "config")
         FileUtils.rm_rf(config_file)
-        expect(File.exists?(config_file)).to be_false
+        expect(File.exist?(config_file)).to be false
         mock_password_entry(password)
       end
 
@@ -92,7 +92,6 @@ describe "brightbox config" do
       end
     end
 
-
     context "when new client is first and only client", :vcr do
       let(:argv) { ["config", "user_add", email, client_id, secret] }
 
@@ -207,7 +206,6 @@ describe "brightbox config" do
         mock_password_entry(password)
       end
 
-
       it "does not error" do
         expect { output }.to_not raise_error
         expect(stderr).to_not include("ERROR")
@@ -261,7 +259,6 @@ describe "brightbox config" do
       end
     end
 
-
     context "when application has access only one active account", :vcr do
       # Hardcoded in response, different from single account value
       let(:default_account) { "acc-33333" }

data/spec/commands/firewall_policies/update_spec.rb

@@ -2,16 +2,16 @@ require "spec_helper"
 
 describe "Firewall policies" do
   before do
-    pending "Spec is grabbing global state (from config) and breaking other specs"
+    skip "Spec is grabbing global state (from config) and breaking other specs"
   end
 
   describe "update" do
-    let(:output) { FauxIO.new { Brightbox::run(argv) } }
+    let(:output) { FauxIO.new { Brightbox.run(argv) } }
     let(:stdout) { output.stdout }
     let(:stderr) { output.stderr }
 
     context "when no identifier is given", :vcr do
-      let(:argv) { ["firewall-policies", "update"] }
+      let(:argv) { %w(firewall-policies update) }
 
       it "prints error to STDERR" do
         expect(stderr).to include("ERROR: You must specify the firewall-policy-id to update")
@@ -19,7 +19,7 @@ describe "Firewall policies" do
     end
 
     context "when the policy does not exist", :vcr do
-      let(:argv) { ["firewall-policies", "update", "-n", "missing", "fwp-12345"] }
+      let(:argv) { %w(firewall-policies update -n missing fwp-12345) }
 
       it "prints error to STDERR" do
         expect(stderr).to include("ERROR: Resource not found using supplied identifier")
@@ -32,7 +32,7 @@ describe "Firewall policies" do
       end
 
       after do
-        #FIXME All specs are pending, why is this trying to run against nil?
+        # FIXME: All specs are pending, why is this trying to run against nil?
         @policy.destroy if @policy
       end
 
@@ -45,7 +45,7 @@ describe "Firewall policies" do
         end
 
         it "has updated the resource" do
-          pending "Fails out of sequence"
+          skip "Fails out of sequence"
           expect { output }.to_not raise_error
           @updated_policy = Brightbox::FirewallPolicy.find(@policy.id)
           expect(@updated_policy.attributes[:name]).to eql(name)
@@ -61,7 +61,7 @@ describe "Firewall policies" do
         end
 
         it "has updated the resource" do
-          pending "Fails out of sequence"
+          skip "Fails out of sequence"
           expect { output }.to_not raise_error
           @updated_policy = Brightbox::FirewallPolicy.find(@policy.id)
           expect(@updated_policy.attributes[:description]).to eql(description)