profitbricks 1.0.1 → 1.0.3

data/CHANGELOG.md

@@ -1,3 +1,7 @@
+=== 1.0.3 / 2013-08-23
+
+  * Bugfix: The 'arg0' argument got renamed to 'request'
+
 === 1.0.1 / 2013-07-09
 
   * Raise an Profitbricks::AuthenticationError when the authentication failed

data/Manifest.txt

@@ -112,10 +112,6 @@ spec/fixtures/get_storage/mount_image.json
 spec/fixtures/get_storage/mount_image.xml
 spec/fixtures/get_storage/success.json
 spec/fixtures/get_storage/success.xml
-spec/fixtures/power_off_server/success.json
-spec/fixtures/power_off_server/success.xml
-spec/fixtures/reboot_server/success.json
-spec/fixtures/reboot_server/success.xml
 spec/fixtures/register_servers_on_load_balancer/success.json
 spec/fixtures/register_servers_on_load_balancer/success.xml
 spec/fixtures/release_public_ip_block/success.json
@@ -132,10 +128,10 @@ spec/fixtures/set_image_os_type/success.json
 spec/fixtures/set_image_os_type/success.xml
 spec/fixtures/set_internet_access/success.json
 spec/fixtures/set_internet_access/success.xml
-spec/fixtures/shutdown_server/success.json
-spec/fixtures/shutdown_server/success.xml
 spec/fixtures/start_server/success.json
 spec/fixtures/start_server/success.xml
+spec/fixtures/stop_server/success.json
+spec/fixtures/stop_server/success.xml
 spec/fixtures/update_data_center/success.json
 spec/fixtures/update_data_center/success.xml
 spec/fixtures/update_load_balancer/success.json

data/README.md

@@ -1,7 +1,7 @@
-# Profitbricks [![Build Status](https://secure.travis-ci.org/dsander/profitbricks.png?branch=master)](http://travis-ci.org/dsander/profitbricks) [![Coverage Status](https://coveralls.io/repos/dsander/profitbricks/badge.png?branch=master)](https://coveralls.io/r/dsander/profitbricks) [![Code Climate](https://codeclimate.com/github/dsander/profitbricks.png)](https://codeclimate.com/github/dsander/profitbricks)
+# Profitbricks [![Build Status](https://secure.travis-ci.org/profitbricks/profitbricks-rb.png?branch=master)](http://travis-ci.org/profitbricks/profitbricks-rb) [![Coverage Status](https://coveralls.io/repos/profitbricks/profitbricks-rb/badge.png?branch=master)](https://coveralls.io/r/profitbricks/profitbricks-rb) [![Code Climate](https://codeclimate.com/github/profitbricks/profitbricks-rb.png)](https://codeclimate.com/github/dsander/profitbricks-rb)
 
-* http://github.com/dsander/profitbricks
-* http://rubydoc.info/github/dsander/profitbricks/master/frames
+* https://github.com/profitbricks/profitbricks-rb
+* http://rubydoc.info/github/profitbricks/profitbricks-rb/master/frames
 
 
 ## DESCRIPTION
@@ -50,17 +50,17 @@ Check out the examples directory for more detailed usage information, or have a
 ## CLI
 
 To use the profitbricks binary you first have to store your username and password in environment variables
- 	
+
  	export PROFITBRICKS_USER=yourusername
  	export PROFITBRICKS_PASSWORD=yourpassword
 
 The binary always takes at least two arguments. The first represents a class name (in snake- or camel-case) and the second a method name of this class.
 Get a list of all your datacenters:
- 	
+
  	profitbricks data_center all
 
 The following arguments are coverted into a Hash and passed to the method, if you want to call instance methods you _have_ to provide the id of the Server/DataCenter, etc:
- 	
+
  	profitbricks server update id=03h17g46-3040-d1af-bb01-9579fe0300e7 cores=2 ram=1024
 
 ## License

data/lib/profitbricks.rb

@@ -15,7 +15,7 @@ require 'profitbricks/ip_block'
 require 'profitbricks/rule'
 
 module Profitbricks
-  VERSION = '1.0.1'
+  VERSION = '1.0.3'
 end
 
 PB = Profitbricks

data/lib/profitbricks/profitbricks.rb

@@ -4,7 +4,6 @@ module Profitbricks
   NEED_PREFIX = [:create_nic, :create_load_balancer, :update_storage, :create_storage,
                  :update_data_center, :rom_drive, :update_nic, :create_server,
                  :update_load_balancer, :connect_storage_to_server, :update_server]
-
   # Configure the Profitbricks API client
   #
   # @see Profitbricks::Config
@@ -19,13 +18,13 @@ module Profitbricks
 
     @client = Savon::Client.new do |globals|
       # FIXME the WSDL currently returns a wrong endpoint
-      #globals.wsdl "https://api.profitbricks.com/1.2/wsdl"
-      globals.namespace "http://ws.api.profitbricks.com/"
-      globals.endpoint "https://api.profitbricks.com/1.2"
+      globals.wsdl "https://api.profitbricks.com/1.2/wsdl"
       globals.convert_request_keys_to :lower_camelcase
       globals.raise_errors true
       globals.log Profitbricks::Config.log
       globals.pretty_print_xml true
+      globals.open_timeout 5
+      globals.read_timeout 5
 
       # Looks like ssl verifycation works with current jruby
       #if defined?(RUBY_ENGINE) && RUBY_ENGINE == 'jruby' && !ENV['SSL_CERT_DIR']
@@ -50,7 +49,7 @@ module Profitbricks
   def self.request(method, options={})
     begin
       message = if NEED_PREFIX.include? method
-        { arg0: options }
+        { request: options }
       else
         options
       end

data/lib/profitbricks/server.rb

@@ -3,20 +3,12 @@ module Profitbricks
     has_many :nics
     has_many :connected_storages, :class_name => :storage
 
-    # Deletes the virtual Server. 
+    # Deletes the virtual Server.
     # @return [Boolean] true on success, false otherwise
     def delete
       Profitbricks.request :delete_server, server_id: self.id
       return true
     end
-    
-    # Reboots an existing virtual server (SOFT REBOOT). 
-    # @return [Boolean] true on success, false otherwise
-    def reboot
-      @virtual_machine_state = 'NOSTATE'
-      Profitbricks.request :reboot_server, server_id: self.id
-      return true
-    end
 
     # Resets an existing virtual server (POWER CYCLE).
     # @return [Boolean] true on success, false otherwise
@@ -34,23 +26,15 @@ module Profitbricks
       return true
     end
 
-    # Stops an existing virtual server (HARD power off) 
+    # Stops an existing virtual server (HARD power off)
     # @return [Boolean] true on success, false otherwise
-    def power_off
+    def stop
       @virtual_machine_state = 'SHUTOFF'
-      Profitbricks.request :power_off_server, server_id: self.id
+      Profitbricks.request :stop_server, server_id: self.id
       return true
     end
 
-    # Stops an existing virtual server gracefully (SOFT stop)
-    # @return [Boolean] true on success, false otherwise
-    def shutdown
-      @virtual_machine_state = 'SHUTDOWN'
-      Profitbricks.request :shutdown_server, server_id: self.id
-      return true
-    end
-
-    # Updates parameters of an existing virtual Server device. 
+    # Updates parameters of an existing virtual Server device.
     # @param [Hash] options parameters for the new server
     # @option options [Fixnum] :cores Number of cores to be assigned to the specified server.
     # @option options [Fixnum] :ram Number of RAM memory (in MiB) to be assigned to the server. Must be at least 256 and a multiple of it.
@@ -129,15 +113,15 @@ module Profitbricks
 
     class << self
       # Returns a list of all Servers created by the user.
-      # 
+      #
       # @return [Array <Server>] Array of all available Servers
       def all
         DataCenter.all.collect(&:servers).flatten.compact
       end
 
-      # Creates a Virtual Server within an existing data center. Parameters can be specified to set up a 
+      # Creates a Virtual Server within an existing data center. Parameters can be specified to set up a
       # boot device and connect the server to an existing LAN or the Internet.
-      # 
+      #
       # @param [Hash] options parameters for the new server
       # @option options [Fixnum] :cores Number of cores to be assigned to the specified server (required)
       # @option options [Fixnum] :ram Number of RAM memory (in MiB) to be assigned to the server. Must be at least 256 and a multiple of it. (required)
@@ -180,6 +164,6 @@ module Profitbricks
     def filter_nics_and_return_ips(&block)
       return [] if self.nics.nil?
       self.nics.select { |nic| yield nic }.collect(&:ips).flatten
-    end 
+    end
   end
 end

data/spec/fixtures/stop_server/success.xml

@@ -0,0 +1 @@
+<?xml version='1.0' encoding='UTF-8'?><S:Envelope xmlns:S="http://schemas.xmlsoap.org/soap/envelope/"><S:Body><ns2:stopServerResponse xmlns:ns2="http://ws.api.profitbricks.com/"><return><requestId>50055</requestId></return></ns2:stopServerResponse></S:Body></S:Envelope>

data/spec/live/data_center_spec.rb

@@ -21,11 +21,11 @@ describe Profitbricks::DataCenter do
   end
 
   it "should return all DataCenters" do
-    DataCenter.all.length.should == 1
+    DataCenter.all.length.should >= 1
   end
 
   it "should be found by name" do
-    DataCenter.find(name: 'PB_live_test_DC').id.should == $dc.id
+    DataCenter.find(name: 'PB_live_test_DC').id.should_not be_nil
   end
 
   it "should be renamed" do

data/spec/profitbricks/cli_spec.rb

@@ -67,7 +67,7 @@ describe Profitbricks::CLI do
 
   it "should update a server" do
     savon.expects(:get_server).with(message: {server_id: '1234-123'}).returns(f :get_server, :after_create)
-    savon.expects(:update_server).with(message: {arg0: {server_id: 'b7a5f3d1-324a-4490-aa8e-56cdec436e3f', server_name: 'meme', ram: 256, cores: 1}}).returns(f :update_server, :basic)
+    savon.expects(:update_server).with(message: {request: {server_id: 'b7a5f3d1-324a-4490-aa8e-56cdec436e3f', server_name: 'meme', ram: 256, cores: 1}}).returns(f :update_server, :basic)
     cli.run(%w(server update id=1234-123 name=meme ram=256 cores=1)).should == 0
   end
 end

data/spec/profitbricks/data_center_spec.rb

@@ -73,7 +73,7 @@ describe Profitbricks::DataCenter do
     dc.wait_for_provisioning
   end
   
-  let(:rename_message) { {arg0: {data_center_id: 'b3eebede-5c78-417c-b1bc-ff5de01a0602', data_center_name: 'Test2'}} }
+  let(:rename_message) { {request: {data_center_id: 'b3eebede-5c78-417c-b1bc-ff5de01a0602', data_center_name: 'Test2'}} }
   it "should rename a datacenter" do
     savon.expects(:get_data_center).with(message: {data_center_id: 'b3eebede-5c78-417c-b1bc-ff5de01a0602'}).returns(f :get_data_center, :two_servers_with_storage)
     savon.expects(:update_data_center).with(message: rename_message).returns(f :update_data_center, :success)

data/spec/profitbricks/load_balancer_spec.rb

@@ -9,7 +9,7 @@ describe Profitbricks::LoadBalancer do
   let(:servers) { [Server.new(:id => "206d10f2-035f-4ef2-8d24-3022653e9706")]}
 
   it "create a new LoadBalancer" do
-    create_msg = {arg0: {data_center_id: "1111", name: "Test", server_ids: servers.collect(&:id), algorithm: 'ROUND_ROBIN'}}
+    create_msg = {request: {data_center_id: "1111", name: "Test", server_ids: servers.collect(&:id), algorithm: 'ROUND_ROBIN'}}
     savon.expects(:create_load_balancer).with(message: create_msg).returns(f :create_load_balancer, :success)
     savon.expects(:get_load_balancer).with(message: {load_balancer_id: '5dadd2b2-3405-4ec5-a450-0df497bebab0'}).returns(f :get_load_balancer, :success)
     lb = LoadBalancer.create(:data_center_id => "1111", :name => "Test", :servers => servers, :algorithm => 'ROUND_ROBIN')
@@ -20,7 +20,7 @@ describe Profitbricks::LoadBalancer do
 
   it "should update an existing LoadBalancer" do
     savon.expects(:get_load_balancer).with(message: {load_balancer_id: '5dadd2b2-3405-4ec5-a450-0df497bebab0'}).returns(f :get_load_balancer, :success)
-    savon.expects(:update_load_balancer).with(message: {arg0: {load_balancer_id: '3e3cb642-4d50-4371-980a-65959b2fa428', load_balancer_name: 'Wee'}}).returns(f :update_load_balancer, :success)
+    savon.expects(:update_load_balancer).with(message: {request: {load_balancer_id: '3e3cb642-4d50-4371-980a-65959b2fa428', load_balancer_name: 'Wee'}}).returns(f :update_load_balancer, :success)
     savon.expects(:get_load_balancer).with(message: {load_balancer_id: '3e3cb642-4d50-4371-980a-65959b2fa428'}).returns(f :get_load_balancer, :success)
     lb = LoadBalancer.find(:id => "5dadd2b2-3405-4ec5-a450-0df497bebab0")
     lb.update(:name => "Wee").should == true

data/spec/profitbricks/nic_spec.rb

@@ -7,7 +7,7 @@ describe Profitbricks::Nic do
   after(:all)  { savon.unmock! }
 
   it "create a new Nic" do
-    savon.expects(:create_nic).with(message: {arg0: {lan_id: 1, ip: '192.168.0.11', nic_name: 'Internal', server_id: '4cb6550f-3777-4818-8f4c-51233162a980'}}).returns(f :create_nic, :success)
+    savon.expects(:create_nic).with(message: {request: {lan_id: 1, ip: '192.168.0.11', nic_name: 'Internal', server_id: '4cb6550f-3777-4818-8f4c-51233162a980'}}).returns(f :create_nic, :success)
     savon.expects(:get_nic).with(message: {nic_id: 'cba8af39-b5de-477b-9795-2f02ea9cf04f'}).returns(f :get_nic, :success)
     nic = Nic.create(:lan_id => 1, :ip => "192.168.0.11", :name => "Internal", :server_id => "4cb6550f-3777-4818-8f4c-51233162a980")
     nic.name.should == "Internal"
@@ -17,7 +17,7 @@ describe Profitbricks::Nic do
 
   it "should update an existing Nic" do
     savon.expects(:get_nic).with(message: {nic_id: 'cba8af39-b5de-477b-9795-2f02ea9cf04f'}).returns(f :get_nic, :success)
-    savon.expects(:update_nic).with(message: {arg0: {nic_id: 'cba8af39-b5de-477b-9795-2f02ea9cf04f', nic_name: 'External'}}).returns(f :update_nic, :success)
+    savon.expects(:update_nic).with(message: {request: {nic_id: 'cba8af39-b5de-477b-9795-2f02ea9cf04f', nic_name: 'External'}}).returns(f :update_nic, :success)
     nic = Nic.find(:id => "cba8af39-b5de-477b-9795-2f02ea9cf04f")
     nic.update(:name => "External").should == true
     nic.name.should == "External"

data/spec/profitbricks/server_spec.rb

@@ -5,8 +5,8 @@ describe Profitbricks::Server do
 
   before(:all) { savon.mock!   }
   after(:all)  { savon.unmock! }
-  
-  describe "enforcing required arguments" do 
+
+  describe "enforcing required arguments" do
     describe "on create" do
       it "should require :cores and :ram" do
         expect { Server.create(:cores => 1) }.to raise_error(ArgumentError, "You must provide :cores and :ram")
@@ -25,7 +25,7 @@ describe Profitbricks::Server do
           raise_error(ArgumentError, ":availability_zone has to be either 'AUTO', 'ZONE_1', or 'ZONE_2'")
 
         ['AUTO', 'ZONE_1', 'ZONE_2'].each do |zone|
-          expect { Server.create(:ram => 256, :cores => 1, :availability_zone => zone) }.not_to 
+          expect { Server.create(:ram => 256, :cores => 1, :availability_zone => zone) }.not_to
             raise_error(ArgumentError, ":availability_zone has to be either 'AUTO', 'ZONE_1', or 'ZONE_2'")
         end
       end
@@ -35,14 +35,14 @@ describe Profitbricks::Server do
           raise_error(ArgumentError, ":os_type has to be either 'WINDOWS' or 'OTHER'")
 
         ['WINDOWS', 'OTHER'].each do |type|
-          expect { Server.create(:ram => 256, :cores => 1, :os_type => type) }.not_to 
+          expect { Server.create(:ram => 256, :cores => 1, :os_type => type) }.not_to
             raise_error(ArgumentError, ":os_type has to be either 'WINDOWS' or 'OTHER'")
         end
       end
     end
     describe "on update" do
       before(:each) do
-        savon.expects(:create_server).with(message: {arg0: {ram: 256, cores: 1}}).returns(f :create_server, :minimal)
+        savon.expects(:create_server).with(message: {request: {ram: 256, cores: 1}}).returns(f :create_server, :minimal)
         savon.expects(:get_server).with(message: {server_id: 'b7a5f3d1-324a-4490-aa8e-56cdec436e3f'}).returns(f :get_server, :after_create)
         @server = Server.create(:ram => 256, :cores => 1)
       end
@@ -58,7 +58,7 @@ describe Profitbricks::Server do
           raise_error(ArgumentError, ":availability_zone has to be either 'AUTO', 'ZONE_1', or 'ZONE_2'")
 
         ['AUTO', 'ZONE_1', 'ZONE_2'].each do |zone|
-          expect { @server.update(:ram => 256, :cores => 1, :availability_zone => zone) }.not_to 
+          expect { @server.update(:ram => 256, :cores => 1, :availability_zone => zone) }.not_to
             raise_error(ArgumentError, ":availability_zone has to be either 'AUTO', 'ZONE_1', or 'ZONE_2'")
         end
       end
@@ -68,7 +68,7 @@ describe Profitbricks::Server do
           raise_error(ArgumentError, ":os_type has to be either 'WINDOWS' or 'OTHER'")
 
         ['WINDOWS', 'OTHER'].each do |type|
-          expect { @server.update(:ram => 256, :cores => 1, :os_type => type) }.not_to 
+          expect { @server.update(:ram => 256, :cores => 1, :os_type => type) }.not_to
             raise_error(ArgumentError, ":os_type has to be either 'WINDOWS' or 'OTHER'")
         end
       end
@@ -77,7 +77,7 @@ describe Profitbricks::Server do
 
 
   it "should create a new server with minimal arguments" do
-    savon.expects(:create_server).with(message: {arg0: {ram: 256, cores: 1, server_name: 'Test Server', data_center_id: 'b3eebede-5c78-417c-b1bc-ff5de01a0602'}}).returns(f :create_server, :minimal)
+    savon.expects(:create_server).with(message: {request: {ram: 256, cores: 1, server_name: 'Test Server', data_center_id: 'b3eebede-5c78-417c-b1bc-ff5de01a0602'}}).returns(f :create_server, :minimal)
     savon.expects(:get_server).with(message: {server_id: 'b7a5f3d1-324a-4490-aa8e-56cdec436e3f'}).returns(f :get_server, :after_create)
     s = Server.create(:cores => 1, :ram => 256, :name => 'Test Server', :data_center_id => "b3eebede-5c78-417c-b1bc-ff5de01a0602")
     s.cores.should == 1
@@ -86,13 +86,6 @@ describe Profitbricks::Server do
     s.data_center_id.should == "b3eebede-5c78-417c-b1bc-ff5de01a0602"
   end
 
-  it "should reboot on request" do
-    savon.expects(:get_server).with(message: {server_id: 'b3eebede-5c78-417c-b1bc-ff5de01a0602'}).returns(f :get_server, :after_create)
-    savon.expects(:reboot_server).with(message: {server_id: 'b7a5f3d1-324a-4490-aa8e-56cdec436e3f'}).returns(f :reboot_server, :success)
-    s = Server.find(:id => "b3eebede-5c78-417c-b1bc-ff5de01a0602")
-    s.reboot.should == true
-  end
-
   it "should reset on request" do
     savon.expects(:get_server).with(message: {server_id: 'b3eebede-5c78-417c-b1bc-ff5de01a0602'}).returns(f :get_server, :after_create)
     savon.expects(:reset_server).with(message: {server_id: 'b7a5f3d1-324a-4490-aa8e-56cdec436e3f'}).returns(f :reset_server, :success)
@@ -109,16 +102,9 @@ describe Profitbricks::Server do
 
   it "should power off on request" do
     savon.expects(:get_server).with(message: {server_id: 'b3eebede-5c78-417c-b1bc-ff5de01a0602'}).returns(f :get_server, :after_create)
-    savon.expects(:power_off_server).with(message: {server_id: 'b7a5f3d1-324a-4490-aa8e-56cdec436e3f'}).returns(f :power_off_server, :success)
+    savon.expects(:stop_server).with(message: {server_id: 'b7a5f3d1-324a-4490-aa8e-56cdec436e3f'}).returns(f :stop_server, :success)
     s = Server.find(:id => "b3eebede-5c78-417c-b1bc-ff5de01a0602")
-    s.power_off.should == true
-  end
-
-  it "should shutdown on request" do
-    savon.expects(:get_server).with(message: {server_id: 'b3eebede-5c78-417c-b1bc-ff5de01a0602'}).returns(f :get_server, :after_create)
-    savon.expects(:shutdown_server).with(message: {server_id: 'b7a5f3d1-324a-4490-aa8e-56cdec436e3f'}).returns(f :shutdown_server, :success)
-    s = Server.find(:id => "b3eebede-5c78-417c-b1bc-ff5de01a0602")
-    s.shutdown.should == true
+    s.stop.should == true
   end
 
   it "should check if its running" do
@@ -141,7 +127,7 @@ describe Profitbricks::Server do
     savon.expects(:get_server).with(message: {server_id: 'b7a5f3d1-324a-4490-aa8e-56cdec436e3f'}).returns(f :get_server, :after_create)
     s.provisioned?.should == false
   end
-  
+
   it "should return true on provisioned?" do
     savon.expects(:get_server).with(message: {server_id: 'b3eebede-5c78-417c-b1bc-ff5de01a0602'}).returns(f :get_server, :after_create)
     s = Server.find(:id => "b3eebede-5c78-417c-b1bc-ff5de01a0602")
@@ -203,9 +189,9 @@ describe Profitbricks::Server do
   end
 
   describe "updating" do
-    it "should update basic attributes correctly" do 
+    it "should update basic attributes correctly" do
       savon.expects(:get_server).with(message: {server_id: 'b3eebede-5c78-417c-b1bc-ff5de01a0602'}).returns(f :get_server, :after_create)
-      savon.expects(:update_server).with(message: {arg0: {server_id: 'b7a5f3d1-324a-4490-aa8e-56cdec436e3f', server_name: 'Power of two', os_type: 'WINDOWS', cores: 2, ram: 512}}).returns(f :update_server, :basic)
+      savon.expects(:update_server).with(message: {request: {server_id: 'b7a5f3d1-324a-4490-aa8e-56cdec436e3f', server_name: 'Power of two', os_type: 'WINDOWS', cores: 2, ram: 512}}).returns(f :update_server, :basic)
       s = Server.find(:id => "b3eebede-5c78-417c-b1bc-ff5de01a0602")
       s.update(:cores => 2, :ram => 512, :name => "Power of two", :os_type => 'WINDOWS')
       s.cores.should == 2

data/spec/profitbricks/storage_spec.rb

@@ -7,7 +7,7 @@ describe Profitbricks::Storage do
   after(:all)  { savon.unmock! }
 
   it "should create a new server with minimal arguments" do
-    savon.expects(:create_storage).with(message: {arg0: {data_center_id: 'b3eebede-5c78-417c-b1bc-ff5de01a0602', size: 5, storage_name: 'Test Storage'}}).returns(f :create_storage, :success)
+    savon.expects(:create_storage).with(message: {request: {data_center_id: 'b3eebede-5c78-417c-b1bc-ff5de01a0602', size: 5, storage_name: 'Test Storage'}}).returns(f :create_storage, :success)
     savon.expects(:get_storage).with(message: {storage_id: 'f55952bc-da27-4e29-af89-ed212ea28e11'}).returns(f :get_storage, :success)
     storage = Storage.create(:size => 5, :name => "Test Storage", :data_center_id => "b3eebede-5c78-417c-b1bc-ff5de01a0602")
     storage.name.should == "Test Storage"
@@ -16,7 +16,7 @@ describe Profitbricks::Storage do
 
   it "should be connectable to a server" do
     savon.expects(:get_storage).with(message: {storage_id: 'f55952bc-da27-4e29-af89-ed212ea28e11'}).returns(f :get_storage, :success)
-    savon.expects(:connect_storage_to_server).with(message: {arg0: {storage_id: 'f55952bc-da27-4e29-af89-ed212ea28e11', server_id: '4cb6550f-3777-4818-8f4c-51233162a980', bus_type: 'VIRTIO'}}).returns(f :connect_storage_to_server, :success)
+    savon.expects(:connect_storage_to_server).with(message: {request: {storage_id: 'f55952bc-da27-4e29-af89-ed212ea28e11', server_id: '4cb6550f-3777-4818-8f4c-51233162a980', bus_type: 'VIRTIO'}}).returns(f :connect_storage_to_server, :success)
     savon.expects(:get_server).with(message: {server_id: '4cb6550f-3777-4818-8f4c-51233162a980'}).returns(f :get_server, :connected_storage)
     storage = Storage.find(:id => "f55952bc-da27-4e29-af89-ed212ea28e11")
     storage.connect(:server_id => "4cb6550f-3777-4818-8f4c-51233162a980", :bus_type => "VIRTIO").should == true
@@ -34,7 +34,7 @@ describe Profitbricks::Storage do
   
   it "should be updated" do
     savon.expects(:get_storage).with(message: {storage_id: 'f55952bc-da27-4e29-af89-ed212ea28e11'}).returns(f :get_storage, :success)
-    savon.expects(:update_storage).with(message: {arg0: {storage_id: 'f55952bc-da27-4e29-af89-ed212ea28e11', size: 10, storage_name: 'Updated'}}).returns(f :update_storage, :success)
+    savon.expects(:update_storage).with(message: {request: {storage_id: 'f55952bc-da27-4e29-af89-ed212ea28e11', size: 10, storage_name: 'Updated'}}).returns(f :update_storage, :success)
     storage = Storage.find(:id => "f55952bc-da27-4e29-af89-ed212ea28e11")
     storage.update(:name => "Updated", :size => 10).should == true
     storage.name.should == "Updated"

data/spec/spec_helper.rb

@@ -37,3 +37,16 @@ Profitbricks.configure do |config|
   config.password = "none"
   config.polling_interval = 0.1 
 end
+
+client = Savon::Client.new do |globals|
+  globals.namespace "http://ws.api.profitbricks.com/"
+  globals.endpoint "https://api.profitbricks.com/1.2"
+  globals.convert_request_keys_to :lower_camelcase
+  globals.raise_errors true
+  globals.log Profitbricks::Config.log
+  globals.pretty_print_xml true
+  globals.open_timeout 5
+  globals.read_timeout 5
+  globals.basic_auth [Profitbricks::Config.username, Profitbricks::Config.password]
+end
+Profitbricks.client = client

metadata

@@ -1,18 +1,20 @@
 --- !ruby/object:Gem::Specification
 name: profitbricks
 version: !ruby/object:Gem::Version
-  version: 1.0.1
+  version: 1.0.3
+  prerelease: 
 platform: ruby
 authors:
 - Dominik Sander
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-07-09 00:00:00.000000000 Z
+date: 2013-08-23 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: savon
   requirement: !ruby/object:Gem::Requirement
+    none: false
     requirements:
     - - '='
       - !ruby/object:Gem::Version
@@ -20,6 +22,7 @@ dependencies:
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
+    none: false
     requirements:
     - - '='
       - !ruby/object:Gem::Version
@@ -27,6 +30,7 @@ dependencies:
 - !ruby/object:Gem::Dependency
   name: rdoc
   requirement: !ruby/object:Gem::Requirement
+    none: false
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
@@ -34,6 +38,7 @@ dependencies:
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
+    none: false
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
@@ -41,6 +46,7 @@ dependencies:
 - !ruby/object:Gem::Dependency
   name: hoe
   requirement: !ruby/object:Gem::Requirement
+    none: false
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
@@ -48,6 +54,7 @@ dependencies:
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
+    none: false
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
@@ -175,10 +182,6 @@ files:
 - spec/fixtures/get_storage/mount_image.xml
 - spec/fixtures/get_storage/success.json
 - spec/fixtures/get_storage/success.xml
-- spec/fixtures/power_off_server/success.json
-- spec/fixtures/power_off_server/success.xml
-- spec/fixtures/reboot_server/success.json
-- spec/fixtures/reboot_server/success.xml
 - spec/fixtures/register_servers_on_load_balancer/success.json
 - spec/fixtures/register_servers_on_load_balancer/success.xml
 - spec/fixtures/release_public_ip_block/success.json
@@ -195,10 +198,10 @@ files:
 - spec/fixtures/set_image_os_type/success.xml
 - spec/fixtures/set_internet_access/success.json
 - spec/fixtures/set_internet_access/success.xml
-- spec/fixtures/shutdown_server/success.json
-- spec/fixtures/shutdown_server/success.xml
 - spec/fixtures/start_server/success.json
 - spec/fixtures/start_server/success.xml
+- spec/fixtures/stop_server/success.json
+- spec/fixtures/stop_server/success.xml
 - spec/fixtures/update_data_center/success.json
 - spec/fixtures/update_data_center/success.xml
 - spec/fixtures/update_load_balancer/success.json
@@ -222,9 +225,8 @@ files:
 - spec/profitbricks/server_spec.rb
 - spec/profitbricks/storage_spec.rb
 - spec/spec_helper.rb
-homepage: http://github.com/dsander/profitbricks
+homepage: https://github.com/profitbricks/profitbricks-rb
 licenses: []
-metadata: {}
 post_install_message: 
 rdoc_options:
 - --main
@@ -232,19 +234,27 @@ rdoc_options:
 require_paths:
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement
+  none: false
   requirements:
-  - - '>='
+  - - ! '>='
     - !ruby/object:Gem::Version
       version: '0'
+      segments:
+      - 0
+      hash: 748897856804736441
 required_rubygems_version: !ruby/object:Gem::Requirement
+  none: false
   requirements:
-  - - '>='
+  - - ! '>='
     - !ruby/object:Gem::Version
       version: '0'
+      segments:
+      - 0
+      hash: 748897856804736441
 requirements: []
 rubyforge_project: profitbricks
-rubygems_version: 2.0.3
+rubygems_version: 1.8.23
 signing_key: 
-specification_version: 4
+specification_version: 3
 summary: A Ruby client for the ProfitBricks API.
 test_files: []

checksums.yaml

@@ -1,7 +0,0 @@
----
-SHA1:
-  metadata.gz: c7b4d1eb20600d65ab78c002755ac2869426785a
-  data.tar.gz: c7280d386007c4a9b9889455a38f6ded432a539b
-SHA512:
-  metadata.gz: fecca29515ddaae5fe833b29e402eec0f4c2a37d3a70895ead1ae1876b3b7e9717d4741297ea0a20d4215915ee6f919b860a82714e539b9dffa58aeb72abbc3a
-  data.tar.gz: 92bae68c2d6399c18d9d32888c5a725545f21ae49b910ff2adc38fdb6dd584aa8927ed1539442d58e5fa066cd2a171f995c2435d1c359bad2065db132dc7b4ce

data/spec/fixtures/power_off_server/success.xml

@@ -1 +0,0 @@
-<?xml version='1.0' encoding='UTF-8'?><S:Envelope xmlns:S="http://schemas.xmlsoap.org/soap/envelope/"><S:Body><ns2:powerOffServerResponse xmlns:ns2="http://ws.api.profitbricks.com/"><return><requestId>50055</requestId></return></ns2:powerOffServerResponse></S:Body></S:Envelope>

data/spec/fixtures/reboot_server/success.json

@@ -1 +0,0 @@
-{"reboot_server_response":{"return":{"request_id":"1187"},"@xmlns:ns2":"http://ws.api.profitbricks.com/"}}

data/spec/fixtures/reboot_server/success.xml

@@ -1 +0,0 @@
-<?xml version='1.0' encoding='UTF-8'?><S:Envelope xmlns:S="http://schemas.xmlsoap.org/soap/envelope/"><S:Body><ns2:rebootServerResponse xmlns:ns2="http://ws.api.profitbricks.com/"><return><requestId>1187</requestId></return></ns2:rebootServerResponse></S:Body></S:Envelope>

data/spec/fixtures/shutdown_server/success.json

@@ -1 +0,0 @@
-{"shutdown_server_response":{"return":{"request_id":"50056"},"@xmlns:ns2":"http://ws.api.profitbricks.com/"}}

data/spec/fixtures/shutdown_server/success.xml

@@ -1 +0,0 @@
-<?xml version='1.0' encoding='UTF-8'?><S:Envelope xmlns:S="http://schemas.xmlsoap.org/soap/envelope/"><S:Body><ns2:shutdownServerResponse xmlns:ns2="http://ws.api.profitbricks.com/"><return><requestId>50056</requestId></return></ns2:shutdownServerResponse></S:Body></S:Envelope>