overcommit 0.2.1 → 0.2.2

data/lib/overcommit/git_hook.rb

@@ -27,7 +27,7 @@ module Overcommit
 
           # Ignore a check if it only applies to a specific file type and there
           # are no staged files of that type in the tree
-          next if check_class.filetype && check.staged.empty?
+          next if check_class.filetypes && check.staged.empty?
 
           reporter.with_status(check) do
             run_and_filter_check(check)
@@ -73,7 +73,8 @@ module Overcommit
       def run_and_filter_check(check)
         status, output = check.run_check
 
-        output = output.to_s
+        # Some checks output a list of lines. Join those lines together with newlines.
+        output = Array[output].flatten.join("\n")
 
         unless output.empty?
           check.staged.each do |staged_file|

data/lib/overcommit/hook_specific_check.rb

@@ -13,7 +13,7 @@ module Overcommit
 
     class HookSpecificCheck
       class << self
-        attr_accessor :filetype, :stealth, :required
+        attr_accessor :filetypes, :stealth, :required
 
         def stealth!
           self.stealth = true
@@ -52,7 +52,8 @@ module Overcommit
 
       def staged
         @staged ||= modified_files.map do |filename|
-          if self.class.filetype.nil? || filename.end_with?(".#{self.class.filetype}")
+          filetypes = Array(self.class.filetypes).map { |type| ".#{type}" }
+          if filetypes.empty? || filename.end_with?(*filetypes)
             StagedFile.new(filename)
           end
         end.compact
@@ -91,8 +92,11 @@ module Overcommit
           take_while { |line| !line.start_with?('diff --git') }
       end
 
-      def self.file_type(type)
-        self.filetype = type
+      class << self
+        def file_type(*types)
+          self.filetypes = types
+        end
+        alias file_types file_type
       end
     end
   end

data/lib/overcommit/plugins/pre_commit/ruby_style.rb

@@ -1,7 +1,7 @@
 module Overcommit::GitHook
   class RubyStyle < HookSpecificCheck
     include HookRegistry
-    file_type :rb
+    file_types :rb, :rake
 
     def run_check
       unless in_path?('rubocop')

data/lib/overcommit/plugins/pre_commit/ruby_syntax.rb

@@ -1,7 +1,7 @@
 module Overcommit::GitHook
   class RubySyntax < HookSpecificCheck
     include HookRegistry
-    file_type :rb
+    file_types :rb, :rake
 
     def run_check
       clean = true

data/lib/overcommit/reporter.rb

@@ -33,7 +33,7 @@ module Overcommit
         exit 1
       when :stop
         log.warning "*** One or more #{@name} checks needs attention"
-        log.warning "*** If you really want to commit, use SKIP_CHECKS"
+        log.warning '*** If you really want to commit, use SKIP_CHECKS'
         log.warning "*** (takes a space-separated list of checks to skip, or 'all')"
         exit 1
       end
@@ -59,7 +59,8 @@ module Overcommit
         log.error 'FAILED'
         print_report output
       when :warn
-        log.warning output
+        log.warning 'WARNING'
+        print_report output
       when :stop
         log.warning 'UH OH'
         print_report output
@@ -76,8 +77,14 @@ module Overcommit
       return :good
     end
 
-    def print_report(*report)
-      log.log report.flatten.map { |line| "    #{line}" }.join("\n")
+    OUTPUT_INDENT = ' ' * 4
+    def print_report(output)
+      unless output.empty?
+        # Take each line of output and add indentation so it nests under check
+        # name (except for the last newline if there is one)
+        output = OUTPUT_INDENT + output.gsub(/\n(?!$)/, "\n#{OUTPUT_INDENT}")
+        log.log output
+      end
     end
   end
 end

data/lib/overcommit/version.rb

@@ -1,3 +1,3 @@
 module Overcommit
-  VERSION = '0.2.1'
+  VERSION = '0.2.2'
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: overcommit
 version: !ruby/object:Gem::Version
-  version: 0.2.1
+  version: 0.2.2
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-07-20 00:00:00.000000000 Z
+date: 2013-07-25 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rspec