prick 0.25.2 → 0.27.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 3dc4e433b296e10221975eb85be4abea219720e0612c0f9720369fd69e18daa1
-  data.tar.gz: 68215c2e6557dd7288bd3754a65780d4b6c3794ed10c7aecc714b856f5d94fc8
+  metadata.gz: 83646fd3fd6a7fecab082cdc10ee5c3bd1330630422edf9640ff6579384aba5d
+  data.tar.gz: 5e49929c6b878929581e46428e036bd5bad00a0695612c6a6d6a7f2d5bcf80da
 SHA512:
-  metadata.gz: fd193deed4c0d020c6396ebb3862aaa8a65c6edbd1c28e822548db28412a60fb7e85ef357d1a72f883adc6375463415d926129988c8938cab767ce2ebf99a29b
-  data.tar.gz: 22c84f80ecc0eaec3d73e1c87586e705074d3793cafef5e954aaf9538c9fad04b012f50527a63bc611272c324f91e122e4366ac9d7315e91cd43a9ecabc33f2e
+  metadata.gz: 7c52f1241c25e8a3aaa9fafba21abc97020ac376cf458e2ec0fba28c9f310183175c3d932515cf644615b3824663cfb891eef91e0b68f741b9e53dd8b5e74165
+  data.tar.gz: d10e893a58d87e5ec8b08eb66ff0744b8b6a452935b779f016db4729ad156d36ab97c81b616a328c8dd07ed52f8170575cbc18343961bec3c0e4518fc9426d31

data/TODO

@@ -1,3 +1,5 @@
+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

@@ -34,7 +34,7 @@ module Prick
       forward_to :pool, :schemas,
                         :nodes, :decl_nodes, :init_nodes, :term_nodes,
                         :seed_nodes, :fox_seed_nodes, :sql_seed_nodes,
-                        :builder_nodes,
+                        :build_nodes,
                         :pg_graph_ignore_schemas, 
                         :refresh_schemas, :keep_schemas
 
@@ -87,12 +87,13 @@ module Prick
           end
           batch.nodes << node
         end
+
         @batches << batch if batch
       end
 
       def execute(conn, create_schemas: schemas)
         group if batches.nil?
-        conn.exec create_schemas.grep_v("public").map { |schema| "create schema #{schema}" }
+        conn.exec create_schemas.map { |schema| "create schema #{schema}" }
         for batch in batches
           batch.execute
         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.25.2"
+  VERSION = "0.27.0"
 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/subcommand/prick-build.rb

@@ -48,10 +48,6 @@ module Prick::SubCommand
 
               # Drop refresh schemes
               refresh_schemas.each { |schema| conn.schema.drop(schema, cascade: true) }
-
-              # Re-create public schema
-              conn.schema.create("public", authorization: "postgres")
-              conn.exec "grant usage, create on schema public to public"
             end
           end
 

data/lib/subcommand/prick-make.rb

@@ -5,7 +5,7 @@ require 'builder/builder.rb'
 module Prick::SubCommand
   def self.make(database, username, schema, timer: nil, dump: nil)
     Timer.on! if timer
-    time "Prick::Command#build" do
+    time "Prick::Command#make" do
       begin
         super_conn = PgConn.new
         conn = nil
@@ -17,7 +17,7 @@ module Prick::SubCommand
         time "Load build object" do
           if super_conn.rdbms.exist? database
             conn = PgConn.new(database, username)
-            if conn.schema.exist_table? "prick", "versions" && !conn.empty?("prick.versions")
+            if conn.schema.exist_table?("prick", "versions") && !conn.empty?("prick.versions")
               built_at = conn.value("select built_at from prick.versions")
             end
           else
@@ -28,11 +28,19 @@ module Prick::SubCommand
 
           builder = Prick::Build::Builder.new(conn, "schema", clean)
 
-          if schema
-            builder.pool.after_schema(schema).each { |schema|
-              conn.schema.drop(schema, cascade: true)
-              builder.pool.delete_schema(schema)
+          if schema 
+            after_schemas = builder.pool.after_schema(schema)
+            refresh_schemas = builder.pool.refresh_schemas
+            conn.schema.drop(schema, cascade: true) # Marks it dirty
+
+            # Nuke later schemas 
+            # FIXME Not a good idea when sitting on a leaf schema.
+            # Forced-delete could be requested using 'prick make schema'
+            #
+            (after_schemas & refresh_schemas).each { |drop_schema|
+              conn.schema.drop(drop_schema, cascade: true)
             }
+            after_schemas.each { |delete_schema| builder.pool.delete_schema(delete_schema) }
           end
 
           touched_nodes = builder.nodes.select { |node| File.mtime(node.path) > built_at }
@@ -41,7 +49,7 @@ module Prick::SubCommand
           touched_schema = touched_nodes.first&.schema
           missing_schema = builder.schemas.find { |schema| !conn.schema.exist?(schema) }
           build_schema = builder.schemas.find { |schema| [touched_schema, missing_schema].include? schema }
-
+          
           if build_schema.nil?
             puts "#{database} is up to date"
             exit

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: prick
 version: !ruby/object:Gem::Version
-  version: 0.25.2
+  version: 0.27.0
 platform: ruby
 authors:
 - Claus Rasmussen
 autorequire:
 bindir: exe
 cert_chain: []
-date: 2023-12-18 00:00:00.000000000 Z
+date: 2023-12-20 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