@@ -1,26 +1,19 @@ #!/usr/bin/env ruby # -# Created on 2008-2-17. -# Copyright (c) 2008-2009 Kevin Rutherford, Rutherford Software Ltd. All rights reserved. +# Reek examines Ruby source code for smells. +# Visit http://reek.rubyforge.org/ for docs etc. +# +# Author: Kevin Rutherford # require 'reek' require 'reek/source' require 'reek/options' -sources = Reek::Options.parse(ARGV) exitstatus = 0 -sources.each do |src| - warnings = src.report - next if warnings.empty? - if sources.size == 1 - puts warnings.to_s - else - puts "\"#{src}\" -- #{warnings.length} warnings:" - puts warnings.to_s - puts - end +source = Reek::Options.parse(ARGV) +if source.smelly? + puts source.report exitstatus = 2 end - exit(exitstatus) bin/reek @@ -45,9 +45,9 @@ EOB begin @@opts = parse_args(args) if ARGV.length > 0 - return ARGV.map {|arg| Source.from_path(arg)} + return Source.from_pathlist(ARGV) else - return [Source.from_io($stdin, 'stdin')] + return Source.from_io($stdin, 'stdin') end rescue OptionParser::ParseError, SystemCallError => err fatal_error(err) lib/reek/options.rb @@ -46,6 +46,15 @@ module Reek return new(code, filename, File.dirname(filename)) end + # + # Factory method: creates a +Source+ object from an array of file paths. + # No source code is actually parsed until the report is accessed. + # + def self.from_pathlist(paths) + sources = paths.map {|path| Source.from_path(path) } + SourceList.new(sources) + end + def initialize(code, desc, dir = '.') # :nodoc: @source = code @dir = dir @@ -82,4 +91,21 @@ module Reek @desc end end + + class SourceList + def initialize(sources) + @sources = sources + end + + def smelly? + @sources.any? {|source| source.smelly? } + end + + def report + @sources.select {|src| src.smelly? }.map do |src| + warnings = src.report + "\"#{src}\" -- #{warnings.length} warnings:\n#{warnings.to_s}\n" + end.join("\n") + end + end end lib/reek/source.rb @@ -115,6 +115,12 @@ class String end end +class Array + def to_source + Reek::Source.from_pathlist(self) + end +end + module Reek class Source def to_source lib/reek/spec.rb @@ -5,10 +5,10 @@ describe 'Reek source code:' do it "reports no smells in #{path}" do File.new(path).should_not reek end - it "reports no smells in #{path} via bin/reek" do - `ruby -Ilib bin/reek #{path}`.should == '' - $?.exitstatus.should == 0 - end + end + + it 'reports no smells via the Dir matcher' do + Dir['lib/**/*.rb'].should_not reek end end spec/integration/reek_source_spec.rb @@ -1,5 +1,4 @@ $:.unshift File.dirname(__FILE__) + '/../lib' -require 'reek' begin require 'spec' @@ -9,6 +8,7 @@ rescue LoadError require 'spec' end +require 'reek' require 'reek/spec' Spec::Runner.configure do |config| spec/spec_helper.rb ae2f0c3821a6a6d311ca0411062c64d09cb13c35 Kevin Rutherford kevin@rutherford-software.com http://github.com/kevinrutherford/reek/commit/b775e26264883783b07541280c78697dd378ab0b b775e26264883783b07541280c78697dd378ab0b 2009-03-30T14:06:11-07:00 2009-03-30T14:06:11-07:00 Added a 'reek' matcher for Dirs [#32 state:resolved] 4e1749d53794f672089df111b587993a3d8c2878 Kevin Rutherford kevin@rutherford-software.com