masamune 0.15.1 → 0.15.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 4dbe593ba3a215812769938a30319600a4d09dfd
-  data.tar.gz: ce90762802dc54af83d0f82fd17cf17d86d79fcf
+  metadata.gz: b6b1e378ec9d528e71798e37eaf92a28e39ce275
+  data.tar.gz: a715c4524d5320cb579053f940419bfebd783036
 SHA512:
-  metadata.gz: b4ed08a3d39df015ad02fc4b7957f5d507f071a953d21d7e3431b2ba204f64c9d727890563ca81722570c45b904cc8d99e977f27fc95baf2bb6197cc49f714d3
-  data.tar.gz: f8105bc6cbdd055cbb897a7a4994d7c266dc4d258db006ae7f6fbe060fa0e0dfc45d83091a2b847c7159838fe474d682d43534938fef663cd93faa28a3f21929
+  metadata.gz: 5593ffbea50e048d74cf341afc34757a0e951df67528a7acdc5603a55fd2c4ed1c563ebebe3f396e41340af67d19ac9f9fcb5f3efb7ad03b902ea43a008bb602
+  data.tar.gz: 9b6cf17acce30109400902d6769ef72c90355542fa985e2b145e4a40aa9dd345f0054e17518f133d95ef950ba4e3e4f8975ce2eb0b0719a579eb1f9f6be95e92

data/lib/masamune/commands/postgres.rb

@@ -83,7 +83,6 @@ module Masamune::Commands
       args << command_args_for_file if @file
       args << '--output=%s' % @output if @output
       args << '--no-align' << '--field-separator=,' << '--pset=footer' if @csv
-      args << '--command=%s' % strip_sql(@exec) if @exec
       args << '--pset=tuples_only' if @tuple_output
       args.flatten.compact
     end
@@ -93,6 +92,11 @@ module Masamune::Commands
       if @debug and output = @rendered_file || @file
         logger.debug("#{output}:\n" + File.read(output))
       end
+
+      if @exec
+        console("postgres exec '#{strip_sql(@exec)}' #{'into ' + @output if @output}")
+        @file = exec_file
+      end
     end
 
     def handle_stdout(line, line_no)
@@ -126,5 +130,12 @@ module Masamune::Commands
       @rendered_file = Masamune::Template.render_to_file(@file, @variables)
       ['--file=%s' % @rendered_file]
     end
+
+    def exec_file
+      Tempfile.new('masamune').tap do |tmp|
+        tmp.write(@exec)
+        tmp.flush
+      end.path
+    end
   end
 end

data/lib/masamune/version.rb

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

data/spec/masamune/commands/hive_spec.rb

@@ -66,7 +66,7 @@ describe Masamune::Commands::Hive do
     context 'with exec' do
       let(:attrs) { {exec: 'SELECT * FROM table;'} }
       before do
-        expect_any_instance_of(Masamune::MockFilesystem).to receive(:basename).and_return(File.basename(local_file))
+        expect(instance).to receive(:exec_file).and_return(remote_file)
       end
       it { is_expected.to eq([*default_command, '-f', remote_file]) }
     end

data/spec/masamune/commands/postgres_spec.rb

@@ -29,6 +29,7 @@ describe Masamune::Commands::Postgres do
   let(:instance) { described_class.new(delegate, attrs) }
 
   before do
+    allow(delegate).to receive(:console).and_return(double)
     allow(delegate).to receive_message_chain(:configuration, :postgres).and_return(configuration)
   end
 
@@ -50,6 +51,7 @@ describe Masamune::Commands::Postgres do
     let(:default_command) { ['psql', '--host=localhost', '--dbname=postgres', '--username=postgres', '--no-password', '--set=ON_ERROR_STOP=1'] }
 
     subject do
+      instance.before_execute
       instance.command_args
     end
 
@@ -60,17 +62,25 @@ describe Masamune::Commands::Postgres do
       it { is_expected.to eq([*default_command, '-A']) }
     end
 
+    context 'with exec' do
+      let(:attrs) { {exec: 'SELECT * FROM table;'} }
+      before do
+        expect(instance).to receive(:exec_file).and_return('zomg.psql')
+      end
+      it { is_expected.to eq([*default_command, '--file=zomg.psql']) }
+    end
+
     context 'with file' do
-      let(:attrs) { {file: 'zomg.hql'} }
-      it { is_expected.to eq([*default_command, '--file=zomg.hql']) }
+      let(:attrs) { {file: 'zomg.psql'} }
+      it { is_expected.to eq([*default_command, '--file=zomg.psql']) }
     end
 
     context 'with template file' do
-      let(:attrs) { {file: 'zomg.hql.erb'} }
+      let(:attrs) { {file: 'zomg.psql.erb'} }
       before do
-        expect(Masamune::Template).to receive(:render_to_file).with('zomg.hql.erb', {}).and_return('zomg.hql')
+        expect(Masamune::Template).to receive(:render_to_file).with('zomg.psql.erb', {}).and_return('zomg.psql')
       end
-      it { is_expected.to eq([*default_command, '--file=zomg.hql']) }
+      it { is_expected.to eq([*default_command, '--file=zomg.psql']) }
     end
 
     context 'with variables and no file' do
@@ -79,8 +89,8 @@ describe Masamune::Commands::Postgres do
     end
 
     context 'with variables and file' do
-      let(:attrs) { {file: 'zomg.hql', variables: {R: 'R2D2', C: 'C3PO'}} }
-      it { is_expected.to eq([*default_command, '--file=zomg.hql', %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', %q(--set=R='R2D2'), %q(--set=C='C3PO')]) }
     end
 
     context 'with csv' do

data/spec/support/masamune/shared_example_group.rb

@@ -99,11 +99,7 @@ module Masamune::SharedExampleGroup
       end
 
       if input['psql']
-        Tempfile.open('etl') do |tmp|
-          tmp.write(input['psql'])
-          tmp.flush
-          postgres(file: tmp.path)
-        end
+        postgres(exec: input['psql'])
       end
     end
   end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: masamune
 version: !ruby/object:Gem::Version
-  version: 0.15.1
+  version: 0.15.2
 platform: ruby
 authors:
 - Michael Andrews
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-11-09 00:00:00.000000000 Z
+date: 2015-11-13 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: thor