roodi 3.2.0 → 3.3.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: cc65ef0c9ffac9f896579cda0a56572065ea813f
-  data.tar.gz: 8c0c7e0b9ca16a6f2e2597fc38677c6ac12ea663
+  metadata.gz: 3e40866579e8df51093c4bce137a04710c118548
+  data.tar.gz: e2141d7d84ca7cc12bc4d2fa483335eaa7c0f5e6
 SHA512:
-  metadata.gz: e5ff37f5f09ebfab6113e5fcf9e0705998ff1067174df0be337f4ee3b42fcfadc1273639e7447e56b26bb89089879f16e2fbd5d8a68598473211f345b2e38eb9
-  data.tar.gz: 6f07ed9c3bb7f711daf43f5ce2108b98654f06a315aed57c83e3d0d236d790a517d8811868d98e3ac18db5fa588504718e2541839107b3a7fe85e9e39a95edd4
+  metadata.gz: 600ff6529f75c763aed4de9b8c63b9b0f01eea3018c5290899b7ce9cf4a07a5c4e926baedeabf9ef8f4bad8b99669c36975f05058ebf720e878d229aa5b6ab90
+  data.tar.gz: 76e602ff62a8a0e2427ab2e6090e73fb6b5e565dcd1dc37b31dd3ec82beaea0f282cea4dab52f9c1487ead8584227efcdc558bbdd54311646f0a9ebe4e735d51

data/History.txt

@@ -1,3 +1,7 @@
+= 3.3.0
+* Using the roodi.yml in the current folder by default if it exists
+* Added coloured output
+
 = 3.2.0
 * Checks all files under current directory by default
 * Made it easier to run for the whole project as a rake task

data/bin/roodi

@@ -10,12 +10,6 @@ config_param = ARGV.detect {|arg| arg =~ /-config=.*/}
 runner.config = config_param.split("=")[1] if config_param
 ARGV.delete config_param
 
-puts "\nRunning Roodi checks"
-
 runner.start(ARGV)
-runner.errors.each {|error| puts error}
-
-puts "\nChecked #{runner.files_checked} files"
-puts "Found #{runner.errors.size} errors"
 
 exit runner.errors.size

data/lib/roodi/core/runner.rb

@@ -8,23 +8,49 @@ require 'roodi/core/visitable_sexp'
 module Roodi
   module Core
     class Runner
-      DEFAULT_CONFIG = File.join(File.dirname(__FILE__), "..", "..", "..", "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")
+      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)
@@ -96,7 +122,7 @@ module Roodi
 
       def load_checks
         check_objects = []
-        checks = YAML.load_file @config
+        checks = load_config(@config)
         checks.each do |check_class_name, options|
           check_class = Roodi::Checks.const_get(check_class_name)
           check_objects << check_class.make(options || {})
@@ -104,6 +130,9 @@ module Roodi
         check_objects
       end
 
+      def load_config(config_file)
+        YAML.load_file config_file
+      end
     end
   end
 end

data/lib/roodi/version.rb

@@ -1,3 +1,3 @@
 module Roodi
-  VERSION = '3.2.0'
+  VERSION = '3.3.0'
 end

data/lib/roodi_task.rb

@@ -21,19 +21,11 @@ class RoodiTask < Rake::TaskLib
   def define
     desc "Run Roodi against all source files"
     task name do
-      puts "\nRunning Roodi checks"
-
       runner = Roodi::Core::Runner.new
 
       runner.config = config if config
 
       runner.start(@patterns)
-
-      runner.errors.each {|error| puts error}
-
-      puts "\nChecked #{runner.files_checked} files"
-
-      raise "Found #{runner.errors.size} errors." unless runner.errors.empty?
     end
     self
   end

data/spec/roodi/core/runner_spec.rb

@@ -3,25 +3,6 @@ require File.expand_path(File.dirname(__FILE__) + '/../../spec_helper')
 describe Roodi::Core::Runner do
   subject { Roodi::Core::Runner.new }
 
-  describe "given a custom config file" do
-    before do
-      subject.config= File.expand_path(File.dirname(__FILE__) + '/../roodi.yml')
-    end
-
-    it "uses check from it" do
-      content = <<-RUBY
-        class TestClass
-
-          def METHOD
-
-          end
-        end
-      RUBY
-      subject.check_content(content)
-      subject.errors.should be_empty
-    end
-  end
-
   describe "running against a file" do
     it "adds an error if file is not valid ruby" do
       content = <<-END
@@ -53,4 +34,35 @@ describe Roodi::Core::Runner do
     end
   end
 
+  describe "configuration" do
+    context "given a custom config file" do
+      before do
+        subject.config= File.expand_path(File.dirname(__FILE__) + '/../roodi.yml')
+      end
+
+      it "uses check from it" do
+        content = <<-RUBY
+          class TestClass
+
+            def METHOD
+
+            end
+          end
+        RUBY
+        subject.check_content(content)
+        subject.errors.should be_empty
+      end
+    end
+
+    it "uses the default config if none given" do
+      subject.stub(:project_config) { nil }
+      expect(subject.default_config).to eq subject.default_config
+    end
+
+    it "uses roodi.yml if it exists" do
+      subject.stub(:project_config) { "roodi.yml" }
+      expect(subject.default_config).to eq "roodi.yml"
+    end
+  end
+
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: roodi
 version: !ruby/object:Gem::Version
-  version: 3.2.0
+  version: 3.3.0
 platform: ruby
 authors:
 - Marty Andrews