squall 1.2.0beta1 → 1.2.1beta1

data/Rakefile

@@ -7,23 +7,9 @@ rescue LoadError
   exit
 end
 
-begin
-  require 'metric_fu'
-  MetricFu::Configuration.run do |config|
-    config.rcov[:rcov_opts] << "-Ispec"
-  end
-rescue LoadError
-end
-
 RSpec::Core::RakeTask.new :spec
 Bundler::GemHelper.install_tasks
 
-desc  "Run all specs with rcov"
-RSpec::Core::RakeTask.new(:rcov) do |t|
-  t.rcov = true
-  t.rcov_opts = %w{--exclude osx\/objc,gems\/,spec\/,features\/}
-end
-
 desc "Open an irb session preloaded with this library"
 task :console do
   sh "irb -rubygems -r ./lib/squall.rb -I ./lib"

data/lib/squall/support/base.rb

@@ -51,10 +51,13 @@ module Squall
         c.response :on_app_errors
         c.response :json
         c.adapter :net_http
+        if Squall.config[:debug]
+         c.use Faraday::Response::Logger
+        end
       end
       response = conn.send(request_method, path)
       @success = (200..207).include?(response.env[:status])
-      @result = conn.send(request_method, path).body
+      @result = response.body
     end
 
     # Raises an error if a request is made without first calling Squall.config

data/lib/squall/support/version.rb

@@ -1,3 +1,3 @@
 module Squall
-  VERSION = '1.2.0beta1'
+  VERSION = '1.2.1beta1'
 end

data/lib/squall/virtual_machine.rb

@@ -43,6 +43,8 @@ module Squall
     # * +note+ - Comment that can be set by the user of the virtual machine
     # * +allowed_hot_migrate+ - Set to '1'  to allow hot migration
     # * +initial_root_password+ - Root password for the virtual machine.  6-31 characters consisting of letters, numbers, '-' and '_'
+    # * hypervisor_group_id - the ID of the hypervisor zone in which the VM will be created. Optional: if no hypervisor zone is set, the VM will be built in any available hypervisor zone.
+
     #
     # ==== Example
     #
@@ -70,7 +72,8 @@ module Squall
                   :admin_note,
                   :note,
                   :allowed_hot_migrate,
-                  :initial_root_password
+                  :initial_root_password,
+                  :hypervisor_group_id
       ]
       params.required(required).accepts(optional).validate! options
       response = request(:post, '/virtual_machines.json', default_params(options))

data/spec/squall/firewall_rule_spec.rb

@@ -8,11 +8,11 @@ describe Squall::FirewallRule do
 
   describe "#list" do
     use_vcr_cassette "firewall_rule/list"
-    
+
     it "requires vm id" do
       expect { @firewall_rule.list }.to raise_error(ArgumentError)
     end
-    
+
     it "returns a list of firewall rules for a vm" do
       firewall_rules = @firewall_rule.list(1)
       firewall_rules.should be_an(Array)
@@ -23,24 +23,24 @@ describe Squall::FirewallRule do
       firewall_rules.all?.should be_true
     end
   end
-  
+
   describe "#create" do
     use_vcr_cassette "firewall_rule/create"
     it "requires command" do
       invalid = @valid.reject{|k,v| k == :command }
       requires_attr(:command) { @firewall_rule.create(1, invalid) }
     end
-    
+
     it "requires protocol" do
       invalid = @valid.reject{|k,v| k == :protocol }
       requires_attr(:protocol) { @firewall_rule.create(1, invalid) }
     end
-    
+
     it "requires network_interface_id" do
       invalid = @valid.reject{|k,v| k == :network_interface_id }
       requires_attr(:network_interface_id) { @firewall_rule.create(1, invalid) }
     end
-    
+
     it "allows all optional params" do
       optional = [:network_interface_id, :address, :port]
       @firewall_rule.should_receive(:request).exactly(optional.size).times.and_return Hash.new("firewall_rule" => {})
@@ -48,11 +48,11 @@ describe Squall::FirewallRule do
         @firewall_rule.create(1, @valid.merge(param => "test"))
       end
     end
-    
+
     it "raises error on unknown params" do
       expect { @firewall_rule.create(1, @valid.merge(:what => 'what')) }.to raise_error(ArgumentError, 'Unknown params: what')
     end
-    
+
     it "raises an error for an invalid vm id" do
       expect { @firewall_rule.create(404, @valid) }.to raise_error(Squall::NotFoundError)
     end
@@ -62,10 +62,10 @@ describe Squall::FirewallRule do
       @firewall_rule.success.should be_true
     end
   end
-  
+
   describe "#edit" do
     use_vcr_cassette "firewall_rule/edit"
-    
+
     it "allows select params" do
       optional = [:command, :protocol, :network_interface_id, :address, :port]
       @firewall_rule.should_receive(:request).exactly(optional.size).times.and_return Hash.new()
@@ -73,35 +73,31 @@ describe Squall::FirewallRule do
         @firewall_rule.edit(1, 1, param => "test")
       end
     end
-    
+
     it "raises error on unknown params" do
       expect { @firewall_rule.edit(1, 1, :what => 'what') }.to raise_error(ArgumentError, 'Unknown params: what')
     end
 
     it "edits a firewall rule" do
-      pending "broken in OnApp: returning invalid JSON" do
-        @firewall_rule.edit(1, 1, :port => 1000)
-        @firewall_rule.success.should be_true
-      end
+      @firewall_rule.edit(1, 1, :port => 1000)
+      @firewall_rule.success.should be_true
     end
-    
+
     it "raises an error for an invalid firewall rule id" do
       expect { @firewall_rule.edit(1, 404, @valid) }.to raise_error(Squall::NotFoundError)
     end
   end
-  
+
   describe "#delete" do
     use_vcr_cassette "firewall_rule/delete"
-    
+
     it "requires an id" do
       expect { @firewall_rule.delete }.to raise_error(ArgumentError)
     end
 
     it "deletes a firewall rule" do
-      pending "broken in OnApp: returning invalid JSON" do
-        @firewall_rule.delete(1, 1)
-        @firewall_rule.success.should be_true
-      end
+      @firewall_rule.delete(1, 1)
+      @firewall_rule.success.should be_true
     end
 
     it "returns NotFound for missing virtual machine" do
@@ -109,4 +105,4 @@ describe Squall::FirewallRule do
     end
   end
 
-end
+end

data/spec/squall/virtual_machine_spec.rb

@@ -79,7 +79,7 @@ describe Squall::VirtualMachine do
 
     it "requires primary_disk_size" do
       requires_attr(:primary_disk_size) {
-        @virtual_machine.create(:label => @valid[:label], :hostname => @valid[:hostname], 
+        @virtual_machine.create(:label => @valid[:label], :hostname => @valid[:hostname],
                                 :memory => @valid[:memory], :cpus => @valid[:cpu_shares],
                                 :cpu_shares => @valid[:cpu_shares])
       }
@@ -102,7 +102,8 @@ describe Squall::VirtualMachine do
                   :note,
                   :allowed_hot_migrate,
                   :hypervisor_id,
-                  :initial_root_password
+                  :initial_root_password,
+                  :hypervisor_group_id
       ]
 
       @virtual_machine.should_receive(:request).exactly(optional.size).times.and_return Hash.new('virtual_machine' => [])
@@ -112,7 +113,7 @@ describe Squall::VirtualMachine do
     end
 
     it "creates a virtual_machine" do
-      pending "broken in OnApp (triggering the Network Interfaces error): see README (and update when fixed)" do 
+      pending "broken in OnApp (triggering the Network Interfaces error): see README (and update when fixed)" do
         virtual_machine = @virtual_machine.create(@valid)
         @valid.each do |k,v|
           virtual_machine[k].should == @valid[k.to_s]
@@ -257,19 +258,19 @@ describe Squall::VirtualMachine do
       @virtual_machine.success.should be_true
     end
   end
-  
+
   describe "#set_ssh_keys" do
     use_vcr_cassette "virtual_machine/set_ssh_keys"
     it "requires an id" do
       expect { @virtual_machine.set_ssh_keys }.to raise_error(ArgumentError)
       @virtual_machine.success.should be_false
     end
-    
+
     it "404s on not found" do
       expect { @virtual_machine.set_ssh_keys(404) }.to raise_error(Squall::NotFoundError)
       @virtual_machine.success.should be_false
     end
-    
+
     it "sets the SSH keys" do
       result = @virtual_machine.set_ssh_keys(1)
       @virtual_machine.success.should be_true
@@ -312,7 +313,7 @@ describe Squall::VirtualMachine do
       end
     end
   end
-  
+
   describe "#set_vip" do
     use_vcr_cassette "virtual_machine/set_vip"
     it "requires an id" do
@@ -327,7 +328,7 @@ describe Squall::VirtualMachine do
       @virtual_machine.set_vip(1)
       @virtual_machine.success.should be_true
     end
-    
+
     it "sets the vip status to false if currently true" do
       pending "No way to actually test this without being able to interact with server state" do
         result = @virtual_machine.set_vip(1)
@@ -362,25 +363,25 @@ describe Squall::VirtualMachine do
     it "returns not found for invalid virtual_machines" do
       expect { @virtual_machine.resize(404, :memory => 1) }.to raise_error(Squall::NotFoundError)
     end
-    
+
     it "accepts memory" do
       hash = [:post, "/virtual_machines/1/resize.json",  @virtual_machine.default_params(:memory => 1)]
       @virtual_machine.should_receive(:request).with(*hash).once.and_return({'virtual_machine'=>{}})
       @virtual_machine.resize 1, :memory => 1
     end
-    
+
     it "accepts cpus" do
       hash = [:post, "/virtual_machines/1/resize.json",  @virtual_machine.default_params(:cpus => 1)]
       @virtual_machine.should_receive(:request).with(*hash).once.and_return({'virtual_machine'=>{}})
       @virtual_machine.resize 1, :cpus => 1
     end
-    
+
     it "accepts cpu_shares" do
       hash = [:post, "/virtual_machines/1/resize.json",  @virtual_machine.default_params(:cpu_shares => 1)]
       @virtual_machine.should_receive(:request).with(*hash).once.and_return({'virtual_machine'=>{}})
       @virtual_machine.resize 1, :cpu_shares => 1
     end
-    
+
     it "accepts allow_cold_resize" do
       hash = [:post, "/virtual_machines/1/resize.json",  @virtual_machine.default_params(:allow_cold_resize => 1)]
       @virtual_machine.should_receive(:request).with(*hash).once.and_return({'virtual_machine'=>{}})
@@ -393,7 +394,7 @@ describe Squall::VirtualMachine do
 
       virtual_machine['memory'].should == 1000
     end
-    
+
     it "requires at least one option" do
       expect { @virtual_machine.resize(1) }.to raise_error(ArgumentError)
     end
@@ -501,14 +502,14 @@ describe Squall::VirtualMachine do
       virtual_machine = @virtual_machine.reboot(1)
       @virtual_machine.success.should be_true
     end
-    
+
     it "reboots in recovery" do
       hash = [:post, "/virtual_machines/1/reboot.json", {:query => {:mode => :recovery}}]
       @virtual_machine.should_receive(:request).with(*hash).once.and_return({'virtual_machine'=>{}})
       @virtual_machine.reboot 1, true
     end
   end
-  
+
   describe "#segregate" do
     use_vcr_cassette "virtual_machine/segregate"
     it "requires an id" do
@@ -536,7 +537,7 @@ describe Squall::VirtualMachine do
       @virtual_machine.success.should be_true
     end
   end
-  
+
   describe "#console" do
     use_vcr_cassette "virtual_machine/console"
     it "requires an id" do
@@ -550,7 +551,7 @@ describe Squall::VirtualMachine do
         @virtual_machine.success.should be_false
       end
     end
-    
+
     it "will reboot a virtual_machine" do
       pending "broken on OnApp (returning 500)" do
         virtual_machine = @virtual_machine.console(1)
@@ -558,7 +559,7 @@ describe Squall::VirtualMachine do
       end
     end
   end
-  
+
   describe "#stats" do
     use_vcr_cassette "virtual_machine/stats"
     it "requires an id" do

data/squall.gemspec

@@ -14,20 +14,16 @@ Gem::Specification.new do |s|
 
   s.rubyforge_project = "squall"
 
-  s.add_runtime_dependency 'faraday', '~> 0.8.0.rc2'
-  s.add_runtime_dependency 'faraday_middleware', '~> 0.8.4'
-  s.add_runtime_dependency 'json', '~> 1.6.1' if defined?(RUBY_ENGINE) && RUBY_ENGINE == 'rbx'
+  s.add_runtime_dependency 'faraday', '~> 0.8.1'
+  s.add_runtime_dependency 'faraday_middleware', '~> 0.8.7'
+  s.add_runtime_dependency 'json', '~> 1.7.3' if defined?(RUBY_ENGINE) && RUBY_ENGINE == 'rbx'
   s.add_runtime_dependency('jruby-openssl', '~> 0.7.3') if RUBY_PLATFORM == 'java'
 
-  s.add_development_dependency 'rspec', '~> 2.5'
+  s.add_development_dependency 'rspec', '~> 2.10.0'
   s.add_development_dependency 'fakeweb', '~> 1.3'
   s.add_development_dependency 'vcr', '~> 1.8'
   s.add_development_dependency 'awesome_print', '~> 1.0.2'
-  s.add_development_dependency 'rake', '~> 0.8.7'
-  if !defined?(RUBY_ENGINE) || RUBY_ENGINE != 'rbx'
-    s.add_development_dependency 'rcov', '~> 0.9' 
-    s.add_development_dependency 'metric_fu', '~> 2.1'
-  end
+  s.add_development_dependency 'rake', '~> 0.9.2.2'
 
   s.files         = `git ls-files`.split("\n")
   s.test_files    = `git ls-files -- {test,spec,features}/*`.split("\n")

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: squall
 version: !ruby/object:Gem::Version
-  version: 1.2.0beta1
+  version: 1.2.1beta1
   prerelease: 5
 platform: ruby
 authors:
@@ -9,44 +9,45 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-03-05 00:00:00.000000000 Z
+date: 2012-06-08 00:00:00.000000000 -04:00
+default_executable: 
 dependencies:
 - !ruby/object:Gem::Dependency
   name: faraday
-  requirement: &13791720 !ruby/object:Gem::Requirement
+  requirement: &12810220 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: 0.8.0.rc2
+        version: 0.8.1
   type: :runtime
   prerelease: false
-  version_requirements: *13791720
+  version_requirements: *12810220
 - !ruby/object:Gem::Dependency
   name: faraday_middleware
-  requirement: &13807600 !ruby/object:Gem::Requirement
+  requirement: &12809260 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: 0.8.4
+        version: 0.8.7
   type: :runtime
   prerelease: false
-  version_requirements: *13807600
+  version_requirements: *12809260
 - !ruby/object:Gem::Dependency
   name: rspec
-  requirement: &13807080 !ruby/object:Gem::Requirement
+  requirement: &12781480 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: '2.5'
+        version: 2.10.0
   type: :development
   prerelease: false
-  version_requirements: *13807080
+  version_requirements: *12781480
 - !ruby/object:Gem::Dependency
   name: fakeweb
-  requirement: &13806620 !ruby/object:Gem::Requirement
+  requirement: &12780680 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -54,10 +55,10 @@ dependencies:
         version: '1.3'
   type: :development
   prerelease: false
-  version_requirements: *13806620
+  version_requirements: *12780680
 - !ruby/object:Gem::Dependency
   name: vcr
-  requirement: &13806160 !ruby/object:Gem::Requirement
+  requirement: &12780040 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -65,10 +66,10 @@ dependencies:
         version: '1.8'
   type: :development
   prerelease: false
-  version_requirements: *13806160
+  version_requirements: *12780040
 - !ruby/object:Gem::Dependency
   name: awesome_print
-  requirement: &13805700 !ruby/object:Gem::Requirement
+  requirement: &12778900 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -76,40 +77,18 @@ dependencies:
         version: 1.0.2
   type: :development
   prerelease: false
-  version_requirements: *13805700
+  version_requirements: *12778900
 - !ruby/object:Gem::Dependency
   name: rake
-  requirement: &13805240 !ruby/object:Gem::Requirement
-    none: false
-    requirements:
-    - - ~>
-      - !ruby/object:Gem::Version
-        version: 0.8.7
-  type: :development
-  prerelease: false
-  version_requirements: *13805240
-- !ruby/object:Gem::Dependency
-  name: rcov
-  requirement: &13804740 !ruby/object:Gem::Requirement
-    none: false
-    requirements:
-    - - ~>
-      - !ruby/object:Gem::Version
-        version: '0.9'
-  type: :development
-  prerelease: false
-  version_requirements: *13804740
-- !ruby/object:Gem::Dependency
-  name: metric_fu
-  requirement: &13804280 !ruby/object:Gem::Requirement
+  requirement: &12778120 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: '2.1'
+        version: 0.9.2.2
   type: :development
   prerelease: false
-  version_requirements: *13804280
+  version_requirements: *12778120
 description: A Ruby library for working with the OnApp REST API
 email:
 - jmazzi@site5.com
@@ -287,6 +266,7 @@ files:
 - spec/vcr_cassettes/whitelist/list.yml
 - spec/vcr_cassettes/whitelist/show.yml
 - squall.gemspec
+has_rdoc: true
 homepage: ''
 licenses: []
 post_install_message: 
@@ -301,7 +281,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: 4481202589571130379
+      hash: -2705965580518717746
 required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
   requirements:
@@ -310,7 +290,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: 1.3.1
 requirements: []
 rubyforge_project: squall
-rubygems_version: 1.8.11
+rubygems_version: 1.6.2
 signing_key: 
 specification_version: 3
 summary: A Ruby library for working with the OnApp REST API