mikras-ruby 0.1.0 → 0.2.1

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
Files changed (4) hide show
  1. checksums.yaml +4 -4
  2. data/lib/mikras/version.rb +1 -1
  3. data/lib/mikras.rb +28 -31
  4. metadata +1 -1
checksums.yaml CHANGED
@@ -1,7 +1,7 @@
1
1
  ---
2
2
  SHA256:
3
- metadata.gz: 9a667ffdb65b67999a5dbc71744b3858183abca165eebc095eb2f7680edd07d6
4
- data.tar.gz: caf1074eecf04368b92957b1db3ed6d80effd04501603b55f7eeb3757781f3b8
3
+ metadata.gz: e5ffeaaa053fe1aa3623ecf9adcfb319fbd21961d29154f7392c8eaf56d0df45
4
+ data.tar.gz: 9b729f40576a3590691ab7069cdfbb96227a20f627d1c73d827d7aac0b9f41b7
5
5
  SHA512:
6
- metadata.gz: 5d1ba0252f64751780f6e7c5221f3b36a0e0b0aec8e7fc660b4940e5452d62157b43af134f84ad4bda668fa2cb7f7f65e3f7452d87d7183ae2c083cf4c46091e
7
- data.tar.gz: 79fc63c968524c8703ebe9a2f57c3b1009c3cdab6084757ae92c7c0872affd004ce0bb66efebb5846eb9ea375454819c642096c2998120752bf98689e037a4f5
6
+ metadata.gz: b7f126313270dc986acab2aac70e0db171b332c48308d69e0f1b883de3ffd0d5ce1468c35b16d0ff1ed65b71584d76eefdebc9bd0b6dd4bdf3e81caabafbeef7
7
+ data.tar.gz: 0fb7773cd74ec601dfb43429f7aee4f7b822309a45ec2bde68744055161a562c6ec1ce6ebdcca32dcbcddd18e1719dc8deef71b3f7c841fca6d9afc9b52f747e
@@ -1,5 +1,5 @@
1
1
  # frozen_string_literal: true
2
2
 
3
3
  module Mikras
4
- VERSION = "0.1.0"
4
+ VERSION = "0.2.1"
5
5
  end
data/lib/mikras.rb CHANGED
@@ -7,7 +7,7 @@
7
7
  # It also requries the local project file lib/mikras.rb if it exists
8
8
  #
9
9
  # require 'mikras'
10
- # require 'some-script.rb' # PRICK_DIR/lib is now in ruby load path
10
+ # require 'some-script.rb' # DIR/lib is now in ruby load path
11
11
  #
12
12
  # It should have been split into two files: prick.rb with definitions of the
13
13
  # Prick module and mikras.rb with the Mikras module but prick.rb would conflict
@@ -22,7 +22,7 @@
22
22
  # PRICK_STATE_FILE
23
23
  # PRICK_ENVIRONMENT_FILE
24
24
  #
25
- # PRICK_DIR
25
+ # DIR
26
26
  #
27
27
  # PRICK_DATABASE
28
28
  # PRICK_USERNAME
@@ -47,14 +47,14 @@ module Prick
47
47
  private
48
48
  def self.prick_state
49
49
  @prick_state ||= begin
50
- state_file_path = File.join(PRICK_DIR, PRICK_STATE_FILE)
50
+ state_file_path = File.join(DIR, PRICK_STATE_FILE)
51
51
  File.exist?(state_file_path) ? YAML.load(IO.read state_file_path) : {}
52
52
  end
53
53
  end
54
54
 
55
55
  def self.prick
56
56
  @prick ||= begin
57
- prick_file_path = File.join(PRICK_DIR, PRICK_FILE)
57
+ prick_file_path = File.join(DIR, PRICK_FILE)
58
58
  File.exist?(prick_file_path) ? YAML.load(IO.read prick_file_path) : {}
59
59
  end
60
60
  end
@@ -64,42 +64,38 @@ public
64
64
  PRICK_STATE_FILE = ".prick.state.yml"
65
65
  PRICK_ENVIRONMENT_FILE = "prick.environment.yml"
66
66
 
67
- PRICK_SCRIPT = File.realpath($0)
68
- PRICK_SCRIPTDIR = File.dirname(PRICK_SCRIPT)
67
+ scriptdir = File.dirname(File.realpath($0))
68
+ DIR = ENV['DIR'] || Find.upfind(scriptdir, PRICK_FILE)
69
+ DIR or ShellOpts::error "Can't find Mikras project directory - #{PRICK_FILE} not found"
69
70
 
70
- PRICK_DIR = ENV['PRICK_DIR'] || Find.upfind(PRICK_SCRIPTDIR, PRICK_FILE)
71
- PRICK_DIR or ShellOpts::error "Can't find Mikras project directory - #{PRICK_FILE} not found"
71
+ DATABASE = ENV['PRICK_DATABASE'] || prick_state["database"]
72
+ USERNAME = ENV['PRICK_USERNAME'] || prick_state["username"]
73
+ ENVIRONMENT = ENV['PRICK_ENVIRONMENT'] || prick_state["environment"]
72
74
 
73
- PRICK_DATABASE = ENV['PRICK_DATABASE'] || prick_state["database"]
74
- PRICK_USERNAME = ENV['PRICK_USERNAME'] || prick_state["username"]
75
- PRICK_ENVIRONMENT = ENV['PRICK_ENVIRONMENT'] || prick_state["environment"]
76
-
77
- PRICK_NAME = ENV['PRICK_NAME'] || prick['name']
75
+ NAME = ENV['PRICK_NAME'] || prick['name']
78
76
 
79
77
  # Prick subdirectories - this includes the PRICK_LIBDIR and PRICK_SHAREDIR
80
78
  # directories that are not implemented in Prick (yet)
81
- PRICK_SCHEMADIR = ENV['PRICK_SCHEMADIR'] || "#{PRICK_DIR}/schema"
82
- PRICK_BINDIR = ENV['PRICK_BINDIR'] || "#{PRICK_DIR}/bin"
83
- PRICK_LIBEXECDIR = ENV['PRICK_LIBEXECDIR'] || "#{PRICK_DIR}/libexec"
84
- PRICK_LIBDIR = ENV['PRICK_LIBDIR'] || "#{PRICK_DIR}/lib"
85
- PRICK_VARDIR = ENV['PRICK_VARDIR'] || "#{PRICK_DIR}/var"
86
- PRICK_CACHEDIR = ENV['PRICK_CACHEDIR'] || "#{PRICK_DIR}/cache"
87
- PRICK_SPOOLDIR = ENV['PRICK_SPOOLDIR'] || "#{PRICK_DIR}/spool"
88
- PRICK_TMPDIR = ENV['PRICK_TMPDIR'] || "#{PRICK_DIR}/tmp"
89
- PRICK_CLONEDIR = ENV['PRICK_CLONEDIR'] || "#{PRICK_DIR}/tmp/clones"
90
- PRICK_SPECDIR = ENV['PRICK_SPECDIR'] || "#{PRICK_DIR}/spec"
91
-
92
- $LOAD_PATH.unshift File.join(PRICK_DIR, "lib") if PRICK_DIR
79
+ SCHEMADIR = ENV['PRICK_SCHEMADIR'] || "#{DIR}/schema"
80
+ BINDIR = ENV['PRICK_BINDIR'] || "#{DIR}/bin"
81
+ LIBEXECDIR = ENV['PRICK_LIBEXECDIR'] || "#{DIR}/libexec"
82
+ LIBDIR = ENV['PRICK_LIBDIR'] || "#{DIR}/lib"
83
+ VARDIR = ENV['PRICK_VARDIR'] || "#{DIR}/var"
84
+ CACHEDIR = ENV['PRICK_CACHEDIR'] || "#{DIR}/cache"
85
+ SPOOLDIR = ENV['PRICK_SPOOLDIR'] || "#{DIR}/spool"
86
+ TMPDIR = ENV['PRICK_TMPDIR'] || "#{DIR}/tmp"
87
+ CLONEDIR = ENV['PRICK_CLONEDIR'] || "#{DIR}/tmp/clones"
88
+ SPECDIR = ENV['PRICK_SPECDIR'] || "#{DIR}/spec"
89
+
90
+ $LOAD_PATH.unshift LIBDIR
93
91
 
94
92
  def self.dump
95
93
  dumpc %w(name)
96
94
  puts
97
- dumpc %w(file state_file environment_file)
95
+ dumpc %w(prick_file prick_state_file prick_environment_file)
98
96
  puts
99
97
  dumpc %w(database username environment)
100
98
  puts
101
- dumpc %w(script scriptdir)
102
- puts
103
99
  dumpc %w(dir)
104
100
  puts
105
101
  dumpc %w(schemadir bindir libexecdir libdir vardir cachedir spooldir tmpdir clonedir specdir)
@@ -111,7 +107,7 @@ private
111
107
  def self.dumpc(*consts)
112
108
  consts = consts.flatten
113
109
  for const in consts
114
- ident = "PRICK_#{const.upcase}"
110
+ ident = const.upcase
115
111
  value = eval(ident)
116
112
  puts "#{ident}: #{value.inspect}"
117
113
  end
@@ -121,7 +117,8 @@ end
121
117
  module Mikras
122
118
  end
123
119
 
124
- if File.exist? File.join(Prick::PRICK_LIBDIR, "mikras.rb")
125
- require File.join(Prick::PRICK_LIBDIR, "mikras.rb")
120
+ # Require pre-project include file if present
121
+ if File.exist? File.join(Prick::LIBDIR, "mikras.rb")
122
+ require File.join(Prick::LIBDIR, "mikras.rb")
126
123
  end
127
124
 
metadata CHANGED
@@ -1,7 +1,7 @@
1
1
  --- !ruby/object:Gem::Specification
2
2
  name: mikras-ruby
3
3
  version: !ruby/object:Gem::Version
4
- version: 0.1.0
4
+ version: 0.2.1
5
5
  platform: ruby
6
6
  authors:
7
7
  - Claus Rasmussen