masamune 0.17.3 → 0.17.4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 308f642fba45cf0882c10023bcd0ab3f30a9a611
-  data.tar.gz: eb32061afd7d7e656bc0384eb1aeb694edebca90
+  metadata.gz: 61f6f61c4cd5df082a7f5a63cee2f4f7716ff7ca
+  data.tar.gz: 9a47bb9bbdb0339904cf8159968fe9fc0a6dc6aa
 SHA512:
-  metadata.gz: 657e6b91d3a6f09dc9d303d5c83e6fe0664ca92c5dfda40b828cf11d6bdfd2b6d870e70c010df328310d6afe46742df28df4dd84985eec1eb50e3f1ebbf16c7b
-  data.tar.gz: bc8f2e98fc05e9bb96096480f5a5070a6a386bb7911b430cb0ff7bfab80c905a6740402fd960fb833731822f16d2a147f2fc50ca1e22b3ccf0ee055e8851beb1
+  metadata.gz: e7bd7a01c74b0779318dc2988c1741fed4122c866b913fe63457d4696a47794ffb540de0d363bb8d92b9f4836de3be1ed929dc741a90085c093b216728e8aaae
+  data.tar.gz: 5ec032b8c286a99d8873a03525ba6c02c2f090567e7a451711423b6e2fd2f6d87133deabafcd527dd149b502b1c5c07ff03bff6b24037bd202a44143ded3cd1d

data/lib/masamune/commands/hive.rb

@@ -144,7 +144,7 @@ module Masamune::Commands
     end
 
     def command_args_for_file
-      @command_args_for_file ||= (@file =~ /\.erb\Z/ ? command_args_for_template : command_args_for_simple_file)
+      @command_args_for_file ||= (template_file? ? command_args_for_template : command_args_for_simple_file)
     end
 
     def command_args_for_simple_file
@@ -163,6 +163,10 @@ module Masamune::Commands
 
     private
 
+    def template_file?
+      @file =~ /\.erb\Z/
+    end
+
     def remote_file
       @remote_file ||= File.join(filesystem.mktempdir!(:tmp_dir), filesystem.basename(@file)).gsub(/.erb\z/,'')
     end
@@ -175,6 +179,7 @@ module Masamune::Commands
     end
 
     def rendered_template
+      return unless template_file?
       @rendered_template ||= Masamune::Template.render_to_file(@file, @variables)
     end
   end

data/lib/masamune/commands/postgres.rb

@@ -115,8 +115,12 @@ module Masamune::Commands
 
     private
 
+    def template_file?
+      @file =~ /\.erb\Z/
+    end
+
     def command_args_for_file
-      @file =~ /\.erb\Z/ ? command_args_for_template : command_args_for_simple_file
+      template_file? ? command_args_for_template : command_args_for_simple_file
     end
 
     def command_args_for_simple_file
@@ -139,6 +143,7 @@ module Masamune::Commands
     end
 
     def rendered_template
+      return unless template_file?
       @rendered_template ||= Masamune::Template.render_to_file(@file, @variables)
     end
   end

data/lib/masamune/version.rb

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

data/spec/masamune/commands/hive_spec.rb

@@ -64,6 +64,15 @@ describe Masamune::Commands::Hive do
       it { is_expected.to eq([*default_command, '-f', remote_file]) }
     end
 
+    context 'with file and debug' do
+      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;")
+      end
+      it { is_expected.to eq([*default_command, '-f', remote_file]) }
+    end
+
     context 'with exec' do
       let(:attrs) { {exec: 'SELECT * FROM table;'} }
       before do

data/spec/masamune/commands/postgres_spec.rb

@@ -76,6 +76,15 @@ describe Masamune::Commands::Postgres do
       it { is_expected.to eq([*default_command, '--file=zomg.psql']) }
     end
 
+    context 'with file and debug' do
+      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;")
+      end
+      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/) }

metadata

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