elasticity 0.4 → 0.5

data/README.mediawiki

@@ -1,18 +1,55 @@
-Elasticity provides programmatic access to Amazon's Elastic Map Reduce service.
+Elasticity provides programmatic access to Amazon's Elastic Map Reduce service.  The aim is to conveniently wrap the API operations in a manner that makes working with EMR job flows from Ruby more enjoyable.  At the very least, using Elasticity allows you to easily experiment with the EMR API :)
 
-There are five API actions in the [http://docs.amazonwebservices.com/ElasticMapReduce/latest/DeveloperGuide/index.html EMR API], described below.  Please see the Amazon guide for details on these operations because the default values aren't obvious (e.g. the meaning of <code>DescribeJobFlows</code> without parameters).
+'''BACKLOG''': Have a look at the backlog  [https://www.pivotaltracker.com/projects/272429 here] (Pivotal Tracker).
+
+'''CREDITS''': AWS signing was used from [http://www.rightscale.com/ RightScale's] amazing [https://github.com/rightscale/right_aws right_aws gem] which works extraordinarily well!  If you need access to any AWS service (EC2, S3, etc.), have a look.
+
+= Installation and Usage =
+
+<pre>
+  gem install elasticity
+</pre>
+
+All you have to do is <code>require 'elasticity'</code> and you're all set!
 
-Each Elasticity call provides some level of wrapping to save you the trouble of having to parse XML and deal with common status codes.
+= API Reference =
+
+Elasticity wraps (well, eventually!) all of the EMR API calls.  Please see the Amazon guide for details on these operations because the default values aren't obvious (e.g. the meaning of <code>DescribeJobFlows</code> without parameters).
 
 Alternatively, you may opt for "direct" access to the API where you specify the params and Elasticity takes care of the signing for you, responding with the XML from Amazon.  Direct access is described below the API catalog.
 
-'''BACKLOG''': Have a look at the backlog  [https://www.pivotaltracker.com/projects/272429 here] (Pivotal Tracker).
+In addition to the [http://aws.amazon.com/elasticmapreduce/ AWS EMR subsite], there are three primary resources of reference information for EMR:
 
-'''CREDITS''': AWS signing was used from [http://www.rightscale.com/ RightScale's] amazing [https://github.com/rightscale/right_aws right_aws gem] which works extraordinarily well!  If you need access to any AWS service (EC2, S3, etc.), have a look.
+* [http://docs.amazonwebservices.com/ElasticMapReduce/latest/GettingStartedGuide/ Amazon EMR Getting Started Guide]
+* [http://docs.amazonwebservices.com/ElasticMapReduce/latest/DeveloperGuide/ Amazon EMR Developer Guide]
+* [http://docs.amazonwebservices.com/ElasticMapReduce/latest/API/ Amazon EMR API Reference]
+
+Unfortunately, the documentation is sometimes incorrect and sometimes missing.  E.g. the allowable values for AddInstanceGroups are present in the [http://awsdocs.s3.amazonaws.com/ElasticMapReduce/20090331/emr-api-20090331.pdf PDF] version of the API reference but not in the [http://docs.amazonwebservices.com/ElasticMapReduce/latest/API/ HTML] version.  Elasticity implements the API as specified in the PDF reference as that is the most complete description I could find.
 
 == AddInstanceGroups ==
 
-''(not yet supported)''
+AddInstanceGroups adds a group of instances to an existing job flow.  The available instance configuration options are listed in the EMR API reference.  They've been converted to be more Ruby-like in the wrappers, as shown in the example below.
+
+<pre>
+  instance_group_config = {
+    :count  => 1,
+    :role   => "TASK",
+    :type   => "m1.small",
+    :market => "ON_DEMAND",
+    :name   => "Go Canucks!"
+  }
+  emr.add_instance_groups("j-26LIXPUNSC0M3", [instance_group_config])
+  
+  > ["ig-E7C8MGA2ULQ1"]
+</pre>
+
+Some combinations of the options will be rejected by Amazon and some once-valid options will sometimes be rejected if they not relevant to the current state of the job flow (e.g. duplicate addition of TASK groups to the same job flow).
+
+<pre>
+  emr.add_instance_groups("j-26LIXPUNSC0M3", [instance_group_config])
+  
+  > Task instance group already exists in the job flow, cannot add more task groups
+</pre>
 
 == AddJobFlowSteps ==
 
@@ -23,10 +60,11 @@ Alternatively, you may opt for "direct" access to the API where you specify the
 DescribeJobFlows returns detailed information as to the state of all jobs.  Currently this is wrapped in an <code>Elasticity::JobFlow</code> that contains the <code>name</code>, <code>jobflow_id</code> and <code>state</code>.  
 
 <pre>
-  > emr = Elasticity::EMR.new(ENV["aws_access_key_id"], ENV["aws_secret_key"])
-  > jobflows = emr.describe_jobflows
-  > p jobflows.map(&:name)
-  ["Hive Test", "Pig Test", "Interactive Hadoop", "Interactive Hive"]
+  emr = Elasticity::EMR.new(ENV["aws_access_key_id"], ENV["aws_secret_key"])
+  jobflows = emr.describe_jobflows
+  p jobflows.map(&:name)
+  
+  > ["Hive Test", "Pig Test", "Interactive Hadoop", "Interactive Hive"]
 </pre>
 
 == ModifyInstanceGroups ==
@@ -34,25 +72,26 @@ DescribeJobFlows returns detailed information as to the state of all jobs.  Curr
 A job flow contains several "instance groups" of various types.  These instances are where the work for your EMR task occurs.  After a job flow has been created, you can find these instance groups in the AWS web UI by clicking on a job flow and then clicking on the "Instance Groups" tab.
 
 <pre>
-  > emr = Elasticity::EMR.new(ENV["aws_access_key_id"], ENV["aws_secret_key"])
-  > emr.modify_instance_groups({"ig-2T1HNUO61BG3O" => 3})
-  >
+  emr = Elasticity::EMR.new(ENV["aws_access_key_id"], ENV["aws_secret_key"])
+  emr.modify_instance_groups({"ig-2T1HNUO61BG3O" => 3})
 </pre>
 
 If there's an error, you'll receive an ArgumentError containing the message from Amazon.  For example if you attempt to modify an instance group that's part of a terminated job flow:
 
 <pre>
-  > emr = Elasticity::EMR.new(ENV["aws_access_key_id"], ENV["aws_secret_key"])
-  > emr.modify_instance_groups({"ig-some_terminated_group" => 3})
-  ArgumentError: An instance group may only be modified when the job flow is running or waiting
+  emr = Elasticity::EMR.new(ENV["aws_access_key_id"], ENV["aws_secret_key"])
+  emr.modify_instance_groups({"ig-some_terminated_group" => 3})
+  
+  > ArgumentError: An instance group may only be modified when the job flow is running or waiting
 </pre>
 
 Or if you attempt to increase the instance count of the MASTER instance group:
 
 <pre>
-  > emr = Elasticity::EMR.new(ENV["aws_access_key_id"], ENV["aws_secret_key"])
-  > emr.modify_instance_groups({"ig-some_terminated_group" => 3})
-  ArgumentError: A master instance group may not be modified
+  emr = Elasticity::EMR.new(ENV["aws_access_key_id"], ENV["aws_secret_key"])
+  emr.modify_instance_groups({"ig-some_terminated_group" => 3})
+  
+  > ArgumentError: A master instance group may not be modified
 </pre>
 
 == RunJobFlow ==
@@ -64,17 +103,17 @@ Or if you attempt to increase the instance count of the MASTER instance group:
 When the job flow '''exists''', you will receive no output.  This is because Amazon does not return anything other than a 200 when you terminate a job flow :)  You'll want to continuously poll with DescribeJobFlows to see when the job was actually terminated.
 
 <pre>
-  > emr = Elasticity::EMR.new(ENV["aws_access_key_id"], ENV["aws_secret_key"])
-  > emr.terminate_jobflows("j-BOWBV7884XD0")
-  >
+  emr = Elasticity::EMR.new(ENV["aws_access_key_id"], ENV["aws_secret_key"])
+  emr.terminate_jobflows("j-BOWBV7884XD0")
 </pre>
 
 When the job flow '''doesn't exist''':
 
 <pre>
-  > emr = Elasticity::EMR.new(ENV["aws_access_key_id"], ENV["aws_secret_key"])
-  > emr.terminate_jobflows("no-flow")
-  ArgumentError: Job flow 'no-flow' does not exist.
+  emr = Elasticity::EMR.new(ENV["aws_access_key_id"], ENV["aws_secret_key"])
+  emr.terminate_jobflows("no-flow")
+  
+  > ArgumentError: Job flow 'no-flow' does not exist.
 </pre>
 
 = Direct Response Access =
@@ -82,9 +121,10 @@ When the job flow '''doesn't exist''':
 If you're fine with Elasticity's invocation wrapping and would prefer to get at the resulting XML rather than the wrapped response, throw a block our way and we'll yield the result.  This still saves you the trouble of having to create the params and sign the request yet gives you direct access to the response XML for your parsing pleasure.
 
 <pre>
-  > emr = Elasticity::EMR.new(ENV["aws_access_key_id"], ENV["aws_secret_key"])
-  > emr.describe_jobflows{|xml| puts xml[0..77]}
-  <DescribeJobFlowsResponse xmlns="http://elasticmapreduce.amazonaws.com/doc/200
+  emr = Elasticity::EMR.new(ENV["aws_access_key_id"], ENV["aws_secret_key"])
+  emr.describe_jobflows{|xml| puts xml[0..77]}
+  
+  > <DescribeJobFlowsResponse xmlns="http://elasticmapreduce.amazonaws.com/doc/200
 </pre>
 
 = Direct Request/Response Access =
@@ -92,11 +132,12 @@ If you're fine with Elasticity's invocation wrapping and would prefer to get at
 If you're chomping at the bit to initiate some EMR functionality that isn't wrapped (or isn't wrapped in a way you prefer :) feel free to access the AWS EMR API directly by using <code>EMR.direct()</code>.  You can find the allowed values in Amazon's EMR API [http://docs.amazonwebservices.com/ElasticMapReduce/latest/DeveloperGuide/index.html developer documentation].
 
 <pre>
-  > emr = Elasticity::EMR.new(ENV["aws_access_key_id"], ENV["aws_secret_key"])
-  > params = {"Operation" => "DescribeJobFlows"}
-  > result_xml = emr.direct(params)
-  > result_xml[0..78]
-  <DescribeJobFlowsResponse xmlns="http://elasticmapreduce.amazonaws.com/doc/2009
+  emr = Elasticity::EMR.new(ENV["aws_access_key_id"], ENV["aws_secret_key"])
+  params = {"Operation" => "DescribeJobFlows"}
+  result_xml = emr.direct(params)
+  result_xml[0..78]
+  
+  > <DescribeJobFlowsResponse xmlns="http://elasticmapreduce.amazonaws.com/doc/2009
 </pre>
 
 <!-- __NOTOC__ -->

data/lib/elasticity/emr.rb

@@ -15,6 +15,53 @@ module Elasticity
       JobFlow.from_members_nodeset(xml_doc.xpath("/DescribeJobFlowsResponse/DescribeJobFlowsResult/JobFlows/member"))
     end
 
+    # Adds a new group of instances to the specified jobflow.  Elasticity maps a
+    # more Ruby-like syntax to the Amazon options.  An exhaustive hash follows although
+    # not all of these options are required (or valid!) at once.  Please see the
+    # EMR docs for details although even then you're going to need to experiment :)
+    #
+    # instance_group_config = {
+    #   :bid_price => 5,
+    #   :count => 1,
+    #   :role => "TASK",
+    #   :type => "m1.small",
+    #   :market => "SPOT",
+    #   :name => "Go Canucks Go!"
+    # }
+    #
+    # add_instance_groups takes an array of {}.
+    #
+    # Returns an array of the instance IDs that were created by the specified configs.
+    # 
+    #  ["ig-2GOVEN6HVJZID", "ig-1DU9M2UQMM051", "ig-3DZRW4Y2X4S", ...]
+    def add_instance_groups(jobflow_id, instance_group_configs)
+      params = {
+        "Operation" => "AddInstanceGroups",
+        "JobFlowId" => jobflow_id
+      }
+      instance_group_configs.each_with_index do |ig_config, index|
+        params.merge!("InstanceGroups.member.#{index+1}.BidPrice" => ig_config[:bid_price]) if ig_config[:bid_price]
+        params.merge!("InstanceGroups.member.#{index+1}.InstanceCount" => ig_config[:count]) if ig_config[:count]
+        params.merge!("InstanceGroups.member.#{index+1}.InstanceRole" => ig_config[:role]) if ig_config[:role]
+        params.merge!("InstanceGroups.member.#{index+1}.InstanceType" => ig_config[:type]) if ig_config[:type]
+        params.merge!("InstanceGroups.member.#{index+1}.Market" => ig_config[:market]) if ig_config[:market]
+        params.merge!("InstanceGroups.member.#{index+1}.Name" => ig_config[:name]) if ig_config[:name]
+      end
+      begin
+        aws_result = @aws_request.aws_emr_request(params)
+        xml_doc = Nokogiri::XML(aws_result)
+        xml_doc.remove_namespaces!
+        instance_group_ids = []
+        xml_doc.xpath("/AddInstanceGroupsResponse/AddInstanceGroupsResult/InstanceGroupIds/member").each do |member|
+          instance_group_ids << member.text
+        end
+        yield aws_result if block_given?
+        instance_group_ids
+      rescue RestClient::BadRequest => e
+        raise ArgumentError, parse_error_response(e.http_body)
+      end
+    end
+
     # Set the number of instances in the specified instance groups to the
     # specified counts.  Note that this modifies the *request* count, which
     # is not the same as the *running* count.  I.e. you request instances
@@ -22,7 +69,7 @@ module Elasticity
     #
     # Takes a {} of instance group IDs => desired instance count.
     #
-    # {"ig-1" => 40, "ig-2" => 5", ...}
+    # {"ig-1" => 40, "ig-2" => 5, ...}
     def modify_instance_groups(instance_group_config)
       params = {"Operation" => "ModifyInstanceGroups"}
       instance_group_config.keys.each_with_index do |instance_group, index|

data/lib/elasticity/version.rb

@@ -1,3 +1,3 @@
 module Elasticity
-  VERSION = "0.4"
+  VERSION = "0.5"
 end

data/spec/fixtures/vcr_cassettes/add_instance_groups/one_group_successful.yml

@@ -0,0 +1,38 @@
+--- 
+- !ruby/struct:VCR::HTTPInteraction 
+  request: !ruby/struct:VCR::Request 
+    method: :get
+    uri: !ruby/regexp /^http:\/\/elasticmapreduce.amazonaws.com:80\/\?AWSAccessKeyId=AKIAI7HEMMNKGT6VFFSA&InstanceGroups.member.1.InstanceCount=1&InstanceGroups.member.1.InstanceRole=TASK&InstanceGroups.member.1.InstanceType=m1.small&InstanceGroups.member.1.Market=ON_DEMAND&InstanceGroups.member.1.Name=Go%20Canucks%20Go!&JobFlowId=j-OALI7TZTQMHX&Operation=AddInstanceGroups/
+    body: 
+    headers: 
+      accept: 
+      - "*/*; q=0.5, application/xml"
+      accept-encoding: 
+      - gzip, deflate
+  response: !ruby/struct:VCR::Response 
+    status: !ruby/struct:VCR::ResponseStatus 
+      code: 200
+      message: OK
+    headers: 
+      x-amzn-requestid: 
+      - ddd0d158-67eb-11e0-ba06-2b5c43005be2
+      content-type: 
+      - text/xml
+      date: 
+      - Sat, 16 Apr 2011 05:39:15 GMT
+      content-length: 
+      - "411"
+    body: |
+      <AddInstanceGroupsResponse xmlns="http://elasticmapreduce.amazonaws.com/doc/2009-03-31">
+        <AddInstanceGroupsResult>
+          <JobFlowId>j-OALI7TZTQMHX</JobFlowId>
+          <InstanceGroupIds>
+            <member>ig-2GOVEN6HVJZID</member>
+          </InstanceGroupIds>
+        </AddInstanceGroupsResult>
+        <ResponseMetadata>
+          <RequestId>ddd0d158-67eb-11e0-ba06-2b5c43005be2</RequestId>
+        </ResponseMetadata>
+      </AddInstanceGroupsResponse>
+
+    http_version: "1.1"

data/spec/fixtures/vcr_cassettes/add_instance_groups/one_group_unsuccessful.yml

@@ -0,0 +1,35 @@
+--- 
+- !ruby/struct:VCR::HTTPInteraction 
+  request: !ruby/struct:VCR::Request 
+    method: :get
+    uri: !ruby/regexp /^http:\/\/elasticmapreduce.amazonaws.com:80\/\?AWSAccessKeyId=AKIAI7HEMMNKGT6VFFSA&InstanceGroups.member.1.BidPrice=0&InstanceGroups.member.1.InstanceCount=1&InstanceGroups.member.1.InstanceRole=TASK&InstanceGroups.member.1.InstanceType=m1.small&InstanceGroups.member.1.Market=ON_DEMAND&InstanceGroups.member.1.Name=Go%20Canucks%20Go!&JobFlowId=j-19WDDS68ZUENP&Operation=AddInstanceGroups/
+    body:
+    headers: 
+      accept: 
+      - "*/*; q=0.5, application/xml"
+      accept-encoding: 
+      - gzip, deflate
+  response: !ruby/struct:VCR::Response 
+    status: !ruby/struct:VCR::ResponseStatus 
+      code: 400
+      message: Bad Request
+    headers: 
+      x-amzn-requestid: 
+      - 0c8d744d-67ea-11e0-bf8a-ed57a5465c87
+      content-type: 
+      - text/xml
+      date: 
+      - Sat, 16 Apr 2011 05:26:15 GMT
+      content-length: 
+      - "337"
+    body: |
+      <ErrorResponse xmlns="http://elasticmapreduce.amazonaws.com/doc/2009-03-31">
+        <Error>
+          <Type>Sender</Type>
+          <Code>ValidationError</Code>
+          <Message>Task instance group already exists in the job flow, cannot add more task groups</Message>
+        </Error>
+        <RequestId>0c8d744d-67ea-11e0-bf8a-ed57a5465c87</RequestId>
+      </ErrorResponse>
+
+    http_version: "1.1"

data/spec/lib/elasticity/emr_spec.rb

@@ -2,6 +2,118 @@ require 'spec_helper'
 
 describe Elasticity::EMR do
 
+  describe "#add_instance_groups" do
+
+    describe "integration happy path" do
+
+      context "when properly specified" do
+        use_vcr_cassette "add_instance_groups/one_group_successful", :record => :none
+        it "should add the instance groups" do
+          emr = Elasticity::EMR.new(ENV["aws_access_key_id"], ENV["aws_secret_key"])
+          instance_group_config = {
+            :count => 1,
+            :role => "TASK",
+            :type => "m1.small",
+            :market => "ON_DEMAND",
+            :name => "Go Canucks Go!"
+          }
+          instance_group_ids = emr.add_instance_groups("j-OALI7TZTQMHX", [instance_group_config])
+          instance_group_ids.should == ["ig-2GOVEN6HVJZID"]
+        end
+      end
+
+      context "when improperly specified" do
+        use_vcr_cassette "add_instance_groups/one_group_unsuccessful", :record => :none
+        it "should add the instance groups" do
+          emr = Elasticity::EMR.new(ENV["aws_access_key_id"], ENV["aws_secret_key"])
+          instance_group_config = {
+            :bid_price => 0,
+            :count => 1,
+            :role => "TASK",
+            :type => "m1.small",
+            :market => "ON_DEMAND",
+            :name => "Go Canucks Go!"
+          }
+          lambda {
+            emr.add_instance_groups("j-19WDDS68ZUENP", [instance_group_config])
+          }.should raise_error(ArgumentError, "Task instance group already exists in the job flow, cannot add more task groups")
+        end
+      end
+
+    end
+
+    describe "unit tests" do
+
+      context "when multiple instance groups are specified" do
+        before do
+          @add_instance_groups_xml = <<-ADD_GROUPS
+            <AddInstanceGroupsResponse xmlns="http://elasticmapreduce.amazonaws.com/doc/2009-03-31">
+              <AddInstanceGroupsResult>
+                <JobFlowId>j-OALI7TZTQMHX</JobFlowId>
+                <InstanceGroupIds>
+                  <member>ig-1</member>
+                  <member>ig-2</member>
+                  <member>ig-3</member>
+                </InstanceGroupIds>
+              </AddInstanceGroupsResult>
+            </AddInstanceGroupsResponse>
+          ADD_GROUPS
+        end
+
+        it "should iterate over them and send the correct params to AWS" do
+          instance_group_configs = [
+            {:type=>"m1.small", :role=>"CORE", :market=>"ON_DEMAND", :count=>1, :name=>"Go Canucks Go!", :bid_price=>0},
+            {:type=>"m1.small", :role=>"CORE", :market=>"ON_DEMAND", :count=>1, :name=>"Go Canucks Go!", :bid_price=>0},
+          ]
+          aws_request = Elasticity::AwsRequest.new("aws_access_key_id", "aws_secret_key")
+          aws_request.should_receive(:aws_emr_request).with({
+            "Operation" => "AddInstanceGroups",
+            "InstanceGroups.member.1.Name"=>"Go Canucks Go!",
+            "InstanceGroups.member.1.InstanceRole"=>"CORE",
+            "InstanceGroups.member.1.InstanceCount"=>1,
+            "InstanceGroups.member.1.BidPrice"=>0,
+            "InstanceGroups.member.1.InstanceType"=>"m1.small",
+            "InstanceGroups.member.1.Market"=>"ON_DEMAND",
+            "InstanceGroups.member.2.Name"=>"Go Canucks Go!",
+            "InstanceGroups.member.2.InstanceRole"=>"CORE",
+            "InstanceGroups.member.2.InstanceCount"=>1,
+            "InstanceGroups.member.2.BidPrice"=>0,
+            "InstanceGroups.member.2.InstanceType"=>"m1.small",
+            "InstanceGroups.member.2.Market"=>"ON_DEMAND",
+            "JobFlowId"=>"j-19WDDS68ZUENP"
+          })
+          Elasticity::AwsRequest.should_receive(:new).and_return(aws_request)
+          emr = Elasticity::EMR.new("aws_access_key_id", "aws_secret_key")
+          emr.add_instance_groups("j-19WDDS68ZUENP", instance_group_configs)
+        end
+
+        it "should return an array of the instance groups created" do
+          aws_request = Elasticity::AwsRequest.new("aws_access_key_id", "aws_secret_key")
+          aws_request.should_receive(:aws_emr_request).and_return(@add_instance_groups_xml)
+          Elasticity::AwsRequest.should_receive(:new).and_return(aws_request)
+          emr = Elasticity::EMR.new("aws_access_key_id", "aws_secret_key")
+          emr.add_instance_groups("", []).should == ["ig-1", "ig-2", "ig-3"]
+        end
+      end
+
+      context "when a block is provided" do
+        it "should yield the XML result" do
+          aws_request = Elasticity::AwsRequest.new("aws_access_key_id", "aws_secret_key")
+          aws_request.should_receive(:aws_emr_request).and_return("AWS XML")
+          Elasticity::AwsRequest.should_receive(:new).and_return(aws_request)
+          emr = Elasticity::EMR.new("aws_access_key_id", "aws_secret_key")
+          xml_result = nil
+          emr.add_instance_groups("", []) do |xml|
+            xml_result = xml
+          end
+          xml_result.should == "AWS XML"
+        end
+      end
+
+    end
+
+  end
+
   describe "#describe_jobflows" do
 
     describe "integration happy path" do
@@ -53,14 +165,14 @@ describe Elasticity::EMR do
       context "when a block is provided" do
         it "should yield the XML result" do
           aws_request = Elasticity::AwsRequest.new("aws_access_key_id", "aws_secret_key")
-          aws_request.should_receive(:aws_emr_request).with({"Operation" => "DescribeJobFlows"}).and_return(@describe_jobflows_xml)
+          aws_request.should_receive(:aws_emr_request).and_return("describe!")
           Elasticity::AwsRequest.should_receive(:new).and_return(aws_request)
           emr = Elasticity::EMR.new("aws_access_key_id", "aws_secret_key")
           xml_result = nil
           emr.describe_jobflows do |xml|
             xml_result = xml
           end
-          xml_result.should == @describe_jobflows_xml
+          xml_result.should == "describe!"
         end
       end
     end
@@ -82,7 +194,6 @@ describe Elasticity::EMR do
     describe "unit tests" do
 
       context "when the jobflow exists" do
-
         before do
           @terminate_jobflows_xml = <<-RESPONSE
             <TerminateJobFlowsResponse xmlns="http://elasticmapreduce.amazonaws.com/doc/2009-03-31">
@@ -92,7 +203,6 @@ describe Elasticity::EMR do
             </TerminateJobFlowsResponse>
           RESPONSE
         end
-
         it "should terminate the specific jobflow" do
           aws_request = Elasticity::AwsRequest.new("aws_access_key_id", "aws_secret_key")
           aws_request.should_receive(:aws_emr_request).with({
@@ -103,24 +213,6 @@ describe Elasticity::EMR do
           emr = Elasticity::EMR.new("aws_access_key_id", "aws_secret_key")
           emr.terminate_jobflows("j-1")
         end
-
-        context "when a block is given" do
-          it "should yield the XML result" do
-            aws_request = Elasticity::AwsRequest.new("aws_access_key_id", "aws_secret_key")
-            aws_request.should_receive(:aws_emr_request).with({
-              "Operation" => "TerminateJobFlows",
-              "JobFlowIds.member.1" => "j-1"
-            }).and_return(@terminate_jobflows_xml)
-            Elasticity::AwsRequest.should_receive(:new).and_return(aws_request)
-            emr = Elasticity::EMR.new("aws_access_key_id", "aws_secret_key")
-            xml_result = nil
-            emr.terminate_jobflows("j-1") do |xml|
-              xml_result = xml
-            end
-            xml_result.should == @terminate_jobflows_xml
-          end
-        end
-
       end
 
       context "when the jobflow does not exist" do
@@ -135,6 +227,20 @@ describe Elasticity::EMR do
         end
       end
 
+      context "when a block is given" do
+        it "should yield the XML result" do
+          aws_request = Elasticity::AwsRequest.new("aws_access_key_id", "aws_secret_key")
+          aws_request.should_receive(:aws_emr_request).and_return("terminated!")
+          Elasticity::AwsRequest.should_receive(:new).and_return(aws_request)
+          emr = Elasticity::EMR.new("aws_access_key_id", "aws_secret_key")
+          xml_result = nil
+          emr.terminate_jobflows("j-1") do |xml|
+            xml_result = xml
+          end
+          xml_result.should == "terminated!"
+        end
+      end
+
     end
   end
 
@@ -168,25 +274,16 @@ describe Elasticity::EMR do
       end
 
       context "when a block is given" do
-        before do
-          @modify_instance_groups_xml = <<-RESPONSE
-            <ModifyInstanceGroupsResponse xmlns="http://elasticmapreduce.amazonaws.com/doc/2009-03-31">
-              <ResponseMetadata>
-                <RequestId>4ef75373-659c-11e0-bdf6-e3d62a364c28</RequestId>
-              </ResponseMetadata>
-            </ModifyInstanceGroupsResponse>
-          RESPONSE
-        end
         it "should yield the XML result" do
           aws_request = Elasticity::AwsRequest.new("aws_access_key_id", "aws_secret_key")
-          aws_request.should_receive(:aws_emr_request).and_return(@modify_instance_groups_xml)
+          aws_request.should_receive(:aws_emr_request).and_return("xml result!")
           Elasticity::AwsRequest.should_receive(:new).and_return(aws_request)
           emr = Elasticity::EMR.new("aws_access_key_id", "aws_secret_key")
           xml_result = nil
-          emr.modify_instance_groups({"ig-1" => 2})  do |xml|
+          emr.modify_instance_groups({"ig-1" => 2}) do |xml|
             xml_result = xml
           end
-          xml_result.should == @modify_instance_groups_xml
+          xml_result.should == "xml result!"
         end
       end
 

metadata

@@ -1,12 +1,12 @@
 --- !ruby/object:Gem::Specification 
 name: elasticity
 version: !ruby/object:Gem::Version 
-  hash: 3
+  hash: 1
   prerelease: 
   segments: 
   - 0
-  - 4
-  version: "0.4"
+  - 5
+  version: "0.5"
 platform: ruby
 authors: 
 - Robert Slifka
@@ -14,7 +14,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2011-04-13 00:00:00 -07:00
+date: 2011-04-16 00:00:00 -07:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -128,6 +128,8 @@ files:
 - lib/elasticity/emr.rb
 - lib/elasticity/job_flow.rb
 - lib/elasticity/version.rb
+- spec/fixtures/vcr_cassettes/add_instance_groups/one_group_successful.yml
+- spec/fixtures/vcr_cassettes/add_instance_groups/one_group_unsuccessful.yml
 - spec/fixtures/vcr_cassettes/describe_jobflows/all_jobflows.yml
 - spec/fixtures/vcr_cassettes/direct/terminate_jobflow.yml
 - spec/fixtures/vcr_cassettes/modify_instance_groups/set_instances_to_3.yml
@@ -171,6 +173,8 @@ signing_key:
 specification_version: 3
 summary: Programmatic access to Amazon's Elastic Map Reduce service.
 test_files: 
+- spec/fixtures/vcr_cassettes/add_instance_groups/one_group_successful.yml
+- spec/fixtures/vcr_cassettes/add_instance_groups/one_group_unsuccessful.yml
 - spec/fixtures/vcr_cassettes/describe_jobflows/all_jobflows.yml
 - spec/fixtures/vcr_cassettes/direct/terminate_jobflow.yml
 - spec/fixtures/vcr_cassettes/modify_instance_groups/set_instances_to_3.yml