brightbox-cli 1.2.2 → 1.3.0

data/spec/spec_helper.rb

@@ -1,20 +1,19 @@
-__LIB_DIR__ = File.expand_path(File.join(File.dirname(__FILE__), "..","lib"))
+LIB_DIR = File.expand_path(File.join(File.dirname(__FILE__), "..", "lib"))
 
-$LOAD_PATH.unshift __LIB_DIR__ unless
-  $LOAD_PATH.include?(__LIB_DIR__) ||
-  $LOAD_PATH.include?(File.expand_path(__LIB_DIR__))
+$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}
+Dir["./spec/support/**/*.rb"].sort.each { |f| require f }
 
-#API_CLIENT_CONFIG_DIR = File.join(File.dirname(__FILE__), "configs/api_client")
-#USER_APP_CONFIG_DIR   = File.join(File.dirname(__FILE__), "configs/user_application")
+# API_CLIENT_CONFIG_DIR = File.join(File.dirname(__FILE__), "configs/api_client")
+# USER_APP_CONFIG_DIR   = File.join(File.dirname(__FILE__), "configs/user_application")
 
-#API_CLIENT_CONFIG = Brightbox::BBConfig.new(:directory => API_CLIENT_CONFIG_DIR)
-#USER_APP_CONFIG   = Brightbox::BBConfig.new(:directory => USER_APP_CONFIG_DIR)
+# API_CLIENT_CONFIG = Brightbox::BBConfig.new(:directory => API_CLIENT_CONFIG_DIR)
+# USER_APP_CONFIG   = Brightbox::BBConfig.new(:directory => USER_APP_CONFIG_DIR)
 
 # These are the contents
 API_CLIENT_CONFIG_CONTENTS = File.read(File.join(File.dirname(__FILE__), "configs/api_client.ini"))

data/spec/support/common_helpers.rb

@@ -1,25 +1,25 @@
 module CommonHelpers
   def limit_exceeded_exception(request = {})
     request_options = {
-      :headers=> {
-        "Content-Type"=>"application/json", "Authorization"=>"OAuth 864b21f13485a7f2de49593f627213075e8eb046",
-        "Host"=>"api.gb1.brightbox.com:443", "Content-Length"=>71
+      :headers => {
+        "Content-Type" => "application/json", "Authorization" => "OAuth 864b21f13485a7f2de49593f627213075e8eb046",
+        "Host" => "api.gb1.brightbox.com:443", "Content-Length" => 71
       },
-      :host=>"api.gb1.brightbox.com", :mock=>false, :path=>"/1.0/servers",
-      :port=>"443", :query=>nil, :scheme=>"https",
-      :expects=>[202],
-      :method=>"POST",
-      :body=>"{\"image\":\"img-4gqhs\",\"server_type\":\"typ-qdiwq\",\"name\":\"medium servers\"}"
+      :host => "api.gb1.brightbox.com", :mock => false, :path => "/1.0/servers",
+      :port => "443", :query => nil, :scheme => "https",
+      :expects => [202],
+      :method => "POST",
+      :body => "{\"image\":\"img-4gqhs\",\"server_type\":\"typ-qdiwq\",\"name\":\"medium servers\"}"
     }
 
     response = Excon::Response.new(
       :body => "{\"error_name\":\"account_limit_reached\",\"errors\":[\"Account limit reached, please contact support for more information\"]}",
       :status => 403,
       :headers => {
-        "Date"=>"Tue, 28 Jun 2011 08:07:21 GMT", "Server"=>"Apache", "Cache-Control"=>"no-cache", "Access-Control-Allow-Origin"=>"*", "Access-Control-Allow-Headers"=>"Authorization", "Content-Length"=>"118", "Status"=>"403", "Content-Type"=>"application/json; charset=utf-8"
+        "Date" => "Tue, 28 Jun 2011 08:07:21 GMT", "Server" => "Apache", "Cache-Control" => "no-cache", "Access-Control-Allow-Origin" => "*", "Access-Control-Allow-Headers" => "Authorization", "Content-Length" => "118", "Status" => "403", "Content-Type" => "application/json; charset=utf-8"
       }
     )
 
-    Excon::Errors.status_error(request_options.merge(request),response)
+    Excon::Errors.status_error(request_options.merge(request), response)
   end
 end

data/spec/support/config_helpers.rb

@@ -2,7 +2,6 @@ require "fileutils"
 require "securerandom"
 
 module ConfigHelpers
-
   # Returns a Brightbox::BBConfig based on the String as its contents
   #
   # It's like a fake configuration - IN A CAN!

data/spec/support/faux_io.rb

@@ -1,20 +1,16 @@
 # This class encapsulates the pattern of faking STD IO and exposing the streams
 # for testing.
 class FauxIO
-  def initialize(&block)
-    begin
-      original_stdout = $stdout
-      original_stderr = $stderr
-
-      $stdout = @stdout = StringIO.new
-      $stderr = @stderr = StringIO.new
-
-      yield
-    rescue SystemExit => e
-    ensure
-      $stdout = original_stdout
-      $stderr = original_stderr
-    end
+  def initialize(&_block)
+    original_stdout = $stdout
+    original_stderr = $stderr
+    $stdout = @stdout = StringIO.new
+    $stderr = @stderr = StringIO.new
+    yield
+  rescue SystemExit
+  ensure
+    $stdout = original_stdout
+    $stderr = original_stderr
   end
 
   def stdout

data/spec/support/password_prompt_helpers.rb

@@ -1,7 +1,6 @@
 require "highline"
 
 module PasswordPromptHelpers
-
   # This password matches the testing users available on dev machines
   def default_test_password
     "N:B3e%7Cmh"
@@ -11,6 +10,6 @@ module PasswordPromptHelpers
   # or a specific value. Otherwise this blocks the specs.
   #
   def mock_password_entry(password = default_test_password)
-    HighLine.any_instance.should_receive(:ask).at_least(:once).and_return(password)
+    expect_any_instance_of(HighLine).to receive(:ask).at_least(:once).and_return(password)
   end
 end

data/spec/support/server_helper.rb

@@ -1,7 +1,7 @@
 # Server parameter helper
 
 module ServerHelpers
-  def server_params(name, type = nil)
+  def server_params(name, _type = nil)
     {
       :image_id      => "img-12345",
       :name          => name,

data/spec/support/shared/api_resource_examples.rb

@@ -1,14 +1,14 @@
 shared_examples "a wrapped API resource" do
-  it { described_class.should respond_to(:require_account?) }
-  it { described_class.should respond_to(:klass_name) }
-  it { described_class.should respond_to(:get) }
-  it { described_class.should respond_to(:find) }
+  it { expect(described_class).to respond_to(:require_account?) }
+  it { expect(described_class).to respond_to(:klass_name) }
+  it { expect(described_class).to respond_to(:get) }
+  it { expect(described_class).to respond_to(:find) }
 
-  it { should respond_to(:fog_model) }
-  it { should respond_to(:exists?) }
-  it { should respond_to(:to_row) }
+  it { is_expected.to respond_to(:fog_model) }
+  it { is_expected.to respond_to(:exists?) }
+  it { is_expected.to respond_to(:to_row) }
 
-  it { should respond_to(:to_s) }
+  it { is_expected.to respond_to(:to_s) }
   it "#to_s equals the #id" do
     expect(subject.to_s).to eql(subject.id)
   end

data/spec/support/shared/collaborating_accounts_context.rb

@@ -9,10 +9,10 @@ shared_context "collaborating accounts" do
     data = {
       "id" => "acc-12345",
       "resource_type" => "account",
-      "url"=>"https://api.gb1.brightbox.com/1.0/accounts/acc-12345",
+      "url" => "https://api.gb1.brightbox.com/1.0/accounts/acc-12345",
       "name" => "Owned account name",
       "status" => "active",
-      "ram_limit" => 3200000,
+      "ram_limit" => 3_200_000,
       "ram_used" => 3072,
       "cloud_ips_limit" => 32,
       "cloud_ips_used" => 0,

data/spec/support/shared/config_section_types.rb

@@ -1,4 +1,4 @@
 shared_examples "a config section type" do
-  it { should respond_to(:to_fog) }
-  it { should respond_to(:valid?) }
+  it { is_expected.to respond_to(:to_fog) }
+  it { is_expected.to respond_to(:valid?) }
 end

data/spec/support/tmp_config.rb

@@ -6,7 +6,7 @@ require "fileutils"
 # dispose of
 #
 class TmpConfig
-
+  attr_reader :path
   # Creates a temporary directory and a "config" file within using the contents
   # of a passed String.
   #
@@ -15,18 +15,14 @@ class TmpConfig
   # @param [String] contents
   #
   def initialize(contents)
-    @dir = Dir.mktmpdir
-    @file = File.open(File.join(@dir, "config"), "w+")
+    @path = Dir.mktmpdir
+    @file = File.open(File.join(@path, "config"), "w+")
     @file.write(contents)
     @file.close
     self
   end
 
-  def path
-    @dir
-  end
-
   def close
-    FileUtils.remove_entry_secure(@dir)
+    FileUtils.remove_entry_secure(path)
   end
 end

data/spec/support/token_helpers.rb

@@ -8,7 +8,7 @@ module TokenHelpers
 
   # Creates a cached refresh token for the config directly to disk
   def cache_refresh_token(config, token)
-    File.open(config.refresh_token_filename, "w") {|f| f.write token }
+    File.open(config.refresh_token_filename, "w") { |f| f.write token }
   end
 
   # Returns the cached access token for the config directly from disk

data/spec/support/vcr.rb

@@ -18,7 +18,7 @@ VCR.configure do |vcr|
   }
 
   # Gives lots of clues about how VCR is running
-  #vcr.debug_logger = $stderr
+  # vcr.debug_logger = $stderr
 
   vcr.before_record do |interaction|
     host = URI.parse(interaction.request.uri).host

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

@@ -2,7 +2,7 @@ require "spec_helper"
 
 describe Brightbox::Account do
   before do
-    pending "recordings corrupted and no longer working"
+    skip "recordings corrupted and no longer working"
   end
 
   describe ".get" do

data/spec/unit/brightbox/account_spec.rb

@@ -7,7 +7,7 @@ describe Brightbox::Account do
 
   it_behaves_like "a wrapped API resource"
 
-  it { should respond_to(:ram_free) }
-  it { should respond_to(:cloud_ip_limit) }
-  it { should respond_to(:lb_limit) }
+  it { is_expected.to respond_to(:ram_free) }
+  it { is_expected.to respond_to(:cloud_ip_limit) }
+  it { is_expected.to respond_to(:lb_limit) }
 end

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

@@ -4,17 +4,17 @@ describe Brightbox::Api, ".find" do
 
   context "when passed nil" do
     it "raises an error" do
-      expect {
+      expect do
         Brightbox::Api.find(nil)
-      }.to raise_error(Brightbox::Api::InvalidArguments)
+      end.to raise_error(Brightbox::Api::InvalidArguments)
     end
   end
 
   context "when passed an empty object" do
     it "raises an error" do
-      expect {
+      expect do
         Brightbox::Api.find([])
-      }.to raise_error(Brightbox::Api::InvalidArguments)
+      end.to raise_error(Brightbox::Api::InvalidArguments)
     end
   end
 
@@ -55,9 +55,9 @@ describe Brightbox::Api, ".find" do
 
   context "when passed a bad search value" do
     it "raises an error" do
-      expect {
+      expect do
         Brightbox::Api.find(double)
-      }.to raise_error(Brightbox::Api::InvalidArguments)
+      end.to raise_error(Brightbox::Api::InvalidArguments)
     end
   end
 end

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

@@ -4,7 +4,7 @@ describe Brightbox::Api, ".require_account?" do
 
   context "when on abstract class" do
     it "returns false" do
-      expect(Brightbox::Api.require_account?).to be_false
+      expect(Brightbox::Api.require_account?).to be false
     end
   end
 end

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

@@ -34,7 +34,7 @@ describe Brightbox::BBConfig do
       before do
         @account_name = "acc-ghj32"
         @client_name = "app-b3n5b"
-        contents =<<-EOS
+        contents = <<-EOS
         [#{@client_name}]
         default_account = #{@account_name}
         EOS
@@ -49,9 +49,9 @@ describe Brightbox::BBConfig do
       end
 
       it "does not dirty the config" do
-        expect {
+        expect do
           @config.account
-        }.to_not change(@config, :dirty?)
+        end.to_not change(@config, :dirty?)
       end
     end
   end

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

@@ -19,16 +19,16 @@ describe Brightbox::BBConfig do
       end
 
       it "does alters the value" do
-        expect {
+        expect do
           @config.clear_default_client
-        }.to change(@config, :default_client)
+        end.to change(@config, :default_client)
         expect(@config.default_client).to be_nil
       end
 
       it "dirties the config" do
-        expect {
+        expect do
           @config.clear_default_client
-        }.to change(@config, :dirty?)
+        end.to change(@config, :dirty?)
       end
     end
 
@@ -39,15 +39,15 @@ describe Brightbox::BBConfig do
       end
 
       it "does not alter the value" do
-        expect {
+        expect do
           @config.clear_default_client
-        }.to_not change(@config, :default_client)
+        end.to_not change(@config, :default_client)
       end
 
       it "does not dirty the config" do
-        expect {
+        expect do
           @config.clear_default_client
-        }.to_not change(@config, :dirty?)
+        end.to_not change(@config, :dirty?)
       end
     end
   end

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

@@ -20,21 +20,21 @@ describe Brightbox::BBConfig do
     context "when client has old 'alias' key" do
       it "returns true" do
         config.client_name = "old_alias"
-        expect(config.client_has_alias?).to be_true
+        expect(config.client_has_alias?).to be true
       end
     end
 
     context "when client has a section header" do
       it "returns true" do
         config.client_name = "alias"
-        expect(config.client_has_alias?).to be_true
+        expect(config.client_has_alias?).to be true
       end
     end
 
     context "when client 'alias' is the identifier" do
       it "returns false" do
         config.client_name = "cli-12345"
-        expect(config.client_has_alias?).to be_false
+        expect(config.client_has_alias?).to be false
       end
     end
   end

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

@@ -17,7 +17,7 @@ describe Brightbox::BBConfig do
     context "when config file contains a default client" do
       before do
         @client_name = "app-b3n5b"
-        contents =<<-EOS
+        contents = <<-EOS
         [core]
         default_client = #{@client_name}
         EOS
@@ -32,7 +32,7 @@ describe Brightbox::BBConfig do
     context "when config file contains only one client" do
       before do
         @client_name = "cli-sdio2"
-        contents =<<-EOS
+        contents = <<-EOS
         [core]
         default_client = #{@client_name}
 
@@ -49,7 +49,7 @@ describe Brightbox::BBConfig do
 
     context "when config contains no default and multiple clients" do
       before do
-        contents =<<-EOS
+        contents = <<-EOS
         [app-first]
         client_id = app-first
 
@@ -73,9 +73,9 @@ describe Brightbox::BBConfig do
         end
 
         it "raises an error" do
-          expect {
+          expect do
             @config.client_name
-          }.to raise_error(Brightbox::BBConfigError, "You must specify a default client using brightbox config client_default")
+          end.to raise_error(Brightbox::BBConfigError, "You must specify a default client using brightbox config client_default")
         end
       end
 

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

@@ -20,37 +20,37 @@ describe Brightbox::BBConfig do
   describe "#client_named?" do
     context "when no client with that name" do
       it "returns false" do
-        expect(config.client_named?("missing")).to be_false
+        expect(config.client_named?("missing")).to be false
       end
     end
 
     context "when client with that ID exists" do
       it "returns false" do
-        expect(config.client_named?("cli-12345")).to be_false
+        expect(config.client_named?("cli-12345")).to be false
       end
     end
 
     context "when client with that alias exists" do
       it "returns true" do
-        expect(config.client_named?("test")).to be_true
+        expect(config.client_named?("test")).to be true
       end
     end
 
     context "when client with that alias exists" do
       it "returns true" do
-        expect(config.client_named?("dev")).to be_true
+        expect(config.client_named?("dev")).to be true
       end
     end
 
     context "when client a section header exists" do
       it "returns true" do
-        expect(config.client_named?("jason.null@brightbox.com")).to be_true
+        expect(config.client_named?("jason.null@brightbox.com")).to be true
       end
     end
 
     context "when client is named 'core'" do
       it "returns false" do
-        expect(config.client_named?("core")).to be_false
+        expect(config.client_named?("core")).to be false
       end
     end
   end

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

@@ -10,7 +10,7 @@ describe Brightbox::BBConfig do
       it "returns true" do
         Dir.mktmpdir do |dir|
           @dir = dir
-          expect(config.config_directory_exists?).to be_true
+          expect(config.config_directory_exists?).to be true
         end
       end
     end
@@ -19,7 +19,7 @@ describe Brightbox::BBConfig do
       it "returns false" do
         Tempfile.open("config_clash") do |tmp_file|
           @dir = tmp_file.path
-          expect(config.config_directory_exists?).to be_false
+          expect(config.config_directory_exists?).to be false
         end
       end
     end
@@ -27,7 +27,7 @@ describe Brightbox::BBConfig do
     context "when directory does not exist" do
       it "returns false" do
         @dir = "fnord"
-        expect(config.config_directory_exists?).to be_false
+        expect(config.config_directory_exists?).to be false
       end
     end
   end

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

@@ -10,7 +10,7 @@ describe Brightbox::BBConfig do
         Dir.mktmpdir do |tmp_dir|
           target_dir = File.join(tmp_dir, "config")
           @config = Brightbox::BBConfig.new :directory => target_dir
-          expect(@config.config_directory_exists?).to be_false
+          expect(@config.config_directory_exists?).to be false
           example.run
         end
       end
@@ -21,7 +21,7 @@ describe Brightbox::BBConfig do
 
       it "creates the config directory" do
         expect { @config.config }.to_not raise_error
-        expect(@config.config_directory_exists?).to be_true
+        expect(@config.config_directory_exists?).to be true
       end
     end
 
@@ -49,9 +49,9 @@ describe Brightbox::BBConfig do
       end
     end
 
-    # FIXME This appears to be current behaviour, at least under testing which
-    # seems a bit off. Might be an issue with the setup because I did have
-    # failures initially.
+    # FIXME: This appears to be current behaviour, at least under testing which
+    #   seems a bit off. Might be an issue with the setup because I did have
+    #   failures initially.
     context "when config dir exists as a file" do
       it "does not raise an error" do
         Tempfile.open("tmp") do |target_dir|

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

@@ -9,15 +9,15 @@ describe Brightbox::BBConfig do
       end
 
       it "does not raise an error" do
-        expect {
+        expect do
           Brightbox::BBConfig.new.default_account
-        }.to_not raise_error
+        end.to_not raise_error
       end
     end
 
     context "when not available in config" do
       before do
-        contents =<<-EOS
+        contents = <<-EOS
         [app-12345]
         EOS
         @config = config_from_contents(contents)
@@ -30,9 +30,9 @@ describe Brightbox::BBConfig do
 
     context "when blank in config" do
       before do
-        contents =<<-EOS
+        contents = <<-EOS
         [app-12345]
-        default_account = 
+        default_account =
         EOS
         @config = config_from_contents(contents)
       end
@@ -46,7 +46,7 @@ describe Brightbox::BBConfig do
       before do
         @account_name = "acc-ghj32"
         @client_name = "app-b3n5b"
-        contents =<<-EOS
+        contents = <<-EOS
         [#{@client_name}]
         default_account = #{@account_name}
         EOS

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

@@ -16,7 +16,7 @@ describe Brightbox::BBConfig do
 
     context "when config file has no default" do
       before do
-        contents =<<-EOS
+        contents = <<-EOS
         [core]
         EOS
         @tmp_config = config_from_contents(contents)
@@ -31,7 +31,7 @@ describe Brightbox::BBConfig do
     context "when config file contains a default client" do
       before do
         @client_name = "app-b3n5b"
-        contents =<<-EOS
+        contents = <<-EOS
         [core]
         default_client = #{@client_name}
         EOS

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

@@ -10,9 +10,9 @@ describe Brightbox::BBConfig do
       end
 
       it "does not raise an error" do
-        expect {
+        expect do
           Brightbox::BBConfig.new.find_or_set_default_account
-        }.to_not raise_error
+        end.to_not raise_error
       end
     end
 
@@ -28,9 +28,9 @@ describe Brightbox::BBConfig do
       end
 
       it "does not update" do
-        expect {
+        expect do
           config.find_or_set_default_account
-        }.to_not change(config, :default_account)
+        end.to_not change(config, :default_account)
       end
     end
 
@@ -45,16 +45,16 @@ describe Brightbox::BBConfig do
       end
 
       it "does not raise an error" do
-        expect {
+        expect do
           config.find_or_set_default_account
-        }.to_not raise_error
+        end.to_not raise_error
       end
 
       it "does not update " do
-        pending
-        expect {
+        skip
+        expect do
           config.find_or_set_default_account
-        }.to_not change(config, :default_account)
+        end.to_not change(config, :default_account)
       end
     end
 
@@ -69,9 +69,9 @@ describe Brightbox::BBConfig do
       end
 
       it "updates the setting" do
-        expect {
+        expect do
           config.find_or_set_default_account
-        }.to change(config, :default_account)
+        end.to change(config, :default_account)
       end
     end
 
@@ -86,10 +86,10 @@ describe Brightbox::BBConfig do
       end
 
       it "does not update" do
-        pending
-        expect {
+        skip
+        expect do
           config.find_or_set_default_account
-        }.to_not change(config, :default_account)
+        end.to_not change(config, :default_account)
       end
     end
   end