brightbox-cli 3.3.0 → 4.1.0

data/lib/brightbox-cli/load_balancers.rb

@@ -1,6 +1,7 @@
 module Brightbox
   class LoadBalancer < Api
     def self.require_account?; true; end
+
     def self.create(options)
       new(conn.load_balancers.create(options))
     end
@@ -38,11 +39,7 @@ module Brightbox
     end
 
     def listeners
-      if attributes[:listeners]
-        attributes[:listeners].map { |l| [l["in"], l["out"], l["protocol"], l['timeout']].join(":") }
-      else
-        nil
-      end
+      attributes[:listeners]&.map { |l| [l["in"], l["out"], l["protocol"], l["timeout"]].join(":") }
     end
 
     def buffer_size
@@ -80,7 +77,7 @@ module Brightbox
     end
 
     def self.default_field_order
-      [:id, :status, :created_on, :cloud_ips, :nodes, :name]
+      %i[id status created_on cloud_ips nodes name]
     end
   end
 end

data/lib/brightbox-cli/logging.rb

@@ -6,33 +6,33 @@ module Brightbox
     end
 
     module MixinMethods
-      def error(s = "")
-        $stderr.write s
+      def error(log_msg = "")
+        $stderr.write log_msg
         $stderr.write "\n"
         $stderr.flush
       end
 
-      def info(s = "")
-        $stderr.write s
+      def info(log_msg = "")
+        $stderr.write log_msg
         $stderr.write "\n"
         $stderr.flush
       end
 
-      def warn(s = "")
-        info "WARN: #{s}"
+      def warn(log_msg = "")
+        info "WARN: #{log_msg}"
       end
 
-      def data(s)
-        $stdout.write s
+      def data(log_msg)
+        $stdout.write log_msg
         $stdout.write "\n"
       end
 
-      def debug(s)
-        if ENV['DEBUG']
-          $stderr.write "DEBUG: "
-          $stderr.write s
-          $stderr.write "\n"
-        end
+      def debug(log_msg)
+        return unless ENV["DEBUG"]
+
+        $stderr.write "DEBUG: "
+        $stderr.write log_msg
+        $stderr.write "\n"
       end
     end
   end

data/lib/brightbox-cli/nilable_hash.rb

@@ -1,7 +1,7 @@
 class NilableHash < Hash
   def nilify_blanks
     keys.each do |k|
-      self[k] = nil if self[k] == ''
+      self[k] = nil if self[k] == ""
     end
   end
 end

data/lib/brightbox-cli/ruby_core_ext.rb

@@ -7,11 +7,11 @@ class Time
   #
   # @return [String] A clipped form of date, ISO 8601 without seconds
   #
-  def clipped_iso_8601
-    strftime(self.utc? ? "%Y-%m-%dT%H:%MZ" : "%Y-%m-%dT%H:%M")
+  def clipped_iso8601
+    strftime(utc? ? "%Y-%m-%dT%H:%MZ" : "%Y-%m-%dT%H:%M")
   end
 
   def to_s
-    clipped_iso_8601
+    clipped_iso8601
   end
 end

data/lib/brightbox-cli/server_groups.rb

@@ -15,7 +15,7 @@ module Brightbox
     end
 
     def self.default_field_order
-      [:id, :server_count, :name]
+      %i[id server_count name]
     end
 
     def firewall_policy
@@ -46,7 +46,7 @@ module Brightbox
     end
 
     def server_ids
-      attributes[:server_ids].map { |id| id.is_a?(Hash) ? id['id'] : id }
+      attributes[:server_ids].map { |id| id.is_a?(Hash) ? id["id"] : id }
     end
 
     def server_count

data/lib/brightbox-cli/servers.rb

@@ -19,7 +19,7 @@ module Brightbox
     end
 
     def self.default_field_order
-      [:id, :status, :type, :zone, :created_on, :image_id, :cloud_ip_ids, :name]
+      %i[id status type zone created_on image_id cloud_ip_ids name]
     end
 
     def update(options)
@@ -41,20 +41,20 @@ module Brightbox
       a[:image] = image_id
       a[:created_at] = created_at
       a[:created_on] = created_on
-      a[:type] = server_type['handle']
+      a[:type] = server_type["handle"]
       a[:status] = fog_model.state
       a[:locked] = locked?
-      a[:zone] = zone && zone['handle']
+      a[:zone] = zone && zone["handle"]
       a[:hostname] = id
       a[:public_hostname] = "public.#{fqdn}" unless cloud_ips.empty?
-      a[:ipv6_hostname] = ipv6_fqdn if interfaces.any? { |i| i['ipv6_address'] }
+      a[:ipv6_hostname] = ipv6_fqdn if interfaces.any? { |i| i["ipv6_address"] }
       a
     end
 
     def to_row
       o = attributes
-      o[:cloud_ip_ids] = cloud_ips.map { |i| i['id'] }
-      o[:ips] = interfaces.map { |i| i['ipv4_address'] }.join(', ')
+      o[:cloud_ip_ids] = cloud_ips.map { |i| i["id"] }
+      o[:ips] = interfaces.map { |i| i["ipv4_address"] }.join(", ")
       o
     end
 

data/lib/brightbox-cli/tables.rb

@@ -1,4 +1,4 @@
-require 'hirb'
+require "hirb"
 
 module Brightbox
   # Hack to set ascii art table cell width due to limitations in Hirb
@@ -10,9 +10,9 @@ module Brightbox
   # Remove most of the ascii art table output
   class SimpleTable < Hirb::Helpers::Table
     def render_table_header
-      title_row = ' ' + @fields.map do |f|
+      title_row = " " + @fields.map do |f|
         format_cell(@headers[f], @field_lengths[f])
-      end.join('  ')
+      end.join("  ")
       ["", title_row, render_border]
     end
 
@@ -21,14 +21,14 @@ module Brightbox
     end
 
     def render_border
-      '-' + @fields.map { |f| '-' * @field_lengths[f] }.join('--') + '-'
+      "-" + @fields.map { |f| "-" * @field_lengths[f] }.join("--") + "-"
     end
 
     def render_rows
       @rows.map do |row|
-        row = ' ' + @fields.map do |f|
+        row = " " + @fields.map do |f|
           format_cell(row[f], @field_lengths[f])
-        end.join('  ')
+        end.join("  ")
       end
     end
 
@@ -56,7 +56,7 @@ module Brightbox
     def render_footer; []; end
 
     def render_rows
-      longest_header = Hirb::String.size @headers.values.sort_by { |e| Hirb::String.size(e) }.last
+      longest_header = Hirb::String.size(@headers.values.max_by { |e| Hirb::String.size(e) })
       @rows.map do |row|
         fields = @fields.map do |f|
           "#{Hirb::String.rjust(@headers[f], longest_header)}: #{row[f]}"
@@ -87,7 +87,7 @@ module Brightbox
     rows.each do |row|
       # FIXME: default Api subclasses do not respond to #keys so specialising
       #   #to_row is required to not break the following
-      row.keys.each do |k|
+      row.each_key do |k|
         row[k] = row[k].render_cell if row[k].respond_to? :render_cell
       end
     end
@@ -97,16 +97,14 @@ module Brightbox
         if options[:vertical]
           data options[:fields].map { |k| [k, row[k]].join("\t") }.join("\n")
         else
-          data options[:fields].map { |k| row[k].is_a?(Array) ? row[k].join(',') : row[k] }.join("\t")
+          data options[:fields].map { |k| row[k].is_a?(Array) ? row[k].join(",") : row[k] }.join("\t")
         end
       end
-    else
+    elsif options[:vertical]
       # "graphical" table
-      if options[:vertical]
-        data ShowTable.render(rows, options)
-      else
-        data SimpleTable.render(rows, options)
-      end
+      data ShowTable.render(rows, options)
+    else
+      data SimpleTable.render(rows, options)
     end
   end
 

data/lib/brightbox-cli/types.rb

@@ -34,15 +34,15 @@ module Brightbox
     end
 
     def self.default_field_order
-      [:id, :name, :handle, :ram, :disk, :cores]
+      %i[id name handle ram disk cores]
     end
 
     def <=>(other)
-      if other.is_a? Type
-        ram <=> other.ram
-      else
-        ram <=> other
-      end
+      ram <=> if other.is_a? Type
+                other.ram
+              else
+                other
+              end
     end
   end
 end

data/lib/brightbox-cli/user_collaboration.rb

@@ -24,20 +24,18 @@ module Brightbox
     #
     def self.get_for_account(account_id)
       collaborations = conn.user_collaborations
-      open_collaborations = collaborations.select { |col| %w(pending accepted).include?(col.status) }
+      open_collaborations = collaborations.select { |col| %w[pending accepted].include?(col.status) }
       collaboration = open_collaborations.find do |col|
         col.account_id == account_id
       end
 
-      if collaboration
-        new(collaboration)
-      else
-        nil
-      end
+      return unless collaboration
+
+      new(collaboration)
     end
 
     def self.default_field_order
-      [:id, :status, :account, :role]
+      %i[id status account role]
     end
 
     def to_s

data/lib/brightbox-cli/users.rb

@@ -18,7 +18,7 @@ module Brightbox
     end
 
     def self.default_field_order
-      [:id, :name, :email_address, :accounts]
+      %i[id name email_address accounts]
     end
 
     def accounts

data/lib/brightbox-cli/version.rb

@@ -1,3 +1,3 @@
 module Brightbox
-  VERSION = "3.3.0" unless defined?(Brightbox::VERSION)
+  VERSION = "4.1.0".freeze unless defined?(Brightbox::VERSION)
 end

data/lib/brightbox-cli/zones.rb

@@ -15,7 +15,7 @@ module Brightbox
     end
 
     def self.default_field_order
-      [:id, :handle]
+      %i[id handle]
     end
 
     def to_s

data/lib/brightbox_cli.rb

@@ -6,67 +6,67 @@ unless Kernel.respond_to?(:require_relative)
   end
 end
 
-lib_dir = File.expand_path(File.dirname(__FILE__))
+lib_dir = __dir__
 
 $LOAD_PATH.unshift lib_dir unless $LOAD_PATH.include?(lib_dir)
 
 os_config = File.join(lib_dir, "brightbox-cli", "os_config.rb")
 require os_config if File.exist? os_config
 
-vendor_dir = File.expand_path(File.join(lib_dir, 'brightbox-cli', 'vendor'))
+vendor_dir = File.expand_path(File.join(lib_dir, "brightbox-cli", "vendor"))
 
 # Add any vendored libraries into search path
-Dir.glob(vendor_dir + '/*').each do |f|
-  $LOAD_PATH.unshift File.join(f, 'lib')
+Dir.glob("#{vendor_dir}/*").each do |f|
+  $LOAD_PATH.unshift File.join(f, "lib")
 end
 
 require "multi_json"
-require 'date'
-require 'gli'
+require "date"
+require "gli"
 require "i18n"
 require "fog/brightbox"
 
 # I18n stuff to clean up scattered text everywhere
 I18n.enforce_available_locales = false
 I18n.default_locale = :en
-I18n.load_path = [File.join(File.dirname(__FILE__) + "/../locales/en.yml")]
+I18n.load_path = [File.join("#{File.dirname(__FILE__)}/../locales/en.yml")]
 
 module Brightbox
-  DEFAULT_API_ENDPOINT = ENV["BRIGHTBOX_API_URL"] || "https://api.gb1.brightbox.com"
-  EMBEDDED_APP_ID = "app-12345"
-  EMBEDDED_APP_SECRET = "mocbuipbiaa6k6c"
+  DEFAULT_API_ENDPOINT = ENV.fetch("BRIGHTBOX_API_URL", "https://api.gb1.brightbox.com")
+  EMBEDDED_APP_ID = "app-12345".freeze
+  EMBEDDED_APP_SECRET = "mocbuipbiaa6k6c".freeze
 
-  autoload :Server, File.expand_path("../brightbox-cli/servers", __FILE__)
-  autoload :DetailedServer, File.expand_path("../brightbox-cli/detailed_server", __FILE__)
-  autoload :Image, File.expand_path("../brightbox-cli/images", __FILE__)
-  autoload :Type, File.expand_path("../brightbox-cli/types", __FILE__)
-  autoload :Zone, File.expand_path("../brightbox-cli/zones", __FILE__)
-  autoload :CloudIP, File.expand_path("../brightbox-cli/cloud_ips", __FILE__)
-  autoload :User, File.expand_path("../brightbox-cli/users", __FILE__)
-  autoload :Account, File.expand_path("../brightbox-cli/accounts", __FILE__)
-  autoload :CollaboratingAccount, File.expand_path("../brightbox-cli/collaborating_account", __FILE__)
-  autoload :LoadBalancer, File.expand_path("../brightbox-cli/load_balancers", __FILE__)
-  autoload :ServerGroup, File.expand_path("../brightbox-cli/server_groups", __FILE__)
-  autoload :DetailedServerGroup, File.expand_path("../brightbox-cli/detailed_server_group", __FILE__)
-  autoload :FirewallPolicy, File.expand_path("../brightbox-cli/firewall_policy", __FILE__)
-  autoload :FirewallRule, File.expand_path("../brightbox-cli/firewall_rule", __FILE__)
-  autoload :FirewallRules, File.expand_path("../brightbox-cli/firewall_rules", __FILE__)
-  autoload :Collaboration, File.expand_path("../brightbox-cli/collaboration", __FILE__)
-  autoload :UserCollaboration, File.expand_path("../brightbox-cli/user_collaboration", __FILE__)
-  autoload :DatabaseType, File.expand_path("../brightbox-cli/database_type", __FILE__)
-  autoload :DatabaseServer, File.expand_path("../brightbox-cli/database_server", __FILE__)
-  autoload :DatabaseSnapshot, File.expand_path("../brightbox-cli/database_snapshot", __FILE__)
-  autoload :Token, File.expand_path("../brightbox-cli/token", __FILE__)
+  autoload :Server, File.expand_path("brightbox-cli/servers", __dir__)
+  autoload :DetailedServer, File.expand_path("brightbox-cli/detailed_server", __dir__)
+  autoload :Image, File.expand_path("brightbox-cli/images", __dir__)
+  autoload :Type, File.expand_path("brightbox-cli/types", __dir__)
+  autoload :Zone, File.expand_path("brightbox-cli/zones", __dir__)
+  autoload :CloudIP, File.expand_path("brightbox-cli/cloud_ips", __dir__)
+  autoload :User, File.expand_path("brightbox-cli/users", __dir__)
+  autoload :Account, File.expand_path("brightbox-cli/accounts", __dir__)
+  autoload :CollaboratingAccount, File.expand_path("brightbox-cli/collaborating_account", __dir__)
+  autoload :LoadBalancer, File.expand_path("brightbox-cli/load_balancers", __dir__)
+  autoload :ServerGroup, File.expand_path("brightbox-cli/server_groups", __dir__)
+  autoload :DetailedServerGroup, File.expand_path("brightbox-cli/detailed_server_group", __dir__)
+  autoload :FirewallPolicy, File.expand_path("brightbox-cli/firewall_policy", __dir__)
+  autoload :FirewallRule, File.expand_path("brightbox-cli/firewall_rule", __dir__)
+  autoload :FirewallRules, File.expand_path("brightbox-cli/firewall_rules", __dir__)
+  autoload :Collaboration, File.expand_path("brightbox-cli/collaboration", __dir__)
+  autoload :UserCollaboration, File.expand_path("brightbox-cli/user_collaboration", __dir__)
+  autoload :DatabaseType, File.expand_path("brightbox-cli/database_type", __dir__)
+  autoload :DatabaseServer, File.expand_path("brightbox-cli/database_server", __dir__)
+  autoload :DatabaseSnapshot, File.expand_path("brightbox-cli/database_snapshot", __dir__)
+  autoload :Token, File.expand_path("brightbox-cli/token", __dir__)
 
   module Config
-    autoload :SectionNameDeduplicator, File.expand_path("../brightbox-cli/config/section_name_deduplicator", __FILE__)
+    autoload :SectionNameDeduplicator, File.expand_path("brightbox-cli/config/section_name_deduplicator", __dir__)
   end
 end
 
 require_relative "brightbox/cli/config"
 
 require_relative "brightbox-cli/connection_manager"
-require_relative 'brightbox-cli/tables'
+require_relative "brightbox-cli/tables"
 require_relative "brightbox-cli/logging"
 require_relative "brightbox-cli/api"
 require_relative "brightbox-cli/config/cache"

data/locales/en.yml

@@ -144,6 +144,8 @@ en:
       desc: Create servers
       cloud_ip:
         desc: Immediately map a Cloud IP to new server? Either "true" or the identifier of the Cloud IP
+      volume_size:
+        desc: Specify a custom volume size (in MiB) when building a network block storage server
     destroy:
       desc: Destroy servers
     lock:

data/spec/brightbox_spec.rb

@@ -1,6 +1,5 @@
 require "spec_helper"
 
 describe Brightbox do
-
   it { expect(Brightbox).to respond_to(:render_table) }
 end

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

@@ -2,7 +2,7 @@
 http_interactions:
 - request:
     method: post
-    uri: http://api.brightbox.dev/token
+    uri: http://api.brightbox.localhost/token
     body:
       encoding: UTF-8
       string: '{"grant_type":"client_credentials"}'
@@ -47,7 +47,7 @@ http_interactions:
   recorded_at: Tue, 27 Aug 2013 16:12:38 GMT
 - request:
     method: get
-    uri: http://api.brightbox.dev/1.0/accounts
+    uri: http://api.brightbox.localhost/1.0/accounts
     body:
       encoding: US-ASCII
       string: ''
@@ -90,7 +90,7 @@ http_interactions:
   recorded_at: Tue, 27 Aug 2013 16:12:38 GMT
 - request:
     method: get
-    uri: http://api.brightbox.dev/1.0/accounts
+    uri: http://api.brightbox.localhost/1.0/accounts
     body:
       encoding: US-ASCII
       string: ''
@@ -133,7 +133,7 @@ http_interactions:
   recorded_at: Tue, 27 Aug 2013 16:12:38 GMT
 - request:
     method: post
-    uri: http://api.brightbox.dev/token
+    uri: http://api.brightbox.localhost/token
     body:
       encoding: UTF-8
       string: '{"grant_type":"client_credentials"}'
@@ -177,7 +177,7 @@ http_interactions:
   recorded_at: Tue, 27 Aug 2013 17:09:42 GMT
 - request:
     method: post
-    uri: http://api.brightbox.dev/token
+    uri: http://api.brightbox.localhost/token
     body:
       encoding: UTF-8
       string: '{"grant_type":"client_credentials"}'

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

@@ -2,7 +2,7 @@
 http_interactions:
 - request:
     method: get
-    uri: http://api.brightbox.dev/1.0/accounts
+    uri: http://api.brightbox.localhost/1.0/accounts
     body:
       encoding: US-ASCII
       string: ''
@@ -45,7 +45,7 @@ http_interactions:
   recorded_at: Tue, 27 Aug 2013 16:12:39 GMT
 - request:
     method: post
-    uri: http://api.brightbox.dev/token
+    uri: http://api.brightbox.localhost/token
     body:
       encoding: UTF-8
       string: '{"grant_type":"client_credentials"}'

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

@@ -2,7 +2,7 @@
 http_interactions:
 - request:
     method: get
-    uri: http://api.brightbox.dev/1.0/account
+    uri: http://api.brightbox.localhost/1.0/account
     body:
       encoding: US-ASCII
       string: ''
@@ -47,7 +47,7 @@ http_interactions:
   recorded_at: Tue, 27 Aug 2013 16:12:39 GMT
 - request:
     method: get
-    uri: http://api.brightbox.dev/1.0/account
+    uri: http://api.brightbox.localhost/1.0/account
     body:
       encoding: US-ASCII
       string: ''
@@ -92,7 +92,7 @@ http_interactions:
   recorded_at: Tue, 27 Aug 2013 16:12:39 GMT
 - request:
     method: post
-    uri: http://api.brightbox.dev/token
+    uri: http://api.brightbox.localhost/token
     body:
       encoding: UTF-8
       string: '{"grant_type":"client_credentials"}'
@@ -136,7 +136,7 @@ http_interactions:
   recorded_at: Tue, 27 Aug 2013 17:09:43 GMT
 - request:
     method: post
-    uri: http://api.brightbox.dev/token
+    uri: http://api.brightbox.localhost/token
     body:
       encoding: UTF-8
       string: '{"grant_type":"client_credentials"}'

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

@@ -2,7 +2,7 @@
 http_interactions:
 - request:
     method: get
-    uri: http://api.brightbox.dev/1.0/account
+    uri: http://api.brightbox.localhost/1.0/account
     body:
       encoding: US-ASCII
       string: ''
@@ -47,7 +47,7 @@ http_interactions:
   recorded_at: Tue, 27 Aug 2013 16:12:39 GMT
 - request:
     method: post
-    uri: http://api.brightbox.dev/token
+    uri: http://api.brightbox.localhost/token
     body:
       encoding: UTF-8
       string: '{"grant_type":"client_credentials"}'

data/spec/cassettes/Brightbox_BBConfig/_add_section/when_config_exists_and_overwrite_duplicates_is_false/does_not_update_the_config_file.yml

@@ -2,7 +2,7 @@
 http_interactions:
 - request:
     method: post
-    uri: http://api.brightbox.dev/token
+    uri: http://api.brightbox.localhost/token
     body:
       encoding: UTF-8
       string: '{"grant_type":"password","username":"jason.null@brightbox.com","password":"N:B3e%7Cmh"}'
@@ -16,7 +16,7 @@ http_interactions:
   response:
     status:
       code: 200
-      message: 
+      message:
     headers:
       Content-Type:
       - application/json
@@ -46,11 +46,11 @@ http_interactions:
       encoding: UTF-8
       string: '{"access_token":"64f68b5dddea1c6b774286180375ba883b896cac","token_type":"Bearer","refresh_token":"b7716ed2480d2831c8cb8af8ea536666c27815b1","scope":"infrastructure,
         orbit","expires_in":7200}'
-    http_version: 
+    http_version:
   recorded_at: Wed, 30 Sep 2015 14:34:22 GMT
 - request:
     method: get
-    uri: http://api.brightbox.dev/1.0/accounts
+    uri: http://api.brightbox.localhost/1.0/accounts
     body:
       encoding: US-ASCII
       string: ''
@@ -64,7 +64,7 @@ http_interactions:
   response:
     status:
       code: 200
-      message: 
+      message:
     headers:
       X-Oauth-Scopes:
       - infrastructure, orbit
@@ -96,11 +96,11 @@ http_interactions:
         new servers are added to this group unless specified otherwise.","created_at":"2015-09-29T08:22:15Z","default":true}],"firewall_policies":[{"id":"fwp-12345","resource_type":"firewall_policy","url":"https://api.gb1.brightbox.com/1.0/firewall_policies/fwp-12345","default":true,"name":"default","created_at":"2015-09-29T08:22:15Z","description":"Applied
         to the default server group."}],"owner":{"id":"usr-12345","resource_type":"user","url":"https://api.gb1.brightbox.com/1.0/users/usr-12345","name":"Jason
         Null","email_address":"jason.null@brightbox.com"},"users":[],"zones":[{"id":"zon-12345","resource_type":"zone","url":"https://api.gb1.brightbox.com/1.0/zones/zon-12345","handle":"gb1-a"},{"id":"zon-12345","resource_type":"zone","url":"https://api.gb1.brightbox.com/1.0/zones/zon-12345","handle":"gb1-b"}]}]'
-    http_version: 
+    http_version:
   recorded_at: Wed, 30 Sep 2015 14:34:22 GMT
 - request:
     method: post
-    uri: http://api.brightbox.dev/token
+    uri: http://api.brightbox.localhost/token
     body:
       encoding: UTF-8
       string: '{"grant_type":"refresh_token","refresh_token":"b7716ed2480d2831c8cb8af8ea536666c27815b1"}'
@@ -114,7 +114,7 @@ http_interactions:
   response:
     status:
       code: 200
-      message: 
+      message:
     headers:
       Content-Type:
       - application/json
@@ -144,11 +144,11 @@ http_interactions:
       encoding: UTF-8
       string: '{"access_token":"c8975689c865aafc885cf964a76fa72418451e25","token_type":"Bearer","refresh_token":"9f7921dbea20637a80b117f3e677060831b6522d","scope":"infrastructure,
         orbit","expires_in":7200}'
-    http_version: 
+    http_version:
   recorded_at: Wed, 30 Sep 2015 14:34:22 GMT
 - request:
     method: get
-    uri: http://api.brightbox.dev/1.0/accounts
+    uri: http://api.brightbox.localhost/1.0/accounts
     body:
       encoding: US-ASCII
       string: ''
@@ -162,7 +162,7 @@ http_interactions:
   response:
     status:
       code: 200
-      message: 
+      message:
     headers:
       X-Oauth-Scopes:
       - infrastructure, orbit
@@ -194,6 +194,6 @@ http_interactions:
         new servers are added to this group unless specified otherwise.","created_at":"2015-09-29T08:22:15Z","default":true}],"firewall_policies":[{"id":"fwp-12345","resource_type":"firewall_policy","url":"https://api.gb1.brightbox.com/1.0/firewall_policies/fwp-12345","default":true,"name":"default","created_at":"2015-09-29T08:22:15Z","description":"Applied
         to the default server group."}],"owner":{"id":"usr-12345","resource_type":"user","url":"https://api.gb1.brightbox.com/1.0/users/usr-12345","name":"Jason
         Null","email_address":"jason.null@brightbox.com"},"users":[],"zones":[{"id":"zon-12345","resource_type":"zone","url":"https://api.gb1.brightbox.com/1.0/zones/zon-12345","handle":"gb1-a"},{"id":"zon-12345","resource_type":"zone","url":"https://api.gb1.brightbox.com/1.0/zones/zon-12345","handle":"gb1-b"}]}]'
-    http_version: 
+    http_version:
   recorded_at: Wed, 30 Sep 2015 14:34:22 GMT
 recorded_with: VCR 2.5.0