prick 0.39.11 → 0.39.13

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: ad50ce31807638ac2ae6641f51d77ed2b27fc4649dcfb103760f807c73b9abdd
-  data.tar.gz: e017f2e426eb63b8af62c1b5e88d39b662dac8a256db92274335edc50cf75aad
+  metadata.gz: 7e4a3abb3d16add6ac8a34d01cf1b4f8c47db59b97110d5a53f7c137d7fac786
+  data.tar.gz: 197a7fed189ac1ace4fb185d17287aa397ab207c4b6c4def6e929341968ea5f3
 SHA512:
-  metadata.gz: 23e42576bc05d4326feaffcbee16786be1957535d511959062036b7f6bb38ba43bb368ac2304c138b6cd23b40ba447c10f1a0a1b3dc5c00f4f03dee787c9843e
-  data.tar.gz: e0ef1c1700bf783efedbb37c20aad0c6e162543edf4bf5f2b889b8872f1282a1441a11725f8410c9c922388c1853dd12a496772332d16240ba432ba57b125837
+  metadata.gz: fabd3040287e7db1deace3ec62929eac32535a2182963fcf1842c868f56e8b25d3e0fbd8c0d93cfd6f1bfd7eaa970c9a3532c89aec3ae90611b703b677c5738f
+  data.tar.gz: 1a0dda8115fcd8f0d2aa100257782f50e7e2f2bd04c9fca7d20d64900e59623faf7a3f607ccd2c3b79bdfab50d1d9f251dc4abc770bef42523d82a626d88e980

data/TODO

@@ -1,3 +1,4 @@
+o Make references to file stable when using -C
 o prefix sql scripts with 'set ON_ERROR_STOP on'
 o make it possible to build only one scheme
 o cleanup connection
@@ -11,7 +12,7 @@ o Have the following entries
     sql: SQL_STATEMENT
     exec: BASH_COMMAND
     eval: BASH_COMMAND
-    call: 
+    call:
     ...
 
 

data/exe/prick

@@ -37,9 +37,15 @@ SPEC = %(
   -e,environment-file=ENVIRONMENT-FILE
       Override the environment file. Default is 'prick.environment.yml'
 
+  -r,reflections-file=REFLECTIONS-FILE
+      Override the reflections file. Default is 'schema/reflections.yml'
+
   -s,state-file=STATE-FILE
       Override state file. Default is '.prick-state.yml'
 
+  -f,fox-state-file=FOX-STATE-FILE
+      Override fox state file. Default is '.fox-state.yml
+
   init! -n,name=NAME -t,title=TITLE DIRECTORY #@ Initialize new Prick project directory
       Initializes a prick project and checks it into git. If a directory is
       given the directory will be created and the project initialized in it.
@@ -117,7 +123,9 @@ SPEC = %(
   drop.data!
       @ Drop data
 
-      TODO
+      Drop data added to the database after the last snapshot was taken. It is
+      useful to run 'prick snapshot' immediately after you complete building
+      the database
 
   build! --step -f,force -t,time --dump=KIND? -- [SCHEMA]
       Build the project. If SCHEMA is defined, later schemas are excluded. KIND
@@ -134,12 +142,15 @@ SPEC = %(
   run! --step -t,time --dump=KIND? --schema=SCHEMA -- PATH
       @ Execute path in Prick environment
 
-      Execute a single directory or file within the Prick environment. If given
-      a directory argument, the directory is searched for a build.yml file. If
-      given a file argument, the file should be a .sql, .fox, or build file
+      Execute a single build directory or file within the Prick environment. If
+      given a directory argument, the directory is searched for a build.yml
+      file. If given a file argument, the file should be a .sql, .fox, or build
+      file
 
       The --schema option sets the current schema before executing the PATH
 
+      TODO: Allow executables
+
   touch! -- [SUCCESS]
       Record a build. SUCCESS can be 'true' (default) or 'false'.  'touch' is
       used by external build processes that doesn't involve prick
@@ -148,18 +159,19 @@ SPEC = %(
       Emit a bash script to build the database. The script is constructed from
       the build attributes in the environment file
 
-  fox! -- FILE...
-      Load fox file data. Data are reset to their initial state after build
-      before the fox data are loaded. This makes it possible to experiment with
-      different data sets
+  fox! -r,reset +e,exclude=SCHEMA... -- FILE...
+      Load fox file data. Can be used together with 'prick snapshot' and 'prick
+      drop data' to to experiment with different data sets
 
-      # TODO: A --clean option that resets data
-      #
+      The --reset option resets data to the last snapshot before loading the
+      file. The --exclude option lists schemas that should not be included in
+      fox, typically schemas that doens't comply with prick's naming
+      conventions
 
   snapshot!
-      Records maximum ID for all tables and stores them in prick.snapshot. It is
-      used by 'drop data' to reset data to the point in time of the snapshot.
-      Only one snapshot can be created at a time
+      Records maximum ID for all tables and stores them in the prick.snapshot
+      table. It is 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
@@ -240,6 +252,10 @@ def clean_pg_meta_cache
   FileUtils.rm_f(PG_META_STATE_PATH)
 end
 
+def clean_fox_state
+  FileUtils.rm_f(Prick.state.fox_state_file)
+end
+
 def parse_database_args(state, args)
   arg, environment = args.expect(0..2)
   if arg
@@ -287,7 +303,9 @@ begin
   # Handle -p, -e, and -c. TODO: Take -C into account for relative paths. Low-hanging fruit
   project_file = opts.project_file || PRICK_PROJECT_PATH
   environment_file = opts.environment_file || PRICK_ENVIRONMENT_PATH
+  reflections_file = opts.reflections_file || REFLECTIONS_PATH
   state_file = opts.state_file || PRICK_STATE_PATH
+  fox_state_file = opts.fox_state_file || FOX_STATE_PATH
 
   # Process init command and exit
   if opts.subcommand == :init!
@@ -307,7 +325,7 @@ begin
   end
 
   # Load state
-  state = Prick.state = State.new(project_file, environment_file, state_file)
+  state = Prick.state = State.new(project_file, environment_file, reflections_file, state_file, fox_state_file)
 
   # Lazyness
   database = state.database
@@ -381,6 +399,7 @@ begin
     when :build!
       require_db
       clean_pg_meta_cache
+      clean_fox_state
       dump = cmd.dump? ? cmd.dump("batches")&.to_sym || :batches : nil
 #     exclude = cmd.exclude? ? cmd.exclude.split(",") : []
       Prick::SubCommand.build(
@@ -390,6 +409,7 @@ begin
     when :make!
       require_db
       clean_pg_meta_cache
+      clean_fox_state
       dump = cmd.dump? ? cmd.dump("batches")&.to_sym || :batches : nil
       Prick::SubCommand.make(
           database, username, args.expect(0..1),
@@ -415,7 +435,7 @@ begin
 
     when :fox!
       require_db
-      Prick::SubCommand.fox(database, username, args)
+      Prick::SubCommand.fox(database, username, args, reset: cmd.reset?, exclude: cmd.exclude)
 
     when :snapshot!
       require_db

data/lib/prick/builder/batch.rb

@@ -122,8 +122,12 @@ module Prick
           t_type.stop
           t_fox = Timer.new "  Parse files"
 
+          # Fetch state
+          ids, anchors = FixtureFox::Fox.read_state(type, Prick.state.fox_state_file)
+
           # Create fox object
-          fox = FixtureFox::Fox.new(type)
+          #
+          fox = FixtureFox::Fox.new(type, ids: ids, anchors: anchors)
 
           # Parse files
           for file in files
@@ -135,8 +139,8 @@ module Prick
           fox.assign_types
           fox.generate
 
-          # Dump state file
-          fox.write_state(FOX_STATE_PATH)
+          # Dump new state file
+          fox.write_state(Prick.state.fox_state_file)
 
           # Timer
           t_fox.stop

data/lib/prick/builder/builder.rb

@@ -66,7 +66,7 @@ module Prick
 
         @conn = conn
         @path = path
-        @reflections_file = REFLECTIONS_PATH
+        @reflections_file = Prick.state.reflections_file
         @clean = clean
         @single = single
         @step = step

data/lib/prick/builder/parser.rb

@@ -195,7 +195,7 @@ module Prick
 
         last = nil
         for env in [env] + env.ancestors.reverse
-          bash_vars["ENVIRONMENT"] = env.name
+          bash_vars["PRICK_ENVIRONMENT"] = env.name
           file = expand_variables(filename, bash_vars)
 #         last ||= (file != last and file) or return nil # return if no ENVIRONMENT substitution
           path = (file.start_with?("/") ? file : File.join(dir, file))

data/lib/prick/state.rb

@@ -24,9 +24,16 @@ module Prick
     # absent if the project doesn't use environments
     attr_reader :environment_file
 
+    # Reflections file. Default 'schema/reflections.yml'. May be nil if the
+    # file is absent
+    attr_reader :reflections_file
+
     # State file. Default '.prick-state.yml'
     attr_reader :state_file
 
+    # Fox state file. Default '.fox-state.yml'
+    attr_reader :fox_state_file
+
     # Schema data file. FIXME What is this?
     def schema_file() SCHEMA_VERSION_PATH end
 
@@ -95,8 +102,9 @@ module Prick
       @clean = Git.clean?
     end
 
-    def initialize(project_file, environment_file, state_file)
-      @project_file, @environment_file, @state_file = project_file, environment_file, state_file
+    def initialize(project_file, environment_file, reflections_file, state_file, fox_state_file)
+      @project_file, @environment_file, @reflections_file, @state_file, @fox_state_file =
+          project_file, environment_file, reflections_file, state_file, fox_state_file
       @project_loaded = @state_loaded = @environment_loaded = false
 
       if @project_file && File.exist?(@project_file)

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

@@ -3,8 +3,16 @@
 require_relative '../builder/builder.rb'
 
 module Prick::SubCommand
-  def self.fox(database, username, files)
-    Command.command "fox --state=#{FOX_STATE_PATH} --exec #{database} #{files.join(" ")}"
+  def self.fox(database, username, files, reset: false, exclude: nil)
+    self.drop_data(database) # In prick-drop
+    opts = {
+      state: FOX_STATE_PATH,
+      delete: "none",
+      exec: true,
+      exclude: (exclude ? exclude.join(',') : nil),
+      reflections: Prick.state.reflections_file
+    }.reject { |k,v| v.nil? }.map { |k,v| "--#{k}#{v == true ? "" : "=#{v}"}" }.join(" ")
+    Command.command "fox #{opts} #{database} #{files.join(" ")}"
   end
 end
 

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

@@ -31,7 +31,7 @@ module Prick::SubCommand
     Command.status == 0 or Prick.failure "Failed creating initial import"
 
     # Write (valid) configuration file
-    state = State.new(project_file, nil, nil)
+    state = State.new(project_file, nil, nil, nil, nil)
     state.name = name
     state.title = title
     state.prick_version = PrickVersion.new VERSION

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

@@ -4,7 +4,7 @@ require_relative '../builder/builder.rb'
 
 module Prick::SubCommand
   def self.snapshot(
-      database, username, 
+      database, username,
       builddir: Prick.state.schema_dir)
 
     conn = Prick.state.connection
@@ -24,6 +24,13 @@ module Prick::SubCommand
       }
     end
     conn.insert("prick", "snapshots", records)
+
+    # Patch fox state file
+    state = YAML.load(IO.read(Prick.state.fox_state_file))
+    for record in records
+      state[:ids][record[:schema_name] + '.' + record[:table_name]] = record[:max_id] if record[:max_id]
+    end
+    IO.write(Prick.state.fox_state_file, YAML.dump(state))
   end
 end
 

data/lib/prick/version.rb

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

metadata

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