cowl 0.3 → 0.4
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.
- checksums.yaml +4 -4
- data/bin/cowl +6 -3
- data/lib/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: a27602e97cc4ee22bd45d9deab4437f11efc49f0
|
|
4
|
+
data.tar.gz: 8ccda49b10095c162c841565f530f1e504f12f85
|
|
5
5
|
SHA512:
|
|
6
|
-
metadata.gz:
|
|
7
|
-
data.tar.gz:
|
|
6
|
+
metadata.gz: 48b97f6cbf2974a3530e761e99bbc6dc25b1e856d8a87e8f0da196069f114aaf8d391f5acc1af28806ce9e0a9d8a9db2601f7ae170b3a198a7c368fab71246b6
|
|
7
|
+
data.tar.gz: 51e7bf6f8c88ac4c9dce04c8833249cc03607057f72d53298e59fee21d39ec9972cbeea2ab8d5fc68350642286f2ff201c037e68f49425a2ed10302c64b861f5
|
data/bin/cowl
CHANGED
|
@@ -33,7 +33,7 @@ def main
|
|
|
33
33
|
end
|
|
34
34
|
|
|
35
35
|
option.on('-v', '--version', 'Print version info') do
|
|
36
|
-
puts "
|
|
36
|
+
puts "cowl #{Cowl::VERSION}"
|
|
37
37
|
exit
|
|
38
38
|
end
|
|
39
39
|
end
|
|
@@ -70,7 +70,7 @@ def main
|
|
|
70
70
|
config_file = dir + File::SEPARATOR + CONFIGURATION_FILENAME
|
|
71
71
|
|
|
72
72
|
if File.exist?(config_file) then
|
|
73
|
-
configuration_dotfile = YAML.load_file(config_file)
|
|
73
|
+
configuration_dotfile = DEFAULT_CONFIGURATION.merge(YAML.load_file(config_file))
|
|
74
74
|
break
|
|
75
75
|
else
|
|
76
76
|
dir = File.expand_path("..", dir)
|
|
@@ -119,13 +119,16 @@ def main
|
|
|
119
119
|
config_file = dir + File::SEPARATOR + CONFIGURATION_FILENAME
|
|
120
120
|
|
|
121
121
|
if File.exist?(config_file) then
|
|
122
|
-
configuration_dotfile = YAML.load_file(config_file)
|
|
122
|
+
configuration_dotfile = DEFAULT_CONFIGURATION.merge(YAML.load_file(config_file))
|
|
123
123
|
break
|
|
124
124
|
else
|
|
125
125
|
dir = File.expand_path("..", dir)
|
|
126
126
|
end
|
|
127
127
|
end
|
|
128
128
|
|
|
129
|
+
# Hack to Reset configuration when changing directories
|
|
130
|
+
configuration_dotfile = DEFAULT_CONFIGURATION unless File.exist?(dir + File::SEPARATOR + CONFIGURATION_FILENAME)
|
|
131
|
+
|
|
129
132
|
# Command line flags override dotfile settings
|
|
130
133
|
configuration = configuration_dotfile.merge(configuration_flags)
|
|
131
134
|
|
data/lib/version.rb
CHANGED