prick 0.46.0 → 0.47.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: '08b98b5cd47f2f9509bea5ecf7816c83d85f56e64811f3466317e474fcd6a2bd'
-  data.tar.gz: c303b9882c8ff8f9ea1c4e14e42e24c2ea84507165e9f664f4849ad35eed9c12
+  metadata.gz: d0b2c89a6c361464beb0f61da45df83e0d0f1ccc2d00beade78b2f25da3adc13
+  data.tar.gz: 0701613c1743c4e95cf7a801b770340f6e8bceffdfccab71125c05bda3baf4f9
 SHA512:
-  metadata.gz: 67984f2ce1a47cc947703cfad3765c3c11bd2d8edeca353c51a87d6bf633da23fb1d4a228368c92a760d4c02e3957f3fde74697ff80b6288132c88f8a916c090
-  data.tar.gz: 25c1d87f54a2b0a44565a810b7c37e6902f1a8eac8fc62ebdeb1cac8585fd5021a83fc640a53119c5100704517226fc20d87f049d8ebf6a6c258c604802fdd7c
+  metadata.gz: c3a5c9fc7067343094ce6684d099fd4a53f65fb0ab79dfcb9a2daf80cb47a3b0d8f25ce573524589b2368acc14ecb34637d4c07d51e574ac0267e6db1984f283
+  data.tar.gz: b4d63a84a815bef10f170a09e2f0bdff2dd41ebf18e6e406f7e71b953f4f228a31c75460ff2a78d0689551ac1925f732fef2e500aca8e00179b0394b23aa43d7

data/exe/prick

@@ -140,10 +140,12 @@ SPEC = %(
       useful to run 'prick snapshot' immediately after you complete building
       the database
 
-  build! --step -f,force -t,time --dump=KIND? -- [SCHEMA]
+  build! --step -f,force -t,time --dump=KIND? --path=BUILD_FILE -- [SCHEMA]
       Build the project. If SCHEMA is defined, later schemas are excluded. KIND
       can be 'nodes', 'allnodes' or 'batches' (the default). Schemas marked
-      with 'no refresh' is not built unless the --force is present
+      with 'no refresh' is not built unless the --force is present. The --file
+      option sets the initial build file or directory, default is
+      SCHEMA_DIR/build.yml
 
   make! --step -t,time --dump=KIND? -- [SCHEMA]
       @ Only rebuild changed files
@@ -441,6 +443,7 @@ begin
 #     exclude = cmd.exclude? ? cmd.exclude.split(",") : []
       Prick::SubCommand.build(
           database, username, args.expect(0..1),
+          path: cmd.path,
           force: cmd.force?, step: cmd.step?, timer: cmd.time?, dump: dump)
 
     when :make!

data/lib/prick/builder/builder.rb

@@ -62,7 +62,7 @@ module Prick
 
       def initialize(conn, path, clean = true, single: false, touched: false, load_pool: true, step: false)
         File.exist?(path) or raise Error, "Can't find #{path}"
-        single || File.directory?(path) or raise Error, "Can't find directory #{path}"
+        ! single || File.file?(path) or raise Error, "Not a file - #{path}"
 
         @conn = conn
         @path = path

data/lib/prick/builder/node.rb

@@ -197,6 +197,11 @@ module Prick
       end
     end
 
+    # Note that script nodes are evaluated within the running Prick process so
+    # it inherites all constants, classes, load path etc. Notice that this
+    # means that a script can't require a file that is also not required by
+    # prick
+    #
     class ScriptNode < ExecutableNode
     protected
       alias_method :execute, :execute_script

data/lib/prick/builder/parser.rb

@@ -17,9 +17,9 @@ module Prick
       def parse(path, single: false)
         File.exist?(path) or raise Error, "Can't find #{path}"
         if single
-          parse_path(path)
+          parse_single(path)
         else
-          parse_directory(nil, path)
+          parse_path(nil, path)
         end
         self
       end
@@ -34,7 +34,7 @@ module Prick
         end
       end
 
-      def parse_path(path, schema: nil)
+      def parse_single(path, schema: nil)
         File.exist?(path) or raise Error, "Can't find #{file}"
         dir = File.dirname(path)
         file = File.basename(path)
@@ -44,8 +44,15 @@ module Prick
         unit
       end
 
-      def parse_directory(parent, dir)
-        build_file = "#{dir}/build.yml".sub(/\/\//, "/")
+      def parse_path(parent, path)
+        if File.directory?(path)
+          dir = path
+          build_file = "#{path}/build.yml".sub(/\/\//, "/")
+        elsif File.file?(path)
+          dir = File.dirname(path)
+          build_file = path
+        end
+
         if File.exist? build_file
           parse_build_file(parent, dir, build_file)
         else
@@ -161,7 +168,7 @@ module Prick
         else
           (path, args = parse_file_entry(unit, dir, entry)) or return nil
           if File.directory? path
-            parse_directory(unit, path)
+            parse_path(unit, path)
           elsif File.executable?(path)
             SysExecNode.new(unit, phase, path, args)
           elsif File.file? path

data/lib/prick/local/command.rb

@@ -94,7 +94,7 @@ module Command
   end
 
 private
-  # cmd is the of the command/script and is only used in error messages
+  # cmd is the name of the command/script and is only used in error messages
   def command_wrapper(cmd, stdin: nil, stderr: nil, fail: true, &block)
     pw = IO::pipe # pipe[0] for read, pipe[1] for write
     pr = IO::pipe

data/lib/prick/share/init/schema/prick/tables.sql

@@ -16,7 +16,7 @@ create table builds (
   prick varchar not null,-- Prick version
 
   -- Git
-  branch varchar not null,
+  branch varchar, -- Null in detached branches
   rev varchar not null, -- commit ID
   clean boolean not null default true, -- True if git repository is clean
 

data/lib/prick/state.rb

@@ -191,7 +191,7 @@ module Prick
             "PRICK_SPOOLDIR" =>  File.join(Prick.state.prick_dir, SPOOL_DIR),
             "PRICK_TMPDIR" =>  File.join(Prick.state.prick_dir, TMP_DIR),
             "PRICK_CLONEDIR" =>  File.join(Prick.state.prick_dir, CLONE_DIR),
-            "PRICK_SPECDIR" =>  File.join(Prick.state.prick_dir, BIN_DIR),
+            "PRICK_SPECDIR" =>  File.join(Prick.state.prick_dir, SPEC_DIR),
           })
         end
 

data/lib/prick/subcommand/prick-build.rb

@@ -5,10 +5,13 @@ require_relative '../builder/builder.rb'
 module Prick::SubCommand
   def self.build(
       database, username, schema,
-      builddir: Prick.state.schema_dir,
+      path: nil, # Default SCHEMA_DIR
       force: false, # Build all schemas
       step: false, timer: nil, dump: nil)
 
+    path ||= Prick.state.schema_dir
+    File.exist?(path) or Prick.error "Can't find #{path}"
+
     Timer.on! if timer
 
     Timer.time "Prick::Command#build" do
@@ -30,7 +33,7 @@ module Prick::SubCommand
           end
           conn = Prick.state.connection
 
-          builder = Prick::Build::Builder.new(conn, builddir, step: step)
+          builder = Prick::Build::Builder.new(conn, path, step: step)
 
           if exist # Empty (part of) the database
             if force

data/lib/prick/version.rb

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

metadata

@@ -1,14 +1,13 @@
 --- !ruby/object:Gem::Specification
 name: prick
 version: !ruby/object:Gem::Version
-  version: 0.46.0
+  version: 0.47.0
 platform: ruby
 authors:
 - Claus Rasmussen
-autorequire: 
 bindir: exe
 cert_chain: []
-date: 2024-12-18 00:00:00.000000000 Z
+date: 1980-01-02 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: semantic
@@ -258,7 +257,6 @@ files:
 homepage: http://www.nowhere.com/
 licenses: []
 metadata: {}
-post_install_message: 
 rdoc_options: []
 require_paths:
 - lib
@@ -273,8 +271,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.3.7
-signing_key: 
+rubygems_version: 3.6.9
 specification_version: 4
 summary: A release control and management system for postgresql
 test_files: []