brightbox-cli 2.1.2 → 2.2.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 9e414299f5428a8989b0b711f4085732e883b739
-  data.tar.gz: 372b1ddf4b22fe727ded09adb9e518307f803079
+  metadata.gz: 34feccb6a89c40ab981c31b408d896606d548abd
+  data.tar.gz: a58a457c767e64ade86c3283e7313f8a76ba1445
 SHA512:
-  metadata.gz: 2d55325e1321e941667a802991494ba2f9e0c3946caa82a89f4decaf54d8395d9c8b516208f2ef2b1f9a786d383c489d9a2acac3cfe1f5f094243a85051b223d
-  data.tar.gz: 369a121630bde46a3fcd2966c4b2d3d6a22a74aa7d19b5ccb81818dbdb9468a99e3042ef8e80ad45142e3021dd1645b8642ecfa5226316f4d0d30b05f070de3e
+  metadata.gz: dd53e4d8ec2d68ad698290ba23a4ca89605a4e17b5af26db4a6f9208362304f68977e144f647ab824b28484b69caea3d88e5fd73da28656054e4a8d232f0859f
+  data.tar.gz: a50b5c409d4b938708b3c2ad29219675f054396cbfaf4175f5019523668cf0ef7bc5175eaafffabb21508c291273990c6cdd6850cd8c89abbcc5e3cd77a17d0a

data/CHANGELOG.md

@@ -1,3 +1,24 @@
+### v2.2.0 / 2015-09-28
+
+[Full Changelog](https://github.com/brightbox/brightbox-cli/compare/v2.1.2...v2.2.0)
+
+Enhancements:
+
+* Add `BRIGHTBOX_API_URL` ENV for running against alternative endpoints.
+
+Bug fixes:
+
+* Specify some expected errors to avoid specs passing when new errors
+  introduced.
+* Fix image list sorting using "status" field.
+* Handle error when `$config` is nil
+
+Changes:
+
+* Update to use `fog-brightbox v0.9.0`
+* Remove 1.8.7 testing references.
+* Declare `net-ssh` dependency as < 3.0 for Ruby 1.9.3 compatibility.
+
 ### v2.1.2 / 2015-07-18
 
 [Full Changelog](https://github.com/brightbox/brightbox-cli/compare/v2.1.1...v2.1.2)

data/Gemfile.lock

@@ -1,13 +1,14 @@
 PATH
   remote: .
   specs:
-    brightbox-cli (2.1.2)
-      fog-brightbox (>= 0.8.0)
+    brightbox-cli (2.2.0)
+      fog-brightbox (>= 0.9.0)
       gli (~> 2.12.0)
       highline (~> 1.6.0)
       hirb (~> 0.6)
       i18n (~> 0.6.0)
       multi_json (~> 1.11.0)
+      net-ssh (< 3.0)
 
 GEM
   remote: https://rubygems.org/
@@ -16,11 +17,11 @@ GEM
     coderay (1.0.9)
     diff-lcs (1.2.5)
     excon (0.45.4)
-    fog-brightbox (0.8.0)
+    fog-brightbox (0.9.0)
       fog-core (~> 1.22)
       fog-json
       inflecto (~> 0.0.2)
-    fog-core (1.32.0)
+    fog-core (1.32.1)
       builder
       excon (~> 0.45)
       formatador (~> 0.2)
@@ -38,7 +39,7 @@ GEM
     inflecto (0.0.2)
     metaclass (0.0.1)
     method_source (0.8.1)
-    mime-types (2.6.1)
+    mime-types (2.6.2)
     mocha (0.14.0)
       metaclass (~> 0.0.1)
     multi_json (1.11.2)
@@ -73,4 +74,4 @@ DEPENDENCIES
   vcr (~> 2.5)
 
 BUNDLED WITH
-   1.10.2
+   1.10.6

data/brightbox-cli.gemspec

@@ -21,10 +21,11 @@ Gem::Specification.new do |s|
   s.executables   = `git ls-files -- bin/*`.split("\n").map { |f| File.basename(f) }
   s.require_paths = ["lib"]
 
-  s.add_dependency "fog-brightbox", ">= 0.8.0"
+  s.add_dependency "fog-brightbox", ">= 0.9.0"
   s.add_dependency "gli", "~> 2.12.0"
   s.add_dependency "i18n", "~> 0.6.0"
   s.add_dependency "multi_json", "~> 1.11.0"
+  s.add_dependency "net-ssh", "< 3.0"
   s.add_dependency "highline", "~> 1.6.0"
   s.add_dependency "hirb", "~> 0.6"
 

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

@@ -41,7 +41,7 @@ module Brightbox
       # raises an error because it is ambiguous which to use.
       #
       # If +force_default_config+ is passed in as false (for +config+ commands)
-      # then it attempts to use the first config but this becomes random on 1.8.7
+      # then it attempts to use the first config
       #
       # Calling +client_name+ within the +config+ command will break the config
       # command because you can no longer manage your config (and set a default)

data/lib/brightbox-cli/gli_global_hooks.rb

@@ -122,7 +122,9 @@ module Brightbox
         debug e.class.to_s
         debug e.backtrace.join("\n")
       end
-      $config.debug_tokens
+      if $config
+        $config.debug_tokens
+      end
       exit(1)
     end
   end

data/lib/brightbox-cli/images.rb

@@ -98,7 +98,7 @@ module Brightbox
     end
 
     def status_sort_code
-      case status
+      case fog_model.attributes[:status]
       when 'available'
         (public? ? 1 : 2)
       when 'deprecated'

data/lib/brightbox-cli/version.rb

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

data/lib/brightbox_cli.rb

@@ -32,7 +32,7 @@ I18n.default_locale = :en
 I18n.load_path = [File.join(File.dirname(__FILE__) + "/../locales/en.yml")]
 
 module Brightbox
-  DEFAULT_API_ENDPOINT = "https://api.gb1.brightbox.com"
+  DEFAULT_API_ENDPOINT = ENV["BRIGHTBOX_API_URL"] || "https://api.gb1.brightbox.com"
 
   autoload :Server, File.expand_path("../brightbox-cli/servers", __FILE__)
   autoload :DetailedServer, File.expand_path("../brightbox-cli/detailed_server", __FILE__)

data/spec/cassettes/Brightbox_Account/_all/when_connected_using_an_application/returns_a_collection_of_Accounts.yml

@@ -5,7 +5,7 @@ http_interactions:
     uri: http://api.brightbox.dev/token
     body:
       encoding: UTF-8
-      string: '{"grant_type":"none","client_id":"cli-12345"}'
+      string: '{"grant_type":"client_credentials"}'
     headers:
       User-Agent:
       - fog/1.15.0
@@ -136,7 +136,7 @@ http_interactions:
     uri: http://api.brightbox.dev/token
     body:
       encoding: UTF-8
-      string: '{"grant_type":"none","client_id":"app-12345"}'
+      string: '{"grant_type":"client_credentials"}'
     headers:
       User-Agent:
       - fog/1.15.0
@@ -180,7 +180,7 @@ http_interactions:
     uri: http://api.brightbox.dev/token
     body:
       encoding: UTF-8
-      string: '{"grant_type":"none","client_id":"app-12345"}'
+      string: '{"grant_type":"client_credentials"}'
     headers:
       User-Agent:
       - fog/1.15.0

data/spec/cassettes/Brightbox_Account/_all/when_connected_using_an_application/returns_resources_on_the_same_connection.yml

@@ -48,7 +48,7 @@ http_interactions:
     uri: http://api.brightbox.dev/token
     body:
       encoding: UTF-8
-      string: '{"grant_type":"none","client_id":"app-12345"}'
+      string: '{"grant_type":"client_credentials"}'
     headers:
       User-Agent:
       - fog/1.15.0

data/spec/cassettes/Brightbox_Account/_all/when_connected_using_an_client/returns_a_collection_of_Accounts.yml

@@ -95,7 +95,7 @@ http_interactions:
     uri: http://api.brightbox.dev/token
     body:
       encoding: UTF-8
-      string: '{"grant_type":"none","client_id":"app-12345"}'
+      string: '{"grant_type":"client_credentials"}'
     headers:
       User-Agent:
       - fog/1.15.0
@@ -139,7 +139,7 @@ http_interactions:
     uri: http://api.brightbox.dev/token
     body:
       encoding: UTF-8
-      string: '{"grant_type":"none","client_id":"app-12345"}'
+      string: '{"grant_type":"client_credentials"}'
     headers:
       User-Agent:
       - fog/1.15.0

data/spec/cassettes/Brightbox_Account/_all/when_connected_using_an_client/returns_resources_on_the_same_connection.yml

@@ -50,7 +50,7 @@ http_interactions:
     uri: http://api.brightbox.dev/token
     body:
       encoding: UTF-8
-      string: '{"grant_type":"none","client_id":"app-12345"}'
+      string: '{"grant_type":"client_credentials"}'
     headers:
       User-Agent:
       - fog/1.15.0

data/spec/cassettes/Brightbox_BBConfig/_add_section/when_first_and_only_client/saves_changes_to_the_config_file.yml

@@ -5,7 +5,7 @@ http_interactions:
     uri: http://api.brightbox.dev/token
     body:
       encoding: UTF-8
-      string: '{"grant_type":"password","client_id":"app-12345","username":"jason.null@brightbox.com","password":"N:B3e%7Cmh"}'
+      string: '{"grant_type":"password","username":"jason.null@brightbox.com","password":"N:B3e%7Cmh"}'
     headers:
       User-Agent:
       - fog/1.15.0

data/spec/cassettes/Brightbox_BBConfig/_add_section/when_first_and_only_client/saves_the_default_account.yml

@@ -5,7 +5,7 @@ http_interactions:
     uri: http://api.brightbox.dev/token
     body:
       encoding: UTF-8
-      string: '{"grant_type":"password","client_id":"app-12345","username":"jason.null@brightbox.com","password":"N:B3e%7Cmh"}'
+      string: '{"grant_type":"password","username":"jason.null@brightbox.com","password":"N:B3e%7Cmh"}'
     headers:
       User-Agent:
       - fog/1.15.0

data/spec/cassettes/Brightbox_BBConfig/_add_section/when_first_and_only_client/saves_the_new_client_as_the_default.yml

@@ -5,7 +5,7 @@ http_interactions:
     uri: http://api.brightbox.dev/token
     body:
       encoding: UTF-8
-      string: '{"grant_type":"password","client_id":"app-12345","username":"jason.null@brightbox.com","password":"N:B3e%7Cmh"}'
+      string: '{"grant_type":"password","username":"jason.null@brightbox.com","password":"N:B3e%7Cmh"}'
     headers:
       User-Agent:
       - fog/1.15.0

data/spec/cassettes/Brightbox_BBConfig/_find_or_set_default_account/when_client_is_not_authenticated/does_not_raise_an_error.yml

@@ -42,7 +42,7 @@ http_interactions:
     method: post
     uri: http://api.brightbox.dev/token
     body:
-      string: "{\"grant_type\":\"none\",\"client_id\":\"app-12345\"}"
+      string: "{\"grant_type\":\"client_credentials\"}"
     headers:
       User-Agent:
       - fog/1.15.0
@@ -83,7 +83,7 @@ http_interactions:
     method: post
     uri: http://api.brightbox.dev/token
     body:
-      string: "{\"grant_type\":\"none\",\"client_id\":\"cli-12345\"}"
+      string: "{\"grant_type\":\"client_credentials\"}"
     headers:
       User-Agent:
       - fog/1.15.0
@@ -163,7 +163,7 @@ http_interactions:
     method: post
     uri: http://api.brightbox.dev/token
     body:
-      string: "{\"grant_type\":\"none\",\"client_id\":\"cli-12345\"}"
+      string: "{\"grant_type\":\"client_credentials\"}"
     headers:
       User-Agent:
       - fog/1.15.0
@@ -243,7 +243,7 @@ http_interactions:
     method: post
     uri: http://api.brightbox.dev/token
     body:
-      string: "{\"client_id\":\"cli-12345\",\"grant_type\":\"none\"}"
+      string: "{\"grant_type\":\"client_credentials\"}"
     headers:
       User-Agent:
       - fog/1.15.0
@@ -286,7 +286,7 @@ http_interactions:
     method: post
     uri: http://api.brightbox.dev/token
     body:
-      string: "{\"client_id\":\"cli-12345\",\"grant_type\":\"none\"}"
+      string: "{\"grant_type\":\"client_credentials\"}"
     headers:
       User-Agent:
       - fog/1.15.0

data/spec/cassettes/Brightbox_BBConfig/_find_or_set_default_account/when_client_may_access_one_account/updates_the_setting.yml

@@ -42,7 +42,7 @@ http_interactions:
     method: post
     uri: http://api.brightbox.dev/token
     body:
-      string: "{\"grant_type\":\"none\",\"client_id\":\"app-12345\"}"
+      string: "{\"grant_type\":\"client_credentials\"}"
     headers:
       User-Agent:
       - fog/1.15.0
@@ -83,7 +83,7 @@ http_interactions:
     method: post
     uri: http://api.brightbox.dev/token
     body:
-      string: "{\"grant_type\":\"none\",\"client_id\":\"cli-12345\"}"
+      string: "{\"grant_type\":\"client_credentials\"}"
     headers:
       User-Agent:
       - fog/1.15.0
@@ -163,7 +163,7 @@ http_interactions:
     method: post
     uri: http://api.brightbox.dev/token
     body:
-      string: "{\"grant_type\":\"none\",\"client_id\":\"cli-12345\"}"
+      string: "{\"grant_type\":\"client_credentials\"}"
     headers:
       User-Agent:
       - fog/1.15.0
@@ -243,7 +243,7 @@ http_interactions:
     method: post
     uri: http://api.brightbox.dev/token
     body:
-      string: "{\"client_id\":\"cli-12345\",\"grant_type\":\"none\"}"
+      string: "{\"grant_type\":\"client_credentials\"}"
     headers:
       User-Agent:
       - fog/1.15.0
@@ -286,7 +286,7 @@ http_interactions:
     method: post
     uri: http://api.brightbox.dev/token
     body:
-      string: "{\"client_id\":\"cli-12345\",\"grant_type\":\"none\"}"
+      string: "{\"grant_type\":\"client_credentials\"}"
     headers:
       User-Agent:
       - fog/1.15.0

data/spec/cassettes/Brightbox_BBConfig/_renew_tokens/when_config_in_use_is_not_the_default/uses_correct_credentials.yml

@@ -5,7 +5,7 @@ http_interactions:
     uri: http://api.brightbox.dev/token
     body:
       encoding: UTF-8
-      string: '{"grant_type":"password","client_id":"app-12345","username":"jason.null@brightbox.com","password":"N:B3e%7Cmh"}'
+      string: '{"grant_type":"password","username":"jason.null@brightbox.com","password":"N:B3e%7Cmh"}'
     headers:
       User-Agent:
       - fog/1.15.0

data/spec/cassettes/Brightbox_BBConfig/_renew_tokens/when_using_a_user_app_with_a_cached_refresh_token/caches_the_new_tokens.yml

@@ -5,7 +5,7 @@ http_interactions:
     uri: http://api.brightbox.dev/token
     body:
       encoding: UTF-8
-      string: '{"grant_type":"refresh_token","client_id":"app-12345","refresh_token":"aeed54b3487019931b04010b0b39715eb4e729e8"}'
+      string: '{"grant_type":"refresh_token","refresh_token":"aeed54b3487019931b04010b0b39715eb4e729e8"}'
     headers:
       User-Agent:
       - fog/1.15.0

data/spec/cassettes/Brightbox_BBConfig/_renew_tokens/when_using_a_user_app_with_an_expired_refresh_token/caches_the_new_tokens.yml

@@ -5,7 +5,7 @@ http_interactions:
     uri: http://api.brightbox.dev/token
     body:
       encoding: UTF-8
-      string: '{"grant_type":"refresh_token","client_id":"app-12345","refresh_token":"aeed54b3487019931b04010b0b39715eb4e729e8"}'
+      string: '{"grant_type":"refresh_token","refresh_token":"aeed54b3487019931b04010b0b39715eb4e729e8"}'
     headers:
       User-Agent:
       - fog/1.15.0
@@ -51,7 +51,7 @@ http_interactions:
     uri: http://api.brightbox.dev/token
     body:
       encoding: UTF-8
-      string: '{"grant_type":"password","client_id":"app-12345","username":"jason.null@brightbox.com","password":"N:B3e%7Cmh"}'
+      string: '{"grant_type":"password","username":"jason.null@brightbox.com","password":"N:B3e%7Cmh"}'
     headers:
       User-Agent:
       - fog/1.15.0

data/spec/cassettes/Brightbox_BBConfig/_renew_tokens/when_using_a_user_app_with_no_tokens/caches_the_new_tokens.yml

@@ -5,7 +5,7 @@ http_interactions:
     uri: http://api.brightbox.dev/token
     body:
       encoding: UTF-8
-      string: '{"grant_type":"password","client_id":"app-12345","username":"jason.null@brightbox.com","password":"N:B3e%7Cmh"}'
+      string: '{"grant_type":"password","username":"jason.null@brightbox.com","password":"N:B3e%7Cmh"}'
     headers:
       User-Agent:
       - fog/1.15.0

data/spec/cassettes/Brightbox_BBConfig/_renew_tokens/when_using_a_user_app_with_no_tokens/prompts_user_to_retry_command.yml

@@ -5,7 +5,7 @@ http_interactions:
     uri: http://api.brightbox.dev/token
     body:
       encoding: UTF-8
-      string: '{"grant_type":"password","client_id":"app-12345","username":"jason.null@brightbox.com","password":"N:B3e%7Cmh"}'
+      string: '{"grant_type":"password","username":"jason.null@brightbox.com","password":"N:B3e%7Cmh"}'
     headers:
       User-Agent:
       - fog/1.15.0

data/spec/cassettes/Brightbox_BBConfig/_renew_tokens/when_using_an_API_client_with_no_tokens/caches_a_new_access_token.yml

@@ -5,7 +5,7 @@ http_interactions:
     uri: http://api.brightbox.dev/token
     body:
       encoding: UTF-8
-      string: '{"grant_type":"none","client_id":"cli-12345"}'
+      string: '{"grant_type":"client_credentials"}'
     headers:
       User-Agent:
       - fog/1.15.0

data/spec/cassettes/Brightbox_CloudIP/_find_all_/when_a_Cloud_IP_exists/returns_a_suitable.yml

@@ -208,7 +208,7 @@ http_interactions:
     uri: http://api.brightbox.dev/token
     body:
       encoding: UTF-8
-      string: '{"grant_type":"none","client_id":"cli-12345"}'
+      string: '{"grant_type":"client_credentials"}'
     headers:
       User-Agent:
       - fog/1.15.0
@@ -253,7 +253,7 @@ http_interactions:
     uri: http://api.brightbox.dev/token
     body:
       encoding: UTF-8
-      string: '{"grant_type":"none","client_id":"app-12345"}'
+      string: '{"grant_type":"client_credentials"}'
     headers:
       User-Agent:
       - fog/1.15.0
@@ -297,7 +297,7 @@ http_interactions:
     uri: http://api.brightbox.dev/token
     body:
       encoding: UTF-8
-      string: '{"grant_type":"none","client_id":"app-12345"}'
+      string: '{"grant_type":"client_credentials"}'
     headers:
       User-Agent:
       - fog/1.15.0
@@ -341,7 +341,7 @@ http_interactions:
     uri: http://api.brightbox.dev/token
     body:
       encoding: UTF-8
-      string: '{"grant_type":"none","client_id":"app-12345"}'
+      string: '{"grant_type":"client_credentials"}'
     headers:
       User-Agent:
       - fog/1.15.0
@@ -385,7 +385,7 @@ http_interactions:
     uri: http://api.brightbox.dev/token
     body:
       encoding: UTF-8
-      string: '{"grant_type":"none","client_id":"app-12345"}'
+      string: '{"grant_type":"client_credentials"}'
     headers:
       User-Agent:
       - fog/1.15.0
@@ -429,7 +429,7 @@ http_interactions:
     uri: http://api.brightbox.dev/token
     body:
       encoding: UTF-8
-      string: '{"grant_type":"none","client_id":"app-12345"}'
+      string: '{"grant_type":"client_credentials"}'
     headers:
       User-Agent:
       - fog/1.15.0
@@ -513,7 +513,7 @@ http_interactions:
     uri: http://api.brightbox.dev/token
     body:
       encoding: UTF-8
-      string: '{"grant_type":"none","client_id":"cli-12345"}'
+      string: '{"grant_type":"client_credentials"}'
     headers:
       User-Agent:
       - fog/1.15.0