@@ -9,11 +9,6 @@ Feature: Reek can be controlled using command-line options Then the exit status indicates an error And it reports the error "Error: invalid option: --no-such-option" - Scenario: return non-zero status on missing argument - When I run reek -f - Then the exit status indicates an error - And it reports the error "Error: missing argument: -f" - Scenario: display the current version number When I run reek --version Then it succeeds @@ -42,8 +37,5 @@ Feature: Reek can be controlled using command-line options Report formatting: -a, --[no-]show-all Show all smells, including those masked by config settings -q, --quiet Suppress headings for smell-free source files - -f, --format FORMAT Specify the format of smell warnings - -c, --context-first Sort by context; sets the format string to "%m%c %w (%s)" - -s, --smell-first Sort by smell; sets the format string to "%m[%s] %c %w" """ features/options.feature @@ -3,29 +3,21 @@ require 'reek' require 'reek/adapters/report' module Reek - - # SMELL: Greedy Module - # This creates the command-line parser AND invokes it. And for the - # -v and -h options it also executes them. And it holds the config - # options for the rest of the application. - class Options - CTX_SORT = '%m%c %w (%s)' - SMELL_SORT = '%m[%s] %c %w' + class Options def initialize(argv) @argv = argv @parser = OptionParser.new @quiet = false @show_all = false - @format = CTX_SORT @command = nil set_options end def parse @parser.parse!(@argv) - @command ||= ReekCommand.new(@argv, @quiet, @format, @show_all) + @command ||= ReekCommand.new(@argv, @quiet, @show_all) end def set_options @@ -48,7 +40,7 @@ EOB @command = HelpCommand.new(@parser) end @parser.on("-v", "--version", "Show version") do - @command = VersionCommand.new(@parser) + @command = VersionCommand.new(@parser.program_name) end @parser.separator "\nReport formatting:" @@ -59,19 +51,6 @@ EOB @parser.on("-q", "--quiet", "Suppress headings for smell-free source files") do @quiet = true end - @parser.on('-f', "--format FORMAT", 'Specify the format of smell warnings') do |arg| - @format = arg unless arg.nil? - end - @parser.on('-c', '--context-first', "Sort by context; sets the format string to \"#{CTX_SORT}\"") do - @format = CTX_SORT - end - @parser.on('-s', '--smell-first', "Sort by smell; sets the format string to \"#{SMELL_SORT}\"") do - @format = SMELL_SORT - end - end - - def create_report(sniffers) - @quiet ? QuietReport.new(sniffers, @format, @show_all) : FullReport.new(sniffers, @format, @show_all) end end @@ -86,20 +65,22 @@ EOB end class VersionCommand - def initialize(parser) - @parser = parser + def initialize(progname) + @progname = progname end def execute - puts "#{@parser.program_name} #{Reek::VERSION}" + puts "#{@progname} #{Reek::VERSION}" return EXIT_STATUS[:success] end end class ReekCommand - def initialize(args, quiet, format, show_all) + + SMELL_FORMAT = '%m%c %w (%s)' + + def initialize(args, quiet, show_all) @args = args @quiet = quiet - @format = format @show_all = show_all end @@ -108,8 +89,8 @@ EOB @args.sniff : Reek::Sniffer.new($stdin.to_reek_source('$stdin')) rpt = @quiet ? - QuietReport.new(sniffer.sniffers, @format, @show_all) : - FullReport.new(sniffer.sniffers, @format, @show_all) + QuietReport.new(sniffer.sniffers, SMELL_FORMAT, @show_all) : + FullReport.new(sniffer.sniffers, SMELL_FORMAT, @show_all) puts rpt.report return EXIT_STATUS[sniffer.smelly? ? :smells : :success] end lib/reek/adapters/command_line.rb a27e570d69cf1b53ef30d0a3cc3615132b9b8238 Kevin Rutherford kevin@rutherford-software.com http://github.com/kevinrutherford/reek/commit/239b159a16bc85001c7ba3d2c00915f0885c1f81 239b159a16bc85001c7ba3d2c00915f0885c1f81 2009-11-07T13:22:30-08:00 2009-11-07T13:22:30-08:00 Removed options for formatting the smell warnings 015ed52144aea82697888791099c7c0a86f9d3eb Kevin Rutherford kevin@rutherford-software.com