prick 0.17.0 → 0.18.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 70b51ae69f1d1cb0c2c27666273b0564d78f950de870104865203362258d40a2
-  data.tar.gz: e3b46dbc411282c05977940551246a8bfff7689889648ac7e481974c67ef326f
+  metadata.gz: 22580f7a2f37e4ad59c6354e3b6ac1d7bb6f5eb7fe8f44eddb941ba715f8fa39
+  data.tar.gz: b0b5bf43389a0e35c6a739b92b4e50b043cb75ab1e215aa109a9a68e4f17e1e3
 SHA512:
-  metadata.gz: 0431efaa5b92fe0497f642bb5bd4f115f533417122c9f7f71d6de17aa7c65128d79c4a74cfe82ac8fa18b88d9b3aff6905744a3129f62b63f865c64d0e63292f
-  data.tar.gz: 8e01993d41040f3d4db9f10d4aa461b420b81a5116836ba1cbb0cb298b75b2e9beaeb61ce3982ed21496ee459ab76e3f28ddf98c6f40fa17ad28c5f49ffcc97e
+  metadata.gz: 7768a47145ae07f6ae99e808ad513107ccd98327fc009311cd0bfde1f1dbd3a52a3d9f5061c6bb3918b12da6850b0cf4e5242efade679d950a603047c8dd9cfc
+  data.tar.gz: e2709800fe62d599bba1ea64960b4a09e8a97a87da3d60731e8293f4957c9ac35147122dea16220481b9c49b17d3cf31377663f1328b99608c0fc3cc84ca4ad9

data/lib/prick/builder.rb

@@ -60,6 +60,7 @@ module Prick
 
   protected
     def do_dir(path, &block)
+#     puts "do_dir(#{path.inspect})"
       dir, file = File.split(path)
       Dir.chdir(dir) { yield(file) }
     end
@@ -82,10 +83,11 @@ module Prick
       true
     end
 
-    def do_exe(path, schema: nil)
-#     puts "do_exe(#{path})"
+    def do_exe(path, args = [], schema: nil)
+#     puts "do_exe(#{path.inspect}, #{args.inspect})"
       do_dir(path) { |file| 
-        lines = Command.command "./#{file} #{database.name} #{database.user}" # FIXME Security
+        cmd = (["./#{file}"] + args).join(" ")
+        lines = Command.command cmd, stdin: [database.name, database.user]
         if @execute
           begin
             Rdbms.exec_sql(database.name, lines.join("\n"), user: database.user, schema: schema)
@@ -110,8 +112,9 @@ module Prick
 
     # A subject can be both an abstract subject or a concrete file (*.yml, *.sql)
     def build_subject(subject)
-      if File.file?(subject) && File.executable?(subject)
-        do_exe(subject)
+      cmd, *args = subject.split(/\s+/)
+      if File.file?(cmd) && File.executable?(cmd)
+        do_exe(cmd, args)
       elsif File.file?(subject) && subject.end_with?(".yml")
         do_yml(subject)
       elsif File.file?(subject) && subject.end_with?(".sql")
@@ -193,9 +196,9 @@ module Prick
       super(path, schema: schema)
     end
 
-    def do_exe(path)
+    def do_exe(path, args = [])
       schema = Dir.getwd.sub(/^.*schema\/([^\/]+)(?:\/.*)?$/, '\1')
-      super(path, schema: schema)
+      super(path, args, schema: schema)
     end
   end
 end

data/lib/prick/command.rb

@@ -15,14 +15,17 @@ module Command
   end
 
   # Execute the shell command 'cmd' and return standard output as an array of
-  # strings while stderr is passed through unless stderr: is false. If stderr:
+  # strings.  while stderr is passed through unless stderr: is false. If stderr:
   # is true, it returns a tuple of [stdout, stderr] instead. The shell command
   # is executed with the `errexit` and `pipefail` bash options
+  #
+  # The :stdin option is a line or an array of lines that'll be fed to the
+  # standard input of the command. Default is nil
   # 
   # It raises a Command::Error exception if the command fails unless :fail is
   # true. The exit status of the last command is stored in ::status
   #
-  def command(cmd, stderr: false, fail: true)
+  def command(cmd, stdin: nil, stderr: false, fail: true)
     cmd = "set -o errexit\nset -o pipefail\n#{cmd}"
 
     pw = IO::pipe   # pipe[0] for read, pipe[1] for write
@@ -52,12 +55,18 @@ module Command
     pr[1].close
     pe[1].close
 
+    if stdin
+      pw[1].puts(stdin)
+      pw[1].flush
+      pw[1].close
+    end
+
     @status = Process.waitpid2(pid)[1].exitstatus
 
     out = pr[0].readlines.collect { |line| line.chop }
     err = pe[0].readlines.collect { |line| line.chop }.grep_v(/^NOTICE:/)
 
-    pw[1].close
+    pw[1].close if !stdin
     pr[0].close
     pe[0].close
 

data/lib/prick/version.rb

@@ -4,7 +4,7 @@
 
 # Required by gem
 module Prick
-  VERSION = "0.17.0"
+  VERSION = "0.18.0"
 end
 
 # Project related code starts here

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: prick
 version: !ruby/object:Gem::Version
-  version: 0.17.0
+  version: 0.18.0
 platform: ruby
 authors:
 - Claus Rasmussen
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2021-07-19 00:00:00.000000000 Z
+date: 2021-07-21 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: shellopts