prick 0.37.0 → 0.39.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: aa15e8c866ef97ee0ba04de08ca05ea38b5cf47d6cb156e09be24d3e10a0c8d5
-  data.tar.gz: 550a8f65c73c1148fa8f9359dbfb7299d0ae2ca4c8acfc3aea7c82f7254c399f
+  metadata.gz: 8cc939a1ea84c9e16f586cc4d3ce2a17c63e188996a46cb1b0e8f1b75c25eec8
+  data.tar.gz: e379b3a003ceed1b49240a1083f0db8f8cc2fb80d9c4a2800cd82e1005eba03f
 SHA512:
-  metadata.gz: 0b6ccea7c28cb6068597899dc8f740629fc7e3d26d7457a06c7c0e76abca1987cf63e422f2be482300c8b44474e0cda941510c1e97653ec4af064c57bb79eea4
-  data.tar.gz: 2e2685d9b25938dc291204eaa7735a167cbd7014219678dddb86ed6e02aa90c960de3aaf8e79fbe64becfff198d435c5ad05aa1657856ce1e1ea5bacee1de9d2
+  metadata.gz: 20c6a454644bf1bc6770eb56cebf20c3bfda8fcde9d70dd2ce0fae7290f47da1b8a5a9254c0b5f04fde8042d38dd0e2f97513fd1b456eff5f49006af36150181
+  data.tar.gz: 8b16d64e31172c373d80abd5a5b8303a63888b3a9e5a999e60817a218d3d32ddb12b752bbb1c82057392be39f5ec0cd4811d05464b39f00271fb4deddf06f7a7

data/exe/prick

@@ -140,6 +140,10 @@ SPEC = %(
 
       The --schema option sets the current schema before executing the PATH
 
+  touch! -- [SUCCESS]
+      Record a build. SUCCESS can be 'true' (default) or 'false'.  'touch' is
+      used by external build processes that doesn't involve prick
+
   bash! --main
       Emit a bash script to build the database. The script is constructed from
       the build attributes in the environment file
@@ -399,6 +403,11 @@ begin
           database, username, args.expect(1), 
           step: cmd.step?, timer: cmd.time?, dump: dump, schema: cmd.schema)
 
+    when :touch!
+      success = args.expect(0..1) || 'true'
+      %w(true false).include?(success) or ShellOpts.error "Illegal argument '#{success}'"
+      Prick::SubCommand.touch(success == "true")
+
     when :bash!
       args.expect(0)
       clean_pg_meta_cache
@@ -413,6 +422,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!

data/lib/prick/local/command.rb

@@ -97,8 +97,8 @@ module Command
   # will instead return a tuple of stdout/stderr lines. If :stderr is false,
   # stderr is ignored and is the same as adding "2>/dev/null" to the command
   #
-  # #command raises a Command::Error exception if the command returns with an exit
-  # code != 0 unless :fail is false. In that case the the exit code can be
+  # #command raises a Command::Error exception if the command returns with an
+  # exit code != 0 unless :fail is false. In that case the the exit code can be
   # fetched from Command::status
   #
   def command(env = {}, cmd, stdin: nil, stderr: nil, fail: true)

data/lib/prick/local/git.rb

@@ -62,6 +62,8 @@ module Prick
     # Access to branch methods
     def self.branch() Branch end
 
+    # List files in repository
+    def self.list() Command.command("git ls-files") end
 
     module Tag
       # The associated commit ID of a tag

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,13 +279,23 @@ 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)
       end
     end
 
+    def save_build(success = true)
+      insert_record(
+        "prick.builds",
+            name: name,
+            version: version.to_s, prick: Prick::VERSION,
+            branch: branch, rev: rev(kind: :short), clean: clean?,
+            environment: environment,
+            success: success)
+    end
+
     def dump
       puts "State"
       indent {

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

@@ -42,7 +42,10 @@ module Prick::SubCommand
     if format == :short
       puts Prick.databases
     else
-      fs_time = `find . -type f -not -path '*/\.*' -printf '%TF %TT\n' | sort -r | head -n 1`
+      # Timestamp of newest file under git control
+      newest_file = Command.command("ls -tr #{Git.list.join(" ")} | tail -1").last
+      fs_time = File.mtime(newest_file)
+
       git_branch = Git.branch.current
       git_rev = Git.id[0...8]
 
@@ -51,10 +54,7 @@ module Prick::SubCommand
         row = conn.record(%(
           select 
               '#{database}' as "database", name, version, branch, rev, clean, environment, 
-              to_char(
-                  built_at at time zone 'UTC' at time zone current_setting('TimeZone'), 
-                  'YYYY-MM-DD HH24:MI') as "built_at",
-              success
+              built_at, success
           from prick.versions
         ))
 
@@ -62,6 +62,8 @@ module Prick::SubCommand
           clean = row[:clean]
           same_revision = row[:branch] == git_branch && row[:rev] == git_rev
           up2date = fs_time <= row[:built_at]
+
+          # Set state
           row[:state] = 
               case [clean, same_revision, up2date]
                 in [true, true, true]; "clean"    # Clean repo
@@ -76,6 +78,10 @@ module Prick::SubCommand
           row[:state] = "-"
         end
 
+        # Convert built_at to string
+        row[:built_at] = row[:built_at].strftime("%Y-%m-%d %H:%M")
+
+        # Add current database marker
         last_column = (Prick.state.database == database ? "*" : "")
         rows << row.values + [last_column]
       }

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

@@ -0,0 +1,9 @@
+#!/usr/bin/env ruby
+
+require_relative '../builder/builder.rb'
+
+module Prick::SubCommand
+  def self.touch(success)
+    Prick.state.save_build(success)
+  end
+end

data/lib/prick/version.rb

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

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: prick
 version: !ruby/object:Gem::Version
-  version: 0.37.0
+  version: 0.39.0
 platform: ruby
 authors:
 - Claus Rasmussen
 autorequire:
 bindir: exe
 cert_chain: []
-date: 2024-05-10 00:00:00.000000000 Z
+date: 2024-06-04 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: semantic
@@ -235,6 +235,7 @@ files:
 - lib/prick/subcommand/prick-setup.rb
 - lib/prick/subcommand/prick-snapshot.rb
 - lib/prick/subcommand/prick-teardown.rb
+- lib/prick/subcommand/prick-touch.rb
 - lib/prick/subcommand/subcommand.rb
 - lib/prick/version.rb
 - prick.gemspec