profitbricks 0.9.8 → 0.9.9

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 927f517f665fe6a3edf1b95ba18d309a904cd921
-  data.tar.gz: ef29502801a32db332dfdd289ece88bb3aea3c0f
+  metadata.gz: 8035c805cdebb8207c5a999ed7db0decdf92782d
+  data.tar.gz: b10e164d47f8e695897f101382f9088a850a0fc2
 SHA512:
-  metadata.gz: 16b87afcb38284f88b8003180533a9c278849a93e065cda09319e1e89a8cab8e5c7117b880f427448bb09707172851dfc9033d9d44d6d20d60f19b49dc93ff1b
-  data.tar.gz: 4cc02ae79a0db4a940a22d701acbbc41ca093e391ec9a9554fedd776864f20a8631eb7bd2d77903ccea96d4a1db5d9ac9cd9645634bb31e9285db06969062b13
+  metadata.gz: 0fdbc90fa42b874606f404551d99a1f880dcb23aaa19c8cf6588ee0056dfc3bb07857c5a32ce507b5ddacf5f5c678362d5bb6a687a993ad97ebdd7fe6318a25e
+  data.tar.gz: f66481fb1dcb2d9ee130936667ce25679ab94bb38785c659f0fc07a160fc05b1131945becb231e0058bf67494f8e8f01c0aeb6989f321f2ab257d16abdbc5ad5

data/.travis.yml

@@ -3,7 +3,5 @@ rvm:
   - 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
   - rbx-19mode

data/Gemfile

@@ -5,10 +5,11 @@ group :test, :development do
   gem 'json'
   gem 'rspec'
   gem 'savon_spec'
-  gem 'simplecov', :require => false
+  gem 'simplecov', require: false
   gem 'rake'
   gem 'guard'
   gem 'guard-rspec'
+  gem 'coveralls', require: false
   platforms :mri do
     # Temporary fix till hoe works with rbx in 1.9 mode
     gem 'hoe'

data/Gemfile.lock

@@ -6,6 +6,13 @@ GEM
       nokogiri (>= 1.4.0)
     builder (3.1.4)
     coderay (1.0.9)
+    colorize (0.5.8)
+    coveralls (0.6.7)
+      colorize
+      multi_json (~> 1.3)
+      rest-client
+      simplecov (>= 0.7)
+      thor
     diff-lcs (1.1.3)
     formatador (0.2.4)
     guard (1.7.0)
@@ -33,9 +40,10 @@ GEM
     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.2.0)
+    multi_json (1.7.2)
     nokogiri (1.5.6)
     nori (1.1.4)
     pry (0.9.12)
@@ -44,6 +52,8 @@ GEM
       slop (~> 3.4)
     rack (1.4.4)
     rake (0.9.2.2)
+    rest-client (1.6.7)
+      mime-types (>= 1.16)
     rspec (2.9.0)
       rspec-core (~> 2.9.0)
       rspec-expectations (~> 2.9.0)
@@ -64,10 +74,10 @@ GEM
       mocha (>= 0.9.8)
       rspec (>= 2.0.0)
       savon (>= 0.8.0)
-    simplecov (0.6.1)
+    simplecov (0.7.1)
       multi_json (~> 1.0)
-      simplecov-html (~> 0.5.3)
-    simplecov-html (0.5.3)
+      simplecov-html (~> 0.7.1)
+    simplecov-html (0.7.1)
     slop (3.4.4)
     thor (0.18.1)
     wasabi (2.5.1)
@@ -78,6 +88,7 @@ PLATFORMS
   ruby
 
 DEPENDENCIES
+  coveralls
   guard
   guard-rspec
   hoe

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

data/lib/profitbricks.rb

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

data/lib/profitbricks/server.rb

@@ -28,7 +28,7 @@ module Profitbricks
     # @return [Boolean] true on success, false otherwise
     def update(options = {})
       return false if options.empty?
-      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(":ram has to be at least 256MiB and a multiple of it") if options[:ram] and (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>"
@@ -76,7 +76,7 @@ module Profitbricks
       # @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("You must provide :cores and :ram") if options[:ram].nil? or 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]

data/profitbricks.gemspec

@@ -2,38 +2,38 @@
 
 Gem::Specification.new do |s|
   s.name = "profitbricks"
-  s.version = "0.9.2.20130121213328"
+  s.version = "0.9.8.20130501204252"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["Dominik Sander"]
-  s.date = "2013-01-21"
+  s.date = "2013-05-01"
   s.description = "A Ruby client for the ProfitBricks API."
   s.email = ["git@dsander.de"]
   s.executables = ["profitbricks"]
-  s.extra_rdoc_files = ["Manifest.txt"]
+  s.extra_rdoc_files = ["CHANGELOG.md", "Manifest.txt", "README.md"]
   s.files = [".autotest", ".rspec", ".travis.yml", "CHANGELOG.md", "Gemfile", "Gemfile.lock", "Manifest.txt", "README.md", "Rakefile", "bin/profitbricks", "examples/create_datacenter.rb", "lib/profitbricks.rb", "lib/profitbricks/cli.rb", "lib/profitbricks/config.rb", "lib/profitbricks/data_center.rb", "lib/profitbricks/extensions.rb", "lib/profitbricks/firewall.rb", "lib/profitbricks/image.rb", "lib/profitbricks/ip_block.rb", "lib/profitbricks/load_balancer.rb", "lib/profitbricks/model.rb", "lib/profitbricks/nic.rb", "lib/profitbricks/profitbricks.rb", "lib/profitbricks/rule.rb", "lib/profitbricks/server.rb", "lib/profitbricks/storage.rb", "profitbricks.gemspec", "spec/fixtures/activate_firewalls/success.json", "spec/fixtures/activate_firewalls/success.xml", "spec/fixtures/activate_load_balancing_on_servers/success.json", "spec/fixtures/activate_load_balancing_on_servers/success.xml", "spec/fixtures/add_firewall_rules_to_load_balancer/success.json", "spec/fixtures/add_firewall_rules_to_load_balancer/success.xml", "spec/fixtures/add_firewall_rules_to_nic/success.json", "spec/fixtures/add_firewall_rules_to_nic/success.xml", "spec/fixtures/add_public_ip_to_nic/success.json", "spec/fixtures/add_public_ip_to_nic/success.xml", "spec/fixtures/clear_data_center/success.json", "spec/fixtures/clear_data_center/success.xml", "spec/fixtures/connect_storage_to_server/success.json", "spec/fixtures/connect_storage_to_server/success.xml", "spec/fixtures/create_data_center/success.json", "spec/fixtures/create_data_center/success.xml", "spec/fixtures/create_load_balancer/success.json", "spec/fixtures/create_load_balancer/success.xml", "spec/fixtures/create_nic/success.json", "spec/fixtures/create_nic/success.xml", "spec/fixtures/create_server/minimal.json", "spec/fixtures/create_server/minimal.xml", "spec/fixtures/create_storage/success.json", "spec/fixtures/create_storage/success.xml", "spec/fixtures/deactivate_firewalls/success.json", "spec/fixtures/deactivate_firewalls/success.xml", "spec/fixtures/deactivate_load_balancing_on_servers/success.json", "spec/fixtures/deactivate_load_balancing_on_servers/success.xml", "spec/fixtures/delete_data_center/success.json", "spec/fixtures/delete_data_center/success.xml", "spec/fixtures/delete_firewalls/success.json", "spec/fixtures/delete_firewalls/success.xml", "spec/fixtures/delete_load_balancer/success.json", "spec/fixtures/delete_load_balancer/success.xml", "spec/fixtures/delete_nic/success.json", "spec/fixtures/delete_nic/success.xml", "spec/fixtures/delete_server/success.json", "spec/fixtures/delete_server/success.xml", "spec/fixtures/delete_storage/failture.json", "spec/fixtures/delete_storage/failture.xml", "spec/fixtures/delete_storage/success.json", "spec/fixtures/delete_storage/success.xml", "spec/fixtures/deregister_servers_on_load_balancer/success.json", "spec/fixtures/deregister_servers_on_load_balancer/success.xml", "spec/fixtures/disconnect_storage_from_server/failture.json", "spec/fixtures/disconnect_storage_from_server/failture.xml", "spec/fixtures/disconnect_storage_from_server/success.json", "spec/fixtures/disconnect_storage_from_server/success.xml", "spec/fixtures/get_all_data_centers/empty.json", "spec/fixtures/get_all_data_centers/empty.xml", "spec/fixtures/get_all_data_centers/test_datacenter.json", "spec/fixtures/get_all_data_centers/test_datacenter.xml", "spec/fixtures/get_all_images/success.json", "spec/fixtures/get_all_images/success.xml", "spec/fixtures/get_all_public_ip_blocks/success.json", "spec/fixtures/get_all_public_ip_blocks/success.xml", "spec/fixtures/get_data_center/create.json", "spec/fixtures/get_data_center/create.xml", "spec/fixtures/get_data_center/firewall.json", "spec/fixtures/get_data_center/firewall.xml", "spec/fixtures/get_data_center/two_servers_with_storage.json", "spec/fixtures/get_data_center/two_servers_with_storage.xml", "spec/fixtures/get_data_center_state/in_process.json", "spec/fixtures/get_data_center_state/in_process.xml", "spec/fixtures/get_data_center_state/success.json", "spec/fixtures/get_data_center_state/success.xml", "spec/fixtures/get_firewall/success.json", "spec/fixtures/get_firewall/success.xml", "spec/fixtures/get_image/success.json", "spec/fixtures/get_image/success.xml", "spec/fixtures/get_load_balancer/success.json", "spec/fixtures/get_load_balancer/success.xml", "spec/fixtures/get_nic/success.json", "spec/fixtures/get_nic/success.xml", "spec/fixtures/get_nic/two_ips.json", "spec/fixtures/get_nic/two_ips.xml", "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_storage/success.json", "spec/fixtures/get_storage/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", "spec/fixtures/release_public_ip_block/success.xml", "spec/fixtures/remove_firewall_rules/success.json", "spec/fixtures/remove_firewall_rules/success.xml", "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/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/update_data_center/success.json", "spec/fixtures/update_data_center/success.xml", "spec/fixtures/update_load_balancer/success.json", "spec/fixtures/update_load_balancer/success.xml", "spec/fixtures/update_nic/success.json", "spec/fixtures/update_nic/success.xml", "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/profitbricks/cli_spec.rb", "spec/profitbricks/data_center_spec.rb", "spec/profitbricks/firewall_spec.rb", "spec/profitbricks/image_spec.rb", "spec/profitbricks/ip_block_spec.rb", "spec/profitbricks/load_balancer_spec.rb", "spec/profitbricks/model_spec.rb", "spec/profitbricks/nic_spec.rb", "spec/profitbricks/server_spec.rb", "spec/profitbricks/storage_spec.rb", "spec/spec_helper.rb", ".gemtest"]
   s.homepage = "http://github.com/dsander/profitbricks"
   s.rdoc_options = ["--main", "README.md"]
   s.require_paths = ["lib"]
   s.rubyforge_project = "profitbricks"
-  s.rubygems_version = "1.8.24"
+  s.rubygems_version = "2.0.0"
   s.summary = "A Ruby client for the ProfitBricks API."
 
   if s.respond_to? :specification_version then
-    s.specification_version = 3
+    s.specification_version = 4
 
     if Gem::Version.new(Gem::VERSION) >= Gem::Version.new('1.2.0') then
       s.add_runtime_dependency(%q<savon>, ["= 1.2.0"])
-      s.add_development_dependency(%q<rdoc>, ["~> 3.10"])
-      s.add_development_dependency(%q<hoe>, ["~> 3.4"])
+      s.add_development_dependency(%q<rdoc>, ["~> 4.0"])
+      s.add_development_dependency(%q<hoe>, ["~> 3.6"])
     else
       s.add_dependency(%q<savon>, ["= 1.2.0"])
-      s.add_dependency(%q<rdoc>, ["~> 3.10"])
-      s.add_dependency(%q<hoe>, ["~> 3.4"])
+      s.add_dependency(%q<rdoc>, ["~> 4.0"])
+      s.add_dependency(%q<hoe>, ["~> 3.6"])
     end
   else
     s.add_dependency(%q<savon>, ["= 1.2.0"])
-    s.add_dependency(%q<rdoc>, ["~> 3.10"])
-    s.add_dependency(%q<hoe>, ["~> 3.4"])
+    s.add_dependency(%q<rdoc>, ["~> 4.0"])
+    s.add_dependency(%q<hoe>, ["~> 3.6"])
   end
 end

data/spec/profitbricks/server_spec.rb

@@ -3,6 +3,76 @@ require 'spec_helper'
 describe Profitbricks::Server do
   include Savon::Spec::Macros
 
+  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")
+        expect { Server.create(:ram => 256) }.to raise_error(ArgumentError, "You must provide :cores and :ram")
+        expect { Server.create(:ram => 256, :cores => 1) }.not_to raise_error(ArgumentError, "You must provide :cores and :ram")
+      end
+
+      it "should require :ram to be a multiple of 256" do
+        expect { Server.create(:ram => 100, :cores => 1) }.to raise_error(ArgumentError, ":ram has to be at least 256MiB and a multiple of it")
+        expect { Server.create(:ram => 280, :cores => 1) }.to raise_error(ArgumentError, ":ram has to be at least 256MiB and a multiple of it")
+        expect { Server.create(:ram => 256, :cores => 1) }.not_to raise_error(ArgumentError, ":ram has to be at least 256MiB and a multiple of it")
+      end
+
+      it "should require that the availability_zone is either 'AUTO', 'ZONE_1', or 'ZONE_2'" do
+        expect { Server.create(:ram => 256, :cores => 1, :availability_zone => 'FAIL') }.to
+          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 
+            raise_error(ArgumentError, ":availability_zone has to be either 'AUTO', 'ZONE_1', or 'ZONE_2'")
+        end
+      end
+
+      it "should require that :os_type is either 'WINDOWS' or 'OTHER'" do
+        expect { Server.create(:ram => 256, :cores => 1, :os_type => 'FAIL') }.to
+          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 
+            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).returns(:minimal)
+        savon.expects(:get_server).returns(:after_create)
+        @server = Server.create(:ram => 256, :cores => 1)
+      end
+
+      it "should require :ram to be a multiple of 256" do
+        expect { @server.update(:ram => 100, :cores => 1) }.to raise_error(ArgumentError, ":ram has to be at least 256MiB and a multiple of it")
+        expect { @server.update(:ram => 280, :cores => 1) }.to raise_error(ArgumentError, ":ram has to be at least 256MiB and a multiple of it")
+        expect { @server.update(:ram => 256, :cores => 1) }.not_to raise_error(ArgumentError, ":ram has to be at least 256MiB and a multiple of it")
+      end
+
+      it "should require that the availability_zone is either 'AUTO', 'ZONE_1', or 'ZONE_2'" do
+        expect { @server.update(:ram => 256, :cores => 1, :availability_zone => 'FAIL') }.to
+          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 
+            raise_error(ArgumentError, ":availability_zone has to be either 'AUTO', 'ZONE_1', or 'ZONE_2'")
+        end
+      end
+
+      it "should require that :os_type is either 'WINDOWS' or 'OTHER'" do
+        expect { @server.update(:ram => 256, :cores => 1, :os_type => 'FAIL') }.to
+          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 
+            raise_error(ArgumentError, ":os_type has to be either 'WINDOWS' or 'OTHER'")
+        end
+      end
+    end
+  end
+
+
   it "should create a new server with minimal arguments" do
     savon.expects(:create_server).returns(:minimal)
     savon.expects(:get_server).returns(:after_create)

data/spec/spec_helper.rb

@@ -12,6 +12,9 @@ if ENV['COVERAGE']
   SimpleCov.start
 end
 
+require 'coveralls'
+Coveralls.wear!
+
 Savon.configure do |config|
   config.log = false
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: profitbricks
 version: !ruby/object:Gem::Version
-  version: 0.9.8
+  version: 0.9.9
 platform: ruby
 authors:
 - Dominik Sander
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-04-24 00:00:00.000000000 Z
+date: 2013-05-01 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: savon