overcommit 0.18.0 → 0.19.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: b609412f41e430a857ae1b1b9b5a3d31cf97eb9b
-  data.tar.gz: 1f3ebdf4981de86e51503d69fdc7ed851cb91aca
+  metadata.gz: 996dd0cae1610ccd8862512890ce60c917eb9998
+  data.tar.gz: 8a7a2dc6f4f36ec0d650fea031bff26a963ef510
 SHA512:
-  metadata.gz: 46b3a66583a3522bbec747ba4a0a579839b5fe09ea77ac62b57149b52e7413b05388fbd1db399d953d2503ff590331f6d8bf789191f45983027aea6dd11bcbb2
-  data.tar.gz: 072a5ce0c265bc2da606332369a5e2ea53e77f4f4aec07b3f94f056fb2e8644358737192ff6c495a4e5fda27fd5fa9b3e5625ad58f916a562056195895e88d26
+  metadata.gz: 40272621da3bd248750062ae0cb16a7c8a5e08fd3cdef1d508579ac740a4ec80a69147e121f66316f3e14c3a68297b5e572b8805fac33294e1c568814aaec3c0
+  data.tar.gz: 2321fa13f258e8d24952655e06f9a3c450a03365759c94dc4e9b60e0a2c6b087e8b7298c168c81a38a4a6577a8f8a86cd80e2f090d8f16df5d87147d10e91fff

data/config/default.yml

@@ -131,6 +131,12 @@ PreCommit:
     install_command: 'npm install -g jscs'
     include: '**/*.js'
 
+  Jsxcs:
+    description: 'Analyzing with JSXCS'
+    required_executable: 'jsxcs'
+    install_command: 'npm install -g jsxcs'
+    include: '**/*.jsx'
+
   JsHint:
     description: 'Analyzing with JSHint'
     required_executable: 'jshint'
@@ -173,6 +179,17 @@ PreCommit:
       - 'db/schema.rb'
       - 'db/structure.sql'
 
+  Reek:
+    description: 'Analyzing with Reek'
+    required_executable: 'reek'
+    install_command: 'gem install reek'
+    include:
+      - '**/*.gemspec'
+      - '**/*.rake'
+      - '**/*.rb'
+      - '**/Gemfile'
+      - '**/Rakefile'
+
   Rubocop:
     description: 'Analyzing with Rubocop'
     required_executable: 'rubocop'

data/lib/overcommit/git_repo.rb

@@ -68,7 +68,7 @@ module Overcommit
         @merge_head = merge_head
       end
 
-      merge_msg_file = File.expand_path('.git/MERGE_MSG', Overcommit::Utils.repo_root)
+      merge_msg_file = File.expand_path('MERGE_MSG', Overcommit::Utils.git_dir)
       @merge_msg = File.open(merge_msg_file).read if File.exist?(merge_msg_file)
     end
 
@@ -90,16 +90,16 @@ module Overcommit
     # of a merge.
     def restore_merge_state
       if @merge_head
-        FileUtils.touch(File.expand_path('.git/MERGE_MODE', Overcommit::Utils.repo_root))
+        FileUtils.touch(File.expand_path('MERGE_MODE', Overcommit::Utils.git_dir))
 
-        File.open(File.expand_path('.git/MERGE_HEAD', Overcommit::Utils.repo_root), 'w') do |f|
+        File.open(File.expand_path('MERGE_HEAD', Overcommit::Utils.git_dir), 'w') do |f|
           f.write("#{@merge_head}\n")
         end
         @merge_head = nil
       end
 
       if @merge_msg
-        File.open(File.expand_path('.git/MERGE_MSG', Overcommit::Utils.repo_root), 'w') do |f|
+        File.open(File.expand_path('MERGE_MSG', Overcommit::Utils.git_dir), 'w') do |f|
           f.write("#{@merge_msg}\n")
         end
         @merge_msg = nil
@@ -110,8 +110,8 @@ module Overcommit
     # of a cherry-pick.
     def restore_cherry_pick_state
       if @cherry_head
-        File.open(File.expand_path('.git/CHERRY_PICK_HEAD',
-                                   Overcommit::Utils.repo_root), 'w') do |f|
+        File.open(File.expand_path('CHERRY_PICK_HEAD',
+                                   Overcommit::Utils.git_dir), 'w') do |f|
           f.write("#{@cherry_head}\n")
         end
         @cherry_head = nil

data/lib/overcommit/hook/pre_commit/brakeman.rb

@@ -2,8 +2,8 @@ module Overcommit::Hook::PreCommit
   # Runs `brakeman` against any modified Ruby/Rails files.
   class Brakeman < Base
     def run
-      result = execute(%W[#{executable} --exit-on-warn --quiet --summary --only-files] +
-                       applicable_files)
+      result = execute(%W[#{executable} --exit-on-warn --quiet --summary --only-files] <<
+                       applicable_files.join(','))
       return :pass if result.success?
 
       [:fail, result.stdout]

data/lib/overcommit/hook/pre_commit/image_optim.rb

@@ -19,7 +19,7 @@ module Overcommit::Hook::PreCommit
         return :fail,
           "The following images are optimizable:\n#{optimized_images.join("\n")}" \
           "\n\nOptimize them by running:\n" \
-          "  image_optim #{optimized_images.join(' ')}"
+          "  image_optim --no-pngout #{optimized_images.join(' ')}"
       end
 
       :pass

data/lib/overcommit/hook/pre_commit/jsxcs.rb

@@ -0,0 +1,28 @@
+module Overcommit::Hook::PreCommit
+  # Runs `jsxcs` (JSCS (JavaScript Code Style Checker) wrapper for JSX files)
+  # against any modified JavaScript files.
+  class Jsxcs < Base
+    def run
+      result = execute(%W[#{executable} --reporter=inline] + applicable_files)
+      return :pass if result.success?
+
+      if result.status == 1
+        return :warn, result.stderr.chomp
+      end
+
+      # Keep lines from the output for files that we actually modified
+      error_lines, warning_lines = result.stdout.split("\n").partition do |output_line|
+        if match = output_line.match(/^([^:]+):[^\d]+(\d+)/)
+          file = match[1]
+          line = match[2]
+        end
+        modified_lines(file).include?(line.to_i)
+      end
+
+      return :fail, error_lines.join("\n") unless error_lines.empty?
+
+      [:warn, "Modified files have lints (on lines you didn't modify)\n" <<
+              warning_lines.join("\n")]
+    end
+  end
+end

data/lib/overcommit/hook/pre_commit/reek.rb

@@ -0,0 +1,29 @@
+module Overcommit::Hook::PreCommit
+  # Runs `reek` against any modified Ruby files.
+  class Reek < Base
+    def run
+      result = execute(%W[#{executable} --single-line --no-color] + applicable_files)
+      return :pass if result.success?
+
+      output = cleanup_output(result.stdout + result.stderr)
+
+      # Keep lines from the output for files that we actually modified
+      error_lines, warning_lines = output.partition do |output_line|
+        if (match = output_line.match(/^([^:]+):(\d+)/))
+          file = match[1]
+          line = match[2]
+        end
+        modified_lines(file).include?(line.to_i)
+      end
+
+      return :fail, error_lines.join("\n") unless error_lines.empty?
+
+      [:warn, "Modified files have lints (on lines you didn't modify)\n" <<
+          warning_lines.join("\n")]
+    end
+
+    def cleanup_output(raw_output)
+      raw_output.split("\n").grep(/^(.(?!warning))*$/)
+    end
+  end
+end

data/lib/overcommit/hook_context/pre_commit.rb

@@ -40,13 +40,20 @@ module Overcommit::HookContext
 
     # Restore unstaged changes and reset file modification times so it appears
     # as if nothing ever changed.
+    #
+    # We want to restore the modification times for each of the files after
+    # every step to ensure as little time as possible has passed while the
+    # modification time on the file was newer. This helps us play more nicely
+    # with file watchers.
     def cleanup_environment
       unless initial_commit? || (@stash_attempted && !@changes_stashed)
         clear_working_tree # Ensure working tree is clean before restoring it
+        restore_modified_times
       end
 
       if @changes_stashed
         restore_working_tree
+        restore_modified_times
       end
 
       Overcommit::GitRepo.restore_merge_state
@@ -124,6 +131,7 @@ module Overcommit::HookContext
     def restore_modified_times
       modified_files.each do |file|
         next if Overcommit::Utils.broken_symlink?(file)
+        next unless File.exist?(file)
         time = @modified_times[file]
         File.utime(time, time, file)
       end

data/lib/overcommit/installer.rb

@@ -2,7 +2,7 @@ require 'fileutils'
 
 module Overcommit
   # Manages the installation of Overcommit hooks in a git repository.
-  class Installer
+  class Installer # rubocop:disable ClassLength
     MASTER_HOOK =
       File.join(OVERCOMMIT_HOME, 'template-dir', 'hooks', 'overcommit-hook')
 
@@ -60,7 +60,7 @@ module Overcommit
 
     def hooks_path
       absolute_target = File.expand_path(@target)
-      File.join(absolute_target, '.git', 'hooks')
+      File.join(Overcommit::Utils.git_dir(absolute_target), 'hooks')
     end
 
     def master_hook_install_path
@@ -78,7 +78,11 @@ module Overcommit
         raise Overcommit::Exceptions::InvalidGitRepo, 'is not a directory'
       end
 
-      unless File.directory?(File.join(absolute_target, '.git'))
+      git_dir_check = Dir.chdir(absolute_target) do
+        Overcommit::Utils.execute(%w[git rev-parse --git-dir])
+      end
+
+      unless git_dir_check.success?
         raise Overcommit::Exceptions::InvalidGitRepo, 'does not appear to be a git repository'
       end
     end

data/lib/overcommit/utils.rb

@@ -1,3 +1,4 @@
+require 'pathname'
 require 'overcommit/subprocess'
 
 module Overcommit
@@ -9,11 +10,47 @@ module Overcommit
       end
 
       # Returns an absolute path to the root of the repository.
+      #
+      # We do this ourselves rather than call `git rev-parse --show-toplevel` to
+      # solve an issue where the .git directory might not actually be valid in
+      # tests.
+      #
+      # @return [String]
       def repo_root
         @repo_root ||=
           begin
-            result = `git rev-parse --show-toplevel`.chomp
-            result if $?.success?
+            git_dir = Pathname.new(File.expand_path('.')).enum_for(:ascend).find do |path|
+              File.exist?(File.join(path, '.git'))
+            end
+
+            unless git_dir
+              raise Overcommit::Exceptions::InvalidGitRepo, 'no .git directory found'
+            end
+
+            git_dir.to_s
+          end
+      end
+
+      # Returns an absolute path to the .git directory for a repo.
+      #
+      # @param repo_dir [String] root directory of git repo
+      # @return [String]
+      def git_dir(repo_dir = repo_root)
+        @git_dir ||=
+          begin
+            git_dir = File.expand_path('.git', repo_dir)
+
+            # .git could also be a file that contains the location of the git directory
+            unless File.directory?(git_dir)
+              git_dir = File.read(git_dir)[/^gitdir: (.*)$/, 1]
+
+              # Resolve relative paths
+              unless git_dir.start_with?('/')
+                git_dir = File.expand_path(git_dir, repo_dir)
+              end
+            end
+
+            git_dir
           end
       end
 

data/lib/overcommit/version.rb

@@ -1,4 +1,4 @@
 # Defines the gem version.
 module Overcommit
-  VERSION = '0.18.0'
+  VERSION = '0.19.0'
 end

data/libexec/index-tags

@@ -6,10 +6,10 @@
 
 set -e
 
-trap "rm -f .git/tags.$$" EXIT
-err_file=.git/ctags.err
-if ctags --tag-relative -Rf.git/tags.$$ --exclude=.git "$@" 2>${err_file}; then
-  mv .git/tags.$$ .git/tags
+trap "rm -f $GIT_DIR/tags.$$" EXIT
+err_file=$GIT_DIR/ctags.err
+if ctags --tag-relative -Rf$GIT_DIR/tags.$$ --exclude=.git "$@" 2>${err_file}; then
+  mv $GIT_DIR/tags.$$ $GIT_DIR/tags
   [ -e ${err_file} ] && rm -f ${err_file}
 else
   # Ignore STDERR unless `ctags` returned a non-zero exit code

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: overcommit
 version: !ruby/object:Gem::Version
-  version: 0.18.0
+  version: 0.19.0
 platform: ruby
 authors:
 - Causes Engineering
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-09-21 00:00:00.000000000 Z
+date: 2014-11-07 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: childprocess
@@ -99,6 +99,7 @@ files:
 - lib/overcommit/hook/base.rb
 - lib/overcommit/hook/pre_commit/author_email.rb
 - lib/overcommit/hook/pre_commit/pry_binding.rb
+- lib/overcommit/hook/pre_commit/jsxcs.rb
 - lib/overcommit/hook/pre_commit/image_optim.rb
 - lib/overcommit/hook/pre_commit/css_lint.rb
 - lib/overcommit/hook/pre_commit/jsx_hint.rb
@@ -120,6 +121,7 @@ files:
 - lib/overcommit/hook/pre_commit/haml_lint.rb
 - lib/overcommit/hook/pre_commit/coffee_lint.rb
 - lib/overcommit/hook/pre_commit/brakeman.rb
+- lib/overcommit/hook/pre_commit/reek.rb
 - lib/overcommit/hook/pre_commit/jscs.rb
 - lib/overcommit/hook/pre_commit/scss_lint.rb
 - lib/overcommit/hook/pre_commit/base.rb