elasticity 6.0.12 → 6.0.13

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: f96e8b15d696c580e01a6957b7981806190c86ef
-  data.tar.gz: aa9fc8328096b4fc7cf0649b0bb3f82eaf416e8f
+  metadata.gz: 790344a0151805b2c9d98ab1a5550da16098a618
+  data.tar.gz: ac2ca4a93b59437f4fdb904bc5d7985c3914c4e2
 SHA512:
-  metadata.gz: 709475923787784aaf6e38c3825a730cf462966b3cf7c10c1f26314d259743e21b462a2d3f36e4d4e077a79b16ec62da65d058ffbd8bdb78ccf915f994a3da36
-  data.tar.gz: 4b5a0731398a0e7cf22f144c853a99d76fbc27ed3cbbf0d18c9ed46d1a4803e76d9872833fb86a96fb4cb23393b0315b74d84eee418e45838ad48a33ace0d2df
+  metadata.gz: 027b587b86c8065a88b6cf614a646677c5ed36c317a88ce90b43c22bbc52ea39fe8b2e4cb12f77b02694a5992261b744721b872dfbe0650610c439063aeb5de6
+  data.tar.gz: d54e84b75052fcf456cfb4a98f8532e7328b45479551064a3cacbd6d0eeaa4356447accc85ff67ffd613d5a1246796a6a260317b5acd1afb4ff9ea19bea54641

data/.travis.yml

@@ -5,4 +5,4 @@ rvm:
 before_install:
   - gem update --system
   - gem --version
-  - gem install bundler
+  - gem install bundler -v 1.17.3

data/HISTORY.md

@@ -1,3 +1,7 @@
+## 6.0.13 - January 17, 2019
+
+- Including PR [#141](https://github.com/rslifka/elasticity/pull/140) - "Add the ability to customize timeouts ". Thank you [@BenFradet ](https://github.com/BenFradet )!
+
 ## 6.0.12 - February 7, 2017
 
 - Including PR [#140](https://github.com/rslifka/elasticity/pull/140) - "Update fog". Thank you [@BenFradet ](https://github.com/BenFradet )!
@@ -61,7 +65,7 @@ On the API side, all of the newer commands take `cluster_id` rather than `job_fl
 
 They've also begun deprecating APIs, starting with `DescribeJobFlows`.  Given the sweeping set of changes, a major release was deemed appropriate.
 
-- [#88](https://github.com/rslifka/elasticity/issues/88) - Removed support for deprecated `DescribeJobFlows`. 
+- [#88](https://github.com/rslifka/elasticity/issues/88) - Removed support for deprecated `DescribeJobFlows`.
 - [#89](https://github.com/rslifka/elasticity/issues/89) - Add support for `AddTags`.
 - [#90](https://github.com/rslifka/elasticity/issues/90) - Add support for `RemoveTags`.
 - [#91](https://github.com/rslifka/elasticity/issues/91) - Add support for `SetVisibleToAllUsers`.
@@ -232,7 +236,7 @@ They've also begun deprecating APIs, starting with `DescribeJobFlows`.  Given th
 ## 2.1 - July 7, 2012
 
 + TASK instance group support added.
-+ SPOT instance support added for all instance group types. 
++ SPOT instance support added for all instance group types.
 + Removed name of jar from default name of ```CustomJarStep``` since the AWS UI already calls it out in a separate column when looking at job flow steps.
 
 ## 2.0 - June 26, 2012

data/lib/elasticity/aws_session.rb

@@ -8,10 +8,12 @@ module Elasticity
 
     attr_reader :host
     attr_reader :region
+    attr_reader :timeout
 
     # Supported values for options:
     #  :region - AWS region (e.g. us-west-1)
     #  :secure - true or false, default true.
+    #  :timeout - the timeout, in seconds, when making a request to EMR, default 60.
     def initialize(options={})
       # There is a cryptic error if this isn't set
       if options.has_key?(:region) && options[:region] == nil
@@ -21,12 +23,21 @@ module Elasticity
       @region = options[:region]
 
       @host = "elasticmapreduce.#@region.amazonaws.com"
+
+      options[:timeout] = 60 unless options[:timeout]
+      @timeout = options[:timeout]
     end
 
     def submit(ruby_service_hash)
       aws_request = AwsRequestV4.new(self, ruby_service_hash)
       begin
-        RestClient.post(aws_request.url, aws_request.payload, aws_request.headers)
+        RestClient.execute(
+          :method => :post,
+          :url => aws_request.url,
+          :payload => aws_request.payload,
+          :headers => aws_request.headers,
+          :timeout => @timeout
+        )
       rescue RestClient::BadRequest => e
         type, message = AwsSession.parse_error_response(e.http_body)
         raise ThrottlingException, message if type == 'ThrottlingException'

data/lib/elasticity/job_flow.rb

@@ -33,6 +33,7 @@ module Elasticity
     attr_accessor :additional_info
     attr_accessor :additional_master_security_groups
     attr_accessor :additional_slave_security_groups
+    attr_accessor :timeout
 
     def initialize
       @action_on_failure = 'TERMINATE_JOB_FLOW'
@@ -55,6 +56,8 @@ module Elasticity
       @instance_count = 2
       @master_instance_type = 'm1.small'
       @slave_instance_type = 'm1.small'
+
+      @timeout = 60
     end
 
     def self.from_jobflow_id(jobflow_id, region = 'us-east-1')
@@ -207,7 +210,7 @@ module Elasticity
     end
 
     def emr
-      @emr ||= Elasticity::EMR.new(:region => @region)
+      @emr ||= Elasticity::EMR.new(:region => @region, :timeout => @timeout)
     end
 
     def is_jobflow_running?

data/lib/elasticity/version.rb

@@ -1,3 +1,3 @@
 module Elasticity
-  VERSION = '6.0.12'
+  VERSION = '6.0.13'
 end

data/spec/lib/elasticity/aws_request_v4_spec.rb

@@ -144,7 +144,7 @@ describe Elasticity::AwsRequestV4 do
 
   describe '.aws_v4_signature' do
     it 'should create the proper signature' do
-      subject.send(:aws_v4_signature).should == '71d7f2adf5b01990b09d7d10910b9a0312ded30bacf05ea8e8a05cc72ab389d1'
+      subject.send(:aws_v4_signature).should == '86798537f9f4310015aac337d493c4b4abb5113109e04a9898c845d09d2d8bdf'
     end
   end
 

data/spec/lib/elasticity/aws_session_spec.rb

@@ -35,6 +35,18 @@ describe Elasticity::AwsSession do
       end
     end
 
+    context 'when :timeout is specified' do
+      it 'should be assigned' do
+        Elasticity::AwsSession.new(:region => 'TEST_REGION', :timeout => 120).timeout.should == 120
+      end
+    end
+
+    context 'when :timeout is not specified' do
+      it 'should be 60' do
+        Elasticity::AwsSession.new(:region => 'TEST_REGION').timeout.should == 60
+      end
+    end
+
   end
 
   describe '#host' do
@@ -66,7 +78,13 @@ describe Elasticity::AwsSession do
         @request.should_receive(:headers).and_return('TEST_HEADERS')
 
         Elasticity::AwsRequestV4.should_receive(:new).with(subject, {}).and_return(@request)
-        RestClient.should_receive(:post).with('TEST_URL', 'TEST_PAYLOAD', 'TEST_HEADERS')
+        RestClient.should_receive(:execute).with(
+          :method => :post,
+          :url => 'TEST_URL',
+          :payload => 'TEST_PAYLOAD',
+          :headers => 'TEST_HEADERS',
+          :timeout => 60
+        )
       end
 
       it 'should POST a properly assembled request' do
@@ -89,7 +107,7 @@ describe Elasticity::AwsSession do
       end
 
       it 'should raise an Argument error with the body of the error' do
-        RestClient.should_receive(:post).and_raise(error)
+        RestClient.should_receive(:execute).and_raise(error)
         expect {
           subject.submit({})
         }.to raise_error(ArgumentError, "AWS EMR API Error (#{error_type}): #{error_message}")
@@ -98,7 +116,7 @@ describe Elasticity::AwsSession do
       context 'EMR API rate limit hit' do
         let(:error_type) { 'ThrottlingException' }
         it 'should raise a Throttling error with the body of the error' do
-          RestClient.should_receive(:post).and_raise(error)
+          RestClient.should_receive(:execute).and_raise(error)
           expect {
             subject.submit({})
           }.to raise_error(Elasticity::ThrottlingException, "AWS EMR API Error (#{error_type}): #{error_message}")

data/spec/lib/elasticity/job_flow_integration_spec.rb

@@ -3,7 +3,8 @@ describe 'Elasticity::JobFlow Integration Examples' do
   let(:emr) { double('Elasticity::EMR') }
 
   before do
-    Elasticity::EMR.should_receive(:new).with(:region => 'us-west-1').and_return(emr)
+    Elasticity::EMR.should_receive(:new).with(:region => 'us-west-1', :timeout => 60)
+      .and_return(emr)
   end
 
   describe 'Hive' do
@@ -243,4 +244,4 @@ describe 'Elasticity::JobFlow Integration Examples' do
 
   end
 
-end
+end

data/spec/lib/elasticity/job_flow_spec.rb

@@ -30,6 +30,7 @@ describe Elasticity::JobFlow do
       expect(subject.jobflow_id).to eql(nil)
       expect(subject.additional_master_security_groups).to eql(nil)
       expect(subject.additional_slave_security_groups).to eql(nil)
+      expect(subject.timeout).to eql(60)
     end
   end
 
@@ -708,7 +709,7 @@ describe Elasticity::JobFlow do
         let(:emr) { double('Elasticity::EMR', :run_job_flow => 'JOBFLOW_ID') }
 
         it 'should run the job with the supplied EMR credentials' do
-          Elasticity::EMR.stub(:new).with(:region => 'us-east-1').and_return(emr)
+          Elasticity::EMR.stub(:new).with(:region => 'us-east-1', :timeout => 60).and_return(emr)
           emr.should_receive(:run_job_flow)
           jobflow_with_steps.run
         end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: elasticity
 version: !ruby/object:Gem::Version
-  version: 6.0.12
+  version: 6.0.13
 platform: ruby
 authors:
 - Robert Slifka
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2017-06-14 00:00:00.000000000 Z
+date: 2019-01-17 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rest-client