masamune 0.11.2 → 0.11.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: dfbc2a3764c6ed9c4a5cb1b82bfa0f7ca22aac53
-  data.tar.gz: fd95120e7e1a26b847af62c09ce7b0fdcc30b736
+  metadata.gz: 56a5dbe4b4256757b5283c3df6dc9493b128b3f3
+  data.tar.gz: bb4f40e8d8b94bdea7479e01c3c42a5f6cf01204
 SHA512:
-  metadata.gz: 601caddfc1aadb966c05010a0f833cfc70051a965d60cda3c59ceacde696109536bf02c422695ee2ec0d159b74f55ceda83cc863d2b2a6c03ce4156010f07a25
-  data.tar.gz: e35f201ff313c4a3d9a98a069ace3cc8ba2e1d425d93ae7ffbbda802fdca968a892b19ce078f2c03bf24ca1e1549b4fe456d30ba66a7dfe8a8f86c69627e66d7
+  metadata.gz: d1a80a035977edb527b81081bc281d599d1a34e1c173e17fd202c0e476818d3327a484da07e7f16122001c43a32785e0625f60f720ccb0ca2d6e959e337259a0
+  data.tar.gz: 38fb039356f2818a729b52ead4301d5e89680f4c77df63bf2f446a25acfd9fcc08f0e53586d2a450915c60cca089908076bf2f50468fcc5a3ee5edd33428ce3a

data/lib/masamune/actions/elastic_mapreduce.rb

@@ -51,18 +51,21 @@ module Masamune::Actions
       extra.empty?
     end
 
+    def validate_jobflow!
+      return unless jobflow_required?
+      jobflow = configuration.elastic_mapreduce[:jobflow]
+      raise ::Thor::RequiredArgumentMissingError, "No value provided for required options '--jobflow'" unless jobflow
+      raise ::Thor::RequiredArgumentMissingError, %Q(Value '#{jobflow}' for '--jobflow' doesn't exist) unless elastic_mapreduce(extra: '--list', jobflow: jobflow, fail_fast: false).success?
+    end
+
     included do |base|
       base.class_option :jobflow, :aliases => '-j', :desc => 'Elastic MapReduce jobflow ID (Hint: elastic-mapreduce --list)' if defined?(base.class_option)
       base.after_initialize(:early) do |thor, options|
-        next unless options[:initialize]
-        next if thor.configuration.elastic_mapreduce.empty?
+        next unless thor.configuration.elastic_mapreduce.any?
         next unless thor.configuration.elastic_mapreduce.fetch(:enabled, true)
-        jobflow = thor.resolve_jobflow(options[:jobflow] || thor.configuration.elastic_mapreduce[:jobflow])
-        if thor.jobflow_required?
-          raise ::Thor::RequiredArgumentMissingError, "No value provided for required options '--jobflow'" unless jobflow
-          raise ::Thor::RequiredArgumentMissingError, %Q(Value '#{jobflow}' for '--jobflow' doesn't exist) unless thor.elastic_mapreduce(extra: '--list', jobflow: jobflow, fail_fast: false).success?
-        end
-        thor.configuration.elastic_mapreduce[:jobflow] = jobflow
+        thor.configuration.elastic_mapreduce[:jobflow] = thor.resolve_jobflow(options[:jobflow] || thor.configuration.elastic_mapreduce[:jobflow])
+        next unless options[:initialize]
+        thor.validate_jobflow!
       end if defined?(base.after_initialize)
     end
   end

data/lib/masamune/version.rb

@@ -21,5 +21,5 @@
 #  THE SOFTWARE.
 
 module Masamune
-  VERSION = '0.11.2'
+  VERSION = '0.11.3'
 end

data/spec/masamune/actions/elastic_mapreduce_spec.rb

@@ -78,7 +78,10 @@ describe Masamune::Actions::ElasticMapreduce do
       before do
         expect(instance).to_not receive(:elastic_mapreduce)
       end
-      it { expect { subject }.to_not raise_error }
+      it do
+        expect { subject }.to_not raise_error
+        expect(instance.configuration.elastic_mapreduce[:jobflow]).to eq('j-XYZ')
+      end
     end
 
     context 'when jobflow does not exist' do
@@ -98,7 +101,7 @@ describe Masamune::Actions::ElasticMapreduce do
       end
       it do
         expect { subject }.to_not raise_error
-        expect(configuration[:jobflow]).to eq('j-XYZ')
+        expect(instance.configuration.elastic_mapreduce[:jobflow]).to eq('j-XYZ')
       end
     end
 
@@ -110,7 +113,7 @@ describe Masamune::Actions::ElasticMapreduce do
       end
       it do
         expect { subject }.to_not raise_error
-        expect(configuration[:jobflow]).to eq('j-XYZ')
+        expect(instance.configuration.elastic_mapreduce[:jobflow]).to eq('j-XYZ')
       end
     end
   end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: masamune
 version: !ruby/object:Gem::Version
-  version: 0.11.2
+  version: 0.11.3
 platform: ruby
 authors:
 - Michael Andrews
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-04-20 00:00:00.000000000 Z
+date: 2015-04-21 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: thor