[DRE-commits] [roodi] 01/05: Merge tag 'upstream/3.3.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 865cc26917cea3b30e3051402830098b1dcb2d55
Merge: 3e6fa75 566e78b
Author: David Suárez <david.sephirot at gmail.com>
Date:   Sat Mar 1 14:27:50 2014 +0100

    Merge tag 'upstream/3.3.1'
    
    Upstream version 3.3.1
    
    Conflicts:
    	lib/roodi/core/runner.rb

 .travis.yml                    |   4 ---
 History.txt                    |  15 +++++++++
 README.md                      |  23 ++++++++++++--
 Rakefile                       |  13 ++------
 bin/roodi                      |  10 ++----
 checksums.yaml.gz              | Bin 269 -> 266 bytes
 lib/roodi/core/runner.rb       |  60 +++++++++++++++++++++++++++++++++--
 lib/roodi/version.rb           |   2 +-
 lib/roodi_task.rb              |  15 ++++-----
 metadata.yml                   |   4 +--
 spec/roodi/core/runner_spec.rb |  69 +++++++++++++++++++++++++++++------------
 11 files changed, 155 insertions(+), 60 deletions(-)

diff --cc lib/roodi/core/runner.rb
index 69eabaa,56232ee..f3a4aa4
--- a/lib/roodi/core/runner.rb
+++ b/lib/roodi/core/runner.rb
@@@ -8,15 -8,65 +8,66 @@@ require 'roodi/core/visitable_sexp
  module Roodi
    module Core
      class Runner
-       DEFAULT_CONFIG = "/etc/roodi.yml"
 +
        attr_writer :config
+       attr_reader :files_checked
  
        def initialize(*checks)
-         @config = DEFAULT_CONFIG
+         @config = default_config
          @checks = checks unless checks.empty?
        end
  
+       def default_config
+         project_config ? project_config : roodi_gem_config
+       end
+ 
+       def roodi_gem_config
 -        File.join(File.dirname(__FILE__), "..", "..", "..", "roodi.yml")
++        File.join("/etc", "roodi.yml")
+       end
+ 
+       def project_config
+         File.exists?("roodi.yml") ? "roodi.yml" : nil
+       end
+ 
+       def start(paths)
+         puts "\nRunning Roodi checks"
+ 
+         paths = ['.'] if paths == []
+         all_files = collect_files(paths)
+         @files_checked = all_files.count
+         all_files.each do |path|
+           check_file(path)
+         end
+ 
+         output_result(errors, @files_checked)
+       end
+ 
+       def output_result(errors, files_checked)
+         errors.each {|error| puts "\e[31m#{error}\e[0m"}
+ 
+         puts "\nChecked #{files_checked} files"
+         result = "Found #{errors.size} errors."
+         if errors.empty?
+           puts "\e[32m#{result}\e[0m"
+         else
+           raise "\e[31m#{result}\e[0m"
+         end
+       end
+ 
+       def collect_files(paths)
+         files = []
+         paths.each do |path|
+           if File.file?(path)
+             files << path
+           elsif File.directory?(path)
+             files += Dir.glob(File.join(path, '**/*.{rb}'))
+           else
+             files += Dir.glob(path)
+           end
+         end
+         files
+       end
+ 
        def check(filename, content)
          @checks ||= load_checks
          @checker ||= CheckingVisitor.new(@checks)

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