brightbox-cli 1.2.2 → 1.3.0

data/spec/unit/brightbox/legacy/args_adjuster_spec.rb

@@ -7,55 +7,55 @@ describe Brightbox::Legacy::ArgsAdjuster do
     let(:adjuster) { Brightbox::Legacy::ArgsAdjuster.new(args) }
 
     context "when account global switch is used" do
-      let(:args) { ["--account", "acc-12345", "show", "srv-12345"] }
+      let(:args) { %w(--account acc-12345 show srv-12345) }
 
       it "inserts after global args" do
-        expected = ["--account", "acc-12345", "command", "show", "srv-12345"]
+        expected = %w(--account acc-12345 command show srv-12345)
         expect(adjuster.for_command "command").to eql(expected)
       end
     end
 
     context "when client global switch is used" do
-      let(:args) { ["-c", "staging", "show", "srv-12345"] }
+      let(:args) { %w(-c staging show srv-12345) }
 
       it "inserts after global args" do
-        expected = ["-c", "staging", "command", "show", "srv-12345"]
+        expected = %w(-c staging command show srv-12345)
         expect(adjuster.for_command "command").to eql(expected)
       end
     end
 
     context "when simple global flag is used" do
-      let(:args) { ["--simple", "show", "srv-12345"] }
+      let(:args) { %w(--simple show srv-12345) }
 
       it "inserts after global args" do
-        expected = ["-s", "command", "show", "srv-12345"]
+        expected = %w(-s command show srv-12345)
         expect(adjuster.for_command "command").to eql(expected)
       end
     end
 
     context "when insecure global switch is used" do
-      let(:args) { ["-k", "show", "srv-12345"] }
+      let(:args) { %w(-k show srv-12345) }
 
       it "inserts after global args" do
-        expected = ["-k", "command", "show", "srv-12345"]
+        expected = %w(-k command show srv-12345)
         expect(adjuster.for_command "command").to eql(expected)
       end
     end
 
     context "when many args are passed" do
-      let(:args) { ["-k", "--simple", "-c", "prod", "subcommand", "srv-12345"] }
+      let(:args) { %w(-k --simple -c prod subcommand srv-12345) }
 
       it "inserts after global args" do
-        expected = ["-k", "-s", "-c", "prod", "command", "subcommand", "srv-12345"]
+        expected = %w(-k -s -c prod command subcommand srv-12345)
         expect(adjuster.for_command "command").to eql(expected)
       end
     end
 
     context "when no global args are used" do
-      let(:args) { ["show", "srv-12345"] }
+      let(:args) { %w(show srv-12345) }
 
       it "inserts at the front" do
-        expected = ["command", "show", "srv-12345"]
+        expected = %w(command show srv-12345)
         expect(adjuster.for_command "command").to eql(expected)
       end
     end

data/spec/unit/brightbox/server/create_spec.rb

@@ -16,10 +16,10 @@ describe Brightbox::Server do
         error = nil
         begin
           Brightbox::Server.create(options)
-        rescue Exception => e
+        rescue => e
           error = Brightbox::ErrorParser.new(e)
         end
-        output = FauxIO.new { error.pretty_print() }
+        output = FauxIO.new { error.pretty_print }
         expect(output.stderr).to match(/Account limit reached, please contact support for more information/i)
       end
     end

data/spec/unit/brightbox/server/destroy_spec.rb

@@ -6,15 +6,15 @@ describe Brightbox::Server do
   describe "#destroy" do
     context "when server exists", :vcr do
       it "should work" do
-        #FIXME Spec never actually calls destroy, just checks output of creation!!
+        # FIXME: Spec never actually calls destroy, just checks output of creation!!
 
         type = Brightbox::Type.find_by_handle "nano"
 
-        options = server_params("wow",type)
+        options = server_params("wow", type)
         @servers = Brightbox::Server.create_servers 1, options
 
         output = FauxIO.new do
-          Brightbox::render_table(@servers, :vertical => true)
+          Brightbox.render_table(@servers, :vertical => true)
         end
         expect(output.stdout).to include("wow")
         expect(output.stdout).to include("img-12345")

data/spec/unit/brightbox/server/find_or_call_spec.rb

@@ -18,7 +18,7 @@ describe Brightbox::Server do
 
       it "shows detailed attributes of a server" do
         output = FauxIO.new do
-          Brightbox.render_table(@servers, {:vertical => true})
+          Brightbox.render_table(@servers, :vertical => true)
         end
         expect(output.stdout).to include("private_ips:")
         expect(output.stdout).to include("ram:")

data/spec/unit/brightbox/server/shutdown_spec.rb

@@ -6,14 +6,12 @@ describe Brightbox::Server do
   describe "#shutdown", :vcr do
     it "should work" do
       type = Brightbox::Type.find_by_handle "nano"
-      options = server_params("rspec_server_shutdown",type)
+      options = server_params("rspec_server_shutdown", type)
       server = (Brightbox::Server.create_servers 1, options).first
 
       server.fog_model.wait_for { ready? }
 
-      lambda {
-        server.shutdown
-      }.should_not raise_error
+      expect { server.shutdown }.not_to raise_error
     end
   end
 end

data/spec/unit/brightbox/server/start_spec.rb

@@ -6,17 +6,17 @@ describe Brightbox::Server do
   describe "#start", :vcr do
     it "should work" do
       type = Brightbox::Type.find_by_handle "nano"
-      options = server_params("rspec_server_start",type)
+      options = server_params("rspec_server_start", type)
       server = (Brightbox::Server.create_servers 1, options).first
 
       server.fog_model.wait_for { ready? }
 
-      lambda {
+      expect {
         server.stop
-        server.fog_model.wait_for { ! ready? }
+        server.fog_model.wait_for { !ready? }
 
         server.start
-      }.should_not raise_error
+      }.not_to raise_error
     end
   end
 end

data/spec/unit/brightbox/server/stop_spec.rb

@@ -6,14 +6,12 @@ describe Brightbox::Server do
   describe "#stop", :vcr do
     it "should work" do
       type = Brightbox::Type.find_by_handle "nano"
-      options = server_params("rspec_server_stop",type)
+      options = server_params("rspec_server_stop", type)
       server = (Brightbox::Server.create_servers 1, options).first
 
       server.fog_model.wait_for { ready? }
 
-      lambda {
-        server.stop
-      }.should_not raise_error
+      expect { server.stop }.not_to raise_error
     end
   end
 end

data/spec/unit/brightbox/server/update_spec.rb

@@ -10,14 +10,14 @@ describe Brightbox::Server do
           :image_id => image_id
         }
         @server = Brightbox::Server.create(options)
-        @group = Brightbox::ServerGroup.create({:name => "test"})
+        @group = Brightbox::ServerGroup.create(:name => "test")
       end
 
       it "should update with group" do
         @server.update(:server_groups => [@group.id])
         @server.reload
 
-        expect(@server.server_groups).to have(1).item
+        expect(@server.server_groups.size).to eql(1)
         expect(@server.server_groups[0]["id"]).to eq(@group.id)
       end
 

data/spec/unit/brightbox/server_group/find_spec.rb

@@ -14,7 +14,7 @@ describe Brightbox::ServerGroup do
       it "list server groups" do
         server_groups = Brightbox::ServerGroup.find(:all)
         output = FauxIO.new do
-          Brightbox.render_table(server_groups,{})
+          Brightbox.render_table(server_groups, {})
         end
         expect(output.stdout).to include(@group.id)
       end

data/spec/unit/brightbox/user_collaboration/get_for_account_spec.rb

@@ -76,7 +76,7 @@ describe Brightbox::UserCollaboration do
             "id" => "usr-54321",
             "resource_type" => "user",
             "url" => "https://api.gb1.brightbox.com/1.0/users/usr-54321",
-            "name"=>"Marie Halvorson",
+            "name" => "Marie Halvorson",
             "email_address" => "marie@example.com"
           }
         },
@@ -103,7 +103,7 @@ describe Brightbox::UserCollaboration do
             "id" => "usr-54321",
             "resource_type" => "user",
             "url" => "https://api.gb1.brightbox.com/1.0/users/usr-54321",
-            "name"=>"Marie Halvorson",
+            "name" => "Marie Halvorson",
             "email_address" => "marie@example.com"
           }
         },
@@ -130,14 +130,14 @@ describe Brightbox::UserCollaboration do
             "id" => "usr-54321",
             "resource_type" => "user",
             "url" => "https://api.gb1.brightbox.com/1.0/users/usr-54321",
-            "name"=>"Marie Halvorson",
+            "name" => "Marie Halvorson",
             "email_address" => "marie@example.com"
           }
         }
       ]
       # Collection#load is private in fog so we can't just pass our collection
       # into get the correct object initialised.
-      api_response_data.collect do |datum|
+      api_response_data.map do |datum|
         Fog::Compute::Brightbox::UserCollaboration.new(datum)
       end
     end

data/spec/unit/brightbox/user_collaboration/remove_spec.rb

@@ -24,7 +24,7 @@ describe Brightbox::UserCollaboration do
 
   # Returns a fog model of a UserCollaboration to initialise a CLI model
   #
-  def faux_collaboration_data(status, options = {})
+  def faux_collaboration_data(status, _options = {})
     api_response_data = {
       "id" => "col-12345",
       "resource_type" => "collaboration",
@@ -39,17 +39,17 @@ describe Brightbox::UserCollaboration do
       "user" => nil,
       "account" => {
         "id" => "acc-12345",
-        "resource_type"=>"account",
-        "url"=>"https://api.gb1.brightbox.com/1.0/accounts/acc-12345",
-        "name"=>"System account",
-        "status"=>"active"
+        "resource_type" => "account",
+        "url" => "https://api.gb1.brightbox.com/1.0/accounts/acc-12345",
+        "name" => "System account",
+        "status" => "active"
       },
-      "inviter"=>{
-        "id"=>"usr-54321",
-        "resource_type"=>"user",
-        "url"=>"https://api.gb1.brightbox.com/1.0/users/usr-54321",
-        "name"=>"Marie Halvorson",
-        "email_address"=>"marie@example.com"
+      "inviter" => {
+        "id" => "usr-54321",
+        "resource_type" => "user",
+        "url" => "https://api.gb1.brightbox.com/1.0/users/usr-54321",
+        "name" => "Marie Halvorson",
+        "email_address" => "marie@example.com"
       }
     }
     Fog::Compute::Brightbox::UserCollaboration.new(api_response_data)

data/spec/unit/nilable_hash_spec.rb

@@ -9,20 +9,20 @@ describe NilableHash, "#nilify_blanks" do
 
   it "should nilify all blank values" do
     @blank_hash.nilify_blanks
-    @blank_hash[:b1].should be_nil
-    @blank_hash['b2'].should be_nil
+    expect(@blank_hash[:b1]).to be_nil
+    expect(@blank_hash['b2']).to be_nil
   end
 
   it "should leave nils as nil" do
-    @blank_hash['nilval'].should be_nil
+    expect(@blank_hash['nilval']).to be_nil
   end
 
   it "should not nilify non blank values" do
-    @blank_hash[:present].should == 'value'
-    @blank_hash['another'].should == 'another value'
+    expect(@blank_hash[:present]).to eq('value')
+    expect(@blank_hash['another']).to eq('another value')
   end
 
   it "should respond true when sent #is_a?(Hash)" do
-    NilableHash.new.is_a?(Hash).should be_true
+    expect(NilableHash.new.is_a?(Hash)).to be true
   end
 end

data/spec/unit/tmp_config_spec.rb

@@ -8,7 +8,7 @@ describe TmpConfig do
 
       @tmp_config = TmpConfig.new(file_contents)
       tmp_config_file = File.join(@tmp_config.path, "config")
-      expect(File.exists?(tmp_config_file)).to be_true
+      expect(File.exist?(tmp_config_file)).to be true
 
       contents = File.read(tmp_config_file)
       expect(contents).to eql(file_contents)

metadata

@@ -1,45 +1,45 @@
 --- !ruby/object:Gem::Specification
 name: brightbox-cli
 version: !ruby/object:Gem::Version
-  version: 1.2.2
+  version: 1.3.0
 platform: ruby
 authors:
 - John Leach
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-04-22 00:00:00.000000000 Z
+date: 2014-08-20 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
-  name: gli
+  name: fog-brightbox
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '2.9'
+        version: '0.3'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '2.9'
+        version: '0.3'
 - !ruby/object:Gem::Dependency
-  name: fog-brightbox
+  name: gli
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '0'
+        version: '2.9'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '0'
+        version: '2.9'
 - !ruby/object:Gem::Dependency
-  name: multi_json
+  name: i18n
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
@@ -67,7 +67,7 @@ dependencies:
       - !ruby/object:Gem::Version
         version: '1.25'
 - !ruby/object:Gem::Dependency
-  name: i18n
+  name: multi_json
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
@@ -81,35 +81,35 @@ dependencies:
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
-  name: hirb
+  name: highline
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '0.6'
+        version: '1.6'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '0.6'
+        version: '1.6'
 - !ruby/object:Gem::Dependency
-  name: highline
+  name: hirb
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '1.6'
+        version: '0.6'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '1.6'
+        version: '0.6'
 - !ruby/object:Gem::Dependency
-  name: rake
+  name: mocha
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
@@ -123,47 +123,61 @@ dependencies:
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
-  name: vcr
+  name: pry
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: '2.5'
+        version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: '2.5'
+        version: '0'
+- !ruby/object:Gem::Dependency
+  name: rake
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: rspec
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '2.14'
+        version: '2.99'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '2.14'
+        version: '2.99'
 - !ruby/object:Gem::Dependency
-  name: mocha
+  name: vcr
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '0'
+        version: '2.5'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '0'
+        version: '2.5'
 description: Scripts to interact with the Brightbox cloud API
 email:
 - john@brightbox.co.uk
@@ -255,6 +269,7 @@ files:
 - lib/brightbox-cli/commands/groups/update.rb
 - lib/brightbox-cli/commands/images/destroy.rb
 - lib/brightbox-cli/commands/images/list.rb
+- lib/brightbox-cli/commands/images/locking.rb
 - lib/brightbox-cli/commands/images/register.rb
 - lib/brightbox-cli/commands/images/show.rb
 - lib/brightbox-cli/commands/images/update.rb
@@ -262,6 +277,7 @@ files:
 - lib/brightbox-cli/commands/lbs/create.rb
 - lib/brightbox-cli/commands/lbs/destroy.rb
 - lib/brightbox-cli/commands/lbs/list.rb
+- lib/brightbox-cli/commands/lbs/locking.rb
 - lib/brightbox-cli/commands/lbs/remove-nodes.rb
 - lib/brightbox-cli/commands/lbs/show.rb
 - lib/brightbox-cli/commands/lbs/update.rb
@@ -269,6 +285,9 @@ files:
 - lib/brightbox-cli/commands/servers/create.rb
 - lib/brightbox-cli/commands/servers/destroy.rb
 - lib/brightbox-cli/commands/servers/list.rb
+- lib/brightbox-cli/commands/servers/locking.rb
+- lib/brightbox-cli/commands/servers/reboot.rb
+- lib/brightbox-cli/commands/servers/reset.rb
 - lib/brightbox-cli/commands/servers/show.rb
 - lib/brightbox-cli/commands/servers/shutdown.rb
 - lib/brightbox-cli/commands/servers/snapshot.rb
@@ -278,12 +297,14 @@ files:
 - lib/brightbox-cli/commands/sql/instances_create.rb
 - lib/brightbox-cli/commands/sql/instances_destroy.rb
 - lib/brightbox-cli/commands/sql/instances_list.rb
+- lib/brightbox-cli/commands/sql/instances_locking.rb
 - lib/brightbox-cli/commands/sql/instances_reset_password.rb
 - lib/brightbox-cli/commands/sql/instances_show.rb
 - lib/brightbox-cli/commands/sql/instances_snapshot.rb
 - lib/brightbox-cli/commands/sql/instances_update.rb
 - lib/brightbox-cli/commands/sql/snapshots_destroy.rb
 - lib/brightbox-cli/commands/sql/snapshots_list.rb
+- lib/brightbox-cli/commands/sql/snapshots_locking.rb
 - lib/brightbox-cli/commands/sql/snapshots_show.rb
 - lib/brightbox-cli/commands/sql/snapshots_update.rb
 - lib/brightbox-cli/commands/sql/types.rb
@@ -453,6 +474,7 @@ files:
 - spec/commands/groups/update_spec.rb
 - spec/commands/images/destroy_spec.rb
 - spec/commands/images/list_spec.rb
+- spec/commands/images/locking_spec.rb
 - spec/commands/images/register_spec.rb
 - spec/commands/images/show_spec.rb
 - spec/commands/images/update_spec.rb
@@ -460,6 +482,7 @@ files:
 - spec/commands/lbs/create_spec.rb
 - spec/commands/lbs/destroy_spec.rb
 - spec/commands/lbs/list_spec.rb
+- spec/commands/lbs/locking_spec.rb
 - spec/commands/lbs/remove_nodes_spec.rb
 - spec/commands/lbs/show_spec.rb
 - spec/commands/lbs/update_spec.rb
@@ -479,6 +502,9 @@ files:
 - spec/commands/servers/create_spec.rb
 - spec/commands/servers/destroy_spec.rb
 - spec/commands/servers/list_spec.rb
+- spec/commands/servers/locking_spec.rb
+- spec/commands/servers/reboot_spec.rb
+- spec/commands/servers/reset_spec.rb
 - spec/commands/servers/show_spec.rb
 - spec/commands/servers/shutdown_spec.rb
 - spec/commands/servers/snapshot_spec.rb
@@ -486,8 +512,10 @@ files:
 - spec/commands/servers/stop_spec.rb
 - spec/commands/servers/update_spec.rb
 - spec/commands/sql/instances/create_spec.rb
+- spec/commands/sql/instances/locking_spec.rb
 - spec/commands/sql/instances/snapshot_spec.rb
 - spec/commands/sql/snapshots/list_spec.rb
+- spec/commands/sql/snapshots/locking_spec.rb
 - spec/commands/sql/snapshots/show_spec.rb
 - spec/commands/sql/types/list_spec.rb
 - spec/commands/types/list_spec.rb
@@ -756,6 +784,7 @@ test_files:
 - spec/commands/groups/update_spec.rb
 - spec/commands/images/destroy_spec.rb
 - spec/commands/images/list_spec.rb
+- spec/commands/images/locking_spec.rb
 - spec/commands/images/register_spec.rb
 - spec/commands/images/show_spec.rb
 - spec/commands/images/update_spec.rb
@@ -763,6 +792,7 @@ test_files:
 - spec/commands/lbs/create_spec.rb
 - spec/commands/lbs/destroy_spec.rb
 - spec/commands/lbs/list_spec.rb
+- spec/commands/lbs/locking_spec.rb
 - spec/commands/lbs/remove_nodes_spec.rb
 - spec/commands/lbs/show_spec.rb
 - spec/commands/lbs/update_spec.rb
@@ -782,6 +812,9 @@ test_files:
 - spec/commands/servers/create_spec.rb
 - spec/commands/servers/destroy_spec.rb
 - spec/commands/servers/list_spec.rb
+- spec/commands/servers/locking_spec.rb
+- spec/commands/servers/reboot_spec.rb
+- spec/commands/servers/reset_spec.rb
 - spec/commands/servers/show_spec.rb
 - spec/commands/servers/shutdown_spec.rb
 - spec/commands/servers/snapshot_spec.rb
@@ -789,8 +822,10 @@ test_files:
 - spec/commands/servers/stop_spec.rb
 - spec/commands/servers/update_spec.rb
 - spec/commands/sql/instances/create_spec.rb
+- spec/commands/sql/instances/locking_spec.rb
 - spec/commands/sql/instances/snapshot_spec.rb
 - spec/commands/sql/snapshots/list_spec.rb
+- spec/commands/sql/snapshots/locking_spec.rb
 - spec/commands/sql/snapshots/show_spec.rb
 - spec/commands/sql/types/list_spec.rb
 - spec/commands/types/list_spec.rb
@@ -906,3 +941,4 @@ test_files:
 - spec/unit/ruby_core_ext_spec.rb
 - spec/unit/temporary_home_spec.rb
 - spec/unit/tmp_config_spec.rb
+has_rdoc: