masamune 0.15.0 → 0.15.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 7abad0d40705fd8c85b74398cf3ce198d6e1e0a3
-  data.tar.gz: 049aeb65a25a01b8dca0a9db21d7e543e9eadae5
+  metadata.gz: 4dbe593ba3a215812769938a30319600a4d09dfd
+  data.tar.gz: ce90762802dc54af83d0f82fd17cf17d86d79fcf
 SHA512:
-  metadata.gz: 5a8ef99944a527c5d0fde7b4875fc1d6541dd830060372fb47752a8a915f8d6bb7a3c359ad54c2592b2939c1bbc0ac1ea2c486f34c75fb31c7551524ef278963
-  data.tar.gz: 3d44f7583a6048a70010c124b8f8c881163196b285ced0fbfe78cb0bc3858bcd3768bc3b3528f0bd8a8a9043060c8fb33f4a813bb472ffa3a751cd71bd0fbbbb
+  metadata.gz: b4ed08a3d39df015ad02fc4b7957f5d507f071a953d21d7e3431b2ba204f64c9d727890563ca81722570c45b904cc8d99e977f27fc95baf2bb6197cc49f714d3
+  data.tar.gz: f8105bc6cbdd055cbb897a7a4994d7c266dc4d258db006ae7f6fbe060fa0e0dfc45d83091a2b847c7159838fe474d682d43534938fef663cd93faa28a3f21929

data/lib/masamune/commands/hive.rb

@@ -41,7 +41,6 @@ module Masamune::Commands
       :schema_files   => [],
       :file           => nil,
       :exec           => nil,
-      :input          => nil,
       :output         => nil,
       :print          => false,
       :block          => nil,
@@ -60,12 +59,6 @@ module Masamune::Commands
       end
     end
 
-    def stdin
-      if @input || @exec
-        @stdin ||= StringIO.new(strip_sql(@input || @exec))
-      end
-    end
-
     def interactive?
       !(@exec || @file)
     end
@@ -99,6 +92,7 @@ module Masamune::Commands
 
       if @exec
         console("hive exec '#{strip_sql(@exec)}' #{'into ' + @output if @output}")
+        @file = exec_file
       end
 
       if @output
@@ -174,5 +168,12 @@ module Masamune::Commands
     def remote_file
       @remote_file ||= File.join(filesystem.mktempdir!(:tmp_dir), filesystem.basename(@file)).gsub(/.erb\z/,'')
     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.0'
+  VERSION = '0.15.1'
 end

data/spec/masamune/commands/hive_spec.rb

@@ -39,27 +39,15 @@ describe Masamune::Commands::Hive do
     allow(filesystem).to receive(:mktempdir!) { filesystem.path(:tmp_dir, mock_tmpdir) }
 
     allow(delegate).to receive(:filesystem) { filesystem }
+    allow(delegate).to receive(:console).and_return(double)
     allow(delegate).to receive_message_chain(:configuration, :hive).and_return(configuration)
   end
 
-  describe '#stdin' do
-    context 'with exec' do
-      let(:attrs) { {exec: %q(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;)) }
-      end
-    end
-  end
-
   describe '#command_args' do
     let(:default_command) { ['hive', '--database', 'default'] }
 
     subject do
+      instance.before_execute
       instance.command_args
     end
 
@@ -75,6 +63,14 @@ describe Masamune::Commands::Hive do
       it { is_expected.to eq([*default_command, '-f', remote_file]) }
     end
 
+    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))
+      end
+      it { is_expected.to eq([*default_command, '-f', remote_file]) }
+    end
+
     context 'with variables' do
       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']) }

data/spec/support/masamune/shared_example_group.rb

@@ -128,12 +128,7 @@ module Masamune::SharedExampleGroup
 
   def execute_output_command(output, output_file)
     if output['hive'] && output['hive'].is_a?(String)
-      # FIXME: Replace with exec once SBI-530 is fixed
-      Tempfile.open('etl') do |tmp|
-        tmp.write(output['hive'])
-        tmp.flush
-        hive(file: tmp.path, output: output_file)
-      end
+      hive(exec: output['hive'], output: output_file)
     elsif output['table']
       table = eval "catalog.#{output['table']}"
       query = denormalize_table(table, output.slice('columns', 'order', 'except', 'include')).to_s
@@ -142,12 +137,7 @@ module Masamune::SharedExampleGroup
       when :postgres
         postgres(exec: query, csv: true, output: output_file)
       when :hive
-        # FIXME: Replace with exec once SBI-530 is fixed
-        Tempfile.open('etl') do |tmp|
-          tmp.write(query)
-          tmp.flush
-          hive(file: tmp.path, output: output_file)
-        end
+        hive(exec: query, output: output_file)
       else
         raise "'table' output not supported for #{output['table']}"
       end

metadata

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