[DRE-commits] [roodi] 01/03: Merge tag 'upstream/3.1.1'

[David Suárez]

This is an automated email from the git hooks/post-receive script.

deiv-guest pushed a commit to branch master
in repository roodi.

commit f523dc573fab2fde0353b61b6b45b9d5079b3e06
Merge: 88bfb50 3a08ed3
Author: David Suárez <david.sephirot at gmail.com>
Date:   Wed Sep 11 20:34:00 2013 +0200

    Merge tag 'upstream/3.1.1'
    
    Upstream version 3.1.1
    
    Conflicts:
    	Gemfile
    	Gemfile.lock
    	Rakefile
    	lib/roodi/core/runner.rb
    	spec/spec_helper.rb

 .gitignore                                         |    4 +
 .travis.yml                                        |   11 +++
 Gemfile                                            |    5 +-
 Gemfile.lock                                       |   30 ------
 History.txt                                        |   32 +++++++
 README.txt => README.md                            |   97 ++++++++++++-------
 Rakefile                                           |   11 +--
 checksums.yaml.gz                                  |  Bin 0 -> 269 bytes
 lib/roodi/checks.rb                                |    2 +-
 lib/roodi/checks/abc_metric_method_check.rb        |   49 +++++-----
 lib/roodi/checks/check.rb                          |   19 ++--
 lib/roodi/checks/class_name_check.rb               |   10 +-
 lib/roodi/checks/control_coupling_check.rb         |    6 +-
 lib/roodi/checks/core_method_override_check.rb     |   23 +++++
 lib/roodi/checks/cyclomatic_complexity_check.rb    |   19 ++--
 lib/roodi/checks/empty_rescue_body_check.rb        |   17 +---
 lib/roodi/checks/line_count_check.rb               |    7 +-
 lib/roodi/checks/method_name_check.rb              |    6 +-
 .../checks/missing_foreign_key_index_check.rb      |   99 --------------------
 lib/roodi/checks/module_name_check.rb              |    8 +-
 lib/roodi/checks/name_check.rb                     |    5 +
 lib/roodi/checks/npath_complexity_check.rb         |   19 ++--
 lib/roodi/checks/npath_complexity_method_check.rb  |    6 +-
 lib/roodi/checks/parameter_number_check.rb         |    2 +-
 lib/roodi/core/parser.rb                           |   28 +++++-
 lib/roodi/core/runner.rb                           |   31 +++---
 lib/roodi/core/visitable_sexp.rb                   |    4 +-
 lib/roodi/version.rb                               |    2 +-
 metadata.yml                                       |   95 +++++++++++--------
 roodi.gemspec                                      |   15 ++-
 roodi.yml                                          |   26 +++--
 spec/roodi/checks/class_line_count_check_spec.rb   |    4 +-
 .../checks/core_method_override_check_spec.rb      |   31 ++++++
 spec/roodi/checks/empty_rescue_body_check_spec.rb  |   74 ++++++++++++++-
 spec/roodi/checks/method_name_check_spec.rb        |    6 +-
 .../checks/missing_foreign_key_index_check_spec.rb |   33 -------
 .../checks/npath_complexity_method_check_spec.rb   |   22 -----
 spec/roodi/core/runner_spec.rb                     |   28 ++++--
 spec/spec_helper.rb                                |    3 +
 39 files changed, 482 insertions(+), 407 deletions(-)

diff --cc lib/roodi/core/runner.rb
index f3cf2f5,565fcc3..69eabaa
--- a/lib/roodi/core/runner.rb
+++ b/lib/roodi/core/runner.rb
@@@ -8,10 -8,10 +8,10 @@@ require 'roodi/core/visitable_sexp
  module Roodi
    module Core
      class Runner
 -      DEFAULT_CONFIG = File.join(File.dirname(__FILE__), "..", "..", "..", "roodi.yml")
 +      DEFAULT_CONFIG = "/etc/roodi.yml"
-       
+ 
        attr_writer :config
-       
+ 
        def initialize(*checks)
          @config = DEFAULT_CONFIG
          @checks = checks unless checks.empty?

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-ruby-extras/roodi.git