rest_connection 0.0.11 → 0.0.12

data/VERSION

@@ -1 +1 @@
-0.0.11
+0.0.12

data/lib/rest_connection/rightscale/server.rb

@@ -40,12 +40,18 @@ class Server
     new_params_hash
   end
 
-  # This is overriding the default save with one that can massage the parameters
-  def save
+  # Since RightScale hands back the parameters with a "name" and "value" tags we should
+  # transform them into the proper hash.  This it the same for setting and getting.
+  def parameters
     # if the parameters are an array of hashes, that means we need to transform.
     if @params['parameters'].is_a?(Array)
       @params['parameters'] = transform_parameters(@params['parameters'])
     end
+    @params['parameters']
+  end
+
+  # This is overriding the default save with one that can massage the parameters
+  def save
     uri = URI.parse(self.href)
     connection.put(uri.path, resource_singular_name.to_sym => @params)
   end
@@ -57,8 +63,8 @@ class Server
     reload
     connection.logger("#{nickname} is #{self.state}")
     while(timeout > 0)
-      return true if state == st
-      raise "FATAL error, this server is stranded and needs to be #{st}: #{nickname}, see audit: #{self.audit_link}" if state.include?('stranded')
+      return true if state =~ /#{st}/
+      raise "FATAL error, this server is stranded and needs to be #{st}: #{nickname}, see audit: #{self.audit_link}" if state.include?('stranded') && !st.include?('stranded')
       sleep 30
       timeout -= 30
       connection.logger("waiting for server #{nickname} to go #{st}, state is #{state}")

data/rest_connection.gemspec

@@ -5,11 +5,11 @@
 
 Gem::Specification.new do |s|
   s.name = %q{rest_connection}
-  s.version = "0.0.11"
+  s.version = "0.0.12"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["Jeremy Deininger"]
-  s.date = %q{2010-10-01}
+  s.date = %q{2010-10-20}
   s.description = %q{provides rest_connection}
   s.email = %q{jeremy@rubyonlinux.org}
   s.extra_rdoc_files = [
@@ -73,21 +73,21 @@ Gem::Specification.new do |s|
   s.rubygems_version = %q{1.3.7}
   s.summary = %q{lib for restful connections to the rightscale api}
   s.test_files = [
-    "spec/ec2_server_array_spec.rb",
-     "spec/ec2_ssh_key_internal_spec.rb",
-     "spec/image_jockey.rb",
+    "spec/server_internal_spec.rb",
      "spec/method_missing_spec.rb",
-     "spec/rs_internal_spec.rb",
-     "spec/server_internal_spec.rb",
      "spec/server_spec.rb",
+     "spec/ec2_ssh_key_internal_spec.rb",
+     "spec/rs_internal_spec.rb",
      "spec/tag_spec.rb",
-     "examples/console.rb",
+     "spec/ec2_server_array_spec.rb",
+     "spec/image_jockey.rb",
+     "examples/relaunch_deployment.rb",
+     "examples/cucumber/step_definitions/spot_check_steps.rb",
      "examples/cucumber/step_definitions/deployment_steps.rb",
      "examples/cucumber/step_definitions/mysql_steps.rb",
      "examples/cucumber/step_definitions/recipe_steps.rb",
-     "examples/cucumber/step_definitions/spot_check_steps.rb",
-     "examples/relaunch_deployment.rb",
-     "examples/right_scale_ec2_instances_api_test.rb"
+     "examples/right_scale_ec2_instances_api_test.rb",
+     "examples/console.rb"
   ]
 
   if s.respond_to? :specification_version then

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: rest_connection
 version: !ruby/object:Gem::Version 
-  hash: 9
+  hash: 7
   prerelease: false
   segments: 
   - 0
   - 0
-  - 11
-  version: 0.0.11
+  - 12
+  version: 0.0.12
 platform: ruby
 authors: 
 - Jeremy Deininger
@@ -15,7 +15,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-10-01 00:00:00 -07:00
+date: 2010-10-20 00:00:00 -07:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -154,18 +154,18 @@ signing_key:
 specification_version: 3
 summary: lib for restful connections to the rightscale api
 test_files: 
-- spec/ec2_server_array_spec.rb
-- spec/ec2_ssh_key_internal_spec.rb
-- spec/image_jockey.rb
-- spec/method_missing_spec.rb
-- spec/rs_internal_spec.rb
 - spec/server_internal_spec.rb
+- spec/method_missing_spec.rb
 - spec/server_spec.rb
+- spec/ec2_ssh_key_internal_spec.rb
+- spec/rs_internal_spec.rb
 - spec/tag_spec.rb
-- examples/console.rb
+- spec/ec2_server_array_spec.rb
+- spec/image_jockey.rb
+- examples/relaunch_deployment.rb
+- examples/cucumber/step_definitions/spot_check_steps.rb
 - examples/cucumber/step_definitions/deployment_steps.rb
 - examples/cucumber/step_definitions/mysql_steps.rb
 - examples/cucumber/step_definitions/recipe_steps.rb
-- examples/cucumber/step_definitions/spot_check_steps.rb
-- examples/relaunch_deployment.rb
 - examples/right_scale_ec2_instances_api_test.rb
+- examples/console.rb