squall 1.1.0 → 1.2.0beta1

data/spec/vcr_cassettes/virtual_machine/build.yml

@@ -2,7 +2,7 @@
 - !ruby/struct:VCR::HTTPInteraction 
   request: !ruby/struct:VCR::Request 
     method: :post
-    uri: http://<USER>:<PASS>@<URL>:80/virtual_machines/404/build.json?virtual_machine[template_id]=1
+    uri: http://<USER>:<PASS>@<URL>:80/virtual_machines/404/build.json?virtual_machine%5Btemplate_id%5D=1
     body: 
     headers: 
       content-type: 
@@ -39,7 +39,7 @@
 - !ruby/struct:VCR::HTTPInteraction 
   request: !ruby/struct:VCR::Request 
     method: :post
-    uri: http://<USER>:<PASS>@<URL>:80/virtual_machines/72/build.json?virtual_machine[template_id]=1
+    uri: http://<USER>:<PASS>@<URL>:80/virtual_machines/72/build.json?virtual_machine%5Btemplate_id%5D=1
     body: 
     headers: 
       content-type: 

data/spec/vcr_cassettes/virtual_machine/create.yml

@@ -2,7 +2,7 @@
 - !ruby/struct:VCR::HTTPInteraction 
   request: !ruby/struct:VCR::Request 
     method: :post
-    uri: http://<USER>:<PASS>@<URL>:80/virtual_machines.json?virtual_machine[cpu_shares]=10&virtual_machine[primary_disk_size]=10&virtual_machine[template_id]=1&virtual_machine[label]=testmachine&virtual_machine[hostname]=testmachine&virtual_machine[memory]=512&virtual_machine[cpus]=1
+    uri: http://<USER>:<PASS>@<URL>:80/virtual_machines.json?virtual_machine%5Bcpu_shares%5D=10&virtual_machine%5Bprimary_disk_size%5D=10&virtual_machine%5Btemplate_id%5D=1&virtual_machine%5Blabel%5D=testmachine&virtual_machine%5Bhostname%5D=testmachine&virtual_machine%5Bmemory%5D=512&virtual_machine%5Bcpus%5D=1
     body: 
     headers: 
       content-type: 

data/spec/vcr_cassettes/virtual_machine/edit.yml

@@ -2,7 +2,7 @@
 - !ruby/struct:VCR::HTTPInteraction 
   request: !ruby/struct:VCR::Request 
     method: :put
-    uri: http://<USER>:<PASS>@<URL>:80/virtual_machines/404.json?virtual_machine[label]=1
+    uri: http://<USER>:<PASS>@<URL>:80/virtual_machines/404.json?virtual_machine%5Blabel%5D=1
     body: 
     headers: 
       content-type: 
@@ -39,7 +39,7 @@
 - !ruby/struct:VCR::HTTPInteraction 
   request: !ruby/struct:VCR::Request 
     method: :put
-    uri: http://<USER>:<PASS>@<URL>:80/virtual_machines/1.json?virtual_machine[label]=testing
+    uri: http://<USER>:<PASS>@<URL>:80/virtual_machines/1.json?virtual_machine%5Blabel%5D=testing
     body: 
     headers: 
       content-type: 

data/spec/vcr_cassettes/virtual_machine/migrate.yml

@@ -2,7 +2,7 @@
 - !ruby/struct:VCR::HTTPInteraction 
   request: !ruby/struct:VCR::Request 
     method: :post
-    uri: http://<USER>:<PASS>@<URL>:80/virtual_machines/404/migrate.json?virtual_machine[destination]=1
+    uri: http://<USER>:<PASS>@<URL>:80/virtual_machines/404/migrate.json?virtual_machine%5Bdestination%5D=1
     body: 
     headers: 
       content-type: 
@@ -39,7 +39,7 @@
 - !ruby/struct:VCR::HTTPInteraction 
   request: !ruby/struct:VCR::Request 
     method: :post
-    uri: http://<USER>:<PASS>@<URL>:80/virtual_machines/1/migrate.json?virtual_machine[destination]=404
+    uri: http://<USER>:<PASS>@<URL>:80/virtual_machines/1/migrate.json?virtual_machine%5Bdestination%5D=404
     body: 
     headers: 
       content-type: 
@@ -76,7 +76,7 @@
 - !ruby/struct:VCR::HTTPInteraction 
   request: !ruby/struct:VCR::Request 
     method: :post
-    uri: http://<USER>:<PASS>@<URL>:80/virtual_machines/1/migrate.json?virtual_machine[destination]=2
+    uri: http://<USER>:<PASS>@<URL>:80/virtual_machines/1/migrate.json?virtual_machine%5Bdestination%5D=2
     body: 
     headers: 
       content-type: 

data/spec/vcr_cassettes/virtual_machine/resize.yml

@@ -2,7 +2,7 @@
 - !ruby/struct:VCR::HTTPInteraction 
   request: !ruby/struct:VCR::Request 
     method: :post
-    uri: http://<USER>:<PASS>@<URL>:80/virtual_machines/404/resize.json?virtual_machine[memory]=1
+    uri: http://<USER>:<PASS>@<URL>:80/virtual_machines/404/resize.json?virtual_machine%5Bmemory%5D=1
     body: 
     headers: 
       content-type: 
@@ -39,7 +39,7 @@
 - !ruby/struct:VCR::HTTPInteraction 
   request: !ruby/struct:VCR::Request 
     method: :post
-    uri: http://<USER>:<PASS>@<URL>:80/virtual_machines/1/resize.json?virtual_machine[memory]=1000
+    uri: http://<USER>:<PASS>@<URL>:80/virtual_machines/1/resize.json?virtual_machine%5Bmemory%5D=1000
     body: 
     headers: 
       content-type: 

data/spec/vcr_cassettes/virtual_machine/segregate.yml

@@ -2,7 +2,7 @@
 - !ruby/struct:VCR::HTTPInteraction 
   request: !ruby/struct:VCR::Request 
     method: :post
-    uri: http://<USER>:<PASS>@<URL>:80/virtual_machines/404/strict_vm.json?virtual_machine[strict_virtual_machine_id]=1
+    uri: http://<USER>:<PASS>@<URL>:80/virtual_machines/404/strict_vm.json?virtual_machine%5Bstrict_virtual_machine_id%5D=1
     body: 
     headers: 
       content-type: 
@@ -39,7 +39,7 @@
 - !ruby/struct:VCR::HTTPInteraction 
   request: !ruby/struct:VCR::Request 
     method: :post
-    uri: http://<USER>:<PASS>@<URL>:80/virtual_machines/1/strict_vm.json?virtual_machine[strict_virtual_machine_id]=404
+    uri: http://<USER>:<PASS>@<URL>:80/virtual_machines/1/strict_vm.json?virtual_machine%5Bstrict_virtual_machine_id%5D=404
     body: 
     headers: 
       content-type: 
@@ -76,7 +76,7 @@
 - !ruby/struct:VCR::HTTPInteraction 
   request: !ruby/struct:VCR::Request 
     method: :post
-    uri: http://<USER>:<PASS>@<URL>:80/virtual_machines/1/strict_vm.json?virtual_machine[strict_virtual_machine_id]=2
+    uri: http://<USER>:<PASS>@<URL>:80/virtual_machines/1/strict_vm.json?virtual_machine%5Bstrict_virtual_machine_id%5D=2
     body: 
     headers: 
       content-type: 

data/spec/vcr_cassettes/whitelist/create.yml

@@ -2,7 +2,7 @@
 - !ruby/struct:VCR::HTTPInteraction 
   request: !ruby/struct:VCR::Request 
     method: :post
-    uri: http://<USER>:<PASS>@<URL>:80/users/404/user_white_lists.json?user_white_list[ip]=192.168.1.1
+    uri: http://<USER>:<PASS>@<URL>:80/users/404/user_white_lists.json?user_white_list%5Bip%5D=192.168.1.1
     body: 
     headers: 
       content-type: 
@@ -39,7 +39,7 @@
 - !ruby/struct:VCR::HTTPInteraction 
   request: !ruby/struct:VCR::Request 
     method: :post
-    uri: http://<USER>:<PASS>@<URL>:80/users/1/user_white_lists.json?user_white_list[ip]=192.168.1.1
+    uri: http://<USER>:<PASS>@<URL>:80/users/1/user_white_lists.json?user_white_list%5Bip%5D=192.168.1.1
     body: 
     headers: 
       content-type: 

data/spec/vcr_cassettes/whitelist/edit.yml

@@ -2,7 +2,7 @@
 - !ruby/struct:VCR::HTTPInteraction 
   request: !ruby/struct:VCR::Request 
     method: :put
-    uri: http://<USER>:<PASS>@<URL>:80/users/1/user_white_lists/1.json?user_white_list[description]=This%20is%20actually%20a%20different%20computer.
+    uri: http://<USER>:<PASS>@<URL>:80/users/1/user_white_lists/1.json?user_white_list%5Bdescription%5D=This+is+actually+a+different+computer.
     body: 
     headers: 
       content-type: 
@@ -41,7 +41,7 @@
 - !ruby/struct:VCR::HTTPInteraction 
   request: !ruby/struct:VCR::Request 
     method: :put
-    uri: http://<USER>:<PASS>@<URL>:80/users/1/user_white_lists/404.json?user_white_list[ip]=192.168.1.1
+    uri: http://<USER>:<PASS>@<URL>:80/users/1/user_white_lists/404.json?user_white_list%5Bip%5D=192.168.1.1
     body: 
     headers: 
       content-type: 

data/squall.gemspec

@@ -14,13 +14,15 @@ Gem::Specification.new do |s|
 
   s.rubyforge_project = "squall"
 
-  s.add_runtime_dependency 'httparty', '~> 0.8.1'
+  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('jruby-openssl', '~> 0.7.3') if RUBY_PLATFORM == 'java'
 
   s.add_development_dependency 'rspec', '~> 2.5'
   s.add_development_dependency 'fakeweb', '~> 1.3'
   s.add_development_dependency 'vcr', '~> 1.8'
-  s.add_development_dependency 'awesome_print'
+  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' 

metadata

@@ -1,30 +1,41 @@
 --- !ruby/object:Gem::Specification
 name: squall
 version: !ruby/object:Gem::Version
-  version: 1.1.0
-  prerelease: 
+  version: 1.2.0beta1
+  prerelease: 5
 platform: ruby
 authors:
 - Justin Mazzi
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-02-15 00:00:00.000000000Z
+date: 2012-03-05 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
-  name: httparty
-  requirement: &70349368130980 !ruby/object:Gem::Requirement
+  name: faraday
+  requirement: &13791720 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: 0.8.1
+        version: 0.8.0.rc2
   type: :runtime
   prerelease: false
-  version_requirements: *70349368130980
+  version_requirements: *13791720
+- !ruby/object:Gem::Dependency
+  name: faraday_middleware
+  requirement: &13807600 !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ~>
+      - !ruby/object:Gem::Version
+        version: 0.8.4
+  type: :runtime
+  prerelease: false
+  version_requirements: *13807600
 - !ruby/object:Gem::Dependency
   name: rspec
-  requirement: &70349368130460 !ruby/object:Gem::Requirement
+  requirement: &13807080 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -32,10 +43,10 @@ dependencies:
         version: '2.5'
   type: :development
   prerelease: false
-  version_requirements: *70349368130460
+  version_requirements: *13807080
 - !ruby/object:Gem::Dependency
   name: fakeweb
-  requirement: &70349368130000 !ruby/object:Gem::Requirement
+  requirement: &13806620 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -43,10 +54,10 @@ dependencies:
         version: '1.3'
   type: :development
   prerelease: false
-  version_requirements: *70349368130000
+  version_requirements: *13806620
 - !ruby/object:Gem::Dependency
   name: vcr
-  requirement: &70349368129540 !ruby/object:Gem::Requirement
+  requirement: &13806160 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -54,21 +65,21 @@ dependencies:
         version: '1.8'
   type: :development
   prerelease: false
-  version_requirements: *70349368129540
+  version_requirements: *13806160
 - !ruby/object:Gem::Dependency
   name: awesome_print
-  requirement: &70349368159880 !ruby/object:Gem::Requirement
+  requirement: &13805700 !ruby/object:Gem::Requirement
     none: false
     requirements:
-    - - ! '>='
+    - - ~>
       - !ruby/object:Gem::Version
-        version: '0'
+        version: 1.0.2
   type: :development
   prerelease: false
-  version_requirements: *70349368159880
+  version_requirements: *13805700
 - !ruby/object:Gem::Dependency
   name: rake
-  requirement: &70349368159340 !ruby/object:Gem::Requirement
+  requirement: &13805240 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -76,10 +87,10 @@ dependencies:
         version: 0.8.7
   type: :development
   prerelease: false
-  version_requirements: *70349368159340
+  version_requirements: *13805240
 - !ruby/object:Gem::Dependency
   name: rcov
-  requirement: &70349368158800 !ruby/object:Gem::Requirement
+  requirement: &13804740 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -87,10 +98,10 @@ dependencies:
         version: '0.9'
   type: :development
   prerelease: false
-  version_requirements: *70349368158800
+  version_requirements: *13804740
 - !ruby/object:Gem::Dependency
   name: metric_fu
-  requirement: &70349368158340 !ruby/object:Gem::Requirement
+  requirement: &13804280 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -98,7 +109,7 @@ dependencies:
         version: '2.1'
   type: :development
   prerelease: false
-  version_requirements: *70349368158340
+  version_requirements: *13804280
 description: A Ruby library for working with the OnApp REST API
 email:
 - jmazzi@site5.com
@@ -130,6 +141,7 @@ files:
 - lib/squall/support/base.rb
 - lib/squall/support/config.rb
 - lib/squall/support/exception.rb
+- lib/squall/support/on_app_errors.rb
 - lib/squall/support/params.rb
 - lib/squall/support/version.rb
 - lib/squall/support/yaml.rb
@@ -287,15 +299,18 @@ required_ruby_version: !ruby/object:Gem::Requirement
   - - ! '>='
     - !ruby/object:Gem::Version
       version: '0'
+      segments:
+      - 0
+      hash: 4481202589571130379
 required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
   requirements:
-  - - ! '>='
+  - - ! '>'
     - !ruby/object:Gem::Version
-      version: '0'
+      version: 1.3.1
 requirements: []
 rubyforge_project: squall
-rubygems_version: 1.8.10
+rubygems_version: 1.8.11
 signing_key: 
 specification_version: 3
 summary: A Ruby library for working with the OnApp REST API