mikras_utils 0.16.1 → 0.16.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: ccdc04a2de611e4b1fe6b0e611fe9cc3c3751081045f0073044ff53e8dc53371
-  data.tar.gz: bbc7c517c0a35beba4978ae97d3a6b0f7c1958c41143b28b98ce579997fdc983
+  metadata.gz: 8bd927c484d22c11d47881a873a533ee74ac69aee14cfaee765bca8ed538ab8d
+  data.tar.gz: fff71f2022cf4707efe4546c6ef44308339c25e88822b23a939604da4cde1270
 SHA512:
-  metadata.gz: 5e9e973fde3d6aeb5ab774a26068d1505383e3d36e37c55680ca7ad2ae340228dc55cd2f186e330385b0dfa220b9d04b94e6cbd7c5089dc49221bdfabbb60a92
-  data.tar.gz: 2c860738ae8dba73d4844a18bee439bd541f0329fbbdccf3235e8a4d90223bb309489de539443b2613241afeba2ef47be03ff817e33d79b810717a33bb5ff179
+  metadata.gz: 125053f30f386c93b59d17118279628a3bf0018334fd0865168f329bde96ad31d02b9301a41899b48154d219192119b5abae27f5b5a9f58c2f5ab036c874177e
+  data.tar.gz: 46a12421cacd790d25346e0ce6e1cd145bf4da45cda083f45cb58eae7332cac1ef866e5ba8304f443d75cfe770b21492d40c4ffbc9b71c826364a30b4f4e9e01

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

@@ -24,16 +24,23 @@ module Prick
 end
 
 module Mikras
+  MIKRAS_DIR = Prick::PRICK_DIR
   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)
+  #   database, username = Mikras.credentials args.expect(0..2) or
+  #       ShellOpts.error "Can't find database/username"
   #
   def self.credentials(database_argument, username_argument = nil)
     if database_argument
@@ -48,8 +55,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.16.2"
 end

metadata

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