@@ -20,28 +20,10 @@ module Reek @options = Options.new(argv) end - def examine_sources - # SMELL: Greedy Method - # Options.parse executes the -v and -h commands and throws a SystemExit - args = @options.parse - if args.length > 0 - @sniffer = args.sniff - else - @sniffer = Reek::Sniffer.new($stdin.to_reek_source('$stdin')) - end - end - - def reek - examine_sources - puts @options.create_report(@sniffer.sniffers).report - return EXIT_STATUS[@sniffer.smelly? ? :smells : :success] - end - def execute begin - return reek - rescue SystemExit => ex - return ex.status + cmd = @options.parse + return cmd.execute rescue Exception => error $stderr.puts "Error: #{error}" return EXIT_STATUS[:error] lib/reek/adapters/application.rb @@ -19,12 +19,13 @@ module Reek @quiet = false @show_all = false @format = CTX_SORT + @command = nil set_options end def parse @parser.parse!(@argv) - @argv + @command ||= ReekCommand.new(@argv, @quiet, @format, @show_all) end def set_options @@ -44,12 +45,10 @@ EOB @parser.separator "Common options:" @parser.on("-h", "--help", "Show this message") do - puts @parser - exit(EXIT_STATUS[:success]) + @command = HelpCommand.new(@parser) end @parser.on("-v", "--version", "Show version") do - puts "#{@parser.program_name} #{Reek::VERSION}" - exit(EXIT_STATUS[:success]) + @command = VersionCommand.new(@parser) end @parser.separator "\nReport formatting:" @@ -75,4 +74,44 @@ EOB @quiet ? QuietReport.new(sniffers, @format, @show_all) : FullReport.new(sniffers, @format, @show_all) end end + + class HelpCommand + def initialize(parser) + @parser = parser + end + def execute + puts @parser.to_s + return EXIT_STATUS[:success] + end + end + + class VersionCommand + def initialize(parser) + @parser = parser + end + def execute + puts "#{@parser.program_name} #{Reek::VERSION}" + return EXIT_STATUS[:success] + end + end + + class ReekCommand + def initialize(args, quiet, format, show_all) + @args = args + @quiet = quiet + @format = format + @show_all = show_all + end + + def execute + sniffer = @args.length > 0 ? + @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) + puts rpt.report + return EXIT_STATUS[sniffer.smelly? ? :smells : :success] + end + end end lib/reek/adapters/command_line.rb 144f6682a6c1a2417a89bd9a37e286fb65c7f986 Kevin Rutherford kevin@rutherford-software.com http://github.com/kevinrutherford/reek/commit/a27e570d69cf1b53ef30d0a3cc3615132b9b8238 a27e570d69cf1b53ef30d0a3cc3615132b9b8238 2009-11-06T09:05:58-08:00 2009-11-06T09:05:58-08:00 Inverted control out of Options 316b0b264d87f04d849b6659ceef0bd9a0a636f0 Kevin Rutherford kevin@rutherford-software.com