prick 0.20.28 → 0.21.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 722515198da4c147ce92b509e47ab06a18f6dcb0e55dffee916047d48086dde9
-  data.tar.gz: 3fa9993f901a7f17af137d5bdf45663cb632b5563b6e5fee3bedd2c903105aad
+  metadata.gz: 851c4a7b6184883fd38a03f5a96af408640f76fcd424859947e0aa70a91b3f81
+  data.tar.gz: 9c04deb3aadf390833b6bd3b3def242069b75b9cfad297e3287900067d33bbbe
 SHA512:
-  metadata.gz: 5ff2373784785d306415949290f208e2b5747152c965252ac05ed4f8c00c5a899c463ac56ef4fae0eea8a9b22e2ac3d261380611adef3b43854451986ee28cf3
-  data.tar.gz: 0baf00ac8c4ff4ce4c2ea741589576cb2cda5dcba130bf5b425f0a73861383dda1facb5214559a2141aab16fb5177750587d5ab9def80fd9f3e904d8f7f5b2b6
+  metadata.gz: ce3215c329264d1e9948aba65c2e15085b17b868270abb4e8539d4a14c82ff353a0e3986e5b1b1bd3548b23188629a906008d735a759a47b70a883d2b289604c
+  data.tar.gz: e75dd4f658cd3a7283d70e1e0bdff064063f062cdd0c7560dae682aa1c9c0679a5dd3be69fbabc67f396041e811fd9620cfc6c4a7b3d32c527dfb64300c7c25f

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/lib/builder/batch.rb

@@ -9,7 +9,7 @@ module Prick
       def kind() @nodes.first&.kind end
       attr_reader :nodes
 
-      def initialize(builder) 
+      def initialize(builder)
         @builder = builder
         @nodes = [] 
       end
@@ -32,6 +32,7 @@ module Prick
         super {
           begin
             sql = []
+            # A SQL batch allows the first node to be an executable
             if nodes.first.is_a?(ExeNode)
               time "Execute script" do
                 sql = [nodes.first.source]

data/lib/builder/node.rb

@@ -37,6 +37,7 @@ module Prick
         @parent, @phase, @kind, @path = parent, phase, kind, path
         @args = args&.empty? ? nil : args
         @schema = nil
+        @source = nil
         @source_lines = nil
       end
 
@@ -138,6 +139,10 @@ module Prick
         begin
           pipe.puts [conn.name, conn.user]
           sql = pipe.wait
+        rescue Command::Error => ex
+          message = "prick: Error executing '#{to_s}'\n" + ex.stderr.map { |l| "   #{l}" }.join("\n")
+          raise Prick::Error.new(message)
+          
         rescue Errno::EPIPE
           raise Prick::Error, "Pipe fail in #{path} called from #{parent.path}\n" + 
                               "Tip: Read username/database from standard input"

data/lib/builder/parser.rb

@@ -95,7 +95,8 @@ module Prick
           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 "sql"
+              InlineNode.new(unit, phase, unit.path, value)
             when "call" 
               args = value.split(/\s+/)
               args.size >= 3 or raise "Illegal number of arguments: #{value}"

data/lib/local/command.rb

@@ -171,7 +171,8 @@ module Command
     end
   end
 
-  # Exit status of the last command
+  # Exit status of the last command. FIXME: This is not usable because the
+  # methods raise an exception if the command exited with anything but 0
   def status() @status end
 
   # Stored exception when #command is called with :fail true

data/lib/prick/version.rb

@@ -1,5 +1,5 @@
 # frozen_string_literal: true
 
 module Prick
-  VERSION = "0.20.28"
+  VERSION = "0.21.1"
 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.28
+  version: 0.21.1
 platform: ruby
 authors:
 - Claus Rasmussen
-autorequire: 
+autorequire:
 bindir: exe
 cert_chain: []
-date: 2022-06-24 00:00:00.000000000 Z
+date: 2022-11-03 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:
     - - ">="
@@ -229,7 +215,7 @@ files:
 homepage: http://www.nowhere.com/
 licenses: []
 metadata: {}
-post_install_message: 
+post_install_message:
 rdoc_options: []
 require_paths:
 - lib
@@ -244,8 +230,8 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.1.2
-signing_key: 
+rubygems_version: 3.3.18
+signing_key:
 specification_version: 4
 summary: A release control and management system for postgresql
 test_files: []