masamune 0.17.15 → 0.18.0

data/spec/masamune/environment_spec.rb

@@ -23,6 +23,23 @@
 describe Masamune::Environment do
   let(:instance) { described_class.new }
   let(:run_dir) { Dir.mktmpdir('masamune') }
+  let(:log_dir) { Dir.mktmpdir('masamune') }
+
+  describe '#log_file_name' do
+    subject { instance.log_file_name }
+
+    context 'when log_dir defined' do
+      before do
+        instance.filesystem.add_path(:log_dir, log_dir)
+      end
+
+      it { is_expected.to eq(File.join(log_dir, instance.log_file_template)) }
+    end
+
+    context 'when log_dir not defined' do
+      it { is_expected.to be_nil }
+    end
+  end
 
   describe '#with_exclusive_lock' do
     context 'when run_dir not defined' do
@@ -50,7 +67,7 @@ describe Masamune::Environment do
       it { expect { |b| instance.with_exclusive_lock('some_lock', &b) }.to yield_control }
     end
 
-    context 'when lock cannot be acquired' do
+    context 'when lock cannot be acquired and returns 1' do
       before do
         instance.filesystem.add_path(:run_dir, run_dir)
         expect(instance.logger).to receive(:error).with(/acquire lock attempt failed for 'some_lock'/)
@@ -59,5 +76,15 @@ describe Masamune::Environment do
 
       it { expect { |b| instance.with_exclusive_lock('some_lock', &b) }.to_not raise_error }
     end
+
+    context 'when lock cannot be acquired and returns false' do
+      before do
+        instance.filesystem.add_path(:run_dir, run_dir)
+        expect(instance.logger).to receive(:error).with(/acquire lock attempt failed for 'some_lock'/)
+        expect_any_instance_of(File).to receive(:flock).once.and_return(false)
+      end
+
+      it { expect { |b| instance.with_exclusive_lock('some_lock', &b) }.to_not raise_error }
+    end
   end
 end

data/spec/masamune/schema/catalog_spec.rb

@@ -36,7 +36,7 @@ describe Masamune::Schema::Catalog do
 
     it { expect(postgres.foo_dimension.id).to eq(:foo) }
     it { expect(postgres.bar_dimension).to be_nil }
-    it { expect { postgres.foo_baz }.to raise_error ArgumentError, "unknown attribute type 'baz'" }
+    it { expect { postgres.foo_baz }.to raise_error NoMethodError }
   end
 
   describe '#[]' do

data/spec/masamune/tasks/aws_emr_thor_spec.rb

@@ -45,7 +45,7 @@ describe Masamune::Tasks::AwsEmrThor do
         let(:options) { ['--cluster-id=j-XYZ'] }
         it do
           expect_any_instance_of(described_class).to receive(:aws_emr).with(hash_including(action: action, cluster_id: 'j-XYZ')).once.and_return(mock_success)
-          cli_invocation
+          execute_command
         end
       end
     end
@@ -57,7 +57,7 @@ describe Masamune::Tasks::AwsEmrThor do
 
       it do
         expect_any_instance_of(described_class).to receive(:aws_emr).with(hash_including(action: action)).once.and_return(mock_success)
-        cli_invocation
+        execute_command
       end
 
       context 'with --help' do

data/spec/masamune/tasks/hive_thor_spec.rb

@@ -36,7 +36,7 @@ describe Masamune::Tasks::HiveThor do
 
     it do
       expect_any_instance_of(described_class).to receive(:hive).with(hash_including(retries: 0)).once.and_return(mock_success)
-      cli_invocation
+      execute_command
     end
   end
 
@@ -46,7 +46,7 @@ describe Masamune::Tasks::HiveThor do
       expect_any_instance_of(described_class).to receive(:hive).with(exec: 'CREATE DATABASE IF NOT EXISTS masamune;', database: nil).and_return(mock_success)
       expect_any_instance_of(described_class).to receive(:hive).with(file: instance_of(String)).and_return(mock_success)
       expect_any_instance_of(described_class).to receive(:hive).with(hash_including(file: File.expand_path('zombo.hql'))).once.and_return(mock_success)
-      cli_invocation
+      execute_command
     end
   end
 
@@ -54,7 +54,7 @@ describe Masamune::Tasks::HiveThor do
     let(:options) { ['--file=zombo.hql'] }
     it do
       expect_any_instance_of(described_class).to receive(:hive).with(hash_including(file: File.expand_path('zombo.hql'))).once.and_return(mock_success)
-      cli_invocation
+      execute_command
     end
   end
 
@@ -62,7 +62,7 @@ describe Masamune::Tasks::HiveThor do
     let(:options) { ['--output=report.txt'] }
     it do
       expect_any_instance_of(described_class).to receive(:hive).with(hash_including(output: File.expand_path('report.txt'))).once.and_return(mock_success)
-      cli_invocation
+      execute_command
     end
   end
 
@@ -70,7 +70,7 @@ describe Masamune::Tasks::HiveThor do
     let(:options) { ['--variables=YEAR:2015', 'MONTH:1'] }
     it do
       expect_any_instance_of(described_class).to receive(:hive).with(hash_including(variables: { 'YEAR' => '2015', 'MONTH' => '1' })).once.and_return(mock_success)
-      cli_invocation
+      execute_command
     end
   end
 
@@ -78,7 +78,7 @@ describe Masamune::Tasks::HiveThor do
     let(:options) { ['-X', 'YEAR:2015', 'MONTH:1'] }
     it do
       expect_any_instance_of(described_class).to receive(:hive).with(hash_including(variables: { 'YEAR' => '2015', 'MONTH' => '1' })).once.and_return(mock_success)
-      cli_invocation
+      execute_command
     end
   end
 
@@ -86,7 +86,7 @@ describe Masamune::Tasks::HiveThor do
     let(:options) { ['--retry'] }
     it do
       expect_any_instance_of(described_class).to receive(:hive).with(hash_excluding(retries: 0)).once.and_return(mock_success)
-      cli_invocation
+      execute_command
     end
   end
 end

data/spec/masamune/tasks/postgres_thor_spec.rb

@@ -33,7 +33,7 @@ describe Masamune::Tasks::PostgresThor do
 
     it do
       expect_any_instance_of(described_class).to receive(:postgres).with(hash_including(retries: 0)).once.and_return(mock_success)
-      cli_invocation
+      execute_command
     end
   end
 
@@ -42,7 +42,7 @@ describe Masamune::Tasks::PostgresThor do
     it do
       expect_any_instance_of(described_class).to receive(:postgres).with(file: instance_of(String), retries: 0).once.and_return(mock_success)
       expect_any_instance_of(described_class).to receive(:postgres).with(hash_including(file: 'zombo.hql')).once.and_return(mock_success)
-      cli_invocation
+      execute_command
     end
   end
 
@@ -50,7 +50,7 @@ describe Masamune::Tasks::PostgresThor do
     let(:options) { ['--file=zombo.hql'] }
     it do
       expect_any_instance_of(described_class).to receive(:postgres).with(hash_including(file: 'zombo.hql')).once.and_return(mock_success)
-      cli_invocation
+      execute_command
     end
   end
 
@@ -58,7 +58,7 @@ describe Masamune::Tasks::PostgresThor do
     let(:options) { ['--retry'] }
     it do
       expect_any_instance_of(described_class).to receive(:postgres).with(hash_excluding(retries: 0)).once.and_return(mock_success)
-      cli_invocation
+      execute_command
     end
   end
 end

data/spec/masamune/tasks/shell_thor_spec.rb

@@ -31,7 +31,7 @@ describe Masamune::Tasks::ShellThor do
   context 'with no arguments' do
     it do
       expect(Pry).to receive(:start)
-      cli_invocation
+      execute_command
     end
   end
 

data/spec/masamune/thor_spec.rb

@@ -41,12 +41,6 @@ describe Masamune::Thor do
         # NOP
       end
 
-      desc 'current_dir', 'current_dir'
-      skip
-      def current_dir_task
-        console(fs.path(:current_dir))
-      end
-
       desc 'unknown', 'unknown'
       target path: fs.path(:unknown_dir, 'target/%Y-%m-%d')
       source path: fs.path(:unknown_dir, 'source/%Y%m%d*.log')
@@ -70,7 +64,7 @@ describe Masamune::Thor do
       end
 
       it 'continues execution' do
-        expect { cli_invocation }.to_not raise_error
+        expect { execute_command }.to_not raise_error
       end
     end
 
@@ -99,7 +93,7 @@ describe Masamune::Thor do
       let(:command) { 'command' }
       let(:options) { ['--version'] }
       it 'exits with status code 0 and prints version' do
-        expect { cli_invocation }.to raise_error { |e|
+        expect { execute_command }.to raise_error { |e|
           expect(e).to be_a(SystemExit)
           expect(e.message).to eq('exit')
           expect(e.status).to eq(0)
@@ -188,7 +182,7 @@ describe Masamune::Thor do
         expect_any_instance_of(Logger).to receive(:error).with(/random exception/)
         allow(thor_class).to receive(:dispatch).and_raise('random exception')
       end
-      it { expect { cli_invocation }.to raise_error(/random exception/) }
+      it { expect { execute_command }.to raise_error(/random exception/) }
     end
 
     context 'with command that raises exception after initialization' do
@@ -198,14 +192,14 @@ describe Masamune::Thor do
         expect_any_instance_of(Logger).to receive(:error).with(/random exception/)
         allow(thor_class).to receive(:after_initialize_invoke).and_raise('random exception')
       end
-      it { expect { cli_invocation }.to raise_error(/random exception/) }
+      it { expect { execute_command }.to raise_error(/random exception/) }
     end
 
     context 'with command that raises exception during execution' do
       let(:command) { 'unknown' }
       let(:options) { ['--start', '2013-01-01'] }
       it 'exits with status code 1 and prints error to stderr' do
-        expect { cli_invocation }.to raise_error { |e|
+        expect { execute_command }.to raise_error { |e|
           expect(e).to be_a(SystemExit)
           expect(e.message).to eq('Path :unknown_dir not defined')
           expect(e.status).to eq(1)
@@ -222,15 +216,16 @@ describe Masamune::Thor do
         include Masamune::Thor
 
         desc 'current_dir', 'current_dir'
-        def current_dir
+        def current_dir_task
           console(fs.path(:current_dir))
         end
       end
     end
 
     let(:command) { 'current_dir' }
+    let(:options) { ['--no-quiet'] }
     it 'prints :current_dir' do
-      cli_invocation
+      execute_command
       expect(stdout.string).to eq(File.dirname(__FILE__) + "\n")
       expect(stderr.string).to be_blank
     end

data/spec/support/masamune/example_group.rb

@@ -24,13 +24,14 @@ require 'masamune/has_environment'
 
 # Separate environment for test harness itself
 module Masamune::ExampleGroup
+  extend ActiveSupport::Concern
+
   include Masamune::HasEnvironment
   extend self # rubocop:disable Style/ModuleFunction
 
-  def self.included(base)
-    base.before(:all) do
+  included do
+    before(:all) do
       filesystem.environment = self.environment = Masamune::ExampleGroup.environment
-      Thor.send(:include, Masamune::ThorMute)
     end
   end
 end

data/spec/support/masamune/job_example_group.rb

@@ -20,40 +20,39 @@
 #  OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
 #  THE SOFTWARE.
 
+require_relative 'shared_example_group'
+
 module Masamune::JobExampleGroup
-  module JobFixtureContext
-    shared_context 'job_fixture' do |context_options = {}|
-      fixture_file = example_fixture_file(context_options.slice(:fixture, :file, :path))
-      let(:fixture) { example_fixture(file: fixture_file) }
-
-      before :all do
-        load_example_config!
-        clean_example_run!
-      end
+  extend ActiveSupport::Concern
 
-      before do
-        setup_example_input!(fixture)
-      end
+  include Masamune::ExampleGroup
+  include Masamune::SharedExampleGroup
+  include Masamune::Actions::Filesystem
+  include Masamune::Actions::Hive
+  include Masamune::Actions::Postgres
+
+  shared_context 'job_fixture' do |context_options = {}|
+    fixture_file = example_fixture_file(context_options.slice(:fixture, :file, :path))
+    let(:fixture) { example_fixture(file: fixture_file) }
+
+    before :all do
+      load_example_config!
+      clean_example_run!
+    end
+
+    before do
+      setup_example_input!(fixture)
+    end
 
-      it "should match #{fixture_file}" do
-        aggregate_failures 'generates expected output' do
-          gather_example_output(fixture) do |actual_data, expect_file, expect_data|
-            expect(File.exist?(expect_file)).to eq(true)
-            expect(actual_data).to eq(expect_data)
-          end
+    it "should match #{fixture_file}" do
+      aggregate_failures 'generates expected output' do
+        gather_example_output(fixture) do |actual_data, expect_file, expect_data|
+          expect(File.exist?(expect_file)).to eq(true)
+          expect(actual_data).to eq(expect_data)
         end
       end
     end
   end
-
-  def self.included(base)
-    base.send(:include, Masamune::ExampleGroup)
-    base.send(:include, Masamune::SharedExampleGroup)
-    base.send(:include, Masamune::Actions::Filesystem)
-    base.send(:include, Masamune::Actions::Hive)
-    base.send(:include, Masamune::Actions::Postgres)
-    base.send(:include, JobFixtureContext)
-  end
 end
 
 RSpec.configure do |config|

data/spec/support/masamune/mock_command.rb

@@ -68,15 +68,15 @@ module Masamune::MockCommand
     end
   end
 
-  included do |base|
-    base.before do
+  included do
+    before do
       new_method = Masamune::Commands::Shell.method(:new)
       allow(Masamune::Commands::Shell).to receive(:new) do |command, options|
         new_method.call(CommandMatcher.new(command), options || {})
       end
     end
 
-    base.after do
+    after do
       CommandMatcher.reset!
     end
   end

data/spec/support/masamune/shared_example_group.rb

@@ -34,22 +34,20 @@ module Masamune::SharedExampleGroup
     stdout.string
   end
 
-  def capture_output
-    @stdout = StringIO.new
-    @stderr = StringIO.new
+  def capture_output(stdout, stderr)
     tmp_stdout = $stdout
-    $stdout = @stdout
+    $stdout = stdout
     tmp_stderr = $stderr
-    $stderr = @stderr
+    $stderr = stderr
     yield
   ensure
     $stdout = tmp_stdout
     $stderr = tmp_stderr
   end
 
-  def capture(enable = true)
+  def capture(stdout: StringIO.new, stderr: StringIO.new, enable: true)
     if enable
-      capture_output do
+      capture_output(stdout, stderr) do
         yield
       end
     else
@@ -77,9 +75,9 @@ module Masamune::SharedExampleGroup
 
   # TODO: iterate over databases
   def clean_example_run!
-    if configuration.postgres[:clean]
-      postgres_admin(action: :drop, database: configuration.postgres[:database])
-      postgres_admin(action: :create, database: configuration.postgres[:database])
+    if configuration.commands.postgres[:clean]
+      postgres_admin(action: :drop, database: configuration.commands.postgres[:database])
+      postgres_admin(action: :create, database: configuration.commands.postgres[:database])
       postgres(file: define_schema(catalog, :postgres).to_file, retries: 0)
     end
     filesystem.paths.each do |_, (path, options)|

data/spec/support/masamune/step_example_group.rb

@@ -21,44 +21,41 @@
 #  THE SOFTWARE.
 
 module Masamune::StepExampleGroup
-  module StepFixtureContext
-    shared_context 'step_fixture' do |context_options = {}|
-      fixture_file = example_fixture_file(context_options.slice(:fixture, :file, :path))
-      step_file = example_step
+  extend ActiveSupport::Concern
 
-      args = context_options[:args]
-      subject do
-        capture_popen([step_file, args].compact.join(' '), input)
-      end
+  include Masamune::SharedExampleGroup
+
+  shared_context 'step_fixture' do |context_options = {}|
+    fixture_file = example_fixture_file(context_options.slice(:fixture, :file, :path))
+    step_file = example_step
 
-      context "with #{fixture_file} fixture" do
-        let(:fixture) { Masamune::StepFixture.load({ file: fixture_file }, binding) }
+    args = context_options[:args]
+    subject do
+      capture_popen([step_file, args].compact.join(' '), input)
+    end
 
-        let(:input) { fixture.input }
-        let(:output) { fixture.output }
+    context "with #{fixture_file} fixture" do
+      let(:fixture) { Masamune::StepFixture.load({ file: fixture_file }, binding) }
 
-        it 'should match output' do
-          is_expected.to eq(output)
-        end
+      let(:input) { fixture.input }
+      let(:output) { fixture.output }
 
-        after(:each) do |example|
-          if example.exception && ENV['MASAMUNE_RECORD']
-            shell = Thor::Shell::Basic.new
-            shell.say(example.exception)
-            if shell.yes?('Save recording?')
-              fixture.output = subject
-              fixture.save
-            end
+      it 'should match output' do
+        is_expected.to eq(output)
+      end
+
+      after(:each) do |example|
+        if example.exception && ENV['MASAMUNE_RECORD']
+          shell = Thor::Shell::Basic.new
+          shell.say(example.exception)
+          if shell.yes?('Save recording?')
+            fixture.output = subject
+            fixture.save
           end
         end
       end
     end
   end
-
-  def self.included(base)
-    base.send(:include, Masamune::SharedExampleGroup)
-    base.send(:include, StepFixtureContext)
-  end
 end
 
 RSpec.configure do |config|