RubyGems - elasticity - Versions diffs - 0.6 → 1.0 - Mend

elasticity 0.6 → 1.0

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.

Files changed (11) hide show

data/README.mediawiki +33 -11
data/lib/elasticity.rb +1 -0
data/lib/elasticity/emr.rb +100 -15
data/lib/elasticity/job_flow.rb +8 -2
data/lib/elasticity/job_flow_step.rb +32 -0
data/lib/elasticity/version.rb +1 -1
data/spec/fixtures/vcr_cassettes/add_jobflow_steps/add_multiple_steps.yml +252 -0
data/spec/lib/elasticity/emr_spec.rb +131 -0
data/spec/lib/elasticity/job_flow_spec.rb +27 -7
data/spec/lib/elasticity/job_flow_step_spec.rb +61 -0
metadata +9 -4

data/README.mediawiki CHANGED Viewed

@@ -54,7 +54,29 @@ Some combinations of the options will be rejected by Amazon and some once-valid
 == AddJobFlowSteps ==
-''(not yet supported)''
+AddJobFlowSteps adds the specified steps to the specified job flow.
+<pre>
+  emr = Elasticity::EMR.new(ENV["AWS_ACCESS_KEY_ID"], ENV["AWS_SECRET_KEY"])
+  jobflow_id = emr.run_job_flow(...)
+  emr.add_jobflow_steps(jobflow_id, {
+    :steps => [
+      {
+        :action_on_failure => "TERMINATE_JOB_FLOW",
+        :hadoop_jar_step => {
+          :args => [
+            "s3://elasticmapreduce/libs/pig/pig-script",
+            "--base-path",
+            "s3://elasticmapreduce/libs/pig/",
+            "--install-pig"
+          ],
+          :jar => "s3://elasticmapreduce/libs/script-runner/script-runner.jar"
+        },
+        :name => "Setup Pig"
+      }
+    ]
+  })
+</pre>
 == DescribeJobFlows ==
@@ -119,9 +141,9 @@ RunJobFlow creates and starts a new job flow.  Specifying the arguments to RunJo
         :hadoop_jar_step => {
           :args => [
             "s3://elasticmapreduce/libs/pig/pig-script",
-              "--base-path",
-              "s3://elasticmapreduce/libs/pig/",
-              "--install-pig"
+            "--base-path",
+            "s3://elasticmapreduce/libs/pig/",
+            "--install-pig"
           ],
           :jar => "s3://elasticmapreduce/libs/script-runner/script-runner.jar"
         },
@@ -132,13 +154,13 @@ RunJobFlow creates and starts a new job flow.  Specifying the arguments to RunJo
           :hadoop_jar_step => {
             :args => [
               "s3://elasticmapreduce/libs/pig/pig-script",
-                "--run-pig-script",
-                "--args",
-                "-p",
-                "INPUT=s3n://elasticmapreduce/samples/pig-apache/input",
-                "-p",
-                "OUTPUT=s3n://slif-elasticity/pig-apache/output/2011-04-19",
-                "s3n://elasticmapreduce/samples/pig-apache/do-reports.pig"
+              "--run-pig-script",
+              "--args",
+              "-p",
+              "INPUT=s3n://elasticmapreduce/samples/pig-apache/input",
+              "-p",
+              "OUTPUT=s3n://slif-elasticity/pig-apache/output/2011-04-19",
+              "s3n://elasticmapreduce/samples/pig-apache/do-reports.pig"
             ],
             :jar => "s3://elasticmapreduce/libs/script-runner/script-runner.jar"
           },

data/lib/elasticity.rb CHANGED Viewed

@@ -6,6 +6,7 @@ require 'nokogiri'
 require 'elasticity/aws_request'
 require 'elasticity/emr'
 require 'elasticity/job_flow'
+require 'elasticity/job_flow_step'
 module Elasticity
 end

data/lib/elasticity/emr.rb CHANGED Viewed

@@ -20,20 +20,19 @@ module Elasticity
     # 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,
-    #   :instance_count => 1,
-    #   :instance_role => "TASK",
-    #   :market => "SPOT",
-    #   :name => "Go Canucks Go!"
-    #   :type => "m1.small",
-    # }
+    #   instance_group_config = {
+    #     :bid_price => 5,
+    #     :instance_count => 1,
+    #     :instance_role => "TASK",
+    #     :market => "SPOT",
+    #     :name => "Go Canucks Go!"
+    #     :type => "m1.small",
+    #   }
     #
-    # add_instance_groups takes an array of {}.
-    #
-    # Returns an array of the instance IDs that were created by the specified configs.
+    # 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", ...]
+    #   ["ig-2GOVEN6HVJZID", "ig-1DU9M2UQMM051", "ig-3DZRW4Y2X4S", ...]
     def add_instance_groups(jobflow_id, instance_group_configs)
       params = {
         :operation => "AddInstanceGroups",
@@ -55,6 +54,38 @@ module Elasticity
       end
     end
+    # Add a step (or steps) to the specified job flow.
+    #
+    #   emr.add_jobflow_step("j-123", {
+    #     :steps => [
+    #       {
+    #         :action_on_failure => "TERMINATE_JOB_FLOW",
+    #         :hadoop_jar_step => {
+    #           :args => [
+    #             "s3://elasticmapreduce/libs/pig/pig-script",
+    #               "--base-path",
+    #               "s3://elasticmapreduce/libs/pig/",
+    #               "--install-pig"
+    #           ],
+    #           :jar => "s3://elasticmapreduce/libs/script-runner/script-runner.jar"
+    #         },
+    #         :name => "Setup Pig"
+    #       }
+    #     ]
+    #   })
+    def add_jobflow_steps(jobflow_id, steps_config)
+      params = {
+        :operation => "AddJobFlowSteps",
+        :job_flow_id => jobflow_id
+      }.merge!(steps_config)
+      begin
+        aws_result = @aws_request.aws_emr_request(EMR.convert_ruby_to_aws(params))
+        yield aws_result if block_given?
+      rescue RestClient::BadRequest => e
+        raise ArgumentError, EMR.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
@@ -62,7 +93,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",
@@ -76,7 +107,61 @@ module Elasticity
       end
     end
-    # TODO DOCUMENT ME
+    # Start a job flow with the specified configuration.  This is a very thin
+    # wrapper around the AWS API, so in order to use it directly you'll need
+    # to have the PDF API reference handy, which can be found here:
+    #
+    # http://awsdocs.s3.amazonaws.com/ElasticMapReduce/20090331/emr-api-20090331.pdf
+    #
+    # Here is a sample job flow configuration that should help.  This job flow
+    # starts by installing Pig then running a Pig script.  It is based off of the
+    # Pig demo script from Amazon.
+    #
+    #   emr.run_job_flow({
+    #     :name => "Elasticity Test Flow (EMR Pig Script)",
+    #     :instances => {
+    #       :ec2_key_name => "sharethrough-dev",
+    #       :hadoop_version => "0.20",
+    #       :instance_count => 2,
+    #       :master_instance_type => "m1.small",
+    #       :placement => {
+    #         :availability_zone => "us-east-1a"
+    #       },
+    #       :slave_instance_type => "m1.small",
+    #     },
+    #     :steps => [
+    #       {
+    #         :action_on_failure => "TERMINATE_JOB_FLOW",
+    #         :hadoop_jar_step => {
+    #           :args => [
+    #             "s3://elasticmapreduce/libs/pig/pig-script",
+    #               "--base-path",
+    #               "s3://elasticmapreduce/libs/pig/",
+    #               "--install-pig"
+    #           ],
+    #           :jar => "s3://elasticmapreduce/libs/script-runner/script-runner.jar"
+    #         },
+    #         :name => "Setup Pig"
+    #       },
+    #         {
+    #           :action_on_failure => "TERMINATE_JOB_FLOW",
+    #           :hadoop_jar_step => {
+    #             :args => [
+    #               "s3://elasticmapreduce/libs/pig/pig-script",
+    #                 "--run-pig-script",
+    #                 "--args",
+    #                 "-p",
+    #                 "INPUT=s3n://elasticmapreduce/samples/pig-apache/input",
+    #                 "-p",
+    #                 "OUTPUT=s3n://slif-elasticity/pig-apache/output/2011-04-19",
+    #                 "s3n://elasticmapreduce/samples/pig-apache/do-reports.pig"
+    #             ],
+    #             :jar => "s3://elasticmapreduce/libs/script-runner/script-runner.jar"
+    #           },
+    #           :name => "Run Pig Script"
+    #         }
+    #     ]
+    #   })
     def run_job_flow(job_flow_config)
       params = {
         :operation => "RunJobFlow",
@@ -99,7 +184,7 @@ module Elasticity
     #
     # Takes an [] of job flow IDs.
     #
-    # ["j-1B4D1XP0C0A35", "j-1YG2MYL0HVYS5", ...]
+    #   ["j-1B4D1XP0C0A35", "j-1YG2MYL0HVYS5", ...]
     def set_termination_protection(jobflow_ids, protection_enabled=true)
       params = {
         :operation => "SetTerminationProtection",

data/lib/elasticity/job_flow.rb CHANGED Viewed

@@ -5,21 +5,27 @@ module Elasticity
     attr_accessor :name
     attr_accessor :jobflow_id
     attr_accessor :state
+    attr_accessor :steps
+    def initialize
+      @steps = []
+    end
     class << self
       # Create a jobflow from an AWS <member> (Nokogiri::XML::Element):
-      #  /DescribeJobFlowsResponse/DescribeJobFlowsResult/JobFlows/member
+      #   /DescribeJobFlowsResponse/DescribeJobFlowsResult/JobFlows/member
       def from_member_element(xml_element)
         jobflow = JobFlow.new
         jobflow.name = xml_element.xpath("./Name").text
         jobflow.jobflow_id = xml_element.xpath("./JobFlowId").text
         jobflow.state = xml_element.xpath("./ExecutionStatusDetail/State").text
+        jobflow.steps = JobFlowStep.from_members_nodeset(xml_element.xpath("./Steps/member"))
         jobflow
       end
       # Create JobFlows from a collection of AWS <member> nodes (Nokogiri::XML::NodeSet):
-      #  /DescribeJobFlowsResponse/DescribeJobFlowsResult/JobFlows
+      #   /DescribeJobFlowsResponse/DescribeJobFlowsResult/JobFlows
       def from_members_nodeset(members_nodeset)
         jobflows = []
         members_nodeset.each do |member|

data/lib/elasticity/job_flow_step.rb ADDED Viewed

@@ -0,0 +1,32 @@
+module Elasticity
+  class JobFlowStep
+    attr_accessor :name
+    attr_accessor :state
+    class << self
+      # Create a job flow from an AWS <member> (Nokogiri::XML::Element):
+      #   /DescribeJobFlowsResponse/DescribeJobFlowsResult/JobFlows/member/Steps/member
+      def from_member_element(xml_element)
+        job_flow_step = JobFlowStep.new
+        job_flow_step.name = xml_element.xpath("./StepConfig/Name").text
+        job_flow_step.state = xml_element.xpath("./ExecutionStatusDetail/State").text
+        job_flow_step
+      end
+      # Create JobFlowSteps from a collection of AWS <member> nodes (Nokogiri::XML::NodeSet):
+      #   /DescribeJobFlowsResponse/DescribeJobFlowsResult/JobFlows/member/Steps/member
+      def from_members_nodeset(members_nodeset)
+        jobflow_steps = []
+        members_nodeset.each do |member|
+          jobflow_steps << from_member_element(member)
+        end
+        jobflow_steps
+      end
+    end
+  end
+end

data/lib/elasticity/version.rb CHANGED Viewed

@@ -1,3 +1,3 @@
 module Elasticity
-  VERSION = "0.6"
+  VERSION = "1.0"
 end

data/spec/fixtures/vcr_cassettes/add_jobflow_steps/add_multiple_steps.yml ADDED Viewed

@@ -0,0 +1,252 @@
+---
+- !ruby/struct:VCR::HTTPInteraction
+  request: !ruby/struct:VCR::Request
+    method: :get
+    uri: !ruby/regexp /^http:\/\/elasticmapreduce.amazonaws.com:80\/\?.*Operation=RunJobFlow/
+    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:
+      - 71b9eb69-6d61-11e0-9ddc-a168e244afdb
+      content-type:
+      - text/xml
+      date:
+      - Sat, 23 Apr 2011 04:23:30 GMT
+      content-length:
+      - "296"
+    body: |
+      <RunJobFlowResponse xmlns="http://elasticmapreduce.amazonaws.com/doc/2009-03-31">
+        <RunJobFlowResult>
+          <JobFlowId>j-F0UCD5851OKV</JobFlowId>
+        </RunJobFlowResult>
+        <ResponseMetadata>
+          <RequestId>71b9eb69-6d61-11e0-9ddc-a168e244afdb</RequestId>
+        </ResponseMetadata>
+      </RunJobFlowResponse>
+    http_version: "1.1"
+- !ruby/struct:VCR::HTTPInteraction
+  request: !ruby/struct:VCR::Request
+    method: :get
+    uri: !ruby/regexp /^http:\/\/elasticmapreduce.amazonaws.com:80\/\?.*Operation=AddJobFlowSteps/
+    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:
+      - 71e1712c-6d61-11e0-b6c0-e9580d1f7304
+      content-type:
+      - text/xml
+      date:
+      - Sat, 23 Apr 2011 04:23:31 GMT
+      content-length:
+      - "221"
+    body: |
+      <AddJobFlowStepsResponse xmlns="http://elasticmapreduce.amazonaws.com/doc/2009-03-31">
+        <ResponseMetadata>
+          <RequestId>71e1712c-6d61-11e0-b6c0-e9580d1f7304</RequestId>
+        </ResponseMetadata>
+      </AddJobFlowStepsResponse>
+    http_version: "1.1"
+- !ruby/struct:VCR::HTTPInteraction
+  request: !ruby/struct:VCR::Request
+    method: :get
+    uri: !ruby/regexp /^http:\/\/elasticmapreduce.amazonaws.com:80\/\?.*Operation=DescribeJobFlows/
+    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:
+      - 720bb591-6d61-11e0-8835-2b8f31bf243b
+      content-type:
+      - text/xml
+      date:
+      - Sat, 23 Apr 2011 04:23:31 GMT
+      content-encoding:
+      - gzip
+      vary:
+      - Accept-Encoding
+      transfer-encoding:
+      - chunked
+    body: !binary |
+      H4sIAAAAAAAAAO1dWXPiSrJ+n1/Bnae5D2pq0Up4fINFbGaXWMxLhwC5zRwM
+      DEv3eH79LUnGBhlQIRCSoCJ6ek4jVVaqlJmV36eqrIecuRwuxgOzPBvkJ7M/
+      y5a5nM+mSzPxn7fJdPnPv7+uVvNUMmlOjOVqPHwz5gtztB6aP4w347+zqfFn
+      +WM4e0uOZsMkAkDhAOYw/Pvj3xKJhz2S15OVdYlc3Pzo/JP88Ga+DczF5p/k
+      B/U/5nC9Gs+m2spYrZc5c2WMJ1/XyR3ZhWlYN+SMlamP38xHBCDkAM8hrAM+
+      hXAKg/5D8ttt2zIs4eajpqdbeqlWeEg6//7SIumhxkNmNlstVwtjnh5ady2T
+      W9dqBulNdUZuvHpP6OZylbAeO/EPtdpKNMa/EhoZovnqfx+S9r1/29LLnC93
+      NHUP0Odt2dn0Zfxr9wK5VDRGs9m8bCyse9xXrTdgLB6XeM+rTU7Gg2VyaSvG
+      LdbTqbnY/dePfxmLh6TV/rvU9OLX8vvPX+of6XE+/mX9j3P6ekjue+BdYRw3
+      MJYmNzdWrzS3e/RN1+N4ulwZkwlHWhxu8JDcPw4PjcVsbi5WY3PbTjZtjr4x
+      x5g0c7WeW4bjNpjN8NtGWJ/miZGuF+ajrraqpVpaV3+W65mf+Uq9S1Rz3bNr
+      UclDJuXtkPZdF3BKW47jiA21ltvnl46q3iFizxtijvRd2B07UgLF2ZUgcyXm
+      SpFxJcxcyZ8rOc+39XI2+XFp9PgvLg/a2ZwgC7D+1CE2/nnl6+6SZQDTobmb
+      MWoT47e5uaS/z83HN/hj+UYshfT37dp2y8bEGJpv5nS1YxGf3RQWs/XcZUp7
+      Y8EF84FN3y3i7uPpr+xsPV09gofk3t8PvLZWvVPSSvXaoXe33Y357zXJ1h1x
+      cKub7d8PNXaN9aFhtttUjcVf5uqxXvuZU6vpWu4h+fGL+8YKiRG2ztlXY/qL
+      KGIsZ9PvHvup6GxiPlbTGvG1Le2tHw+1sN8qMSsS7mCjVJAh0oppWRK+mm/u
+      2BsG3oh+5mJfBNgfk5jBRNBgsvWWerq5oGcIu6ibxVpRA5TmsrQCEK21uGTu
+      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
+      9yph3/P4t/8HTfYMqCsnAgA=
+    http_version: "1.1"

data/spec/lib/elasticity/emr_spec.rb CHANGED Viewed

@@ -117,6 +117,137 @@ describe Elasticity::EMR do
   end
+  describe "#add_jobflow_steps" do
+    describe "integration happy path" do
+      use_vcr_cassette "add_jobflow_steps/add_multiple_steps", :record => :none
+      before do
+        @setup_pig_step = {
+          :action_on_failure => "TERMINATE_JOB_FLOW",
+          :hadoop_jar_step => {
+            :args => [
+              "s3://elasticmapreduce/libs/pig/pig-script",
+                "--base-path",
+                "s3://elasticmapreduce/libs/pig/",
+                "--install-pig"
+            ],
+            :jar => "s3://elasticmapreduce/libs/script-runner/script-runner.jar"
+          },
+          :name => "Setup Pig"
+        }
+        @emr = Elasticity::EMR.new(AWS_ACCESS_KEY_ID, AWS_SECRET_KEY)
+        @jobflow_id = @emr.run_job_flow({
+          :name => "Elasticity Test Flow (EMR Pig Script)",
+          :instances => {
+            :ec2_key_name => "sharethrough-dev",
+            :instance_count => 2,
+            :master_instance_type => "m1.small",
+            :slave_instance_type => "m1.small",
+          },
+          :steps => [@setup_pig_step]
+        })
+      end
+      it "should add a job flow step to the specified job flow" do
+        @emr.add_jobflow_steps(@jobflow_id, {
+          :steps => [
+            @setup_pig_step.merge(:name => "Setup Pig 2"),
+              @setup_pig_step.merge(:name => "Setup Pig 3")
+          ]
+        })
+        jobflow = @emr.describe_jobflows.select { |jf| jf.jobflow_id = @jobflow_id }.first
+        jobflow.steps.map(&:name).should == ["Setup Pig", "Setup Pig 2", "Setup Pig 3"]
+      end
+    end
+    describe "unit tests" do
+      it "should add the specified steps to the job flow" do
+        aws_request = Elasticity::AwsRequest.new(AWS_ACCESS_KEY_ID, AWS_SECRET_KEY)
+        aws_request.should_receive(:aws_emr_request).with({
+          "Operation" => "AddJobFlowSteps",
+          "JobFlowId" => "j-1",
+          "Steps.member.1.Name" => "Step 1",
+          "Steps.member.1.ActionOnFailure" => "TERMINATE_JOB_FLOW",
+          "Steps.member.1.HadoopJarStep.Jar" => "jar1",
+          "Steps.member.1.HadoopJarStep.Args.member.1" => "arg1-1",
+          "Steps.member.1.HadoopJarStep.Args.member.2" => "arg1-2",
+          "Steps.member.2.Name" => "Step 2",
+          "Steps.member.2.ActionOnFailure" => "CONTINUE",
+          "Steps.member.2.HadoopJarStep.Jar" => "jar2",
+          "Steps.member.2.HadoopJarStep.Args.member.1" => "arg2-1",
+          "Steps.member.2.HadoopJarStep.Args.member.2" => "arg2-2",
+        })
+        Elasticity::AwsRequest.should_receive(:new).and_return(aws_request)
+        emr = Elasticity::EMR.new(AWS_ACCESS_KEY_ID, AWS_SECRET_KEY)
+        emr.add_jobflow_steps("j-1", {
+          :steps => [
+            {
+              :action_on_failure => "TERMINATE_JOB_FLOW",
+              :name => "Step 1",
+              :hadoop_jar_step => {
+                :args => ["arg1-1", "arg1-2"],
+                :jar => "jar1",
+              }
+            },
+              {
+                :action_on_failure => "CONTINUE",
+                :name => "Step 2",
+                :hadoop_jar_step => {
+                  :args => ["arg2-1", "arg2-2"],
+                  :jar => "jar2",
+                }
+              }
+          ]
+        })
+      end
+      context "when there is an error" do
+        before do
+          @error_message = "2 validation errors detected: Value null at 'steps' failed to satisfy constraint: Member must not be null; Value null at 'jobFlowId' failed to satisfy constraint: Member must not be null"
+          @error_xml = <<-ERROR
+            <ErrorResponse xmlns="http://elasticmapreduce.amazonaws.com/doc/2009-03-31">
+              <Error>
+                <Message>#{@error_message}</Message>
+              </Error>
+            </ErrorResponse>
+          ERROR
+        end
+        it "should raise an ArgumentError with the error message" do
+          aws_request = Elasticity::AwsRequest.new("aws_access_key_id", "aws_secret_key")
+          @exception = RestClient::BadRequest.new
+          @exception.should_receive(:http_body).and_return(@error_xml)
+          aws_request.should_receive(:aws_emr_request).and_raise(@exception)
+          Elasticity::AwsRequest.should_receive(:new).and_return(aws_request)
+          emr = Elasticity::EMR.new("aws_access_key_id", "aws_secret_key")
+          lambda {
+            emr.add_jobflow_steps("", {})
+          }.should raise_error(ArgumentError, @error_message)
+        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("xml_response")
+          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_jobflow_steps("", {}) do |xml|
+            xml_result = xml
+          end
+          xml_result.should == "xml_response"
+        end
+      end
+    end
+  end
   describe "#describe_jobflows" do
     describe "integration happy path" do

data/spec/lib/elasticity/job_flow_spec.rb CHANGED Viewed

@@ -8,26 +8,44 @@ describe Elasticity::JobFlow do
         <DescribeJobFlowsResult>
           <JobFlows>
             <member>
+              <JobFlowId>j-p</JobFlowId>
+              <Name>Pig Job</Name>
               <ExecutionStatusDetail>
                 <State>TERMINATED</State>
               </ExecutionStatusDetail>
-              <JobFlowId>j-p</JobFlowId>
-              <Name>Pig Job</Name>
+              <Steps>
+                <member>
+                  <StepConfig>
+                    <Name>Setup Hive</Name>
+                  </StepConfig>
+                  <ExecutionStatusDetail>
+                    <State>FAILED</State>
+                  </ExecutionStatusDetail>
+                </member>
+                <member>
+                  <StepConfig>
+                    <Name>Run Hive Script</Name>
+                  </StepConfig>
+                  <ExecutionStatusDetail>
+                    <State>PENDING</State>
+                  </ExecutionStatusDetail>
+                </member>
+              </Steps>
             </member>
             <member>
+              <JobFlowId>j-h</JobFlowId>
+              <Name>Hive Job</Name>
               <ExecutionStatusDetail>
                 <State>TERMINATED</State>
               </ExecutionStatusDetail>
-              <JobFlowId>j-h</JobFlowId>
-              <Name>Hive Job</Name>
             </member>
           </JobFlows>
         </DescribeJobFlowsResult>
       </DescribeJobFlowsResponse>
     JOBFLOWS
-    @describe_jobflows_document = Nokogiri::XML(describe_jobflows_xml)
-    @describe_jobflows_document.remove_namespaces!
-    @members_nodeset = @describe_jobflows_document.xpath('/DescribeJobFlowsResponse/DescribeJobFlowsResult/JobFlows/member')
+    describe_jobflows_document = Nokogiri::XML(describe_jobflows_xml)
+    describe_jobflows_document.remove_namespaces!
+    @members_nodeset = describe_jobflows_document.xpath('/DescribeJobFlowsResponse/DescribeJobFlowsResult/JobFlows/member')
   end
   describe ".from_xml" do
@@ -36,6 +54,8 @@ describe Elasticity::JobFlow do
       jobflow.name.should == "Pig Job"
       jobflow.jobflow_id.should == "j-p"
       jobflow.state.should == "TERMINATED"
+      jobflow.steps.map(&:name).should == ["Setup Hive", "Run Hive Script"]
+      jobflow.steps.map(&:state).should == ["FAILED", "PENDING"]
     end
   end

data/spec/lib/elasticity/job_flow_step_spec.rb ADDED Viewed

@@ -0,0 +1,61 @@
+require 'spec_helper'
+describe Elasticity::JobFlowStep do
+  before do
+    describe_jobflows_xml = <<-JOBFLOWS
+      <DescribeJobFlowsResponse xmlns="http://elasticmapreduce.amazonaws.com/doc/2009-03-31">
+        <DescribeJobFlowsResult>
+          <JobFlows>
+            <member>
+              <JobFlowId>j-p</JobFlowId>
+              <Name>Pig Job</Name>
+              <ExecutionStatusDetail>
+                <State>TERMINATED</State>
+              </ExecutionStatusDetail>
+              <Steps>
+                <member>
+                  <StepConfig>
+                    <Name>Setup Hive</Name>
+                  </StepConfig>
+                  <ExecutionStatusDetail>
+                    <State>FAILED</State>
+                  </ExecutionStatusDetail>
+                </member>
+                <member>
+                  <StepConfig>
+                    <Name>Run Hive Script</Name>
+                  </StepConfig>
+                  <ExecutionStatusDetail>
+                    <State>PENDING</State>
+                  </ExecutionStatusDetail>
+                </member>
+              </Steps>
+            </member>
+          </JobFlows>
+        </DescribeJobFlowsResult>
+      </DescribeJobFlowsResponse>
+    JOBFLOWS
+    describe_jobflows_document = Nokogiri::XML(describe_jobflows_xml)
+    describe_jobflows_document.remove_namespaces!
+    @members_nodeset = describe_jobflows_document.xpath('/DescribeJobFlowsResponse/DescribeJobFlowsResult/JobFlows/member/Steps/member')
+  end
+  describe ".from_xml" do
+    it "should return a JobFlowStep with the appropriate fields initialized" do
+      jobflow_step = Elasticity::JobFlowStep.from_member_element(@members_nodeset[0])
+      jobflow_step.name.should == "Setup Hive"
+      jobflow_step.state.should == "FAILED"
+    end
+  end
+  describe ".from_steps_nodeset" do
+    it "should return JobFlowSteps with the appropriate fields initialized" do
+      jobflow_steps = Elasticity::JobFlowStep.from_members_nodeset(@members_nodeset)
+      jobflow_steps.map(&:name).should == ["Setup Hive", "Run Hive Script"]
+      jobflow_steps.map(&:state).should == ["FAILED", "PENDING"]
+    end
+  end
+end

metadata CHANGED Viewed

@@ -1,12 +1,12 @@
 --- !ruby/object:Gem::Specification
 name: elasticity
 version: !ruby/object:Gem::Version
-  hash: 7
+  hash: 15
   prerelease:
   segments:
+  - 1
   - 0
-  - 6
-  version: "0.6"
+  version: "1.0"
 platform: ruby
 authors:
 - Robert Slifka
@@ -14,7 +14,7 @@ autorequire:
 bindir: bin
 cert_chain: []
-date: 2011-04-18 00:00:00 -07:00
+date: 2011-04-22 00:00:00 -07:00
 default_executable:
 dependencies:
 - !ruby/object:Gem::Dependency
@@ -127,9 +127,11 @@ files:
 - lib/elasticity/aws_request.rb
 - lib/elasticity/emr.rb
 - lib/elasticity/job_flow.rb
+- lib/elasticity/job_flow_step.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/add_jobflow_steps/add_multiple_steps.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
@@ -140,6 +142,7 @@ files:
 - spec/lib/elasticity/aws_request_spec.rb
 - spec/lib/elasticity/emr_spec.rb
 - spec/lib/elasticity/job_flow_spec.rb
+- spec/lib/elasticity/job_flow_step_spec.rb
 - spec/spec_helper.rb
 has_rdoc: true
 homepage: http://www.github.com/rslifka/elasticity
@@ -178,6 +181,7 @@ 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/add_jobflow_steps/add_multiple_steps.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
@@ -188,4 +192,5 @@ test_files:
 - spec/lib/elasticity/aws_request_spec.rb
 - spec/lib/elasticity/emr_spec.rb
 - spec/lib/elasticity/job_flow_spec.rb
+- spec/lib/elasticity/job_flow_step_spec.rb
 - spec/spec_helper.rb