elasticity 2.7 → 3.0

checksums.yaml

@@ -1,15 +1,15 @@
 ---
 !binary "U0hBMQ==":
   metadata.gz: !binary |-
-    NWE3MTZjMzY1Mjc1NGM2MTBkMDgzNzlkZmRjZTllNWYxMzQ1MWE5Mg==
+    MzdjNjY4ZGZiYmQyMjFjMDA2YzU0MDI0NjkwNmUxYTNmMDg2OTUwOA==
   data.tar.gz: !binary |-
-    MzljODgxYWQ1YjhkOWZlZGVhZWViNzhhMzFlYjlhYTdjZmZiNjUyNg==
+    Yjc2ZGE3ZGNlZGQ3YTU4ODkzMDNmMDc1OTlmMjgzNjUzMWZiMWEwYw==
 SHA512:
   metadata.gz: !binary |-
-    OTU3OTk2ZjUxZTU1NTE2NGM0MTBhNjMzYTAxNjY3MzdhNTJiN2FlZmQzZDg3
-    NTI1Y2I2MDkzZmIwZDVmYzUzOTY1Y2U4YzY3MzkzNWJjOWI5YTVhNWRiNzQw
-    OWJmM2E1NjFkYTQ3ZDljNjZlZmExOWQ5Y2FmYTI3YTg4MThkMDM=
+    YWUzMDg0ZTYxY2M5NTQ0Y2U5NDVmZGY4NzFiYThmMDcwZTQxNDM5ZjI3ODg0
+    YTZkNTdlY2JmYTI1ZDcyMTgxZjJlZDZjNTZjOGQxNDMyZDQ1OTVlMzFmZjll
+    ZWRlMDljYjlmYzRmNDlhN2YxM2VhOGIxNDQ1Zjk0NjViOWVmOTY=
   data.tar.gz: !binary |-
-    MTJmNWIxZWNiOGUxODI0N2MwYjE1OGVlNmZjYThmYjlkMDM0Yzg0MDQyZmNj
-    NTRiNGMxNmM0M2Y1ZDVhZGFjYTMxZGZkMzI2NjFlMTc0ZTk0ODdlYmFmNzU2
-    YjU4OWJmZDM3NDI5MWUwODFmYjBjN2M5NzNjODFlMzZkYjNmMDQ=
+    YWUyYmI4Yjc2YmNiNDY4ZDhlNzYxZmVhZGQ3MmQwZDRjYjIzNjExN2RiODlh
+    MGM5YzQ0MDk3YjFhNGYxZTg2ZGM0MTlmZGQ5MmUxMTBjZDZjMTJmM2U0NWRk
+    M2M3OGVlM2Y1ZmRkNzNjNWZjNDFlNTNiMDQ2ZGY5ZjMxNmYzMDE=

data/HISTORY.md

@@ -1,3 +1,8 @@
+## 3.0 - February 15, 2014
+
+- Major/minor bump because of breaking API changes to `Elasticity::BootstrapAction` due to [Issue #55](https://github.com/rslifka/elasticity/issues/55).  After spending some time deprecating, I realized I don't have the code bandwidth to do it in a way that I would be happy with.  Move fast and break things ;)
+- Dev update: Added `Elasticity::EMR#describe_jobflow_xml` to assist in job flow debugging.
+
 ## 2.7 - December 4, 2013
 
 - `Elasticity::S3DistCp` and `Elasticity::ScriptStep` added to provide easy access to remote copying and arbitrary script execution.

data/README.md

@@ -1,6 +1,6 @@
 [![Gem Version](https://badge.fury.io/rb/elasticity.png)](http://badge.fury.io/rb/elasticity)
 
-**(December 4, 2013)** Taking requests! I have a few ideas for what might be cool features though I'd rather work on what the community wants.  Go ahead and file an issue!
+**(February 15, 2014)** Taking requests! I have a few ideas for what might be cool features though I'd rather work on what the community wants.  Go ahead and file an issue!
 
 Elasticity provides programmatic access to Amazon's Elastic Map Reduce service.  The aim is to conveniently abstract away the complex EMR REST API and make working with job flows more productive and more enjoyable.
 
@@ -20,7 +20,7 @@ gem install elasticity
 or in your Gemfile
 
 ```
-gem 'elasticity', '~> 2.7'
+gem 'elasticity', '~> 3.0'
 ```
 
 This will ensure that you protect yourself from API changes, which will only be made in major revisions.

data/lib/elasticity/bootstrap_action.rb

@@ -3,27 +3,26 @@ module Elasticity
   class BootstrapAction
 
     attr_accessor :name
-    attr_accessor :option
-    attr_accessor :value
     attr_accessor :script
+    attr_accessor :arguments
 
-    def initialize(script, option, value)
+    def initialize(script, *bootstrap_arguments)
       @name = 'Elasticity Bootstrap Action'
-      @option = option
-      @value = value
       @script = script
+      @arguments = bootstrap_arguments
     end
 
     def to_aws_bootstrap_action
-      {
+      action = {
         :name => @name,
         :script_bootstrap_action => {
-          :path => @script,
-          :args => [@option, @value]
+          :path => @script
         }
       }
+      action[:script_bootstrap_action].merge!(:args => @arguments) unless @arguments.empty?
+      action
     end
 
   end
 
-end
+end

data/lib/elasticity/emr.rb

@@ -24,6 +24,15 @@ module Elasticity
       JobFlowStatus.from_members_nodeset(xml_doc.xpath('/DescribeJobFlowsResponse/DescribeJobFlowsResult/JobFlows/member')).first
     end
 
+    # This is primarily for debugging purposes, providing insight into how
+    # Amazon internally represents jobs.  It's used to reverse-engineer
+    # how API calls construct jobflows.
+    def describe_jobflow_xml(jobflow_id)
+      describe_jobflow(jobflow_id) do |xml|
+        return xml
+      end
+    end
+
     # Lists all jobflows in all states.
     #
     # To override this behaviour, pass additional filters as specified in the AWS

data/lib/elasticity/hadoop_bootstrap_action.rb

@@ -3,10 +3,8 @@ module Elasticity
   class HadoopBootstrapAction < BootstrapAction
 
     def initialize(option, value)
-      @name = 'Elasticity Bootstrap Action (Configure Hadoop)'
-      @option = option
-      @value = value
-      @script = 's3n://elasticmapreduce/bootstrap-actions/configure-hadoop'
+      super('s3n://elasticmapreduce/bootstrap-actions/configure-hadoop', option, value)
+      self.name = 'Elasticity Bootstrap Action (Configure Hadoop)'
     end
 
   end

data/lib/elasticity/hadoop_file_bootstrap_action.rb

@@ -3,10 +3,8 @@ module Elasticity
   class HadoopFileBootstrapAction < BootstrapAction
 
     def initialize(config_file)
-      @name = 'Elasticity Bootstrap Action (Configure Hadoop via File)'
-      @option = '--mapred-config-file'
-      @value = config_file
-      @script = 's3n://elasticmapreduce/bootstrap-actions/configure-hadoop'
+      super('s3n://elasticmapreduce/bootstrap-actions/configure-hadoop', '--mapred-config-file', config_file)
+      self.name = 'Elasticity Bootstrap Action (Configure Hadoop via File)'
     end
 
   end

data/lib/elasticity/version.rb

@@ -1,3 +1,3 @@
 module Elasticity
-  VERSION = '2.7'
+  VERSION = '3.0'
 end

data/spec/lib/elasticity/bootstrap_action_spec.rb

@@ -1,25 +1,41 @@
 describe Elasticity::BootstrapAction do
 
   subject do
-    Elasticity::BootstrapAction.new('script', 'option', 'value')
+    Elasticity::BootstrapAction.new('script', 'arg1', 'arg2')
   end
 
   its(:name) { should == 'Elasticity Bootstrap Action' }
-  its(:option) { should == 'option' }
-  its(:value) { should == 'value' }
   its(:script) { should == 'script' }
+  its(:arguments) { should == %w(arg1 arg2) }
 
   describe '#to_aws_bootstrap_action' do
-    it 'should create a bootstrap action' do
-      subject.to_aws_bootstrap_action.should ==
-        {
-          :name => 'Elasticity Bootstrap Action',
-          :script_bootstrap_action => {
-            :path => 'script',
-            :args => %w(option value)
-          }
+
+    let(:aws_bootstrap_step) {
+      {
+        :name => 'Elasticity Bootstrap Action',
+        :script_bootstrap_action => {
+          :path => 'script'
         }
+      }
+    }
+
+    context 'when there are no arguments' do
+      let(:bootstrap_action) { Elasticity::BootstrapAction.new('script') }
+      it 'should create a proper bootstrap action' do
+        expect(bootstrap_action.to_aws_bootstrap_action).to eq(aws_bootstrap_step)
+      end
     end
+
+    context 'when there are arguments' do
+      let(:bootstrap_action) { Elasticity::BootstrapAction.new('script', 'arg1', 'arg2') }
+      before do
+        aws_bootstrap_step[:script_bootstrap_action][:args] = %w(arg1 arg2)
+      end
+      it 'should create a proper bootstrap action' do
+        expect(subject.to_aws_bootstrap_action).to be_a_hash_including(aws_bootstrap_step)
+      end
+    end
+
   end
 
 end

data/spec/lib/elasticity/emr_spec.rb

@@ -203,6 +203,18 @@ describe Elasticity::EMR do
     end
   end
 
+  describe '#describe_jobflow_xml' do
+
+    before do
+      subject.should_receive(:describe_jobflow).with('JOBFLOW_ID').and_yield('XML_RESULT')
+    end
+
+    it 'should describe the specified jobflow via raw xml text' do
+      subject.describe_jobflow_xml('JOBFLOW_ID').should == 'XML_RESULT'
+    end
+
+  end
+
   describe '#modify_instance_groups' do
 
     it 'should modify the specified instance groups' do

data/spec/lib/elasticity/hadoop_bootstrap_action_spec.rb

@@ -7,8 +7,7 @@ describe Elasticity::HadoopBootstrapAction do
   it { should be_a Elasticity::BootstrapAction }
 
   its(:name) { should == 'Elasticity Bootstrap Action (Configure Hadoop)' }
-  its(:option) { should == 'option' }
-  its(:value) { should == 'value' }
+  its(:arguments) { should == %w(option value) }
   its(:script) { should == 's3n://elasticmapreduce/bootstrap-actions/configure-hadoop' }
 
 end

data/spec/lib/elasticity/hadoop_file_bootstrap_action_spec.rb

@@ -7,8 +7,7 @@ describe Elasticity::HadoopFileBootstrapAction do
   it { should be_a Elasticity::BootstrapAction }
 
   its(:name) { should == 'Elasticity Bootstrap Action (Configure Hadoop via File)' }
-  its(:option) { should == '--mapred-config-file' }
-  its(:value) { should == 'config_file' }
+  its(:arguments) { should == %w(--mapred-config-file config_file) }
   its(:script) { should == 's3n://elasticmapreduce/bootstrap-actions/configure-hadoop' }
 
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: elasticity
 version: !ruby/object:Gem::Version
-  version: '2.7'
+  version: '3.0'
 platform: ruby
 authors:
 - Robert Slifka
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-12-04 00:00:00.000000000 Z
+date: 2014-02-15 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rest-client