elasticity 6.0.6 → 6.0.7

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 9544e6d7a9f5c8b361f07657a2902a0006415c93
-  data.tar.gz: 2477d97b8f823248ae6f1d6061f092aa0e5e0747
+  metadata.gz: f8acfedb244b21d3b8ab10c2c78b33006f15b9c9
+  data.tar.gz: 72978cfbb6598c283771630159f2203b0d2722f8
 SHA512:
-  metadata.gz: 356394fc7e44ec694f8c59f60a90b1f1daaa3a0c2f4b40f55532c89bfcbfce11b59ac70d385936dccb9fb08ee726f645a6b8e010c464dbd4ee147a5f2e174ed0
-  data.tar.gz: ffc3be6f66d3218e5a167afb3f4eb4431f0b86f6966d93f62c3ff86d54f4021485d100d04b16e73333970a2f708f2f4f7015977a339c7515bc790a9a1d2d1bf2
+  metadata.gz: cb3ade000c41023d37fba15f48df3be25f2d02ab7a62ee1e75c3fdc576a88d7cde639b8cff8b4144ba2b9d31ce281f6e0c55b3aae1573443e4b890d8b1db3ad6
+  data.tar.gz: 344e4daeb4d74e6fdefdc74a8ad6c05a3a68fa5c3b623197c5b0935a03081bb2291ffaf9da307c88cfb243228a360c6190831d0d2846130cbcfe14af48cc2723

data/.ruby-version

@@ -1 +1 @@
-2.0.0-p598
+2.3.0

data/HISTORY.md

@@ -1,10 +1,14 @@
+## 6.0.7 - February 29, 2016
+
+- Including PR [#125](https://github.com/rslifka/elasticity/pull/125) - "AMI 4.x support".  Thank you [@fblundun](https://github.com/fblundun)!
+
 ## 6.0.6 - February 29, 2016
 
-- - Including PR [#20](https://github.com/rslifka/elasticity/pull/120) - "EMR Applications and support for release_label".  Thank you [@robert2d](https://github.com/robert2d)!
-- 
+- Including PR [#120](https://github.com/rslifka/elasticity/pull/120) - "EMR Applications and support for release_label".  Thank you [@robert2d](https://github.com/robert2d)!
+
 ## 6.0.5 - August 28, 2015
 
-- - Including PR [#119](https://github.com/rslifka/elasticity/pull/119) - "Error handling for API rate limiting".  Thank you [@robert2d](https://github.com/robert2d)!
+- Including PR [#119](https://github.com/rslifka/elasticity/pull/119) - "Error handling for API rate limiting".  Thank you [@robert2d](https://github.com/robert2d)!
 
 ## 6.0.4 - August 3, 2015
 

data/README.md

@@ -131,6 +131,7 @@ jobflow.region                            = 'us-east-1'
 jobflow.instance_count                    = 2
 jobflow.master_instance_type              = 'm1.small'
 jobflow.slave_instance_type               = 'm1.small'
+jobflow.additonal_info                    = 'additonal info'
 ```
 
 ### EMR Applications (optional needs release_label >= 4.0.0)
@@ -334,6 +335,10 @@ copy_step = Elasticity::S3DistCpStep.new
 copy_step.arguments = [...]
 
 jobflow.add_step(copy_step)
+
+# For AMI < 4.x you need to specifify legacy argument
+copy_step = Elasticity::S3DistCpStep.new(true)
+
 ```
 
 ## 7 - Upload Assets (optional)

data/lib/elasticity/job_flow.rb

@@ -28,6 +28,7 @@ module Elasticity
     attr_accessor :service_role
     attr_accessor :jobflow_id
     attr_accessor :aws_applications
+    attr_accessor :additional_info
 
     def initialize
       @action_on_failure = 'TERMINATE_JOB_FLOW'
@@ -201,6 +202,7 @@ module Elasticity
       config[:tags] = jobflow_tags if @tags
       config[:job_flow_role] = @job_flow_role if @job_flow_role
       config[:service_role] = @service_role if @service_role
+      config[:additional_info] = @additional_info if @additional_info
       config[:bootstrap_actions] = @bootstrap_actions.map(&:to_aws_bootstrap_action) unless @bootstrap_actions.empty?
       config[:applications] = @aws_applications.map(&:to_hash) if valid_aws_applications?
       config

data/lib/elasticity/s3distcp_step.rb

@@ -1,12 +1,10 @@
 module Elasticity
-
   class S3DistCpStep < CustomJarStep
-
-    def initialize
-      super('/home/hadoop/lib/emr-s3distcp-1.0.jar')
+    def initialize(legacy = false)
+      path = '/usr/share/aws/emr/s3-dist-cp/lib/s3-dist-cp.jar'
+      path = '/home/hadoop/lib/emr-s3distcp-1.0.jar' if legacy # For AMI version < 4
+      super(path)
       @name = 'Elasticity S3DistCp Step'
     end
-
   end
-
-end
+end

data/lib/elasticity/version.rb

@@ -1,3 +1,3 @@
 module Elasticity
-  VERSION = '6.0.6'
+  VERSION = '6.0.7'
 end

data/spec/lib/elasticity/aws_request_v4_spec.rb

@@ -123,7 +123,7 @@ describe Elasticity::AwsRequestV4 do
 
   describe '.aws_v4_signature' do
     it 'should create the proper signature' do
-      subject.send(:aws_v4_signature).should == '107261f2d6a4d5caa0b14c6be4aabd283f730ce11f1e855890553288b21e1f5a'
+      subject.send(:aws_v4_signature).should == '2012c7d0d1fecd99b023d2a81a5930300436e4739f274301932941506e8fc9bf'
     end
   end
 

data/spec/lib/elasticity/job_flow_spec.rb

@@ -24,6 +24,7 @@ describe Elasticity::JobFlow do
       expect(subject.enable_debugging).to eql(false)
       expect(subject.job_flow_role).to eql(nil)
       expect(subject.service_role).to eql(nil)
+      expect(subject.additional_info).to eql(nil)
       expect(subject.jobflow_id).to eql(nil)
     end
   end
@@ -63,6 +64,17 @@ describe Elasticity::JobFlow do
 
   end
 
+  describe '#additional_info=' do
+    context 'when set' do
+      before do
+        subject.additional_info = 'additional info'
+      end
+      it 'additional_info is a string' do
+        expect(subject.additional_info).to eq('additional info')
+      end
+    end
+  end
+
   describe '#enable_debugging=' do
 
     context 'when a log_uri is present' do

data/spec/lib/elasticity/s3distcp_step_spec.rb

@@ -6,7 +6,16 @@ describe Elasticity::S3DistCpStep do
 
   it 'should set the appropriate default fields' do
     expect(subject.name).to eql('Elasticity S3DistCp Step')
-    expect(subject.jar).to eql('/home/hadoop/lib/emr-s3distcp-1.0.jar')
+    expect(subject.jar).to eql('/usr/share/aws/emr/s3-dist-cp/lib/s3-dist-cp.jar')
   end
 
-end
+  context 'legacy' do
+
+    subject { described_class.new(true) }
+
+    it 'sets the correct JAR location' do
+      expect(subject.jar).to eql('/home/hadoop/lib/emr-s3distcp-1.0.jar')
+    end
+  end
+
+end

metadata

@@ -1,125 +1,125 @@
 --- !ruby/object:Gem::Specification
 name: elasticity
 version: !ruby/object:Gem::Version
-  version: 6.0.6
+  version: 6.0.7
 platform: ruby
 authors:
 - Robert Slifka
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-01-29 00:00:00.000000000 Z
+date: 2016-02-01 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rest-client
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: '1.0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: '1.0'
 - !ruby/object:Gem::Dependency
   name: fog
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: '1.0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: '1.0'
 - !ruby/object:Gem::Dependency
   name: unf
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: '0.1'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: '0.1'
 - !ruby/object:Gem::Dependency
   name: factory_girl
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: '4.0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: '4.0'
 - !ruby/object:Gem::Dependency
   name: fakefs
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: 0.4.0
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: 0.4.0
 - !ruby/object:Gem::Dependency
   name: rake
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: '0.9'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: '0.9'
 - !ruby/object:Gem::Dependency
   name: rspec
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: '3.0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: '3.0'
 - !ruby/object:Gem::Dependency
   name: timecop
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: '0.6'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: '0.6'
 description: Streamlined, programmatic access to Amazon's Elastic Map Reduce service,
@@ -129,11 +129,11 @@ executables: []
 extensions: []
 extra_rdoc_files: []
 files:
-- .gitignore
-- .rspec
-- .ruby-gemset
-- .ruby-version
-- .travis.yml
+- ".gitignore"
+- ".rspec"
+- ".ruby-gemset"
+- ".ruby-version"
+- ".travis.yml"
 - Gemfile
 - Guardfile
 - HISTORY.md
@@ -204,17 +204,17 @@ require_paths:
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
-  - - '>='
+  - - ">="
     - !ruby/object:Gem::Version
       version: '0'
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
-  - - '>='
+  - - ">="
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.0.14
+rubygems_version: 2.5.1
 signing_key: 
 specification_version: 4
 summary: Streamlined, programmatic access to Amazon's Elastic Map Reduce service.