profitbricks-sdk-ruby 1.0.4 → 1.0.5

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 6692ce451a899b262c070c4165835a5d416b7e28
-  data.tar.gz: 7cd8499014f70a3de75c39ef4adde967c194efc4
+  metadata.gz: 14db6f0ee04190fb34315ac681ae64790b94eb66
+  data.tar.gz: e33068f4eb3a3c265fc0500338808ca59cf619b5
 SHA512:
-  metadata.gz: 44b05afffd5308078aefd416297122a9b5c20fd344ed1bafa99596c06bc3ade0d5cef62d2e94188186d5a0c3593e6a0cf472126ecd932a366fcd4eadcee11ac8
-  data.tar.gz: 237afdae61b2e7171cac86deab394f6295ef2d47aa75fb86e9623dc7bc372e78464fa9267ac37a31348a4b17747eeded3687079642ba8f410c416fa918602ffa
+  metadata.gz: 7713cb62f664ce285a7194c0d25fe21809099f1e85bd7ffacdf994a332c3ea84aa09c8214b763a14d143dd88ee9c86f6dccb60a5fb8d79926be71386994d6e31
+  data.tar.gz: f0b25b5a6ef17b8e5e930ca811441213509906040be12cd45d993eed594c1126f0b30339241e32400b97b08ffdc9adf3db181b3019bda72165849660f9121c1c

data/lib/profitbricks/datacenter.rb

@@ -2,11 +2,13 @@ module ProfitBricks
   # Datacenter class
   class Datacenter < ProfitBricks::Model
     def delete
-      ProfitBricks.request(
+      response = ProfitBricks.request(
         method: :delete,
         path: "/datacenters/#{self.id}",
         expects: 202
       )
+      self.requestId = response[:requestId]
+      self
     end
 
     def update(options = {})

data/lib/profitbricks/firewall.rb

@@ -4,11 +4,13 @@ module ProfitBricks
 
     # Delete the firewall rule.
     def delete
-      ProfitBricks.request(
+      response = ProfitBricks.request(
         method: :delete,
         path: "/datacenters/#{self.datacenterId}/servers/#{self.serverId}/nics/#{self.nicId}/firewallrules/#{self.id}",
         expects: 202
       )
+      self.requestId = response[:requestId]
+      self
     end
 
     # Update the firewall rule.

data/lib/profitbricks/lan.rb

@@ -4,11 +4,13 @@ module ProfitBricks
 
     # Delete the LAN.
     def delete
-      ProfitBricks.request(
+      response = ProfitBricks.request(
         method: :delete,
         path: "/datacenters/#{self.datacenterId}/lans/#{self.id}",
         expects: 202
       )
+      self.requestId = response[:requestId]
+      self
     end
 
     # Update the LAN.

data/lib/profitbricks/loadbalancer.rb

@@ -3,11 +3,13 @@ module ProfitBricks
   class Loadbalancer < ProfitBricks::Model
     # Delete the loadbalancer.
     def delete
-      ProfitBricks.request(
+      response = ProfitBricks.request(
         method: :delete,
         path: "/datacenters/#{self.datacenterId}/loadbalancers/#{self.id}",
         expects: 202
       )
+      self.requestId = response[:requestId]
+      self
     end
 
     # Update the loadbalancer.

data/lib/profitbricks/nic.rb

@@ -4,11 +4,13 @@ module ProfitBricks
 
     # Delete the NIC.
     def delete
-      ProfitBricks.request(
+      response = ProfitBricks.request(
         method: :delete,
         path: "/datacenters/#{self.datacenterId}/servers/#{self.serverId}/nics/#{self.id}",
         expects: 202
       )
+      self.requestId = response[:requestId]
+      self
     end
 
     # Update the NIC.

data/lib/profitbricks/server.rb

@@ -3,11 +3,13 @@ module ProfitBricks
   class Server < ProfitBricks::Model
     # Delete the server.
     def delete
-      ProfitBricks.request(
+      response = ProfitBricks.request(
         method: :delete,
         path: "/datacenters/#{datacenterId}/servers/#{id}",
         expects: 202
       )
+      self.requestId = response[:requestId]
+      self
     end
 
     # Update the server.

data/lib/profitbricks/snapshot.rb

@@ -4,11 +4,13 @@ module ProfitBricks
 
     # Delete the snapshot.
     def delete
-      ProfitBricks.request(
+      response = ProfitBricks.request(
         method: :delete,
         path: "/snapshots/#{self.id}",
         expects: 202
       )
+      self.requestId = response[:requestId]
+      self
     end
 
     # Update the snapshot.

data/lib/profitbricks/version.rb

@@ -1,3 +1,3 @@
 module ProfitBricks
-  VERSION = "1.0.4"
+  VERSION = "1.0.5"
 end

data/lib/profitbricks/volume.rb

@@ -4,11 +4,13 @@ module ProfitBricks
 
     # Delete the volume.
     def delete
-      ProfitBricks.request(
+      response = ProfitBricks.request(
         method: :delete,
         path: "/datacenters/#{self.datacenterId}/volumes/#{self.id}",
         expects: 202
       )
+      self.requestId = response[:requestId]
+      self
     end
 
     # Update the volume.

data/spec/datacenter_spec.rb

@@ -24,9 +24,7 @@ describe ProfitBricks::Datacenter do
 
   it '#create' do
     expect(@datacenter.type).to eq('datacenter')
-    expect(@datacenter.id).to match(
-      /^[a-f0-9]{8}-[a-f0-9]{4}-[a-f0-9]{4}-[a-f0-9]{4}-[a-f0-9]{12}$/i
-    )
+    expect(@datacenter.id).to match(options[:uuid])
     expect(@datacenter.properties['name']).to eq('Ruby SDK Datacenter')
     expect(@datacenter.properties['description']).to eq('SDK test environment')
     expect(@datacenter.properties['location']).to eq('de/fkb')
@@ -37,9 +35,7 @@ describe ProfitBricks::Datacenter do
 
     expect(datacenters.count).to be > 0
     expect(datacenters[0].type).to eq('datacenter')
-    expect(datacenters[0].id).to match(
-      /^[a-f0-9]{8}-[a-f0-9]{4}-[a-f0-9]{4}-[a-f0-9]{4}-[a-f0-9]{12}$/i
-    )
+    expect(datacenters[0].id).to match(options[:uuid])
   end
 
   it '#get' do
@@ -68,7 +64,7 @@ describe ProfitBricks::Datacenter do
     datacenter = ProfitBricks::Datacenter.create(options[:datacenter])
     datacenter.wait_for { ready? }
 
-    expect(datacenter.delete).to be_kind_of(Hash)
+    expect(datacenter.delete.requestId).to match(options[:uuid])
     expect(datacenter.wait_for { ready? }).to be_kind_of(Hash)
   end
 
@@ -76,9 +72,7 @@ describe ProfitBricks::Datacenter do
     servers = @datacenter.list_servers
 
     expect(servers[0].type).to eq('server')
-    expect(servers[0].id).to match(
-      /^[a-f0-9]{8}-[a-f0-9]{4}-[a-f0-9]{4}-[a-f0-9]{4}-[a-f0-9]{12}$/i
-    )
+    expect(servers[0].id).to match(options[:uuid])
     expect(servers[0].properties['name']).to eq('New Server')
     expect(servers[0].properties['cores']).to be_kind_of(Integer)
     expect(servers[0].properties['ram']).to eq(1024)
@@ -92,9 +86,7 @@ describe ProfitBricks::Datacenter do
     server = @datacenter.get_server(@server.id)
 
     expect(server.type).to eq('server')
-    expect(server.id).to match(
-      /^[a-f0-9]{8}-[a-f0-9]{4}-[a-f0-9]{4}-[a-f0-9]{4}-[a-f0-9]{12}$/i
-    )
+    expect(server.id).to match(options[:uuid])
     expect(server.properties['name']).to eq('New Server')
     expect(server.properties['cores']).to be_kind_of(Integer)
     expect(server.properties['ram']).to eq(1024)
@@ -122,9 +114,7 @@ describe ProfitBricks::Datacenter do
     volumes = @datacenter.list_volumes
 
     expect(volumes[0].type).to eq('volume')
-    expect(volumes[0].id).to match(
-      /^[a-f0-9]{8}-[a-f0-9]{4}-[a-f0-9]{4}-[a-f0-9]{4}-[a-f0-9]{12}$/i
-    )
+    expect(volumes[0].id).to match(options[:uuid])
     expect(volumes[0].properties['name']).to eq('my boot volume for server 1')
     expect(volumes[0].properties['size']).to eq(10)
     expect(volumes[0].properties['bus']).to be nil
@@ -139,9 +129,7 @@ describe ProfitBricks::Datacenter do
     volume = @datacenter.get_volume(@volume.id)
 
     expect(volume.type).to eq('volume')
-    expect(volume.id).to match(
-      /^[a-f0-9]{8}-[a-f0-9]{4}-[a-f0-9]{4}-[a-f0-9]{4}-[a-f0-9]{12}$/i
-    )
+    expect(volume.id).to match(options[:uuid])
     expect(volume.properties['name']).to eq('my boot volume for server 1')
     expect(volume.properties['size']).to eq(10)
     expect(volume.properties['bus']).to be nil
@@ -157,9 +145,7 @@ describe ProfitBricks::Datacenter do
     volume = @datacenter.get_volume(@volume.id)
 
     expect(volume.type).to eq('volume')
-    expect(volume.id).to match(
-      /^[a-f0-9]{8}-[a-f0-9]{4}-[a-f0-9]{4}-[a-f0-9]{4}-[a-f0-9]{12}$/i
-    )
+    expect(volume.id).to match(options[:uuid])
     expect(volume.properties['name']).to eq('my boot volume for server 1')
     expect(volume.properties['size']).to eq(10)
     expect(volume.properties['bus']).to be nil
@@ -207,7 +193,7 @@ describe ProfitBricks::Datacenter do
     expect(lans[0].type).to eq('lan')
     expect(lans[0].id).to match(/^\d+$/)
     expect(lans[0].properties['name']).to eq('public Lan 4')
-    expect(lans[0].properties['public']).to be false
+    expect(lans[0].properties['public']).to be true
   end
 
   it '#get_lan' do

data/spec/firewall_spec.rb

@@ -21,7 +21,7 @@ describe ProfitBricks::Firewall do
 
   it '#create' do
     expect(@fwrule.type).to eq('firewall-rule')
-    expect(@fwrule.id).to be_kind_of(String)
+    expect(@fwrule.id).to match(options[:uuid])
     expect(@fwrule.properties['name']).to eq('SSH')
     expect(@fwrule.properties['protocol']).to eq('TCP')
     expect(@fwrule.properties['sourceMac']).to eq('01:23:45:67:89:00')
@@ -90,6 +90,6 @@ describe ProfitBricks::Firewall do
     fwrule = ProfitBricks::Firewall.create(@datacenter.id, @server.id, @nic.id, options[:fwrule])
     fwrule.wait_for { ready? }
 
-    expect(fwrule.delete).to have_key(:requestId)
+    expect(fwrule.delete.requestId).to match(options[:uuid])
   end
 end

data/spec/image_spec.rb

@@ -8,7 +8,7 @@ describe ProfitBricks::Image do
   it '#list' do
     expect(@images.count).to be > 0
     expect(@images[0].type).to eq('image')
-    expect(@images[0].id).to be_kind_of(String)
+    expect(@images[0].id).to match(options[:uuid])
     expect(@images[0].properties['name']).to be_kind_of(String)
     expect(@images[0].properties['description']).to be nil
     expect(@images[0].properties['location']).to match(/\w+\/\w+/)
@@ -19,7 +19,7 @@ describe ProfitBricks::Image do
     image = ProfitBricks::Image.get(@images[0].id)
 
     expect(image.type).to eq('image')
-    expect(image.id).to be_kind_of(String)
+    expect(image.id).to match(options[:uuid])
     expect(image.properties['name']).to be_kind_of(String)
     expect(image.properties['description']).to be nil
     expect(image.properties['location']).to match(/\w+\/\w+/)

data/spec/ipblock_spec.rb

@@ -12,9 +12,7 @@ describe ProfitBricks::IPBlock do
   # alias: create
   it '#reserve' do
     expect(@ipblock.type).to eq('ipblock')
-    expect(@ipblock.id).to match(
-      /^[a-f0-9]{8}-[a-f0-9]{4}-[a-f0-9]{4}-[a-f0-9]{4}-[a-f0-9]{12}$/i
-    )
+    expect(@ipblock.id).to match(options[:uuid])
     expect(@ipblock.properties['ips'].count).to be > 0
     expect(@ipblock.properties['location']).to eq('de/fra')
     expect(@ipblock.properties['size']).to eq(1)
@@ -25,9 +23,7 @@ describe ProfitBricks::IPBlock do
 
     expect(ipblocks.count).to be > 0
     expect(ipblocks[0].type).to eq('ipblock')
-    expect(ipblocks[0].id).to match(
-      /^[a-f0-9]{8}-[a-f0-9]{4}-[a-f0-9]{4}-[a-f0-9]{4}-[a-f0-9]{12}$/i
-    )
+    expect(ipblocks[0].id).to match(options[:uuid])
     expect(ipblocks[0].properties['ips'].count).to be > 0
     expect(ipblocks[0].properties['location']).to eq('de/fra')
     expect(ipblocks[0].properties['size']).to be_kind_of(Integer)

data/spec/lan_spec.rb

@@ -58,7 +58,7 @@ describe ProfitBricks::LAN do
     lan = ProfitBricks::LAN.create(@datacenter.id, options[:lan])
     lan.wait_for { ready? }
 
-    expect(lan.delete).to be_kind_of(Hash)
+    expect(lan.delete.requestId).to match(options[:uuid])
   end
 
   it '#list_members' do

data/spec/loadbalancer_spec.rb

@@ -27,7 +27,7 @@ describe ProfitBricks::Loadbalancer do
 
   it '#create' do
     expect(@loadbalancer.type).to eq('loadbalancer')
-    expect(@loadbalancer.id).to be_kind_of(String)
+    expect(@loadbalancer.id).to match(options[:uuid])
     expect(@loadbalancer.properties['name']).to eq('My LB')
     expect(@loadbalancer.properties['ip']).to be nil
     expect(@loadbalancer.properties['dhcp']).to be true
@@ -75,7 +75,7 @@ describe ProfitBricks::Loadbalancer do
     loadbalancer = ProfitBricks::Loadbalancer.create(@datacenter.id, options[:loadbalancer])
     loadbalancer.wait_for { ready? }
 
-    expect(loadbalancer.delete).to have_key(:requestId)
+    expect(loadbalancer.delete.requestId).to match(options[:uuid])
   end
 
   it '#list_balanced_nics' do

data/spec/nic_spec.rb

@@ -21,7 +21,7 @@ describe ProfitBricks::NIC do
 
   it '#create' do
     expect(@nic.type).to eq('nic')
-    expect(@nic.id).to be_kind_of(String)
+    expect(@nic.id).to match(options[:uuid])
     expect(@nic.properties['name']).to eq('nic1')
     expect(@nic.properties['ips']).to be_kind_of(Array)
     expect(@nic.properties['dhcp']).to be true
@@ -66,7 +66,7 @@ describe ProfitBricks::NIC do
     nic = ProfitBricks::NIC.create(@datacenter.id, @server.id, options[:nic])
     nic.wait_for { ready? }
 
-    expect(nic.delete).to be_kind_of(Hash)
+    expect(nic.delete.requestId).to match(options[:uuid])
   end
 
   it '#list_firewall_rules' do

data/spec/request_spec.rb

@@ -17,14 +17,14 @@ describe ProfitBricks::Request do
 
     expect(requests.count).to be > 0
     expect(requests[0].type).to eq('request')
-    expect(requests[0].id).to be_kind_of(String)
+    expect(requests[0].id).to match(options[:uuid])
   end
 
   it '#get' do
     request = ProfitBricks::Request.get(@request.id)
 
     expect(request.type).to eq('request')
-    expect(request.id).to be_kind_of(String)
+    expect(request.id).to match(options[:uuid])
     expect(request.properties['method']).to eq('POST')
   end
 

data/spec/server_spec.rb

@@ -35,23 +35,19 @@ describe ProfitBricks::Server do
 
   it '#create' do
     expect(@server.type).to eq('server')
-    expect(@server.id).to match(
-      /^[a-f0-9]{8}-[a-f0-9]{4}-[a-f0-9]{4}-[a-f0-9]{4}-[a-f0-9]{12}$/i
-    )
+    expect(@server.id).to match(options[:uuid])
     expect(@server.properties['name']).to eq('New Server')
     expect(@server.properties['cores']).to eq(1)
     expect(@server.properties['ram']).to eq(1024)
     expect(@server.properties['availabilityZone']).to eq('AUTO')
-    expect(@server.properties['vmState']).to eq('RUNNING')
+    expect(@server.properties['vmState']).to eq('SHUTOFF').or eq('RUNNING')
   end
 
   it '#create composite' do
     @composite_server.wait_for(300) { ready? }
     @composite_server.reload
     expect(@composite_server.type).to eq('server')
-    expect(@composite_server.id).to match(
-      /^[a-f0-9]{8}-[a-f0-9]{4}-[a-f0-9]{4}-[a-f0-9]{4}-[a-f0-9]{12}$/i
-    )
+    expect(@composite_server.id).to match(options[:uuid])
     expect(@composite_server.properties['name']).to eq('New Composite Server')
     expect(@composite_server.properties['cores']).to eq(1)
     expect(@composite_server.properties['ram']).to eq(1024)
@@ -110,7 +106,7 @@ describe ProfitBricks::Server do
     server = ProfitBricks::Server.create(@datacenter.id, options[:server])
     server.wait_for { ready? }
 
-    expect(server.delete).to be_kind_of(Hash)
+    expect(server.delete.requestId).to match(options[:uuid])
     expect(server.wait_for { ready? }).to be_kind_of(Hash)
   end
 
@@ -198,7 +194,7 @@ describe ProfitBricks::Server do
 
   it '#create_nic' do
     expect(@nic.type).to eq('nic')
-    expect(@nic.id).to be_kind_of(String)
+    expect(@nic.id).to match(options[:uuid])
     expect(@nic.properties['name']).to eq('nic1')
     expect(@nic.properties['ips']).to be_kind_of(Array)
     expect(@nic.properties['dhcp']).to be true
@@ -210,7 +206,7 @@ describe ProfitBricks::Server do
 
     expect(nics.count).to be > 0
     expect(nics[0].type).to eq('nic')
-    expect(nics[0].id).to be_kind_of(String)
+    expect(nics[0].id).to match(options[:uuid])
     expect(nics[0].properties['name']).to eq('nic1')
     expect(nics[0].properties['ips']).to be_kind_of(Array)
     expect(nics[0].properties['dhcp']).to be true
@@ -221,7 +217,7 @@ describe ProfitBricks::Server do
     nic = @server.get_nic(@nic.id)
 
     expect(nic.type).to eq('nic')
-    expect(nic.id).to be_kind_of(String)
+    expect(nic.id).to match(options[:uuid])
     expect(nic.properties['name']).to eq('nic1')
     expect(nic.properties['ips']).to be_kind_of(Array)
     expect(nic.properties['dhcp']).to be true

data/spec/snapshot_spec.rb

@@ -18,7 +18,7 @@ describe ProfitBricks::Snapshot do
 
   it '#create' do
     expect(@snapshot.type).to eq('snapshot')
-    expect(@snapshot.id).to be_kind_of(String)
+    expect(@snapshot.id).to match(options[:uuid])
     expect(@snapshot.properties['name']).to eq('Snapshot of storage X on 12.12.12 12:12:12 - updated')
     expect(@snapshot.properties['description']).to eq('description of a snapshot - updated')
     expect(@snapshot.properties['location']).to match(/\w+\/\w+/)
@@ -41,7 +41,7 @@ describe ProfitBricks::Snapshot do
 
     expect(snapshots.count).to be > 0
     expect(snapshots[0].type).to eq('snapshot')
-    expect(snapshots[0].id).to be_kind_of(String)
+    expect(snapshots[0].id).to match(options[:uuid])
     expect(snapshots[0].properties['name']).to be_kind_of(String)
     expect(snapshots[0].properties['description']).to be_kind_of(String)
     expect(snapshots[0].properties['location']).to match(/\w+\/\w+/)
@@ -86,7 +86,7 @@ describe ProfitBricks::Snapshot do
     snapshot.wait_for { ready? }
 
     expect(snapshot.type).to eq('snapshot')
-    expect(snapshot.id).to be_kind_of(String)
+    expect(snapshot.id).to match(options[:uuid])
     expect(snapshot.properties['name']).to eq('New name')
     expect(snapshot.properties['description']).to be_kind_of(String)
     expect(snapshot.properties['location']).to match(/\w+\/\w+/)

data/spec/support/resource_helper.rb

@@ -1,6 +1,7 @@
 module Helpers
   def options
     {
+      uuid: /^[a-f0-9]{8}-[a-f0-9]{4}-[a-f0-9]{4}-[a-f0-9]{4}-[a-f0-9]{12}$/i,
       datacenter: {
         name: 'Ruby SDK Datacenter',
         description: 'SDK test environment',

data/spec/volume_spec.rb

@@ -18,24 +18,16 @@ describe ProfitBricks::Volume do
     @snapshot.wait_for { ready? }
   end
 
-  # before do
-  #   @volume.wait_for { ready? }
-  #   @volume.reload
-  # end
-
   after(:all) do
     @datacenter.delete
   end
 
   it '#create' do
     expect(@volume.type).to eq('volume')
-    expect(@volume.id).to match(
-      /^[a-f0-9]{8}-[a-f0-9]{4}-[a-f0-9]{4}-[a-f0-9]{4}-[a-f0-9]{12}$/i
-    )
+    expect(@volume.id).to match(options[:uuid])
     expect(@volume.properties['name']).to eq('my boot volume for server 1')
     expect(@volume.properties['size']).to be_kind_of(Integer)
     expect(@volume.properties['bus']).to be nil
-    #expect(@volume.properties['type']).to eq('HDD')
     expect(@volume.properties['type']).to be nil
   end
 
@@ -80,7 +72,7 @@ describe ProfitBricks::Volume do
     volume = ProfitBricks::Volume.create(@datacenter.id, options[:volume])
     volume.wait_for { ready? }
 
-    expect(volume.delete).to be_kind_of(Hash)
+    expect(volume.delete.requestId).to match(options[:uuid])
   end
 
   it '#attach' do

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: profitbricks-sdk-ruby
 version: !ruby/object:Gem::Version
-  version: 1.0.4
+  version: 1.0.5
 platform: ruby
 authors:
 - Ethan Devenport
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-09-08 00:00:00.000000000 Z
+date: 2015-09-23 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: excon