boxen 1.5.1 → 1.5.2
Sign up to get free protection for your applications and to get access to all the features.
- data/boxen.gemspec +1 -1
- data/lib/facter/boxen.rb +7 -7
- metadata +1 -1
data/boxen.gemspec
CHANGED
@@ -2,7 +2,7 @@
|
|
2
2
|
|
3
3
|
Gem::Specification.new do |gem|
|
4
4
|
gem.name = "boxen"
|
5
|
-
gem.version = "1.5.
|
5
|
+
gem.version = "1.5.2"
|
6
6
|
gem.authors = ["John Barnette", "Will Farrington"]
|
7
7
|
gem.email = ["jbarnette@github.com", "wfarr@github.com"]
|
8
8
|
gem.description = "Manage Mac development boxes with love (and Puppet)."
|
data/lib/facter/boxen.rb
CHANGED
@@ -22,13 +22,13 @@ Dir["#{config.homedir}/config/facts/*.json"].each do |file|
|
|
22
22
|
facts.merge! JSON.parse File.read file
|
23
23
|
end
|
24
24
|
|
25
|
-
if File.
|
26
|
-
|
27
|
-
|
28
|
-
|
29
|
-
|
30
|
-
|
31
|
-
|
25
|
+
if File.directory?(dot_boxen) && File.file?(user_config)
|
26
|
+
facts.merge! JSON.parse(File.read(user_config))
|
27
|
+
end
|
28
|
+
|
29
|
+
if File.file?(dot_boxen)
|
30
|
+
warn "DEPRECATION: ~/.boxen is deprecated and will be removed in 2.0; use ~/.boxen/config.json instead!"
|
31
|
+
facts.merge! JSON.parse(File.read(dot_boxen))
|
32
32
|
end
|
33
33
|
|
34
34
|
facts.each { |k, v| Facter.add(k) { setcode { v } } }
|