masamune 0.17.2 → 0.17.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 539cdf75fd7e8734d5ad8393a80c1fe389ca1e52
-  data.tar.gz: fea5c3e3908578febd63ac0a1e959c30442b5e09
+  metadata.gz: 308f642fba45cf0882c10023bcd0ab3f30a9a611
+  data.tar.gz: eb32061afd7d7e656bc0384eb1aeb694edebca90
 SHA512:
-  metadata.gz: 06705c4e419adb0b2ffb82d35b80e92cfca1148f97c638880277f06d6f52731354915a9a3e468fdeec4f0874a5da7c6213660e5bc0df70e8ed5a104b3885d361
-  data.tar.gz: b6c98cdbe32f2f83ce54835243da0c1f060f5dfca1500dd6366a99d3fb7b77e4f181b373dac32eb388d027840b796820e0979b71c03445f75d2520032a3d3966
+  metadata.gz: 657e6b91d3a6f09dc9d303d5c83e6fe0664ca92c5dfda40b828cf11d6bdfd2b6d870e70c010df328310d6afe46742df28df4dd84985eec1eb50e3f1ebbf16c7b
+  data.tar.gz: bc8f2e98fc05e9bb96096480f5a5070a6a386bb7911b430cb0ff7bfab80c905a6740402fd960fb833731822f16d2a147f2fc50ca1e22b3ccf0ee055e8851beb1

data/lib/masamune/commands/hive.rb

@@ -57,6 +57,7 @@ module Masamune::Commands
       DEFAULT_ATTRIBUTES.merge(configuration.hive).merge(attrs).each do |name, value|
         instance_variable_set("@#{name}", value)
       end
+      raise ArgumentError, 'Cannot specify both file and exec' if @file && @exec
     end
 
     def interactive?
@@ -86,7 +87,7 @@ module Masamune::Commands
         console("hive with file #{@file}")
       end
 
-      if @debug and output = @rendered_file || @file
+      if @debug and output = rendered_template || @file
         logger.debug("#{output}:\n" + File.read(output))
       end
 
@@ -143,7 +144,7 @@ module Masamune::Commands
     end
 
     def command_args_for_file
-      @file =~ /\.erb\Z/ ? command_args_for_template : command_args_for_simple_file
+      @command_args_for_file ||= (@file =~ /\.erb\Z/ ? command_args_for_template : command_args_for_simple_file)
     end
 
     def command_args_for_simple_file
@@ -156,8 +157,7 @@ module Masamune::Commands
     end
 
     def command_args_for_template
-      @rendered_file = Masamune::Template.render_to_file(@file, @variables)
-      filesystem.copy_file_to_file(@rendered_file, remote_file)
+      filesystem.copy_file_to_file(rendered_template, remote_file)
       ['-f', remote_file]
     end
 
@@ -173,5 +173,9 @@ module Masamune::Commands
         tmp.flush
       end.path
     end
+
+    def rendered_template
+      @rendered_template ||= Masamune::Template.render_to_file(@file, @variables)
+    end
   end
 end

data/lib/masamune/commands/postgres.rb

@@ -55,6 +55,7 @@ module Masamune::Commands
       DEFAULT_ATTRIBUTES.merge(configuration.postgres).merge(attrs).each do |name, value|
         instance_variable_set("@#{name}", value)
       end
+      raise ArgumentError, 'Cannot specify both file and exec' if @file && @exec
     end
 
     def stdin
@@ -89,7 +90,7 @@ module Masamune::Commands
 
     def before_execute
       console("psql with file #{@file}") if @file
-      if @debug and output = @rendered_file || @file
+      if @debug and output = rendered_template || @file
         logger.debug("#{output}:\n" + File.read(output))
       end
 
@@ -127,8 +128,7 @@ module Masamune::Commands
     end
 
     def command_args_for_template
-      @rendered_file = Masamune::Template.render_to_file(@file, @variables)
-      ['--file=%s' % @rendered_file]
+      ['--file=%s' % rendered_template]
     end
 
     def exec_file
@@ -137,5 +137,9 @@ module Masamune::Commands
         tmp.flush
       end.path
     end
+
+    def rendered_template
+      @rendered_template ||= Masamune::Template.render_to_file(@file, @variables)
+    end
   end
 end

data/lib/masamune/version.rb

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

data/spec/masamune/commands/hive_spec.rb

@@ -39,6 +39,7 @@ 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(:logger).and_return(double)
     allow(delegate).to receive(:console).and_return(double)
     allow(delegate).to receive_message_chain(:configuration, :hive).and_return(configuration)
   end
@@ -71,6 +72,11 @@ describe Masamune::Commands::Hive do
       it { is_expected.to eq([*default_command, '-f', remote_file]) }
     end
 
+    context 'with file and exec' do
+      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'}} }
       it { is_expected.to eq([*default_command, '-f', remote_file, '-d', 'R=R2DO', '-d', 'C=C3PO']) }
@@ -88,7 +94,18 @@ describe Masamune::Commands::Hive do
     context 'with template file' do
       let(:attrs) { {file: 'zomg.hql.erb'} }
       before do
-        expect(Masamune::Template).to receive(:render_to_file).with('zomg.hql.erb', {}).and_return('XXX')
+        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)
+      end
+      it { is_expected.to eq([*default_command, '-f', filesystem.get_path(:tmp_dir, mock_tmpdir, 'zomg.hql')]) }
+    end
+
+    context 'with template file and debug' do
+      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;')
+        expect(instance.logger).to receive(:debug).with("zomg.hql:\nSHOW TABLES;")
         expect_any_instance_of(Masamune::MockFilesystem).to receive(:copy_file_to_file)
       end
       it { is_expected.to eq([*default_command, '-f', filesystem.get_path(:tmp_dir, mock_tmpdir, 'zomg.hql')]) }

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(:logger).and_return(double)
     allow(delegate).to receive(:console).and_return(double)
     allow(delegate).to receive_message_chain(:configuration, :postgres).and_return(configuration)
   end
@@ -75,6 +76,11 @@ describe Masamune::Commands::Postgres do
       it { is_expected.to eq([*default_command, '--file=zomg.psql']) }
     end
 
+    context 'with file and exec' do
+      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'} }
       before do
@@ -83,6 +89,16 @@ describe Masamune::Commands::Postgres do
       it { is_expected.to eq([*default_command, '--file=zomg.psql']) }
     end
 
+    context 'with template file and debug' do
+      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;')
+        expect(instance.logger).to receive(:debug).with("zomg.psql:\nSHOW TABLES;")
+      end
+      it { is_expected.to eq([*default_command, '--file=zomg.psql']) }
+    end
+
     context 'with variables and no file' do
       let(:attrs) { {variables: {R: 'R2D2', C: 'C3PO'}} }
       it { is_expected.to eq(default_command) }

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: masamune
 version: !ruby/object:Gem::Version
-  version: 0.17.2
+  version: 0.17.3
 platform: ruby
 authors:
 - Michael Andrews
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-01-26 00:00:00.000000000 Z
+date: 2016-02-04 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: thor