process_settings 0.10.1 → 0.10.2
Sign up to get free protection for your applications and to get access to all the features.
- checksums.yaml +4 -4
- data/bin/diff_process_settings +10 -6
- 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: 8ce718980ddaa00d22cd609a921834e2d9d175086ac8564b26c85449cbc84189
|
4
|
+
data.tar.gz: aa33fa784feeb0dda12a9787502fec4b044022b2f10ee5c859202d95700a1c65
|
5
5
|
SHA512:
|
6
|
-
metadata.gz:
|
7
|
-
data.tar.gz:
|
6
|
+
metadata.gz: e1c47ff17b641fd0699bef1546de45f5910aa6458d08c97c8dabc697c25a491c0741d58540062f1ef81b68c2d87f120ce0b12e15dececdc2ffae16a9b1f3b54b
|
7
|
+
data.tar.gz: 6a4df9a86fc29231ff414f0f0448da615682d78e8425b4e5aa6f672b7d6a63a334610be11f08853cf58fc51d4976b63ee2e57aaaf2c84cd2eab0a856b0636fdb
|
data/bin/diff_process_settings
CHANGED
@@ -7,6 +7,7 @@
|
|
7
7
|
require 'fileutils'
|
8
8
|
require 'optparse'
|
9
9
|
require 'ostruct'
|
10
|
+
require 'tempfile'
|
10
11
|
|
11
12
|
PROGRAM_NAME = File.basename($PROGRAM_NAME)
|
12
13
|
|
@@ -41,19 +42,22 @@ input_files =
|
|
41
42
|
end
|
42
43
|
end
|
43
44
|
|
44
|
-
|
45
|
+
tempfile_a = Tempfile.new(['combined_process_settings', '.yml'], 'tmp').path
|
46
|
+
tempfile_b = Tempfile.new(['combined_process_settings', '.yml'], 'tmp').path
|
47
|
+
|
48
|
+
system("rm -f #{tempfile_a} #{tempfile_b}")
|
45
49
|
|
46
50
|
# remove the meta-data from the end
|
47
|
-
system("sed '/^- meta:$/,$d' #{input_files[0]} >
|
48
|
-
system("sed '/^- meta:$/,$d' #{input_files[1]} >
|
51
|
+
system("sed '/^- meta:$/,$d' #{input_files[0]} > #{tempfile_a}")
|
52
|
+
system("sed '/^- meta:$/,$d' #{input_files[1]} > #{tempfile_b}")
|
49
53
|
|
50
54
|
if options.silent
|
51
|
-
system("cmp --silent
|
55
|
+
system("cmp --silent #{tempfile_a} #{tempfile_b}")
|
52
56
|
else
|
53
|
-
system("diff -c
|
57
|
+
system("diff -c #{tempfile_a} #{tempfile_b} | sed '1,3d'")
|
54
58
|
end
|
55
59
|
exit_code = $?.exitstatus
|
56
60
|
|
57
|
-
system("rm -f
|
61
|
+
system("rm -f #{tempfile_a} #{tempfile_b}")
|
58
62
|
|
59
63
|
exit(exit_code)
|