rest_connection 0.1.6 → 0.1.7

data/README.rdoc

@@ -53,4 +53,4 @@ Copy the example from GEMHOME/rest_connection/examples/rest_api_config.yaml.samp
   rake gemspec
   rake install
   visit www.rubygems.org
-    gem push rest_connection-0.0.0.gem (use your new version number in this command)
+    gem push pkg/rest_connection-0.0.0.gem (use your new version number in this command)

data/Rakefile

@@ -12,5 +12,6 @@ Jeweler::Tasks.new do |gemspec|
   gemspec.add_dependency('json')
   gemspec.add_dependency('highline')
   gemspec.add_dependency('rest-client')
+  gemspec.add_dependency('nokogiri')
 end
 Jeweler::GemcutterTasks.new

data/VERSION

@@ -1 +1 @@
-0.1.6
+0.1.7

data/lib/rest_connection/rightscale/ec2_server_array_internal.rb

@@ -16,9 +16,9 @@
 class Ec2ServerArrayInternal
   include RightScale::Api::Base
   extend RightScale::Api::BaseExtend
-  include RightScale::Api::Taggable
-  extend RightScale::Api::TaggableExtend
-
+  include RightScale::Api::Internal
+  extend RightScale::Api::InternalExtend
+  
   deny_methods :index, :show, :create, :update, :destroy
 
   def run_script_on_instances(script, ec2_instance_hrefs=[], opts={})
@@ -28,7 +28,7 @@ class Ec2ServerArrayInternal
     when String then script = RightScript.new('href' => script)
     end
 
-    params = {:right_script_href => script.href}
+    params = {:right_script_href => script.href }
     unless ec2_instance_hrefs.nil? || ec2_instance_hrefs.empty?
       params[:ec2_instance_hrefs] = ec2_instance_hrefs
     end
@@ -36,8 +36,10 @@ class Ec2ServerArrayInternal
       params[:parameters] = opts
     end
     params = {:ec2_server_array => params}
+    status_array=[]
     connection.post(uri.path + "/run_script_on_instances", params).map do |work_unit|
-      Status.new('href' => location)
+      status_array.push Status.new('href' => work_unit)
     end
+    return(status_array)
   end
 end

data/lib/rest_connection.rb

@@ -22,6 +22,7 @@ require 'rest_connection/rightscale/rightscale_api_resources'
 require 'rest_connection/patches'
 require 'logger'
 require 'highline/import'
+require 'nokogiri'
 
 module RestConnection
   class Connection
@@ -204,8 +205,21 @@ module RestConnection
     # decoding and post processing goes here. This is where you may need some customization if you want to handle the response differently (or not at all!).  Luckily it's easy to modify based on this handler.
     def handle_response(res)
       if res.code.to_i == 201 or res.code.to_i == 202
-        return res['Location']
+        #
+        # In most cases, it's safe to return the location
+        #
+      	if res['Location']
+      	  return res['Location']
+      	else
+      	  #
+      	  # Ec2ServerArrayInternal.run_script_on_instances returns XML.
+      	  # We need to parse it to retrieve the href's to audit entries.
+      	  #
+          xml_response = Nokogiri::XML(res.body)
+          return xml_response.xpath('audit-entries/audit-entry/href').map { |href| href.content }
+        end
       elsif [200,203,204].detect { |d| d == res.code.to_i }
+
         if res.body
           begin
             return JSON.load(res.body)

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: rest_connection
 version: !ruby/object:Gem::Version 
-  hash: 23
+  hash: 21
   prerelease: 
   segments: 
   - 0
   - 1
-  - 6
-  version: 0.1.6
+  - 7
+  version: 0.1.7
 platform: ruby
 authors: 
 - Jeremy Deininger
@@ -16,7 +16,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2012-03-06 00:00:00 Z
+date: 2012-03-14 00:00:00 Z
 dependencies: 
 - !ruby/object:Gem::Dependency 
   name: activesupport
@@ -92,6 +92,20 @@ dependencies:
         version: "0"
   type: :runtime
   version_requirements: *id005
+- !ruby/object:Gem::Dependency 
+  name: nokogiri
+  prerelease: false
+  requirement: &id006 !ruby/object:Gem::Requirement 
+    none: false
+    requirements: 
+    - - ">="
+      - !ruby/object:Gem::Version 
+        hash: 3
+        segments: 
+        - 0
+        version: "0"
+  type: :runtime
+  version_requirements: *id006
 description: "A Modular RESTful API library. Current implemented modules: RightScale API"
 email: 
 - daniel.onorato@rightscale.com
@@ -194,7 +208,6 @@ files:
 - lib/rest_connection/rightscale/user.rb
 - lib/rest_connection/rightscale/vpc_dhcp_option.rb
 - lib/rest_connection/ssh_hax.rb
-- rest_connection.gemspec
 - spec/ec2_server_array_spec.rb
 - spec/ec2_ssh_key_internal_spec.rb
 - spec/image_jockey.rb

data/rest_connection.gemspec

@@ -1,155 +0,0 @@
-# Generated by jeweler
-# DO NOT EDIT THIS FILE DIRECTLY
-# Instead, edit Jeweler::Tasks in Rakefile, and run 'rake gemspec'
-# -*- encoding: utf-8 -*-
-
-Gem::Specification.new do |s|
-  s.name = "rest_connection"
-  s.version = "0.1.6"
-
-  s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
-  s.authors = ["Jeremy Deininger", "Timothy Rodriguez"]
-  s.date = "2012-03-06"
-  s.description = "A Modular RESTful API library. Current implemented modules: RightScale API"
-  s.email = ["daniel.onorato@rightscale.com"]
-  s.extra_rdoc_files = [
-    "README.rdoc"
-  ]
-  s.files = [
-    "README.rdoc",
-    "Rakefile",
-    "VERSION",
-    "config/rest_api_config.yaml.sample",
-    "examples/README.txt",
-    "examples/console.rb",
-    "examples/cucumber/2mysql_5.x_v2_beta_from_scratch.feature",
-    "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",
-    "git_hooks/post-commit",
-    "git_hooks/post-commit.disabled",
-    "git_hooks/post-merge.disabled",
-    "git_hooks/pre-commit",
-    "lib/rest_connection.rb",
-    "lib/rest_connection/patches.rb",
-    "lib/rest_connection/rightscale/account.rb",
-    "lib/rest_connection/rightscale/alert_spec.rb",
-    "lib/rest_connection/rightscale/alert_spec_subject.rb",
-    "lib/rest_connection/rightscale/audit_entry.rb",
-    "lib/rest_connection/rightscale/backup.rb",
-    "lib/rest_connection/rightscale/child_account.rb",
-    "lib/rest_connection/rightscale/cloud.rb",
-    "lib/rest_connection/rightscale/cloud_account.rb",
-    "lib/rest_connection/rightscale/credential.rb",
-    "lib/rest_connection/rightscale/deployment.rb",
-    "lib/rest_connection/rightscale/ec2_ebs_snapshot.rb",
-    "lib/rest_connection/rightscale/ec2_ebs_volume.rb",
-    "lib/rest_connection/rightscale/ec2_elastic_ip.rb",
-    "lib/rest_connection/rightscale/ec2_security_group.rb",
-    "lib/rest_connection/rightscale/ec2_server_array.rb",
-    "lib/rest_connection/rightscale/ec2_server_array_internal.rb",
-    "lib/rest_connection/rightscale/ec2_ssh_key.rb",
-    "lib/rest_connection/rightscale/ec2_ssh_key_internal.rb",
-    "lib/rest_connection/rightscale/executable.rb",
-    "lib/rest_connection/rightscale/instance.rb",
-    "lib/rest_connection/rightscale/instance_type.rb",
-    "lib/rest_connection/rightscale/macro.rb",
-    "lib/rest_connection/rightscale/mc_audit_entry.rb",
-    "lib/rest_connection/rightscale/mc_datacenter.rb",
-    "lib/rest_connection/rightscale/mc_deployment.rb",
-    "lib/rest_connection/rightscale/mc_image.rb",
-    "lib/rest_connection/rightscale/mc_instance.rb",
-    "lib/rest_connection/rightscale/mc_instance_type.rb",
-    "lib/rest_connection/rightscale/mc_multi_cloud_image.rb",
-    "lib/rest_connection/rightscale/mc_multi_cloud_image_setting.rb",
-    "lib/rest_connection/rightscale/mc_security_group.rb",
-    "lib/rest_connection/rightscale/mc_server.rb",
-    "lib/rest_connection/rightscale/mc_server_array.rb",
-    "lib/rest_connection/rightscale/mc_server_template.rb",
-    "lib/rest_connection/rightscale/mc_server_template_multi_cloud_image.rb",
-    "lib/rest_connection/rightscale/mc_ssh_key.rb",
-    "lib/rest_connection/rightscale/mc_tag.rb",
-    "lib/rest_connection/rightscale/mc_volume.rb",
-    "lib/rest_connection/rightscale/mc_volume_attachment.rb",
-    "lib/rest_connection/rightscale/mc_volume_snapshot.rb",
-    "lib/rest_connection/rightscale/mc_volume_type.rb",
-    "lib/rest_connection/rightscale/monitoring_metric.rb",
-    "lib/rest_connection/rightscale/multi_cloud_image.rb",
-    "lib/rest_connection/rightscale/multi_cloud_image_cloud_setting_internal.rb",
-    "lib/rest_connection/rightscale/multi_cloud_image_internal.rb",
-    "lib/rest_connection/rightscale/permission.rb",
-    "lib/rest_connection/rightscale/right_script.rb",
-    "lib/rest_connection/rightscale/right_script_attachment_internal.rb",
-    "lib/rest_connection/rightscale/right_script_internal.rb",
-    "lib/rest_connection/rightscale/rightscale_api_base.rb",
-    "lib/rest_connection/rightscale/rightscale_api_gateway.rb",
-    "lib/rest_connection/rightscale/rightscale_api_internal.rb",
-    "lib/rest_connection/rightscale/rightscale_api_mc_input.rb",
-    "lib/rest_connection/rightscale/rightscale_api_mc_taggable.rb",
-    "lib/rest_connection/rightscale/rightscale_api_resources.rb",
-    "lib/rest_connection/rightscale/rightscale_api_taggable.rb",
-    "lib/rest_connection/rightscale/rs_internal.rb",
-    "lib/rest_connection/rightscale/s3_bucket.rb",
-    "lib/rest_connection/rightscale/security_group_rule.rb",
-    "lib/rest_connection/rightscale/server.rb",
-    "lib/rest_connection/rightscale/server_ec2_ebs_volume.rb",
-    "lib/rest_connection/rightscale/server_interface.rb",
-    "lib/rest_connection/rightscale/server_internal.rb",
-    "lib/rest_connection/rightscale/server_template.rb",
-    "lib/rest_connection/rightscale/server_template_internal.rb",
-    "lib/rest_connection/rightscale/session.rb",
-    "lib/rest_connection/rightscale/sqs_queue.rb",
-    "lib/rest_connection/rightscale/status.rb",
-    "lib/rest_connection/rightscale/tag.rb",
-    "lib/rest_connection/rightscale/task.rb",
-    "lib/rest_connection/rightscale/user.rb",
-    "lib/rest_connection/rightscale/vpc_dhcp_option.rb",
-    "lib/rest_connection/ssh_hax.rb",
-    "rest_connection.gemspec",
-    "spec/ec2_server_array_spec.rb",
-    "spec/ec2_ssh_key_internal_spec.rb",
-    "spec/image_jockey.rb",
-    "spec/mcserver_spec.rb",
-    "spec/method_missing_spec.rb",
-    "spec/multi.rb",
-    "spec/right_script_internal.rb",
-    "spec/rs_internal_spec.rb",
-    "spec/server_internal_spec.rb",
-    "spec/server_spec.rb",
-    "spec/server_template_internal.rb",
-    "spec/spec_helper.rb",
-    "spec/tag_spec.rb"
-  ]
-  s.homepage = "http://github.com/rightscale/rest_connection"
-  s.require_paths = ["lib"]
-  s.rubygems_version = "1.8.17"
-  s.summary = "Modular RESTful API library"
-
-  if s.respond_to? :specification_version then
-    s.specification_version = 3
-
-    if Gem::Version.new(Gem::VERSION) >= Gem::Version.new('1.2.0') then
-      s.add_runtime_dependency(%q<activesupport>, ["= 2.3.10"])
-      s.add_runtime_dependency(%q<net-ssh>, ["= 2.1.4"])
-      s.add_runtime_dependency(%q<json>, [">= 0"])
-      s.add_runtime_dependency(%q<highline>, [">= 0"])
-      s.add_runtime_dependency(%q<rest-client>, [">= 0"])
-    else
-      s.add_dependency(%q<activesupport>, ["= 2.3.10"])
-      s.add_dependency(%q<net-ssh>, ["= 2.1.4"])
-      s.add_dependency(%q<json>, [">= 0"])
-      s.add_dependency(%q<highline>, [">= 0"])
-      s.add_dependency(%q<rest-client>, [">= 0"])
-    end
-  else
-    s.add_dependency(%q<activesupport>, ["= 2.3.10"])
-    s.add_dependency(%q<net-ssh>, ["= 2.1.4"])
-    s.add_dependency(%q<json>, [">= 0"])
-    s.add_dependency(%q<highline>, [">= 0"])
-    s.add_dependency(%q<rest-client>, [">= 0"])
-  end
-end
-