elasticity 5.0 → 5.0.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: e0f03b6f19c745e3dba221b6c758d09a684e9996
-  data.tar.gz: 688f198e1385cd13d47e6c974560e9162bdc795c
+  metadata.gz: 214e0a6224f1c25d0cab456008171d242f5b2cb6
+  data.tar.gz: 417acbc3a8b312eabea4a86d4db2b1b9f726e8fa
 SHA512:
-  metadata.gz: 209fb20aa9563f401be0f58be8e6ac2199890d0854cff8aa7da8b11cdfac6a18ae027bbdb5a7ddb3c2abe11ec4ffa97efebe196187910739223bca422acb178e
-  data.tar.gz: 24d77bf764a8aecd7616f75991538373eb539f5d7a3bb9591769a136fdc60b190963c61a5ee8632299ff4717003e87bbfa9308ad7948f2374d0d5bc30d3b3bba
+  metadata.gz: 856569d07a95865b11b3d54ebbbdad531b646200fd1df2eb609b75f408eb1be2d1b2eae0bc5625da1a222ebfed5c0e8b4eefc54dd36a4df0e66f0f43f290e5b3
+  data.tar.gz: c46610d0917cd5089dccc6aa8712007d536b3a3ed5f94acb8cc7328a4c07e218efe3000c26f32508a03dae53ca28b98eae9b8de2df8d65e2d363e8bb4ac0ea06

data/HISTORY.md

@@ -1,10 +1,18 @@
-## 5.0 - March 28, 2014
+## 5.0.1 - April 12, 2015
+
+- Bear with me here :)  Backmerged into 4.0.4 to add [IAM Service Role support](http://docs.aws.amazon.com/ElasticMapReduce/latest/DeveloperGuide/emr-iam-roles-creatingroles.html) per @alexanderdean.  As part of the forward merge, bumping the version to trigger an update.
+
+## 5.0 - March 28, 2015
 
 - Major version bump as there are language support implications.
 - Now supporting only the latest version of the 2.x minors (e.g. 2.0.x, 2.1.x, etc.) versus specific minor-minor releases.  This was an oversight on my part in how I both configured Travis and communicated support for the 2.x line.
 - Removed support for Ruby 1.9.3 as it has been [unsupported since 2/23/2015](https://www.ruby-lang.org/en/news/2014/01/10/ruby-1-9-3-will-end-on-2015/).
 - Removed "support" for JRuby.  It was in poor form that I originally claimed to support JRuby as I do not have the time to dedicate to such an endeavor.  Compatibility is merely coincidental and it would not be responsible for me to continue communicating ongoing support when that is not my intention.  Apologies to those this may inconvenience.
 
+## 4.0.5 - April 9, 2015
+
+- Thanks to @alexanderdean, pull request [#82](https://github.com/rslifka/elasticity/pull/82) adds support for profile roles.
+
 ## 4.0.4 - November 20, 2014
 
 - Thanks to @jshafton, pull request [#79](https://github.com/rslifka/elasticity/pull/79) adds support for job flow roles.

data/README.md

@@ -106,6 +106,8 @@ jobflow.name                              = 'Elasticity Job Flow'
 
 # For new AWS accounts, this is required to be set
 jobflow.ec2_subnet_id                     = nil
+jobflow.jobflow_role                      = nil
+jobflow.service_role                      = nil
 
 jobflow.action_on_failure                 = 'TERMINATE_JOB_FLOW'
 jobflow.keep_job_flow_alive_when_no_steps = false

data/lib/elasticity/job_flow.rb

@@ -23,6 +23,7 @@ module Elasticity
     attr_accessor :visible_to_all_users
     attr_accessor :enable_debugging
     attr_accessor :job_flow_role
+    attr_accessor :service_role
 
     attr_reader :access_key
     attr_reader :secret_key
@@ -187,6 +188,7 @@ module Elasticity
       config[:steps] = steps
       config[:log_uri] = @log_uri if @log_uri
       config[:job_flow_role] = @job_flow_role if @job_flow_role
+      config[:service_role] = @service_role if @service_role
       config[:bootstrap_actions] = @bootstrap_actions.map{|a| a.to_aws_bootstrap_action} unless @bootstrap_actions.empty?
       config
     end

data/lib/elasticity/version.rb

@@ -1,3 +1,3 @@
 module Elasticity
-  VERSION = '5.0'
+  VERSION = '5.0.1'
 end

data/spec/lib/elasticity/job_flow_spec.rb

@@ -4,22 +4,25 @@ describe Elasticity::JobFlow do
     Elasticity::JobFlow.new('access', 'secret')
   end
 
-  its(:access_key) { should == 'access' }
-  its(:secret_key) { should == 'secret' }
   its(:action_on_failure) { should == 'TERMINATE_JOB_FLOW' }
   its(:ec2_key_name) { should == nil }
-  its(:ec2_subnet_id) { should == nil }
+  its(:name) { should == 'Elasticity Job Flow' }
   its(:instance_count) { should == 2 }
   its(:log_uri) { should == nil }
   its(:master_instance_type) { should == 'm1.small' }
-  its(:name) { should == 'Elasticity Job Flow' }
   its(:slave_instance_type) { should == 'm1.small' }
   its(:ami_version) { should == 'latest' }
   its(:keep_job_flow_alive_when_no_steps) { should == false }
+  its(:ec2_subnet_id) { should == nil }
   its(:placement) { should == 'us-east-1a' }
+  its(:region) { should == 'us-east-1' }
   its(:visible_to_all_users) { should == false }
   its(:enable_debugging) { should == false }
-  its(:region) { should == 'us-east-1' }
+  its(:job_flow_role) { should == nil }
+  its(:service_role) { should == nil }
+
+  its(:access_key) { should == 'access' }
+  its(:secret_key) { should == 'secret' }
 
   describe '.initialize' do
     it 'should set the access and secret keys to nil by default' do
@@ -357,7 +360,7 @@ describe Elasticity::JobFlow do
         end
       end
 
-      context 'when a log URI is not specified' do
+      context 'when a job flow role is not specified' do
         let(:jobflow_with_no_job_flow_role) do
           Elasticity::JobFlow.new('_', '_').tap do |jf|
             jf.job_flow_role = nil
@@ -370,6 +373,32 @@ describe Elasticity::JobFlow do
 
     end
 
+    describe 'service role' do
+
+      context 'when a service role is specified' do
+        let(:jobflow_with_service_role) do
+          Elasticity::JobFlow.new('_', '_').tap do |jf|
+            jf.service_role = 'SERVICE_ROLE'
+          end
+        end
+        it 'should incorporate it into the jobflow config' do
+          jobflow_with_service_role.send(:jobflow_config).should be_a_hash_including({:service_role => 'SERVICE_ROLE'})
+        end
+      end
+
+      context 'when a service role is not specified' do
+        let(:jobflow_with_no_service_role) do
+          Elasticity::JobFlow.new('_', '_').tap do |jf|
+            jf.service_role = nil
+          end
+        end
+        it 'should not make space for it in the jobflow config' do
+          jobflow_with_no_service_role.send(:jobflow_config).should_not have_key(:service_role)
+        end
+      end
+
+    end
+
     describe 'bootstrap actions' do
 
       context 'when bootstrap actions are specified' do

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: elasticity
 version: !ruby/object:Gem::Version
-  version: '5.0'
+  version: 5.0.1
 platform: ruby
 authors:
 - Robert Slifka
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-03-28 00:00:00.000000000 Z
+date: 2015-04-13 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rest-client