elasticity 4.0.2 → 4.0.3

checksums.yaml

@@ -1,15 +1,15 @@
 ---
 !binary "U0hBMQ==":
   metadata.gz: !binary |-
-    YTFkNWI4Njc2OTcwNjE2ZTk1MzFhZTc2MjIwOWRkOWUzMzA0MDMxYw==
+    ZjhlNWY2ZjAwNzYxNWNkNDMzM2M1YzE3ODJmNDQ3MDA2OTQzNDA2ZA==
   data.tar.gz: !binary |-
-    MWRjZDNkNDAxMmJkNmIzZTM3MWJjMTEwNGNjYzVmMDdmZjA0ZmZkNQ==
+    ZjQxMzc2ZmZlNTNhMmUwMzMwODE1MTJjOTljZjk5Mjk4ZTBkYTliYw==
 SHA512:
   metadata.gz: !binary |-
-    NjQ4YWVmOTMzNmMyYjkxZDM5OGJkZmUyNWJhNWU5YzBlM2RlOTdmNWFhOThi
-    OTJlYThhYTMzNjFhODI3YWJjZjJlNTRlYTYyNjAzYjU1ZDhmZGFhMDViNDg0
-    ZmI0ZmNhZDI3OTUzMTNmOWQyYjZmYzVkM2MxNzQ4MTQ4MDA0ODI=
+    YmE4YmYyMDE2YTEyZjM0MzZmMDBlYzQyNDI0MmFhNWJlNjhlY2Y1ZjM4NTlh
+    ZGM3YmQ0ODdlNDRlY2JmYjU3YTVlN2QzZDIzZDI0MTAyM2RmMmM2ODNmNWQx
+    YzY2NWVlNTczY2M4YThlMDZmZmY3NDFkNzAxODFhODBhYzYyNDc=
   data.tar.gz: !binary |-
-    Y2I0YmYzZGM4MTZmMWU5NjM0Y2ZiODViZmVkZDZjOTdhOTY1ODg4MWU4NzM0
-    YjM0MWRlMWMwMmZiY2FjYjQ5M2Q2NTM2MjBhZmVjMjA1ZmY2MGQ0NzhjYzI2
-    ZWNkMDUzNzMzNzFhZDEwODcyNjFiM2Y4MDg1NDQwNmE1Yzc4OTA=
+    ZGVhYThjOTk1NmJkNThmODJjYmRiOTk1MWFkYmUyMjgzZjllOTc1NGNjZDU3
+    ZGRiN2FlMjVlNTM2MWU0ZWJiYmJlNTlkMzMzMzJhOWFlNzk5YWUwYWFlY2Jl
+    YTY5MDlmNThjZDc5Yjg1NmI5ZGNmNTE1ZTEwOTgyN2ViZDdiN2Y=

data/HISTORY.md

@@ -1,3 +1,7 @@
+## 4.0.3 - November 12, 2014
+
+- Thanks to @ilyakava, pull request [#78](https://github.com/rslifka/elasticity/pull/78) fixes a bug in the "wait for completion" feature.
+
 ## 4.0.2 - September 20, 2014
 
 - Thanks to @jshafton, now with support for Ganglia!

data/lib/elasticity/job_flow.rb

@@ -168,7 +168,7 @@ module Elasticity
 
     def retry_check
       jf_status = status
-      return status.state == 'RUNNING' || status.state == 'STARTING', jf_status
+      return status.active?, jf_status
     end
 
     def emr

data/lib/elasticity/job_flow_status.rb

@@ -25,6 +25,11 @@ module Elasticity
       @installed_steps = []
     end
 
+    # http://docs.aws.amazon.com/ElasticMapReduce/latest/DeveloperGuide/ProcessingCycle.html
+    def active?
+      %w{RUNNING STARTING BOOTSTRAPPING WAITING SHUTTING_DOWN}.include? state
+    end
+
     # Create a jobflow from an AWS <member> (Nokogiri::XML::Element):
     #   /DescribeJobFlowsResponse/DescribeJobFlowsResult/JobFlows/member
     def self.from_member_element(xml_element)

data/lib/elasticity/version.rb

@@ -1,3 +1,3 @@
 module Elasticity
-  VERSION = '4.0.2'
+  VERSION = '4.0.3'
 end

data/spec/lib/elasticity/job_flow_spec.rb

@@ -606,8 +606,8 @@ describe Elasticity::JobFlow do
 
   describe '#retry_check' do
 
-    context 'when the jobflow is RUNNING' do
-      let(:jobflow_status) { double(:state => 'RUNNING') }
+    context 'when the jobflow is active' do
+      let(:jobflow_status) { double(:active? => true) }
       before do
         subject.stub(:status).and_return(jobflow_status)
       end
@@ -616,25 +616,16 @@ describe Elasticity::JobFlow do
       end
     end
 
-    context 'when the jobflow is STARTING' do
-      let(:jobflow_status) { double(:state => 'STARTING') }
+    context 'when the jobflow is not active' do
+      let(:jobflow_status) { double(:active? => false) }
       before do
         subject.stub(:status).and_return(jobflow_status)
       end
       it 'returns true and the result of #status' do
-        subject.send(:retry_check).should == [true, jobflow_status]
-      end
-    end
-
-    context 'when the jobflow is != RUNNING or STARTING' do
-      let(:jobflow_status) { double(:state => '_') }
-      before do
-        subject.stub(:status).and_return(jobflow_status)
-      end
-      it 'returns false and the result of #status' do
         subject.send(:retry_check).should == [false, jobflow_status]
       end
     end
+
   end
 
   describe '.from_jobflow_id' do

data/spec/lib/elasticity/job_flow_status_spec.rb

@@ -236,4 +236,30 @@ describe Elasticity::JobFlowStatus do
     end
   end
 
+  describe '#active?' do
+
+    context 'when the jobflow status is terminal' do
+      %w{COMPLETED TERMINATED FAILED _}.each do |status|
+        context "when the jobflow is #{status}" do
+          it 'is not active' do
+            single_jobflow_status.state = status
+            single_jobflow_status.active?.should be_false
+          end
+        end
+      end
+    end
+
+    context 'when the jobflow status is not terminal' do
+      %w{RUNNING STARTING BOOTSTRAPPING WAITING SHUTTING_DOWN}.each do |status|
+        context "when the jobflow is #{status}" do
+          it 'is active' do
+            single_jobflow_status.state = status
+            single_jobflow_status.active?.should be_true
+          end
+        end
+      end
+    end
+
+  end
+
 end

metadata

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