overcommit 0.1.6 → 0.1.7

data/bin/hooks/post-merge

@@ -9,12 +9,12 @@ submodule_status.each_line do |line|
 
   if line.match(/^\+/)
     # The second word is the submodule directory.
-    updated_submodules << line.split(" ")[1]
+    updated_submodules << line.split(' ')[1]
   end
 end
 
 if updated_submodules.length > 0
-  puts "The following git submodules are out of date:"
+  puts 'The following git submodules are out of date:'
   updated_submodules.each do |submodule|
     puts "\t#{submodule}"
   end

data/lib/overcommit/cli.rb

@@ -24,7 +24,7 @@ module Overcommit
 
         opts.on('-l', '--list-templates', 'List built-in templates') do
           Overcommit.config.templates.each_pair do |name, configuration|
-            bold name
+            log.bold name
             log.log YAML.dump(configuration), ''
           end
           exit 0

data/lib/overcommit/git_hook.rb

@@ -59,7 +59,7 @@ module Overcommit
             hook_name = Utils.underscorize(check.name).split('/').last
 
             check.skippable? && (skip_all || skip_checks.include?(hook_name))
-          end
+          end.sort_by(&:name)
         end
       end
 

data/lib/overcommit/hook_specific_check.rb

@@ -28,6 +28,10 @@ module Overcommit
         def skippable?
           !required
         end
+
+        def friendly_name
+          Overcommit::Utils.underscorize name.to_s.split('::').last
+        end
       end
 
       def initialize(*args)
@@ -35,7 +39,7 @@ module Overcommit
       end
 
       def name
-        Overcommit::Utils.underscorize self.class.name.to_s.split('::').last
+        self.class.friendly_name
       end
 
       def skip?
@@ -74,13 +78,13 @@ module Overcommit
         @arguments[0]
       end
 
-      def commit_message
-        @commit_message ||= ::IO.readlines(commit_message_file)
+      def raw_commit_message
+        @raw_commit_message ||= ::IO.readlines(commit_message_file)
       end
 
       # Strip comments and diff (from git-commit --verbose)
-      def user_commit_message
-        @user_commit_message ||= commit_message.
+      def commit_message
+        @commit_message ||= raw_commit_message.
           reject     { |line| line =~ /^#/ }.
           take_while { |line| !line.start_with?('diff --git') }
       end

data/lib/overcommit/logger.rb

@@ -5,32 +5,44 @@ module Overcommit
   class Logger
     include Singleton
 
+    attr_accessor :output
+
     def partial(*args)
-      print *args
+      out.print *args
     end
 
     def log(*args)
-      puts *args
+      out.puts *args
     end
 
     def bold(str)
-      log "\033[1;37m#{str}\033[0m"
+      color('1;37', str)
     end
 
     def error(str)
-      log "\033[31m#{str}\033[0m"
+      color(31, str)
     end
 
     def success(str)
-      log "\033[32m#{str}\033[0m"
+      color(32, str)
     end
 
     def warning(str)
-      log "\033[33m#{str}\033[0m"
+      color(33, str)
     end
 
     def notice(str)
-      log "\033[1;33m#{str}\033[0m"
+      color('1;33', str)
+    end
+
+    def out
+      self.output ||= $stdout
+    end
+
+  private
+
+    def color(code, str)
+      log(out.isatty ? "\033[#{code}m#{str}\033[0m" : str)
     end
   end
 end

data/lib/overcommit/plugins/commit_msg/hard_tabs.rb

@@ -0,0 +1,14 @@
+module Overcommit::GitHook
+  class HardTabs < HookSpecificCheck
+    include HookRegistry
+
+    def run_check
+      # Catches hard tabs entered by the user (not auto-generated)
+      if commit_message.join.index /\t/
+        return :warn, "Don't use hard tabs in commit messages"
+      end
+
+      :good
+    end
+  end
+end

data/lib/overcommit/plugins/commit_msg/release_note.rb

@@ -4,7 +4,7 @@ module Overcommit::GitHook
 
     EMPTY_RELEASE_NOTE = /^release notes?\s*[:.]?\n{2,}/im
     def run_check
-      if user_commit_message.join =~ EMPTY_RELEASE_NOTE
+      if commit_message.join =~ EMPTY_RELEASE_NOTE
         strip_release_note
         return :warn, 'Empty release note found, automatically removed'
       end
@@ -15,7 +15,7 @@ module Overcommit::GitHook
   private
 
     def strip_release_note
-      stripped_message = user_commit_message.join.sub(EMPTY_RELEASE_NOTE, '')
+      stripped_message = commit_message.join.sub(EMPTY_RELEASE_NOTE, '')
 
       ::File.open(commit_message_file, 'w') do |file|
         file.write(stripped_message)

data/lib/overcommit/plugins/commit_msg/russian_novel.rb

@@ -6,7 +6,7 @@ module Overcommit::GitHook
 
     RUSSIAN_NOVEL_LENGTH = 30
     def run_check
-      if user_commit_message.length > RUSSIAN_NOVEL_LENGTH
+      if commit_message.length > RUSSIAN_NOVEL_LENGTH
         return :warn, 'You seem to have authored a Russian novel; congratulations!'
       end
 

data/lib/overcommit/plugins/commit_msg/single_line_subject.rb

@@ -0,0 +1,13 @@
+module Overcommit::GitHook
+  class SingleLineSubject < HookSpecificCheck
+    include HookRegistry
+
+    def run_check
+      unless commit_message[1].to_s.strip.empty?
+        return :warn, 'Subject should be a single line'
+      end
+
+      :good
+    end
+  end
+end

data/lib/overcommit/plugins/commit_msg/text_width.rb

@@ -3,11 +3,11 @@ module Overcommit::GitHook
     include HookRegistry
 
     def run_check
-      if user_commit_message.first.size > 60
+      if commit_message.first.size > 60
         return :warn, 'Please keep the subject < ~60 characters'
       end
 
-      user_commit_message.each do |line|
+      commit_message.each do |line|
         chomped = line.chomp
         if chomped.size > 72
           return :warn, "> 72 characters, please hard wrap: '#{chomped}'"

data/lib/overcommit/plugins/commit_msg/trailing_period.rb

@@ -4,7 +4,7 @@ module Overcommit::GitHook
 
     def run_check
       if commit_message[0].rstrip.end_with?('.')
-        return :warn, 'Please omit trailing period from commit message subject.'
+        return :warn, 'Please omit trailing period from commit message subject'
       end
 
       :good

data/lib/overcommit/reporter.rb

@@ -3,12 +3,12 @@ module Overcommit
     def initialize(name, checks)
       @name    = name
       @checks  = checks
-      @width   = 70 - (@checks.map { |s| s.name.length }.max || 0)
+      @width   = 60 - (@checks.map { |s| s.friendly_name.length }.max || 0)
       @results = []
     end
 
     def with_status(check, &block)
-      title = "  Checking #{check.name}..."
+      title = "  Checking #{check.name}"
       log.partial title unless check.stealth?
 
       status, output = yield

data/lib/overcommit/version.rb

@@ -1,3 +1,3 @@
 module Overcommit
-  VERSION = '0.1.6'
+  VERSION = '0.1.7'
 end

metadata

@@ -1,27 +1,30 @@
 --- !ruby/object:Gem::Specification
 name: overcommit
 version: !ruby/object:Gem::Version
-  version: 0.1.6
+  version: 0.1.7
+  prerelease: 
 platform: ruby
 authors:
 - Causes Engineering
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-06-04 00:00:00.000000000 Z
+date: 2013-06-10 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rspec
   requirement: !ruby/object:Gem::Requirement
+    none: false
     requirements:
-    - - '>='
+    - - ! '>='
       - !ruby/object:Gem::Version
         version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
+    none: false
     requirements:
-    - - '>='
+    - - ! '>='
       - !ruby/object:Gem::Version
         version: '0'
 description: Overcommit is a utility to install and extend Git hooks
@@ -31,74 +34,77 @@ executables:
 extensions: []
 extra_rdoc_files: []
 files:
-- lib/overcommit/cli.rb
-- lib/overcommit/configuration.rb
-- lib/overcommit/errors.rb
-- lib/overcommit/git_hook.rb
-- lib/overcommit/hook_specific_check.rb
-- lib/overcommit/hooks/commit_msg.rb
-- lib/overcommit/hooks/pre_commit.rb
-- lib/overcommit/installer.rb
 - lib/overcommit/logger.rb
-- lib/overcommit/plugins/commit_msg/change_id.rb
-- lib/overcommit/plugins/commit_msg/release_note.rb
+- lib/overcommit/installer.rb
+- lib/overcommit/hook_specific_check.rb
+- lib/overcommit/reporter.rb
+- lib/overcommit/plugins/commit_msg/hard_tabs.rb
 - lib/overcommit/plugins/commit_msg/russian_novel.rb
+- lib/overcommit/plugins/commit_msg/release_note.rb
+- lib/overcommit/plugins/commit_msg/single_line_subject.rb
+- lib/overcommit/plugins/commit_msg/change_id.rb
 - lib/overcommit/plugins/commit_msg/text_width.rb
 - lib/overcommit/plugins/commit_msg/trailing_period.rb
-- lib/overcommit/plugins/pre_commit/author_name.rb
+- lib/overcommit/plugins/pre_commit/js_syntax.rb
+- lib/overcommit/plugins/pre_commit/test_history.rb
+- lib/overcommit/plugins/pre_commit/yaml_syntax.rb
+- lib/overcommit/plugins/pre_commit/python_flake8.rb
 - lib/overcommit/plugins/pre_commit/causes_email.rb
-- lib/overcommit/plugins/pre_commit/coffee_lint.rb
-- lib/overcommit/plugins/pre_commit/css_linter.rb
+- lib/overcommit/plugins/pre_commit/js_console_log.rb
+- lib/overcommit/plugins/pre_commit/author_name.rb
 - lib/overcommit/plugins/pre_commit/erb_syntax.rb
+- lib/overcommit/plugins/pre_commit/scss_lint.rb
+- lib/overcommit/plugins/pre_commit/coffee_lint.rb
 - lib/overcommit/plugins/pre_commit/haml_syntax.rb
-- lib/overcommit/plugins/pre_commit/js_console_log.rb
-- lib/overcommit/plugins/pre_commit/js_syntax.rb
-- lib/overcommit/plugins/pre_commit/python_flake8.rb
+- lib/overcommit/plugins/pre_commit/whitespace.rb
 - lib/overcommit/plugins/pre_commit/restricted_paths.rb
 - lib/overcommit/plugins/pre_commit/ruby_syntax.rb
-- lib/overcommit/plugins/pre_commit/scss_lint.rb
-- lib/overcommit/plugins/pre_commit/test_history.rb
-- lib/overcommit/plugins/pre_commit/whitespace.rb
-- lib/overcommit/plugins/pre_commit/yaml_syntax.rb
-- lib/overcommit/reporter.rb
-- lib/overcommit/utils.rb
+- lib/overcommit/plugins/pre_commit/css_linter.rb
+- lib/overcommit/git_hook.rb
+- lib/overcommit/errors.rb
+- lib/overcommit/cli.rb
+- lib/overcommit/configuration.rb
 - lib/overcommit/version.rb
+- lib/overcommit/hooks/pre_commit.rb
+- lib/overcommit/hooks/commit_msg.rb
+- lib/overcommit/utils.rb
 - lib/overcommit.rb
-- bin/hooks/commit-msg
-- bin/hooks/post-checkout
-- bin/hooks/post-merge
-- bin/hooks/pre-commit
-- bin/hooks/prepare-commit-msg
 - bin/overcommit
 - bin/run-hook
+- bin/scripts/jshint.js
+- bin/scripts/index-tags
 - bin/scripts/csslint-rhino.js
 - bin/scripts/gerrit-change-id
-- bin/scripts/index-tags
-- bin/scripts/jshint.js
 - bin/scripts/jshint_runner.js
+- bin/hooks/commit-msg
+- bin/hooks/pre-commit
+- bin/hooks/post-merge
+- bin/hooks/post-checkout
+- bin/hooks/prepare-commit-msg
 - config/templates.yml
 homepage: http://github.com/causes/overcommit
 licenses:
 - MIT
-metadata: {}
 post_install_message: 
 rdoc_options: []
 require_paths:
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement
+  none: false
   requirements:
-  - - '>='
+  - - ! '>='
     - !ruby/object:Gem::Version
       version: '0'
 required_rubygems_version: !ruby/object:Gem::Requirement
+  none: false
   requirements:
-  - - '>='
+  - - ! '>='
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.0.2
+rubygems_version: 1.8.23
 signing_key: 
-specification_version: 4
+specification_version: 3
 summary: Opinionated Git hook manager
 test_files: []

checksums.yaml

@@ -1,7 +0,0 @@
----
-SHA1:
-  metadata.gz: 8705a9603730e08028af8ed52da1d89b34701870
-  data.tar.gz: 36da43665b7fc82ac9e527a5bed18fe26343d072
-SHA512:
-  metadata.gz: 02a1281d19da82fa562078b4c783f652b95e3eaa082cd938aa4507ff347e88206df91a892695084d78902340d6fed1ef71191a7c8635a415466bbf7d807ea785
-  data.tar.gz: 69850c03a18dd3831710074f0985c236f50b570f10a866fcae16314570a9b35594c5153df165078c731548292b98197616809a17f7740160695a7e7f7fc2f872