elasticity 4.0 → 4.0.1

checksums.yaml

@@ -1,15 +1,15 @@
 ---
 !binary "U0hBMQ==":
   metadata.gz: !binary |-
-    MmZlODg3MzM2NmYzOGQyZjdiYjcyZjZkNTA2MThmMWZlZTQzYmM5Mw==
+    ODg5Y2I0ODUyNGUyYmViNDA4Y2NiM2ZiYmMzNGI5OTM4YzFhNGFlZQ==
   data.tar.gz: !binary |-
-    ODA1ZWJiMDM5YzQ5YTBjY2Y3MzY0NGFmY2Y5MTA3MWFjNjAxNTUzNA==
+    MzE3ZTQ1Y2M0ZWM5NzE3NjEyNzE3NDNkNGNkZjQ4ZTUwOGRiYmI0Yw==
 SHA512:
   metadata.gz: !binary |-
-    OGRjMjY3Y2M3MWQxNTRjNmJiNDM1NGI3YTAyNDc5NTUxYmY2MjNkYzk0YmJj
-    ZjcxMDExYWNlMzY1M2MxODVkMWUyMmM5NmFhYzJjZTdlNmU5YmJmYzU4MWFj
-    YWIzM2ZkN2U3ZTZhMmZmYjc1NWYyODYzZjY1OTgyYjAxZTM4M2E=
+    YjgxOGQ4ZGU4ZTQ5ODlmMTk3NGI4MTFiMjEyNDUzMWQ1NWE5N2I5OTFhMjZj
+    NWE3M2I3MmM4NzhhNzNjNzRkNGQyMzgzYjczMjkyZDBkNDNhMzljNTQzYmIx
+    YWRiNzQyYjBkNjZhN2JlOWZmMDI1MzU2ZjIyNDg5ZDk0NGM0NGY=
   data.tar.gz: !binary |-
-    OWNjMjg3ZTI5NzJhNWVhZmQ2NDg0ZDViZmRhMDEwYWQ1ZTI4YWJjNTEwODE1
-    YmFjNzRlYWFjZTM4YjNhOTE2ZjhjNjQxOTE3MDI3ZDUyMTFjNGJkOTUwOGY5
-    NzlkZTQ4NjE1Nzk5MzE5M2VmOWMyMGEyM2RhYjM0ZGY4M2FmYWU=
+    YjNlZTMwYTA2ZTBkYmIxMDBhYmFhNDQ1OTNlOTJjOTM0Y2M1ZmE0MmFkZjM2
+    ZDhjYmEwZjkyNDA0MWZlM2YxZjE1NmNjMmU0Mjc3ZjNkNjNlOTZhYWZiZTQ4
+    NDY3NmYzZDZjNGI1OWJiMWU5Nzc1NWU5ZGI5ZWQxNzY2NTY4NzQ=

data/HISTORY.md

@@ -1,3 +1,7 @@
+## 4.0.1 - September 4, 2014
+
+- Now tracking the Master Instance ID and Created At timestamp for job flows and steps, via @AuraBorea (Thanks!) [#73](https://github.com/rslifka/elasticity/issues/73).
+
 ## 4.0 - May 21, 2014
 
 - Fix for issue [#69](https://github.com/rslifka/elasticity/issues/69).  The AWS region was previously being derived from the placement.  With the advent of VPC/subnet IDs being set, placement is not always relevant (as the VPC subnet ID implicitly defines a placement).  Since region cannot be derived it is now available directly on `JobFlow`.

data/lib/elasticity/job_flow_status.rb

@@ -13,6 +13,7 @@ module Elasticity
     attr_accessor :duration
     attr_accessor :instance_count
     attr_accessor :master_instance_type
+    attr_accessor :master_instance_id
     attr_accessor :slave_instance_type
     attr_accessor :last_state_change_reason
     attr_accessor :installed_steps
@@ -58,6 +59,8 @@ module Elasticity
 
       jobflow_status.instance_count = xml_element.xpath('./Instances/InstanceCount').text.strip
       jobflow_status.master_instance_type = xml_element.xpath('./Instances/MasterInstanceType').text.strip
+      master_instance_id = xml_element.xpath('./Instances/MasterInstanceId').text.strip
+      jobflow_status.master_instance_id = (master_instance_id == '') ? (nil) : (master_instance_id)
       jobflow_status.slave_instance_type = xml_element.xpath('./Instances/SlaveInstanceType').text.strip
 
       master_public_dns_name = xml_element.xpath('./Instances/MasterPublicDnsName').text.strip

data/lib/elasticity/job_flow_status_step.rb

@@ -4,6 +4,7 @@ module Elasticity
 
     attr_accessor :name
     attr_accessor :state
+    attr_accessor :created_at
     attr_accessor :started_at
     attr_accessor :ended_at
 
@@ -13,10 +14,12 @@ module Elasticity
       job_flow_step = JobFlowStatusStep.new
       job_flow_step.name = xml_element.xpath('./StepConfig/Name').text.strip
       job_flow_step.state = xml_element.xpath('./ExecutionStatusDetail/State').text.strip
+      created_at = xml_element.xpath('./ExecutionStatusDetail/CreationDateTime').text.strip
+      job_flow_step.created_at = (created_at == '') ? (nil) : (Time.parse(created_at))
       started_at = xml_element.xpath('./ExecutionStatusDetail/StartDateTime').text.strip
       job_flow_step.started_at = (started_at == '') ? (nil) : (Time.parse(started_at))
       ended_at = xml_element.xpath('./ExecutionStatusDetail/EndDateTime').text.strip
-      job_flow_step.ended_at = (ended_at == "") ? (nil) : (Time.parse(ended_at))
+      job_flow_step.ended_at = (ended_at == '') ? (nil) : (Time.parse(ended_at))
       job_flow_step
     end
 

data/lib/elasticity/version.rb

@@ -1,3 +1,3 @@
 module Elasticity
-  VERSION = '4.0'
+  VERSION = '4.0.1'
 end

data/spec/lib/elasticity/job_flow_status_spec.rb

@@ -88,6 +88,9 @@ describe Elasticity::JobFlowStatus do
                  <SlaveInstanceType>
                     m1.small
                  </SlaveInstanceType>
+                 <MasterInstanceId>
+                    i-15a4417c
+                 </MasterInstanceId>
                  <MasterInstanceType>
                     m1.small
                  </MasterInstanceType>
@@ -164,6 +167,7 @@ describe Elasticity::JobFlowStatus do
       single_jobflow_status.ready_at.should == Time.parse('2011-10-04T21:49:18Z')
       single_jobflow_status.ended_at.should == Time.parse('2011-10-05T21:49:18Z')
       single_jobflow_status.duration.should == 1440
+      single_jobflow_status.master_instance_id.should == 'i-15a4417c'
       single_jobflow_status.master_instance_type.should == 'm1.small'
       single_jobflow_status.slave_instance_type.should == 'm1.small'
       single_jobflow_status.instance_count.should == '4'
@@ -191,6 +195,7 @@ describe Elasticity::JobFlowStatus do
       multiple_jobflow_statuses.map(&:ready_at).should == [Time.parse('2011-10-04T21:49:18Z'), nil]
       multiple_jobflow_statuses.map(&:ended_at).should == [Time.parse('2011-10-05T21:49:18Z'), nil]
       multiple_jobflow_statuses.map(&:duration).should == [1440, nil]
+      multiple_jobflow_statuses.map(&:master_instance_id).should == ['i-15a4417c', nil]
       multiple_jobflow_statuses.map(&:master_instance_type).should == %w(m1.small c1.medium)
       multiple_jobflow_statuses.map(&:slave_instance_type).should == %w(m1.small c1.medium)
       multiple_jobflow_statuses.map(&:instance_count).should == %w(4 2)

data/spec/lib/elasticity/job_flow_status_step_spec.rb

@@ -18,6 +18,9 @@ describe Elasticity::JobFlowStatusStep do
                   </StepConfig>
                   <ExecutionStatusDetail>
                     <State>FAILED</State>
+                    <CreationDateTime>
+                      2011-10-04T21:46:16Z
+                    </CreationDateTime>
                     <StartDateTime>
                        2011-10-04T21:49:16Z
                     </StartDateTime>
@@ -32,6 +35,8 @@ describe Elasticity::JobFlowStatusStep do
                   </StepConfig>
                   <ExecutionStatusDetail>
                     <State>PENDING</State>
+                    <CreationDateTime>
+                    </CreationDateTime>
                     <StartDateTime>
                     </StartDateTime>
                     <EndDateTime>
@@ -54,6 +59,7 @@ describe Elasticity::JobFlowStatusStep do
       jobflow_step = Elasticity::JobFlowStatusStep.from_member_element(@members_nodeset[0])
       jobflow_step.name.should == "Setup Hive"
       jobflow_step.state.should == "FAILED"
+      jobflow_step.created_at.should == Time.parse("2011-10-04T21:46:16Z")
       jobflow_step.started_at.should == Time.parse("2011-10-04T21:49:16Z")
       jobflow_step.ended_at.should == Time.parse("2011-10-04T21:51:16Z")
     end
@@ -64,6 +70,7 @@ describe Elasticity::JobFlowStatusStep do
       jobflow_steps = Elasticity::JobFlowStatusStep.from_members_nodeset(@members_nodeset)
       jobflow_steps.map(&:name).should == ["Setup Hive", "Run Hive Script"]
       jobflow_steps.map(&:state).should == ["FAILED", "PENDING"]
+      jobflow_steps.map(&:created_at).should == [Time.parse("2011-10-04T21:46:16Z"), nil]
       jobflow_steps.map(&:started_at).should == [Time.parse("2011-10-04T21:49:16Z"), nil]
       jobflow_steps.map(&:ended_at).should == [Time.parse("2011-10-04T21:51:16Z"), nil]
     end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: elasticity
 version: !ruby/object:Gem::Version
-  version: '4.0'
+  version: 4.0.1
 platform: ruby
 authors:
 - Robert Slifka
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-05-21 00:00:00.000000000 Z
+date: 2014-09-05 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rest-client