prick 0.20.18 → 0.20.22

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 69e1bed1482431efd5f5e449ba9d2b3d5cccfef223398e51879aeda7374fd6e1
-  data.tar.gz: 99984a969cb456c6efbf4943f56433d1c207246dfc615956fbd550511c30bfee
+  metadata.gz: 99ba6fb22cc049f8f7a42f94c939c27b0d2496ec2218c8dec3c327478fd664cb
+  data.tar.gz: 5d8eff4ca98279c775de052cd1511bae449d658c9fd73adc865fb15e1530ff7a
 SHA512:
-  metadata.gz: 7359ccc4a5da931531579431375e94007d7b7c66dc128c1a15c26fce5aa8b206b2ed89b33e9d15054c49f4dc64b61a31ea5647e387c219f5fdd1f0a7eed1fe25
-  data.tar.gz: 3713cb328f4aea15e7ac67d0e40dd7d1ae07e31528368aaf24d634fcd6ffbb91c2b512764a2c82cd01abe7c9aa191c784332196ba9b0f8232c5f4fe5a2b56fff
+  metadata.gz: b08ba8c172f31f336aba28c2eee8c84a1d752dcd4fc2183bff2459d76f4b1a9fdf9ab4effcb2bf6395ea2e39438bacb4ff238adaaa21e89b69eb0fbeb2d7c2be
+  data.tar.gz: c3e79178490e6f777170e0ccd1f888c28951c68b756067c21caee02a6650ceda3406a108a7ff1f2ecb07dc568ff5fa6e6086d160f3b922fdfafe602c9fbed1ba

data/lib/builder/node.rb

@@ -131,12 +131,16 @@ module Prick
         @pipe = Command::Pipe.new(to_s, stderr: nil)
       end
 
-      def inspect() "#{path}(#{args.join(", ")})" end
+      def inspect() "#{path}(#{(args || []).join(", ")})" end
 
     protected
       def read_source
         pipe.puts [conn.name, conn.user]
         sql = pipe.wait
+        if pipe.status != 0
+          $stderr.puts pipe.error
+          raise Prick::Error, "Failed executing #{pipe.cmd}"
+        end
         @source_lines = 1 + 1 + sql.count("\n")
         ["set search_path to #{schema};\n", sql]
       end

data/lib/builder/parser.rb

@@ -76,31 +76,39 @@ module Prick
         unit
       end
 
+      def parse_file_entry(dir, entry)
+        name = entry.dup
+        name.sub!(/\$ENVIRONMENT/, Prick.state.environment.to_s)
+        name.sub!(/\/$/, "")
+        if name =~ /^(\S+)\s+(.*)$/ # exe
+          file = $1
+          args = $2
+        else
+          file = name
+        end
+        path = "#{dir}/#{file}"
+        [path, name, file, args]
+      end
+
       def parse_entry(unit, phase, dir, entry)
         if entry.is_a?(Hash)
           entry.size == 1 or raise Error, "sql and module are single-line values"
           key, value = entry.first
           case key
             when "sql"; InlineNode.new(unit, phase, unit.path, value)
-            when "call"; 
+            when "call" 
               args = value.split(/\s+/)
               args.size >= 3 or raise "Illegal number of arguments: #{value}"
               file, klass, command, args = *args
               ModuleNode.new(unit, phase, "#{dir}/#{file}", klass, command, args)
+            when "exec"
+              path, name, file, args = parse_file_entry(dir, value)
+              ExeNode.new(unit, phase, path, args)
           else
             raise Error, "Illegal key: #{key}"
           end
         else
-          name = entry
-          name.sub!(/\$ENVIRONMENT/, Prick.state.environment.to_s)
-          name.sub!(/\/$/, "")
-          if name =~ /^(\S+)\s+(.*)$/ # exe
-            file = $1
-            args = $2
-          else
-            file = name
-          end
-          path = "#{dir}/#{file}"
+          path, name, file, args = parse_file_entry(dir, entry)
           if File.directory? path
             parse_directory(unit, path)
           elsif File.executable? path

data/lib/prick/version.rb

@@ -1,5 +1,5 @@
 # frozen_string_literal: true
 
 module Prick
-  VERSION = "0.20.18"
+  VERSION = "0.20.22"
 end

data/lib/subcommand/prick-setup.rb

@@ -4,7 +4,7 @@ require 'builder/builder.rb'
 
 module Prick::SubCommand
   def self.setup(database, username)
-    conn = PgConn.new
+    conn = PgConn.new("template1") # Connect to template1 because database might not exist
     if !conn.role.exist? username
       # FIXME Should not be created as superuser but we can't do that before we
       # have a super: option in build

data/prick.gemspec

@@ -37,9 +37,10 @@ Gem::Specification.new do |spec|
   spec.add_dependency "fixture_fox", "~> 0.1.3"
   spec.add_dependency "postspec"
   spec.add_dependency "pg_graph", "~> 0.1.8"
-  spec.add_dependency "shellopts", "~> 2.0.23"
+  spec.add_dependency "shellopts", "~> 2.0.24"
 
   spec.add_development_dependency "ruby-prof"
+  spec.add_development_dependency "dbutils"
 
   # Also un-comment in spec/spec_helper to use simplecov
   # spec.add_development_dependency "simplecov"

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: prick
 version: !ruby/object:Gem::Version
-  version: 0.20.18
+  version: 0.20.22
 platform: ruby
 authors:
 - Claus Rasmussen
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2022-06-06 00:00:00.000000000 Z
+date: 2022-06-11 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: semantic
@@ -128,14 +128,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 2.0.23
+        version: 2.0.24
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 2.0.23
+        version: 2.0.24
 - !ruby/object:Gem::Dependency
   name: ruby-prof
   requirement: !ruby/object:Gem::Requirement
@@ -150,6 +150,20 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: '0'
+- !ruby/object:Gem::Dependency
+  name: dbutils
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
 description: A release control and management system for postgresql
 email:
 - claus.l.rasmussen@gmail.com