Merge remote-tracking branch 'upstream/master' into marcosvm/separate_gofmt_and_go_build

marcosvm · marcosvm · commit 5b5b9bc0b2cb · 2014-09-13T17:23:24.000-07:00
diff --git a/.travis.yml b/.travis.yml
@@ -14,3 +14,5 @@ rvm:
   - jruby
 matrix:
   fast_finish: true
+  allow_failures:
+    - rvm: jruby
diff --git a/README.md b/README.md
@@ -1,11 +1,11 @@
 A better pre-commit hook for git.
 
-[![Current version](https://badge.fury.io/rb/pre-commit.png)](https://rubygems.org/gems/pre-commit)
-[![Code Climate](https://codeclimate.com/github/jish/pre-commit.png)](https://codeclimate.com/github/jish/pre-commit)
-[![Coverage Status](https://coveralls.io/repos/jish/pre-commit/badge.png?branch=master)](https://coveralls.io/r/jish/pre-commit?branch=master)
-[![Build status](https://secure.travis-ci.org/jish/pre-commit.png?branch=master)](https://travis-ci.org/jish/pre-commit)
+[![Current version](https://badge.fury.io/rb/pre-commit.svg)](https://rubygems.org/gems/pre-commit)
+[![Code Climate](https://img.shields.io/codeclimate/github/jish/pre-commit.svg)](https://codeclimate.com/github/jish/pre-commit)
+[![Coverage Status](https://img.shields.io/coveralls/jish/pre-commit/master.svg)](https://coveralls.io/r/jish/pre-commit?branch=master)
+[![Build status](https://travis-ci.org/jish/pre-commit.svg?branch=master)](https://travis-ci.org/jish/pre-commit)
 [![Dependency Status](https://gemnasium.com/jish/pre-commit.png)](https://gemnasium.com/jish/pre-commit)
-[![Documentation](http://b.repl.ca/v1/yard-docs-blue.png)](http://rubydoc.info/gems/pre-commit/frames)
+[![Documentation](https://img.shields.io/badge/yard-docs-blue.svg)](http://rubydoc.info/gems/pre-commit/frames)
 
 ## Installation
 
@@ -95,6 +95,7 @@ This functionality was added in version `0.17.0`
 ```bash
 pre-commit run              # run on the files added to index not yet commited
 pre-commit run all          # run on all files in current directory
+pre-commit run git          # run on all git-tracked files, respect gitignore (added in 0.19.0)
 pre-commit run <file-list>  # run on the list of files, patterns not supported
 ```
 
diff --git a/changelog.md b/changelog.md
@@ -1,3 +1,15 @@
+* Upgrade JSHint to 2.5.4
+
+## 0.19.0
+
+* Add a `pre-commit run git` command to run `pre-commit` checks on all files tracked by git.
+* Filenames containing spaces no longer break the Grep check
+
+## 0.18.0
+
+* Improve version number discovery in schema and migration files so that a blank `schema.rb` (with version `0`) does not fail the migration check
+* Fix `pre-commit run <file-list>`.
+
 ## 0.17.0
 
 * Fix a bug where `pre-commit list` would bomb when you had older versions of `pre-commit` installed
diff --git a/lib/plugins/pre_commit/checks/jshint.rb b/lib/plugins/pre_commit/checks/jshint.rb
@@ -4,17 +4,8 @@ module PreCommit
   module Checks
     class Jshint < Js
 
-      def js_config
-        if config_file
-          ExecJS.exec("return (#{File.read(config_file)});")
-        else
-          {}
-        end
-      end
-
       def run_check(file)
-        context = ExecJS.compile(File.read(linter_src))
-        context.call("JSHINT", File.read(file), js_config, js_config["globals"])
+        context.call("JSHINT._getErrors", File.read(file), js_config, js_config["globals"])
       end
 
       def linter_src
@@ -29,6 +20,25 @@ def self.description
         "Checks javascript files with JSHint."
       end
 
+      private
+
+      def context
+        @context ||= ExecJS.compile(File.read(linter_src) << <<-JAVASCRIPT)
+          ;JSHINT._getErrors = function(source, options, globals) {
+            JSHINT(source, options, globals);
+            return JSHINT.errors;
+          }
+        JAVASCRIPT
+      end
+
+      def js_config
+        @js_config ||= if config_file
+          ExecJS.exec("return (#{File.read(config_file)});")
+        else
+          {}
+        end
+      end
+
     end
   end
 end
diff --git a/lib/plugins/pre_commit/checks/migration.rb b/lib/plugins/pre_commit/checks/migration.rb
@@ -3,36 +3,56 @@
 module PreCommit
   module Checks
     class Migration < Plugin
+      VERSION_PATTERN = /(\d{14})/
+
+      self::VersionedFile = Struct.new(:file, :version) do
+        alias_method :to_s, :file
+      end
+
       def self.aliases
         [:migrations]
       end
 
       def call(staged_files)
-        migration_files = migration_files(staged_files)
-        schema_files = schema_files(staged_files)
+        migration_files = versioned_migration_files(staged_files)
+        schema_files = versioned_schema_files(staged_files)
 
         if migration_files.any? && schema_files.none?
           "It looks like you're adding a migration, but did not update the schema file"
         elsif migration_files.none? && schema_files.any?
           "You're trying to change the schema without adding a migration file"
         elsif migration_files.any? && schema_files.any?
-          versions = migration_files.map { |f| f[/\d+/] }
-          schema = schema_files.map { |f| File.read(f) }.join
-          missing_versions = versions.select { |version| !schema.include?(version) }
+          migration_versions = migration_files.map(&:version)
+          missing_versions = migration_versions - schema_files.map(&:version)
           if missing_versions.any?
-            "You did not add the schema versions for #{versions.join(', ')} to #{schema_files.join(' or ')}"
+            "You did not add the schema versions for "\
+            "#{migration_versions.join(', ')} to #{schema_files.join(' or ')}"
           end
         end
       end
 
       private
 
-      def migration_files(staged_files)
-        staged_files.grep(/db\/migrate\/.*\.rb/)
+      def versioned_migration_files(staged_files)
+        files = staged_files.grep(/db\/migrate\/.*\.rb/)
+
+        files.each_with_object([]) do |f, result|
+          if f =~ VERSION_PATTERN
+            result << VersionedFile.new(f, $1)
+          end
+        end
       end
 
-      def schema_files(staged_files)
-        staged_files.select { |f| File.basename(f) =~ /schema\.rb|structure.*\.sql/ }
+      def versioned_schema_files(staged_files)
+        files = staged_files.select do |f|
+          File.basename(f) =~ /schema\.rb|structure.*\.sql/
+        end
+
+        files.each_with_object([]) do |f, result|
+          if IO.read(f) =~ VERSION_PATTERN
+            result << VersionedFile.new(f, $1)
+          end
+        end
       end
 
       def self.description
diff --git a/lib/plugins/pre_commit/checks/rspec_focus.rb b/lib/plugins/pre_commit/checks/rspec_focus.rb
@@ -13,7 +13,7 @@ def message
       end
 
       def pattern
-        "':focus'"
+        "'(describe|context|it).*(:focus|focus:).*do'"
       end
 
       def self.description
diff --git a/lib/pre-commit/checks/grep.rb b/lib/pre-commit/checks/grep.rb
@@ -1,4 +1,5 @@
 require 'pre-commit/checks/plugin'
+require 'shellwords'
 
 module PreCommit
   module Checks
@@ -30,7 +31,7 @@ def pattern
     # general code:
 
       def call(staged_files)
-        staged_files = files_filter(staged_files)
+        staged_files = files_filter(staged_files).map(&:shellescape)
         return if staged_files.empty?
         errors = `#{grep} #{pattern} #{staged_files.join(" ")}#{extra_grep}`
         return unless $?.success?
diff --git a/lib/pre-commit/cli.rb b/lib/pre-commit/cli.rb
@@ -33,7 +33,7 @@ def execute_help(*args)
 
     def execute_run(*args)
       require 'pre-commit/runner'
-      PreCommit::Runner.new.run(*args)
+      PreCommit::Runner.new.run(*args) and puts "No failed checks."
     end
 
     def execute_install(key = nil, *args)
diff --git a/lib/pre-commit/runner.rb b/lib/pre-commit/runner.rb
@@ -1,4 +1,6 @@
 require 'pluginator'
+require 'benchmark'
+
 require 'pre-commit/utils/staged_files'
 require 'pre-commit/configuration'
 require 'pre-commit/list_evaluator'
@@ -7,13 +9,14 @@ module PreCommit
   class Runner
     include PreCommit::Utils::StagedFiles
 
-    attr_reader :pluginator, :config
+    attr_reader :pluginator, :config, :debug
 
     def initialize(stderr = nil, staged_files = nil, config = nil, pluginator = nil)
       @stderr       = (stderr       or $stderr)
       @pluginator   = (pluginator   or PreCommit.pluginator)
       @config       = (config       or PreCommit::Configuration.new(@pluginator))
       @staged_files = staged_files
+      @debug = ENV["PRE_COMMIT_DEBUG"]
     end
 
     def run(*args)
@@ -36,7 +39,17 @@ def show_output(name, list)
     end
 
     def execute(list)
-      list.map{|cmd| cmd.new(pluginator, config, list).call(staged_files.dup) }.compact
+      list.map do |cmd|
+        result = nil
+
+        seconds = Benchmark.realtime do
+          result = cmd.new(pluginator, config, list).call(staged_files.dup)
+        end
+
+        puts "#{cmd} #{seconds*1000}ms" if debug
+
+        result
+      end.compact
     end
 
     def list_to_run(name)
diff --git a/lib/pre-commit/support/jshint/jshint.js b/lib/pre-commit/support/jshint/jshint.js
diff --git a/lib/pre-commit/utils/staged_files.rb b/lib/pre-commit/utils/staged_files.rb
@@ -5,8 +5,9 @@ module StagedFiles
       def set_staged_files(*args)
         case args[0].to_s
         when "all" then staged_files_all
+        when "git" then staged_files_git_all
         when "" then staged_files
-        else staged_files=args
+        else self.staged_files=args
         end
       end
 
@@ -22,6 +23,10 @@ def staged_files_all
         @staged_files = filter_files(staged_from_dir)
       end
 
+      def staged_files_git_all
+        @staged_files = filter_files(staged_from_git_all)
+      end
+
     private
       # from https://github.com/djberg96/ptools/blob/master/lib/ptools.rb#L90
       def binary?(file)
@@ -31,6 +36,7 @@ def binary?(file)
 
       def filter_files(files)
         files.reject do |f|
+          !File.exists?(f) ||
           File.directory?(f) ||
           (
             size = File.size(f)
@@ -43,6 +49,10 @@ def staged_from_git
         `git diff --cached --name-only --diff-filter=ACM`.split(/\n/)
       end
 
+      def staged_from_git_all
+        `git ls-files`.split(/\n/)
+      end
+
       def staged_from_dir
         Dir["**/*"]
       end
diff --git a/pre-commit.gemspec b/pre-commit.gemspec
@@ -2,7 +2,7 @@
 
 Gem::Specification.new do |s|
   s.name = %q{pre-commit}
-  s.version = "0.17.0"
+  s.version = "0.19.0"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["Shajith Chacko, Josh Lubaway"]
diff --git a/test/files/filename with spaces.rb b/test/files/filename with spaces.rb
@@ -0,0 +1 @@
+test
diff --git a/test/files/rspec_focus_bad_spec.rb b/test/files/rspec_focus_bad_spec.rb
@@ -0,0 +1,22 @@
+describe RspecFocusChecks do
+  context 'with old hash syntax', :focus => true do
+    describe 'focus on describe', :focus => true do
+      it 'alerts with focus on example too', :focus => true do
+      end
+    end
+  end
+
+  context 'with new hash syntax', focus: true do
+    describe 'focus on describe', focus: true do
+      it 'alerts with focus on example too', focus: true do
+      end
+    end
+  end
+
+  context 'with symbols as keys', :focus do
+    describe 'focus on describe', :focus do
+      it 'alerts with focus on example too', :focus do
+      end
+    end
+  end
+end
diff --git a/test/files/rspec_focus_good_spec.rb b/test/files/rspec_focus_good_spec.rb
@@ -0,0 +1,14 @@
+describe FocusModel do
+  it 'should not trigger the pre-commit focus detector with old hash syntax' do
+    expect(FocusModel.new(:focus => true)).to be_valid
+  end
+
+  it 'should not trigger the pre-commit focus detector with new hash syntax' do
+    expect(FocusModel.new(focus: true)).to be_valid
+  end
+
+  it 'should not trigger the pre-commit focus detector with a has key' do
+    focus = FocusModel.new
+    expect(focus.value_for[:focus]).to eq 'undetected'
+  end
+end
diff --git a/test/unit/plugins/pre_commit/checks/jshint_test.rb b/test/unit/plugins/pre_commit/checks/jshint_test.rb
@@ -25,7 +25,14 @@
 
   it "fails if file contains debugger" do
     check.run_check(fixture_file('bad_file.js')).must_equal [{
-      "id"=>"(error)", "raw"=>"Missing semicolon.", "evidence"=>"}", "line"=>4, "character"=>2, "reason"=>"Missing semicolon."
+      "id" => "(error)",
+      "raw" => "Missing semicolon.",
+      "evidence" => "}",
+      "line" => 4,
+      "character" => 2,
+      "reason" => "Missing semicolon.",
+      "code" => "W033",
+      "scope" => "(main)"
     }]
   end
 
diff --git a/test/unit/plugins/pre_commit/checks/migration_test.rb b/test/unit/plugins/pre_commit/checks/migration_test.rb
diff --git a/test/unit/plugins/pre_commit/checks/rspec_focus_test.rb b/test/unit/plugins/pre_commit/checks/rspec_focus_test.rb
diff --git a/test/unit/pre-commit/checks/grep_test.rb b/test/unit/pre-commit/checks/grep_test.rb
diff --git a/test/unit/pre-commit/checks/js_test.rb b/test/unit/pre-commit/checks/js_test.rb
diff --git a/test/unit/pre-commit/runner_test.rb b/test/unit/pre-commit/runner_test.rb
diff --git a/test/unit/pre-commit/utils/staged_files_test.rb b/test/unit/pre-commit/utils/staged_files_test.rb
