prick 0.14.0 → 0.15.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: c155692c268326430a0e9225d4a7c156fedd52533114b62fae7e7ce61da01177
-  data.tar.gz: 4e245212208c3ecc518f313cd9f1af709db5ce41b7281c7247a1078293c486de
+  metadata.gz: 65c56eb6650acf4a9a15acc00589075fe551548f06df7f714db56b89fc8f0f7d
+  data.tar.gz: 585b320426243c5a3a82df87a924e89e03807c47b618a44350a8c7e646112f34
 SHA512:
-  metadata.gz: 38ff771885f6a73a20f36985403cb61a63fc2f025c20f92bb1dea4cb2ba047f908e48c4a564a50b707594d32199a87f796e0640135f6f0da5a521fe572c70cdb
-  data.tar.gz: 79641d89e168fe1be4d7493aed420fd40cd71cfb29ac98c359c34f82457bd1b7c265883e83cf661c29ff1ea6437bf1a087a652987409221cc4c439768b480922
+  metadata.gz: 72f83cb2412de38665afac3c6b3e7bd293d17ad35c64910bec6ef6db5080922d5d6771b044b76dcc52539da60327843861f681f979f3e04739a3cb04f804f8e1
+  data.tar.gz: c5460d78662709f1c5cb8bc5badd3243230cd41ff800b3d8fb9eee3d3e49cd314f51548dab060f0435d5c1aa58c3dbdfb22c490acc96b8e4dc101659675af027

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)
@@ -67,7 +68,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
@@ -80,7 +87,13 @@ module Prick
       do_dir(path) { |file| 
         lines = Command.command "./#{file} #{database.name} #{database.user}" # FIXME Security
         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
@@ -130,6 +143,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

data/lib/prick/version.rb

@@ -4,7 +4,7 @@
 
 # Required by gem
 module Prick
-  VERSION = "0.14.0"
+  VERSION = "0.15.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.15.0
 platform: ruby
 authors:
 - Claus Rasmussen
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2021-03-18 00:00:00.000000000 Z
+date: 2021-03-19 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