prick 0.27.1 → 0.28.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: fe266587f9311853dc79a6eee9ff2732ba265fd50ce1fb69fb0ba1d8f2018f5a
-  data.tar.gz: f364180b63248c6b1cbc963cad889770538aabfbc5b0ec9d12aabe97e91fd1dc
+  metadata.gz: '022876c913aadf3a2b42646f514f51c2db481c32db42a5903f2dbce88303d423'
+  data.tar.gz: 1772f43a5a99fe93b97e748488f3c5bfa93fddce768176744ebb27e983cbb475
 SHA512:
-  metadata.gz: 0ab04d20f8169352ac7c6e181b053c3e5271e60c5109af444fd8abb37ad3ce5d101e37f2c2ee06c801b0b7a18662fad65384b6434e592abefd18a1c48b7ee442
-  data.tar.gz: f8108b5acec772b9ee63b7f8acc46aa9a1b54fea79766cd1c7ed449a8d069484d6ffd74296a6f90d2eac9dc368656d680bdf03e0ab9f140d336cac46ea104219
+  metadata.gz: d8c647cc168aee7f0aab47d39d6ce1050331a06b6aa7a04fc8173152618432c377eb7ce42784eb95d2a70134be10bddd0ff3a43298c2e20af8a3649dc8227451
+  data.tar.gz: 84068d08a68d2b1177054faa4d31218bf7bc66cf437bf255a6ff2404c0126e10288e58519e11fe7c80029c7169ff9e3a59be5327c39f8fd112bc0a846519d833

data/lib/builder/parser.rb

@@ -62,11 +62,11 @@ module Prick
                   when "seed"; unit.seed_nodes
                 else
                   raise Error, "Illegal key in #{unit.path}: #{key}"
-                end.concat(Array(value).map { |value| parse_entry(unit, key.to_sym, dir, value) })
+                end.concat(Array(value).map { |value| parse_entry(unit, key.to_sym, dir, value) }.compact)
               end
             }
           else
-            node = parse_entry(unit, :decl, dir, entry)
+            node = parse_entry(unit, :decl, dir, entry) or next
             if node.kind == :fox
               unit.seed_nodes << node
             else
@@ -77,11 +77,11 @@ module Prick
         unit
       end
 
-      # Expand $ENVIRONMENT variable. The function implements a hierarchy of
-      # environments:
+      # Expand $ENVIRONMENT variable in file names. The function implements a
+      # hierarchy of environments:
       #
       #   production
-      #     online
+      #     (online)
       #   development
       #     online
       #     offline
@@ -92,19 +92,26 @@ module Prick
       # If an environment doesn't exist in #dir, then the higher level
       # environments are tried in turn. Eg. if the current environment is
       # 'test', the algorithm expands '$ENVIRONMENT' to 'test', 'offline', and
-      # 'development' until an existing file is found. If no file is found, the
-      # algorithm returns the unexpanded value
+      # 'development' until an existing file is found. If no file is found the
+      # the unexpanded value is returned
+      #
+      # NOTE: This is a hardcoded feature for an internal project. It is
+      #       configurable in the next major version
       #
-      def expand_environment(dir, name)
-        env = Prick.state.environment.to_s
-        file = name
-        if !File.exist?("#{dir}/#{file}") && name =~ /^(.*?)\$ENVIRONMENT/
+      def expand_filename(dir, filename)
+        if File.exist?("#{dir}/#{filename}")
+          return filename
+        elsif filename =~ /\$ENVIRONMENT|\$\{ENVIRONMENT\}/
+          env = Prick.state.environment.to_s
           while true
-            file = expand_variables(name, ENVIRONMENT: env)
-            break if File.exist? "#{dir}/#{file}"
+            file = expand_variables(filename, ENVIRONMENT: env, PWD: Dir.getwd)
+            return file if File.exist? "#{dir}/#{file}"
             case env
-              when "production"; break
-              when "development"; break
+              when "production"
+                file = expand_variables(filename, ENVIRONMENT: "online", PWD: Dir.getwd) or return nil
+                return file if File.exist? "#{dir}/#{file}"
+                return nil
+              when "development"; return nil
               when "online"; env = "development"
               when "offline"; env = "development"
               when "backend"; env = "offline"
@@ -114,43 +121,64 @@ module Prick
               raise Error, "Illegal env: '#{env}'"
             end
           end
+        else
+          return nil
         end
-        return file
       end
 
-      def parse_file_entry(dir, entry)
-        name = expand_environment(dir, entry)
-        name.sub!(/\/$/, "")
-        if name =~ /^(\S+)\s+(.+)$/ # has arguments -> exe
-          file = $1
-          args = $2.split
+      # Expand $ENVIRONMENT variable
+      def expand_string(string)
+        expand_variables(string, ENVIRONMENT: Prick.state.environment.to_s, PWD: Dir.getwd)
+      end
+
+      def parse_file_entry(unit, dir, entry)
+        entry = entry.sub(/\/$/, "")
+        if entry =~ /^(\S+?)(\?)?(?:\s+(.+))?\s*$/
+          filename = $1
+          optional = !$2.nil?
+          args = expand_string($3 || '').split
+          file = expand_filename(dir, filename) 
+          file || optional or raise Error, "Can't find #{filename} in #{dir} from #{unit}"
+          !file.nil? or return nil
         else
-          file = name
+          raise Error, "Not a file name: '#{entry}'"
         end
         path = "#{dir}/#{file}"
-        [path, name, file, args]
+        [path, entry, file, args].flatten
       end
 
+#     def parse_file_entry(dir, entry)
+#       name = expand_environment(dir, entry)
+#       name.sub!(/\/$/, "")
+#       if name =~ /^(\S+)\s+(.+)$/ # has arguments -> exe
+#         file = $1
+#         args = $2.split
+#       else
+#         file = name
+#       end
+#       path = "#{dir}/#{file}"
+#       [path, name, file, args]
+#     end
+
       def parse_entry(unit, phase, dir, entry)
         if entry.is_a?(Hash)
           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 "call" 
-              args = value.split(/\s+/)
-              args.size >= 3 or raise "Illegal number of arguments: #{value}"
-              file, klass, command, args = *args
+              InlineNode.new(unit, phase, unit.path, expand_string(value))
+            when "call"
+              (path, name, file, klass, command, args = parse_file_entry(unit, dir, value)) or return nil
+              klass && command or raise "Illegal number of arguments: #{value}"
               ModuleNode.new(unit, phase, "#{dir}/#{file}", klass, command, args)
             when "exec"
-              path, name, file, args = parse_file_entry(dir, value)
+              (path, name, file, args = parse_file_entry(unit, dir, value)) or return nil
               ExeNode.new(unit, phase, path, args)
           else
             raise Error, "Illegal key: #{key}"
           end
         else
-          path, name, file, args = parse_file_entry(dir, entry)
+          (path, name, file, args = parse_file_entry(unit, dir, entry)) or return nil
           if File.directory? path
             parse_directory(unit, path)
           elsif File.file? path

data/lib/prick/version.rb

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

data/lib/subcommand/prick-teardown.rb

@@ -6,13 +6,14 @@ module Prick::SubCommand
   def self.teardown(database, username)
     conn = PgConn.new "postgres" # Superuser connection
     if conn.rdbms.exist? database
-      conn.rdbms.drop database
+      conn.rdbms.drop database, force: true
     end
     if conn.role.exist? username
       conn.role.drop username, cascade: true
     end
-    builder = Prick::Build::Builder.new(conn, "schema")
+
     # TODO Run builder teardown scrips
+#   builder = Prick::Build::Builder.new(conn, "schema")
   end
 end
 

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: prick
 version: !ruby/object:Gem::Version
-  version: 0.27.1
+  version: 0.28.0
 platform: ruby
 authors:
 - Claus Rasmussen
 autorequire:
 bindir: exe
 cert_chain: []
-date: 2023-12-21 00:00:00.000000000 Z
+date: 2024-01-08 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: semantic
@@ -231,7 +231,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.3.18
+rubygems_version: 3.3.7
 signing_key:
 specification_version: 4
 summary: A release control and management system for postgresql