lib/railroady/options_struct.rb in railroady-1.5.3 vs lib/railroady/options_struct.rb in railroady-1.6.0

- old
+ new

@@ -1,10 +1,6 @@ -# RailRoady - RoR diagrams generator -# http://railroad.rubyforge.org -# -# Copyright 2007-2008 - Javier Smaldone (http://www.smaldone.com.ar) -# See COPYING for more details +# frozen_string_literal: true require 'ostruct' # RailRoady command line options parser class OptionsStruct < OpenStruct @@ -38,11 +34,11 @@ xmi: false, command: '', config_file: 'config/environment', app_name: 'railroady', app_human_name: 'Railroady', app_version: '', copyright: '' } super(init_options.merge(args)) - end # initialize + end def parse(args) @opt_parser = OptionParser.new do |opts| opts.banner = "Usage: #{app_name} [options] command" opts.separator '' @@ -136,15 +132,15 @@ self.engine_controllers = ec end opts.separator '' opts.separator 'Other options:' opts.on('-h', '--help', 'Show this message') do - STDOUT.print "#{opts}\n" + $stdout.print "#{opts}\n" exit end opts.on('--version', 'Show version and copyright') do - STDOUT.print "#{app_human_name} version #{app_version}\n\n" \ + $stdout.print "#{app_human_name} version #{app_version}\n\n" \ "#{copyright}\nThis is free software; see the source " \ "for copying conditions.\n\n" exit end opts.separator '' @@ -152,37 +148,37 @@ self.config_file = c if c && c != '' end opts.separator 'Commands (you must supply one of these):' opts.on('-M', '--models', 'Generate models diagram') do |_c| if command != '' - STDERR.print "Error: Can only generate one diagram type\n\n" + $stderr.print "Error: Can only generate one diagram type\n\n" exit 1 else self.command = 'models' end end opts.on('-C', '--controllers', 'Generate controllers diagram') do |_c| if command != '' - STDERR.print "Error: Can only generate one diagram type\n\n" + $stderr.print "Error: Can only generate one diagram type\n\n" exit 1 else self.command = 'controllers' end end # From Ana Nelson's patch - opts.on('-A', '--aasm', "Generate \"acts as state machine\" diagram") do |_c| + opts.on('-A', '--aasm', 'Generate "acts as state machine" diagram') do |_c| if command == 'controllers' - STDERR.print "Error: Can only generate one diagram type\n\n" + $stderr.print "Error: Can only generate one diagram type\n\n" exit 1 else self.command = 'aasm' end end opts.separator '' opts.separator 'For bug reporting and additional information, please see:' opts.separator 'http://railroad.rubyforge.org/' - end # do + end begin @opt_parser.parse!(args) rescue OptionParser::AmbiguousOption option_error 'Ambiguous option' @@ -191,14 +187,14 @@ rescue OptionParser::InvalidArgument option_error 'Invalid argument' rescue OptionParser::MissingArgument option_error 'Missing argument' end - end # parse + end private def option_error(msg) - STDERR.print "Error: #{msg}\n\n #{@opt_parser}\n" + $stderr.print "Error: #{msg}\n\n #{@opt_parser}\n" exit 1 end -end # class OptionsStruct +end