pre-commit 0.17.0 → 0.18.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: c7c3a12b035bf764791d70ec6cb4fba9fd3778d6
-  data.tar.gz: ec677fe164684322255b950dd125571c202dcd72
+  metadata.gz: 4ab21a6aa71a872a9bcd1764a116ccb93bfd9ac6
+  data.tar.gz: fbc548adf285e5872c4b14b633f108eb28a62c66
 SHA512:
-  metadata.gz: 025a3bc6ada1545472d509af763ae76151c7506fe417165392cdea1589b349a7b3cd3e9a2a77ff43f904ac4761528b83d5c5ddedb62ce97c953c6a4ee1125663
-  data.tar.gz: b7891532e91f04eda649a830e341ceab2ef01c7f831119be762e88241357c30efaa22789b0f480777a7aea83aad08acb16b5a2f31af6eb10f65bf7c4a84b3447
+  metadata.gz: 01f05a9e0cb5323a53afade54f4528c7de3957dc39eea2c68ffc1607a95b1281a5fc39c5756471e4f4e6b7146450540cb34351a782b55a27ed45fb71dcef70c3
+  data.tar.gz: 884e6682da33909cda2f6340fbf495226eb107d20c2aafb28ebf07e8f2aa0fea4b18579ab8bcf215718c1d01ac439815d403fe8515a1e90d014496e5afb4a8d6

data/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
 
@@ -74,7 +74,7 @@ Example move `jshint` from `checks` to `warnings` in `yaml` provider and save co
 ```bash
 pre-commit disable yaml checks   jshint
 pre-commit enable  yaml warnings jshint
-git add config/pre-commit.yml
+git add config/pre_commit.yml
 git commit -m "pre-commit: move jshint from checks to warnings"
 ```
 
@@ -103,7 +103,7 @@ pre-commit run <file-list>  # run on the list of files, patterns not supported
 
 - `default` - basic settings, read only
 - `git` - reads configuration from `git config pre-commit.*`, allow local update
-- `yaml` - reads configuration from `/etc/pre-commit.yml`, `$HOME/.pre-commit.yml` and `config/pre-commit.yml`, allows `config/pre-commit.yml` updates
+- `yaml` - reads configuration from `/etc/pre_commit.yml`, `$HOME/.pre_commit.yml` and `config/pre_commit.yml`, allows `config/pre_commit.yml` updates
 - `env` - reads configuration from environment variables
 
 ## [Contributing](CONTRIBUTING.md)

data/lib/plugins/pre_commit/checks/migration.rb

@@ -3,36 +3,56 @@ require 'pre-commit/checks/plugin'
 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

data/lib/pre-commit/checks/plugin/config_file.rb

@@ -56,7 +56,7 @@ module PreCommit
           $stderr.puts "Warning: #{name} config file '#{config_location}' does not exist"
           $stderr.puts "Set the path to the config file using:"
           $stderr.puts "\tgit config pre-commit.#{property_name} 'path/relative/to/git/dir/#{name}.config'"
-          $stderr.puts "Or in 'config/pre-commit.yml':"
+          $stderr.puts "Or in 'config/pre_commit.yml':"
           $stderr.puts "\t#{yaml_property_name}: path/relative/to/git/dir/#{name}.config"
           $stderr.puts "Or set the environment variable:"
           $stderr.puts "\texport #{environment_variable_name}='path/relative/to/git/dir/#{name}.config'"

data/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 @@ module PreCommit
     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)

data/lib/pre-commit/utils/staged_files.rb

@@ -6,7 +6,7 @@ module PreCommit
         case args[0].to_s
         when "all" then staged_files_all
         when "" then staged_files
-        else staged_files=args
+        else self.staged_files=args
         end
       end
 

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: pre-commit
 version: !ruby/object:Gem::Version
-  version: 0.17.0
+  version: 0.18.0
 platform: ruby
 authors:
 - Shajith Chacko, Josh Lubaway
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-07-02 00:00:00.000000000 Z
+date: 2014-08-25 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: pluginator
@@ -100,14 +100,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '0.23'
+        version: '0.25'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '0.23'
+        version: '0.25'
 description: A git pre-commit hook written in ruby with a few more tricks up its sleeve
 email: dontneedmoreemail@example.com
 executables: