pre-commit 0.8.1 → 0.9.0

data/lib/pre-commit/checks/rubocop_check.rb

@@ -1,38 +1,15 @@
-require 'pre-commit/base'
 require 'pre-commit/utils'
 require 'rubocop'
+require 'stringio'
 
 module PreCommit
   class RubocopCheck
-
-    attr_accessor :type
-
-    def check_name
-      "Rubocop"
-    end
-
-    def initialize(type = :all)
-      @type = type
-    end
-
-    def files_to_check
-      case @type
-      when :new
-        Utils.new_files('.').split(" ")
-      else
-        Utils.staged_files('.').split(" ")
-      end
-    end
-
-    def reject_non_rb(staged_files)
-      staged_files.select { |f| f =~ /\.rb$/ }
-    end
-
-    def call
-      rb_files = reject_non_rb(files_to_check)
-      return true if rb_files.empty?
+    def self.call(staged_files)
+      staged_files = staged_files.grep(/\.rb$/)
+      return if staged_files.empty?
       config_file = `git config pre-commit.rubocop.config`.chomp
-      args = rb_files
+
+      args = staged_files
       if !config_file.empty?
         if !File.exist? config_file
           $stderr.puts "Warning: rubocop config file '" + config_file + "' does not exist"
@@ -43,13 +20,19 @@ module PreCommit
           args = ['-c', config_file] + args
         end
       end
-      run(args)
-    end
 
-    def run(rb_files)
-      rubocop = Rubocop::CLI.new
-      return rubocop.run(rb_files) == 0
+      success, captured = capture { Rubocop::CLI.new.run(args) == 0 }
+      captured unless success
     end
 
+    def self.capture
+      $stdout, stdout = StringIO.new, $stdout
+      $stderr, stderr = StringIO.new, $stderr
+      result = yield
+      [result, $stdout.string + $stderr.string]
+    ensure
+      $stdout = stdout
+      $stderr = stderr
+    end
   end
 end

data/lib/pre-commit/checks/ruby_symbol_hashrockets.rb

@@ -2,54 +2,13 @@ require 'pre-commit/utils'
 
 module PreCommit
   class RubySymbolHashrockets
-
-    attr_accessor :staged_files, :error_message
-
     HASHROCKET_PATTERN = '[^:](:{1}(?:\$|@|@@|[_A-Za-z])?\w*[=!?]?\s*=>\s*)'
 
-    def self.call
-      check = new
-      check.staged_files = Utils.staged_files('*')
-      result = check.run
-
-      if !result
-        $stderr.puts check.error_message
-        $stderr.puts
-        $stderr.puts 'pre-commit: You can bypass this check using `git commit -n`'
-        $stderr.puts
-      end
-
-      result
+    def self.call(staged_files)
+      return if staged_files.empty?
+      lines = `#{Utils.grep} '#{HASHROCKET_PATTERN}' #{staged_files.join(" ")}`.strip
+      return unless $?.success?
+      "detected :symbol => value hashrocket:\n#{lines}"
     end
-
-    def run
-      # There is nothing to check
-      return true if staged_files.empty?
-
-      if detected_bad_code?
-        @error_message = "pre-commit: detected :symbol => value hashrocket:\n"
-        @error_message += violations[:lines]
-
-        @passed = false
-      else
-        @passed = true
-      end
-
-      @passed
-    end
-
-    def detected_bad_code?
-      violations[:success]
-    end
-
-    def violations
-      @violations ||= begin
-        lines = `#{Utils.grep} '#{HASHROCKET_PATTERN}' #{staged_files}`
-        success = $?.exitstatus == 0
-
-        { :lines => lines, :success => success}
-      end
-    end
-
   end
 end

data/lib/pre-commit/checks/tabs_check.rb

@@ -0,0 +1,12 @@
+module PreCommit
+  class TabsCheck
+    LEADING_TAB_PATTERN = '^ *\t'
+
+    def self.call(staged_files)
+      return if staged_files.empty?
+      errors = `#{Utils.grep} '#{LEADING_TAB_PATTERN}' #{staged_files.join(" ")}`.strip
+      return unless $?.success?
+      "detected tab before initial space:\n#{errors}"
+    end
+  end
+end

data/lib/pre-commit/checks/whitespace_check.rb

@@ -0,0 +1,16 @@
+module PreCommit
+  class WhiteSpaceCheck
+    def self.call(_)
+      errors = `git diff-index --check --cached head -- 2>&1`
+      return if $?.success?
+
+      # Initial commit: diff against the empty tree object
+      if errors =~ /fatal: bad revision 'head'/
+        errors = `git diff-index --check --cached 4b825dc642cb6eb9a060e54bf8d69288fbee4904 -- 2>&1`
+        return if $?.success?
+      end
+
+      errors
+    end
+  end
+end

data/lib/pre-commit/checks.rb

@@ -1,10 +1,10 @@
-require 'support/all'
 require 'pre-commit/utils'
-require 'pre-commit/checks/merge_conflict'
-require 'pre-commit/checks/tabs'
-require 'pre-commit/checks/console_log'
+require 'pre-commit/checks/merge_conflict_check'
+require 'pre-commit/checks/tabs_check'
+require 'pre-commit/checks/console_log_check'
 require 'pre-commit/checks/debugger_check'
 require 'pre-commit/checks/local_check'
+require 'pre-commit/checks/nb_space_check'
 require 'pre-commit/checks/jslint_check'
 require 'pre-commit/checks/jshint_check'
 require 'pre-commit/checks/migration_check'
@@ -13,50 +13,36 @@ require 'pre-commit/checks/php_check'
 require 'pre-commit/checks/pry_check'
 require 'pre-commit/checks/rspec_focus_check'
 require 'pre-commit/checks/ruby_symbol_hashrockets'
+require 'pre-commit/checks/whitespace_check'
+require 'pre-commit/checks/closure_check'
+require 'pre-commit/checks/gemfile_path_check'
 begin
   require 'pre-commit/checks/rubocop_check'
 rescue LoadError # no rubocop
 end
 
 module PreCommit
-
-  WhiteSpace = lambda {
-    WhiteSpaceChecker.check
-  }
-
-  ClosureSyntaxCheck = lambda {
-    if File.exists?('public/javascripts') && (args = Utils.staged_files('public/javascripts')).size > 0
-      ClosureChecker.check(args.split(" "))
-    else
-      true
-    end
-  }
-
-  Checks = {
-    :white_space             => WhiteSpace,
-    :console_log             => ConsoleLog,
-    :js_lint_all             => JslintCheck.new(:all),
-    :js_lint_new             => JslintCheck.new(:new),
-    :jshint                  => JshintCheck.new,
+  CHECKS = {
+    :white_space             => WhiteSpaceCheck,
+    :console_log             => ConsoleLogCheck,
+    :js_lint                 => JslintCheck,
+    :jshint                  => JshintCheck,
     :debugger                => DebuggerCheck,
     :pry                     => PryCheck,
     :local                   => LocalCheck,
-    :tabs                    => Tabs,
-    :closure_syntax_check    => ClosureSyntaxCheck,
-    :merge_conflict          => MergeConflict,
-    :migrations              => MigrationCheck.new,
+    :nb_space                => NbSpaceCheck,
+    :tabs                    => TabsCheck,
+    :closure_syntax_check    => ClosureCheck,
+    :merge_conflict          => MergeConflictCheck,
+    :migrations              => MigrationCheck,
     :ci                      => CiCheck.new,
     :php                     => PhpCheck.new,
     :rspec_focus             => RSpecFocusCheck,
-    :ruby_symbol_hashrockets => RubySymbolHashrockets
+    :ruby_symbol_hashrockets => RubySymbolHashrockets,
+    :gemfile_path            => GemfilePathCheck
   }
 
-  if defined?(Rubocop)
-    Checks.merge!({
-      :rubocop_new           => RubocopCheck.new(:new),
-      :rubocop_all           => RubocopCheck.new(:all)
-    })
-  end
+  CHECKS[:rubocop] = RubocopCheck if defined?(Rubocop)
 
   # Can not delete this method with out a deprecation strategy.
   # It is refered to in the generated pre-commit hook in versions 0.0-0.1.1
@@ -73,18 +59,30 @@ module PreCommit
     checks_to_run = `git config pre-commit.checks`.chomp.split(/,\s*/).map(&:to_sym)
 
     if checks_to_run.empty?
-      Checks.values_at(:white_space, :console_log, :debugger, :pry, :tabs, :jshint,
-        :migrations, :merge_conflict, :local)
+      CHECKS.values_at(:white_space, :console_log, :debugger, :pry, :tabs, :jshint,
+        :migrations, :merge_conflict, :local, :nb_space)
     else
-      Checks.values_at(*checks_to_run)
+      [:js_lint, :rubocop].each do |check|
+        if checks_to_run.delete("#{check}_all".to_sym) || checks_to_run.delete("#{check}_new".to_sym)
+          $stderr.puts "please use just '#{check}' as check name"
+          checks_to_run << check
+        end
+      end
+
+      CHECKS.values_at(*checks_to_run)
     end.compact
   end
 
   def self.run
-    exit_status = self.checks_to_run.inject(true) do |acc, cmd|
-      cmd.call && acc
+    staged_files = Utils.staged_files
+    errors = checks_to_run.map { |cmd| cmd.call(staged_files.dup) }.compact
+    if errors.any?
+      puts "pre-commit: Stopping commit because of errors."
+      puts errors.join("\n")
+      puts "pre-commit: You can bypass this check using `git commit -n`"
+      exit 1
+    else
+      exit 0
     end
-
-    exit(exit_status ? 0 : 1)
   end
 end

data/lib/pre-commit/cli.rb

@@ -1,39 +1,12 @@
 require 'fileutils'
-require 'pre-commit/base'
 
 module PreCommit
   class Cli
 
     PRE_COMMIT_HOOK_PATH = '.git/hooks/pre-commit'
 
-    def answered_yes?(answer)
-      answer =~ /y\n/i || answer == "\n"
-    end
-
     def install
-      if File.exists?(PRE_COMMIT_HOOK_PATH)
-        ask_to_overwrite
-      end
-
-      install_pre_commit_hook
-    end
-
-    def ask_to_overwrite
-      puts "pre-commit: WARNING There is already a pre-commit hook installed in this git repo."
-      print "Would you like to overwrite it? [Yn] "
-      answer = $stdin.gets
-
-      if answered_yes?(answer)
-        FileUtils.rm(PRE_COMMIT_HOOK_PATH)
-      else
-        puts "Not overwriting existing hook: #{PRE_COMMIT_HOOK_PATH}"
-        puts
-        exit(1)
-      end
-    end
-
-    def install_pre_commit_hook
-      hook = File.join(PreCommit.root, 'templates', 'pre-commit-hook')
+      hook = File.expand_path("../support/templates/pre-commit-hook", __FILE__)
       FileUtils.cp(hook, PRE_COMMIT_HOOK_PATH)
       FileUtils.chmod(0755, PRE_COMMIT_HOOK_PATH)
     end

data/lib/pre-commit/utils.rb

@@ -1,20 +1,17 @@
 module PreCommit
   class Utils
 
-    def self.staged_files(*dirs)
-      dirs = reject_missing(dirs)
-
-      @staged_files ||= {}
-      @staged_files[dirs.join(' ')] ||= `git diff --cached --name-only --diff-filter=ACM #{dirs.join(' ')} | xargs`.chomp
-    end
-
-    def self.new_files(*dirs)
-      @new_files ||= {}
-      @new_files[dirs.join(' ')] ||= `git status --short #{dirs.join(' ')} | grep ^A | xargs`.chomp.split("A ").join(" ")
+    def self.staged_files
+      @staged_files ||= begin
+        files = `git diff --cached --name-only --diff-filter=ACM`.split
+        files.reject { |f| size = File.size(f); size > 1_000_000 || (size > 20 && binary?(f)) }
+      end
     end
 
-    def self.reject_missing(dirs)
-      dirs.reject { |dir| !File.exist?(dir) }
+    # from https://github.com/djberg96/ptools/blob/master/lib/ptools.rb#L90
+    def self.binary?(file)
+      s = (File.read(file, File.stat(file).blksize) || "").split(//)
+      ((s.size - s.grep(" ".."~").size) / s.size.to_f) > 0.30
     end
 
     def self.grep

metadata

@@ -1,30 +1,27 @@
 --- !ruby/object:Gem::Specification
 name: pre-commit
 version: !ruby/object:Gem::Version
-  version: 0.8.1
-  prerelease: 
+  version: 0.9.0
 platform: ruby
 authors:
 - Shajith Chacko, Josh Lubaway
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-06-10 00:00:00.000000000 Z
+date: 2013-08-26 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: execjs
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - '>='
       - !ruby/object:Gem::Version
         version: '0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - '>='
       - !ruby/object:Gem::Version
         version: '0'
 description: A git pre-commit hook written in ruby with a few more tricks up its sleeve
@@ -35,39 +32,39 @@ extensions: []
 extra_rdoc_files:
 - README.md
 files:
-- lib/pre-commit/base.rb
 - lib/pre-commit/checks/ci_check.rb
-- lib/pre-commit/checks/console_log.rb
+- lib/pre-commit/checks/closure_check.rb
+- lib/pre-commit/checks/console_log_check.rb
 - lib/pre-commit/checks/debugger_check.rb
+- lib/pre-commit/checks/gemfile_path_check.rb
 - lib/pre-commit/checks/js_check.rb
 - lib/pre-commit/checks/jshint_check.rb
 - lib/pre-commit/checks/jslint_check.rb
 - lib/pre-commit/checks/local_check.rb
-- lib/pre-commit/checks/merge_conflict.rb
+- lib/pre-commit/checks/merge_conflict_check.rb
 - lib/pre-commit/checks/migration_check.rb
+- lib/pre-commit/checks/nb_space_check.rb
 - lib/pre-commit/checks/php_check.rb
 - lib/pre-commit/checks/pry_check.rb
 - lib/pre-commit/checks/rspec_focus_check.rb
 - lib/pre-commit/checks/rubocop_check.rb
 - lib/pre-commit/checks/ruby_symbol_hashrockets.rb
-- lib/pre-commit/checks/tabs.rb
+- lib/pre-commit/checks/tabs_check.rb
+- lib/pre-commit/checks/whitespace_check.rb
 - lib/pre-commit/checks.rb
 - lib/pre-commit/cli.rb
 - lib/pre-commit/runner.rb
+- lib/pre-commit/support/closure/compiler.jar
+- lib/pre-commit/support/jshint/jshint.js
+- lib/pre-commit/support/jslint/lint.js
+- lib/pre-commit/support/templates/pre-commit-hook
 - lib/pre-commit/utils.rb
 - lib/pre-commit.rb
-- lib/support/all.rb
-- lib/support/closure/closure_checker.rb
-- lib/support/closure/compiler.jar
-- lib/support/jshint/jshint.js
-- lib/support/jslint/lint.js
-- lib/support/whitespace/whitespace
-- lib/support/whitespace/whitespace_checker.rb
-- templates/pre-commit-hook
 - README.md
 - bin/pre-commit
 homepage: http://github.com/jish/pre-commit
 licenses: []
+metadata: {}
 post_install_message: 
 rdoc_options:
 - --main
@@ -75,21 +72,20 @@ 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: 1.8.23
+rubygems_version: 2.0.2
 signing_key: 
 specification_version: 3
 summary: A slightly better git pre-commit hook
 test_files: []
+has_rdoc: 

data/lib/pre-commit/base.rb

@@ -1,7 +0,0 @@
-module PreCommit
-
-  def self.root
-    File.expand_path('../../..', __FILE__)
-  end
-
-end

data/lib/pre-commit/checks/console_log.rb

@@ -1,43 +0,0 @@
-module PreCommit
-  class ConsoleLog
-
-    attr_accessor :staged_files, :error_message
-
-    def self.call(quiet=false)
-      check = new
-      check.staged_files = Utils.staged_files('public/javascripts')
-
-      result = check.run
-      if !quiet && !result
-        puts check.error_message
-      end
-      result
-    end
-
-    def run
-      return true if staged_js_files.empty?
-      if detected_bad_code?
-        @error_message = "pre-commit: console.log found:\n"
-        @error_message += instances_of_console_log_violations
-        false
-      else
-        true
-      end
-    end
-
-    def detected_bad_code?
-      system("grep -v \/\/ #{staged_js_files} | grep -qe \"console\\.log\"")
-    end
-
-    def instances_of_console_log_violations
-      `grep -nHe \"console\\.log\" #{staged_js_files}`
-    end
-
-    def staged_js_files
-      @staged_js_files ||= staged_files.split(" ").select do |file|
-        File.extname(file) == ".js"
-      end.join(" ")
-    end
-
-  end
-end

data/lib/pre-commit/checks/merge_conflict.rb

@@ -1,34 +0,0 @@
-module PreCommit
-  class MergeConflict
-
-    attr_accessor :staged_files
-
-    def self.call
-      check = new
-      check.staged_files = Utils.staged_files('.')
-      check.run
-    end
-
-    def run
-      if detected_bad_code?
-        $stderr.puts 'pre-commit: detected a merge conflict'
-        $stderr.puts errors
-        $stderr.puts
-        $stderr.puts 'pre-commit: You can bypass this check using `git commit -n`'
-        $stderr.puts
-        false
-      else
-        true
-      end
-    end
-
-    def detected_bad_code?
-      system("grep '<<<<<<<' #{staged_files} --quiet")
-    end
-
-    def errors
-      `grep -nH '<<<<<<<' #{staged_files}`
-    end
-
-  end
-end

data/lib/pre-commit/checks/tabs.rb

@@ -1,54 +0,0 @@
-require 'pre-commit/utils'
-
-module PreCommit
-  class Tabs
-
-    attr_accessor :staged_files, :error_message
-
-    # Maintaining the functionality of `call` for backwards compatibility
-    # Currently, the call method is expected to:
-    # * run a check
-    # * print any corresponding error messages if the check fails
-    def self.call
-      check = new
-      check.staged_files = Utils.staged_files('*')
-      result = check.run
-
-      if !result
-        $stderr.puts check.error_message
-        $stderr.puts
-        $stderr.puts 'pre-commit: You can bypass this check using `git commit -n`'
-        $stderr.puts
-      end
-
-      result
-    end
-
-    def run
-      # There is nothing to check
-      if staged_files.empty?
-        return true
-      end
-
-      if detected_bad_code?
-        @error_message = "pre-commit: detected tab before initial space:\n"
-        @error_message += violations
-
-        @passed = false
-      else
-        @passed = true
-      end
-    end
-
-    LEADING_TAB_PATTERN = '^ *\t'
-
-    def detected_bad_code?
-      system("#{Utils.grep} -q '#{LEADING_TAB_PATTERN}' #{staged_files}")
-    end
-
-    def violations
-      `#{Utils.grep} '#{LEADING_TAB_PATTERN}' #{staged_files}`
-    end
-
-  end
-end

data/lib/support/all.rb

@@ -1,2 +0,0 @@
-require 'support/closure/closure_checker'
-require 'support/whitespace/whitespace_checker'

data/lib/support/closure/closure_checker.rb

@@ -1,10 +0,0 @@
-module PreCommit
-  class ClosureChecker
-    CLOSURE_PATH = File.join(File.dirname(__FILE__),"compiler.jar")
-
-    def self.check(files)
-      js_args = files.map {|arg| "--js #{arg}"}.join(' ')
-      system("java -jar #{CLOSURE_PATH} #{js_args} --js_output_file /tmp/jammit.js")
-    end
-  end
-end

data/lib/support/whitespace/whitespace

@@ -1,46 +0,0 @@
-#!/bin/sh
-#
-# An example hook script to verify what is about to be committed.
-# Called by "git commit" with no arguments.  The hook should
-# exit with non-zero status after issuing an appropriate message if
-# it wants to stop the commit.
-#
-# To enable this hook, rename this file to "pre-commit".
-
-if git rev-parse --verify HEAD >/dev/null 2>&1
-then
-	against=HEAD
-else
-	# Initial commit: diff against an empty tree object
-	against=4b825dc642cb6eb9a060e54bf8d69288fbee4904
-fi
-
-# If you want to allow non-ascii filenames set this variable to true.
-allownonascii=$(git config hooks.allownonascii)
-
-# Cross platform projects tend to avoid non-ascii filenames; prevent
-# them from being added to the repository. We exploit the fact that the
-# printable range starts at the space character and ends with tilde.
-if [ "$allownonascii" != "true" ] &&
-	# Note that the use of brackets around a tr range is ok here, (it's
-	# even required, for portability to Solaris 10's /usr/bin/tr), since
-	# the square bracket bytes happen to fall in the designated range.
-	test "$(git diff --cached --name-only --diff-filter=A -z $against |
-	  LC_ALL=C tr -d '[ -~]\0')"
-then
-	echo "Error: Attempt to add a non-ascii file name."
-	echo
-	echo "This can cause problems if you want to work"
-	echo "with people on other platforms."
-	echo
-	echo "To be portable it is advisable to rename the file ..."
-	echo
-	echo "If you know what you are doing you can disable this"
-	echo "check using:"
-	echo
-	echo "  git config hooks.allownonascii true"
-	echo
-	exit 1
-fi
-
-exec git diff-index --check --cached $against --