prick 0.20.26 → 0.21.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: ef9683d44f849bd5a028f6b450a167fb2433b659b672f9a66568a59629c49fe7
-  data.tar.gz: 242a6d11790d04054d0e70f6142ba1564730b0d0cc1301cc37a9c3e350442618
+  metadata.gz: e8713e1196f35cc6086d3bb32164b6c79fb5e2d73c4e5d8530b9977bf48c4415
+  data.tar.gz: 8dde0df50e768126b505bd45163546eeca635c715a4a278ce9b1b6f3ed84c721
 SHA512:
-  metadata.gz: db54f4bb1da3d044092c5e6d0189e126d3f8508e8379edb41dbcc55f0b9e72fe9506ece977ca4661cc3269fe055a62eefce89ee4534e6453ad5d05601850a01b
-  data.tar.gz: 156401d0f3ff5410028d17ec4dff24757ee586579c682a5906f561fe9af253c83da88aebfeba6a422cc2502cd0aadb6af22292d07a06267a75d66ee388e1a291
+  metadata.gz: a0341de3eb0bf6db60039aab1c4dd215a0e211bc468674281b6f9ab36ba3ddf35615d89a39029dc9cb06688d786797d929d78e6ceab56d3d2d0511b9ab30780f
+  data.tar.gz: 4096b8941033430de62e392620059b6b7d4a9638499f3fe5fb28ab5e59f08a8ef7b47d05b6a1d8ad77d1b02f3e8b66e22cc1d5923cb770cae06bda9c8a380408

data/.ruby-version

@@ -1 +1 @@
-ruby-2.7.1
+ruby-3.1.2

data/TODO

@@ -1,3 +1,6 @@
+o Use mikras_root(1) to be able to run from any subdirectory
+o Add 'prick build .' and 'prick make .'
+
 o Fix that enum references are not created:
 
     system_roles
@@ -8,8 +11,6 @@ o Fix that enum references are not created:
         permissions:
           - *app_registry_anon_permission
 
-
-
 o Store fox.state, reflections, and reflections in the database so third-party
   programs can use them when testing
 o 'prick make <resource>' should build everything up the resource, then commit
@@ -21,6 +22,37 @@ o Build functions after schema so that there are no order dependencies on
   functions. Problem is to detect function files
 o Build views after schema so that there are no order dependencies on
   views. Problem is to detect view files
+o Detect file types dynamically by grepping for "create" statements
+
+o Add dependencies to build files:
+
+  schema: app_registry
+  require:
+    - sys_registry
+    - websys
+
+  schema: websys
+  require:
+    - $prod, $online
+      - fdw_websys
+      - sys_registry
+
+o Maybe extend build.yml syntax with conditionals. Eg.
+
+  - tables.sql
+  - $prod:
+      - prod_data.fox
+  - $dev:
+    - dev_debug.sql
+    - dev_data.fox
+  - $else:
+    - not_dev_data.fox
+  - $online:
+    - fdw_schema.sql
+  - not $online:
+    - fdw_schema_copy.sql
+  - $env in $proc, $online:
+    - fdw_operation.sql
 
 + prick release major|minor|patch
 + Check modification time of build.yml files too

data/exe/prick

@@ -242,6 +242,7 @@ rescue ShellOpts::Error, Prick::Error => ex
   ShellOpts.error(ex.message)
 end
 
+
 __END__
 
   -n,name=NAME

data/lib/builder/node.rb

@@ -131,15 +131,20 @@ 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
+        begin
+          pipe.puts [conn.name, conn.user]
+          sql = pipe.wait
+        rescue Errno::EPIPE
+          raise Prick::Error, "Pipe fail in #{path} called from #{parent.path}\n" + 
+                              "Tip: Read username/database from standard input"
+        end
         if pipe.status != 0
           $stderr.puts pipe.error
-          raise Prick::Error, "Failed executing #{pipe.cmd} #{args.join(" ")}"
+          raise Prick::Error, "Failed executing #{path} called from #{parent.path}"
         end
         @source_lines = 1 + 1 + sql.count("\n")
         ["set search_path to #{schema};\n", sql]

data/lib/builder/parser.rb

@@ -82,7 +82,7 @@ module Prick
         name.sub!(/\/$/, "")
         if name =~ /^(\S+)\s+(.*)$/ # exe
           file = $1
-          args = $2
+          args = $2.split
         else
           file = name
         end
@@ -111,8 +111,6 @@ module Prick
           path, name, file, args = parse_file_entry(dir, entry)
           if File.directory? path
             parse_directory(unit, path)
-          elsif File.executable? path
-            ExeNode.new(unit, phase, path, args)
           elsif File.file? path
             case path
               when /\.sql$/
@@ -120,7 +118,11 @@ module Prick
               when /\.fox$/
                 FoxNode.new(unit, :seed, path)
             else
-              raise Error, "Unrecognized file type #{File.basename(path)} in #{dir}"
+              if File.executable? path
+                ExeNode.new(unit, phase, path, args)
+              else
+                raise Error, "Unrecognized file type #{File.basename(path)} in #{dir}"
+              end
             end
           else
             raise Error, "Can't find #{name} in #{dir} from #{unit}"

data/lib/prick/version.rb

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

data/prick.gemspec

@@ -34,13 +34,12 @@ Gem::Specification.new do |spec|
   spec.add_dependency "constrain"
   spec.add_dependency "forward_to"
   spec.add_dependency "bootsnap"
-  spec.add_dependency "fixture_fox", "~> 0.1.3"
+  spec.add_dependency "fixture_fox"
   spec.add_dependency "postspec"
-  spec.add_dependency "pg_graph", "~> 0.1.8"
-  spec.add_dependency "shellopts", "~> 2.0.24"
+  spec.add_dependency "pg_graph"
+  spec.add_dependency "shellopts"
 
   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.26
+  version: 0.21.0
 platform: ruby
 authors:
 - Claus Rasmussen
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2022-06-12 00:00:00.000000000 Z
+date: 2022-07-20 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: semantic
@@ -84,16 +84,16 @@ dependencies:
   name: fixture_fox
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: 0.1.3
+        version: '0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: 0.1.3
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: postspec
   requirement: !ruby/object:Gem::Requirement
@@ -112,38 +112,24 @@ dependencies:
   name: pg_graph
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: 0.1.8
+        version: '0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: 0.1.8
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: shellopts
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: 2.0.24
-  type: :runtime
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: 2.0.24
-- !ruby/object:Gem::Dependency
-  name: ruby-prof
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
         version: '0'
-  type: :development
+  type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
@@ -151,7 +137,7 @@ dependencies:
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
-  name: dbutils
+  name: ruby-prof
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="