prick 0.39.12 → 0.40.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 5ebdfba60b4161b0afa671e4c19abf963db5d017376c089acade485e5d895dc8
-  data.tar.gz: a3cff45e06c66cb094fa3ca891b4d3a863d21ab52f2fb13ff1b9c2d026bb494b
+  metadata.gz: e6f8ea8c479a4482f6b26e33c9e83a0f61ab6078d715a014124c34d11b0ff66a
+  data.tar.gz: a4fbc9c66bee4866dc51c99068f835ded7c53dbceb4eedc6d5c4df61d3709c2b
 SHA512:
-  metadata.gz: 16a1deeabd509f289eeb1fff91a2880e21794bd1124862b84f0fd9c4cad19c512d22d2733ac9cd7b9bf0b288f536739cd9b1c1da88b002f1e2c4ceb9dd2c677a
-  data.tar.gz: 477ce9af0329c7b07a89be381f73cf47629f97b38395342dc817b0ccc051b20b1381da92e6bd71ed9cebb0f8a0b6e9a559eeaf7944b980f1c215d440f0d56f6f
+  metadata.gz: 4d3a33f458512e93fc42bf28abf4fff87fbb82c648b657207546a24962f0c9f27356cafd988a7411ab4a969c228155ed6992de781827ee16e7d70e9b711b4574
+  data.tar.gz: a38e125d8ca682a03a712fd911e89bf9190e5709dfdd5d449607b572e3e1e15e8f1bac3f903d6b8deeae715176203a6265201cd840aaac124c0e1043a991766d

data/TODO

@@ -1,3 +1,4 @@
+o Make references to file stable when using -C
 o prefix sql scripts with 'set ON_ERROR_STOP on'
 o make it possible to build only one scheme
 o cleanup connection
@@ -11,9 +12,18 @@ o Have the following entries
     sql: SQL_STATEMENT
     exec: BASH_COMMAND
     eval: BASH_COMMAND
-    call: 
+    call:
     ...
 
+o Use multiple processes. Build order
+
+    tables
+    (pg_graph dump in parallel)
+    plpgsql functions
+    views
+    sql functions
+    indexes
+    load seeds (requires pg_graph dump)
 
 o Use mikras_root(1) to be able to run from any subdirectory
 o Add 'prick build .' and 'prick make .'

data/exe/prick

@@ -1,17 +1,17 @@
 #!/usr/bin/env ruby
 
-require 'bootsnap'
-begin
-  cache_dir = "/run/user/" + `id -u`.chomp
-  Bootsnap.setup(
-    cache_dir:            cache_dir,            # Path to your cache
-    development_mode:     true,                 # Current working environment, e.g. RACK_ENV, RAILS_ENV, etc
-    load_path_cache:      true,                 # Optimize the LOAD_PATH with a cache
-    compile_cache_iseq:   true,                 # Compile Ruby code into ISeq cache, breaks coverage reporting.
-    compile_cache_yaml:   true                  # Compile YAML into a cache
-  )
-  # Bootsnap.instrumentation = ->(event, path) { puts "#{event} #{path}" }
-end
+#require 'bootsnap'
+#begin
+# cache_dir = "/run/user/" + `id -u`.chomp
+# Bootsnap.setup(
+#   cache_dir:            cache_dir,            # Path to your cache
+#   development_mode:     true,                 # Current working environment, e.g. RACK_ENV, RAILS_ENV, etc
+#   load_path_cache:      true,                 # Optimize the LOAD_PATH with a cache
+#   compile_cache_iseq:   true,                 # Compile Ruby code into ISeq cache, breaks coverage reporting.
+#   compile_cache_yaml:   true                  # Compile YAML into a cache
+# )
+# # Bootsnap.instrumentation = ->(event, path) { puts "#{event} #{path}" }
+#end
 
 require 'shellopts'
 
@@ -37,9 +37,15 @@ SPEC = %(
   -e,environment-file=ENVIRONMENT-FILE
       Override the environment file. Default is 'prick.environment.yml'
 
+  -r,reflections-file=REFLECTIONS-FILE
+      Override the reflections file. Default is 'schema/reflections.yml'
+
   -s,state-file=STATE-FILE
       Override state file. Default is '.prick-state.yml'
 
+  -f,fox-state-file=FOX-STATE-FILE
+      Override fox state file. Default is '.fox-state.yml
+
   init! -n,name=NAME -t,title=TITLE DIRECTORY #@ Initialize new Prick project directory
       Initializes a prick project and checks it into git. If a directory is
       given the directory will be created and the project initialized in it.
@@ -117,7 +123,9 @@ SPEC = %(
   drop.data!
       @ Drop data
 
-      TODO
+      Drop data added to the database after the last snapshot was taken. It is
+      useful to run 'prick snapshot' immediately after you complete building
+      the database
 
   build! --step -f,force -t,time --dump=KIND? -- [SCHEMA]
       Build the project. If SCHEMA is defined, later schemas are excluded. KIND
@@ -134,12 +142,15 @@ SPEC = %(
   run! --step -t,time --dump=KIND? --schema=SCHEMA -- PATH
       @ Execute path in Prick environment
 
-      Execute a single directory or file within the Prick environment. If given
-      a directory argument, the directory is searched for a build.yml file. If
-      given a file argument, the file should be a .sql, .fox, or build file
+      Execute a single build directory or file within the Prick environment. If
+      given a directory argument, the directory is searched for a build.yml
+      file. If given a file argument, the file should be a .sql, .fox, or build
+      file
 
       The --schema option sets the current schema before executing the PATH
 
+      TODO: Allow executables
+
   touch! -- [SUCCESS]
       Record a build. SUCCESS can be 'true' (default) or 'false'.  'touch' is
       used by external build processes that doesn't involve prick
@@ -148,18 +159,19 @@ SPEC = %(
       Emit a bash script to build the database. The script is constructed from
       the build attributes in the environment file
 
-  fox! -- FILE...
-      Load fox file data. Data are reset to their initial state after build
-      before the fox data are loaded. This makes it possible to experiment with
-      different data sets
+  fox! -r,reset +e,exclude=SCHEMA... -- FILE...
+      Load fox file data. Can be used together with 'prick snapshot' and 'prick
+      drop data' to to experiment with different data sets
 
-      # TODO: A --clean option that resets data
-      #
+      The --reset option resets data to the last snapshot before loading the
+      file. The --exclude option lists schemas that should not be included in
+      fox, typically schemas that doens't comply with prick's naming
+      conventions
 
   snapshot!
-      Records maximum ID for all tables and stores them in prick.snapshot. It is
-      used by 'drop data' to reset data to the point in time of the snapshot.
-      Only one snapshot can be created at a time
+      Records maximum ID for all tables and stores them in the prick.snapshot
+      table. It is used by 'drop data' to reset data to the point in time of
+      the snapshot. Only one snapshot can be created at a time
 
   reset!
       Restore database to the last snapshot. TODO
@@ -240,6 +252,10 @@ def clean_pg_meta_cache
   FileUtils.rm_f(PG_META_STATE_PATH)
 end
 
+def clean_fox_state
+  FileUtils.rm_f(Prick.state.fox_state_file)
+end
+
 def parse_database_args(state, args)
   arg, environment = args.expect(0..2)
   if arg
@@ -273,7 +289,7 @@ end
 
 # Require prick only after -C directory option because some constants depends
 # on the current directory
-require_relative '../lib/prick.rb'
+require_relative '../lib/prick-command.rb'
 include Prick
 
 begin
@@ -287,7 +303,9 @@ begin
   # Handle -p, -e, and -c. TODO: Take -C into account for relative paths. Low-hanging fruit
   project_file = opts.project_file || PRICK_PROJECT_PATH
   environment_file = opts.environment_file || PRICK_ENVIRONMENT_PATH
+  reflections_file = opts.reflections_file || REFLECTIONS_PATH
   state_file = opts.state_file || PRICK_STATE_PATH
+  fox_state_file = opts.fox_state_file || FOX_STATE_PATH
 
   # Process init command and exit
   if opts.subcommand == :init!
@@ -307,7 +325,7 @@ begin
   end
 
   # Load state
-  state = Prick.state = State.new(project_file, environment_file, state_file)
+  state = Prick.state = State.new(project_file, environment_file, reflections_file, state_file, fox_state_file)
 
   # Lazyness
   database = state.database
@@ -381,6 +399,7 @@ begin
     when :build!
       require_db
       clean_pg_meta_cache
+      clean_fox_state
       dump = cmd.dump? ? cmd.dump("batches")&.to_sym || :batches : nil
 #     exclude = cmd.exclude? ? cmd.exclude.split(",") : []
       Prick::SubCommand.build(
@@ -390,6 +409,7 @@ begin
     when :make!
       require_db
       clean_pg_meta_cache
+      clean_fox_state
       dump = cmd.dump? ? cmd.dump("batches")&.to_sym || :batches : nil
       Prick::SubCommand.make(
           database, username, args.expect(0..1),
@@ -415,7 +435,7 @@ begin
 
     when :fox!
       require_db
-      Prick::SubCommand.fox(database, username, args)
+      Prick::SubCommand.fox(database, username, args, reset: cmd.reset?, exclude: cmd.exclude)
 
     when :snapshot!
       require_db

data/lib/prick/builder/batch.rb

@@ -40,7 +40,7 @@ module Prick
 
           begin
             # A SQL batch allows the first node to be an evaluated or executed node
-            if nodes.first.is_a?(CommandNode)
+            if nodes.first.is_a?(ExecutableNode)
               node = nodes.shift
               conn.execute [node.source], silent: true
             end
@@ -122,8 +122,12 @@ module Prick
           t_type.stop
           t_fox = Timer.new "  Parse files"
 
+          # Fetch state
+          ids, anchors = FixtureFox::Fox.read_state(type, Prick.state.fox_state_file)
+
           # Create fox object
-          fox = FixtureFox::Fox.new(type)
+          #
+          fox = FixtureFox::Fox.new(type, ids: ids, anchors: anchors)
 
           # Parse files
           for file in files
@@ -135,8 +139,8 @@ module Prick
           fox.assign_types
           fox.generate
 
-          # Dump state file
-          fox.write_state(FOX_STATE_PATH)
+          # Dump new state file
+          fox.write_state(Prick.state.fox_state_file)
 
           # Timer
           t_fox.stop

data/lib/prick/builder/builder.rb

@@ -66,7 +66,7 @@ module Prick
 
         @conn = conn
         @path = path
-        @reflections_file = REFLECTIONS_PATH
+        @reflections_file = Prick.state.reflections_file
         @clean = clean
         @single = single
         @step = step

data/lib/prick/builder/node.rb

@@ -43,7 +43,7 @@ module Prick
         @source_lines = nil
       end
 
-      def to_s() @to_s ||= [path, args].compact.join(" ") end
+      def to_s() @to_s ||= [path, *args].join(" ") end
       def inspect() to_s end
       def dump() puts "#{inspect} (#{@schema || 'nil'})" end
 
@@ -123,47 +123,132 @@ module Prick
       def self.objects() @@objects end
     end
 
-    # Virtual base class for EvalNode and ExecNode
-    class CommandNode < Node
+    # Virtual base class for executable nodes
+    class ExecutableNode < Node
+      # The full command including arguments
       alias_method :command, :to_s
 
+      # The command. Equal to #command without arguments
+      alias_method :cmd, :path
+
+      # Path to executable
+      def exepath()
+        @exepath ||= begin
+          v = `which #{path} 2>/dev/null`.chomp
+          v == "" ? nil : v
+        end
+      end
+
       def filename = File.basename(path)
 
       def initialize(parent, phase, path, args = nil)
         constrain args, [String]
         super(parent, phase, :exe, path, args)
+        check_path
       end
 
       def inspect() "#{path} #{(args || []).join(" ")}" end
 
     protected
-      def execute_command
+      def check_path
+        !exepath.nil? or Prick.error "'#{path}' is not an executable"
+      end
+
+      def read_cmd
+        sql = execute
+        @source_lines = 1 + 1 + sql.count("\n")
+        ["set search_path to #{schema}, pg_temp", sql.join("\n")]
+      end
+
+      def exec_cmd
+        execute
+        []
+      end
+
+      def execute() = raise
+
+      def execute_system
         begin
-          Command.command(Prick.state.bash_environment, command)
+          yield
         rescue Command::Error => ex
           message = "Error executing '#{command}'\n" + ex.stderr.map { |l| "   #{l}" }.join("\n")
           Prick.error message
         end
       end
+
+      def execute_script
+        begin
+          r = Command.script(Prick.state.bash_environment, cmd, argv: args)
+        rescue Command::Error => ex
+          message = "Error executing '#{command}'\n" + ex.stderr.map { |l| "   #{l}" }.join("\n")
+          Prick.error message
+        ensure
+          # Reset connection because the script may have manipulated the
+          # current connection
+          Prick.owner_conn&.reset
+        end
+        r
+      end
     end
 
-    # EvalNode executes the command and feeds the output into the database
-    class EvalNode < CommandNode
+    class ScriptNode < ExecutableNode
+    protected
+      alias_method :execute, :execute_script
+
+      def check_path
+        super
+        return if path.end_with?(".rb")
+        first_line = File.open(exepath, &:gets).chomp
+        first_line =~ /^#!\/usr\/bin\/env\>.*ruby/ or Prick.error "'#{path}' is not a ruby script"
+      end
+    end
+
+    class EvalNode < ScriptNode
+      alias_method :read_source, :read_cmd
+    end
+
+    class ExecNode < ScriptNode
+      alias_method :read_source, :exec_cmd
+    end
+
+    class SystemCommandNode < ExecutableNode
+    protected
+      alias_method :execute, :execute_system
+    end
+
+    class RequireNode < ExecutableNode
       def read_source
         sql = execute_command
         @source_lines = 1 + 1 + sql.count("\n")
         ["set search_path to #{schema}, pg_temp", sql.join("\n")]
       end
+
+      def execute_command
+        execute {
+          Command.inline(Prick.state.bash_environment, path, argv: args)
+        }
+      end
     end
 
-    # ExecNode executes the command and ignores its output
-    class ExecNode < CommandNode
-      def read_source
-        execute_command
-        []
+    class CommandNode < ExecutableNode
+    protected
+      def execute_command
+        execute {
+          Command.command(Prick.state.bash_environment, command)
+        }
       end
     end
 
+    # EvalNode executes the command and feeds the output into the database
+    class SysEvalNode < SystemCommandNode
+      alias_method :read_source, :read_cmd
+    end
+
+    # ExecNode executes the command and ignores its output
+    class SysExecNode < SystemCommandNode
+      alias_method :read_source, :exec_cmd
+    end
+
     # A build.yml file node
     class BuildNode < Node
       # True if the build file contains a 'schema' attribute
@@ -220,4 +305,3 @@ module Prick
     end
   end
 end
-

data/lib/prick/builder/parser.rb

@@ -57,7 +57,8 @@ module Prick
         unit = make_build_unit(parent, path)
         entries = YAML.load(File.read(path)) || []
         entries.each { |entry|
-          if entry.is_a?(Hash) && (entry.size != 1 || !%w(call sql exec eval).include?(entry.first.first))
+          if entry.is_a?(Hash) \
+              && (entry.size != 1 || !%w(call sql exec eval sysexec syseval).include?(entry.first.first))
             entry.each { |key, value|
               if key == "schema"
                 unit.schema = value
@@ -129,12 +130,21 @@ module Prick
               command = args.shift
               klass && command or raise "Illegal number of arguments: #{value}"
               ModuleNode.new(unit, phase, path, klass, command, args)
+            when "require"
+              (path, args = parse_file_entry(unit, dir, value)) or return nil
+              RequireNode.new(unit, phase, path, args)
             when "eval"
               (path, args = parse_file_entry(unit, dir, value)) or return nil
               EvalNode.new(unit, phase, path, args)
             when "exec"
               (path, args = parse_file_entry(unit, dir, value)) or return nil
               ExecNode.new(unit, phase, path, args)
+            when "syseval"
+              (path, args = parse_file_entry(unit, dir, value)) or return nil
+              SysEvalNode.new(unit, phase, path, args)
+            when "sysexec"
+              (path, args = parse_file_entry(unit, dir, value)) or return nil
+              SysExecNode.new(unit, phase, path, args)
           else
             raise Error, "Illegal key: #{key}"
           end
@@ -143,7 +153,7 @@ module Prick
           if File.directory? path
             parse_directory(unit, path)
           elsif File.executable?(path)
-            ExecNode.new(unit, phase, path, args)
+            SysExecNode.new(unit, phase, path, args)
           elsif File.file? path
             case path
               when /\.sql$/

data/lib/prick/local/command.rb

@@ -1,5 +1,4 @@
 require 'fcntl'
-
 module Command
   class Error < RuntimeError
     attr_reader :cmd
@@ -18,92 +17,85 @@ module Command
     end
   end
 
-  class Pipe
-    attr_reader :cmd
-    attr_reader :status
-
-    def writer() @pw[1] end
-    def reader() @pr[0] end
-    def error() @pe[0] end
-
-    forward_to :reader, :read, :gets
-    forward_to :writer, :write, :puts
-
-    # Remaining output not consumed by #get/#read or through #reader or #error
-    attr_reader :stdout
-    attr_reader :stdin
+  # Execute the shell command 'cmd' and return standard-output as an array of
+  # strings. If :stdin is a string or an array of lines if will be fed to the
+  # command on standard-input, if it is a IO object that IO object is piped to
+  # the command
+  #
+  # By default #command pass through error message to stderr but if :stderr is
+  # true, #command will instead return a tuple of stdout/stderr lines. If
+  # :stderr is false, stderr is ignored and is the same as adding "2>/dev/null"
+  # to the command
+  #
+  # #command raises a Command::Error exception if the command returns with an
+  # exit code != 0 unless :fail is false. In that case the the exit code can be
+  # fetched from Command::status
+  #
+  def command(env = {}, cmd, argv: nil, stdin: nil, stderr: nil, fail: true)
+    command_wrapper(cmd, stdin: stdin, stderr: stderr, fail: fail) {
+      # Add standard shell options
+      bashcmd = "set -o errexit\nset -o pipefail\n#{cmd}"
 
-    def initialize(cmd, stderr: nil, fail: true)
-      @cmd = "set -o errexit\nset -o pipefail\n#{cmd}"
-      @stderr = stderr
-      @fail = fail
+      # Add arguments if present
+      bashcmd = [bashcmd, *argv].join(' ') if argv
 
-      @pw = IO::pipe # pipe[0] for read, pipe[1] for write
-      @pr = IO::pipe
-      @pe = IO::pipe
+      # Clean bundler environment so that prick can be run in development mode.
+      # The problem is that the bundler environment is inherited by
+      # subprocesses and interferes with loading ruby commands. FIXME This is
+      # only relevant when running prick in development mode
+      ENV.delete_if { |k,v| %w(RUBYOPT RUBYLIB _).include?(k) || k =~ /^BUNDLER?_/ }
 
-      STDOUT.flush
+      # Setup environment
+      env = env.map { |k,v| [k.to_s, v.to_s] }.to_h # Convert array values to strings
+      env.each { |k,v| ENV[k] = v }
 
-      @pid = fork {
-        @pw[1].close
-        @pr[0].close
-        @pe[0].close
+      Kernel.exec(env, bashcmd)
+    }
+  end
 
-        STDIN.reopen(@pw[0])
-        @pw[0].close
+  # Like command but returns true if the command exited with the expected
+  # status. Note that it suppresses standard-error by default
+  #
+  def command?(env = {}, cmd, expect: 0, argv: nil, stdin: nil, stderr: false)
+    command(env, cmd, argv: argv, stdin: stdin, stderr: stderr, fail: false)
+    @status == expect
+  end
 
-        STDOUT.reopen(@pr[1])
-        @pr[1].close
+  # Exit status of the last command
+  def status() @status end
 
-        STDERR.reopen(@pe[1])
-        @pe[1].close
+  # Exception of the last command if it failed, otherwise nil TODO What is this used for?
+  def exception() @exception end
 
-        exec(cmd)
-      }
+  # Like #command but "execute" the ruby file by requiring it. This is only
+  # possible using ruby scripts
+  def script(env = {}, script, argv: nil, stdin: nil, stderr: nil, fail: true)
 
-      @pw[0].close
-      @pr[1].close
-      @pe[1].close
+    # Turn script into absolute path or a path relative to the current
+    # directory
+    if !script.start_with?("/") && !script.start_with?(".")
+      script = "./#{script}"
     end
 
-    def wait
-      @pw[1].close
-      @status = Process.waitpid2(@pid)[1].exitstatus
-
-      out = @pr[0].readlines.map(&:chomp)
-      err = @pe[0].readlines.map(&:chomp)
+    command_wrapper(script, stdin: stdin, stderr: stderr, fail: fail) {
+      ENV.delete_if { |k,v| %w(RUBYOPT RUBYLIB _).include?(k) || k =~ /^BUNDLER?_/ }
 
-      @pr[0].close
-      @pe[0].close
+      # Setup environment
+      env = env.map { |k,v| [k.to_s, v.to_s] }.to_h # Convert array values to strings
+      env.each { |k,v| ENV[k] = v }
 
-      raise Command::Error.new(@cmd, @status, nil, out, err) if @status != 0 && @fail == true
+      # Setup ARGV. Only relevant when running ruby scripts using the 'require'
+      # mechanish instead of calling them through the shell
+      ARGV.replace (argv || [])
 
-      case @stderr
-        when true; [out, err]
-        when false; out
-        when nil
-          $stderr.puts err
-          out
-      end
-    end
+      # 'Execute' script by requiring it
+      require script
+    }
   end
 
-  # Execute the shell command 'cmd' and return standard-output as an array of
-  # strings. If :stdin is a string or an array of lines if will be fed to the
-  # command on standard-input, if it is a IO object that IO object is piped to
-  # the command
-  #
-  # By default #command pass through stderr but if :stderr is true, #command
-  # will instead return a tuple of stdout/stderr lines. If :stderr is false,
-  # stderr is ignored and is the same as adding "2>/dev/null" to the command
-  #
-  # #command raises a Command::Error exception if the command returns with an
-  # exit code != 0 unless :fail is false. In that case the the exit code can be
-  # fetched from Command::status
-  #
-  def command(env = {}, cmd, stdin: nil, stderr: nil, fail: true)
-    cmd = "set -o errexit\nset -o pipefail\n#{cmd}"
-
+private
+  # cmd is the 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
     pe = IO::pipe
@@ -124,14 +116,7 @@ module Command
       STDERR.reopen(pe[1])
       pe[1].close
 
-      # Clean bundler environment so that prick can be run in development mode.
-      # The problem is that the bundler environment is inherited by
-      # subprocesses and interferes with loading ruby commands. FIXME This is
-      # only relevant when running prick in development mode
-      ENV.delete_if { |k,v| %w(RUBYOPT RUBYLIB _).include?(k) || k =~ /^BUNDLER?_/ }
-      env = env.map { |k,v| [k.to_s, v.to_s] }.to_h # Convert array values to strings
-      env.each { |k,v| ENV[k] = v }
-      Kernel.exec(env, cmd)
+      yield
     }
 
     pw[0].close
@@ -172,23 +157,82 @@ module Command
     end
   end
 
-  # Like command but returns true if the command exited with the expected
-  # status. Note that it suppresses standard-error by default
-  #
-  def command?(cmd, expect: 0, stdin: nil, stderr: false)
-    command(cmd, stdin: stdin, stderr: stderr, fail: false)
-    @status == expect
-  end
-
-  # Exit status of the last command
-  def status() @status end
-
-  # Exception of the last command if it failed, otherwise nil TODO What is this used for?
-  def exception() @exception end
-
   module_function :command
+  module_function :command?
+  module_function :script
   module_function :status
   module_function :exception
-  module_function :command?
+  module_function :command_wrapper
 end
 
+__END__
+  class Pipe
+    attr_reader :cmd
+    attr_reader :status
+
+    def writer() @pw[1] end
+    def reader() @pr[0] end
+    def error() @pe[0] end
+
+    forward_to :reader, :read, :gets
+    forward_to :writer, :write, :puts
+
+    # Remaining output not consumed by #get/#read or through #reader or #error
+    attr_reader :stdout
+    attr_reader :stdin
+
+    def initialize(cmd, stderr: nil, fail: true)
+      @cmd = "set -o errexit\nset -o pipefail\n#{cmd}"
+      @stderr = stderr
+      @fail = fail
+
+      @pw = IO::pipe # pipe[0] for read, pipe[1] for write
+      @pr = IO::pipe
+      @pe = IO::pipe
+
+      STDOUT.flush
+
+      @pid = fork {
+        @pw[1].close
+        @pr[0].close
+        @pe[0].close
+
+        STDIN.reopen(@pw[0])
+        @pw[0].close
+
+        STDOUT.reopen(@pr[1])
+        @pr[1].close
+
+        STDERR.reopen(@pe[1])
+        @pe[1].close
+
+        exec(cmd)
+      }
+
+      @pw[0].close
+      @pr[1].close
+      @pe[1].close
+    end
+
+    def wait
+      @pw[1].close
+      @status = Process.waitpid2(@pid)[1].exitstatus
+
+      out = @pr[0].readlines.map(&:chomp)
+      err = @pe[0].readlines.map(&:chomp)
+
+      @pr[0].close
+      @pe[0].close
+
+      raise Command::Error.new(@cmd, @status, nil, out, err) if @status != 0 && @fail == true
+
+      case @stderr
+        when true; [out, err]
+        when false; out
+        when nil
+          $stderr.puts err
+          out
+      end
+    end
+  end
+

data/lib/prick/state.rb

@@ -24,9 +24,16 @@ module Prick
     # absent if the project doesn't use environments
     attr_reader :environment_file
 
+    # Reflections file. Default 'schema/reflections.yml'. May be nil if the
+    # file is absent
+    attr_reader :reflections_file
+
     # State file. Default '.prick-state.yml'
     attr_reader :state_file
 
+    # Fox state file. Default '.fox-state.yml'
+    attr_reader :fox_state_file
+
     # Schema data file. FIXME What is this?
     def schema_file() SCHEMA_VERSION_PATH end
 
@@ -95,8 +102,9 @@ module Prick
       @clean = Git.clean?
     end
 
-    def initialize(project_file, environment_file, state_file)
-      @project_file, @environment_file, @state_file = project_file, environment_file, state_file
+    def initialize(project_file, environment_file, reflections_file, state_file, fox_state_file)
+      @project_file, @environment_file, @reflections_file, @state_file, @fox_state_file =
+          project_file, environment_file, reflections_file, state_file, fox_state_file
       @project_loaded = @state_loaded = @environment_loaded = false
 
       if @project_file && File.exist?(@project_file)

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

@@ -3,8 +3,16 @@
 require_relative '../builder/builder.rb'
 
 module Prick::SubCommand
-  def self.fox(database, username, files)
-    Command.command "fox --state=#{FOX_STATE_PATH} --exec #{database} #{files.join(" ")}"
+  def self.fox(database, username, files, reset: false, exclude: nil)
+    self.drop_data(database) # In prick-drop
+    opts = {
+      state: FOX_STATE_PATH,
+      delete: "none",
+      exec: true,
+      exclude: (exclude ? exclude.join(',') : nil),
+      reflections: Prick.state.reflections_file
+    }.reject { |k,v| v.nil? }.map { |k,v| "--#{k}#{v == true ? "" : "=#{v}"}" }.join(" ")
+    Command.command "fox #{opts} #{database} #{files.join(" ")}"
   end
 end
 

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

@@ -31,7 +31,7 @@ module Prick::SubCommand
     Command.status == 0 or Prick.failure "Failed creating initial import"
 
     # Write (valid) configuration file
-    state = State.new(project_file, nil, nil)
+    state = State.new(project_file, nil, nil, nil, nil)
     state.name = name
     state.title = title
     state.prick_version = PrickVersion.new VERSION

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

@@ -4,7 +4,7 @@ require_relative '../builder/builder.rb'
 
 module Prick::SubCommand
   def self.snapshot(
-      database, username, 
+      database, username,
       builddir: Prick.state.schema_dir)
 
     conn = Prick.state.connection
@@ -24,6 +24,13 @@ module Prick::SubCommand
       }
     end
     conn.insert("prick", "snapshots", records)
+
+    # Patch fox state file
+    state = YAML.load(IO.read(Prick.state.fox_state_file))
+    for record in records
+      state[:ids][record[:schema_name] + '.' + record[:table_name]] = record[:max_id] if record[:max_id]
+    end
+    IO.write(Prick.state.fox_state_file, YAML.dump(state))
   end
 end
 

data/lib/prick/version.rb

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

data/lib/prick-command.rb

@@ -0,0 +1,123 @@
+require 'prick/version.rb'
+
+require 'pg_conn'
+
+require 'indented_io'
+require 'constrain'
+require 'forward_to'
+require 'string-text'
+
+include Constrain
+include ForwardTo
+include String::Text
+
+require 'fixture_fox'
+
+module Prick
+  class Error < RuntimeError; end
+  class Failure < RuntimeError; end
+end
+
+require_relative 'prick/constants.rb'
+require_relative 'prick/ext/expand_variables.rb'
+
+require_relative 'prick/local/command.rb'
+require_relative 'prick/local/git.rb'
+require_relative 'prick/local/timer.rb'
+require_relative 'prick/local/ansi.rb'
+require_relative 'prick/local/fmt.rb'
+
+require_relative 'prick/environment.rb'
+require_relative 'prick/state.rb'
+require_relative 'prick/prick_version.rb'
+require_relative 'prick/diff.rb'
+
+module Prick
+  def mesg(*msgs) = Prick.mesg(*msgs)
+  def verb(*msgs) = Prick.verb(*msgs)
+  def self.mesg(*msgs) puts msgs.join(" ") if !$quiet end
+  def self.verb(*msgs) puts msgs.join(" ") if $verbose && !$quiet end
+end
+
+require_relative 'prick/subcommand/subcommand.rb'
+require_relative 'prick/subcommand/prick-bash.rb'
+require_relative 'prick/subcommand/prick-build.rb'
+require_relative 'prick/subcommand/prick-clean.rb'
+require_relative 'prick/subcommand/prick-create.rb'
+require_relative 'prick/subcommand/prick-drop.rb'
+require_relative 'prick/subcommand/prick-fox.rb'
+require_relative 'prick/subcommand/prick-init.rb'
+require_relative 'prick/subcommand/prick-list.rb'
+require_relative 'prick/subcommand/prick-make.rb'
+require_relative 'prick/subcommand/prick-migrate.rb'
+require_relative 'prick/subcommand/prick-release.rb'
+require_relative 'prick/subcommand/prick-run.rb'
+require_relative 'prick/subcommand/prick-set.rb'
+require_relative 'prick/subcommand/prick-setup.rb'
+require_relative 'prick/subcommand/prick-snapshot.rb'
+require_relative 'prick/subcommand/prick-teardown.rb'
+require_relative 'prick/subcommand/prick-touch.rb'
+
+module Prick
+  @state = nil
+  def self.state?() !@state.nil? end
+  def self.state() @state or raise ArgumentError end
+  def self.state=(state) @state = state end
+
+  def self.error(*args) raise Prick::Error.new *args end
+  def self.failure(*args) raise Prick::Failure.new *args end
+
+  def self.owner_conn = state.connection
+  def self.super_conn = State.connection
+# def self.conn = owner_conn
+
+  # Return list of prick databases. If a block is given it is called with a
+  # connection to each of the databases
+  def self.databases(&block)
+    databases = super_conn.values %(
+      select datname from pg_database where datistemplate = false order by datname
+    )
+    databases.select! { |database|
+      PgConn.new(database) { |conn|
+        is_prick_database = conn.exist?(%(
+            select 1
+            from information_schema.tables
+            where table_schema = 'prick'
+            and table_name = 'builds'
+            limit 1
+        ))
+        yield(database, conn) if is_prick_database && block_given?
+        is_prick_database
+      }
+    }
+    databases
+  end
+
+  # Call a ruby script using fork. This is much faster than calling the script
+  # using #system and it shares the database connection with the current
+  # process
+  #
+  # The script is supposed to require 'prick.rb' to get access to the
+  # Prick.conn function that returns the current database when run in a Prick
+  # environment
+  #
+  #   require 'prick.rb'
+  #   conn = Prick.conn database, username
+  #
+  def self.call(ruby_script)
+    File.exist?(ruby_script) or raise ArgumentError, "Can't find script '#{ruby_script}' in Prick.call"
+
+    pid = fork do
+      require(File.join(Dir.getwd, ruby_script))
+    end
+    Process.wait(pid)
+    $?.exitstatus == 0 or raise ArgumentError, "Ruby script '#{ruby_script}' failed"
+    owner_conn.reset
+  end
+
+  module SubCommand
+    def self.owner_conn = Prick.owner_conn
+    def self.super_conn = Prick.super_conn
+#   def self.conn = Prick.conn
+  end
+end

data/lib/prick.rb

@@ -1,101 +1,12 @@
-require 'prick/version.rb'
 
 require 'pg_conn'
 
-require 'indented_io'
-require 'constrain'
-require 'forward_to'
-require 'string-text'
-
-include Constrain
-include ForwardTo
-include String::Text
-
-require 'fixture_fox'
-
-module Prick
-  class Error < RuntimeError; end
-  class Failure < RuntimeError; end
-end
-
-require_relative 'prick/constants.rb'
-require_relative 'prick/ext/expand_variables.rb'
-
-require_relative 'prick/local/command.rb'
-require_relative 'prick/local/git.rb'
-require_relative 'prick/local/timer.rb'
-require_relative 'prick/local/ansi.rb'
-require_relative 'prick/local/fmt.rb'
-
-require_relative 'prick/environment.rb'
-require_relative 'prick/state.rb'
-require_relative 'prick/prick_version.rb'
-require_relative 'prick/diff.rb'
-
 module Prick
-  def mesg(*msgs) = Prick.mesg(*msgs)
-  def verb(*msgs) = Prick.verb(*msgs)
-  def self.mesg(*msgs) puts msgs.join(" ") if !$quiet end
-  def self.verb(*msgs) puts msgs.join(" ") if $verbose && !$quiet end
-end
-
-require_relative 'prick/subcommand/subcommand.rb'
-require_relative 'prick/subcommand/prick-bash.rb'
-require_relative 'prick/subcommand/prick-build.rb'
-require_relative 'prick/subcommand/prick-clean.rb'
-require_relative 'prick/subcommand/prick-create.rb'
-require_relative 'prick/subcommand/prick-drop.rb'
-require_relative 'prick/subcommand/prick-fox.rb'
-require_relative 'prick/subcommand/prick-init.rb'
-require_relative 'prick/subcommand/prick-list.rb'
-require_relative 'prick/subcommand/prick-make.rb'
-require_relative 'prick/subcommand/prick-migrate.rb'
-require_relative 'prick/subcommand/prick-release.rb'
-require_relative 'prick/subcommand/prick-run.rb'
-require_relative 'prick/subcommand/prick-set.rb'
-require_relative 'prick/subcommand/prick-setup.rb'
-require_relative 'prick/subcommand/prick-snapshot.rb'
-require_relative 'prick/subcommand/prick-teardown.rb'
-require_relative 'prick/subcommand/prick-touch.rb'
-
-module Prick
-  @state = nil
-  def self.state?() !@state.nil? end
-  def self.state() @state or raise ArgumentError end
-  def self.state=(state) @state = state end
-
-  def self.error(*args) raise Prick::Error.new *args end
-  def self.failure(*args) raise Prick::Failure.new *args end
-
-  def self.owner_conn = state.connection
-  def self.super_conn = State.connection
-# def self.conn = owner_conn
-
-  # Return list of prick databases. If a block is given it is called with a
-  # connection to each of the databases
-  def self.databases(&block)
-    databases = super_conn.values %(
-      select datname from pg_database where datistemplate = false order by datname
-    )
-    databases.select! { |database|
-      PgConn.new(database) { |conn|
-        is_prick_database = conn.exist?(%(
-            select 1
-            from information_schema.tables
-            where table_schema = 'prick'
-            and table_name = 'builds'
-            limit 1
-        ))
-        yield(database, conn) if is_prick_database && block_given?
-        is_prick_database
-      }
-    }
-    databases
-  end
-
-  module SubCommand
-    def self.owner_conn = Prick.owner_conn
-    def self.super_conn = Prick.super_conn
-#   def self.conn = Prick.conn
+  def self.conn(database, username)
+    if self.respond_to?(:owner_conn)
+      self.owner_conn
+    else
+      PgConn.new(database, username)
+    end
   end
 end

data/prick.gemspec

@@ -33,13 +33,13 @@ Gem::Specification.new do |spec|
   spec.add_dependency "indented_io"
   spec.add_dependency "constrain"
   spec.add_dependency "forward_to"
-  spec.add_dependency "bootsnap"
   spec.add_dependency "fixture_fox"
   spec.add_dependency "postspec"
   spec.add_dependency "pg_graph"
   spec.add_dependency "shellopts"
   spec.add_dependency "dsort"
   spec.add_dependency "string-text"
+  spec.add_dependency "prick-inflector" # Because we use it from inline-eval'ed scripts
 
   spec.add_development_dependency "ruby-prof"
 

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: prick
 version: !ruby/object:Gem::Version
-  version: 0.39.12
+  version: 0.40.0
 platform: ruby
 authors:
 - Claus Rasmussen
 autorequire:
 bindir: exe
 cert_chain: []
-date: 2024-09-09 00:00:00.000000000 Z
+date: 2024-10-10 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: semantic
@@ -67,7 +67,7 @@ dependencies:
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
-  name: bootsnap
+  name: fixture_fox
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
@@ -81,7 +81,7 @@ dependencies:
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
-  name: fixture_fox
+  name: postspec
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
@@ -95,7 +95,7 @@ dependencies:
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
-  name: postspec
+  name: pg_graph
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
@@ -109,7 +109,7 @@ dependencies:
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
-  name: pg_graph
+  name: shellopts
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
@@ -123,7 +123,7 @@ dependencies:
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
-  name: shellopts
+  name: dsort
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
@@ -137,7 +137,7 @@ dependencies:
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
-  name: dsort
+  name: string-text
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
@@ -151,7 +151,7 @@ dependencies:
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
-  name: string-text
+  name: prick-inflector
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
@@ -197,6 +197,7 @@ files:
 - doc/build-yml.txt
 - exe/prick
 - idea.txt
+- lib/prick-command.rb
 - lib/prick.rb
 - lib/prick/builder/batch.rb
 - lib/prick/builder/builder.rb