profitbricks 0.9.5 → 0.9.6

checksums.yaml

@@ -0,0 +1,7 @@
+---
+SHA1:
+  metadata.gz: 4a0ff4bfe920209b641d343a04137b8a38d6ec43
+  data.tar.gz: 396baa3f665ca3a526a60141a50115ae0acd96c8
+SHA512:
+  metadata.gz: 78788fb605f270e3af09dbd6831dfbc4b76b6bbe1adbcc9b0dd87f2c041ed7d3812d8aadfb3041255d34901b647ecb02ec6c393a8d299b2dd174e66c43072f03
+  data.tar.gz: 8ff5a7e06ab96295d4e6492d0016f09fe42140f9de409ae632ade63d3038846b455e5cdda5fa1d3759e2705513305c7bc5ad3e64391077edbfe22f052a2e30a4

data/.travis.yml

@@ -1,8 +1,8 @@
 language: ruby
 rvm:
-  - 1.8.7
   - 1.9.2
   - 1.9.3
+  - 2.0.0
   - jruby-18mode # JRuby in 1.8 mode
   - jruby-19mode # JRuby in 1.9 mode
   - rbx-18mode

data/Gemfile

@@ -1,23 +1,23 @@
-source :rubygems
-gem 'savon', '1.2.0'
-
-group :test, :development do 
-  gem 'json'
-  gem 'rspec'
-  gem 'savon_spec'
-  gem 'simplecov', :require => false
-  gem 'rake'
-  gem 'ZenTest'
-  platforms :mri do
-    gem 'autotest-fsevent'
-    # Temporary fix till hoe works with rbx in 1.9 mode
-    gem 'hoe'
-    gem 'hoe-git'
-    gem 'hoe-gemspec'
-    gem 'hoe-bundler'
-  end
-end
-
-platforms :jruby do
-  gem 'jruby-openssl'
-end
+source 'https://rubygems.org'
+gem 'savon'
+
+group :test, :development do
+  gem 'json'
+  gem 'rspec'
+  gem 'savon_spec'
+  gem 'simplecov', :require => false
+  gem 'rake'
+  gem 'guard'
+  gem 'guard-rspec'
+  platforms :mri do
+    # Temporary fix till hoe works with rbx in 1.9 mode
+    gem 'hoe'
+    gem 'hoe-git'
+    gem 'hoe-gemspec'
+    gem 'hoe-bundler'
+  end
+end
+
+platforms :jruby do
+  gem 'jruby-openssl'
+end

data/Gemfile.lock

@@ -1,15 +1,21 @@
 GEM
-  remote: http://rubygems.org/
+  remote: https://rubygems.org/
   specs:
-    ZenTest (4.7.0)
     akami (1.2.0)
       gyoku (>= 0.4.0)
       nokogiri (>= 1.4.0)
-    autotest-fsevent (0.2.8)
-      sys-uname
     builder (3.1.4)
+    coderay (1.0.9)
     diff-lcs (1.1.3)
-    ffi (1.0.11)
+    formatador (0.2.4)
+    guard (1.7.0)
+      formatador (>= 0.2.4)
+      listen (>= 0.6.0)
+      lumberjack (>= 1.0.2)
+      pry (>= 0.9.10)
+      thor (>= 0.14.6)
+    guard-rspec (1.2.1)
+      guard (>= 1.1)
     gyoku (0.4.6)
       builder (>= 2.1.2)
     hoe (3.0.3)
@@ -22,13 +28,20 @@ GEM
       hoe (>= 2.2.0)
     httpi (1.1.1)
       rack
-    json (1.6.6)
+    json (1.7.7)
+    listen (0.7.3)
+    lumberjack (1.0.3)
     metaclass (0.0.1)
+    method_source (0.8.1)
     mocha (0.10.5)
       metaclass (~> 0.0.1)
     multi_json (1.2.0)
     nokogiri (1.5.6)
     nori (1.1.4)
+    pry (0.9.12)
+      coderay (~> 1.0.5)
+      method_source (~> 0.8)
+      slop (~> 3.4)
     rack (1.4.4)
     rake (0.9.2.2)
     rspec (2.9.0)
@@ -55,8 +68,8 @@ GEM
       multi_json (~> 1.0)
       simplecov-html (~> 0.5.3)
     simplecov-html (0.5.3)
-    sys-uname (0.9.0)
-      ffi (>= 1.0.0)
+    slop (3.4.4)
+    thor (0.18.1)
     wasabi (2.5.1)
       httpi (~> 1.0)
       nokogiri (>= 1.4.0)
@@ -65,8 +78,8 @@ PLATFORMS
   ruby
 
 DEPENDENCIES
-  ZenTest
-  autotest-fsevent
+  guard
+  guard-rspec
   hoe
   hoe-bundler
   hoe-gemspec
@@ -75,6 +88,6 @@ DEPENDENCIES
   json
   rake
   rspec
-  savon (= 1.2.0)
+  savon
   savon_spec
   simplecov

data/README.md

@@ -8,7 +8,7 @@
 A Ruby client for the ProfitBricks API.
 
 ## Dependencies
-A Ruby interpreter (MRI 1.8.7/1.9.2/1.9.3, JRuby 1.8/1.9 and Rubinius 1.8/1.9).
+A Ruby interpreter (MRI 1.9.2/1.9.3/2.0.0, JRuby 1.8/1.9 and Rubinius 1.8/1.9).
 
 To get the SSL certificate verification on JRuby 1.9 to work (at least on ubuntu/debian) export the following environment variable:
 

data/lib/profitbricks/server.rb

@@ -23,15 +23,17 @@ module Profitbricks
     # @option options [String]  :name Name of the server to be created
     # @option options [String]  :boot_from_image_id Defines an existing CD-ROM/DVD image ID to be set as boot device of the server. A virtual CD-ROM/DVD drive with the mounted image will be connected to the server.
     # @option options [String]  :boot_from_storage_id Defines an existing storage device ID to be set as boot device of the server. The storage will be connected to the server implicitly.
+    # @option options [String]  :availability_zone Sets the availability zone in which the server is located (AUTO, ZONE_1, ZONE_2). If set to AUTO servers will be placed in a random zone.
     # @option options [String]  :os_type Sets the OS type of the server. (WINDOWS, OTHER) If left empty, the server will inherit the OS Type of its selected boot image / storage.
     # @return [Boolean] true on success, false otherwise
     def update(options = {})
       return false if options.empty?
       raise ArgumentError.new(":ram and :cores are mandatory options.") unless options[:ram] or options[:core]
       raise ArgumentError.new(":ram has to be at least 256MiB and a multiple of it") if options[:ram] < 256 or (options[:ram] % 256) > 0
+      raise ArgumentError.new(":availability_zone has to be either 'AUTO', 'ZONE_1', or 'ZONE_2'") if options[:availability_zone] and !['AUTO', 'ZONE_1', 'ZONE_2'].include? options[:availability_zone]
       raise ArgumentError.new(":os_type has to be either 'WINDOWS' or 'OTHER'") if options[:os_type] and !['WINDOWS', 'OTHER'].include? options[:os_type]
       xml = "<arg0><serverId>#{self.id}</serverId>"
-      xml += get_xml_and_update_attributes options, [:cores, :ram, :name, :boot_from_storage_id, :boot_from_image_id, :os_type]
+      xml += get_xml_and_update_attributes options, [:cores, :ram, :name, :boot_from_storage_id, :boot_from_image_id, :availability_zone, :os_type]
       xml += "</arg0>"
       response = Profitbricks.request :update_server, xml
       return true if response.to_hash[:update_server_response][:return]
@@ -65,15 +67,17 @@ module Profitbricks
       # @option options [String]  :boot_from_storage_id Defines an existing storage device ID to be set as boot device of the server. The storage will be connected to the server implicitly.
       # @option options [Fixnum] :lan_id Connects the server to the specified LAN ID > 0. If the respective LAN does not exist, it is going to be created.
       # @option options [Boolean] :internet_access Set to true to connect the server to the internet via the specified LAN ID. If the LAN is not specified, it is going to be created in the next available LAN ID, starting with LAN ID 1
+      # @option options [String]  :availability_zone Sets the availability zone in which the server is located (AUTO, ZONE_1, ZONE_2). If set to AUTO or left empty, servers will be created in a random zone.
       # @option options [String]  :os_type Sets the OS type of the server. (WINDOWS, OTHER) If left empty, the server will inherit the OS Type of its selected boot image / storage.
       # @return [Server] The created virtual server
       def create(options = {})
         raise ArgumentError.new("You must provide :cores and :ram") if options[:ram].nil? and options[:cores].nil?
         raise ArgumentError.new(":ram has to be at least 256MiB and a multiple of it") if options[:ram].to_i < 256 or (options[:ram].to_i % 256) > 0
+        raise ArgumentError.new(":availability_zone has to be either 'AUTO', 'ZONE_1', or 'ZONE_2'") if options[:availability_zone] and !['AUTO', 'ZONE_1', 'ZONE_2'].include? options[:availability_zone]
         raise ArgumentError.new(":os_type has to be either 'WINDOWS' or 'OTHER'") if options[:os_type] and !['WINDOWS', 'OTHER'].include? options[:os_type]
         xml = "<arg0>"
         xml += get_xml_and_update_attributes options, 
-                    [:cores, :ram, :name, :boot_from_storage_id, :boot_from_image_id, :os_type, :internet_access, :lan_id, :data_center_id]
+                    [:cores, :ram, :name, :boot_from_storage_id, :boot_from_image_id, :os_type, :internet_access, :lan_id, :data_center_id, :availability_zone]
         xml += "</arg0>"
         response = Profitbricks.request :create_server, xml
         self.find(:id => response.to_hash[:create_server_return][:return][:server_id])
@@ -95,4 +99,4 @@ module Profitbricks
       end
     end
   end
-end
+end

data/lib/profitbricks.rb

@@ -13,7 +13,7 @@ require 'profitbricks/firewall'
 require 'profitbricks/rule'
 
 module Profitbricks
-  VERSION = '0.9.5'
+  VERSION = '0.9.6'
 end
 
 PB = Profitbricks

data/spec/fixtures/clear_data_center/success.json

@@ -1,10 +1,10 @@
-{
-    "clear_data_center_response": {
-        "@xmlns:ns2": "http://ws.api.profitbricks.com/",
-        "return": {
-            "data_center_id": "b3eebede-5c78-417c-b1bc-ff5de01a0602",
-            "data_center_version": "10",
-            "request_id": "1179"
-        }
-    }
+{
+    "clear_data_center_response": {
+        "@xmlns:ns2": "http://ws.api.profitbricks.com/",
+        "return": {
+            "data_center_id": "b3eebede-5c78-417c-b1bc-ff5de01a0602",
+            "data_center_version": "10",
+            "request_id": "1179"
+        }
+    }
 }

data/spec/fixtures/connect_storage_to_server/success.json

@@ -1,10 +1,10 @@
-{
-    "connect_storage_to_server_response": {
-        "@xmlns:ns2": "http://ws.api.profitbricks.com/",
-        "return": {
-            "data_center_id": "b3eebede-5c78-417c-b1bc-ff5de01a0602",
-            "data_center_version": "34",
-            "request_id": "1233"
-        }
-    }
+{
+    "connect_storage_to_server_response": {
+        "@xmlns:ns2": "http://ws.api.profitbricks.com/",
+        "return": {
+            "data_center_id": "b3eebede-5c78-417c-b1bc-ff5de01a0602",
+            "data_center_version": "34",
+            "request_id": "1233"
+        }
+    }
 }

data/spec/fixtures/create_data_center/success.json

@@ -1,10 +1,10 @@
-{
-    "create_data_center_response": {
-        "@xmlns:ns2": "http://ws.api.profitbricks.com/",
-        "return": {
-            "data_center_id": "a897fbd7-9f24-4eed-bd56-cadae6117755",
-            "data_center_version": "1",
-            "request_id": "1182"
-        }
-    }
+{
+    "create_data_center_response": {
+        "@xmlns:ns2": "http://ws.api.profitbricks.com/",
+        "return": {
+            "data_center_id": "a897fbd7-9f24-4eed-bd56-cadae6117755",
+            "data_center_version": "1",
+            "request_id": "1182"
+        }
+    }
 }

data/spec/fixtures/create_server/minimal.json

@@ -1,11 +1,11 @@
-{
-    "create_server_return": {
-        "@xmlns:ns2": "http://ws.api.profitbricks.com/",
-        "return": {
-            "data_center_id": "b3eebede-5c78-417c-b1bc-ff5de01a0602",
-            "data_center_version": "14",
-            "request_id": "1184",
-            "server_id": "b7a5f3d1-324a-4490-aa8e-56cdec436e3f"
-        }
-    }
+{
+    "create_server_return": {
+        "@xmlns:ns2": "http://ws.api.profitbricks.com/",
+        "return": {
+            "data_center_id": "b3eebede-5c78-417c-b1bc-ff5de01a0602",
+            "data_center_version": "14",
+            "request_id": "1184",
+            "server_id": "b7a5f3d1-324a-4490-aa8e-56cdec436e3f"
+        }
+    }
 }

data/spec/fixtures/create_storage/success.json

@@ -1,11 +1,11 @@
-{
-    "create_storage_return": {
-        "@xmlns:ns2": "http://ws.api.profitbricks.com/",
-        "return": {
-            "data_center_id": "b3eebede-5c78-417c-b1bc-ff5de01a0602",
-            "data_center_version": "32",
-            "request_id": "1229",
-            "storage_id": "f55952bc-da27-4e29-af89-ed212ea28e11"
-        }
-    }
+{
+    "create_storage_return": {
+        "@xmlns:ns2": "http://ws.api.profitbricks.com/",
+        "return": {
+            "data_center_id": "b3eebede-5c78-417c-b1bc-ff5de01a0602",
+            "data_center_version": "32",
+            "request_id": "1229",
+            "storage_id": "f55952bc-da27-4e29-af89-ed212ea28e11"
+        }
+    }
 }

data/spec/fixtures/delete_data_center/success.json

@@ -1,8 +1,8 @@
-{
-    "delete_data_center_response": {
-        "@xmlns:ns2": "http://ws.api.profitbricks.com/",
-        "return": {
-            "request_id": "1183"
-        }
-    }
+{
+    "delete_data_center_response": {
+        "@xmlns:ns2": "http://ws.api.profitbricks.com/",
+        "return": {
+            "request_id": "1183"
+        }
+    }
 }

data/spec/fixtures/delete_server/success.json

@@ -1,10 +1,10 @@
-{
-    "delete_server_response": {
-        "@xmlns:ns2": "http://ws.api.profitbricks.com/",
-        "return": {
-            "data_center_id": "b3eebede-5c78-417c-b1bc-ff5de01a0602",
-            "data_center_version": "18",
-            "request_id": "1186"
-        }
-    }
+{
+    "delete_server_response": {
+        "@xmlns:ns2": "http://ws.api.profitbricks.com/",
+        "return": {
+            "data_center_id": "b3eebede-5c78-417c-b1bc-ff5de01a0602",
+            "data_center_version": "18",
+            "request_id": "1186"
+        }
+    }
 }

data/spec/fixtures/delete_storage/failture.json

@@ -1,16 +1,16 @@
-{
-    "fault": {
-        "@xmlns:ns4": "http://www.w3.org/2003/05/soap-envelope",
-        "detail": {
-            "profitbricks_service_fault": {
-                "@xmlns:ns2": "http://ws.api.profitbricks.com/",
-                "fault_code": "BAD_REQUEST",
-                "http_code": "400",
-                "message": "The following mandatory parameters are null: storageId",
-                "request_id": "1252"
-            }
-        },
-        "faultcode": "S:Server",
-        "faultstring": "The following mandatory parameters are null: storageId"
-    }
+{
+    "fault": {
+        "@xmlns:ns4": "http://www.w3.org/2003/05/soap-envelope",
+        "detail": {
+            "profitbricks_service_fault": {
+                "@xmlns:ns2": "http://ws.api.profitbricks.com/",
+                "fault_code": "BAD_REQUEST",
+                "http_code": "400",
+                "message": "The following mandatory parameters are null: storageId",
+                "request_id": "1252"
+            }
+        },
+        "faultcode": "S:Server",
+        "faultstring": "The following mandatory parameters are null: storageId"
+    }
 }

data/spec/fixtures/delete_storage/success.json

@@ -1,10 +1,10 @@
-{
-    "delete_storage_response": {
-        "@xmlns:ns2": "http://ws.api.profitbricks.com/",
-        "return": {
-            "data_center_id": "b3eebede-5c78-417c-b1bc-ff5de01a0602",
-            "data_center_version": "38",
-            "request_id": "1265"
-        }
-    }
+{
+    "delete_storage_response": {
+        "@xmlns:ns2": "http://ws.api.profitbricks.com/",
+        "return": {
+            "data_center_id": "b3eebede-5c78-417c-b1bc-ff5de01a0602",
+            "data_center_version": "38",
+            "request_id": "1265"
+        }
+    }
 }

data/spec/fixtures/disconnect_storage_from_server/failture.json

@@ -1,16 +1,16 @@
-{
-    "fault": {
-        "@xmlns:ns4": "http://www.w3.org/2003/05/soap-envelope",
-        "detail": {
-            "profitbricks_service_fault": {
-                "@xmlns:ns2": "http://ws.api.profitbricks.com/",
-                "fault_code": "PROVISIONING_NO_CHANGES",
-                "http_code": "409",
-                "message": "Nothing changes. The new provisioning request does not differ from the current active one. The storage is not mounted to the server. So no needs to unmount it",
-                "request_id": "1216"
-            }
-        },
-        "faultcode": "S:Server",
-        "faultstring": "Nothing changes. The new provisioning request does not differ from the current active one. The storage is not mounted to the server. So no needs to unmount it"
-    }
+{
+    "fault": {
+        "@xmlns:ns4": "http://www.w3.org/2003/05/soap-envelope",
+        "detail": {
+            "profitbricks_service_fault": {
+                "@xmlns:ns2": "http://ws.api.profitbricks.com/",
+                "fault_code": "PROVISIONING_NO_CHANGES",
+                "http_code": "409",
+                "message": "Nothing changes. The new provisioning request does not differ from the current active one. The storage is not mounted to the server. So no needs to unmount it",
+                "request_id": "1216"
+            }
+        },
+        "faultcode": "S:Server",
+        "faultstring": "Nothing changes. The new provisioning request does not differ from the current active one. The storage is not mounted to the server. So no needs to unmount it"
+    }
 }

data/spec/fixtures/disconnect_storage_from_server/success.json

@@ -1,10 +1,10 @@
-{
-    "disconnect_storage_from_server_response": {
-        "@xmlns:ns2": "http://ws.api.profitbricks.com/",
-        "return": {
-            "data_center_id": "b3eebede-5c78-417c-b1bc-ff5de01a0602",
-            "data_center_version": "36",
-            "request_id": "1250"
-        }
-    }
+{
+    "disconnect_storage_from_server_response": {
+        "@xmlns:ns2": "http://ws.api.profitbricks.com/",
+        "return": {
+            "data_center_id": "b3eebede-5c78-417c-b1bc-ff5de01a0602",
+            "data_center_version": "36",
+            "request_id": "1250"
+        }
+    }
 }

data/spec/fixtures/get_all_data_centers/test_datacenter.json

@@ -1,10 +1,10 @@
-{
-    "get_all_data_centers_response": {
-        "@xmlns:ns2": "http://ws.api.profitbricks.com/",
-        "return": {
-            "data_center_id": "b3eebede-5c78-417c-b1bc-ff5de01a0602",
-            "data_center_name": "Test",
-            "data_center_version": "9"
-        }
-    }
+{
+    "get_all_data_centers_response": {
+        "@xmlns:ns2": "http://ws.api.profitbricks.com/",
+        "return": {
+            "data_center_id": "b3eebede-5c78-417c-b1bc-ff5de01a0602",
+            "data_center_name": "Test",
+            "data_center_version": "9"
+        }
+    }
 }