prick 0.47.3 → 0.48.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 2e0a9b54c4b853c9fc0d449105ce61c3a528d7b7eeaddf454002136f4e3a340e
-  data.tar.gz: c4646b444f131e10c05e17fc3bffbb001a1035f1cfa1f18b02ce50f0986c0f08
+  metadata.gz: 174ae3f514ca2eda0f8eea870922d85e6676f0c979dc783d3763063f238923af
+  data.tar.gz: 41acf5e250fb735f9d1297a67f2a758d6642358b7a15c39fde0f963f0b897395
 SHA512:
-  metadata.gz: b86bd754388b6f06858c1cf3edf05b0d330bf8abd5eeae2ef3aa952c3dfa6a6109271d8e42c8dec07d4ef7e360d1f28d65a34b50f40a57cd67fe57c484afa2cf
-  data.tar.gz: a8b52d146c29dc975bf1534d93f44fd9cdbf794efd12171e0d056d4a4c20f4392887823c097142b3bbbe47451fdeb10cb2735d6294099a8570266d14b25530d4
+  metadata.gz: 9b638fcb0b5b4b3558361f5a05450ce9b378b34466dd9a3833ec382e4c61f7a618398457d6996fd88b32780de4268db9c311cfe28f20e871e74c17a536713df1
+  data.tar.gz: 41eed12f679709b00b5505f6f99e0a1fb5288470111f8b2fdf621d6c731b759a5aea32077a7cce62858db2c018bc945f4092e6a370a81c1bb33d47e931765386

data/exe/prick

@@ -140,21 +140,23 @@ SPEC = %(
       useful to run 'prick snapshot' immediately after you complete building
       the database
 
-  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. The --file
+  build! -S,no-seeds -A,no-auth -s,step -f,force -t,time --dump=KIND? --path=BUILD_FILE -- [SCHEMA]
+      Build the project, if SCHEMA is defined, later schemas are excluded. The
+      'no-seeds' option excludes seed and auth files from the build while
+      'no-auth' only excludes the auth files Schemas marked with 'no refresh'
+      in the build is not built unless the --force is present. The --file
       option sets the initial build file or directory, default is
-      SCHEMA_DIR/build.yml
+      $SCHEMA_DIR/build.yml. Dump KIND can be 'nodes', 'allnodes' or 'batches'
+      (the default)
 
-  make! --step -t,time --dump=KIND? -- [SCHEMA]
+  make! -S,no-seeds -A,no-auth --step -t,time --dump=KIND? -- [SCHEMA]
       @ Only rebuild changed files
 
       Checks file timestamps against the time of the last build and only
       rebuild affected parts of the project. KIND can be 'nodes', 'allnodes' or
       'batches' (the default)
 
-  run! --step -t,time --dump=KIND? --schema=SCHEMA -- PATH
+  run! -S,no-seeds -A,no-auth --step -t,time --dump=KIND? --schema=SCHEMA -- PATH
       @ Execute path in Prick environment
 
       Execute a single build directory or file within the Prick environment. If
@@ -444,6 +446,7 @@ begin
       Prick::SubCommand.build(
           database, username, args.expect(0..1),
           path: cmd.path,
+          seeds: !cmd.no_seeds, auth: !cmd.no_auth,
           force: cmd.force?, step: cmd.step?, timer: cmd.time?, dump: dump)
 
     when :make!
@@ -453,6 +456,7 @@ begin
       dump = cmd.dump? ? cmd.dump("batches")&.to_sym || :batches : nil
       Prick::SubCommand.make(
           database, username, args.expect(0..1),
+          seeds: !cmd.no_seeds, auth: !cmd.no_auth,
           step: cmd.step?, timer: cmd.time?, dump: dump)
 
     when :run!
@@ -461,6 +465,7 @@ begin
       dump = cmd.dump? ? cmd.dump("batches")&.to_sym || :batches : nil
       Prick::SubCommand.run(
           database, username, args.expect(1),
+          seeds: !cmd.no_seeds, auth: !cmd.no_auth,
           step: cmd.step?, timer: cmd.time?, dump: dump, schema: cmd.schema)
 
     when :touch!

data/lib/prick/builder/batch.rb

@@ -153,7 +153,7 @@ module Prick
           fox.assign_types
           fox.generate
 
-          # Dump new state file
+          # Write new state file
           fox.write_state(Prick.state.fox_state_file)
 
           # Timer

data/lib/prick/builder/builder.rb

@@ -42,11 +42,18 @@ module Prick
       # Root build node
       attr_reader :root
 
-      # True if this is a single-file build
+      # True if this is a single-file build. Default false
       attr_reader :single
 
+      # True if seed data should be loaded. Default true
+      def seeds?() @seeds end
+
+      # True if auth data should be loaded. Default true
+      def auth?() @auth end
+
       # True if SQL entries should be single-stepped. Default false
-      attr_reader :step
+      def step?() = @step
+#     def step?() @step end
 
       # Pool of nodes. Initialized by #load_pool
       attr_reader :pool
@@ -54,13 +61,15 @@ module Prick
       forward_to :pool, :schemas,
                         :nodes, :decl_nodes, :init_nodes, :term_nodes,
                         :seed_nodes, :fox_seed_nodes, :sql_seed_nodes,
+                        :auth_nodes,
                         :build_nodes,
                         :pg_graph_ignore_schemas,
                         :refresh_schemas, :keep_schemas
 
       def batches() @batches || create_batches end
 
-      def initialize(conn, path, clean = true, single: false, touched: false, load_pool: true, step: false)
+      def initialize(conn, path, clean = true,
+          single: false, touched: false, load_pool: true, seeds: true, auth: true, step: false)
         File.exist?(path) or raise Error, "Can't find #{path}"
         ! single || File.file?(path) or raise Error, "Not a file - #{path}"
 
@@ -69,6 +78,8 @@ module Prick
         @reflections_file = Prick.state.reflections_file
         @clean = clean
         @single = single
+        @seeds = seeds
+        @auth = auth
         @step = step
         @root = Parser.parse(conn, path, single: single)
         @pool = nil # Initialized by #load_pool
@@ -87,8 +98,15 @@ module Prick
         kind = nil
         batch = nil
 
+        nodes = (
+            [init_nodes, decl_nodes] +
+            (seeds? ? [fox_seed_nodes, sql_seed_nodes] : []) +
+            (auth? ? auth_nodes : []) +
+            [term_nodes.reverse]
+        ).flatten
+
         # TODO: Refactor
-        for node in [init_nodes, decl_nodes, fox_seed_nodes, sql_seed_nodes, term_nodes.reverse].flatten
+        for node in nodes
           # Create new batch if required. Order of when-clauses is important
           case node.kind
             when :module
@@ -101,15 +119,15 @@ module Prick
               batch = SqlBatch.new(self)
             when batch&.kind # Same kind as current batch. After this when-clause
                              # we know that the node kind has changed
-              if node.kind == :sql && step
+              if node.kind == :sql && step?
                 @batches << batch if batch
                 batch = SqlBatch.new(self)
-              elsif node.kind == :psql && step
+              elsif node.kind == :psql && step?
                 @batches << batch if batch
                 batch = SqlBatch.new(self)
               end
             when :sql || node.kind == :inline
-              if batch&.kind != :exe || step
+              if batch&.kind != :exe || step?
                 @batches << batch if batch
                 batch = SqlBatch.new(self)
               end
@@ -178,6 +196,7 @@ module Prick
           load_pool_impl(node) if node.kind == :yml
         }
         pool.add(build_node.seed_nodes)
+        pool.add(build_node.auth_nodes)
         pool.add(build_node.term_nodes)
       end
     end

data/lib/prick/builder/node.rb

@@ -8,8 +8,9 @@ module Prick
       attr_reader :path
       attr_reader :args # only defined for :exe (String)
 
-      def name() @name = File.basename(path) end
-      def relpath = path.sub(/^#{Dir.getwd}\//, "")
+      def name() @name ||= path && File.basename(path) end
+      def dir() @dir ||= path && File.dirname(path) end
+      def relpath() @relpath ||= path&.sub(/^#{Dir.getwd}\//, "") end
 
       # Note that schema defaults to 'public' which may not be what you want in
       # some cases
@@ -32,7 +33,7 @@ module Prick
 
       def initialize(parent, phase, kind, path, args = nil)
         constrain parent, BuildNode, NilClass
-        constrain phase, :init, :decl, :seed, :term, nil
+        constrain phase, :init, :decl, :seed, :auth, :term, nil
         constrain kind, :sql, :psql, :exe, :fox, :yml, :inline, :module
         constrain path, String, NilClass
         @parent, @phase, @kind, @path = parent, phase, kind, path
@@ -45,7 +46,13 @@ module Prick
 
       def to_s() @to_s ||= [path, *args].join(" ") end
       def inspect() to_s end
-      def dump() puts "#{inspect} (#{@schema || 'nil'})" end
+      def dump()
+        if path =~ /(?:^|\/)schema\/#{@schema}\//
+          puts inspect
+        else
+          puts "#{inspect} (#{@schema || 'nil'})"
+        end
+      end
 
     protected
       def read_source
@@ -198,7 +205,7 @@ module Prick
     end
 
     # Note that script nodes are evaluated within the running Prick process so
-    # it inherites all constants, classes, load path etc. Notice that this
+    # it inherites all constants, classes, load path etc. Note that this
     # means that a script can't require a file that is also not required by
     # prick
     #
@@ -237,27 +244,36 @@ module Prick
       alias_method :read_source, :exec_cmd
     end
 
+#   class PSqlNode < SysExecNode
+#     def initialize(parent, phase, path)
+#       super(parent, phase, :psql, path)
+#     end
+#   end
+
     # A build.yml file node
     class BuildNode < Node
       # True if the build file contains a 'schema' attribute
       attr_accessor :has_schema
 
-      def nodes() @nodes ||= init_nodes + decl_nodes + seed_nodes + term_nodes end
+      def nodes() @nodes ||= init_nodes + decl_nodes + seed_nodes + auth_nodes + term_nodes end
 
-      attr_reader :decl_nodes
+      # Nodes are executed in this order:
       attr_reader :init_nodes
-      attr_reader :term_nodes
+      attr_reader :decl_nodes
       attr_reader :seed_nodes
+      attr_reader :auth_nodes
+      attr_reader :term_nodes
 
       attr_accessor :pg_graph_ignore_schema
       attr_accessor :refresh_schema
 
       def initialize(parent, path)
         super(parent, nil, :yml, path)
-        @decl_nodes = []
         @init_nodes = []
-        @term_nodes = []
+        @decl_nodes = []
         @seed_nodes = []
+        @auth_nodes = []
+        @term_nodes = []
         @pg_graph_ignore_schema = false
         @refresh_schema = true
       end
@@ -272,7 +288,7 @@ module Prick
           puts "refresh: #{refresh_schema.to_s}"
           puts "pg_graph_ignore_schema: #{pg_graph_ignore_schema}"
           decl_nodes.each(&:dump)
-          for kind in [:init, :term, :seed]
+          for kind in [:init, :seed, :auth, :term]
             kind_nodes = self.send("#{kind}_nodes".to_sym)
             if !kind_nodes.empty?
               puts "#{kind}:"

data/lib/prick/builder/node_pool.rb

@@ -13,13 +13,14 @@ module Prick
       attr_reader :init_nodes
       attr_reader :decl_nodes
       attr_reader :seed_nodes
+      attr_reader :auth_nodes
       attr_reader :term_nodes
 
       # attr_reader :setup_nodes
       # attr_reader :teardown_nodes
 
       def fox_seed_nodes() seed_nodes.select { |node| node.kind == :fox } end
-      def sql_seed_nodes() seed_nodes.select { |node| node.kind == :sql } end
+      def sql_seed_nodes() seed_nodes.select { |node| [:sql, :psql].include? node.kind } end
 
       # List of BuildNode nodes
       def build_nodes() nodes.select { |node| node.is_a?(BuildNode) } end
@@ -101,11 +102,13 @@ module Prick
           @init_nodes = []
           @decl_nodes = []
           @seed_nodes = []
+          @auth_nodes = []
           @term_nodes = []
           @kind_nodes = {
             decl: @decl_nodes,
             init: @init_nodes,
             seed: @seed_nodes,
+            auth: @auth_nodes,
             term: @term_nodes,
             yml: nil
           }
@@ -121,11 +124,15 @@ module Prick
           indent { @decl_nodes.each &:dump }
           puts "seed_nodes:"
           indent { @seed_nodes.each &:dump }
+          puts "auth_nodes:"
+          indent { @auth_nodes.each &:dump }
           puts "term_nodes:"
           indent { @term_nodes.each &:dump }
         }
       end
 
+      def inspect() "<INSTANCE>" end
+
     private
       def delete_node(node)
 #       puts "#delete_node"

data/lib/prick/builder/parser.rb

@@ -38,7 +38,7 @@ module Prick
         File.exist?(path) or raise Error, "Can't find #{file}"
         dir = File.dirname(path)
         file = File.basename(path)
-        unit = make_build_unit(nil, nil)
+        unit = make_build_unit(nil, nil) # <- only reason we drag #dir through every function FIXME
         unit.schema = schema if schema
         entry = parse_build_entry(unit, dir, file)
         unit
@@ -67,21 +67,29 @@ module Prick
           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
-                unit.has_schema = true
-              elsif key == "standard"
-                unit.pg_graph_ignore_schema = !value
-              elsif key == "refresh"
-                unit.refresh_schema = value
-              else
-                case key
-                  when "init"; unit.init_nodes
-                  when "term"; unit.term_nodes
-                  when "seed"; unit.seed_nodes
+              key = "seed" if key == "seeds" # Resolve alias
+              case key
+                when "schema"
+                  unit.schema = value
+                  unit.has_schema = true
+                when "standard"
+                  unit.pg_graph_ignore_schema = !value
+                when "refresh"
+                  unit.refresh_schema = value
+                when "make"
+                  execute_make(unit, value)
                 else
-                  raise Error, "Illegal key in #{unit.path}: #{key}"
-                end.concat(Array(value).map { |value| parse_entry(unit, key.to_sym, dir, value) }.compact)
+                  # Find LVAL
+                  case key
+                    when "init"; unit.init_nodes
+                    when "seed"; unit.seed_nodes
+                    when "auth"; unit.auth_nodes
+                    when "term"; unit.term_nodes
+                  else
+                    raise Error, "Illegal key in #{unit.path}: #{key}"
+                  end
+                  # then concat
+                  .concat(Array(value).map { |value| parse_entry(unit, key.to_sym, dir, value) }.compact)
               end
             }
           else
@@ -91,6 +99,13 @@ module Prick
         unit
       end
 
+      def execute_make(unit, bash)
+        # env = Prick.state.bash_environment # FIXME Doesn't work for some reason
+        env = ENV.to_h.merge "PATH" => Prick::PRICK_PATH
+        cmd = "cd #{unit.dir} && { #{bash} }"
+        system(env, cmd, exception: false) or raise Error, "Make command failed:\n\n#{cmd}\n"
+      end
+
       def parse_build_entry(unit, dir, file)
         node = parse_entry(unit, :decl, dir, file) or return nil
         if node.kind == :fox
@@ -122,6 +137,7 @@ module Prick
         [path, Array(args).flatten]
       end
 
+      # FIXME Why?
       def parse_psql_file_entry(unit, dir, entry)
         if entry =~ /^[a-zA-Z0-9_.-]+$/
           path = File.join(dir, entry)
@@ -134,6 +150,7 @@ module Prick
 
       def parse_entry(unit, phase, dir, entry)
 #       puts "#parse_entry(#{unit.inspect}, #{phase.inspect}, #{dir.inspect}, #{entry.inspect})"
+
         if entry.is_a?(Hash)
           entry.size == 1 or raise Error, "sql and module are single-line values"
           key, value = entry.first
@@ -162,10 +179,10 @@ module Prick
           else
             raise Error, "Illegal key: #{key}"
           end
-        elsif entry =~ /\.psql$/
+        elsif entry =~ /\.psql$/ # FIXME: Move below?
           path = parse_psql_file_entry(unit, dir, entry)
           PSqlNode.new(unit, phase, path)
-        else
+        else # file argument(s)
           (path, args = parse_file_entry(unit, dir, entry)) or return nil
           if File.directory? path
             parse_path(unit, path)
@@ -176,7 +193,8 @@ module Prick
               when /\.sql$/
                 SqlNode.new(unit, phase, path)
               when /\.fox$/
-                FoxNode.new(unit, :seed, path)
+                fox_phase = (phase == :decl ? :seed : phase) # Move .fox files to seed section
+                FoxNode.new(unit, fox_phase, path)
               when /(?:^|\/)build-.*\.yml$/
                 parse_build_file(unit, dir, path)
               when /(?:^|\/)build.yml$/ # Only used when building a single file

data/lib/prick/constants.rb

@@ -26,9 +26,6 @@ module Prick
     SPEC_DIR = "spec"
   ]
 
-  # Search path for executables
-# PRICK_PATH = "#{ENV['PATH']}:#{PRICK_DIR}/#{BIN_DIR}:#{PRICK_DIR}/#{LIBEXEC_DIR}"
-
   # Project filename
   PRICK_PROJECT_FILE = "prick.yml"
 
@@ -47,6 +44,9 @@ module Prick
     end
   end
 
+  # Search path for executables
+  PRICK_PATH = "#{PRICK_DIR}/#{BIN_DIR}:#{ENV['PATH']}"
+
   # Project file path
   PRICK_PROJECT_PATH = File.join(PRICK_DIR, PRICK_PROJECT_FILE)
 

data/lib/prick/local/command.rb

@@ -1,4 +1,5 @@
 require 'fcntl'
+
 module Command
   class Error < RuntimeError
     attr_reader :cmd
@@ -48,8 +49,7 @@ module Command
       # 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 }
-
-      Kernel.exec(env, bashcmd)
+      Kernel.exec(ENV, bashcmd)
     }
   end
 

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

@@ -7,7 +7,7 @@ module Prick::SubCommand
       database, username, schema,
       path: nil, # Default SCHEMA_DIR
       force: false, # Build all schemas
-      step: false, timer: nil, dump: nil)
+      seeds: true, auth: true, step: false, timer: nil, dump: nil)
 
     path ||= Prick.state.schema_dir
     File.exist?(path) or Prick.error "Can't find #{path}"
@@ -33,7 +33,7 @@ module Prick::SubCommand
           end
           conn = Prick.state.connection
 
-          builder = Prick::Build::Builder.new(conn, path, step: step)
+          builder = Prick::Build::Builder.new(conn, path, seeds: seeds, auth: auth, step: step)
 
           if exist # Empty (part of) the database
             if force

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

@@ -3,7 +3,7 @@
 require_relative '../builder/builder.rb'
 
 module Prick::SubCommand
-  def self.make(database, username, schema, step: false, timer: nil, dump: nil)
+  def self.make(database, username, schema, seeds: true, auth: true, step: false, timer: nil, dump: nil)
     Timer.on! if timer
     Timer.time "Prick::Command#make" do
       begin
@@ -26,7 +26,7 @@ module Prick::SubCommand
             clean = true
           end
 
-          builder = Prick::Build::Builder.new(conn, "schema", clean, step: step)
+          builder = Prick::Build::Builder.new(conn, "schema", clean, seeds: seeds, auth: true, step: step)
 
           if schema
             after_schemas = builder.pool.after_schema(schema)
@@ -58,10 +58,11 @@ module Prick::SubCommand
           if touched_phases.include?(:decl) || touched_phases.empty?
             create_schemas = [build_schema] + builder.pool.after_schema(build_schema)
             create_schemas.each { |schema| conn.schema.drop(schema, cascade: true) }
-            builder.pool.delete_schema(builder.pool.before_schema(build_schema), exclude: [:seed])
+            builder.pool.delete_schema(builder.pool.before_schema(build_schema), exclude: [:seed, :auth])
           elsif touched_phases.include?(:init) || touched_phases.include?(:term)
             builder.pool.clear(:decl, :seed)
-          elsif touched_phases.include?(:seed)
+            builder.pool.clear(:decl, :auth)
+          elsif touched_phases.include?(:seed) || touched_phases.include?(:auth)
             builder.pool.clear(:init, :decl, :term)
           end
 

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

@@ -3,7 +3,7 @@
 require_relative '../builder/builder.rb'
 
 module Prick::SubCommand
-  def self.run(database, username, path, step: false, timer: nil, dump: nil, schema: nil)
+  def self.run(database, username, path, seeds: true, auth: true, step: false, timer: nil, dump: nil, schema: nil)
 
     Timer.on! if timer
 
@@ -27,7 +27,9 @@ module Prick::SubCommand
           conn = Prick.state.connection
 
           # Parse
-          builder = Prick::Build::Builder.new(conn, path, single: true, load_pool: false, step: step)
+          builder = Prick::Build::Builder.new(
+              conn, path,
+              single: true, load_pool: false, seeds: seeds, auth: auth, step: step)
 
           # Register if a build file is referenced and normalize path to
           # include build.yml of directories

data/lib/prick/version.rb

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

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: prick
 version: !ruby/object:Gem::Version
-  version: 0.47.3
+  version: 0.48.0
 platform: ruby
 authors:
 - Claus Rasmussen