@@ -25,7 +25,7 @@ module Roodi def evaluate(node) complexity = count_complexity(node) - add_error "Method name \"#{node[1]}\" has a cyclomatic complexity is #{complexity}. It should be #{@complexity} or less." unless complexity <= @complexity + add_error "Method name \"#{node[1]}\" cyclomatic complexity is #{complexity}. It should be #{@complexity} or less." unless complexity <= @complexity end end end lib/roodi/checks/cyclomatic_complexity_method_check.rb @@ -6,7 +6,7 @@ module Roodi # # Keeping to a consistent nameing convention makes your code easier to read. class MethodNameCheck < NameCheck - DEFAULT_PATTERN = /^[_a-z<>=\[\]|+-\/\*`]+[_a-z0-9_<>=~@\[\]]*[=!\?]?$/ + DEFAULT_PATTERN = /^[_a-z<>=\[|+-\/\*`]+[_a-z0-9_<>=~@\[\]]*[=!\?]?$/ def initialize(options = {}) pattern = options['pattern'] || DEFAULT_PATTERN lib/roodi/checks/method_name_check.rb @@ -8,7 +8,7 @@ CyclomaticComplexityMethodCheck: { complexity: 8 } EmptyRescueBodyCheck: { } ForLoopCheck: { } MethodLineCountCheck: { line_count: 20 } -MethodNameCheck: { pattern: !ruby/regexp /^[_a-z<>=\[\]|+-\/\*`]+[_a-z0-9_<>=~@\[\]]*[=!\?]?$/ } +MethodNameCheck: { pattern: !ruby/regexp /^[_a-z<>=\[|+-\/\*`]+[_a-z0-9_<>=~@\[\]]*[=!\?]?$/ } ModuleLineCountCheck: { line_count: 300 } ModuleNameCheck: { pattern: !ruby/regexp /^[A-Z][a-zA-Z0-9]*$/ } ParameterNumberCheck: { parameter_count: 5 } roodi.yml @@ -9,7 +9,7 @@ describe Roodi::Checks::CyclomaticComplexityMethodCheck do @roodi.check_content(content) errors = @roodi.errors errors.should_not be_empty - errors[0].to_s.should eql("dummy-file.rb:1 - Method name \"method_name\" has a cyclomatic complexity is #{complexity}. It should be 0 or less.") + errors[0].to_s.should eql("dummy-file.rb:1 - Method name \"method_name\" cyclomatic complexity is #{complexity}. It should be 0 or less.") end it "should find an if block" do spec/roodi/checks/cyclomatic_complexity_method_check_spec.rb @@ -71,6 +71,6 @@ describe Roodi::Checks::MethodNameCheck do @roodi.check_content(content) errors = @roodi.errors errors.should_not be_empty - errors[0].to_s.should eql("dummy-file.rb:1 - Method name \"badMethodName\" should match pattern /^[_a-z<>=\\[\\]|+-\\/\\*`]+[_a-z0-9_<>=~@\\[\\]]*[=!\\?]?$/") + errors[0].to_s.should eql("dummy-file.rb:1 - Method name \"badMethodName\" should match pattern /^[_a-z<>=\\[|+-\\/\\*`]+[_a-z0-9_<>=~@\\[\\]]*[=!\\?]?$/") end end spec/roodi/checks/method_name_check_spec.rb b8f1b8a3cb7bbbe7391c66a914519764f3b556e2 Marty Andrews marty@martyandrews.net http://github.com/martinjandrews/roodi/commit/5e4a297c89fde6789b9269d18c0358eae58e03b7 5e4a297c89fde6789b9269d18c0358eae58e03b7 2008-11-30T22:32:08-08:00 2008-11-30T22:32:08-08:00 fixed a typo and a bug found by damien. 53825e29eea1eb8d0fedbbc58e0e94f6ffc37155 Marty Andrews marty@martyandrews.net