prick 0.14.0 → 0.18.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: c155692c268326430a0e9225d4a7c156fedd52533114b62fae7e7ce61da01177
-  data.tar.gz: 4e245212208c3ecc518f313cd9f1af709db5ce41b7281c7247a1078293c486de
+  metadata.gz: 22580f7a2f37e4ad59c6354e3b6ac1d7bb6f5eb7fe8f44eddb941ba715f8fa39
+  data.tar.gz: b0b5bf43389a0e35c6a739b92b4e50b043cb75ab1e215aa109a9a68e4f17e1e3
 SHA512:
-  metadata.gz: 38ff771885f6a73a20f36985403cb61a63fc2f025c20f92bb1dea4cb2ba047f908e48c4a564a50b707594d32199a87f796e0640135f6f0da5a521fe572c70cdb
-  data.tar.gz: 79641d89e168fe1be4d7493aed420fd40cd71cfb29ac98c359c34f82457bd1b7c265883e83cf661c29ff1ea6437bf1a087a652987409221cc4c439768b480922
+  metadata.gz: 7768a47145ae07f6ae99e808ad513107ccd98327fc009311cd0bfde1f1dbd3a52a3d9f5061c6bb3918b12da6850b0cf4e5242efade679d950a603047c8dd9cfc
+  data.tar.gz: e2709800fe62d599bba1ea64960b4a09e8a97a87da3d60731e8293f4957c9ac35147122dea16220481b9c49b17d3cf31377663f1328b99608c0fc3cc84ca4ad9

data/TODO

@@ -1,4 +1,7 @@
 
+o Add a top-level 'global' directory for stuff that doesn't belong to a schema or that 
+  require superuser privileges. prick-build should then execute the content of that
+  directory first before switching to the database user
 o Check for commits to tags
 o Accumulate version history in prick.versions instead of just having the newest
 o Using rc's in migration syntax: fork-version-fork-version.rc1 ?

data/exe/prick

@@ -198,7 +198,7 @@ begin
   # Change to parent directory containing the Prick version file if not found
   # in the current directory
   program.current_directory = Dir.getwd
-  while !Dir.getwd != "/" && !File.exist?(PRICK_VERSION_FILE)
+  while Dir.getwd != "/" && !File.exist?(PRICK_VERSION_FILE)
     Dir.chdir("..")
   end
 

data/lib/prick/builder.rb

@@ -19,7 +19,7 @@ module Prick
   # When a resource match a directory, the directory can contain a special
   # default resource ('build' or 'migrate') that takes over the rest of the
   # build process for that directory.  Typically, you'll use the 'build.yml' or
-  # 'migrate.yml' to control the build order of the other resources If a
+  # 'migrate.yml' to control the build order of the other resources. If a
   # directory doesn't contain a build resource, the resources in the directory
   # are built in alphabetic order
   #
@@ -38,6 +38,7 @@ module Prick
       @default = default
       @execute = true
       @lines = []
+      @cwd = Dir.getwd # used in error messages
     end
 
     def build(subject = default, execute: true)
@@ -59,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
@@ -67,7 +69,13 @@ module Prick
 #     puts "do_sql(#{path})"
       do_dir(path) { |file| 
         if @execute
-          Rdbms.exec_file(database.name, file, user: database.user, schema: schema) 
+          begin
+            Rdbms.exec_file(database.name, file, user: database.user, schema: schema)
+          rescue Command::Error => ex
+            $stderr.puts ex.stderr
+            $stderr.puts "in #{reldir}/#{file}"
+            exit 1
+          end  
         else
           @lines += IO.readlines(file).map(&:chomp)
         end
@@ -75,12 +83,19 @@ 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
-          Rdbms.exec_sql(database.name, lines.join("\n"), user: database.user, schema: schema)
+          begin
+            Rdbms.exec_sql(database.name, lines.join("\n"), user: database.user, schema: schema)
+          rescue Command::Error => ex
+            $stderr.puts ex.stderr
+            $stderr.puts "from #{reldir}/#{file}"
+            exit 1
+          end
         else
           @lines += lines
         end
@@ -97,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")
@@ -130,6 +146,14 @@ module Prick
         end
       }
     end
+
+  private
+    # Return the relative path to the current directory from the directory of
+    # the time of the instantiation of the Builder object. Used in error
+    # messages
+    def reldir
+      Dir.getwd.sub(/^#{@cwd}\//, "")
+    end
   end
 
   class MigrationBuilder < Builder
@@ -172,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 }
+    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.14.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.14.0
+  version: 0.18.0
 platform: ruby
 authors:
 - Claus Rasmussen
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2021-03-18 00:00:00.000000000 Z
+date: 2021-07-21 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: shellopts
@@ -155,7 +155,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.1.2
+rubygems_version: 3.1.4
 signing_key: 
 specification_version: 4
 summary: A release control and management system for postgresql