mikras-ruby 0.1.0 → 0.2.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 9a667ffdb65b67999a5dbc71744b3858183abca165eebc095eb2f7680edd07d6
-  data.tar.gz: caf1074eecf04368b92957b1db3ed6d80effd04501603b55f7eeb3757781f3b8
+  metadata.gz: 6582d229ae4eec92af92439e72bbdb9a78463824f3e09c4dbcc1384adc7778f8
+  data.tar.gz: bcdf4a1d8ab52dad2ef0822f3ec8358e45997a03beafe29e8bc97067da81dc20
 SHA512:
-  metadata.gz: 5d1ba0252f64751780f6e7c5221f3b36a0e0b0aec8e7fc660b4940e5452d62157b43af134f84ad4bda668fa2cb7f7f65e3f7452d87d7183ae2c083cf4c46091e
-  data.tar.gz: 79fc63c968524c8703ebe9a2f57c3b1009c3cdab6084757ae92c7c0872affd004ce0bb66efebb5846eb9ea375454819c642096c2998120752bf98689e037a4f5
+  metadata.gz: 79e2602d0afd2e3618cf31dc21a33a6689aba17bcb3236ff070a337084b1ed69d5579a6cda1bd4e1a7df0bfa8e0540bf8d9a8c5520c0f7ee7eebd735022c1385
+  data.tar.gz: 2315841948c97cd46b611c023b4fe37522753ee8d3b831f1d5b889bcc8ad72bc3640e7a26360311fcdf32b6503243b1229bb65c43525bef867c091aff6de5020

data/lib/mikras/version.rb

@@ -1,5 +1,5 @@
 # frozen_string_literal: true
 
 module Mikras
-  VERSION = "0.1.0"
+  VERSION = "0.2.0"
 end

data/lib/mikras.rb

@@ -7,7 +7,7 @@
 # It also requries the local project file lib/mikras.rb if it exists
 #
 #   require 'mikras'
-#   require 'some-script.rb' # PRICK_DIR/lib is now in ruby load path
+#   require 'some-script.rb' # DIR/lib is now in ruby load path
 #
 # It should have been split into two files: prick.rb with definitions of the
 # Prick module and mikras.rb with the Mikras module but prick.rb would conflict
@@ -22,7 +22,7 @@
 #   PRICK_STATE_FILE
 #   PRICK_ENVIRONMENT_FILE
 #
-#   PRICK_DIR
+#   DIR
 #
 #   PRICK_DATABASE
 #   PRICK_USERNAME
@@ -47,14 +47,14 @@ module Prick
 private
   def self.prick_state
     @prick_state ||= begin
-      state_file_path = File.join(PRICK_DIR, PRICK_STATE_FILE)
+      state_file_path = File.join(DIR, PRICK_STATE_FILE)
       File.exist?(state_file_path) ? YAML.load(IO.read state_file_path) : {}
     end
   end
 
   def self.prick
     @prick ||= begin
-      prick_file_path = File.join(PRICK_DIR, PRICK_FILE)
+      prick_file_path = File.join(DIR, PRICK_FILE)
       File.exist?(prick_file_path) ? YAML.load(IO.read prick_file_path) : {}
     end
   end
@@ -64,32 +64,30 @@ public
   PRICK_STATE_FILE = ".prick.state.yml"
   PRICK_ENVIRONMENT_FILE = "prick.environment.yml"
 
-  PRICK_SCRIPT = File.realpath($0)
-  PRICK_SCRIPTDIR = File.dirname(PRICK_SCRIPT)
+  scriptdir = File.dirname(File.realpath($0))
+  DIR = ENV['DIR'] || Find.upfind(scriptdir, PRICK_FILE)
+  DIR or ShellOpts::error "Can't find Mikras project directory - #{PRICK_FILE} not found"
 
-  PRICK_DIR = ENV['PRICK_DIR'] || Find.upfind(PRICK_SCRIPTDIR, PRICK_FILE)
-  PRICK_DIR or ShellOpts::error "Can't find Mikras project directory - #{PRICK_FILE} not found"
+  DATABASE = ENV['PRICK_DATABASE'] || prick_state["database"]
+  USERNAME = ENV['PRICK_USERNAME'] || prick_state["username"]
+  ENVIRONMENT = ENV['PRICK_ENVIRONMENT'] || prick_state["environment"]
 
-  PRICK_DATABASE = ENV['PRICK_DATABASE'] || prick_state["database"]
-  PRICK_USERNAME = ENV['PRICK_USERNAME'] || prick_state["username"]
-  PRICK_ENVIRONMENT = ENV['PRICK_ENVIRONMENT'] || prick_state["environment"]
-
-  PRICK_NAME = ENV['PRICK_NAME'] || prick['name']
+  NAME = ENV['PRICK_NAME'] || prick['name']
 
   # Prick subdirectories - this includes the PRICK_LIBDIR and PRICK_SHAREDIR
   # directories that are not implemented in Prick (yet)
-  PRICK_SCHEMADIR = ENV['PRICK_SCHEMADIR'] || "#{PRICK_DIR}/schema"
-  PRICK_BINDIR = ENV['PRICK_BINDIR'] || "#{PRICK_DIR}/bin"
-  PRICK_LIBEXECDIR = ENV['PRICK_LIBEXECDIR'] || "#{PRICK_DIR}/libexec"
-  PRICK_LIBDIR = ENV['PRICK_LIBDIR'] || "#{PRICK_DIR}/lib"
-  PRICK_VARDIR = ENV['PRICK_VARDIR'] || "#{PRICK_DIR}/var"
-  PRICK_CACHEDIR = ENV['PRICK_CACHEDIR'] || "#{PRICK_DIR}/cache"
-  PRICK_SPOOLDIR = ENV['PRICK_SPOOLDIR'] || "#{PRICK_DIR}/spool"
-  PRICK_TMPDIR = ENV['PRICK_TMPDIR'] || "#{PRICK_DIR}/tmp"
-  PRICK_CLONEDIR = ENV['PRICK_CLONEDIR'] || "#{PRICK_DIR}/tmp/clones"
-  PRICK_SPECDIR = ENV['PRICK_SPECDIR'] || "#{PRICK_DIR}/spec"
-
-  $LOAD_PATH.unshift File.join(PRICK_DIR, "lib") if PRICK_DIR
+  SCHEMADIR = ENV['PRICK_SCHEMADIR'] || "#{DIR}/schema"
+  BINDIR = ENV['PRICK_BINDIR'] || "#{DIR}/bin"
+  LIBEXECDIR = ENV['PRICK_LIBEXECDIR'] || "#{DIR}/libexec"
+  LIBDIR = ENV['PRICK_LIBDIR'] || "#{DIR}/lib"
+  VARDIR = ENV['PRICK_VARDIR'] || "#{DIR}/var"
+  CACHEDIR = ENV['PRICK_CACHEDIR'] || "#{DIR}/cache"
+  SPOOLDIR = ENV['PRICK_SPOOLDIR'] || "#{DIR}/spool"
+  TMPDIR = ENV['PRICK_TMPDIR'] || "#{DIR}/tmp"
+  CLONEDIR = ENV['PRICK_CLONEDIR'] || "#{DIR}/tmp/clones"
+  SPECDIR = ENV['PRICK_SPECDIR'] || "#{DIR}/spec"
+
+  $LOAD_PATH.unshift LIBDIR
 
   def self.dump
     dumpc %w(name)
@@ -98,8 +96,6 @@ public
     puts
     dumpc %w(database username environment)
     puts
-    dumpc %w(script scriptdir)
-    puts
     dumpc %w(dir)
     puts
     dumpc %w(schemadir bindir libexecdir libdir vardir cachedir spooldir tmpdir clonedir specdir)
@@ -121,6 +117,7 @@ end
 module Mikras
 end
 
+# Require pre-project include file if present
 if File.exist? File.join(Prick::PRICK_LIBDIR, "mikras.rb")
   require File.join(Prick::PRICK_LIBDIR, "mikras.rb")
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: mikras-ruby
 version: !ruby/object:Gem::Version
-  version: 0.1.0
+  version: 0.2.0
 platform: ruby
 authors:
 - Claus Rasmussen