elasticity 2.5.2 → 2.5.3

data/HISTORY.md

@@ -1,3 +1,9 @@
+## 2.5.3 - January 16, 2013
+
++ Added ```#visible_to_all_users``` to ```JobFlow```.  Thanks to [dstumm](https://github.com/dstumm) for the contribution!
++ Added ```#ended_at``` to ```JobFlowStatus```.
++ Added ```#duration``` calculated field to ```JobFlowStatus```.
+
 ## 2.5.2 - November 29, 2012
 
 + Configuration of Hive installations via ```hive_site``` is now supported.  See the README.md for details.

data/README.md

@@ -1,3 +1,5 @@
+(2012-11-30) Taking requests! I have a few ideas for what might be cool features though I'd rather work on what the community wants.  Go ahead and file an issue!
+
 Elasticity provides programmatic access to Amazon's Elastic Map Reduce service.  The aim is to conveniently abstract away the complex EMR REST API and make working with job flows more productive and more enjoyable.
 
 [![Build Status](https://secure.travis-ci.org/rslifka/elasticity.png)](http://travis-ci.org/rslifka/elasticity) REE, 1.8.7, 1.9.2, 1.9.3
@@ -104,6 +106,7 @@ jobflow.log_uri                           = nil
 
 jobflow.ec2_key_name                      = nil
 jobflow.ec2_subnet_id                     = nil
+jobflow.visible_to_all_users              = false
 jobflow.placement                         = 'us-east-1a'
 jobflow.instance_count                    = 2
 jobflow.master_instance_type              = 'm1.small'

data/lib/elasticity/job_flow.rb

@@ -18,6 +18,7 @@ module Elasticity
     attr_accessor :keep_job_flow_alive_when_no_steps
     attr_accessor :ec2_subnet_id
     attr_accessor :placement
+    attr_accessor :visible_to_all_users
 
     attr_reader :access_key
     attr_reader :secret_key
@@ -32,6 +33,7 @@ module Elasticity
 
       @access_key = access
       @secret_key = secret
+      @visible_to_all_users = false
 
       @bootstrap_actions = []
       @jobflow_steps = []
@@ -154,6 +156,7 @@ module Elasticity
       preamble = {
         :name => @name,
         :ami_version => @ami_version,
+        :visible_to_all_users => @visible_to_all_users,
         :instances => {
           :keep_job_flow_alive_when_no_steps => @keep_job_flow_alive_when_no_steps,
           :hadoop_version => @hadoop_version,

data/lib/elasticity/job_flow_status.rb

@@ -9,6 +9,8 @@ module Elasticity
     attr_accessor :created_at
     attr_accessor :started_at
     attr_accessor :ready_at
+    attr_accessor :ended_at
+    attr_accessor :duration
     attr_accessor :instance_count
     attr_accessor :master_instance_type
     attr_accessor :slave_instance_type
@@ -40,11 +42,18 @@ module Elasticity
 
       jobflow.created_at = Time.parse(xml_element.xpath('./ExecutionStatusDetail/CreationDateTime').text.strip)
 
+      ready_at = xml_element.xpath('./ExecutionStatusDetail/ReadyDateTime').text.strip
+      jobflow.ready_at = (ready_at == '') ? (nil) : (Time.parse(ready_at))
+
       started_at = xml_element.xpath('./ExecutionStatusDetail/StartDateTime').text.strip
       jobflow.started_at = (started_at == '') ? (nil) : (Time.parse(started_at))
 
-      ready_at = xml_element.xpath('./ExecutionStatusDetail/ReadyDateTime').text.strip
-      jobflow.ready_at = (ready_at == '') ? (nil) : (Time.parse(ready_at))
+      ended_at = xml_element.xpath('./ExecutionStatusDetail/EndDateTime').text.strip
+      jobflow.ended_at = (ended_at == '') ? (nil) : (Time.parse(ended_at))
+
+      if jobflow.ended_at && jobflow.started_at
+        jobflow.duration = ((jobflow.ended_at - jobflow.started_at) / 60).to_i
+      end
 
       jobflow.instance_count = xml_element.xpath('./Instances/InstanceCount').text.strip
       jobflow.master_instance_type = xml_element.xpath('./Instances/MasterInstanceType').text.strip

data/lib/elasticity/version.rb

@@ -1,3 +1,3 @@
 module Elasticity
-  VERSION = '2.5.2'
+  VERSION = '2.5.3'
 end

data/spec/lib/elasticity/aws_request_spec.rb

@@ -4,6 +4,10 @@ describe Elasticity::AwsRequest do
     Timecop.freeze(Time.at(1302461096))
   end
 
+  after do
+    Timecop.return
+  end
+
   subject do
     Elasticity::AwsRequest.new('access', 'secret')
   end

data/spec/lib/elasticity/job_flow_integration_spec.rb

@@ -28,6 +28,7 @@ describe 'Elasticity::JobFlow Integration Examples' do
         :name => 'Elasticity Job Flow',
         :log_uri => 's3n://slif-test/output/logs',
         :ami_version => 'latest',
+        :visible_to_all_users => false,
         :instances => {
           :keep_job_flow_alive_when_no_steps => false,
           :hadoop_version => '1.0.3',
@@ -115,6 +116,7 @@ describe 'Elasticity::JobFlow Integration Examples' do
         :name => 'Elasticity Job Flow',
         :log_uri => 's3n://slif-test/output/logs',
         :ami_version => 'latest',
+        :visible_to_all_users => false,
         :instances => {
           :keep_job_flow_alive_when_no_steps => false,
           :hadoop_version => '1.0.3',
@@ -201,6 +203,7 @@ describe 'Elasticity::JobFlow Integration Examples' do
         :name => 'Elasticity Job Flow',
         :log_uri => 's3n://slif-test/output/logs',
         :ami_version => 'latest',
+        :visible_to_all_users => false,
         :instances => {
           :keep_job_flow_alive_when_no_steps => false,
           :hadoop_version => '1.0.3',

data/spec/lib/elasticity/job_flow_spec.rb

@@ -18,6 +18,7 @@ describe Elasticity::JobFlow do
   its(:ami_version) { should == 'latest' }
   its(:keep_job_flow_alive_when_no_steps) { should == false }
   its(:placement) { should == 'us-east-1a' }
+  its(:visible_to_all_users) { should == false }
 
   describe '.initialize' do
     it 'should set the access and secret keys to nil by default' do
@@ -350,6 +351,7 @@ describe Elasticity::JobFlow do
       {
         :name => 'Elasticity Job Flow',
         :ami_version => 'latest',
+        :visible_to_all_users => false,
         :instances => {
           :keep_job_flow_alive_when_no_steps => false,
           :hadoop_version => '1.0.3',
@@ -383,6 +385,13 @@ describe Elasticity::JobFlow do
       end
     end
 
+    context 'when jobflow visibility is modified' do
+      it 'should be reflected in the jobflow settings' do
+        subject.visible_to_all_users = true
+        subject.send(:jobflow_preamble).should be_a_hash_including({:visible_to_all_users => true})
+      end
+    end
+
   end
 
   describe '#run' do

data/spec/lib/elasticity/job_flow_status_spec.rb

@@ -26,6 +26,14 @@ describe Elasticity::JobFlowStatus do
     XML
   end
 
+  let(:started_at) do
+    <<-XML
+      <StartDateTime>
+        2011-10-04T21:49:17Z
+      </StartDateTime>
+    XML
+  end
+
   let(:setup_config) do
     hive_setup_config
   end
@@ -45,12 +53,13 @@ describe Elasticity::JobFlowStatus do
                 <LastStateChangeReason>
                    Steps completed with errors
                 </LastStateChangeReason>
-                <StartDateTime>
-                   2011-10-04T21:49:17Z
-                </StartDateTime>
+                #{started_at}
                 <ReadyDateTime>
                    2011-10-04T21:49:18Z
                 </ReadyDateTime>
+                <EndDateTime>
+                   2011-10-05T21:49:18Z
+                </EndDateTime>
                 <State>TERMINATED</State>
               </ExecutionStatusDetail>
               <Steps>
@@ -94,12 +103,6 @@ describe Elasticity::JobFlowStatus do
                 <CreationDateTime>
                    2011-10-04T22:49:16Z
                 </CreationDateTime>
-                <StartDateTime>
-
-                </StartDateTime>
-                <ReadyDateTime>
-
-                </ReadyDateTime>
                 <State>
                   TERMINATED
                 </State>
@@ -153,12 +156,22 @@ describe Elasticity::JobFlowStatus do
       single_jobflow.created_at.should == Time.parse('2011-10-04T21:49:16Z')
       single_jobflow.started_at.should == Time.parse('2011-10-04T21:49:17Z')
       single_jobflow.ready_at.should == Time.parse('2011-10-04T21:49:18Z')
+      single_jobflow.ended_at.should == Time.parse('2011-10-05T21:49:18Z')
+      single_jobflow.duration.should == 1440
       single_jobflow.master_instance_type.should == 'm1.small'
       single_jobflow.slave_instance_type.should == 'm1.small'
       single_jobflow.instance_count.should == '4'
       single_jobflow.last_state_change_reason.should == 'Steps completed with errors'
       single_jobflow.master_public_dns_name.should == 'ec2-107-22-77-99.compute-1.amazonaws.com'
     end
+
+    context 'when the jobflow never started' do
+      let(:started_at) {}
+      it 'should have a nil duration' do
+        single_jobflow.started_at.should == nil
+        single_jobflow.duration.should == nil
+      end
+    end
   end
 
   describe '.from_jobflows_nodeset' do
@@ -169,6 +182,8 @@ describe Elasticity::JobFlowStatus do
       multiple_jobflows.map(&:created_at).should == [Time.parse('2011-10-04T21:49:16Z'), Time.parse('2011-10-04T22:49:16Z')]
       multiple_jobflows.map(&:started_at).should == [Time.parse('2011-10-04T21:49:17Z'), nil]
       multiple_jobflows.map(&:ready_at).should == [Time.parse('2011-10-04T21:49:18Z'), nil]
+      multiple_jobflows.map(&:ended_at).should == [Time.parse('2011-10-05T21:49:18Z'), nil]
+      multiple_jobflows.map(&:duration).should == [1440, nil]
       multiple_jobflows.map(&:master_instance_type).should == %w(m1.small c1.medium)
       multiple_jobflows.map(&:slave_instance_type).should == %w(m1.small c1.medium)
       multiple_jobflows.map(&:instance_count).should == %w(4 2)

data/spec/lib/elasticity/sync_to_s3_spec.rb

@@ -181,9 +181,10 @@ describe Elasticity::SyncToS3 do
     it 'should not write identical content' do
       sync_to_s3.send(:sync_file, full_path, remote_dir)
       last_modified = s3.directories[0].files.head(remote_path).last_modified
-      Timecop.travel(Time.now + 60)
-      sync_to_s3.send(:sync_file, full_path, remote_dir)
-      s3.directories[0].files.head(remote_path).last_modified.should == last_modified
+      Timecop.freeze(Time.now + 60) do
+        sync_to_s3.send(:sync_file, full_path, remote_dir)
+        s3.directories[0].files.head(remote_path).last_modified.should == last_modified
+      end
     end
 
     context 'when remote dir is a corner case value' do

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: elasticity
 version: !ruby/object:Gem::Version
-  version: 2.5.2
+  version: 2.5.3
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-11-29 00:00:00.000000000 Z
+date: 2013-01-16 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rest-client