fog-brightbox 0.16.0 → 1.1.0

data/spec/fog/compute/brightbox/user_spec.rb

@@ -1,7 +1,7 @@
 require "spec_helper"
 require "fog/brightbox/models/compute/user"
 
-describe Fog::Compute::Brightbox::User do
+describe Fog::Brightbox::Compute::User do
   include ModelSetup
 
   subject { service.users.new }

data/spec/fog/compute/brightbox/zone_spec.rb

@@ -1,7 +1,7 @@
 require "spec_helper"
 require "fog/brightbox/models/compute/zone"
 
-describe Fog::Compute::Brightbox::Zone do
+describe Fog::Brightbox::Compute::Zone do
   include ModelSetup
 
   subject { service.zones.new }

data/spec/fog/compute/brightbox_spec.rb

@@ -1,6 +1,6 @@
 require "spec_helper"
 
-describe Fog::Compute::Brightbox do
+describe Fog::Brightbox::Compute do
   describe "when global config is available" do
     before do
       @arguments = {
@@ -19,7 +19,7 @@ describe Fog::Compute::Brightbox do
       end
 
       Fog.stub :credentials, @credential_guard do
-        @service = Fog::Compute::Brightbox.new(@arguments)
+        @service = Fog::Brightbox::Compute.new(@arguments)
       end
     end
 
@@ -40,7 +40,7 @@ describe Fog::Compute::Brightbox do
     it "raises an error" do
       Fog.stub :credentials, {} do
         assert_raises ArgumentError do
-          Fog::Compute::Brightbox.new({})
+          Fog::Brightbox::Compute.new({})
         end
       end
     end
@@ -53,7 +53,7 @@ describe Fog::Compute::Brightbox do
         :brightbox_secret => "1234567890"
       }
       @config = Fog::Brightbox::Config.new(@options)
-      @service = Fog::Compute::Brightbox.new(@config)
+      @service = Fog::Brightbox::Compute.new(@config)
       pass
     end
   end
@@ -62,7 +62,7 @@ describe Fog::Compute::Brightbox do
     it "raises ArgumentError"do
       @config = Fog::Brightbox::Config.new({})
       assert_raises ArgumentError do
-        @service = Fog::Compute::Brightbox.new(@config)
+        @service = Fog::Brightbox::Compute.new(@config)
       end
     end
   end

data/spec/fog/storage/brightbox_spec.rb

@@ -1,16 +1,16 @@
 require "spec_helper"
 
-describe Fog::Storage::Brightbox do
+describe Fog::Brightbox::Storage do
   include StockStorageResponses
 
   let(:config) { Fog::Brightbox::Config.new(settings) }
-  let(:service) { Fog::Storage::Brightbox.new(config) }
+  let(:service) { Fog::Brightbox::Storage.new(config) }
 
   describe "when created without required arguments" do
     it "raises an error" do
       Fog.stub :credentials, {} do
         assert_raises ArgumentError do
-          Fog::Storage::Brightbox.new({})
+          Fog::Brightbox::Storage.new({})
         end
       end
     end
@@ -35,7 +35,7 @@ describe Fog::Storage::Brightbox do
 
     it "raises ArgumentError" do
       assert_raises ArgumentError do
-        Fog::Storage::Brightbox.new(config)
+        Fog::Brightbox::Storage.new(config)
       end
     end
   end
@@ -89,7 +89,7 @@ describe Fog::Storage::Brightbox do
       {
         :brightbox_client_id => "app-12345",
         :brightbox_secret => "12345",
-        :brightbox_username => "user@example.com",
+        :brightbox_username => "user@example.test",
         :brightbox_password => "abcde",
         :brightbox_account => "acc-abcde"
       }
@@ -111,7 +111,7 @@ describe Fog::Storage::Brightbox do
       {
         :brightbox_client_id => "app-12345",
         :brightbox_secret => "12345",
-        :brightbox_username => "user@example.com",
+        :brightbox_username => "user@example.test",
         :brightbox_password => "abcde"
       }
     end
@@ -204,7 +204,7 @@ describe Fog::Storage::Brightbox do
       {
         :brightbox_client_id => "app-12345",
         :brightbox_secret => "12345",
-        :brightbox_username => "user@example.com",
+        :brightbox_username => "user@example.test",
         :brightbox_password => "12345",
         :brightbox_access_token => "1234567890abcdefghijklmnopqrstuvwxyz",
         :brightbox_refresh_token => "1234567890abcdefghijklmnopqrstuvwxyz",
@@ -221,7 +221,7 @@ describe Fog::Storage::Brightbox do
 
       # The reauthentication
       stub_request(:get, "https://files.gb2.brightbox.com/v1").
-        with(:headers => { "X-Auth-User" => "user@example.com", "X-Auth-Key" => "12345" }).
+        with(:headers => { "X-Auth-User" => "user@example.test", "X-Auth-Key" => "12345" }).
         to_return(authorized_response)
 
       # Repeated request
@@ -283,7 +283,6 @@ describe Fog::Storage::Brightbox do
   end
 
   describe "when initialised with temporary URL key" do
-    before { skip unless RUBY_VERSION > "1.9.3" }
     let(:temp_url_key) { "1234567890" }
     let(:settings) do
       {
@@ -319,7 +318,6 @@ describe Fog::Storage::Brightbox do
   end
 
   describe "when initialised without management URL" do
-    before { skip unless RUBY_VERSION > "1.9.3" }
     let(:temp_url_key) { "1234567890" }
     let(:settings) do
       {

data/spec/model_setup.rb

@@ -16,7 +16,7 @@ module ModelSetup
       end
 
       let(:config) { Fog::Brightbox::Config.new(configuration) }
-      let(:service) { Fog::Compute::Brightbox.new(config) }
+      let(:service) { Fog::Brightbox::Compute.new(config) }
     end
   end
 end

data/spec/supports_resource_locking.rb

@@ -14,8 +14,6 @@ module SupportsResourceLocking
       end
 
       def test_lock_makes_request
-        skip if RUBY_VERSION < "1.9"
-
         subject.id = "tst-12345"
 
         stub_request(:put, "http://localhost/1.0/#{collection_name}/tst-12345/lock_resource").
@@ -30,8 +28,6 @@ module SupportsResourceLocking
       end
 
       def test_unlock_makes_request
-        skip if RUBY_VERSION < "1.9"
-
         subject.id = "tst-12345"
 
         stub_request(:put, "http://localhost/1.0/#{collection_name}/tst-12345/unlock_resource").

data/tests/brightbox/compute/schema.rb

@@ -46,7 +46,7 @@ Hash.send :include, Fog::Brightbox::Nullable::Zone
 NilClass.send :include, Fog::Brightbox::Nullable::Zone
 
 class Brightbox
-  module Compute
+  class Compute
     module Formats
       module Struct
         CIP_PORT_TRANSLATOR = {

data/tests/brightbox/compute_tests.rb

@@ -9,8 +9,8 @@ end
 Shindo.tests("Fog::Compute.new", ["brightbox"]) do
   tests("service options") do
     {
-      :brightbox_api_url => "https://example.com",
-      :brightbox_auth_url => "https://example.com",
+      :brightbox_api_url => "https://example.test",
+      :brightbox_auth_url => "https://example.test",
       :brightbox_client_id => "app-12345",
       :brightbox_secret => "12345abdef6789",
       :brightbox_username => "user-12345",

data/tests/brightbox/requests/compute/api_client_tests.rb

@@ -38,9 +38,9 @@ Shindo.tests("Fog::Compute[:brightbox] | api client requests", ["brightbox"]) do
       test("new secret is visible") { !result["secret"].nil? }
     end
 
-    tests("#destroy_api_client('#{@api_client_id}')") do
+    tests("#delete_api_client('#{@api_client_id}')") do
       pending if Fog.mocking?
-      result = Fog::Compute[:brightbox].destroy_api_client(@api_client_id)
+      result = Fog::Compute[:brightbox].delete_api_client(@api_client_id)
       data_matches_schema(Brightbox::Compute::Formats::Full::API_CLIENT, :allow_extra_keys => true) { result }
     end
   end

data/tests/brightbox/requests/compute/application_test.rb

@@ -37,9 +37,9 @@ Shindo.tests("Fog::Compute[:brightbox] | api client requests", ["brightbox"]) do
       test("new secret is visible") { !result["secret"].nil? }
     end
 
-    tests("#destroy_application('#{@application_id}')") do
+    tests("#delete_application('#{@application_id}')") do
       pending if Fog.mocking?
-      result = Fog::Compute[:brightbox].destroy_application(@application_id)
+      result = Fog::Compute[:brightbox].delete_application(@application_id)
       data_matches_schema(Brightbox::Compute::Formats::Full::APPLICATION, :allow_extra_keys => true) { result }
     end
   end

data/tests/brightbox/requests/compute/cloud_ip_tests.rb

@@ -54,9 +54,9 @@ Shindo.tests("Fog::Compute[:brightbox] | cloud ip requests", ["brightbox"]) do
       result = Fog::Compute[:brightbox].update_cloud_ip(@cloud_ip_id, :reverse_dns => "")
     end
 
-    tests("#destroy_cloud_ip('#{@cloud_ip_id}')") do
+    tests("#delete_cloud_ip('#{@cloud_ip_id}')") do
       pending if Fog.mocking?
-      result = Fog::Compute[:brightbox].destroy_cloud_ip(@cloud_ip_id)
+      result = Fog::Compute[:brightbox].delete_cloud_ip(@cloud_ip_id)
       data_matches_schema(Brightbox::Compute::Formats::Full::CLOUD_IP, :allow_extra_keys => true) { result }
     end
 

data/tests/brightbox/requests/compute/collaboration_tests.rb

@@ -1,8 +1,11 @@
 Shindo.tests("Fog::Compute[:brightbox] | collaboration requests", ["brightbox"]) do
   tests("success") do
+    @test_collaborator_email = ENV["FOG_TEST_COLLABORATOR_EMAIL"]
+    pending unless @test_collaborator_email
+
     tests("#create_collaboration") do
       pending if Fog.mocking?
-      collaboration = Fog::Compute[:brightbox].create_collaboration(:email => "paul@example.com", :role => "admin")
+      collaboration = Fog::Compute[:brightbox].create_collaboration(:email => @test_collaborator_email, :role => "admin")
       @collaboration_id = collaboration["id"]
       formats(Brightbox::Compute::Formats::Full::COLLABORATION, false) { collaboration }
     end
@@ -20,9 +23,9 @@ Shindo.tests("Fog::Compute[:brightbox] | collaboration requests", ["brightbox"])
       formats(Brightbox::Compute::Formats::Full::COLLABORATION, false) { result }
     end
 
-    tests("#destroy_collaboration") do
+    tests("#delete_collaboration") do
       pending if Fog.mocking?
-      result = Fog::Compute[:brightbox].destroy_collaboration(@collaboration_id)
+      result = Fog::Compute[:brightbox].delete_collaboration(@collaboration_id)
       formats(Brightbox::Compute::Formats::Full::COLLABORATION, false) { result }
     end
   end

data/tests/brightbox/requests/compute/database_server_tests.rb

@@ -35,8 +35,8 @@ Shindo.tests("Fog::Compute[:brightbox] | database server requests", ["brightbox"
       test("new password is visible") { !result["admin_password"].nil? }
     end
 
-    tests("#destroy_database_server('#{@database_server_id}')") do
-      result = Fog::Compute[:brightbox].destroy_database_server(@database_server_id)
+    tests("#delete_database_server('#{@database_server_id}')") do
+      result = Fog::Compute[:brightbox].delete_database_server(@database_server_id)
       data_matches_schema(Brightbox::Compute::Formats::Full::DATABASE_SERVER, :allow_extra_keys => true) { result }
     end
   end

data/tests/brightbox/requests/compute/database_snapsnot_tests.rb

@@ -32,8 +32,8 @@ Shindo.tests("Fog::Compute[:brightbox] | database snapshot requests", ["brightbo
       data_matches_schema(Brightbox::Compute::Formats::Full::DATABASE_SNAPSHOT, :allow_extra_keys => true) { result }
     end
 
-    tests("#destroy_database_snapshot('#{@database_snapshot_id}')") do
-      result = service.destroy_database_snapshot(@database_snapshot_id)
+    tests("#delete_database_snapshot('#{@database_snapshot_id}')") do
+      result = service.delete_database_snapshot(@database_snapshot_id)
       data_matches_schema(Brightbox::Compute::Formats::Full::DATABASE_SNAPSHOT, :allow_extra_keys => true) { result }
     end
   end

data/tests/brightbox/requests/compute/firewall_policy_tests.rb

@@ -31,8 +31,8 @@ Shindo.tests("Fog::Compute[:brightbox] | firewall policy requests", ["brightbox"
       returns("Fog test policy B") { result["name"] }
     end
 
-    tests("#destroy_firewall_policy('#{@firewall_policy_id}')") do
-      result = Fog::Compute[:brightbox].destroy_firewall_policy(@firewall_policy_id)
+    tests("#delete_firewall_policy('#{@firewall_policy_id}')") do
+      result = Fog::Compute[:brightbox].delete_firewall_policy(@firewall_policy_id)
       data_matches_schema(Brightbox::Compute::Formats::Full::FIREWALL_POLICY, :allow_extra_keys => true) { result }
     end
   end

data/tests/brightbox/requests/compute/firewall_rule_tests.rb

@@ -30,8 +30,8 @@ Shindo.tests("Fog::Compute[:brightbox] | firewall rule requests", ["brightbox"])
       end
     end
 
-    tests("#destroy_firewall_rule('#{@firewall_rule_id}')") do
-      result = Fog::Compute[:brightbox].destroy_firewall_rule(@firewall_rule_id)
+    tests("#delete_firewall_rule('#{@firewall_rule_id}')") do
+      result = Fog::Compute[:brightbox].delete_firewall_rule(@firewall_rule_id)
       data_matches_schema(Brightbox::Compute::Formats::Full::FIREWALL_RULE, :allow_extra_keys => true) { result }
     end
 

data/tests/brightbox/requests/compute/helper.rb

@@ -1,5 +1,5 @@
 class Brightbox
-  module Compute
+  class Compute
     module TestSupport
       # Find a suitable image for testing with
       # For speed of server building we're using an empty image

data/tests/brightbox/requests/compute/image_tests.rb

@@ -34,8 +34,8 @@ Shindo.tests("Fog::Compute[:brightbox] | image requests", ["brightbox"]) do
     # end
 
     ## Same as other tests - can't be deleting them unless part of the test run
-    # tests("#destroy_server('#{@image_id}')") do
-    #   result = Fog::Compute[:brightbox].destroy_image(@image_id)
+    # tests("#delete_image('#{@image_id}')") do
+    #   result = Fog::Compute[:brightbox].delete_image(@image_id)
     #   formats(Brightbox::Compute::Formats::Full::IMAGE) { result }
     # end
   end

data/tests/brightbox/requests/compute/load_balancer_tests.rb

@@ -85,9 +85,9 @@ Shindo.tests("Fog::Compute[:brightbox] | load balancer requests", ["brightbox"])
       data_matches_schema(Brightbox::Compute::Formats::Full::LOAD_BALANCER, :allow_extra_keys => true) { result }
     end
 
-    tests("#destroy_load_balancer('#{@load_balancer_id}')") do
+    tests("#delete_load_balancer('#{@load_balancer_id}')") do
       pending if Fog.mocking?
-      result = Fog::Compute[:brightbox].destroy_load_balancer(@load_balancer_id)
+      result = Fog::Compute[:brightbox].delete_load_balancer(@load_balancer_id)
       data_matches_schema(Brightbox::Compute::Formats::Full::LOAD_BALANCER, :allow_extra_keys => true) { result }
     end
 

data/tests/brightbox/requests/compute/server_group_tests.rb

@@ -61,9 +61,9 @@ Shindo.tests("Fog::Compute[:brightbox] | server group requests", ["brightbox"])
       test("group is emptied") { result["servers"].empty? }
     end
 
-    tests("#destroy_server_group('#{@server_group_id}')") do
+    tests("#delete_server_group('#{@server_group_id}')") do
       pending if Fog.mocking?
-      result = Fog::Compute[:brightbox].destroy_server_group(@server_group_id)
+      result = Fog::Compute[:brightbox].delete_server_group(@server_group_id)
       data_matches_schema(Brightbox::Compute::Formats::Full::SERVER_GROUP, :allow_extra_keys => true) { result }
     end
 

data/tests/brightbox/requests/compute/server_tests.rb

@@ -76,9 +76,9 @@ Shindo.tests("Fog::Compute[:brightbox] | server requests", ["brightbox"]) do
       @snapshot.destroy
     end
 
-    tests("#destroy_server('#{server_id}')") do
+    tests("#delete_server('#{server_id}')") do
       pending if Fog.mocking?
-      result = Fog::Compute[:brightbox].destroy_server(server_id)
+      result = Fog::Compute[:brightbox].delete_server(server_id)
       data_matches_schema(Brightbox::Compute::Formats::Full::SERVER, :allow_extra_keys => true) { result }
     end
   end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: fog-brightbox
 version: !ruby/object:Gem::Version
-  version: 0.16.0
+  version: 1.1.0
 platform: ruby
 authors:
 - Paul Thornthwaite
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2018-09-04 00:00:00.000000000 Z
+date: 1970-01-01 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: fog-core
@@ -16,14 +16,20 @@ dependencies:
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: '0'
+        version: '1.45'
+    - - "<"
+      - !ruby/object:Gem::Version
+        version: '3.0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: '0'
+        version: '1.45'
+    - - "<"
+      - !ruby/object:Gem::Version
+        version: '3.0'
 - !ruby/object:Gem::Dependency
   name: fog-json
   requirement: !ruby/object:Gem::Requirement
@@ -52,20 +58,6 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: '0'
-- !ruby/object:Gem::Dependency
-  name: mime-types
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: '0'
-  type: :runtime
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: '0'
 - !ruby/object:Gem::Dependency
   name: bundler
   requirement: !ruby/object:Gem::Requirement
@@ -181,7 +173,6 @@ files:
 - README.md
 - Rakefile
 - fog-brightbox.gemspec
-- gemfiles/Gemfile.1.9.3
 - lib/fog/brightbox.rb
 - lib/fog/brightbox/compute.rb
 - lib/fog/brightbox/compute/config.rb
@@ -374,6 +365,7 @@ files:
 - lib/fog/brightbox/storage/config.rb
 - lib/fog/brightbox/storage/connection.rb
 - lib/fog/brightbox/storage/management_url_unknown.rb
+- lib/fog/brightbox/storage/not_found.rb
 - lib/fog/brightbox/version.rb
 - spec/fog/brightbox/compute/config_spec.rb
 - spec/fog/brightbox/compute/wrapped_request_spec.rb
@@ -464,17 +456,16 @@ require_paths:
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
-  - - ">="
+  - - "~>"
     - !ruby/object:Gem::Version
-      version: '0'
+      version: '2.0'
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubyforge_project: 
-rubygems_version: 2.7.7
+rubygems_version: 3.0.6
 signing_key: 
 specification_version: 4
 summary: This library can be used as a module for `fog` or as standalone provider