elasticity 3.0.3 → 3.0.4

checksums.yaml

@@ -1,15 +1,15 @@
 ---
 !binary "U0hBMQ==":
   metadata.gz: !binary |-
-    MWQ4ZmEwYWE4MjYwZGU4NTBkZmRmMGZmYWZiOWNkM2U4NmE0ODYzNA==
+    MmY0NTJjZmJkMmVhNTYwNTJlZmY3MjAwOTE0NDhmYjczY2MxNzAwOA==
   data.tar.gz: !binary |-
-    Y2VlNzE3NmI5YzAxZTI2NzFkMzg1Y2M0ZTgwZjEzMGY4NDRkZTg0NQ==
+    MmIwNDRmMjM3MTA3NzliZDM4ZWY4MGZmODRlNTYwODlhYTMwYmYwZQ==
 SHA512:
   metadata.gz: !binary |-
-    NDE0NTc0NGNiZTljOTFlZDdlNjYzZjc0MjIzNmE3ZGNmOGNiNmY0NDFmMTA5
-    NTQxY2NkN2Q4NGI2YjhiOGQ5NGEyOTM5MTI4MGNkZmJmYzg3NjMzZDhhZTRj
-    ZWQ3Mzk3ODg1ZDM4MTIwYjZlZGNiYzBjNWVjMDBlZmE3MGY0N2U=
+    YzI5NzgyMjc5YTlmZjljMjY5MzQ2MzU4ZmZiOWFiYmViMDgwMmYyNDJiZjE2
+    NzY4MTllZGFlN2Q1ZjcyNTVjZGIxYWQ2NTNmMmE4NDE2MTNmOTc1ODcyYjZl
+    MTljMDM3OWZhNWM2OThkYjBkMjI1MGE4YzgyMWZkZjQ3M2ZlMDU=
   data.tar.gz: !binary |-
-    ZTE1OGNmNzQxMmJjNTgyMmIxNzdhYWIyYjQyY2RiMGRhYjE4YmY0NGRlMGE2
-    YTM2MDU4NGFmYTZlNjcyY2IwMDJkMGU5N2I5OTU2NDQ5YWFlODhiOWJiMGQx
-    NjhiZGExYTQ2ZGM3MTFkN2VhY2U3MTczN2U0ODc4OWU2ODU4MzI=
+    NmU2N2MxM2EyODdhZGMyYzQ2MTA1YmQ4ZGFiMTI2MTM3ZGQ0Mzg0MGM3ODg3
+    MjQ2NTljMTg5NzYxODZhM2UyNzQ2NTZjMTU1MmIxOTRmNWJiNmVmYmNlMTBi
+    MDg3ZjlmZTE1ZTUyODBmMDQ0MjI0NzBhN2ZmOGFhMGRmZTI2MmU=

data/HISTORY.md

@@ -1,3 +1,7 @@
+## 3.0.4 - April 30, 2014
+
+- Fix for issues [#65](https://github.com/rslifka/elasticity/issues/65) and [#66](https://github.com/rslifka/elasticity/issues/66).
+
 ## 3.0.3 - April 10, 2014
 
 - Fix for issues [#63](https://github.com/rslifka/elasticity/issues/63) and [#64](https://github.com/rslifka/elasticity/issues/64).

data/README.md

@@ -106,6 +106,9 @@ These options are sent up as part of job flow submission (i.e. ```JobFlow#run```
 ```ruby
 jobflow.name                              = 'Elasticity Job Flow'
 
+# For new AWS accounts, this is required to be set
+jobflow.ec2_subnet_id                     = nil
+
 jobflow.action_on_failure                 = 'TERMINATE_JOB_FLOW'
 jobflow.keep_job_flow_alive_when_no_steps = false
 jobflow.ami_version                       = 'latest'
@@ -114,7 +117,6 @@ jobflow.log_uri                           = nil
 jobflow.enable_debugging                  = false # Requires a log_uri to enable
 
 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
@@ -300,8 +302,8 @@ jobflow.add_step(script_step)
 For a complete list of supported arguments, please see the [Amazon EMR guide](http://docs.aws.amazon.com/ElasticMapReduce/latest/DeveloperGuide/UsingEMR_s3distcp.html).
 
 ```ruby
-# Path to your script, plus arguments (both symbols and strings are supported)
-copy_step = Elasticity::S3DistCpStep.new(:arg1 => 'value1', 'arg2' => 'value2')
+copy_step = Elasticity::S3DistCpStep.new
+copy_step.arguments = [...]
 
 jobflow.add_step(copy_step)
 ```

data/lib/elasticity/job_flow.rb

@@ -84,6 +84,11 @@ module Elasticity
       @slave_instance_type = type
     end
 
+    def ec2_subnet_id=(subnet_id)
+      @ec2_subnet_id = subnet_id
+      @placement = nil
+    end
+
     def add_bootstrap_action(bootstrap_action)
       if is_jobflow_running?
         raise JobFlowRunningError, 'To modify bootstrap actions, please create a new job flow.'

data/lib/elasticity/s3distcp_step.rb

@@ -2,13 +2,9 @@ module Elasticity
 
   class S3DistCpStep < CustomJarStep
 
-    def initialize(options)
+    def initialize
+      super('/home/hadoop/lib/emr-s3distcp-1.0.jar')
       @name = 'Elasticity S3DistCp Step'
-      @jar = '/home/hadoop/lib/emr-s3distcp-1.0.jar'
-      @arguments = []
-      options.each do |argument, value|
-        @arguments << '--arg' << argument.to_s << '--arg' << value
-      end
     end
 
   end

data/lib/elasticity/version.rb

@@ -1,3 +1,3 @@
 module Elasticity
-  VERSION = '3.0.3'
+  VERSION = '3.0.4'
 end

data/spec/lib/elasticity/job_flow_spec.rb

@@ -129,6 +129,20 @@ describe Elasticity::JobFlow do
 
   end
 
+  describe '#ec2_subnet_id=' do
+    it 'should set ec2_subnet_id' do
+      subject.ec2_subnet_id = 'TEST_ID'
+      subject.ec2_subnet_id.should == 'TEST_ID'
+    end
+
+    it 'should unset placement (which has a default value) because having both set is EMR-invalid' do
+      subject.placement = 'TEST_PLACEMENT'
+
+      subject.ec2_subnet_id = '_'
+      subject.placement.should == nil
+    end
+  end
+
   describe '#add_bootstrap_action' do
 
     context 'when the jobflow is not yet started' do

data/spec/lib/elasticity/s3distcp_step_spec.rb

@@ -2,10 +2,9 @@ describe Elasticity::S3DistCpStep do
 
   it { should be_a Elasticity::CustomJarStep }
 
-  subject { Elasticity::S3DistCpStep.new({'arg1' => 'value1', :arg2 => 'value2'}) }
-
   its(:name) { should == 'Elasticity S3DistCp Step' }
   its(:jar) { should == '/home/hadoop/lib/emr-s3distcp-1.0.jar' }
-  its(:arguments) { should == %w(--arg arg1 --arg value1 --arg arg2 --arg value2) }
+  its(:arguments) { should == [] }
+  its(:action_on_failure) { should == 'TERMINATE_JOB_FLOW' }
 
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: elasticity
 version: !ruby/object:Gem::Version
-  version: 3.0.3
+  version: 3.0.4
 platform: ruby
 authors:
 - Robert Slifka
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-04-10 00:00:00.000000000 Z
+date: 2014-04-30 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rest-client