mikras_utils 0.4.1 → 0.4.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 90f1bd3e1b61aa3d1e5e922773e7b6df03b7ccddc8f86ee9694912cde85eca88
-  data.tar.gz: 2420e824ca51a391afdc736d1bf6222f608c4ae0cb5a5a03242db05541783610
+  metadata.gz: 3ab95c37caacbe1ab7ed069d6d6fb83b6a234e1b64e5206e1a5382d5e7eb6507
+  data.tar.gz: a778c6dd04db370c1be6b6af571929dbadc2b5220148726c21da74527a84693a
 SHA512:
-  metadata.gz: '08f53b9af5af200bf9d8477e50fd66e59a09063d819f5518d5ff12dcbab2f50ab8232f01da55c8486f3c4f6a4732bfdb8fdf9a8bc369f4eae176111581eb7bb6'
-  data.tar.gz: 4f4b1e9deb5f42c20ece3156888c7254351922d3b693422e3627b4521c4ab4548d63a7db84bc2ab120d74f4672febb820342886a70fea4bc3100b544399ea7a6
+  metadata.gz: 84004bdb6c46d4f41a992fc5929d557704b886a975ba167011a2afd8e867cdf0787703a8cc12aa61443a4987b8b05a7a8c70595714bafcd81510cd37524c309d
+  data.tar.gz: 3bece44a7fba65f2db3a7016a9a9d26595c1e7d97b4c1b5759628977e23cd0db980307c6d73987dbb75bd74cc3f0184fd9cd7440d2c1d571573aa90df4af62d9

data/exe/mkacl

@@ -58,7 +58,7 @@ SPEC = %(
 require 'yaml'
 require 'shellopts'
 
-require_relative '../lib/mikras_utils/mikras.rb'
+require_relative '../lib/mikras.rb'
 require_relative '../lib/mikras_utils/mkacl.rb'
 
 PRICK_STATE_FILE = "prick.state.yml"

data/lib/mikras.rb

@@ -0,0 +1,40 @@
+
+require 'yaml'
+
+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"
+end
+
+module Mikras
+  # Find database/username. Called from scripts that may take a database and an
+  # 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
+  #
+  def self.credentials(database_argument, username_argument = nil)
+    if database_argument
+      database = database_argument
+      username = username_argument || database
+    elsif ENV['PRICK_DATABASE']
+      database = ENV['PRICK_DATABASE']
+      username = username_argument || ENV['PRICK_USERNAME'] || database
+    else
+      if File.exist?(Prick::PRICK_STATE_FILE)
+        prick_state = YAML.load(IO.read Prick::PRICK_STATE_FILE)
+        database = prick_state["database"]
+        username = prick_state["username"]
+      else
+        database = ENV["USER"]
+        username = ENV["USER"]
+      end
+    end
+    [database, username]
+  end
+end
+

data/lib/mikras_utils/version.rb

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

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: mikras_utils
 version: !ruby/object:Gem::Version
-  version: 0.4.1
+  version: 0.4.3
 platform: ruby
 authors:
 - Claus Rasmussen
 autorequire:
 bindir: exe
 cert_chain: []
-date: 2025-01-01 00:00:00.000000000 Z
+date: 2025-01-08 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: pg_conn
@@ -86,8 +86,8 @@ files:
 - exe/mikras_utils
 - exe/mkacl
 - exe/rls
+- lib/mikras.rb
 - lib/mikras_utils.rb
-- lib/mikras_utils/mikras.rb
 - lib/mikras_utils/mkacl.rb
 - lib/mikras_utils/mkacl/analyzer.rb
 - lib/mikras_utils/mkacl/generator.rb

data/lib/mikras_utils/mikras.rb

@@ -1,24 +0,0 @@
-
-module Mikras
-  def self.credentials(database_argument)
-    if database_argument
-      database = database_argument
-      username = database
-    else
-      username ||= database || ENV['PRICK_USERNAME']
-      database ||= ENV['PRICK_DATABASE']
-
-      if database.nil? && File.exist?(PRICK_STATE_FILE)
-        prick_state = YAML.load(IO.read PRICK_STATE_FILE)
-        database = prick_state["database"]
-        username = prick_state["username"]
-      else
-        database ||= ENV["USER"]
-        username ||= database
-      end
-    end
-    [database, username]
-  end
-end
-
-