pre-commit 0.8.0 → 0.8.1

data/README.md

@@ -36,6 +36,7 @@ These are the available checks:
 * merge_conflict (Will check if you are about to check in a merge conflict)
 * migrations (Will make sure you check in the proper files after creating a Rails migration)
 * ci (Will run the `pre_commit:ci` rake task and pass or fail accordingly)
+* rubocop\_new and rubocop\_all (Check ruby code style using the rubocop gem. Rubocop must be installed)
 
 To configure which checks you would like to run, simply set the `pre-commit.checks` git configuration setting.
 
@@ -53,5 +54,10 @@ Note: If no checks are configured, a default set of checks is run:
 
     white_space, console_log, debugger, pry, tabs, jshint, migrations, merge_conflict, local
 
+For the rubocop check, you can tell it what config file to use by setting a path relative to the repo:
+
+    # From your git repo
+    $ git config "pre-commit.rubocop.config" "config/rubocop.yml"
+
 [1]: https://rubygems.org/gems/pre-commit
 [2]: https://travis-ci.org/jish/pre-commit

data/lib/pre-commit/base.rb

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

data/lib/pre-commit/checks.rb

@@ -13,6 +13,10 @@ 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'
+begin
+  require 'pre-commit/checks/rubocop_check'
+rescue LoadError # no rubocop
+end
 
 module PreCommit
 
@@ -21,8 +25,6 @@ module PreCommit
   }
 
   ClosureSyntaxCheck = lambda {
-    compiler = "test/javascript/lib/compiler.jar"
-
     if File.exists?('public/javascripts') && (args = Utils.staged_files('public/javascripts')).size > 0
       ClosureChecker.check(args.split(" "))
     else
@@ -49,6 +51,13 @@ module PreCommit
     :ruby_symbol_hashrockets => RubySymbolHashrockets
   }
 
+  if defined?(Rubocop)
+    Checks.merge!({
+      :rubocop_new           => RubocopCheck.new(:new),
+      :rubocop_all           => RubocopCheck.new(:all)
+    })
+  end
+
   # 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
   #

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

@@ -0,0 +1,55 @@
+require 'pre-commit/base'
+require 'pre-commit/utils'
+require 'rubocop'
+
+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?
+      config_file = `git config pre-commit.rubocop.config`.chomp
+      args = rb_files
+      if !config_file.empty?
+        if !File.exist? config_file
+          $stderr.puts "Warning: rubocop config file '" + config_file + "' does not exist"
+          $stderr.puts "Set the path to the config file using:"
+          $stderr.puts "\tgit config pre-commit.rubocop.config 'path/relative/to/git/dir/rubocop.yml'"
+          $stderr.puts "rubocop will use its default configuration or look for a .rubocop.yml file\n\n"
+        else
+          args = ['-c', config_file] + args
+        end
+      end
+      run(args)
+    end
+
+    def run(rb_files)
+      rubocop = Rubocop::CLI.new
+      return rubocop.run(rb_files) == 0
+    end
+
+  end
+end

data/templates/pre-commit-hook

@@ -1,17 +1,18 @@
 #!/usr/bin/env ruby
 
+OPTIONS = "-r rubygems"
+
 cmd = if system("which rvm > /dev/null")
-  "rvm default do ruby -rrubygems"
+  "rvm default do ruby"
 elsif system("which rbenv > /dev/null")
-  "rbenv exec ruby -rrubygems"
+  "rbenv exec ruby"
 else
-  "ruby -r rubygems"
+  "ruby"
 end
-cmd << " -r pre-commit"
 
-if !system("#{cmd} -e ';' 2>&1")
+if !system(%Q{#{cmd} #{OPTIONS} -e "require 'pre-commit';" 2>&1})
   $stderr.puts "pre-commit: WARNING: Skipping checks because the pre-commit gem is not installed. (Did you change your Ruby version?)"
   exit(0)
 end
 
-exec("#{cmd} -e 'PreCommit.run'")
+exec(%Q{#{cmd} #{OPTIONS} -e "require 'pre-commit'; PreCommit.run"})

metadata

@@ -1,27 +1,30 @@
 --- !ruby/object:Gem::Specification
 name: pre-commit
 version: !ruby/object:Gem::Version
-  version: 0.8.0
+  version: 0.8.1
+  prerelease: 
 platform: ruby
 authors:
 - Shajith Chacko, Josh Lubaway
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-03-30 00:00:00.000000000 Z
+date: 2013-06-10 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
@@ -45,6 +48,7 @@ files:
 - 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.rb
@@ -64,7 +68,6 @@ files:
 - bin/pre-commit
 homepage: http://github.com/jish/pre-commit
 licenses: []
-metadata: {}
 post_install_message: 
 rdoc_options:
 - --main
@@ -72,18 +75,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: 2.0.0
+rubygems_version: 1.8.23
 signing_key: 
 specification_version: 3
 summary: A slightly better git pre-commit hook

checksums.yaml

@@ -1,7 +0,0 @@
----
-SHA1:
-  metadata.gz: 4d9c371797ba41d4ea7f982f02afb3ea83509b6c
-  data.tar.gz: 3db78877071110d7c8a6594144d6a581ff05f4b9
-SHA512:
-  metadata.gz: ef060f68886d56abe7fb9ead2edfa62f287cb3a84fa76c83a26748fdde3f726a83124401274fbd7a2bb3a89c755ae5efc3a40158de8cd0e19d895deb59bd0e08
-  data.tar.gz: 5e182f1fd7511e7bddd86704c40220f6f2c83b69108213b3f1052bd123d984cfd2850bfb963828ba36765c9b3cfab665501d709f229f21a7656431f1c70fe62d