lib/roodi/core/parser.rb lib/roodi/core/runner.rb @@ -29,7 +29,7 @@ Check one controller and all model files in a rails app: Check all ruby files in a rails app with a custom configuration file: roodi -config=my_roodi_config.yml "rails_app/**/*.rb" -If you're writing a check, it is useful to see the structure of a file the way that Roodi tokenizes it (via ParseTree). Use: +If you're writing a check, it is useful to see the structure of a file the way that Roodi tokenizes it (via ruby_parser). Use: roodi-describe [filename] == CUSTOM CONFIGURATION README.txt @@ -8,7 +8,7 @@ require 'roodi' Hoe.new('roodi', Roodi::VERSION) do |p| p.developer('Marty Andrews', 'marty@cogentconsulting.com.au') - p.extra_deps = ['ParseTree', 'facets'] + p.extra_deps = ['ruby_parser', 'facets'] p.remote_rdoc_dir = '' end Rakefile @@ -4,7 +4,7 @@ $LOAD_PATH.unshift(File.expand_path(File.dirname(__FILE__) + "/../lib")) require 'roodi' -runner = Roodi::Core::ParseTreeRunner.new +runner = Roodi::Core::Runner.new config_param = ARGV.detect {|arg| arg =~ /-config=.*/} runner.config = config_param.split("=")[1] if config_param bin/roodi @@ -3,5 +3,5 @@ $LOAD_PATH.unshift(File.expand_path(File.dirname(__FILE__) + "/../lib")) require 'roodi' -roodi = Roodi::Core::ParseTreeRunner.new +roodi = Roodi::Core::Runner.new roodi.print_file(ARGV[0]) bin/roodi-describe @@ -1,2 +1 @@ -require 'roodi/core/parse_tree_runner' -require 'roodi/core/ruby_parser_runner' +require 'roodi/core/runner' lib/roodi/core.rb @@ -18,7 +18,7 @@ class RoodiTask < Rake::TaskLib def define desc "Check for design issues in: #{patterns.join(', ')}" task name do - runner = Roodi::Core::ParseTreeRunner.new + runner = Roodi::Core::Runner.new runner.config = config if config lib/roodi_task.rb @@ -2,7 +2,7 @@ require File.expand_path(File.dirname(__FILE__) + '/../../spec_helper') describe Roodi::Checks::AbcMetricMethodCheck do before(:each) do - @roodi = Roodi::Core::RubyParserRunner.new(Roodi::Checks::AbcMetricMethodCheck.new({'score' => 0})) + @roodi = Roodi::Core::Runner.new(Roodi::Checks::AbcMetricMethodCheck.new({'score' => 0})) end def verify_content_score(content, a, b, c) spec/roodi/checks/abc_metric_method_check_spec.rb @@ -2,7 +2,7 @@ require File.expand_path(File.dirname(__FILE__) + '/../../spec_helper') describe Roodi::Checks::AssignmentInConditionalCheck do before(:each) do - @roodi = Roodi::Core::RubyParserRunner.new(Roodi::Checks::AssignmentInConditionalCheck.new) + @roodi = Roodi::Core::Runner.new(Roodi::Checks::AssignmentInConditionalCheck.new) end it "should accept an assignment before an if clause" do spec/roodi/checks/assignment_in_conditional_check_spec.rb @@ -2,7 +2,7 @@ require File.expand_path(File.dirname(__FILE__) + '/../../spec_helper') describe Roodi::Checks::CaseMissingElseCheck do before(:each) do - @roodi = Roodi::Core::RubyParserRunner.new(Roodi::Checks::CaseMissingElseCheck.new) + @roodi = Roodi::Core::Runner.new(Roodi::Checks::CaseMissingElseCheck.new) end it "should accept case statements that do have an else" do spec/roodi/checks/case_missing_else_check_spec.rb @@ -2,7 +2,7 @@ require File.expand_path(File.dirname(__FILE__) + '/../../spec_helper') describe Roodi::Checks::ClassLineCountCheck do before(:each) do - @roodi = Roodi::Core::RubyParserRunner.new(Roodi::Checks::ClassLineCountCheck.new({'line_count' => 1})) + @roodi = Roodi::Core::Runner.new(Roodi::Checks::ClassLineCountCheck.new({'line_count' => 1})) end it "should accept classes with less lines than the threshold" do spec/roodi/checks/class_line_count_check_spec.rb @@ -2,7 +2,7 @@ require File.expand_path(File.dirname(__FILE__) + '/../../spec_helper') describe Roodi::Checks::ClassNameCheck do before(:each) do - @roodi = Roodi::Core::RubyParserRunner.new(Roodi::Checks::ClassNameCheck.new) + @roodi = Roodi::Core::Runner.new(Roodi::Checks::ClassNameCheck.new) end it "should accept camel case class names starting in capitals" do spec/roodi/checks/class_name_check_spec.rb @@ -2,7 +2,7 @@ require File.expand_path(File.dirname(__FILE__) + '/../../spec_helper') describe Roodi::Checks::ClassVariableCheck do before(:each) do - @roodi = Roodi::Core::RubyParserRunner.new(Roodi::Checks::ClassVariableCheck.new) + @roodi = Roodi::Core::Runner.new(Roodi::Checks::ClassVariableCheck.new) end it "should reject class variables" do spec/roodi/checks/class_variable_check_spec.rb @@ -2,7 +2,7 @@ require File.expand_path(File.dirname(__FILE__) + '/../../spec_helper') describe Roodi::Checks::ControlCouplingCheck do before(:each) do - @roodi = Roodi::Core::RubyParserRunner.new(Roodi::Checks::ControlCouplingCheck.new) + @roodi = Roodi::Core::Runner.new(Roodi::Checks::ControlCouplingCheck.new) end it "should reject methods with if checks using a parameter" do spec/roodi/checks/control_coupling_check_spec.rb @@ -2,7 +2,7 @@ require File.expand_path(File.dirname(__FILE__) + '/../../spec_helper') describe Roodi::Checks::CyclomaticComplexityBlockCheck do before(:each) do - @roodi = Roodi::Core::RubyParserRunner.new(Roodi::Checks::CyclomaticComplexityBlockCheck.new({'complexity' => 0})) + @roodi = Roodi::Core::Runner.new(Roodi::Checks::CyclomaticComplexityBlockCheck.new({'complexity' => 0})) end def verify_content_complexity(content, complexity) spec/roodi/checks/cyclomatic_complexity_block_check_spec.rb @@ -2,7 +2,7 @@ require File.expand_path(File.dirname(__FILE__) + '/../../spec_helper') describe Roodi::Checks::CyclomaticComplexityMethodCheck do before(:each) do - @roodi = Roodi::Core::RubyParserRunner.new(Roodi::Checks::CyclomaticComplexityMethodCheck.new({'complexity' => 0})) + @roodi = Roodi::Core::Runner.new(Roodi::Checks::CyclomaticComplexityMethodCheck.new({'complexity' => 0})) end def verify_content_complexity(content, complexity) spec/roodi/checks/cyclomatic_complexity_method_check_spec.rb @@ -2,7 +2,7 @@ require File.expand_path(File.dirname(__FILE__) + '/../../spec_helper') describe Roodi::Checks::EmptyRescueBodyCheck do before(:each) do - @roodi = Roodi::Core::RubyParserRunner.new(Roodi::Checks::EmptyRescueBodyCheck.new) + @roodi = Roodi::Core::Runner.new(Roodi::Checks::EmptyRescueBodyCheck.new) end it "should accept a rescue body with content and no parameter" do spec/roodi/checks/empty_rescue_body_check_spec.rb @@ -2,7 +2,7 @@ require File.expand_path(File.dirname(__FILE__) + '/../../spec_helper') describe Roodi::Checks::ForLoopCheck do before(:each) do - @roodi = Roodi::Core::RubyParserRunner.new(Roodi::Checks::ForLoopCheck.new) + @roodi = Roodi::Core::Runner.new(Roodi::Checks::ForLoopCheck.new) end it "should reject for loops" do spec/roodi/checks/for_loop_check_spec.rb @@ -2,7 +2,7 @@ require File.expand_path(File.dirname(__FILE__) + '/../../spec_helper') describe Roodi::Checks::MethodLineCountCheck do before(:each) do - @roodi = Roodi::Core::RubyParserRunner.new(Roodi::Checks::MethodLineCountCheck.new({'line_count' => 1})) + @roodi = Roodi::Core::Runner.new(Roodi::Checks::MethodLineCountCheck.new({'line_count' => 1})) end it "should accept methods with less lines than the threshold" do spec/roodi/checks/method_line_count_check_spec.rb @@ -2,7 +2,7 @@ require File.expand_path(File.dirname(__FILE__) + '/../../spec_helper') describe Roodi::Checks::MethodNameCheck do before(:each) do - @roodi = Roodi::Core::RubyParserRunner.new(Roodi::Checks::MethodNameCheck.new) + @roodi = Roodi::Core::Runner.new(Roodi::Checks::MethodNameCheck.new) end it "should accept method names with underscores" do spec/roodi/checks/method_name_check_spec.rb @@ -2,7 +2,7 @@ require File.expand_path(File.dirname(__FILE__) + '/../../spec_helper') describe Roodi::Checks::ModuleLineCountCheck do before(:each) do - @roodi = Roodi::Core::RubyParserRunner.new(Roodi::Checks::ModuleLineCountCheck.new({'line_count' => 1})) + @roodi = Roodi::Core::Runner.new(Roodi::Checks::ModuleLineCountCheck.new({'line_count' => 1})) end it "should accept modules with less lines than the threshold" do spec/roodi/checks/module_line_count_check_spec.rb @@ -2,7 +2,7 @@ require File.expand_path(File.dirname(__FILE__) + '/../../spec_helper') describe Roodi::Checks::ModuleNameCheck do before(:each) do - @roodi = Roodi::Core::RubyParserRunner.new(Roodi::Checks::ModuleNameCheck.new) + @roodi = Roodi::Core::Runner.new(Roodi::Checks::ModuleNameCheck.new) end it "should accept camel case module names starting in capitals" do spec/roodi/checks/module_name_check_spec.rb @@ -2,7 +2,7 @@ require File.expand_path(File.dirname(__FILE__) + '/../../spec_helper') describe Roodi::Checks::ParameterNumberCheck do before(:each) do - @roodi = Roodi::Core::RubyParserRunner.new(Roodi::Checks::ParameterNumberCheck.new({'parameter_count' => 1})) + @roodi = Roodi::Core::Runner.new(Roodi::Checks::ParameterNumberCheck.new({'parameter_count' => 1})) end it "should accept methods with less lines than the threshold" do spec/roodi/checks/parameter_number_check_spec.rb lib/roodi/core/parse_tree_runner.rb lib/roodi/core/ruby_parser_parser.rb lib/roodi/core/ruby_parser_runner.rb db0c64dcb171b59e45ac4abf90162e32f1cd9f98 Marty Andrews marty@martyandrews.net http://github.com/martinjandrews/roodi/commit/afa4f4317e5f3d3492e883bcb00de21dfef0afab afa4f4317e5f3d3492e883bcb00de21dfef0afab 2009-05-06T21:09:31-07:00 2009-05-06T21:09:31-07:00 Cleaned up naming after moving to ruby_parser. 01ade94fbcbb44def9b025c43667bd96ee411a1e Marty Andrews marty@martyandrews.net