prick 0.26.0 → 0.27.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 3fcaa84e14ed58667eaa0752b5dec5ba5786f3a32b2a598d8d78ab6636817e65
-  data.tar.gz: b9582bdb7d6733b0aaf50675581135e2c04fabe322d7c8ccbec5481569a7ec04
+  metadata.gz: fe266587f9311853dc79a6eee9ff2732ba265fd50ce1fb69fb0ba1d8f2018f5a
+  data.tar.gz: f364180b63248c6b1cbc963cad889770538aabfbc5b0ec9d12aabe97e91fd1dc
 SHA512:
-  metadata.gz: 72cb0ca152e3805131079e3e9d473eb1fb8623d571bbdeddd398e943dc199bb31f5f0c1e94f78c163211dbc5bd2fcad5858e3ad11331e6a5fea70c898d07a047
-  data.tar.gz: bdd15924608544c695c2932b1a7e3581307917bced9f2a449caeb56962aa17546ed8a6314ce5f7450a519c01288c883d1d82d1980145d81ad1e9928e906ce207
+  metadata.gz: 0ab04d20f8169352ac7c6e181b053c3e5271e60c5109af444fd8abb37ad3ce5d101e37f2c2ee06c801b0b7a18662fad65384b6434e592abefd18a1c48b7ee442
+  data.tar.gz: f8108b5acec772b9ee63b7f8acc46aa9a1b54fea79766cd1c7ed449a8d069484d6ffd74296a6f90d2eac9dc368656d680bdf03e0ab9f140d336cac46ea104219

data/TODO

@@ -1,3 +1,6 @@
+o Make it possible to define (nested) environments
+o Use standard directory layout
+
 o Have the following entries
 
     sql: SQL_STATEMENT

data/exe/prick

@@ -200,7 +200,7 @@ begin
         database, username, args.expect(0..1), force: cmd.force?, timer: cmd.time?, dump: dump)
 
     when :make!
-      dump = cmd.dump? ? cmd.dump("batches").to_sym : nil
+      dump = cmd.dump? ? cmd.dump("batches")&.to_sym || :batches : nil
       Prick::SubCommand.make(database, username, args.expect(0..1), timer: cmd.time?, dump: dump)
 
     when :fox!

data/lib/builder/builder.rb

@@ -87,6 +87,7 @@ module Prick
           end
           batch.nodes << node
         end
+
         @batches << batch if batch
       end
 

data/lib/builder/parser.rb

@@ -8,11 +8,12 @@ module Prick
 
       attr_reader :conn
       attr_reader :dir
-      attr_reader :unit
+      attr_reader :unit # The singular RootBuildNode object
 #     attr_reader :schemas
 
       def initialize(conn)
         @conn = conn
+        @unit = nil
       end
 
       def parse(dir)
@@ -24,7 +25,7 @@ module Prick
 
     private
 
-      # First build unit is a RootBuildNode, the rest are regular BuildNode objects
+      # First built unit is a RootBuildNode, the rest are regular BuildNode objects
       def make_build_unit(parent, path)
         if @unit
           BuildNode.new(parent, path)
@@ -76,11 +77,51 @@ module Prick
         unit
       end
 
+      # Expand $ENVIRONMENT variable. The function implements a hierarchy of
+      # environments:
+      #
+      #   production
+      #     online
+      #   development
+      #     online
+      #     offline
+      #       backend
+      #       frontend
+      #       test
+      #
+      # 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
+      #
+      def expand_environment(dir, name)
+        env = Prick.state.environment.to_s
+        file = name
+        if !File.exist?("#{dir}/#{file}") && name =~ /^(.*?)\$ENVIRONMENT/
+          while true
+            file = expand_variables(name, ENVIRONMENT: env)
+            break if File.exist? "#{dir}/#{file}"
+            case env
+              when "production"; break
+              when "development"; break
+              when "online"; env = "development"
+              when "offline"; env = "development"
+              when "backend"; env = "offline"
+              when "frontend"; env = "offline"
+              when "test"; env = "offline"
+            else
+              raise Error, "Illegal env: '#{env}'"
+            end
+          end
+        end
+        return file
+      end
+
       def parse_file_entry(dir, entry)
-        name = entry.dup
-        name.sub!(/\$ENVIRONMENT/, Prick.state.environment.to_s)
+        name = expand_environment(dir, entry)
         name.sub!(/\/$/, "")
-        if name =~ /^(\S+)\s+(.*)$/ # exe
+        if name =~ /^(\S+)\s+(.+)$/ # has arguments -> exe
           file = $1
           args = $2.split
         else

data/lib/ext/expand_variables.rb

@@ -0,0 +1,27 @@
+
+# Expands variables in a template string. Variables are prefixed with a $ sign
+# and consist of word characters (letters, digits, underscores). The name can
+# be enclosed in curly braces to avoid unintended expansions. The $ sign can be
+# escaped with a backslash (\), and backslashes can be escaped with another
+# backslash. All occurrences of a variable in the string are replaced
+#
+# The str argument is the template string and the variables argument is a hash
+# from variable name (Symbol) to variable value
+#
+# Note that the characters '\x00' and '\x01' are used internally and may not be
+# present in the template string
+#
+def expand_variables(str, variables) # ChatGPT
+  # Replace escaped bashslashes and dollar signs
+  str = str.gsub('\\\\', "\x00").gsub('\\$', "\x01")
+  
+  # Expand variables
+  str.gsub!(/\$(\w+)\b|\$\{(\w+)\}/) do |match| # Strange that '\b' is necessary
+    key = ($1 || $2).to_sym
+    variables[key] || match
+  end
+
+  # Restore escaped characters
+  str.gsub("\x00", '\\').gsub("\x01", '$')
+end
+

data/lib/prick/version.rb

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

data/lib/prick.rb

@@ -12,6 +12,7 @@ module Prick
 end
 
 require 'prick/constants.rb'
+require 'ext/expand_variables.rb'
 
 require 'local/command.rb'
 require 'local/git.rb'

data/lib/share/init/spec/spec_helper.rb

@@ -40,7 +40,7 @@ require 'postspec_helper'
 require 'prick_helper'
 
 Postspec.configure do |config|
-  config.database = "mikras"
+  config.database = Prick.state.database
   # config.anchors = "..."
   config.mode = :seed
   config.reflections = Prick::REFLECTIONS_PATH if File.exist?(Prick::REFLECTIONS_PATH)

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: prick
 version: !ruby/object:Gem::Version
-  version: 0.26.0
+  version: 0.27.1
 platform: ruby
 authors:
 - Claus Rasmussen
 autorequire:
 bindir: exe
 cert_chain: []
-date: 2023-12-18 00:00:00.000000000 Z
+date: 2023-12-21 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: semantic
@@ -173,6 +173,7 @@ files:
 - lib/builder/node.rb
 - lib/builder/node_pool.rb
 - lib/builder/parser.rb
+- lib/ext/expand_variables.rb
 - lib/local/command.rb
 - lib/local/git.rb
 - lib/local/timer.rb