mikras_utils 0.16.1 → 0.17.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: ccdc04a2de611e4b1fe6b0e611fe9cc3c3751081045f0073044ff53e8dc53371
-  data.tar.gz: bbc7c517c0a35beba4978ae97d3a6b0f7c1958c41143b28b98ce579997fdc983
+  metadata.gz: 1c816a28ca581275c40dcf3d0b66bf42948bcac6366b5cae0f3409cb58598dcd
+  data.tar.gz: 101f1ec84af04826df059cbfa1cd189d74c5d701da8e462c98201ea0f684e0be
 SHA512:
-  metadata.gz: 5e9e973fde3d6aeb5ab774a26068d1505383e3d36e37c55680ca7ad2ae340228dc55cd2f186e330385b0dfa220b9d04b94e6cbd7c5089dc49221bdfabbb60a92
-  data.tar.gz: 2c860738ae8dba73d4844a18bee439bd541f0329fbbdccf3235e8a4d90223bb309489de539443b2613241afeba2ef47be03ff817e33d79b810717a33bb5ff179
+  metadata.gz: 32c2be8417aa64fc1826e45fc5e75c2b97e12b1b1d3cd9d7609c8fbebbb3bee712ed3fd210293031febe0b4d9818779d7eb069549ec4d16ac1f469c11894bb0c
+  data.tar.gz: b0e550f9ef58738abfd7274d1c53e556ea4e2a096559cb4981f35e14abaa0f28b39d39a8cfdc8ffbad1d8ffe96f1eb2aab7567db6a8dd994d886a40d55381f98

data/exe/mkacl

@@ -61,8 +61,6 @@ require 'shellopts'
 require_relative '../lib/mikras.rb'
 require_relative '../lib/mikras_utils/mkacl.rb'
 
-PRICK_STATE_FILE = "prick.state.yml"
-
 opts, args = ShellOpts::process(SPEC, ARGV)
 file = args.extract(-1)
 database = args.extract(0..1)

data/lib/mikras.rb

@@ -1,5 +1,17 @@
 
+# General include file for Mikras scripts that sets up core constants and ruby
+# include path. It is installed in a gem so that it can be found before the
+# environment has been initialized
+#
+#   require 'mikras'
+#   require 'mikras/lib/some-script.rb'
+#
+# It defines the Prick constants: PRICK_DIR, PRICK_STATE_FILE, PRICK_ENVIRONMENT_FILE
+#
+
 require 'yaml'
+require 'shellopts'
+require 'pg_conn'
 
 module Find # Monkey patching standard library
   def self.upfind(dir, file)
@@ -13,27 +25,34 @@ module Find # Monkey patching standard library
 end
 
 module Prick
-  # FIXME Hardcoded to avoid dragging in the whole prick environment. Should be
-  # kept in sync with Prick::PRICK_STATE_FILE
-  #
-  # TODO: Make prick.rb includable
-  #
   PRICK_STATE_FILE = ".prick.state.yml"
+  PRICK_ENVIRONMENT_FILE = "prick.environment.yml"
   PRICK_DIR = Find.upfind(Dir.getwd, PRICK_STATE_FILE)
-  PRICK_STATE_PATH = PRICK_DIR && File.join(PRICK_DIR, PRICK_STATE_FILE)
+
+  $LOAD_PATH.unshift File.join(PRICK_DIR, "lib") if PRICK_DIR
 end
 
+__END__
+
+
 module Mikras
   MIKRAS_LIBDIR = Prick::PRICK_DIR && File.join(Prick::PRICK_DIR, "lib")
 
   # Add project-dir/lib to search path
   $LOAD_PATH.unshift MIKRAS_LIBDIR if MIKRAS_LIBDIR
 
-  # Find database/username. Called from scripts that may take a database and an
+  # Find database/username. Called from scripts that takes an optinal database and
   # username argument. If the arguments are absent, the database/username is
   # initialized using the PRICK_DATABASE and PRICK_USERNAME environment
-  # variables and if they are also absent, the PRICK_STATE_FILE is read. If
-  # everything fails, the user's username is used as the database and username
+  # variables and if they are also absent, the PRICK_STATE_FILE is read.
+  # Returns nil if everything fails
+  #
+  # Should typically be called like this
+  #
+  #   opts, args = ShellOpts.parse(SPEC, ARGV)
+  #   credentials = Mikras.credentials(args.expect(0..2)) or
+  #       ShellOpts.error "Can't find database"
+  #   db = PgConn.new(*credentials)
   #
   def self.credentials(database_argument, username_argument = nil)
     if database_argument
@@ -48,8 +67,9 @@ module Mikras
         database = prick_state["database"]
         username = prick_state["username"]
       else
-        database = ENV["USER"]
-        username = ENV["USER"]
+        return nil
+#       database = ENV["USER"]
+#       username = ENV["USER"]
       end
     end
     [database, username]

data/lib/mikras_utils/version.rb

@@ -1,5 +1,5 @@
 # frozen_string_literal: true
 
 module MikrasUtils
-  VERSION = "0.16.1"
+  VERSION = "0.17.0"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: mikras_utils
 version: !ruby/object:Gem::Version
-  version: 0.16.1
+  version: 0.17.0
 platform: ruby
 authors:
 - Claus Rasmussen
 autorequire:
 bindir: exe
 cert_chain: []
-date: 2025-03-22 00:00:00.000000000 Z
+date: 2025-05-06 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: pg_conn