prick 0.39.5 → 0.39.7

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 01771a2a76d7f9c9350c6e05424cf29de726d8bc6702f21c3577cbb3b9a93b6c
-  data.tar.gz: b7a4e6895f8d80943ac7ccc364aeebbb24b73f61df072c2ff41f72a44c5e6e99
+  metadata.gz: 7d27db668e8163dce24bb6c7548f5332a5f5e8c72ee4a5e266b10a032a06b782
+  data.tar.gz: c3e293fec4e73625c45e28198f112a52cef7d83816274ca3a63231cfc6746c28
 SHA512:
-  metadata.gz: a027ffc3f0a0e19fea6bb1bca1f2afe4eb0adb3b9d171602b5512d358ca8ca4d6490f384e90ac88d0d68da935fd413c63531588377ea4c0c0953075e86f42f96
-  data.tar.gz: dca9bf4af5c6fc4cda593cb25f963a3d92f3360fa51b535fc43c3ffeddef313bdaa8e41719de9297f088deec5c1cc0876d91d8dc1593bac4c56b8f60736726f0
+  metadata.gz: 02fcb89d65a6c99e95b9263266c84353eac7a572a6338bcabde51d699377a4c32161dd785ef1b9ccdd16f58ba85e92174ba09e086eda7fd11426449d30c2fa2e
+  data.tar.gz: 7079b45ddf107b13c1ea22e131ea580c16c9e3378fc0f0ff3e1eb22b8b0e8b3c22a61e3732efb1f58180a29fc97d5453a0ff2a96cec2c4d3ac1a5083948a8e97

data/exe/prick

@@ -191,7 +191,7 @@ SPEC = %(
       List variables for the current environment
 
   dump.migration! --force -- VERSION
-  
+
   dump.type!
       Dumps a PgGraph object
 
@@ -203,8 +203,8 @@ SPEC = %(
 
   dump.value! -- VARIABLE...
       Dumps values of the given variables. Multiple variables can be read into bash
-      variables using read: 
-        
+      variables using read:
+
           read name title <<< $(prick dump value PRICK_NAME PRICK_TITLE)
 
   dump.node!
@@ -217,7 +217,7 @@ SPEC = %(
       TODO
 )
 
-def require_db(database = Prick.state&.database, exist: true) 
+def require_db(database = Prick.state&.database, exist: true)
   database or raise ArgumentError
   dba = State.connection
   if exist
@@ -290,7 +290,7 @@ begin
   state_file = opts.state_file || PRICK_STATE_PATH
 
   # Process init command and exit
-  if opts.subcommand == :init!    
+  if opts.subcommand == :init!
     dir, name = Prick::SubCommand.init(project_file, args.expect(0..1), cmd.name, cmd.title)
     Prick.mesg "Initialized Prick project '#{name}' in #{File.absolute_path(dir)}/"
     exit
@@ -369,8 +369,8 @@ begin
           arg = args.expect(1)
           version = PrickVersion.try(arg) or Prick.error "Illegal version: #{arg}"
           Prick::SubCommand.create_migration(
-              username, version, 
-              force: create_command.subcommand!.force?, 
+              username, version,
+              force: create_command.subcommand!.force?,
               file: create_command.subcommand!.file)
         when :users, :schema, :data, :all
           raise NotImplementedError
@@ -384,7 +384,7 @@ begin
       dump = cmd.dump? ? cmd.dump("batches")&.to_sym || :batches : nil
 #     exclude = cmd.exclude? ? cmd.exclude.split(",") : []
       Prick::SubCommand.build(
-          database, username, args.expect(0..1), 
+          database, username, args.expect(0..1),
           force: cmd.force?, step: cmd.step?, timer: cmd.time?, dump: dump)
 
     when :make!
@@ -392,7 +392,7 @@ begin
       clean_pg_meta_cache
       dump = cmd.dump? ? cmd.dump("batches")&.to_sym || :batches : nil
       Prick::SubCommand.make(
-          database, username, args.expect(0..1), 
+          database, username, args.expect(0..1),
           step: cmd.step?, timer: cmd.time?, dump: dump)
 
     when :run!
@@ -400,7 +400,7 @@ begin
       clean_pg_meta_cache
       dump = cmd.dump? ? cmd.dump("batches")&.to_sym || :batches : nil
       Prick::SubCommand.run(
-          database, username, args.expect(1), 
+          database, username, args.expect(1),
           step: cmd.step?, timer: cmd.time?, dump: dump, schema: cmd.schema)
 
     when :touch!
@@ -457,7 +457,7 @@ begin
 
     when :release!
       kind = args.expect(1).to_sym
-      constrain? kind, :major, :minor, :patch or 
+      constrain? kind, :major, :minor, :patch or
           Prick.failure "Expected 'major', 'minor', or 'patch' argument, got '#{kind}'"
       Prick::SubCommand.release(kind)
 
@@ -472,7 +472,7 @@ begin
       case cmd.subcommand
         when :environments!; Prick::SubCommand.list_environments(format: format)
         when :databases!; Prick::SubCommand.list_databases(format: format)
-        when :variables!; 
+        when :variables!;
           all = cmd.subcommand!.all?
           Prick::SubCommand.list_variables(format: format, all: all)
         when :users!; Prick::SubCommand.list_users
@@ -506,7 +506,7 @@ begin
           raise NotImplementedError
         when :variable!
           scope =
-              case [subject.export?, subject.local?] 
+              case [subject.export?, subject.local?]
                 in [true, false]; :global
                 in [false, true]; :local
                 in [false, false]; nil
@@ -544,7 +544,7 @@ rescue ShellOpts::Error, Prick::Error => ex
   ShellOpts.error(ex.message)
 
 # FIXME
-#rescue RuntimeError, IOError, ShellOpts::Failure, Prick::Failure, Prick::Build::PostgresError => ex 
+#rescue RuntimeError, IOError, ShellOpts::Failure, Prick::Failure, Prick::Build::PostgresError => ex
 # ShellOpts.failure(ex.message)
 end
 

data/lib/prick/builder/batch.rb

@@ -11,7 +11,7 @@ module Prick
 
       def initialize(builder)
         @builder = builder
-        @nodes = [] 
+        @nodes = []
       end
 
       def execute(**opts, &block)
@@ -87,10 +87,10 @@ module Prick
 
     class ModuleBatch < BuildBatch
       def execute
-        super { 
-          nodes.each { |node| 
+        super {
+          nodes.each { |node|
             sql = node&.call
-            conn.execute sql if sql 
+            conn.execute sql if sql
           }
         }
       end
@@ -140,7 +140,7 @@ module Prick
           delete = builder.clean ? :none : :touched
           begin
             conn.execute fox.to_sql(format: :exec, delete: delete)
-          rescue PG::SyntaxError, PG::Error => ex 
+          rescue PG::SyntaxError, PG::Error => ex
             raise PostgresError.new(ex.message)
           end
         }

data/lib/prick/builder/builder.rb

@@ -55,7 +55,7 @@ module Prick
                         :nodes, :decl_nodes, :init_nodes, :term_nodes,
                         :seed_nodes, :fox_seed_nodes, :sql_seed_nodes,
                         :build_nodes,
-                        :pg_graph_ignore_schemas, 
+                        :pg_graph_ignore_schemas,
                         :refresh_schemas, :keep_schemas
 
       def batches() @batches || create_batches end
@@ -160,7 +160,7 @@ module Prick
     private
       def load_pool_impl(build_node)
         pool.add(build_node.init_nodes)
-        build_node.decl_nodes.each { |node| 
+        build_node.decl_nodes.each { |node|
           pool.add node
           load_pool_impl(node) if node.kind == :yml
         }

data/lib/prick/builder/node.rb

@@ -29,7 +29,7 @@ module Prick
 
       def lines() prefix_lines + source_lines end
 
-      def initialize(parent, phase, kind, path, args = nil) 
+      def initialize(parent, phase, kind, path, args = nil)
         constrain parent, BuildNode, NilClass
         constrain phase, :init, :decl, :seed, :term, nil
         constrain kind, :sql, :exe, :fox, :yml, :inline, :module
@@ -60,7 +60,7 @@ module Prick
 
     protected
       def read_source
-        file = File.read(path)
+        file = File.read(path).gsub(/^\\[^\n]*/m, "")
         @source_lines = 1 + 1 + file.count("\n")
         ["set search_path to #{schema}, pg_temp;\n", file]
       end
@@ -110,7 +110,7 @@ module Prick
         end
       end
 
-      def call() 
+      def call()
         object.send(@command, *args)
       end
 
@@ -200,7 +200,7 @@ module Prick
             kind_nodes = self.send("#{kind}_nodes".to_sym)
             if !kind_nodes.empty?
               puts "#{kind}:"
-              indent { kind_nodes.each(&:dump) } 
+              indent { kind_nodes.each(&:dump) }
             end
           end
         }

data/lib/prick/builder/node_pool.rb

@@ -35,7 +35,7 @@ module Prick
 
       # List of schemas that should be rebuilt. #refresh_schemas is not cached
       # and can be manipulated by removing build nodes from the pool
-      def refresh_schemas() 
+      def refresh_schemas()
         build_nodes.select(&:refresh_schema).map(&:schema).uniq
       end
 
@@ -43,7 +43,7 @@ module Prick
         build_nodes.reject(&:refresh_schema).map(&:schema).uniq
       end
 
-      def initialize() 
+      def initialize()
         self.clear
       end
 
@@ -52,7 +52,7 @@ module Prick
         term_nodes = [] # Ugly hack to do recursive init/term but preserve order within a term block
         @nodes.concat(nodes)
         @all_nodes.concat(nodes)
-        nodes.each { |node| 
+        nodes.each { |node|
           @schemas[node.schema] += 1
           if node.phase == :term
             term_nodes << node
@@ -60,7 +60,7 @@ module Prick
             @kind_nodes[node.phase]&.append(node)
           end
         }
-        term_nodes.reverse.each { |node| @kind_nodes[:term]&.append node } 
+        term_nodes.reverse.each { |node| @kind_nodes[:term]&.append node }
         self
       end
 
@@ -81,7 +81,7 @@ module Prick
 
       def delete_schema(*schemas, exclude: [])
         schemas = Array(schemas).flatten
-        delete_if { |node| 
+        delete_if { |node|
           schemas.include?(node.schema) && !exclude.include?(node.phase) && !exclude.include?(node.kind)
         }
       end

data/lib/prick/builder/parser.rb

@@ -105,7 +105,7 @@ module Prick
           rest = $3
           args = expand_string(rest || '').split
           path = expand_filename(dir, command)
-          path || optional or 
+          path || optional or
               raise Error, "Can't find file #{command} #{path} in #{dir}/ from #{unit}"
           !path.nil? or return nil
         else
@@ -165,7 +165,7 @@ module Prick
 
       # Search for an executable in path. Return nil if not found
       #
-      # Note that "." is ignored in the search path 
+      # Note that "." is ignored in the search path
       def find_executable(filename) # ChatGPT
 #       puts "#find_executable(#{filename.inspect})"
         if !Prick.state.environments.key?(filename) # Environment names are reserved

data/lib/prick/constants.rb

@@ -144,7 +144,7 @@ module Prick
 
   # Matches a major.minor.patch ('MMP') version
   #
-  # The *_SEMVER REs are derived from the canonical RE 
+  # The *_SEMVER REs are derived from the canonical RE
   #
   # /
   #   (0|[1-9]\d*)\.(0|[1-9]\d*)\.(0|[1-9]\d*)

data/lib/prick/diff.rb

@@ -1,5 +1,5 @@
 module Prick
-  # Database diff 
+  # Database diff
   class Diff
     # Diff as a list of lines
     attr_reader :diff

data/lib/prick/environment.rb

@@ -16,7 +16,7 @@ module Prick
     # List of names of inherited environments
     def inherit = assignments[:inherit]
 
-    # List of directly inherited environment objects. Assigned by the 
+    # List of directly inherited environment objects. Assigned by the
     # analyzer
     attr_accessor :parents
 
@@ -88,7 +88,7 @@ module Prick
     def dump
       puts "#{name}:"
       indent {
-        self.each { |ident,val| 
+        self.each { |ident,val|
 #         if ident == :build
 #           puts "super: #{super_environment&.name || 'false'}"
 #         end
@@ -163,11 +163,11 @@ module Prick
           local method=$1
           super_stack+=($method)
         }
-        
+
         function pop_super_stack() {
           super_stack=("${super_stack[@]::${#super_stack[@]}-1}")
         }
-        
+
         function super() {
           eval ${super_stack[-1]}
         }
@@ -258,7 +258,7 @@ module Prick
     def analyze
       # Assign Environment#parent
       values.each { |env|
-        env.parents = env.inherit.map { |name| 
+        env.parents = env.inherit.map { |name|
           self[name] or raise ArgumentError, "Can't find '#{name}' environment referred from '#{name}'"
         }
       }
@@ -279,10 +279,10 @@ module Prick
             case type
               when "BOOLEAN"; env[ident] = value if !env.key?(ident)
               when "STRING"; env[ident] ||= value
-              when "LIST"; 
+              when "LIST";
                   next if ident == :inherit # Does not accumulate
                   # FIXME !inherited.key? should prevent env[ident].nil?
-                  env[ident] = (value + (env[ident] || [])).uniq 
+                  env[ident] = (value + (env[ident] || [])).uniq
               when "TEXT"; env[ident] = env[ident] || value
             else
               raise ArgumentError
@@ -294,7 +294,7 @@ module Prick
       # Assign #ancestors
       sorted_indexes = sorted_environments.map.with_index { |env, idx| [env.name, idx] }.to_h
       for env in sorted_environments
-        env.ancestors = 
+        env.ancestors =
           (env.parents + env.parents.map(&:ancestors))
             .flatten
             .uniq

data/lib/prick/local/fmt.rb

@@ -1,13 +1,13 @@
 
 module Fmt
   # Print table
-  def self.puts_table(headers, table)
+  def self.puts_table(headers, table, bold: nil)
     widths = headers.map(&:size)
     signs = []
     types = []
     indexes = [] # absolute position of column. Zero based
     for i in (0...headers.size)
-      value_width = 
+      value_width =
           table.map { |row|
             case value = row[i]
               when TrueClass, FalseClass
@@ -58,8 +58,10 @@ module Fmt
     }
     puts
 
-    for row in table
+    table.each.with_index { |row, rownum|
 #     for index, sign, width, type, value in signs.zip(indexes, signs, widths, types, row) # FIXME doesn't work?
+      print "\033[1m" if rownum == bold
+
       for i in (0...headers.size)
         index, sign, width, type, value = indexes[i], signs[i], widths[i], types[i], row[i]
 
@@ -75,7 +77,7 @@ module Fmt
           lines = []
           while !values.empty?
             rest = width
-            line = [] 
+            line = []
             while !values.empty? && values.first.size <= rest
               rest -= values.first.size
               line << values.shift
@@ -92,8 +94,8 @@ module Fmt
           printf "%#{sign}#{width}#{type} ", "#{value}"
         end
       end
-      puts
-    end
+      puts (rownum == bold ? "\033[0m" : "")
+    }
   end
 end
 

data/lib/prick/local/git.rb

@@ -2,7 +2,7 @@
 module Prick
   module Git
     # Return the origin of the repository
-    def self.origin() 
+    def self.origin()
       Command.command("git remote get-url origin").first
     end
 
@@ -52,7 +52,7 @@ module Prick
     end
 
     # Push change to repository
-    def self.push 
+    def self.push
       Command.command "git push --quiet --atomic"
     end
 
@@ -67,34 +67,34 @@ module Prick
 
     module Tag
       # The associated commit ID of a tag
-      def self.id(tag) 
-        tag && Command.command("git rev-list -n 1 #{tag}").first 
+      def self.id(tag)
+        tag && Command.command("git rev-list -n 1 #{tag}").first
       end
 
       # True if tag exists
-      def self.exist?(tag) 
-        tag && Command.command?("git describe --tags #{tag}") 
+      def self.exist?(tag)
+        tag && Command.command?("git describe --tags #{tag}")
       end
 
       # Create tag
-      def self.create(tag, id: nil) 
-        Command.command "git tag '#{tag}' #{id}" 
+      def self.create(tag, id: nil)
+        Command.command "git tag '#{tag}' #{id}"
       end
 
       # Drop a tag
-      def self.drop(tag) 
-        Command.command "git tag -d '#{tag}'" 
+      def self.drop(tag)
+        Command.command "git tag -d '#{tag}'"
       end
 
       # Return list of all tags. Not in any particular order
-      def self.list() 
-        Command.command("git tag") 
+      def self.list()
+        Command.command("git tag")
       end
 
       # Return the most recent tag before the given commit (defaults to the
       # last commit)
-      def self.current(id = nil) 
-        describe_tag(id)&.first 
+      def self.current(id = nil)
+        describe_tag(id)&.first
       end
 
     private
@@ -115,11 +115,11 @@ module Prick
     end
 
     module Branch
-      def self.exist?(branch) 
+      def self.exist?(branch)
         Command.command? "git show-ref --verify --quiet refs/heads/#{branch}"
       end
 
-      def self.create(branch, id = nil, set_upstream: true) 
+      def self.create(branch, id = nil, set_upstream: true)
         if set_upstream
           current = Git.branch.current
           Command.command %(
@@ -132,7 +132,7 @@ module Prick
         end
       end
 
-      def self.drop(branch) 
+      def self.drop(branch)
         Command.command "git branch -D #{branch}"
       end
 
@@ -140,11 +140,11 @@ module Prick
         Command.command "git for-each-ref --format='%(refname:short)' refs/heads/*"
       end
 
-      def self.current() 
+      def self.current()
         Command.command("git branch --show-current").first
       end
 
-      def self.checkout(branch) 
+      def self.checkout(branch)
         Command.command "git checkout --quiet #{branch}"
       end
     end
@@ -158,7 +158,7 @@ __END__
     end
 
 
-    
+
     # Return true if `version` has an associated tag
     def self.tag?(version)
       !list_tags.grep(version.to_s).empty?

data/lib/prick/local/timer.rb

@@ -62,15 +62,15 @@ module Timer
 
     def to_s(title = self.title) "#{title}: #{Timer.format(time)}" end
 
-    def emit(title = self.title) 
+    def emit(title = self.title)
       stop
       ::Timer.file.puts to_s(title) if ::Timer.on?
     end
 
     def self.factor() { s: 1, ms: 1000 }[::Timer.unit] end
 
-    def self.format(time) 
-      time ? sprintf("%.#{::Timer.scale}f#{::Timer.unit}", Timer.factor * time) : time.inspect 
+    def self.format(time)
+      time ? sprintf("%.#{::Timer.scale}f#{::Timer.unit}", Timer.factor * time) : time.inspect
     end
   end
 

data/lib/prick/prick_version.rb

@@ -15,9 +15,9 @@ module Prick
     def zero?() self == PrickVersion.zero end
 
     # Return true if `string` is a version
-    def self.version?(string) 
+    def self.version?(string)
       string.is_a?(String) or raise Internal, "String expected"
-      !(string =~ VERSION_RE).nil? 
+      !(string =~ VERSION_RE).nil?
     end
 
     attr_accessor :fork
@@ -95,9 +95,9 @@ module Prick
       [version, tag]
     end
 
-    # `part` can be one of :major, :minor, :patch, or :pre. If pre is undefined, it 
+    # `part` can be one of :major, :minor, :patch, or :pre. If pre is undefined, it
     # is set to `pre_initial_value`
-    def increment(part, pre_initial_value = 1) 
+    def increment(part, pre_initial_value = 1)
       self.dup.increment!(part, pre_initial_value)
     end
 

data/lib/prick/share/init/prick.yml

@@ -1,6 +1,6 @@
 ---
 # Initial project configuration file
-name: 
-title: 
-version: 
-prick: 
+name:
+title:
+version:
+prick:

data/lib/prick/share/init/schema/prick/build.yml

@@ -3,7 +3,7 @@
 # Note the SQL scripts are also called directly from 'prick setup' when the
 # database is created because we don't want to parse the whole build
 # environment just to create the prick schema.  After the initial setup, the
-# scripts are only run by 'prick build' with the --force option 
+# scripts are only run by 'prick build' with the --force option
 #
 # This is hardcoded an should be fixed somehow
 #

data/lib/prick/share/init/schema/prick/tables.sql

@@ -22,7 +22,7 @@ create table builds (
 
   -- Environment
   environment varchar not null default 'default',
-  
+
   -- Build timestamp. This is the time of the start of the build
   built_at timestamp without time zone default (now() at time zone 'UTC'),
 

data/lib/prick/state.rb

@@ -45,7 +45,7 @@ module Prick
     attr_accessor :version
 
     # Version of prick in prick.yml. Note that this can be different than the current
-    # version of prick 
+    # version of prick
     attr_accessor :prick_version
 
     # Database name. nil if state file is absent
@@ -82,7 +82,7 @@ module Prick
     def branch() @branch ||= Git.branch.current end
 
     # Git revision (commit ID). Lazy-evaluated
-    def rev(kind: :long) 
+    def rev(kind: :long)
       case kind
         when :short; @rev_short ||= rev()[0...8]
         when :long; @rev_long ||= Git.id
@@ -90,7 +90,7 @@ module Prick
     end
 
     # True if the git repository is clean (not modified). Lazy-evaluated
-    def clean?() 
+    def clean?()
       return @clean if defined?(@clean)
       @clean = Git.clean?
     end
@@ -109,7 +109,7 @@ module Prick
       load_environment_file if @environment_file && File.exist?(@environment_file)
     end
 
-    # Project user (owner) connection. Memoized to connect only once. 
+    # Project user (owner) connection. Memoized to connect only once.
     # TODO Rename. Also rename self.connection
     def connection(database: nil, username: nil, environment: nil, &block)
       if @connection.nil?
@@ -125,9 +125,9 @@ module Prick
         load_database_environment
 
         # Set environment if undefined and not overridden by :environment
-        self.environment = 
-            environment || 
-            Prick.state.environment || 
+        self.environment =
+            environment ||
+            Prick.state.environment ||
             environments.key?(database_environment) && database_environment ||
             DEFAULT_ENVIRONMENT
       end
@@ -160,8 +160,8 @@ module Prick
     end
 
     # Create a bash(1) environment (Hash). It is used for in-prick expansion of
-    # variables and is also injected into the enviroment of subprocesses    
-    # 
+    # variables and is also injected into the enviroment of subprocesses
+    #
     # FIXME: Problems with BUNDLE_* variables FIXME Still a problem?
     #
     # TODO: Explain handling of PRICK_<STANDARD-DIRECTORY>
@@ -231,12 +231,12 @@ module Prick
             val = val.join(" ")
           end
         end
-        assignments << "#{prefix}#{var}='#{val}'\n" 
+        assignments << "#{prefix}#{var}='#{val}'\n"
       }
       assignments.join
     end
 
-    # It is an error if the project file exists. 
+    # 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 }
@@ -268,7 +268,7 @@ module Prick
             branch: branch, rev: rev(kind: :short), clean: clean?,
             environment: environment)
       end
-#           version: version.to_s, prick: prick_version, 
+#           version: version.to_s, prick: prick_version,
     end
 
     def save_build_end(success, duration)
@@ -279,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)
@@ -300,7 +300,7 @@ module Prick
       puts "State"
       indent {
         for method in [
-            :name, :title, :prick_version, :project_version, 
+            :name, :title, :prick_version, :project_version,
             :database_version, :database_environment, :database, :username]
           puts "#{method}: #{self.send method}"
         end
@@ -327,7 +327,7 @@ module Prick
       for key in mandatory_keys
         !hash[key].to_s.empty? or Prick.error "Can't find '#{key}' in #{file}"
       end
-      (unknown = (hash.keys - mandatory_keys - optional_keys).first) and 
+      (unknown = (hash.keys - mandatory_keys - optional_keys).first) and
           Prick.error "Illegal key '#{unknown}' in #{file}"
       hash
     end

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

@@ -4,8 +4,8 @@ require_relative '../builder/builder.rb'
 
 module Prick::SubCommand
   def self.build(
-      database, username, schema, 
-      builddir: Prick.state.schema_dir, 
+      database, username, schema,
+      builddir: Prick.state.schema_dir,
       force: false, # Build all schemas
       step: false, timer: nil, dump: nil)
 
@@ -43,7 +43,7 @@ module Prick::SubCommand
               refresh_schemas = conn.schema.list
 
               # Find existing keep-schemas (but exclude target schema)
-              keep_schemas = builder.keep_schemas.select { |s| 
+              keep_schemas = builder.keep_schemas.select { |s|
                 conn.schema.exist?(s) && (schema.nil? || schema != s)
               }
 
@@ -63,7 +63,7 @@ module Prick::SubCommand
           # 'prick build' was given a schema
           builder.pool.delete_schema(builder.pool.after_schema(schema)) if schema
         end
-        
+
         case dump
           when :nodes; builder.nodes.reject { |node| node.is_a?(Build::BuildNode) }.map &:dump
           when :allnodes; builder.nodes.map &:dump

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

@@ -35,7 +35,7 @@ module Prick
           built_at: nil,
           success: nil
     end
-      
+
     def self.create_migration(username, from_version, force: false, file: nil)
       constrain from_version, PrickVersion
       Git.clean? or raise "Won't migrate: Repository is dirty"
@@ -97,7 +97,7 @@ module Prick
       end
 
       if file
-        File.open(file, "a") { |f| 
+        File.open(file, "a") { |f|
           f.puts "-- UPDATE VERSION"
           f.puts File.readlines(SCHEMA_VERSION_PATH).grep_v(/^--/)
         }
@@ -106,7 +106,7 @@ module Prick
         FileUtils.mkdir_p migration_dir
         Command.command "cp -a #{SHARE_PATH}/migrate/migration/. #{migration_dir}"
         Dir.chdir(migration_dir) { diff.write(*DIFF_FILES, mark: true) }
-      end 
+      end
     end
   end
 end

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

@@ -4,7 +4,7 @@ require_relative '../builder/builder.rb'
 
 module Prick::SubCommand
   # Drop database owner
-  def self.drop_owner(username) 
+  def self.drop_owner(username)
     # No database at this point so no session is running and no cascade. A nop
     # if the user is the current user or owns objects in other databases
     if username != ENV['USER']
@@ -21,7 +21,7 @@ module Prick::SubCommand
     if conn.rdbms.exist? database
       users = conn.role.list(database: database).reject { _1 == conn.rdbms.owner(database) }
       conn.session.terminate(database, users)
-      if conn.rdbms.exist?(database) 
+      if conn.rdbms.exist?(database)
         # Connect to database to make cascade work. Run in a block to close connection afterwards
         PgConn.new(database) { |conn| conn.role.drop(users, cascade: true) }
       else
@@ -53,7 +53,7 @@ module Prick::SubCommand
       schema_list = conn.quote_literal_list(schemas)
       schema_expr = schemas ? "true = true" : "schema_name in #{schema_list}"
       tables = conn.tuples %(
-        select schema_name, table_name, max_id 
+        select schema_name, table_name, max_id
         from prick.snapshots
         where #{schema_expr}
       )

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

@@ -30,7 +30,7 @@ __END__
           builder = Prick::Build::Builder.new(conn, builddir)
           builder.pool.delete_schema(builder.pool.after_schema(schema)) if schema
         end
-        
+
         case dump
           when :nodes; builder.nodes.reject { |node| node.is_a?(Build::BuildNode) }.map &:dump
           when :allnodes; builder.nodes.map &:dump

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

@@ -26,7 +26,7 @@ module Prick::SubCommand
       done
       git add .
       git commit -am "Initial import"
-      rm -f #{project_file} 
+      rm -f #{project_file}
     ), fail: false
     Command.status == 0 or Prick.failure "Failed creating initial import"
 

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

@@ -17,7 +17,7 @@ module Prick::SubCommand
       headers = %w(variable value)
       vars = Prick.state.bash_environment(all: all).reject { |k,v| k == "PATH" }
       rows = vars.map
-#     rows = vars.map { |k,v| 
+#     rows = vars.map { |k,v|
 #       if v.is_a?(Array)
 #         if v.first&.is_a?(Array)
 #           v = v.first
@@ -28,7 +28,7 @@ module Prick::SubCommand
 #         v = v.to_s
 #       end
 #
-#       [k, v] 
+#       [k, v]
 #     }
       Fmt.puts_table(headers, rows)
     end
@@ -50,26 +50,33 @@ module Prick::SubCommand
       git_rev = Git.id[0...8]
 
       rows = []
+      current_database_row = nil
       Prick.databases { |database, conn|
         row = conn.record(%(
-          select 
-              '#{database}' as "database", name, version, branch, rev, clean, environment, 
+          select
+              '#{database}' as "database", name, version, branch, rev, clean, environment,
               built_at, success
           from prick.versions
         ))
 
+        # Detect is this is the current database
+        if Prick.state.database == database
+          is_current_database = true
+          current_database_row = rows.size
+        end
+
         if row[:success]
           clean = row[:clean]
           same_revision = row[:branch] == git_branch && row[:rev] == git_rev
           up2date = fs_time <= row[:built_at]
 
           # Set state
-          row[:state] = 
+          row[:state] =
               case [clean, same_revision, up2date]
                 in [true, true, true]; "clean"    # Built from clean repo
                 in [true, true, false]; "ok"      # Clean repo but doesn't include latest uncommitted changes
                 in [true, false, _]; "clean"      # Clean repo but different revision
-                
+
                 in [false, true, true]; "edge"    # Dirty repo, work-in-progress
                 in [false, true, false]; "dirty"  # Dirty repo and doesn't include latest changes
                 in [false, false, _]; "stale"     # Dirty repo, no way back
@@ -84,12 +91,13 @@ module Prick::SubCommand
         row[:built_at] = row[:built_at]&.strftime("%Y-%m-%d %H:%M")
 
         # Add current database marker
-        last_column = (Prick.state.database == database ? "*" : "")
+        last_column = (is_current_database ? "*" : "")
+
         rows << row.values + [last_column]
       }
 
       headers = %w(database project version branch rev clean environment built success state) + [" "]
-      Fmt.puts_table(headers, rows)
+      Fmt.puts_table(headers, rows, bold: current_database_row)
     end
   end
 
@@ -100,7 +108,7 @@ module Prick::SubCommand
   def self.list_owners(format: :long)
     owners = {}
     Prick.databases.each { |database|
-#     owner = super_conn.rdbms.exist?(d) ? super_conn.rdbms.owner(d) : d 
+#     owner = super_conn.rdbms.exist?(d) ? super_conn.rdbms.owner(d) : d
       owner = super_conn.rdbms.owner(database)
       (owners[owner] ||= []) << database
     }
@@ -108,9 +116,9 @@ module Prick::SubCommand
       puts owners.keys
     else
       headers = %w(username databases) + [" "]
-      rows = owners.map { |owner, databases| 
+      rows = owners.map { |owner, databases|
         current_user_mark = (Prick.state.username == owner ? '*' : "")
-        [owner, databases.join(","), current_user_mark] 
+        [owner, databases.join(","), current_user_mark]
       }
       Fmt.puts_table(headers, rows)
     end

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

@@ -28,12 +28,12 @@ module Prick::SubCommand
 
           builder = Prick::Build::Builder.new(conn, "schema", clean, step: step)
 
-          if 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 
+            # Nuke later schemas
             # FIXME Not a good idea when sitting on a leaf schema.
             # Forced-delete could be requested using 'prick make schema'
             #
@@ -49,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

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

@@ -39,7 +39,7 @@ module Prick::SubCommand
           else
             is_build_file = false
           end
-        
+
           # Read schema from build file if possible and decide if schema should
           # be dropped beforehand
           if is_build_file
@@ -70,7 +70,7 @@ module Prick::SubCommand
 
           # Drop schema if needed
           if is_schema_rebuild
-            conn.schema.drop schema, cascade: true 
+            conn.schema.drop schema, cascade: true
           end
 
           # Create schema if absent

data/lib/prick/version.rb

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

data/lib/prick.rb

@@ -77,13 +77,13 @@ module Prick
     databases = super_conn.values %(
       select datname from pg_database where datistemplate = false order by datname
     )
-    databases.select! { |database| 
+    databases.select! { |database|
       PgConn.new(database) { |conn|
         is_prick_database = conn.exist?(%(
-            select 1 
-            from information_schema.tables 
+            select 1
+            from information_schema.tables
             where table_schema = 'prick'
-            and table_name = 'builds' 
+            and table_name = 'builds'
             limit 1
         ))
         yield(database, conn) if is_prick_database && block_given?

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: prick
 version: !ruby/object:Gem::Version
-  version: 0.39.5
+  version: 0.39.7
 platform: ruby
 authors:
 - Claus Rasmussen
 autorequire:
 bindir: exe
 cert_chain: []
-date: 2024-07-13 00:00:00.000000000 Z
+date: 2024-07-28 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: semantic