brightbox-cli 2.1.2 → 2.2.0

data/spec/commands/sql/snapshots/show_spec.rb

@@ -13,7 +13,7 @@ describe "brightbox database-snapshots" do
       cache_access_token(config, "f83da712e6299cda953513ec07f7a754f747d727")
     end
 
-    context "when resource exists", :vcr do
+    context "when resource exists", vcr: true do
       let(:argv) { %w(sql snapshots show dbi-12345) }
 
       it "does not output to stderr" do

data/spec/spec_helper.rb

@@ -4,7 +4,6 @@ $LOAD_PATH.unshift LIB_DIR unless
   $LOAD_PATH.include?(LIB_DIR) || $LOAD_PATH.include?(File.expand_path(LIB_DIR))
 
 require "brightbox_cli"
-require "support/common_helpers"
 require "tmpdir"
 
 Dir["./spec/support/**/*.rb"].sort.each { |f| require f }
@@ -28,12 +27,10 @@ RSpec.configure do |config|
   config.include TokenHelpers
   config.include PasswordPromptHelpers
 
-  config.filter_run_excluding :vcr if RUBY_VERSION <= "1.8.7"
-
   # For each test, point to the testing endpoint to make it safer and easier to
   # record from dev endpoints. Devs can DNS api.brightbox.dev to their dev service
   config.before do
-    stub_const("Brightbox::DEFAULT_API_ENDPOINT", "http://api.brightbox.dev")
+    stub_const("Brightbox::DEFAULT_API_ENDPOINT", ENV["BRIGHTBOX_API_URL"] || "http://api.brightbox.dev")
   end
 
   # For each test, isolate the testing users $HOME so that we control the config

data/spec/support/vcr.rb

@@ -1,9 +1,5 @@
 require "vcr"
 
-RSpec.configure do |config|
-  config.treat_symbols_as_metadata_keys_with_true_values = true
-end
-
 VCR.configure do |vcr|
   vcr.cassette_library_dir = File.join(File.dirname(__FILE__), "../cassettes")
   vcr.allow_http_connections_when_no_cassette = false

data/spec/unit/brightbox/account/all_spec.rb

@@ -8,7 +8,7 @@ describe Brightbox::Account do
   end
 
   describe ".all" do
-    context "when connected using an application", :vcr do
+    context "when connected using an application", vcr: true do
       let(:contents) { USER_APP_CONFIG_CONTENTS }
 
       it "returns a collection of Accounts" do
@@ -26,7 +26,7 @@ describe Brightbox::Account do
       end
     end
 
-    context "when connected using an client", :vcr do
+    context "when connected using an client", vcr: true do
       let(:contents) { API_CLIENT_CONFIG_CONTENTS }
 
       it "returns a collection of Accounts" do

data/spec/unit/brightbox/account/get_spec.rb

@@ -11,7 +11,7 @@ describe Brightbox::Account do
         Brightbox::Api.configuration = USER_APP_CONFIG
       end
 
-      context "and the account is accessible", :vcr do
+      context "and the account is accessible", vcr: true do
         before do
           @account_id = "acc-12345"
           @account = Brightbox::Account.get(@account_id)
@@ -27,19 +27,19 @@ describe Brightbox::Account do
         end
       end
 
-      context "and the account is unknown", :vcr do
+      context "and the account is unknown", vcr: true do
         it "returns nil" do
           expect(Brightbox::Account.get("acc-xxxxx")).to be_nil
         end
       end
     end
 
-    context "when connected using an client", :vcr do
+    context "when connected using an client", vcr: true do
       before do
         Brightbox::Api.configuration = API_CLIENT_CONFIG
       end
 
-      context "and the account is accessible", :vcr do
+      context "and the account is accessible", vcr: true do
         before do
           @account_id = "acc-12345"
           @account = Brightbox::Account.get(@account_id)
@@ -55,7 +55,7 @@ describe Brightbox::Account do
         end
       end
 
-      context "and the account is unknown", :vcr do
+      context "and the account is unknown", vcr: true do
         it "returns nil" do
           expect(Brightbox::Account.get("acc-xxxxx")).to be_nil
         end

data/spec/unit/brightbox/api/conn_spec.rb

@@ -2,7 +2,7 @@ require "spec_helper"
 
 describe Brightbox::Api, ".conn" do
 
-  context "when account is not required", :vcr do
+  context "when account is not required", vcr: true do
     it "returns a 'real' fog compute instance" do
       expect(Brightbox::Api.conn).to be_instance_of(Fog::Compute::Brightbox::Real)
     end

data/spec/unit/brightbox/bb_config/add_section_spec.rb

@@ -3,7 +3,7 @@ require "spec_helper"
 describe Brightbox::BBConfig do
 
   describe "#add_section" do
-    context "when first and only client", :vcr do
+    context "when first and only client", vcr: true do
       let(:config) { Brightbox::BBConfig.new }
       let(:client_alias) { "dev" }
       let(:client_id) { "app-12345" }

data/spec/unit/brightbox/bb_config/find_or_set_default_account_spec.rb

@@ -34,7 +34,7 @@ describe Brightbox::BBConfig do
       end
     end
 
-    context "when client is not authenticated", :vcr do
+    context "when client is not authenticated", vcr: true do
       let(:contents) do
         <<-EOS
         [cli-12345]
@@ -58,7 +58,7 @@ describe Brightbox::BBConfig do
       end
     end
 
-    context "when client may access one account", :vcr do
+    context "when client may access one account", vcr: true do
       let(:contents) do
         <<-EOS
         [cli-12345]
@@ -75,7 +75,7 @@ describe Brightbox::BBConfig do
       end
     end
 
-    context "when the client may access multiple accounts", :vcr do
+    context "when the client may access multiple accounts", vcr: true do
       let(:contents) do
         <<-EOS
         [app-12345]

data/spec/unit/brightbox/bb_config/renew_tokens_spec.rb

@@ -12,7 +12,7 @@ describe Brightbox::BBConfig do
   let(:cli_secret) { "qy6xxnvy4o0tgv5" }
 
   describe "#renew_tokens" do
-    context "when using a user app with no tokens", :vcr do
+    context "when using a user app with no tokens", vcr: true do
       before do
         contents = <<-EOS
         [app-12345]
@@ -43,7 +43,7 @@ describe Brightbox::BBConfig do
 
     end
 
-    context "when using a user app with a cached refresh token", :vcr do
+    context "when using a user app with a cached refresh token", vcr: true do
       before do
         @config = config_from_contents(USER_APP_CONFIG_CONTENTS)
 
@@ -72,7 +72,7 @@ describe Brightbox::BBConfig do
       end
     end
 
-    context "when using a user app with an expired refresh token", :vcr do
+    context "when using a user app with an expired refresh token", vcr: true do
       before do
         @config = config_from_contents(USER_APP_CONFIG_CONTENTS)
 
@@ -100,7 +100,7 @@ describe Brightbox::BBConfig do
       end
     end
 
-    context "when using an API client with no tokens", :vcr do
+    context "when using an API client with no tokens", vcr: true do
       before do
         @new_access_token = random_token
         @config = config_from_contents(API_CLIENT_CONFIG_CONTENTS)
@@ -116,7 +116,7 @@ describe Brightbox::BBConfig do
       end
     end
 
-    context "when config in use is not the default", :vcr do
+    context "when config in use is not the default", vcr: true do
       before do
         contents = <<-EOS
         [core]

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

@@ -8,7 +8,7 @@ describe Brightbox::CloudIP do
         @cip = Brightbox::CloudIP.create
       end
 
-      it "returns a suitable", :vcr do
+      it "returns a suitable", vcr: true do
         ips = Brightbox::CloudIP.find(:all)
         output = FauxIO.new do
           Brightbox.render_table(ips.sort, :vertical => true)

data/spec/unit/brightbox/config/api_client/to_fog_spec.rb

@@ -92,7 +92,7 @@ describe Brightbox::Config::ApiClient do
       end
 
       it "raises error" do
-        expect { section.to_fog }.to raise_error
+        expect { section.to_fog }.to raise_error(Brightbox::BBConfigError, "api_url option missing from config in section cli-12345")
       end
     end
 
@@ -106,7 +106,7 @@ describe Brightbox::Config::ApiClient do
       end
 
       it "raises error" do
-        expect { section.to_fog }.to raise_error
+        expect { section.to_fog }.to raise_error(Brightbox::BBConfigError, "client_id option missing from config in section cli-12345")
       end
     end
 
@@ -120,7 +120,7 @@ describe Brightbox::Config::ApiClient do
       end
 
       it "raises error" do
-        expect { section.to_fog }.to raise_error
+        expect { section.to_fog }.to raise_error(Brightbox::BBConfigError, "secret option missing from config in section cli-12345")
       end
     end
   end

data/spec/unit/brightbox/config/user_application/to_fog_spec.rb

@@ -96,7 +96,7 @@ describe Brightbox::Config::UserApplication do
       end
 
       it "raises error" do
-        expect { section.to_fog }.to raise_error
+        expect { section.to_fog }.to raise_error(Brightbox::BBConfigError, "api_url option missing from config in section app-12345")
       end
     end
 
@@ -111,7 +111,7 @@ describe Brightbox::Config::UserApplication do
       end
 
       it "raises error" do
-        expect { section.to_fog }.to raise_error
+        expect { section.to_fog }.to raise_error(Brightbox::BBConfigError, "client_id option missing from config in section app-12345")
       end
     end
 
@@ -126,7 +126,7 @@ describe Brightbox::Config::UserApplication do
       end
 
       it "raises error" do
-        expect { section.to_fog }.to raise_error
+        expect { section.to_fog }.to raise_error(Brightbox::BBConfigError, "secret option missing from config in section app-12345")
       end
     end
 
@@ -141,7 +141,7 @@ describe Brightbox::Config::UserApplication do
       end
 
       it "raises error" do
-        expect { section.to_fog }.to raise_error
+        expect { section.to_fog }.to raise_error(Brightbox::BBConfigError, "username option missing from config in section app-12345")
       end
     end
   end

data/spec/unit/brightbox/firewall_policy/apply_to_spec.rb

@@ -2,7 +2,7 @@ require "spec_helper"
 
 describe Brightbox::FirewallPolicy do
 
-  describe "#apply_to", :vcr do
+  describe "#apply_to", vcr: true do
 
     it "should apply firewall policy" do
       expect do

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

@@ -2,7 +2,7 @@ require "spec_helper"
 
 describe Brightbox::FirewallPolicy do
 
-  describe "#create", :vcr do
+  describe "#create", vcr: true do
 
     it "should create firewall policy" do
       params = { :name => "rspec_tests" }

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

@@ -2,7 +2,7 @@ require "spec_helper"
 
 describe Brightbox::FirewallPolicy do
 
-  describe "#destroy", :vcr do
+  describe "#destroy", vcr: true do
     it "should destroy firewall policy" do
       params = { :name => "rspec_tests" }
       @group = Brightbox::ServerGroup.create(params)

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

@@ -11,7 +11,7 @@ describe Brightbox::FirewallPolicy do
         @policy = Brightbox::FirewallPolicy.create(options)
       end
 
-      it "should show firewall policy", :vcr do
+      it "should show firewall policy", vcr: true do
         output = FauxIO.new do
           firewall_policy = Brightbox::FirewallPolicy.find_or_call([@policy.id])
           Brightbox.render_table(firewall_policy, :vertical => true)

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

@@ -2,7 +2,7 @@ require "spec_helper"
 
 describe Brightbox::FirewallPolicy do
 
-  describe "#find(:all)", :vcr do
+  describe "#find(:all)", vcr: true do
 
     context "when a policy exists" do
       before do
@@ -10,7 +10,7 @@ describe Brightbox::FirewallPolicy do
         @policy = Brightbox::FirewallPolicy.create(options)
       end
 
-      it "should list firewall policy", :vcr do
+      it "should list firewall policy", vcr: true do
         output = FauxIO.new do
           firewall_policies = Brightbox::FirewallPolicy.find(:all)
           Brightbox.render_table(firewall_policies, :vertical => true)

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

@@ -17,7 +17,7 @@ describe Brightbox::FirewallRule do
         }
       end
 
-      it "creates the rule successfully", :vcr do
+      it "creates the rule successfully", vcr: true do
         @rule = Brightbox::FirewallRule.create(@rule_options)
         output = FauxIO.new do
           Brightbox.render_table([@rule], :vertical => true)

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

@@ -2,7 +2,7 @@ require "spec_helper"
 
 describe Brightbox::FirewallRule do
 
-  describe "#destroy", :vcr do
+  describe "#destroy", vcr: true do
     context "when rule exists" do
       before do
         policy_options = {}

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

@@ -2,7 +2,7 @@ require "spec_helper"
 
 describe Brightbox::FirewallRule do
 
-  describe "#find", :vcr do
+  describe "#find", vcr: true do
     context "when rule exists" do
       before do
         policy_options = {}

data/spec/unit/brightbox/firewall_rule/from_policy_spec.rb

@@ -2,7 +2,7 @@ require "spec_helper"
 
 describe Brightbox::FirewallRule do
 
-  describe ".from_policy", :vcr do
+  describe ".from_policy", vcr: true do
     context "when policy exists with a rule" do
       before do
         policy_options = {}

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

@@ -4,7 +4,7 @@ describe Brightbox::Server do
   include ServerHelpers
 
   describe "#destroy" do
-    context "when server exists", :vcr do
+    context "when server exists", vcr: true do
       it "should work" do
         # FIXME: Spec never actually calls destroy, just checks output of creation!!
 

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

@@ -2,7 +2,7 @@ require "spec_helper"
 
 describe Brightbox::Server do
 
-  describe "#show", :vcr do
+  describe "#show", vcr: true do
     context "when server exists" do
       before do
         options = {

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

@@ -4,7 +4,7 @@ describe Brightbox::Server do
   let(:image_id) { "img-12345" }
 
   describe "#find(:all)" do
-    context "when a server exists", :vcr do
+    context "when a server exists", vcr: true do
       before do
         options = {
           :image_id => image_id

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

@@ -3,7 +3,7 @@ require "spec_helper"
 describe Brightbox::Server do
   include ServerHelpers
 
-  describe "#shutdown", :vcr do
+  describe "#shutdown", vcr: true do
     it "should work" do
       type = Brightbox::Type.find_by_handle "nano"
       options = server_params("rspec_server_shutdown", type)

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

@@ -3,7 +3,7 @@ require "spec_helper"
 describe Brightbox::Server do
   include ServerHelpers
 
-  describe "#start", :vcr do
+  describe "#start", vcr: true do
     it "should work" do
       type = Brightbox::Type.find_by_handle "nano"
       options = server_params("rspec_server_start", type)

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

@@ -3,7 +3,7 @@ require "spec_helper"
 describe Brightbox::Server do
   include ServerHelpers
 
-  describe "#stop", :vcr do
+  describe "#stop", vcr: true do
     it "should work" do
       type = Brightbox::Type.find_by_handle "nano"
       options = server_params("rspec_server_stop", type)

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

@@ -4,7 +4,7 @@ describe Brightbox::Server do
   let(:image_id) { "img-12345" }
 
   describe "#update" do
-    context "when passing new group membership", :vcr do
+    context "when passing new group membership", vcr: true do
       before do
         options = {
           :image_id => image_id

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

@@ -3,7 +3,7 @@ require "spec_helper"
 describe Brightbox::ServerGroup do
 
   describe "#find(:all)" do
-    context "when a group exists", :vcr do
+    context "when a group exists", vcr: true do
       before do
         options = {
           :name => "Test group"

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

@@ -8,7 +8,7 @@ describe Brightbox::UserCollaboration do
       expect(Brightbox::UserCollaboration.conn).to receive(:user_collaborations).and_return(faux_api_response)
     end
 
-    context "when collaboration exists but is complete", :vcr do
+    context "when collaboration exists but is complete", vcr: true do
       it "does not return the complete collaboration" do
         @account = "acc-aaaaa"
         @collaboration = Brightbox::UserCollaboration.get_for_account(@account)
@@ -16,7 +16,7 @@ describe Brightbox::UserCollaboration do
       end
     end
 
-    context "when a collaboration exists for user on account", :vcr do
+    context "when a collaboration exists for user on account", vcr: true do
       before do
         @account = "acc-aaaaa"
         @collaboration = Brightbox::UserCollaboration.get_for_account(@account)
@@ -31,7 +31,7 @@ describe Brightbox::UserCollaboration do
       end
     end
 
-    context "when multiple collaborations exist", :vcr do
+    context "when multiple collaborations exist", vcr: true do
       before do
         @account = "acc-aaaaa"
         @collaboration = Brightbox::UserCollaboration.get_for_account(@account)
@@ -42,7 +42,7 @@ describe Brightbox::UserCollaboration do
       end
     end
 
-    context "when no collaboration exists", :vcr do
+    context "when no collaboration exists", vcr: true do
       it "returns nil" do
         @account = "acc-zzzzz"
         @collaboration = Brightbox::UserCollaboration.get_for_account(@account)