process_settings 0.13.0 → 0.13.1
Sign up to get free protection for your applications and to get access to all the features.
- checksums.yaml +4 -4
- data/bin/combine_process_settings +10 -8
- data/lib/process_settings/version.rb +1 -1
- metadata +1 -1
checksums.yaml
CHANGED
|
@@ -1,7 +1,7 @@
|
|
|
1
1
|
---
|
|
2
2
|
SHA256:
|
|
3
|
-
metadata.gz:
|
|
4
|
-
data.tar.gz:
|
|
3
|
+
metadata.gz: 60447e2f039f0d12d6f35a21b8b823c9f9dea2294900c0d3310ccf40dfe0a3e1
|
|
4
|
+
data.tar.gz: dceadf48d13853e709d5b35bfd5740551cc3baabd4df07e0d3b64c855f5caba7
|
|
5
5
|
SHA512:
|
|
6
|
-
metadata.gz:
|
|
7
|
-
data.tar.gz:
|
|
6
|
+
metadata.gz: d33df4bfb607626f41f8c0059b821caab6b6f50a900aef9a6aefd5f6e47c562e44d5c32f75b99412e22c7375c74dbf39c37c4e0812896f1ac84363b2b01bfe84
|
|
7
|
+
data.tar.gz: 18a90e814c09e2666da73970998a8eda9bca90fe216ef7bf4c7d2b463cafb77b42a2ba07e478eaaca186f422a43b4a4859c2ea7ba56a647a6ff66621fb1fefd1
|
|
@@ -10,7 +10,6 @@ require_relative '../lib/process_settings/targeted_settings'
|
|
|
10
10
|
|
|
11
11
|
PROGRAM_NAME = File.basename($PROGRAM_NAME)
|
|
12
12
|
SETTINGS_FOLDER = 'settings'
|
|
13
|
-
MINIMUM_LIBYAML_VERSION = Gem::Version.new('0.2.6') # So that null (nil) values don't have trailing spaces.
|
|
14
13
|
|
|
15
14
|
def end_marker(version)
|
|
16
15
|
{
|
|
@@ -76,20 +75,23 @@ def add_warning_comment(yaml, root_folder, program_name, settings_folder)
|
|
|
76
75
|
yaml.sub("\n", "\n" + warning_comment)
|
|
77
76
|
end
|
|
78
77
|
|
|
78
|
+
MINIMUM_LIBYAML_VERSION = '0.2.5' # So that null (nil) values don't have trailing spaces.
|
|
79
|
+
|
|
79
80
|
def check_libyaml_version
|
|
80
|
-
Gem::Version.new(Psych::LIBYAML_VERSION)
|
|
81
|
+
if Gem::Version.new(Psych::LIBYAML_VERSION) < Gem::Version.new(MINIMUM_LIBYAML_VERSION)
|
|
81
82
|
warn <<~EOS
|
|
82
83
|
|
|
83
84
|
#{PROGRAM_NAME} error: libyaml version #{Psych::LIBYAML_VERSION} must be at least #{MINIMUM_LIBYAML_VERSION}. Try:
|
|
84
|
-
|
|
85
|
+
|
|
85
86
|
brew update && upgrade libyaml
|
|
86
|
-
|
|
87
|
+
|
|
87
88
|
You may also need:
|
|
88
|
-
|
|
89
|
+
|
|
89
90
|
gem install psych -- --enable-bundled-libyaml
|
|
90
91
|
EOS
|
|
91
92
|
|
|
92
|
-
|
|
93
|
+
exit(1)
|
|
94
|
+
end
|
|
93
95
|
end
|
|
94
96
|
|
|
95
97
|
|
|
@@ -97,10 +99,10 @@ end
|
|
|
97
99
|
# main
|
|
98
100
|
#
|
|
99
101
|
|
|
100
|
-
check_libyaml_version
|
|
101
|
-
|
|
102
102
|
options = parse_options(ARGV.dup)
|
|
103
103
|
|
|
104
|
+
check_libyaml_version
|
|
105
|
+
|
|
104
106
|
combined_settings = read_and_combine_settings(Pathname.new(options.root_folder) + SETTINGS_FOLDER)
|
|
105
107
|
|
|
106
108
|
version_number = options.version || default_version_number(options.initial_filename)
|