masamune 0.17.12 → 0.17.13

data/spec/masamune/commands/hadoop_filesystem_spec.rb

@@ -21,7 +21,7 @@
 #  THE SOFTWARE.
 
 describe Masamune::Commands::HadoopFilesystem do
-  let(:configuration) { {options: options} }
+  let(:configuration) { { options: options } }
   let(:options) { [] }
   let(:attrs) { {} }
 
@@ -33,14 +33,14 @@ describe Masamune::Commands::HadoopFilesystem do
   end
 
   describe '#command_args' do
-    let(:attrs) { {extra: ['-ls', '/']} }
+    let(:attrs) { { extra: ['-ls', '/'] } }
 
     subject { instance.command_args }
 
     it { is_expected.to eq(['hadoop', 'fs', '-ls', '/']) }
 
     context 'with options' do
-      let(:options) { [{'--conf' => 'hadoop.conf'}] }
+      let(:options) { [{ '--conf' => 'hadoop.conf' }] }
 
       it { is_expected.to eq(['hadoop', 'fs', '--conf', 'hadoop.conf', '-ls', '/']) }
     end

data/spec/masamune/commands/hadoop_streaming_spec.rb

@@ -23,10 +23,10 @@
 describe Masamune::Commands::HadoopStreaming do
   let(:filesystem) { Masamune::MockFilesystem.new }
 
-  let(:configuration) { {options: options, input: input_option, output: 'output_dir', mapper: 'mapper.rb', reducer: 'reducer.rb', extra: extra} }
+  let(:configuration) { { options: options, input: input_option, output: 'output_dir', mapper: 'mapper.rb', reducer: 'reducer.rb', extra: extra } }
   let(:options) { [] }
   let(:input_option) { 'input.txt' }
-  let(:extra) { ['-D', %q(map.output.key.field.separator='\t')] }
+  let(:extra) { ['-D', 'map.output.key.field.separator=\'\t\''] }
   let(:attrs) { {} }
 
   let(:delegate) { double }
@@ -87,13 +87,13 @@ describe Masamune::Commands::HadoopStreaming do
     it { is_expected.to eq(pre_command_args + extra + post_command_args) }
 
     context 'with options' do
-      let(:options) { [{'-cacheFile' => 'cache.rb'}] }
+      let(:options) { [{ '-cacheFile' => 'cache.rb' }] }
 
       it { is_expected.to eq(pre_command_args + extra + options.map(&:to_a).flatten + post_command_args) }
     end
 
     context 'with quote' do
-      let(:attrs) { {quote: true} }
+      let(:attrs) { { quote: true } }
       let(:quoted_extra) { ['-D', %q(map.output.key.field.separator='"'\\\\t'"')] }
 
       subject { instance.command_args }

data/spec/masamune/commands/hive_spec.rb

@@ -22,7 +22,7 @@
 
 describe Masamune::Commands::Hive do
   let(:filesystem) { Masamune::MockFilesystem.new }
-  let(:configuration) { {:options => options} }
+  let(:configuration) { { options: options } }
   let(:options) { [] }
   let(:attrs) { {} }
 
@@ -55,17 +55,17 @@ describe Masamune::Commands::Hive do
     it { is_expected.to eq(default_command) }
 
     context 'with command attrs' do
-      let(:options) { [{'-d' => 'DATABASE=development'}] }
+      let(:options) { [{ '-d' => 'DATABASE=development' }] }
       it { is_expected.to eq([*default_command, '-d', 'DATABASE=development']) }
     end
 
     context 'with file' do
-      let(:attrs) { {file: local_file} }
+      let(:attrs) { { file: local_file } }
       it { is_expected.to eq([*default_command, '-f', remote_file]) }
     end
 
     context 'with file and debug' do
-      let(:attrs) { {file: local_file, debug: true} }
+      let(:attrs) { { file: local_file, debug: true } }
       before do
         expect(File).to receive(:read).with(local_file).and_return('SHOW TABLES;')
         expect(instance.logger).to receive(:debug).with("#{local_file}:\nSHOW TABLES;")
@@ -74,7 +74,7 @@ describe Masamune::Commands::Hive do
     end
 
     context 'with exec' do
-      let(:attrs) { {exec: 'SELECT * FROM table;'} }
+      let(:attrs) { { exec: 'SELECT * FROM table;' } }
       before do
         expect(instance).to receive(:exec_file).and_return(remote_file)
       end
@@ -82,12 +82,12 @@ describe Masamune::Commands::Hive do
     end
 
     context 'with file and exec' do
-      let(:attrs) { {file: local_file, exec: 'SELECT * FROM table;'} }
+      let(:attrs) { { file: local_file, exec: 'SELECT * FROM table;' } }
       it { expect { instance }.to raise_error ArgumentError, 'Cannot specify both file and exec' }
     end
 
     context 'with variables' do
-      let(:attrs) { {file: local_file, variables: {R: 'R2DO', C: 'C3PO'}} }
+      let(:attrs) { { file: local_file, variables: { R: 'R2DO', C: 'C3PO' } } }
       it { is_expected.to eq([*default_command, '-f', remote_file, '-d', 'R=R2DO', '-d', 'C=C3PO']) }
     end
 
@@ -96,12 +96,12 @@ describe Masamune::Commands::Hive do
         filesystem.touch!('setup_a.hql', 'setup_b.hql')
       end
 
-      let(:attrs) { {setup_files: ['setup_a.hql', 'setup_b.hql']} }
+      let(:attrs) { { setup_files: ['setup_a.hql', 'setup_b.hql'] } }
       it { is_expected.to eq([*default_command, '-i', 'setup_a.hql', '-i', 'setup_b.hql']) }
     end
 
     context 'with template file' do
-      let(:attrs) { {file: 'zomg.hql.erb'} }
+      let(:attrs) { { file: 'zomg.hql.erb' } }
       before do
         expect(Masamune::Template).to receive(:render_to_file).with('zomg.hql.erb', {}).and_return('zomg.hql')
         expect_any_instance_of(Masamune::MockFilesystem).to receive(:copy_file_to_file)
@@ -110,7 +110,7 @@ describe Masamune::Commands::Hive do
     end
 
     context 'with template file and debug' do
-      let(:attrs) { {file: 'zomg.hql.erb', debug: true} }
+      let(:attrs) { { file: 'zomg.hql.erb', debug: true } }
       before do
         expect(Masamune::Template).to receive(:render_to_file).with('zomg.hql.erb', {}).and_return('zomg.hql')
         expect(File).to receive(:read).with('zomg.hql').and_return('SHOW TABLES;')
@@ -124,7 +124,7 @@ describe Masamune::Commands::Hive do
   describe '#handle_stdout' do
     let(:buffer) { StringIO.new }
     let(:delimiter) { "\t" }
-    let(:attrs) { {buffer: buffer, delimiter: delimiter, csv: true} }
+    let(:attrs) { { buffer: buffer, delimiter: delimiter, csv: true } }
 
     context 'encode NULL' do
       let(:input_row) { ['A', 'NULL', 'B', 'C', '', 'E'].join(delimiter) }

data/spec/masamune/commands/postgres_admin_spec.rb

@@ -21,7 +21,7 @@
 #  THE SOFTWARE.
 
 describe Masamune::Commands::PostgresAdmin do
-  let(:configuration) { {:create_db_path => 'createdb', :drop_db_path => 'dropdb', :hostname => 'localhost', :username => 'postgres'} }
+  let(:configuration) { { create_db_path: 'createdb', drop_db_path: 'dropdb', hostname: 'localhost', username: 'postgres' } }
   let(:attrs) { {} }
 
   let(:delegate) { double }
@@ -38,42 +38,42 @@ describe Masamune::Commands::PostgresAdmin do
     end
 
     context 'action :create with database' do
-      let(:attrs) { {action: :create, database: 'zombo'} }
+      let(:attrs) { { action: :create, database: 'zombo' } }
       it { is_expected.to eq(['createdb', '--host=localhost', '--username=postgres', '--no-password', 'zombo']) }
     end
 
     context 'action :create without database' do
-      let(:attrs) { {action: :create} }
+      let(:attrs) { { action: :create } }
       it { expect { subject }.to raise_error ArgumentError, ':database must be given' }
     end
 
     context 'action :drop with database' do
-      let(:attrs) { {action: :drop, database: 'zombo'} }
+      let(:attrs) { { action: :drop, database: 'zombo' } }
       it { is_expected.to eq(['dropdb', '--if-exists', '--host=localhost', '--username=postgres', '--no-password', 'zombo']) }
     end
 
     context 'action :drop with database and :output' do
-      let(:attrs) { {action: :drop, database: 'zombo', output: 'zombo.csv'} }
+      let(:attrs) { { action: :drop, database: 'zombo', output: 'zombo.csv' } }
       it { is_expected.to eq(['dropdb', '--if-exists', '--host=localhost', '--username=postgres', '--no-password', 'zombo']) }
     end
 
     context 'action :dump with database' do
-      let(:attrs) { {action: :dump, database: 'zombo'} }
+      let(:attrs) { { action: :dump, database: 'zombo' } }
       it { is_expected.to eq(['pg_dump', '--no-owner', '--no-privileges', '--oids', '--schema=public', '--host=localhost', '--username=postgres', '--no-password', '--dbname=zombo']) }
     end
 
     context 'action :dump with database and :output' do
-      let(:attrs) { {action: :dump, database: 'zombo', output: 'zombo.csv'} }
+      let(:attrs) { { action: :dump, database: 'zombo', output: 'zombo.csv' } }
       it { is_expected.to eq(['pg_dump', '--no-owner', '--no-privileges', '--oids', '--schema=public', '--host=localhost', '--username=postgres', '--no-password', '--dbname=zombo', '--file=zombo.csv']) }
     end
 
     context 'action :drop without database' do
-      let(:attrs) { {action: :drop} }
+      let(:attrs) { { action: :drop } }
       it { expect { subject }.to raise_error ArgumentError, ':database must be given' }
     end
 
     context 'action unfuddle with database' do
-      let(:attrs) { {action: :unfuddle, database: 'zombo'} }
+      let(:attrs) { { action: :unfuddle, database: 'zombo' } }
       it { expect { subject }.to raise_error ArgumentError, ':action must be :create, :drop, or :dump' }
     end
   end

data/spec/masamune/commands/postgres_spec.rb

@@ -21,7 +21,7 @@
 #  THE SOFTWARE.
 
 describe Masamune::Commands::Postgres do
-  let(:configuration) { {:path => 'psql', :database => 'postgres', :options => options} }
+  let(:configuration) { { path: 'psql', database: 'postgres', options: options } }
   let(:options) { [] }
   let(:attrs) { {} }
 
@@ -36,14 +36,14 @@ describe Masamune::Commands::Postgres do
 
   describe '#stdin' do
     context 'with input' do
-      let(:attrs) { {input: %q(SELECT * FROM table;)} }
+      let(:attrs) { { input: 'SELECT * FROM table;' } }
       subject(:stdin) { instance.stdin }
 
       it { is_expected.to be_a(StringIO) }
 
       describe '#string' do
         subject { stdin.string }
-        it { is_expected.to eq(%q(SELECT * FROM table;)) }
+        it { is_expected.to eq('SELECT * FROM table;') }
       end
     end
   end
@@ -59,12 +59,12 @@ describe Masamune::Commands::Postgres do
     it { is_expected.to eq(default_command) }
 
     context 'with options' do
-      let(:options) { [{'-A' => nil}] }
+      let(:options) { [{ '-A' => nil }] }
       it { is_expected.to eq([*default_command, '-A']) }
     end
 
     context 'with exec' do
-      let(:attrs) { {exec: 'SELECT * FROM table;'} }
+      let(:attrs) { { exec: 'SELECT * FROM table;' } }
       before do
         expect(instance).to receive(:exec_file).and_return('zomg.psql')
       end
@@ -72,12 +72,12 @@ describe Masamune::Commands::Postgres do
     end
 
     context 'with file' do
-      let(:attrs) { {file: 'zomg.psql'} }
+      let(:attrs) { { file: 'zomg.psql' } }
       it { is_expected.to eq([*default_command, '--file=zomg.psql']) }
     end
 
     context 'with file and debug' do
-      let(:attrs) { {file: 'zomg.psql', debug: true} }
+      let(:attrs) { { file: 'zomg.psql', debug: true } }
       before do
         expect(File).to receive(:read).with('zomg.psql').and_return('SHOW TABLES;')
         expect(instance.logger).to receive(:debug).with("zomg.psql:\nSHOW TABLES;")
@@ -86,12 +86,12 @@ describe Masamune::Commands::Postgres do
     end
 
     context 'with file and exec' do
-      let(:attrs) { {file: 'zomg.psql', exec: 'SELECT * FROM table;'} }
+      let(:attrs) { { file: 'zomg.psql', exec: 'SELECT * FROM table;' } }
       it { expect { subject }.to raise_error(/Cannot specify both file and exec/) }
     end
 
     context 'with template file' do
-      let(:attrs) { {file: 'zomg.psql.erb'} }
+      let(:attrs) { { file: 'zomg.psql.erb' } }
       before do
         expect(Masamune::Template).to receive(:render_to_file).with('zomg.psql.erb', {}).and_return('zomg.psql')
       end
@@ -99,7 +99,7 @@ describe Masamune::Commands::Postgres do
     end
 
     context 'with template file and debug' do
-      let(:attrs) { {file: 'zomg.psql.erb', debug: true} }
+      let(:attrs) { { file: 'zomg.psql.erb', debug: true } }
       before do
         expect(Masamune::Template).to receive(:render_to_file).with('zomg.psql.erb', {}).and_return('zomg.psql')
         expect(File).to receive(:read).with('zomg.psql').and_return('SHOW TABLES;')
@@ -109,22 +109,22 @@ describe Masamune::Commands::Postgres do
     end
 
     context 'with variables and no file' do
-      let(:attrs) { {variables: {R: 'R2D2', C: 'C3PO'}} }
+      let(:attrs) { { variables: { R: 'R2D2', C: 'C3PO' } } }
       it { is_expected.to eq(default_command) }
     end
 
     context 'with variables and file' do
-      let(:attrs) { {file: 'zomg.psql', variables: {R: 'R2D2', C: 'C3PO'}} }
-      it { is_expected.to eq([*default_command, '--file=zomg.psql', %q(--set=R='R2D2'), %q(--set=C='C3PO')]) }
+      let(:attrs) { { file: 'zomg.psql', variables: { R: 'R2D2', C: 'C3PO' } } }
+      it { is_expected.to eq([*default_command, '--file=zomg.psql', "--set=R='R2D2'", "--set=C='C3PO'"]) }
     end
 
     context 'with csv' do
-      let(:attrs) { {csv: true} }
+      let(:attrs) { { csv: true } }
       it { is_expected.to eq([*default_command, '--no-align', '--field-separator=,', '--pset=footer']) }
     end
 
     context 'with tuple_output' do
-      let(:attrs) { {tuple_output: true} }
+      let(:attrs) { { tuple_output: true } }
       it { is_expected.to eq([*default_command, '--pset=tuples_only']) }
     end
   end

data/spec/masamune/commands/retry_with_backoff_spec.rb

@@ -21,7 +21,7 @@
 #  THE SOFTWARE.
 
 describe Masamune::Commands::RetryWithBackoff do
-  let(:options) { {retries: retries, backoff: 0} }
+  let(:options) { { retries: retries, backoff: 0 } }
   let(:delegate) { double }
   let(:instance) { described_class.new(delegate, options) }
 
@@ -45,14 +45,15 @@ describe Masamune::Commands::RetryWithBackoff do
         instance.around_execute do
           @retry_count += 1
           if @retry_count < retries
-            OpenStruct.new(:success? => false, :exitstatus => 42)
+            OpenStruct.new(success?: false, exitstatus: 42)
           else
-            OpenStruct.new(:success? => true)
+            OpenStruct.new(success?: true)
           end
         end
       end
 
-      it 'logs useful debug and error messages' do; end
+      it 'logs useful debug and error messages' do
+      end
       it 'attempts to retry the specified number of times' do
         expect(@retry_count).to eq(retries)
       end
@@ -73,11 +74,12 @@ describe Masamune::Commands::RetryWithBackoff do
         instance.around_execute do
           @retry_count += 1
           raise 'wtf' if @retry_count < retries
-          OpenStruct.new(:success? => true)
+          OpenStruct.new(success?: true)
         end
       end
 
-      it 'logs useful debug and error messages' do; end
+      it 'logs useful debug and error messages' do
+      end
       it 'attempts to retry the specified number of times' do
         expect(@retry_count).to eq(retries)
       end
@@ -102,7 +104,8 @@ describe Masamune::Commands::RetryWithBackoff do
         end
       end
 
-      it 'logs useful debug and error messages' do; end
+      it 'logs useful debug and error messages' do
+      end
       it 'attempts to retry the specified number of times' do
         expect(@retry_count).to eq(retries + 1)
       end

data/spec/masamune/commands/s3cmd_spec.rb

@@ -21,7 +21,7 @@
 #  THE SOFTWARE.
 
 describe Masamune::Commands::S3Cmd do
-  let(:configuration) { {:options => options} }
+  let(:configuration) { { options: options } }
   let(:options) { [] }
   let(:attrs) { {} }
 
@@ -33,14 +33,14 @@ describe Masamune::Commands::S3Cmd do
   end
 
   describe '#command_args' do
-    let(:attrs) { {extra: ['ls', 's3://fake']} }
+    let(:attrs) { { extra: ['ls', 's3://fake'] } }
 
     subject { instance.command_args }
 
     it { is_expected.to eq(['s3cmd', 'ls', 's3://fake']) }
 
     context 'with options' do
-      let(:options) { [{'--config' => '/opt/etc/etl/s3cfg'}] }
+      let(:options) { [{ '--config' => '/opt/etc/etl/s3cfg' }] }
 
       it { is_expected.to eq(['s3cmd', '--config', '/opt/etc/etl/s3cfg', 'ls', 's3://fake']) }
     end

data/spec/masamune/commands/shell_spec.rb

@@ -22,7 +22,7 @@
 
 describe Masamune::Commands::Shell do
   let(:input) { nil }
-  let(:options) { {fail_fast: false} }
+  let(:options) { { fail_fast: false } }
   let(:delegate) { double }
   let(:instance) { described_class.new(delegate, options) }
 
@@ -34,7 +34,7 @@ describe Masamune::Commands::Shell do
     end
 
     context 'with simple command that succeeds' do
-      let(:command) { %Q{bash -c "echo 'stdout 1'; echo 'stderr 1' 1>&2; echo 'stdout 2'; echo 'stderr 2' 1>&2"} }
+      let(:command) { %(bash -c "echo 'stdout 1'; echo 'stderr 1' 1>&2; echo 'stdout 2'; echo 'stderr 2' 1>&2") }
 
       before do
         expect(instance.logger).to receive(:debug).with(/\Aexecute: TZ=UTC bash -c .*\z/)
@@ -48,10 +48,10 @@ describe Masamune::Commands::Shell do
     end
 
     context 'with simple command that fails' do
-      let(:command) { %Q{bash -c 'exit 1'} }
+      let(:command) { %(bash -c 'exit 1') }
 
       before do
-        expect(instance.logger).to receive(:debug).with(%q(execute: TZ=UTC bash -c 'exit 1'))
+        expect(instance.logger).to receive(:debug).with("execute: TZ=UTC bash -c 'exit 1'")
         expect(instance.logger).to receive(:debug).with(/\Astatus: .* exit 1\z/)
         subject
       end
@@ -62,11 +62,11 @@ describe Masamune::Commands::Shell do
     end
 
     context 'with fail_fast and simple command that fails' do
-      let(:command) { %Q{bash -c 'exit 1'} }
-      let(:options) { {fail_fast: true} }
+      let(:command) { %(bash -c 'exit 1') }
+      let(:options) { { fail_fast: true } }
 
       before do
-        expect(instance.logger).to receive(:debug).with(%q(execute: TZ=UTC bash -c 'exit 1'))
+        expect(instance.logger).to receive(:debug).with("execute: TZ=UTC bash -c 'exit 1'")
         expect(instance.logger).to receive(:debug).with(/\Astatus: .* exit 1\z/)
       end
 
@@ -74,12 +74,12 @@ describe Masamune::Commands::Shell do
     end
 
     context 'with fail_fast and simple command that fails and delegate.failure_message' do
-      let(:command) { %Q{bash -c 'exit 1'} }
-      let(:options) { {fail_fast: true} }
+      let(:command) { %(bash -c 'exit 1') }
+      let(:options) { { fail_fast: true } }
 
       before do
         allow(delegate).to receive(:failure_message).and_return('Wha happen')
-        expect(instance.logger).to receive(:debug).with(%q(execute: TZ=UTC bash -c 'exit 1'))
+        expect(instance.logger).to receive(:debug).with("execute: TZ=UTC bash -c 'exit 1'")
         expect(instance.logger).to receive(:debug).with(/\Astatus: .* exit 1\z/)
       end
 
@@ -87,7 +87,7 @@ describe Masamune::Commands::Shell do
     end
 
     context 'when command is interrupted' do
-      let(:command) { %Q{bash -c "echo 'test'"} }
+      let(:command) { %(bash -c "echo 'test'") }
 
       before do
         expect(instance.logger).to receive(:debug).with(%q(execute: TZ=UTC bash -c "echo 'test'"))
@@ -116,7 +116,7 @@ describe Masamune::Commands::Shell do
       end
 
       it { expect(delegate.status).to eq(0) }
-      it { expect(delegate.stdout).to eq(['ping', 'pong']) }
+      it { expect(delegate.stdout).to eq(%w(ping pong)) }
       it { expect(delegate.stderr).to eq([]) }
     end
 
@@ -147,7 +147,7 @@ describe Masamune::Commands::Shell do
 
     context 'when delegate implements command_args' do
       before do
-        allow(delegate).to receive(:command_args).and_return(command_args) 
+        allow(delegate).to receive(:command_args).and_return(command_args)
       end
 
       context 'with nil command_args' do
@@ -172,17 +172,17 @@ describe Masamune::Commands::Shell do
 
       context 'with command_args containing nil' do
         let(:command_args) { ['echo', nil, 'foo'] }
-        it { is_expected.to eq(['echo', 'foo']) }
+        it { is_expected.to eq(%w(echo foo)) }
       end
 
       context 'with command_args containing an integer' do
         let(:command_args) { ['echo', nil, 5] }
-        it { is_expected.to eq(['echo', '5']) }
+        it { is_expected.to eq(%w(echo 5)) }
       end
 
       context 'with nested command_args' do
         let(:command_args) { [['echo'], ['foo']] }
-        it { is_expected.to eq(['echo', 'foo']) }
+        it { is_expected.to eq(%w(echo foo)) }
       end
     end
   end