prick 0.36.0 → 0.38.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 49ed6762f3557cc979f89bb1aaee3d5aa1d8d11a5ba9c7880a8b692d917dc733
-  data.tar.gz: 16436521e2f9a51ed6c2076ba2a54f968735868a711d170253691a69a4b34fb4
+  metadata.gz: e44c6bb60e5ae3fe9a90935d641c116ccac1ff93790385880085dbe65cbca19c
+  data.tar.gz: bc04dc4f8f7c145c36f46fdeacb7ebb0fd751c4446f4adf1ecc0f2449098b6a5
 SHA512:
-  metadata.gz: eedba5e0757b8f19c94d4bf898ea156b93090cd2466e333860d7a4da9ce91d75fbc4acab596bbc06b0a8f260909c9770715299c55040c017d45b7f679d5528f0
-  data.tar.gz: 7d98f2a0a8e6ed8230bc44b3d16d1c46f4baa85956bdbcd893325e2d062d8a6d46c4277cf85af8c5e833fb20bbf8324a75d8788d05418cd87185976c6c16a76a
+  metadata.gz: 3a210f76e1d1ad412185a9bc52229ecb48119e3e5542d216e26750116cd6e807bce7d6435a293987dfa897ba5ded23c39f26a287259d8ebc55ec5154610a720c
+  data.tar.gz: e59379e97b66b72be5a6d43288ce8665f6dd3400f99e5ed5ec39308b2fe849592b143819f36e6c3f5ce6ca2edb9e1db5775e697cf171ead49832a71ab4877954

data/exe/prick

@@ -157,6 +157,9 @@ SPEC = %(
       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
+
   version!
       Print project version
 
@@ -229,6 +232,10 @@ def require_db(database = Prick.state&.database, exist: true)
   end
 end
 
+def clean_pg_meta_cache
+  FileUtils.rm_f(PG_META_STATE_PATH)
+end
+
 def parse_database_args(state, args)
   arg, environment = args.expect(0..2)
   if arg
@@ -308,6 +315,7 @@ begin
       puts "#{Prick.state.name}-#{Prick.state.version}"
 
     when :setup!
+      clean_pg_meta_cache
       state.project_loaded? or Prick.error "No #{project_file} found"
       username, database, environment = parse_database_args(state, args)
       require_db(database, exist: false)
@@ -315,6 +323,7 @@ begin
 
     # FIXME Ensure that we never drop the current user
     when :teardown!
+      clean_pg_meta_cache
       if args.empty?
         Prick::SubCommand.teardown(database, remove_state_file: true)
       else
@@ -331,11 +340,13 @@ begin
       end
 
     when :set!
+      clean_pg_meta_cache
       variable, *args = args.expect(1..3)
       require_db(database) if variable == "duration"
       Prick::SubCommand.set(variable, *args) or error "Illegal variable name '#{variable}'"
 
     when :clean!
+      clean_pg_meta_cache
       database = args.expect(0..1) || database
       require_db(database)
       Prick::SubCommand.clean(database)
@@ -344,10 +355,12 @@ begin
       create_command = opts.create! # Because we need easy access to subcommand options
       case create_command.subcommand
         when :database!
+          clean_pg_meta_cache
           database, username, environment = parse_database_args(state, args)
           require_db(database, exist: false)
           Prick::SubCommand.create_database(database, username, environment)
         when :migration!
+          # clean_pg_meta_cache # FIXME ?
           require_db
           arg = args.expect(1)
           version = PrickVersion.try(arg) or Prick.error "Illegal version: #{arg}"
@@ -363,6 +376,7 @@ begin
 
     when :build!
       require_db
+      clean_pg_meta_cache
       dump = cmd.dump? ? cmd.dump("batches")&.to_sym || :batches : nil
 #     exclude = cmd.exclude? ? cmd.exclude.split(",") : []
       Prick::SubCommand.build(
@@ -371,6 +385,7 @@ begin
 
     when :make!
       require_db
+      clean_pg_meta_cache
       dump = cmd.dump? ? cmd.dump("batches")&.to_sym || :batches : nil
       Prick::SubCommand.make(
           database, username, args.expect(0..1), 
@@ -378,6 +393,7 @@ begin
 
     when :run!
       require_db
+      clean_pg_meta_cache
       dump = cmd.dump? ? cmd.dump("batches")&.to_sym || :batches : nil
       Prick::SubCommand.run(
           database, username, args.expect(1), 
@@ -385,6 +401,7 @@ begin
 
     when :bash!
       args.expect(0)
+      clean_pg_meta_cache
       Prick::SubCommand.bash(main: cmd.main?)
 
     when :fox!
@@ -396,6 +413,11 @@ begin
       args.expect(0)
       Prick::SubCommand.snapshot(database, username)
 
+    when :reset!
+      require_db
+      args.expect(0)
+      Prick::SubCommand.drop_data(database)
+
     when :drop!
       case cmd.subcommand
         when :users!
@@ -408,6 +430,7 @@ begin
           owner = args.expect(0..1) || username
           Prick::SubCommand.drop_owner(owner)
         when :database!
+          clean_pg_meta_cache
           database = args.expect(0..1) || database
           Prick::SubCommand.drop_database(database)
         when :data!
@@ -416,6 +439,7 @@ begin
           Prick::SubCommand.drop_data(database)
         when :schema!
           require_db
+          clean_pg_meta_cache
           schemas = args.to_a
           Prick::SubCommand.drop_schema(database, schemas)
       else
@@ -430,6 +454,7 @@ begin
 
     when :migrate!
       require_db
+      # clean_pg_meta_cache # FIXME ?
       args.expect(0)
       Prick::SubCommand.migrate(database, username, file: cmd.file)
 

data/lib/prick/builder/node.rb

@@ -15,8 +15,6 @@ module Prick
       def schema() @schema ||= parent&.schema || "public" end
       def schema=(s) @schema = s end
 
-      attr_reader :source
-
       def source
         @source ||= read_source
       end

data/lib/prick/builder/parser.rb

@@ -98,6 +98,7 @@ module Prick
       # value is returned
       def parse_file_entry(unit, dir, entry)
         entry = entry.sub(/\/$/, "")
+#       puts "#parse_file_entry(#{unit.path.inspect}, #{dir.inspect}, #{entry.inspect})"
         if entry =~ /^(\S+?)(\?)?(?:\s+(.+))?\s*$/
           command = $1
           optional = !$2.nil?
@@ -141,7 +142,7 @@ module Prick
           (path, args = parse_file_entry(unit, dir, entry)) or return nil
           if File.directory? path
             parse_directory(unit, path)
-          elsif File.executable? path
+          elsif File.executable?(path)
             ExecNode.new(unit, phase, path, args)
           elsif File.file? path
             case path
@@ -166,10 +167,13 @@ module Prick
       #
       # Note that "." is ignored in the search path 
       def find_executable(filename) # ChatGPT
-        Prick.state.executable_search_path.split(File::PATH_SEPARATOR).each do |directory|
-          next if directory == "."
-          path = File.join(directory, filename)
-          return path if File.file?(path) && File.executable?(path)
+#       puts "#find_executable(#{filename.inspect})"
+        if !Prick.state.environments.key?(filename) # Environment names are reserved
+          Prick.state.executable_search_path.split(File::PATH_SEPARATOR).each do |directory|
+            next if directory == "."
+            path = File.join(directory, filename)
+            return path if File.file?(path) && File.executable?(path)
+          end
         end
         nil
       end

data/lib/prick/constants.rb

@@ -40,6 +40,8 @@ module Prick
   PRICK_ENVIRONMENT_FILE = "prick.environment.yml"
   PRICK_ENVIRONMENT_PATH = PRICK_ENVIRONMENT_FILE
 
+  # TODO: Move to var/cache
+
   # State file
   PRICK_STATE_FILE = ".prick.state.yml"
   PRICK_STATE_PATH = PRICK_STATE_FILE
@@ -48,6 +50,10 @@ module Prick
   FOX_STATE_FILE = ".fox-state.yml"
   FOX_STATE_PATH = FOX_STATE_FILE
 
+  # PgMeta snapshot. Is deleted at the start of each build
+  PG_META_STATE_FILE = ".pg_meta-state.yml"
+  PG_META_STATE_PATH = PG_META_STATE_FILE
+
   # Reflections file
   REFLECTIONS_FILE = "reflections.yml"
   REFLECTIONS_PATH = File.join(SCHEMA_DIR, REFLECTIONS_FILE)

data/lib/prick/state.rb

@@ -239,7 +239,7 @@ module Prick
     # It is an error if the project file exists. 
     def save_project(overwrite: false)
       overwrite || !File.exists?(project_file) or Prick.error "Won't overwrite '#{project_file}'"
-      hash = { name: name, title: title, version: version.to_s, prick: prick_version.to_s }
+      hash = { name: name, title: title, version: version.to_s, prick: Prick::VERSION }
       save_yaml(project_file, hash)
     end
 
@@ -264,10 +264,11 @@ module Prick
         @build_id = insert_record(
             "prick.builds",
             name: name,
-            version: version.to_s, prick: prick_version, 
+            version: version.to_s, prick: Prick::VERSION,
             branch: branch, rev: rev(kind: :short), clean: clean?,
             environment: environment)
       end
+#           version: version.to_s, prick: prick_version, 
     end
 
     def save_build_end(success, duration)
@@ -278,7 +279,7 @@ module Prick
         insert_record(
             "prick.builds",
             name: name,
-            version: version.to_s, prick: prick_version, 
+            version: version.to_s, prick: Prick::VERSION, 
             branch: branch, rev: rev(kind: :short), clean: clean?,
             environment: environment,
             success: success, duration: duration, prick_duration: dt)

data/lib/prick/version.rb

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

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: prick
 version: !ruby/object:Gem::Version
-  version: 0.36.0
+  version: 0.38.0
 platform: ruby
 authors:
 - Claus Rasmussen
 autorequire:
 bindir: exe
 cert_chain: []
-date: 2024-05-06 00:00:00.000000000 Z
+date: 2024-05-15 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: semantic