mikras_utils 0.5.0 → 0.5.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 46a6caa587baa5d73d1eee1af5a8cf764fc64e70be223f0b66aae6f1f41c6b91
-  data.tar.gz: a13096682ea8ec58b36b0154922b7e56fa914e51a756eda8a0f434106e8b1cc2
+  metadata.gz: 5ed0f08aeac113ce1baaab8a61f252fc80db284204cf6092ef9a4396f0cbe90a
+  data.tar.gz: '09bbf4ada5bb30f2ccd9b69ce88fbedc77c36cdb6518a485a3d605c3df0df7c5'
 SHA512:
-  metadata.gz: ac6234c5bcdbc6b2bcf1301c8a6b2c23c4a71a43abaeb47e37c3908126c3d8bfd25bafa439d7ec59a3070f6f5b4706edafc454191a4725d46ab487dad0bf1686
-  data.tar.gz: 005a114875b9eedbbf2d87d20fa752d8fbde45fd18773bee8d7a7f16373e80d65f0d9a8b9546c3bff67b3c9f429a3119cef8d13e96dbaa916ca6bd19d3f6aa51
+  metadata.gz: 94326cd108d93deebb637cf69684679cd16d20e760c63ad56e60a0f2d2a3b7af4d5a3cfbe58900f705c7eb1066979bffebe6751a14ae916896a4eed83d394385
+  data.tar.gz: f19ba5e3ab24f4874a1a63d9ea8389bcc9a3a3c2e3faf557c497f9f59b4b5704f622d1542679c2ebd21355389652c3708d94e49420da6821b5390f767db4794a

data/lib/mikras.rb

@@ -1,6 +1,17 @@
 
 require 'yaml'
 
+module Find # Monkey patching standard library
+  def self.upfind(dir, file)
+    loop do
+      return dir if File.exist? File.join(dir, file)
+      return nil if dir == "/"
+      dir = File.dirname(dir)
+    end
+    return nil
+  end
+end
+
 module Prick
   # FIXME Hardcoded to avoid dragging in the whole prick environment. Should be
   # kept in sync with Prick::PRICK_STATE_FILE
@@ -8,13 +19,20 @@ module Prick
   # TODO: Make prick.rb includable
   #
   PRICK_STATE_FILE = ".prick.state.yml"
+  PRICK_DIR = Find.upfind(Dir.getwd, PRICK_STATE_FILE)
+  PRICK_STATE_PATH = PRICK_DIR && File.join(PRICK_DIR, PRICK_STATE_FILE)
 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
   # 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
+  # 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)
@@ -25,8 +43,8 @@ module Mikras
       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)
+      if Prick::PRICK_STATE_PATH
+        prick_state = YAML.load(IO.read Prick::PRICK_STATE_PATH)
         database = prick_state["database"]
         username = prick_state["username"]
       else

data/lib/mikras_utils/version.rb

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

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: mikras_utils
 version: !ruby/object:Gem::Version
-  version: 0.5.0
+  version: 0.5.1
 platform: ruby
 authors:
 - Claus Rasmussen
 autorequire:
 bindir: exe
 cert_chain: []
-date: 2025-01-14 00:00:00.000000000 Z
+date: 2025-01-20 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: pg_conn