masamune 0.17.1 → 0.17.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 6ddce086bb21f28d0fed13c985c5d4f85712e9a4
-  data.tar.gz: 0f9458ce48db794367985117fe07a7eb9fa6c67f
+  metadata.gz: 539cdf75fd7e8734d5ad8393a80c1fe389ca1e52
+  data.tar.gz: fea5c3e3908578febd63ac0a1e959c30442b5e09
 SHA512:
-  metadata.gz: 532d05598d8286dc976935cbd15ee0e943dd4127f4d0f60f85044fb983f7f9214fa9c6115ea9b715684dd2985ad1740b00d0669cf495311ec9d90e999b90448b
-  data.tar.gz: 6541b858616931ed4b50aae951824e3ed0b40e4b49a4b7595540a2b407b3f9f50f7f2e99d10eebb21a6a3c2def11e43abe085e9952950d632406967467a4b01e
+  metadata.gz: 06705c4e419adb0b2ffb82d35b80e92cfca1148f97c638880277f06d6f52731354915a9a3e468fdeec4f0874a5da7c6213660e5bc0df70e8ed5a104b3885d361
+  data.tar.gz: b6c98cdbe32f2f83ce54835243da0c1f060f5dfca1500dd6366a99d3fb7b77e4f181b373dac32eb388d027840b796820e0979b71c03445f75d2520032a3d3966

data/lib/masamune/actions/execute.rb

@@ -38,6 +38,10 @@ module Masamune::Actions
         define_method(:command_args) do
           args
         end
+
+        define_method(:command_env) do
+          opts[:env] || {}
+        end
       end
 
       klass.class_eval do

data/lib/masamune/commands/aws_emr.rb

@@ -77,7 +77,7 @@ module Masamune::Commands
     def ssh_command
       @ssh_command ||= begin
         result = nil
-        execute(*ssh_args, fail_fast: true, safe: true) do |line|
+        execute(*ssh_args, env: command_env, fail_fast: true, safe: true) do |line|
           next if result
           if line =~ /exit\Z/
             result = line.sub(/ exit\Z/, '').split(' ')

data/lib/masamune/version.rb

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

data/spec/masamune/actions/execute_spec.rb

@@ -52,5 +52,12 @@ describe Masamune::Actions::Execute do
 
       it { expect { |b| instance.execute(*command, options, &b) }.to yield_with_args('pong', 0) }
     end
+
+    context 'with a simple command with env' do
+      let(:command) { %Q(bash -c "echo $MESSAGE") }
+      let(:options) { {env: { 'MESSAGE' => 'pong' }, fail_fast: true} }
+
+      it { expect { |b| instance.execute(*command, options, &b) }.to yield_with_args('pong', 0) }
+    end
   end
 end

data/spec/masamune/commands/aws_emr_spec.rb

@@ -49,10 +49,10 @@ describe Masamune::Commands::AwsEmr do
 
     context 'with --cluster-id j-XYZ' do
       let(:delegate) { double(command_args: ['hive', '-e', "'show tables;'"]) }
-      let(:attrs) { { cluster_id: 'j-XYZ' } }
+      let(:attrs) { { config_file: '/etc/aws_config', cluster_id: 'j-XYZ' } }
 
       before do
-        expect(instance).to receive(:execute).with('aws', 'emr', 'ssh', '--cluster-id', 'j-XYZ', '--command', 'exit', {fail_fast: true, safe: true}).
+        expect(instance).to receive(:execute).with('aws', 'emr', 'ssh', '--cluster-id', 'j-XYZ', '--command', 'exit', {env: {"AWS_CONFIG_FILE"=>"/etc/aws_config"}, fail_fast: true, safe: true}).
           and_yield('ssh -o StrictHostKeyChecking=no -o ServerAliveInterval=10 -i /etc/ssh/aws.key hadoop@ec2-10.0.0.1.compute-1.amazonaws.com exit').
           and_yield("Warning: Permanently added 'ec2-10.0.0.1.compute-1.amazonaws.com,10.0.0.1' (ECDSA) to the list of known hosts.")
       end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: masamune
 version: !ruby/object:Gem::Version
-  version: 0.17.1
+  version: 0.17.2
 platform: ruby
 authors:
 - Michael Andrews