naginata 0.1.6 → 0.1.7
Sign up to get free protection for your applications and to get access to all the features.
- checksums.yaml +4 -4
- data/CHANGELOG.md +6 -0
- data/lib/naginata/loader.rb +3 -2
- data/lib/naginata/shared_helpers.rb +1 -1
- data/lib/naginata/version.rb +1 -1
- metadata +1 -1
checksums.yaml
CHANGED
@@ -1,7 +1,7 @@
|
|
1
1
|
---
|
2
2
|
SHA1:
|
3
|
-
metadata.gz:
|
4
|
-
data.tar.gz:
|
3
|
+
metadata.gz: 33e22575dceeb95a2786b8500b2b282907ac1e75
|
4
|
+
data.tar.gz: 491009f7c0db0500b495263efae04b6bb1dd292d
|
5
5
|
SHA512:
|
6
|
-
metadata.gz:
|
7
|
-
data.tar.gz:
|
6
|
+
metadata.gz: 0605de3b891226b765e68fb0d2a36a97f7f86d1521a78732b01a282579f5a76c3be1443140dbcb6c2d3effaa067fc26dcadbf724624af7603670d47538827781
|
7
|
+
data.tar.gz: 260208cc2d72c8253be0a13e66c6f75ccf93070b4e4e829877f3034105a0852d6fe233ce4a2ad71de81cebb41fedd54754580302d5655b4909edbae0b52637a3
|
data/CHANGELOG.md
CHANGED
data/lib/naginata/loader.rb
CHANGED
@@ -12,13 +12,14 @@ module Naginata
|
|
12
12
|
|
13
13
|
def load_configuration
|
14
14
|
# Load defaults.rb
|
15
|
-
|
15
|
+
default = File.join(File.dirname(__FILE__), 'defaults.rb')
|
16
|
+
instance_eval File.read(default), default
|
16
17
|
# Load Naginatafile
|
17
18
|
naginatafile_path = ::Naginata::Configuration.env.fetch(:naginatafile) || find_naginatafile
|
18
19
|
if naginatafile_path.nil? or !File.file?(naginatafile_path)
|
19
20
|
raise NaginatafileNotFound, 'Could not locate Naginatafile'
|
20
21
|
else
|
21
|
-
instance_eval File.read naginatafile_path
|
22
|
+
instance_eval File.read(naginatafile_path), naginatafile_path
|
22
23
|
end
|
23
24
|
end
|
24
25
|
|
@@ -7,7 +7,7 @@ module Naginata
|
|
7
7
|
~/.naginata/Naginatafile
|
8
8
|
/etc/naginata/Naginatafile
|
9
9
|
).map{ |path| File.expand_path(path) }.find { |path| File.file?(path) }
|
10
|
-
raise NaginatafileNotFound, "Could not locate
|
10
|
+
raise NaginatafileNotFound, "Could not locate Naginatafile" unless file
|
11
11
|
return file
|
12
12
|
end
|
13
13
|
|
data/lib/naginata/version.rb
CHANGED