overcommit 0.27.0 → 0.28.0

data/lib/overcommit/os.rb

@@ -0,0 +1,34 @@
+require 'rbconfig'
+
+module Overcommit
+  # Methods relating to the current operating system
+  module OS
+    class << self
+      def windows?
+        !(/mswin|msys|mingw|bccwin|wince|emc/ =~ host_os).nil?
+      end
+
+      def cygwin?
+        !(/cygwin/ =~ host_os).nil?
+      end
+
+      def mac?
+        !(/darwin|mac os/ =~ host_os).nil?
+      end
+
+      def unix?
+        !windows?
+      end
+
+      def linux?
+        unix? && !mac? && !cygwin?
+      end
+
+      private
+
+      def host_os
+        @os ||= ::RbConfig::CONFIG['host_os']
+      end
+    end
+  end
+end

data/lib/overcommit/printer.rb

@@ -81,7 +81,7 @@ module Overcommit
       log.partial hook_name
     end
 
-    def print_result(hook, status, output) # rubocop:disable CyclomaticComplexity, MethodLength
+    def print_result(hook, status, output)
       case status
       when :pass
         log.success 'OK' unless hook.quiet?

data/lib/overcommit/subprocess.rb

@@ -25,6 +25,8 @@ module Overcommit
       # @option options [String] input string to pass via standard input stream
       # @return [Result]
       def spawn(args, options = {})
+        args = win32_prepare_args(args) if OS.windows?
+
         process = ChildProcess.build(*args)
 
         out, err = assign_output_streams(process)
@@ -34,7 +36,7 @@ module Overcommit
         if options[:input]
           begin
             process.io.stdin.puts(options[:input])
-          rescue
+          rescue # rubocop:disable Lint/HandleExceptions
             # Silently ignore if the standard input stream of the spawned
             # process is closed before we get a chance to write to it. This
             # happens on JRuby a lot.
@@ -53,6 +55,8 @@ module Overcommit
       # Spawns a new process in the background using the given array of
       # arguments (the first element is the command).
       def spawn_detached(args)
+        args = win32_prepare_args(args) if OS.windows?
+
         process = ChildProcess.build(*args)
         process.detach = true
 
@@ -63,6 +67,20 @@ module Overcommit
 
       private
 
+      # Necessary to run commands in the cmd.exe context.
+      # Args are joined to properly handle quotes and special characters.
+      def win32_prepare_args(args)
+        args = args.map do |arg|
+          # Quote args that contain whitespace
+          arg = "\"#{arg}\"" if arg =~ /\s/
+
+          # Escape cmd.exe metacharacters
+          arg.gsub(/[()%!^"<>&|]/, '^\0')
+        end
+
+        %w[cmd.exe /c] + [args.join(' ')]
+      end
+
       # @param process [ChildProcess]
       # @return [Array<IO>]
       def assign_output_streams(process)

data/lib/overcommit/utils.rb

@@ -1,4 +1,5 @@
 require 'pathname'
+require 'overcommit/os'
 require 'overcommit/subprocess'
 require 'overcommit/command_splitter'
 require 'tempfile'
@@ -107,7 +108,7 @@ module Overcommit
         Dir[File.join(HOOK_DIRECTORY, '*')].
           select { |file| File.directory?(file) }.
           reject { |file| File.basename(file) == 'shared' }.
-          map { |file| File.basename(file).gsub('_', '-') }
+          map { |file| File.basename(file).tr('_', '-') }
       end
 
       # Returns a list of supported hook classes (PreCommit, CommitMsg, etc.)
@@ -128,8 +129,9 @@ module Overcommit
         exts  = ENV['PATHEXT'] ? ENV['PATHEXT'].split(';') : ['']
         paths.each do |path|
           exts.each do |ext|
-            exe = File.join(path, "#{cmd}#{ext}")
-            return true if File.executable?(exe)
+            cmd_with_ext = cmd.upcase.end_with?(ext.upcase) ? cmd : "#{cmd}#{ext}"
+            full_path = File.join(path, cmd_with_ext)
+            return true if File.executable?(full_path)
           end
         end
         false
@@ -137,7 +139,17 @@ module Overcommit
 
       # Return the parent command that triggered this hook run
       def parent_command
-        `ps -ocommand= -p #{Process.ppid}`.chomp
+        if OS.windows?
+          `wmic process where ProcessId=#{Process.ppid} get CommandLine /FORMAT:VALUE`.
+            strip.
+            slice(/(?<=CommandLine=).+/)
+        elsif OS.cygwin?
+          # Cygwin's `ps` command behaves differently than the traditional
+          # Linux version, but a comparable `procps` is provided to compensate.
+          `procps -ocommand= -p #{Process.ppid}`.chomp
+        else
+          `ps -ocommand= -p #{Process.ppid}`.chomp
+        end
       end
 
       # Execute a command in a subprocess, capturing exit status and output from
@@ -219,7 +231,7 @@ module Overcommit
       def broken_symlink?(file)
         # JRuby's implementation of File.exist? returns true for broken
         # symlinks, so we need use File.size?
-        File.symlink?(file) && File.size?(file).nil?
+        Overcommit::Utils::FileUtils.symlink?(file) && File.size?(file).nil?
       end
 
       # Convert a glob pattern to an absolute path glob pattern rooted from the

data/lib/overcommit/utils/file_utils.rb

@@ -0,0 +1,69 @@
+require 'overcommit/os'
+require 'overcommit/subprocess'
+
+module Overcommit::Utils
+  # Utility functions for file IO.
+  module FileUtils
+    class << self
+      # When the host OS is Windows, uses the `mklink` command to create an
+      # NTFS symbolic link from `new_name` to `old_name`. Otherwise delegates
+      # to `File.symlink`
+      def symlink(old_name, new_name)
+        return File.symlink(old_name, new_name) unless Overcommit::OS.windows?
+
+        result = win32_mklink_cmd(old_name, new_name)
+        result.status
+      end
+
+      # When the host OS is Windows, uses the `dir` command to check whether
+      # `file_name` is an NTFS symbolic link. Otherwise delegates to
+      # `File.symlink`.
+      def symlink?(file_name)
+        return File.symlink?(file_name) unless Overcommit::OS.windows?
+
+        result = win32_dir_cmd(file_name)
+        win32_symlink?(result.stdout)
+      end
+
+      # When the host OS is Windows, uses the `dir` command to check whether
+      # `link_name` is an NTFS symbolic link. If so, it parses the target from
+      # the command output. Otherwise raises an `ArgumentError`. Delegates to
+      # `File.readlink` if the host OS is not Windows.
+      def readlink(link_name)
+        return File.readlink(link_name) unless Overcommit::OS.windows?
+
+        result = win32_dir_cmd(link_name)
+
+        unless win32_symlink?(result.stdout)
+          raise ArgumentError, "#{link_name} is not a symlink"
+        end
+
+        # Extract symlink target from output, which looks like:
+        #   11/13/2012 12:53 AM <SYMLINK> mysymlink [C:\Windows\Temp\somefile.txt]
+        result.stdout[/\[(.+)\]/, 1]
+      end
+
+      private
+
+      def win32_dir_cmd(file_name)
+        Overcommit::Subprocess.spawn(
+          %W[dir #{win32_fix_pathsep(file_name)}]
+        )
+      end
+
+      def win32_mklink_cmd(old_name, new_name)
+        Overcommit::Subprocess.spawn(
+          %W[mklink #{win32_fix_pathsep(new_name)} #{win32_fix_pathsep(old_name)}]
+        )
+      end
+
+      def win32_fix_pathsep(path)
+        path.tr('/', '\\')
+      end
+
+      def win32_symlink?(dir_output)
+        !(dir_output =~ /<SYMLINK>/).nil?
+      end
+    end
+  end
+end

data/lib/overcommit/version.rb

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

data/template-dir/hooks/commit-msg

@@ -27,10 +27,12 @@ end
 
 # Check if Overcommit should invoke a Bundler context for loading gems
 require 'yaml'
+# rubocop:disable Style/RescueModifier
 if gemfile = YAML.load_file('.overcommit.yml')['gemfile'] rescue nil
   ENV['BUNDLE_GEMFILE'] = gemfile
   require 'bundler/setup'
 end
+# rubocop:enable Style/RescueModifier
 
 begin
   require 'overcommit'

data/template-dir/hooks/overcommit-hook

@@ -27,10 +27,12 @@ end
 
 # Check if Overcommit should invoke a Bundler context for loading gems
 require 'yaml'
+# rubocop:disable Style/RescueModifier
 if gemfile = YAML.load_file('.overcommit.yml')['gemfile'] rescue nil
   ENV['BUNDLE_GEMFILE'] = gemfile
   require 'bundler/setup'
 end
+# rubocop:enable Style/RescueModifier
 
 begin
   require 'overcommit'

data/template-dir/hooks/post-checkout

@@ -27,10 +27,12 @@ end
 
 # Check if Overcommit should invoke a Bundler context for loading gems
 require 'yaml'
+# rubocop:disable Style/RescueModifier
 if gemfile = YAML.load_file('.overcommit.yml')['gemfile'] rescue nil
   ENV['BUNDLE_GEMFILE'] = gemfile
   require 'bundler/setup'
 end
+# rubocop:enable Style/RescueModifier
 
 begin
   require 'overcommit'

data/template-dir/hooks/post-commit

@@ -27,10 +27,12 @@ end
 
 # Check if Overcommit should invoke a Bundler context for loading gems
 require 'yaml'
+# rubocop:disable Style/RescueModifier
 if gemfile = YAML.load_file('.overcommit.yml')['gemfile'] rescue nil
   ENV['BUNDLE_GEMFILE'] = gemfile
   require 'bundler/setup'
 end
+# rubocop:enable Style/RescueModifier
 
 begin
   require 'overcommit'

data/template-dir/hooks/post-merge

@@ -27,10 +27,12 @@ end
 
 # Check if Overcommit should invoke a Bundler context for loading gems
 require 'yaml'
+# rubocop:disable Style/RescueModifier
 if gemfile = YAML.load_file('.overcommit.yml')['gemfile'] rescue nil
   ENV['BUNDLE_GEMFILE'] = gemfile
   require 'bundler/setup'
 end
+# rubocop:enable Style/RescueModifier
 
 begin
   require 'overcommit'

data/template-dir/hooks/post-rewrite

@@ -27,10 +27,12 @@ end
 
 # Check if Overcommit should invoke a Bundler context for loading gems
 require 'yaml'
+# rubocop:disable Style/RescueModifier
 if gemfile = YAML.load_file('.overcommit.yml')['gemfile'] rescue nil
   ENV['BUNDLE_GEMFILE'] = gemfile
   require 'bundler/setup'
 end
+# rubocop:enable Style/RescueModifier
 
 begin
   require 'overcommit'

data/template-dir/hooks/pre-commit

@@ -27,10 +27,12 @@ end
 
 # Check if Overcommit should invoke a Bundler context for loading gems
 require 'yaml'
+# rubocop:disable Style/RescueModifier
 if gemfile = YAML.load_file('.overcommit.yml')['gemfile'] rescue nil
   ENV['BUNDLE_GEMFILE'] = gemfile
   require 'bundler/setup'
 end
+# rubocop:enable Style/RescueModifier
 
 begin
   require 'overcommit'

data/template-dir/hooks/pre-push

@@ -27,10 +27,12 @@ end
 
 # Check if Overcommit should invoke a Bundler context for loading gems
 require 'yaml'
+# rubocop:disable Style/RescueModifier
 if gemfile = YAML.load_file('.overcommit.yml')['gemfile'] rescue nil
   ENV['BUNDLE_GEMFILE'] = gemfile
   require 'bundler/setup'
 end
+# rubocop:enable Style/RescueModifier
 
 begin
   require 'overcommit'

data/template-dir/hooks/pre-rebase

@@ -27,10 +27,12 @@ end
 
 # Check if Overcommit should invoke a Bundler context for loading gems
 require 'yaml'
+# rubocop:disable Style/RescueModifier
 if gemfile = YAML.load_file('.overcommit.yml')['gemfile'] rescue nil
   ENV['BUNDLE_GEMFILE'] = gemfile
   require 'bundler/setup'
 end
+# rubocop:enable Style/RescueModifier
 
 begin
   require 'overcommit'

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: overcommit
 version: !ruby/object:Gem::Version
-  version: 0.27.0
+  version: 0.28.0
 platform: ruby
 authors:
 - Brigade Engineering
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-07-13 00:00:00.000000000 Z
+date: 2015-08-24 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: childprocess
@@ -67,20 +67,6 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: '1.7'
-- !ruby/object:Gem::Dependency
-  name: w3c_validators
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '1.2'
-  type: :development
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '1.2'
 description: Utility to install, configure, and extend Git hooks
 email:
 - eng@brigade.com
@@ -115,17 +101,29 @@ files:
 - lib/overcommit/hook/commit_msg/text_width.rb
 - lib/overcommit/hook/commit_msg/trailing_period.rb
 - lib/overcommit/hook/post_checkout/base.rb
+- lib/overcommit/hook/post_checkout/bower_install.rb
+- lib/overcommit/hook/post_checkout/bundle_install.rb
 - lib/overcommit/hook/post_checkout/index_tags.rb
+- lib/overcommit/hook/post_checkout/npm_install.rb
 - lib/overcommit/hook/post_checkout/submodule_status.rb
 - lib/overcommit/hook/post_commit/base.rb
+- lib/overcommit/hook/post_commit/bower_install.rb
+- lib/overcommit/hook/post_commit/bundle_install.rb
 - lib/overcommit/hook/post_commit/git_guilt.rb
 - lib/overcommit/hook/post_commit/index_tags.rb
+- lib/overcommit/hook/post_commit/npm_install.rb
 - lib/overcommit/hook/post_commit/submodule_status.rb
 - lib/overcommit/hook/post_merge/base.rb
+- lib/overcommit/hook/post_merge/bower_install.rb
+- lib/overcommit/hook/post_merge/bundle_install.rb
 - lib/overcommit/hook/post_merge/index_tags.rb
+- lib/overcommit/hook/post_merge/npm_install.rb
 - lib/overcommit/hook/post_merge/submodule_status.rb
 - lib/overcommit/hook/post_rewrite/base.rb
+- lib/overcommit/hook/post_rewrite/bower_install.rb
+- lib/overcommit/hook/post_rewrite/bundle_install.rb
 - lib/overcommit/hook/post_rewrite/index_tags.rb
+- lib/overcommit/hook/post_rewrite/npm_install.rb
 - lib/overcommit/hook/post_rewrite/submodule_status.rb
 - lib/overcommit/hook/pre_commit/author_email.rb
 - lib/overcommit/hook/pre_commit/author_name.rb
@@ -139,10 +137,12 @@ files:
 - lib/overcommit/hook/pre_commit/coffee_lint.rb
 - lib/overcommit/hook/pre_commit/css_lint.rb
 - lib/overcommit/hook/pre_commit/es_lint.rb
+- lib/overcommit/hook/pre_commit/execute_permissions.rb
 - lib/overcommit/hook/pre_commit/go_lint.rb
 - lib/overcommit/hook/pre_commit/go_vet.rb
 - lib/overcommit/hook/pre_commit/haml_lint.rb
 - lib/overcommit/hook/pre_commit/hard_tabs.rb
+- lib/overcommit/hook/pre_commit/hlint.rb
 - lib/overcommit/hook/pre_commit/html_hint.rb
 - lib/overcommit/hook/pre_commit/html_tidy.rb
 - lib/overcommit/hook/pre_commit/image_optim.rb
@@ -156,6 +156,7 @@ files:
 - lib/overcommit/hook/pre_commit/merge_conflicts.rb
 - lib/overcommit/hook/pre_commit/pep257.rb
 - lib/overcommit/hook/pre_commit/pep8.rb
+- lib/overcommit/hook/pre_commit/puppet_lint.rb
 - lib/overcommit/hook/pre_commit/pyflakes.rb
 - lib/overcommit/hook/pre_commit/pylint.rb
 - lib/overcommit/hook/pre_commit/python_flake8.rb
@@ -169,6 +170,7 @@ files:
 - lib/overcommit/hook/pre_commit/semi_standard.rb
 - lib/overcommit/hook/pre_commit/shell_check.rb
 - lib/overcommit/hook/pre_commit/slim_lint.rb
+- lib/overcommit/hook/pre_commit/sqlint.rb
 - lib/overcommit/hook/pre_commit/standard.rb
 - lib/overcommit/hook/pre_commit/trailing_whitespace.rb
 - lib/overcommit/hook/pre_commit/travis_lint.rb
@@ -183,7 +185,10 @@ files:
 - lib/overcommit/hook/pre_push/r_spec.rb
 - lib/overcommit/hook/pre_rebase/base.rb
 - lib/overcommit/hook/pre_rebase/merged_commits.rb
+- lib/overcommit/hook/shared/bower_install.rb
+- lib/overcommit/hook/shared/bundle_install.rb
 - lib/overcommit/hook/shared/index_tags.rb
+- lib/overcommit/hook/shared/npm_install.rb
 - lib/overcommit/hook/shared/submodule_status.rb
 - lib/overcommit/hook_context.rb
 - lib/overcommit/hook_context/base.rb
@@ -205,9 +210,11 @@ files:
 - lib/overcommit/interrupt_handler.rb
 - lib/overcommit/logger.rb
 - lib/overcommit/message_processor.rb
+- lib/overcommit/os.rb
 - lib/overcommit/printer.rb
 - lib/overcommit/subprocess.rb
 - lib/overcommit/utils.rb
+- lib/overcommit/utils/file_utils.rb
 - lib/overcommit/version.rb
 - libexec/gerrit-change-id
 - libexec/index-tags