brightbox-cli 2.3.0 → 2.3.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 878ff7e5b319cc7c15095db32d0091a6e1d2988b
-  data.tar.gz: d5809b9c66921ea3820855723d871fb1eeeb99ec
+  metadata.gz: f27bf83c2b327b366e844aeb2a3d3f6734689870
+  data.tar.gz: 8184ccc9096fbc3117807938aca84b0c71224d49
 SHA512:
-  metadata.gz: 95b4dce981e19ad00c6f79636cc4bd29c620eee0ca43eb5256be40c2a5c60be9de634348c861177a21f4d4d72720ed1b26b8c8efbb787c8948011bddc55d148b
-  data.tar.gz: e5f9235468da53a0f4635665376dae4f9f35d4d43612c144ef36bc343342f03496cf1eb415fa682217fd101b09bd1ac06222f6f58b28d5987fb3ca12cf53765e
+  metadata.gz: 961e3af440fb8e7614d47f52d60ab5ec05af1563a07e28f702f78dc25414016252b14aa580ee16c009844f9db2be737b3c7bef1418ee9db7e20eac55383dd8e8
+  data.tar.gz: 0c61aef7964334ececb2cd7c57351fec449a20638bbc30238badeaf4ca051fe076fcd8165d3445b23f3ebb602bd2adcbb31a6488b9e639717d20e546bab0d47b

data/CHANGELOG.md

@@ -1,3 +1,11 @@
+### v2.3.1 / 2015-10-26
+
+[Full Changelog](https://github.com/brightbox/brightbox-cli/compare/v2.3.0...v2.3.1)
+
+Bug fixes:
+
+* Fix issue when `login` command would reset custom URLs to the defaults.
+
 ### v2.3.0 / 2015-10-23
 
 [Full Changelog](https://github.com/brightbox/brightbox-cli/compare/v2.2.0...v2.3.0)

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    brightbox-cli (2.3.0)
+    brightbox-cli (2.3.1)
       fog-brightbox (>= 0.9.0)
       gli (~> 2.12.0)
       highline (~> 1.6.0)
@@ -13,8 +13,11 @@ PATH
 GEM
   remote: https://rubygems.org/
   specs:
+    addressable (2.3.8)
     builder (3.2.2)
     coderay (1.0.9)
+    crack (0.4.2)
+      safe_yaml (~> 1.0.0)
     diff-lcs (1.2.5)
     excon (0.45.4)
     fog-brightbox (0.9.0)
@@ -62,8 +65,12 @@ GEM
     rspec-expectations (2.99.1)
       diff-lcs (>= 1.1.3, < 2.0)
     rspec-mocks (2.99.1)
+    safe_yaml (1.0.4)
     slop (3.4.5)
     vcr (2.5.0)
+    webmock (1.21.0)
+      addressable (>= 2.3.6)
+      crack (>= 0.3.2)
 
 PLATFORMS
   ruby
@@ -75,6 +82,7 @@ DEPENDENCIES
   rake
   rspec (~> 2.99)
   vcr (~> 2.5)
+  webmock
 
 BUNDLED WITH
    1.10.6

data/brightbox-cli.gemspec

@@ -34,6 +34,7 @@ Gem::Specification.new do |s|
   s.add_development_dependency "rake"
   s.add_development_dependency "rspec", "~> 2.99"
   s.add_development_dependency "vcr", "~> 2.5"
+  s.add_development_dependency "webmock"
 
   s.post_install_message = <<-EOS
 The CLI command is now `brightbox` with subcommands for the resources.

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

@@ -31,17 +31,16 @@ module Brightbox
       end
       raise "You must specify your Brightbox password." if password.empty?
 
-      api_url = options[:"api-url"] || DEFAULT_API_ENDPOINT
-      auth_url = options[:"auth-url"] || api_url
-
       section_options = {
         :client_name => config_name,
         :alias => config_name,
         :username => email,
-        :password => password,
-        :api_url => api_url,
-        :auth_url => auth_url
+        :password => password
       }
+
+      section_options[:api_url] = options[:"api-url"] if options[:"api-url"]
+      section_options[:auth_url] = options[:"auth-url"] if options[:"auth-url"]
+
       section_options[:default_account] = options[:"default-account"] if options[:"default-account"]
 
       section_options[:client_id] = options[:"application-id"] if options[:"application-id"]

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

@@ -24,7 +24,7 @@ module Brightbox
         config_section["api_url"] = DEFAULT_API_ENDPOINT unless config_section["api_url"]
 
         config_section["auth_url"] = options[:auth_url] if options.key?(:auth_url)
-        config_section["auth_url"] = config_section["api_url"]
+        config_section["auth_url"] = config_section["api_url"] unless config_section["auth_url"]
 
         config_section["default_account"] = options[:default_account] if options.key?(:default_account)
 

data/lib/brightbox-cli/version.rb

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

data/spec/commands/login_spec.rb

@@ -236,4 +236,59 @@ describe "brightbox login" do
       expect(stderr).to_not include("please re-run your command")
     end
   end
+
+  context "when login is used to refresh tokens" do
+    let(:email) { "jason.null@brightbox.com" }
+    let(:client_alias) { "#{email}/custom" }
+    let(:custom_api_url) { "https://api.example.com" }
+    let(:custom_auth_url) { "https://auth.example.com" }
+    let(:default_account) { "acc-custom" }
+
+    let(:contents) do
+      <<-EOS
+      [core]
+      default_client = #{client_alias}
+
+      [#{client_alias}]
+      username = #{email}
+      api_url = #{custom_api_url}
+      auth_url = #{custom_auth_url}
+      default_account = #{default_account}
+      EOS
+    end
+    let(:config) { Brightbox::BBConfig.new }
+
+    let(:argv) { ["login", client_alias] }
+
+    before do
+      config_from_contents(contents)
+      mock_password_entry(password)
+
+      stub_request(:post, "https://auth.example.com/token").to_return(
+        :status => 200,
+        :body => '{"access_token":"44320b29286077c44f14c4efdfed70f63f4a8361","token_type":"Bearer","refresh_token":"759b2b28c228948a0ba5d07a89f39f9e268a95c0","scope":"infrastructure orbit","expires_in":7200}').times(2)
+    end
+
+    it "does not change the config" do
+      expect { output }.to_not raise_error
+
+      client_section = config.config[client_alias]
+
+      expect(client_section["api_url"]).to eql(custom_api_url)
+      expect(client_section["auth_url"]).to eql(custom_auth_url)
+      expect(client_section["username"]).to eql(email)
+      expect(client_section["default_account"]).to eql(default_account)
+    end
+
+    it "requests access tokens" do
+      expect { output }.to_not raise_error
+
+      expect(cached_access_token(config)).to eql(config.access_token)
+      expect(cached_refresh_token(config)).to eql(config.refresh_token)
+    end
+
+    it "does not prompt to rerun the command" do
+      expect(stderr).to_not include("please re-run your command")
+    end
+  end
 end

data/spec/spec_helper.rb

@@ -8,6 +8,9 @@ require "tmpdir"
 
 Dir["./spec/support/**/*.rb"].sort.each { |f| require f }
 
+require "webmock/rspec"
+WebMock.disable_net_connect!
+
 # API_CLIENT_CONFIG_DIR = File.join(File.dirname(__FILE__), "configs/api_client")
 # USER_APP_CONFIG_DIR   = File.join(File.dirname(__FILE__), "configs/user_application")
 

data/spec/support/vcr.rb

@@ -3,7 +3,7 @@ require "vcr"
 VCR.configure do |vcr|
   vcr.cassette_library_dir = File.join(File.dirname(__FILE__), "../cassettes")
   vcr.allow_http_connections_when_no_cassette = false
-  vcr.hook_into :excon
+  vcr.hook_into :webmock
 
   vcr.configure_rspec_metadata!
   vcr.default_cassette_options = {
@@ -30,3 +30,13 @@ VCR.configure do |vcr|
     end
   end
 end
+
+VCR.turn_off!
+
+VCR.extend Module.new {
+  def use_cassette(*args)
+    VCR.turn_on!
+    super
+    VCR.turn_off!
+  end
+}

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: brightbox-cli
 version: !ruby/object:Gem::Version
-  version: 2.3.0
+  version: 2.3.1
 platform: ruby
 authors:
 - John Leach
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-10-23 00:00:00.000000000 Z
+date: 2015-10-26 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: fog-brightbox
@@ -178,6 +178,20 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: '2.5'
+- !ruby/object:Gem::Dependency
+  name: webmock
+  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'
 description: Scripts to interact with the Brightbox cloud API
 email:
 - john@brightbox.co.uk