profitbricks 0.9.9 → 1.0.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 8035c805cdebb8207c5a999ed7db0decdf92782d
-  data.tar.gz: b10e164d47f8e695897f101382f9088a850a0fc2
+  metadata.gz: 7eff0a7923f9a91e6b21df7f6a0ed25dd958099a
+  data.tar.gz: 535952263dae50c778ff480e9a6b36304056aece
 SHA512:
-  metadata.gz: 0fdbc90fa42b874606f404551d99a1f880dcb23aaa19c8cf6588ee0056dfc3bb07857c5a32ce507b5ddacf5f5c678362d5bb6a687a993ad97ebdd7fe6318a25e
-  data.tar.gz: f66481fb1dcb2d9ee130936667ce25679ab94bb38785c659f0fc07a160fc05b1131945becb231e0058bf67494f8e8f01c0aeb6989f321f2ab257d16abdbc5ad5
+  metadata.gz: b4756b5b0e0685ea5fabf087b54222d7081da44270effa01a95db5a288651d26284020a9e4bd58af0889a5040fbb24ce8d1604d9993e079660271032927569d9
+  data.tar.gz: 26e43a768c5d4a9d783a7a45be46836e2c641ff0a56f6c1789962fdcb3e387ca0949c621c95614788d8c9792ac4c42c6112f6df27b27db3dc5c049f3396ab666

data/Gemfile

@@ -1,14 +1,15 @@
 source 'https://rubygems.org'
-gem 'savon'
+gem 'savon', '~> 2.2.0'
 
 group :test, :development do
   gem 'json'
   gem 'rspec'
-  gem 'savon_spec'
+  gem 'rspec-mocks'
   gem 'simplecov', require: false
   gem 'rake'
   gem 'guard'
   gem 'guard-rspec'
+  gem 'rb-inotify'
   gem 'coveralls', require: false
   platforms :mri do
     # Temporary fix till hoe works with rbx in 1.9 mode

data/Gemfile.lock

@@ -4,7 +4,7 @@ GEM
     akami (1.2.0)
       gyoku (>= 0.4.0)
       nokogiri (>= 1.4.0)
-    builder (3.1.4)
+    builder (3.2.0)
     coderay (1.0.9)
     colorize (0.5.8)
     coveralls (0.6.7)
@@ -14,6 +14,7 @@ GEM
       simplecov (>= 0.7)
       thor
     diff-lcs (1.1.3)
+    ffi (1.6.0)
     formatador (0.2.4)
     guard (1.7.0)
       formatador (>= 0.2.4)
@@ -23,7 +24,7 @@ GEM
       thor (>= 0.14.6)
     guard-rspec (1.2.1)
       guard (>= 1.1)
-    gyoku (0.4.6)
+    gyoku (1.0.0)
       builder (>= 2.1.2)
     hoe (3.0.3)
       rake (~> 0.8)
@@ -33,25 +34,24 @@ GEM
       hoe (>= 2.2.0)
     hoe-git (1.5.0)
       hoe (>= 2.2.0)
-    httpi (1.1.1)
+    httpi (2.0.2)
       rack
     json (1.7.7)
     listen (0.7.3)
     lumberjack (1.0.3)
-    metaclass (0.0.1)
     method_source (0.8.1)
     mime-types (1.23)
-    mocha (0.10.5)
-      metaclass (~> 0.0.1)
     multi_json (1.7.2)
-    nokogiri (1.5.6)
-    nori (1.1.4)
+    nokogiri (1.5.9)
+    nori (2.1.0)
     pry (0.9.12)
       coderay (~> 1.0.5)
       method_source (~> 0.8)
       slop (~> 3.4)
-    rack (1.4.4)
+    rack (1.5.2)
     rake (0.9.2.2)
+    rb-inotify (0.9.0)
+      ffi (>= 0.5.0)
     rest-client (1.6.7)
       mime-types (>= 1.16)
     rspec (2.9.0)
@@ -62,26 +62,22 @@ GEM
     rspec-expectations (2.9.1)
       diff-lcs (~> 1.1.3)
     rspec-mocks (2.9.0)
-    savon (1.2.0)
+    savon (2.2.0)
       akami (~> 1.2.0)
       builder (>= 2.1.2)
-      gyoku (~> 0.4.5)
-      httpi (~> 1.1.0)
+      gyoku (~> 1.0.0)
+      httpi (~> 2.0.2)
       nokogiri (>= 1.4.0)
-      nori (~> 1.1.0)
-      wasabi (~> 2.5.0)
-    savon_spec (0.1.6)
-      mocha (>= 0.9.8)
-      rspec (>= 2.0.0)
-      savon (>= 0.8.0)
+      nori (~> 2.1.0)
+      wasabi (~> 3.1.0)
     simplecov (0.7.1)
       multi_json (~> 1.0)
       simplecov-html (~> 0.7.1)
     simplecov-html (0.7.1)
     slop (3.4.4)
     thor (0.18.1)
-    wasabi (2.5.1)
-      httpi (~> 1.0)
+    wasabi (3.1.0)
+      httpi (~> 2.0)
       nokogiri (>= 1.4.0)
 
 PLATFORMS
@@ -98,7 +94,8 @@ DEPENDENCIES
   jruby-openssl
   json
   rake
+  rb-inotify
   rspec
-  savon
-  savon_spec
+  rspec-mocks
+  savon (~> 2.2.0)
   simplecov

data/Guardfile

@@ -0,0 +1,9 @@
+# A sample Guardfile
+# More info at https://github.com/guard/guard#readme
+
+guard 'rspec', :spec_paths => ["spec/profitbricks"], :exclude => "./spec/live/*" do
+  watch(%r{^spec/profitbricks/.+_spec\.rb$})
+  watch(%r{^lib/profitbricks/(.+)\.rb$})     { |m| "spec/profitbricks/#{m[1]}_spec.rb" }
+  watch('spec/spec_helper.rb')  { "spec" }
+  watch('lib/profitbricks.rb')
+end

data/Manifest.txt

@@ -4,6 +4,7 @@
 CHANGELOG.md
 Gemfile
 Gemfile.lock
+Guardfile
 Manifest.txt
 README.md
 Rakefile
@@ -105,8 +106,14 @@ spec/fixtures/get_server/after_create.json
 spec/fixtures/get_server/after_create.xml
 spec/fixtures/get_server/connected_storage.json
 spec/fixtures/get_server/connected_storage.xml
+spec/fixtures/get_server/two_nics.json
+spec/fixtures/get_server/two_nics.xml
+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
@@ -119,10 +126,16 @@ spec/fixtures/remove_public_ip_from_nic/success.json
 spec/fixtures/remove_public_ip_from_nic/success.xml
 spec/fixtures/reserve_public_ip_block/success.json
 spec/fixtures/reserve_public_ip_block/success.xml
+spec/fixtures/reset_server/success.json
+spec/fixtures/reset_server/success.xml
 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/update_data_center/success.json
 spec/fixtures/update_data_center/success.xml
 spec/fixtures/update_load_balancer/success.json
@@ -133,6 +146,8 @@ spec/fixtures/update_server/basic.json
 spec/fixtures/update_server/basic.xml
 spec/fixtures/update_storage/success.json
 spec/fixtures/update_storage/success.xml
+spec/live/data_center_spec.rb
+spec/live/server_spec.rb
 spec/profitbricks/cli_spec.rb
 spec/profitbricks/data_center_spec.rb
 spec/profitbricks/firewall_spec.rb

data/README.md

@@ -1,4 +1,4 @@
-# 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)
+# 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)
 
 * http://github.com/dsander/profitbricks
 * http://rubydoc.info/github/dsander/profitbricks/master/frames

data/Rakefile

@@ -16,22 +16,30 @@ if defined?(RUBY_ENGINE) && RUBY_ENGINE == 'ruby'
   Hoe.plugin :bundler
   Hoe.plugin :gemcutter
   Hoe.plugins.delete :rubyforge
+  Hoe.plugins.delete :test
 
   Hoe.spec 'profitbricks' do
     developer('Dominik Sander', 'git@dsander.de')
 
     self.readme_file = 'README.md'
     self.history_file = 'CHANGELOG.md'
-    self.extra_deps << ["savon", "1.2.0"]
+    self.extra_deps << ["savon", "2.2.0"]
   end
 
   task :prerelease => [:clobber, :check_manifest, :test]
-else
-  RSpec::Core::RakeTask.new(:spec) do |spec|
-    spec.pattern = 'spec/**/*_spec.rb'
+end
+
+RSpec::Core::RakeTask.new(:spec) do |spec|
+  spec.pattern = 'spec/profitbricks/*_spec.rb'
+  spec.rspec_opts = ['--backtrace']
+end
+namespace :spec do
+  RSpec::Core::RakeTask.new(:live) do |spec|
+    spec.pattern = 'spec/live/*_spec.rb'
     spec.rspec_opts = ['--backtrace']
   end
 end
 
+
 task :default => :spec
-task :test => :spec
+task :test => :spec

data/lib/profitbricks.rb

@@ -3,17 +3,19 @@ require 'profitbricks/profitbricks'
 require 'profitbricks/extensions'
 require 'profitbricks/config'
 require 'profitbricks/model'
-require 'profitbricks/data_center'
+require 'profitbricks/rule'
+require 'profitbricks/firewall'
+require 'profitbricks/nic'
+require 'profitbricks/load_balancer'
 require 'profitbricks/server'
+require 'profitbricks/data_center'
 require 'profitbricks/image'
 require 'profitbricks/storage'
 require 'profitbricks/ip_block'
-require 'profitbricks/load_balancer'
-require 'profitbricks/firewall'
 require 'profitbricks/rule'
 
 module Profitbricks
-  VERSION = '0.9.9'
+  VERSION = '1.0.0'
 end
 
-PB = Profitbricks
+PB = Profitbricks

data/lib/profitbricks/data_center.rb

@@ -7,18 +7,18 @@ module Profitbricks
     # Deletes an empty Virtual Data Center. All components must be removed first.
     # @return [Boolean] true on success, false otherwise
     def delete
-      response = Profitbricks.request :delete_data_center, "<dataCenterId>#{self.id}</dataCenterId>"
-      response.to_hash[:delete_data_center_response][:return] ? true : false
+      response = Profitbricks.request :delete_data_center, data_center_id: self.id
+      response ? true : false
     end
 
     # Removes all components from the current Virtual Data Center.
     # @return The current Virtual Data Center
     def clear
-      response = Profitbricks.request :clear_data_center, "<dataCenterId>#{self.id}</dataCenterId>"
+      response = Profitbricks.request :clear_data_center, data_center_id: self.id
       @provisioning_state = nil
       @servers = []
       @storages = []
-      return self if response.to_hash[:clear_data_center_response][:return]
+      return self if response
     end
     
     # Renames the Virtual Data Center. 
@@ -26,9 +26,8 @@ module Profitbricks
     # @param [String] Name
     # @return [DataCenter] The renamed DataCenter
     def rename(name)
-      response = Profitbricks.request :update_data_center,
-                  "<arg0><dataCenterId>#{self.id}</dataCenterId><dataCenterName>#{name}</dataCenterName></arg0>"
-      if response.to_hash[:update_data_center_response][:return]
+      response = Profitbricks.request :update_data_center, data_center_id: self.id, data_center_name: name
+      if response
         @name = name
       end
       self
@@ -41,27 +40,27 @@ module Profitbricks
     #
     # @return [String] Provisioning State of the target Virtual Data Center (INACTIVE, INPROCESS, AVAILABLE, DELETED)
     def update_state
-      response = Profitbricks.request :get_data_center_state, "<dataCenterId>#{self.id}</dataCenterId>"
-      @provisioning_state = response.to_hash[:get_data_center_state_response][:return]
+      response = Profitbricks.request :get_data_center_state, data_center_id: self.id
+      @provisioning_state = response
       self.provisioning_state
     end
 
     # Creates a Server in the current Virtual Data Center, automatically sets the :data_center_id
     # @see Profitbricks::Server#create
     def create_server(options)
-      Server.create(options.merge(:data_center_id => self.id))
+      Server.create(options.merge(data_center_id: self.id))
     end
 
     # Creates a Storage in the current Virtual Data Center, automatically sets the :data_center_id
     # @see Profitbricks::Storage#create
     def create_storage(options)
-      Storage.create(options.merge(:data_center_id => self.id))
+      Storage.create(options.merge(data_center_id: self.id))
     end
 
     # Creates a Load Balancer in the current Virtual Data Center, automatically sets the :data_center_id
     # @see Profitbricks::LoadBalancer#create
     def create_load_balancer(options)
-      LoadBalancer.create(options.merge(:data_center_id => self.id))
+      LoadBalancer.create(options.merge(data_center_id: self.id))
     end
 
     # Checks if the Data Center was successfully provisioned
@@ -90,8 +89,7 @@ module Profitbricks
       # @return [Array <DataCenter>] Array of all available DataCenter
       def all
         resp = Profitbricks.request :get_all_data_centers
-        datacenters = resp.to_hash[:get_all_data_centers_response][:return]
-        [datacenters].flatten.compact.collect do |dc|
+        [resp].flatten.compact.collect do |dc|
           PB::DataCenter.find(:id => PB::DataCenter.new(dc).id)
         end
       end
@@ -104,10 +102,9 @@ module Profitbricks
       # @return [DataCenter] The newly created Virtual Data Center
       def create(options)
         raise ArgumentError.new(":region has to be one of 'DEFAULT', 'NORTH_AMERICA', or 'EUROPE'") if options[:region] and !['DEFAULT', 'EUROPE', 'NORTH_AMERICA'].include? options[:region]
-        xml = "<dataCenterName>#{options[:name]}</dataCenterName>"
-        xml += get_xml_and_update_attributes options, [:region]
-        response = Profitbricks.request :create_data_center, xml
-        self.find(:id => response.to_hash[:create_data_center_response][:return][:data_center_id] )
+        options[:data_center_name] = options.delete :name
+        response = Profitbricks.request :create_data_center, options
+        self.find(:id => response[:data_center_id] )
       end
 
       # Finds a Virtual Data Center
@@ -120,8 +117,10 @@ module Profitbricks
           options[:id] = dc.id if dc
         end
         raise "Unable to locate the datacenter named '#{options[:name]}'" unless options[:id]
-        response = Profitbricks.request :get_data_center, "<dataCenterId>#{options[:id]}</dataCenterId>"
-        PB::DataCenter.new(response.to_hash[:get_data_center_response][:return])
+        options[:data_center_id]   = options.delete :id
+        options.delete :name
+        response = Profitbricks.request :get_data_center, options
+        PB::DataCenter.new(response)
       end
     end
 

data/lib/profitbricks/extensions.rb

@@ -11,7 +11,4 @@ class String
     return self if self !~ /_/ && self =~ /[A-Z]+.*/
     split('_').map{|e| e.capitalize}.join
   end
-  def lower_camelcase
-    self.split('_').inject([]){ |buffer,e| buffer.push(buffer.empty? ? e : e.capitalize) }.join
-  end
 end

data/lib/profitbricks/firewall.rb

@@ -15,23 +15,17 @@ module Profitbricks
     # @param [Array<FirewallRule>] Array of FirewallRules to add
     # @return [Boolean] true on success, false otherwise
     def add_rules(rules)
-      xml = ""
+      options = {request: []}
       rules.each do |rule|
-        xml += "<request>"
-        xml += rule.get_xml_and_update_attributes rule.attributes, rule.attributes.keys
-        xml += "</request>"
+        options[:request] << rule.attributes
       end
       response = nil
       if @parent.class == Profitbricks::LoadBalancer
-        xml += "<loadBalancerId>#{@parent.id}</loadBalancerId>"
-        response = Profitbricks.request :add_firewall_rules_to_load_balancer, xml
-        update_attributes(response.to_hash[:add_firewall_rules_to_load_balancer_response][:return])
-        return true if response.to_hash[:add_firewall_rules_to_load_balancer_response][:return]
+        response = Profitbricks.request :add_firewall_rules_to_load_balancer, options.merge(load_balancer_id: @parent.id)
+        self.reload
       else
-        xml += "<nicId>#{self.nic_id}</nicId>"        
-        response = Profitbricks.request :add_firewall_rules_to_nic, xml
-        update_attributes(response.to_hash[:add_firewall_rules_to_nic_response][:return])
-        return true if response.to_hash[:add_firewall_rules_to_nic_response][:return]
+        response = Profitbricks.request :add_firewall_rules_to_nic, options.merge(nic_id: self.nic_id)
+        self.reload
       end
       
     end
@@ -40,24 +34,24 @@ module Profitbricks
     #
     # @return [Boolean] true on success, false otherwise
     def activate
-      response = Profitbricks.request :activate_firewalls, "<firewallIds>#{self.id}</firewallIds>"
-      return true if response[:activate_firewalls_response][:return]
+      response = Profitbricks.request :activate_firewalls, firewall_ids: self.id
+      return true
     end
 
     # Deactivates the Firewall
     #
     # @return [Boolean] true on success, false otherwise
     def deactivate
-      response = Profitbricks.request :deactivate_firewalls, "<firewallIds>#{self.id}</firewallIds>"
-      return true if response[:deactivate_firewalls_response][:return]
+      response = Profitbricks.request :deactivate_firewalls, firewall_ids: self.id
+      return true
     end
     
     # Deletes the Firewall
     #
     # @return [Boolean] true on success, false otherwise
     def delete
-      response = Profitbricks.request :delete_firewalls, "<firewallIds>#{self.id}</firewallIds>"
-      return true if response[:delete_firewalls_response][:return]
+      response = Profitbricks.request :delete_firewalls, firewall_ids: self.id
+      return true
     end
     class << self
       # Returns information about the respective firewall. 
@@ -67,9 +61,9 @@ module Profitbricks
       # @option options [String] :id The id of the firewall to locate (required)
       # @return [Firewall] The located Firewall
       def find(options = {})
-        response = Profitbricks.request :get_firewall, "<firewallId>#{options[:id]}</firewallId>"
+        response = Profitbricks.request :get_firewall, firewall_id: options[:id]
         # FIXME we cannot load the Firewall without knowing if it is belonging to a NIC or a LoadBalancer
-        PB::Firewall.new(response.to_hash[:get_firewall_response][:return], nil)
+        PB::Firewall.new(response, nil)
       end
     end
   end

data/lib/profitbricks/image.rb

@@ -1,5 +1,6 @@
 module Profitbricks
   class Image < Profitbricks::Model
+    belongs_to :mount_image, :class_name => :image
 
     # Sets the OS Type of an individual HDD and/or CD-ROM/DVD image that has been uploaded on the ProfitBricks FTP server.  
     # 
@@ -7,7 +8,7 @@ module Profitbricks
     # @return [Image] Updated Image Object
     def set_os_type(type)
       raise ArgumentError.new(":os_type has to be either 'WINDOWS' or 'OTHER'") if !['WINDOWS', 'OTHER'].include? type
-      response = Profitbricks.request :set_image_os_type, "<imageId>#{self.id}</imageId><osType>#{type}</osType>"
+      response = Profitbricks.request :set_image_os_type, image_id: self.id, os_type: type
       @os_type = type
       self
     end
@@ -23,14 +24,11 @@ module Profitbricks
       def find(options = {})
         image = nil
         if options[:name]
-          image = PB::Image.all().select { |d| d.name == options[:name] }.first
+          image = PB::Image.all().select { |d| d.name == options[:name] && (options[:region] ? d.region == options[:region] : true) }.first
           options[:id] = image.id if image
         end
         raise "Unable to locate the image named '#{options[:name]}'" unless options[:id]
         image
-        # This does not work for public images
-        #response = Profitbricks.request :get_image, "<imageId>#{options[:id]}</imageId>"
-        #PB::Image.new(response.to_hash[:get_image_response][:return])
       end
       
       # Outputs a list of all HDD and/or CD-ROM/DVD images existing on or uploaded to the Profit-Bricks FTP server. 
@@ -38,7 +36,7 @@ module Profitbricks
       # @return [Array<Image>] List of all available Images
       def all
         resp = Profitbricks.request :get_all_images
-        resp.to_hash[:get_all_images_response][:return].collect do |dc|
+        resp.collect do |dc|
           PB::Image.new(dc)
         end
       end