process_settings 0.9.0 → 0.10.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 7ace753f727c3aea91291d906951ff86da6750d6aa4b0db1022ad6155dce42dc
-  data.tar.gz: 1081a5ba75c69f17f6ad308125a748751d381b7289b27e63a0e9130fd96db0bd
+  metadata.gz: 7639f6a88f14fbfc52dabbac2b771712cb7fda441683eabc23bdabdd2c9d5492
+  data.tar.gz: 5f8f41ad06f23db45c31a6c91246252a2a18b9055f1317dcf7e32f84cb6be6eb
 SHA512:
-  metadata.gz: dbfbe4d945aa9d67b02862be7f5905afd36b0c0c1c5fd1f2054d6b263f6ccdaf878bbc6521361c4454183c9d00f882947572933aa6c52850a8c10e3b32839510
-  data.tar.gz: 6e2341fca852024f9d0a518159c6367264376fb760d3efde1904546cc75a40042272ad1c0c9e075b7e68f23891c5812911253f98a66f514f72992aad2324dd7b
+  metadata.gz: df98267ef1e0c5da02c62a37ac953e12dd4f187aa822306fccce6c2654b6963641dc682d3fbd457455461d8237be7a4eb319f16f0393d399802773ce5ce16fc2
+  data.tar.gz: 67419019b84fca98837ef37f09d85554052f4ef1b9a2f59185017fb9f141834d28d86228dd7b1f461a00f079234541c02c12f955e760bc7686f55a4ce90b553e

data/bin/combine_process_settings

@@ -68,7 +68,7 @@ end
 def add_warning_comment(yaml, root_folder, program_name, settings_folder)
   warning_comment = <<~EOS
   #
-  # Don't edit this file directly! It was generated by #{program_name} from the files in #{root_folder.split('/').last}/#{settings_folder}/.
+  # Don't edit this file directly! It was generated by #{program_name} from the files in #{root_folder.rpartition('/').last}/#{settings_folder}/.
   #
   EOS
 
@@ -96,7 +96,7 @@ system("rm -f #{tmp_output_filename}")
 File.write(tmp_output_filename, yaml_with_warning_comment)
 
 system(<<~EOS)
-  if cmp #{tmp_output_filename} #{output_filename} --silent; then
+  if bundle exec diff_process_settings --silent #{tmp_output_filename} #{output_filename} ; then
     #{"echo #{options.root_folder}: unchanged;" if options.verbose}
     rm -f #{tmp_output_filename};
   else

data/bin/diff_process_settings

@@ -5,18 +5,31 @@
 # A filename of - means STDIN.
 
 require 'fileutils'
+require 'optparse'
+require 'ostruct'
 
 PROGRAM_NAME = File.basename($PROGRAM_NAME)
 
-unless ARGV.size == 2
-  puts "usage: #{PROGRAM_NAME} <path-to-combined_process_settings-A.yml> <path-to-combined_process_settings-B.yml>"
-  exit 1
+def parse_options(argv)
+  options = OpenStruct.new
+  options.silent = false
+  option_parser = OptionParser.new(argv) do |opt|
+    opt.on('-s', '--silent', 'Silent mode.') { options.silent = true }
+  end
+
+  if option_parser.parse! && argv.size == 2
+    [options, argv]
+  else
+    warn "usage: #{PROGRAM_NAME} [--silent] <path-to-combined_process_settings-A.yml> <path-to-combined_process_settings-B.yml>"
+    option_parser.summarize(STDERR)
+    exit(1)
+  end
 end
 
-path_to_combine_process_settings = ARGV[0]
+options, file_args = parse_options(ARGV)
 
 input_files =
-    ARGV.map do |path|
+    file_args.map do |path|
       if path == '-'
         ''
       else
@@ -34,6 +47,13 @@ system("rm -f tmp/combined_process_settings-A.yml tmp/combined_process_settings-
 system("sed '/^- meta:$/,$d' #{input_files[0]} > tmp/combined_process_settings-A.yml")
 system("sed '/^- meta:$/,$d' #{input_files[1]} > tmp/combined_process_settings-B.yml")
 
-system("diff -c tmp/combined_process_settings-A.yml tmp/combined_process_settings-B.yml | sed '1,3d'")
+if options.silent
+  system("cmp --silent tmp/combined_process_settings-A.yml tmp/combined_process_settings-B.yml")
+else
+  system("diff -c tmp/combined_process_settings-A.yml tmp/combined_process_settings-B.yml | sed '1,3d'")
+end
+exit_code = $?.exitstatus
 
 system("rm -f tmp/combined_process_settings-A.yml tmp/combined_process_settings-B.yml")
+
+exit(exit_code)

data/lib/process_settings/version.rb

@@ -1,5 +1,5 @@
 # frozen_string_literal: true
 
 module ProcessSettings
-  VERSION = '0.9.0'
+  VERSION = '0.10.0'
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: process_settings
 version: !ruby/object:Gem::Version
-  version: 0.9.0
+  version: 0.10.0
 platform: ruby
 authors:
 - Invoca