diff options
Diffstat (limited to 'lib')
| -rw-r--r-- | lib/dslkeywords/file.rb | 4 | ||||
| -rw-r--r-- | lib/dslkeywords/given.rb | 4 | ||||
| -rw-r--r-- | lib/options.rb | 33 | ||||
| -rw-r--r-- | lib/rcm.rb | 1 |
4 files changed, 32 insertions, 10 deletions
diff --git a/lib/dslkeywords/file.rb b/lib/dslkeywords/file.rb index aa1b725..9a44f72 100644 --- a/lib/dslkeywords/file.rb +++ b/lib/dslkeywords/file.rb @@ -23,7 +23,7 @@ module RCM def different?(file_a, file_b) checksum_a = Digest::SHA256.file(file_a).hexdigest checksum_b = Digest::SHA256.file(file_b).hexdigest - [checksum_a == checksum_b, checksum_a, cecksum_b] + [checksum_a != checksum_b, checksum_a, checksum_b] end private @@ -320,7 +320,7 @@ module RCM end do? "Copying #{source_path} -> #{@file_path} resursively" do - if File.directory?(@file_path) + if ::File.directory?(@file_path) Dir["#{source_path}/*"].each { FileUtils.cp_r(_1, @file_path) } else FileUtils.cp_r(source_path, @file_path) diff --git a/lib/dslkeywords/given.rb b/lib/dslkeywords/given.rb index fa14e68..ba61703 100644 --- a/lib/dslkeywords/given.rb +++ b/lib/dslkeywords/given.rb @@ -17,6 +17,10 @@ module RCM def met? return false if @conds.key?(:hostname) && Socket.gethostname != @conds[:hostname].to_s + # When --hosts is specified, only run on the listed hosts + hosts = option(:hosts) + return false if hosts.any? && !hosts.include?(Socket.gethostname) + true end end diff --git a/lib/options.rb b/lib/options.rb index 401d135..6ce2479 100644 --- a/lib/options.rb +++ b/lib/options.rb @@ -1,16 +1,33 @@ require 'optparse' module RCM - # Command line options + # Command line options, supports both Rake mode (args after --) + # and standalone mode (direct args). Unknown options are ignored + # so that test runners and other tools can pass their own flags. module Options - @@options = { debug: false, dry: false } + @@options = { debug: false, dry: false, hosts: [] } - if (after_double_dash = ARGV.slice_before('--').to_a.last&.drop(1)) - OptionParser.new do |opts| - opts.banner = 'Usage: rake [task] -- [options]' - opts.on('-v', '--[no-]debug', 'debug output') { |v| @@options[:debug] = v } - opts.on('-d', '--dry', 'dry mode') { |v| @@options[:dry] = v } - end.parse!(after_double_dash) + parser = OptionParser.new do |opts| + opts.banner = 'Usage: rake [task] -- [options] OR ruby config.rb [options]' + opts.on('-v', '--[no-]debug', 'debug output') { |v| @@options[:debug] = v } + opts.on('-d', '--dry', 'dry mode') { |v| @@options[:dry] = v } + opts.on('--hosts HOSTS', 'comma-separated list of target hostnames') do |v| + @@options[:hosts] = v.split(',').map(&:strip) + end + end + + # Rake passes args after '--'; standalone scripts pass args directly. + args = if ARGV.include?('--') + ARGV.slice_before('--').to_a.last.drop(1) + else + ARGV.dup + end + + # Ignore unknown options (e.g. from test runners or other tools) + begin + parser.parse!(args) + rescue OptionParser::InvalidOption + retry end def option(key) diff --git a/lib/rcm.rb b/lib/rcm.rb new file mode 100644 index 0000000..641b02d --- /dev/null +++ b/lib/rcm.rb @@ -0,0 +1 @@ +require_relative 'dsl' |