prick 0.39.8 → 0.39.10

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: d0d60cf8855c1cd7dcc4b0183a4dffbd308157cd7e15601ed5976a336ce8ceff
-  data.tar.gz: 62e2c45a335d45430f27c33a2a078ea45555dc41b722635ee33ce3a598b409d3
+  metadata.gz: d21f671634521afdb6a2f711b98042f5561496f45fcbfc75446a622cc4f0209c
+  data.tar.gz: cd77bebc7e51297f7a768ae7b3d15267ea0591a8a9338ca73ba9d4e04589f6e3
 SHA512:
-  metadata.gz: cc493ec4c4f87ac990c545da92be73817669fe71418fd3aa20c1604369a4860d7c03218a727546172b5f6f67761b338f1f1db1c5f1f08d351fda5ebdb88f59fb
-  data.tar.gz: 767d9ea5b0911f70603b4414fee3d29e259a5489c18a7d8edb6d1699d2915d3a7b096dcae7a0882e8d547e0ad6a3e5c73d560628b109214b71fe010cb792281f
+  metadata.gz: 8b48ab4c8a4dc42df39d46a827279b6e413f04d1a1989c9aee4858e30e26a05dff7630cb22fe37f464c5e3ca3cbb3634061ed2e8cdc161b514defcdf7f9372e1
+  data.tar.gz: 98e31722b962566506a7157acf72b9eeb523b68f9427f98e8b633e7e056fbe38e4c57886fa88341cde5e80285cd86e3fb5bf24eb3153d95ed74b6c0d097df371

data/exe/prick

@@ -524,6 +524,11 @@ begin
     Prick.failure "Internal error: Unhandled command - #{opts.subcommand.inspect}"
   end
 
+rescue FixtureFox::ParseError => ex
+  $stderr.puts "Parse Error in #{ex.error_message}"
+  exit 1
+
+
 rescue Prick::Build::PostgresError => ex
   $stderr.puts "Error: #{ex.message}"
   if STDERR.tty?

data/lib/prick/builder/batch.rb

@@ -16,9 +16,13 @@ module Prick
 
       def execute(**opts, &block)
         name = self.class.to_s.sub(/.*::/, "").split(/(?=[A-Z])/).map(&:downcase).join(" ")
+        node_paths = nodes.map(&:relpath)
         time "Execute #{name} (nodes: #{nodes.size})" do
           yield(**opts)
         end
+        if Timer.on?
+          ::Timer.file.indent { |f| f.puts node_paths }
+        end
       end
 
       def dump

data/lib/prick/builder/builder.rb

@@ -88,6 +88,7 @@ module Prick
         batch = nil
 
         for node in [init_nodes, decl_nodes, fox_seed_nodes, sql_seed_nodes, term_nodes.reverse].flatten
+          # Create new batch if required. Order of when-clauses is important
           case node.kind
             when :module
               if batch&.kind != :module
@@ -103,7 +104,7 @@ module Prick
                 batch = SqlBatch.new(self)
               end
             when :sql || node.kind == :inline
-              if batch&.kind != :exe
+              if batch&.kind != :exe || step
                 @batches << batch if batch
                 batch = SqlBatch.new(self)
               end
@@ -113,11 +114,13 @@ module Prick
             when :fox
               @batches << batch if batch
               batch = FoxBatch.new(self)
-            when :yml
+            when :yml # build.yml files
               next
           else
             raise Error, "Unexpected node kind: #{node.kind}"
           end
+
+          # Add node to current batch
           batch.nodes << node
         end
         @batches << batch if batch

data/lib/prick/builder/node.rb

@@ -9,6 +9,7 @@ module Prick
       attr_reader :args # only defined for :exe (String)
 
       def name() @name = File.basename(path) end
+      def relpath = path.sub(/^#{Dir.getwd}\//, "")
 
       # Note that schema defaults to 'public' which may not be what you want in
       # some cases
@@ -126,7 +127,6 @@ module Prick
       alias_method :command, :to_s
 
       def filename = File.basename(path)
-      def relpath = path.sub(/^#{Dir.getwd}\//, "")
 
       def initialize(parent, phase, path, args = nil)
         constrain args, [String]

data/lib/prick/local/timer.rb

@@ -43,7 +43,7 @@ module Timer
     def file() ::Timer.file end
 
     def self.on!() ::Timer.on! end
-    def self.on?() ::Time.on? end
+    def self.on?() ::Timer.on? end
 
     def unit() ::Timer.unit end
     def unit=(unit) ::Timer.unit = unit end

data/lib/prick/version.rb

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

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: prick
 version: !ruby/object:Gem::Version
-  version: 0.39.8
+  version: 0.39.10
 platform: ruby
 authors:
 - Claus Rasmussen
 autorequire:
 bindir: exe
 cert_chain: []
-date: 2024-08-08 00:00:00.000000000 Z
+date: 2024-08-21 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: semantic