Check properly for zero arguments.

This commit is contained in:
j2blake 2013-10-15 12:16:30 -04:00
parent efd8b11ff4
commit f4d90fd083
2 changed files with 4 additions and 4 deletions

View file

@ -33,6 +33,8 @@ class LabelInserter
# Parse the arguments and complain if they don't make sense. # Parse the arguments and complain if they don't make sense.
# #
def sanity_check_arguments(args) def sanity_check_arguments(args)
raise UsageError, "usage is: label_inserter.rb <rdf_file> <labels_input_file> <locale> [filter_file] <n3_output_file> [ok]" unless (3..5).include?(args.length)
if args[-1].downcase == 'ok' if args[-1].downcase == 'ok'
ok = true ok = true
args.pop args.pop
@ -40,8 +42,6 @@ class LabelInserter
ok = false ok = false
end end
raise UsageError, "usage is: label_inserter.rb <rdf_file> <labels_input_file> <locale> [filter_file] <n3_output_file> [ok]" unless (4..5).include?(args.length)
n3_output_file = args.pop n3_output_file = args.pop
raise UsageError, "File '#{n3_output_file}' already exists. specify 'ok' to overwrite it." if File.exist?(n3_output_file) && !ok raise UsageError, "File '#{n3_output_file}' already exists. specify 'ok' to overwrite it." if File.exist?(n3_output_file) && !ok

View file

@ -32,6 +32,8 @@ class LabelStripper
# Parse the arguments and complain if they don't make sense. # Parse the arguments and complain if they don't make sense.
# #
def sanity_check_arguments(args) def sanity_check_arguments(args)
raise UsageError, "usage is: label_stripper.rb <rdf_file> [filter_file] <labels_output_file> [ok]" unless (2..3).include?(args.length)
if args[-1].downcase == 'ok' if args[-1].downcase == 'ok'
ok = true ok = true
args.pop args.pop
@ -39,8 +41,6 @@ class LabelStripper
ok = false ok = false
end end
raise UsageError, "usage is: label_stripper.rb <rdf_file> [filter_file] <labels_output_file> [ok]" unless (2..3).include?(args.length)
output_file = args.pop output_file = args.pop
raise UsageError, "File '#{output_file}' already exists. specify 'ok' to overwrite it." if File.exist?(output_file) && !ok raise UsageError, "File '#{output_file}' already exists. specify 'ok' to overwrite it." if File.exist?(output_file) && !ok