overcommit 0.6.3 → 0.7.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 7d64fbba103905649d8924761929dd8de6ed8dda
-  data.tar.gz: 7e60a0e86700b84e2c0e20f31d9725e3d20e17b5
+  metadata.gz: 92e61229cb593b12785dc6f250aaf20b59335277
+  data.tar.gz: 6109a2ebdd9e9ad8fb6612178dc38c919decc366
 SHA512:
-  metadata.gz: 6287bda409ccdcb0b42760bae088929caec13d9a09ab9dd8355374e889cae1fb33ebc2450bc2a725ec8901f2d0df3185ec7f604694ca2631c43449f4ef371d82
-  data.tar.gz: 4c8de904dcf1b65ef3854e43e8a313baacef309e999d38448f106941284a246fe3cdcc933c7e9e96efe749627771cf9b4b3207a221b413c3006ea78b2ebdef7e
+  metadata.gz: 9a30a6cef4ea66c146c536e3868e12e2ce8a80dbc4c10955e3e6f18990dc0f75a21e439032bdcd180086aa6fd47a4a327d9ca36441f654f4e1400777ce333d8c
+  data.tar.gz: 1d0a931ee95dac1fa0f7bf35f3e154033d831df840f1ba30772108612bc5aafd52315bded077ec359873cc2d3298f76aca2800fec55ae862b89f45867af15b11

data/lib/overcommit/cli.rb

@@ -45,6 +45,10 @@ module Overcommit
           @options[:action] = :install
         end
 
+        opts.on('-f', '--force', 'Overwrite any previously installed hooks') do
+          @options[:force] = true
+        end
+
         opts.on('-t', '--template-dir', 'Print location of template directory') do
           @options[:action] = :template_dir
         end
@@ -81,6 +85,9 @@ module Overcommit
         rescue Overcommit::Exceptions::InvalidGitRepo => error
           log.warning "Invalid repo #{target}: #{error}"
           halt 69 # EX_UNAVAILABLE
+        rescue Overcommit::Exceptions::PreExistingHooks => error
+          log.warning "Unable to install into #{target}: #{error}"
+          halt 73 # EX_CANTCREAT
         end
       end
     end

data/lib/overcommit/hook/base.rb

@@ -51,8 +51,8 @@ module Overcommit::Hook
       Overcommit::Utils.in_path?(cmd)
     end
 
-    def command(cmd)
-      Overcommit::Utils.command(cmd)
+    def execute(cmd)
+      Overcommit::Utils.execute(cmd)
     end
 
     # Gets a list of staged files that apply to this hook based on its

data/lib/overcommit/hook/commit_msg/gerrit_change_id.rb

@@ -7,7 +7,7 @@ module Overcommit::Hook::CommitMsg
   # edit the message after a prepare-commit-msg hook was run.
   class GerritChangeId < Base
     def run
-      result = command("#{SCRIPT_LOCATION} #{commit_message_file}")
+      result = execute([SCRIPT_LOCATION, commit_message_file])
       return (result.success? ? :good : :bad), result.stdout
     end
 

data/lib/overcommit/hook/post_checkout/bundle_check.rb

@@ -15,7 +15,7 @@ module Overcommit::Hook::PostCheckout
   private
 
     def dependencies_changed?
-      result = command("git diff --exit-code #{new_head} #{previous_head} --name-only")
+      result = execute(%w[git diff --exit-code --name-only] + [new_head, previous_head])
 
       result.stdout.split("\n").any? do |file|
         Array(@config['include']).any? { |glob| File.fnmatch(glob, file) }
@@ -23,7 +23,7 @@ module Overcommit::Hook::PostCheckout
     end
 
     def dependencies_satisfied?
-      command('bundle check').success?
+      execute(%w[bundle check]).success?
     end
   end
 end

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

@@ -2,7 +2,7 @@ module Overcommit::Hook::PreCommit
   # Checks the format of an author's email address.
   class AuthorEmail < Base
     def run
-      result = command('git config --get user.email')
+      result = execute(%w[git config --get user.email])
       email = result.stdout.chomp
 
       unless email =~ /#{@config['pattern']}/

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

@@ -2,7 +2,7 @@ module Overcommit::Hook::PreCommit
   # Ensures that a commit author has a name with at least first and last names.
   class AuthorName < Base
     def run
-      result = command('git config --get user.name')
+      result = execute(%w[git config --get user.name])
       name = result.stdout.chomp
 
       unless name.split(' ').count >= 2

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

@@ -8,14 +8,14 @@ module Overcommit::Hook::PreCommit
       end
 
       # Ignore if Gemfile.lock is not tracked by git
-      return :good if command("git check-ignore #{LOCK_FILE}").success?
+      return :good if execute(%w[git check-ignore] + [LOCK_FILE]).success?
 
-      result = command('bundle check')
+      result = execute(%w[bundle check])
       unless result.success?
         return :bad, result.stdout
       end
 
-      result = command("git diff --quiet -- #{LOCK_FILE}")
+      result = execute(%w[git diff --quiet --] + [LOCK_FILE])
       unless result.success?
         return :bad, "#{LOCK_FILE} is not up-to-date -- run `bundle check`"
       end

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

@@ -6,7 +6,7 @@ module Overcommit::Hook::PreCommit
         return :warn, 'Run `npm install -g coffeelint`'
       end
 
-      result = command("coffeelint --quiet #{applicable_files.join(' ')}")
+      result = execute(%w[coffeelint --quiet] + applicable_files)
       return :good if result.success?
       return :bad, result.stdout
     end

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

@@ -6,9 +6,7 @@ module Overcommit::Hook::PreCommit
         return :warn, 'csslint not installed -- run `npm install -g csslint`'
       end
 
-      paths = applicable_files.join(' ')
-
-      result = command("csslint --quiet --format=compact #{paths} | grep 'Error - '")
+      result = execute(%w[csslint --quiet --format=compact] + applicable_files)
       output = result.stdout
       return (output !~ /Error - (?!Unknown @ rule)/ ? :good : :bad), output
     end

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

@@ -6,7 +6,7 @@ module Overcommit::Hook::PreCommit
         return :warn, 'haml-lint not installed -- run `gem install haml-lint`'
       end
 
-      result = command("haml-lint #{applicable_files.join(' ')}")
+      result = execute(%w[haml-lint] + applicable_files)
       return :good if result.success?
 
       # Keep lines from the output for files that we actually modified

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

@@ -2,10 +2,8 @@ module Overcommit::Hook::PreCommit
   # Checks for hard tabs in files.
   class HardTabs < Base
     def run
-      paths = applicable_files.join(' ')
-
       # Catches hard tabs
-      result = command("grep -IHn \"\t\" #{paths}")
+      result = execute(%w[grep -IHn] + ["\t"] + applicable_files)
       unless result.stdout.empty?
         return :bad, "Hard tabs detected:\n#{result.stdout}"
       end

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

@@ -6,7 +6,7 @@ module Overcommit::Hook::PreCommit
         return :warn, 'jshint not installed -- run `npm install -g jshint`'
       end
 
-      result = command("jshint #{applicable_files.join(' ')}")
+      result = execute(%w[jshint] + applicable_files)
       output = result.stdout
 
       return (output.empty? ? :good : :bad), output

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

@@ -7,7 +7,7 @@ module Overcommit::Hook::PreCommit
         return :warn, 'jscs not installed -- run `npm install -g jscs`'
       end
 
-      result = command("jscs --reporter=inline #{applicable_files.join(' ')}")
+      result = execute(%w[jscs --reporter=inline] + applicable_files)
       return :good if result.success?
 
       if /Config.*not found/i =~ result.stderr

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

@@ -6,7 +6,7 @@ module Overcommit::Hook::PreCommit
         return :warn, 'flake8 not installed -- run `pip install flake8`'
       end
 
-      result = command("flake8 #{applicable_files.join(' ')}")
+      result = execute(%w[flake8] + applicable_files)
 
       return (result.success? ? :good : :bad), result.stdout
     end

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

@@ -6,11 +6,13 @@ module Overcommit::Hook::PreCommit
         return :warn, 'Rubocop not installed -- run `gem install rubocop`'
       end
 
-      result = command("rubocop --format=emacs #{applicable_files.join(' ')} 2>&1")
+      result = execute(%w[rubocop --format=emacs] + applicable_files)
       return :good if result.success?
 
+      output = result.stdout + result.stderr
+
       # Keep lines from the output for files that we actually modified
-      error_lines, warning_lines = result.stdout.split("\n").partition do |output_line|
+      error_lines, warning_lines = output.split("\n").partition do |output_line|
         if match = output_line.match(/^([^:]+):(\d+)/)
           file = match[1]
           line = match[2]

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

@@ -6,7 +6,7 @@ module Overcommit::Hook::PreCommit
         return :warn, 'scss-lint not installed -- run `gem install scss-lint`'
       end
 
-      result = command("scss-lint #{applicable_files.join(' ')}")
+      result = execute(%w[scss-lint] + applicable_files)
       return :good if result.success?
 
       # Keep lines from the output for files that we actually modified

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

@@ -2,9 +2,7 @@ module Overcommit::Hook::PreCommit
   # Checks for trailing whitespace in files.
   class TrailingWhitespace < Base
     def run
-      paths = applicable_files.join(' ')
-
-      result = command("grep -IHn \"\\s$\" #{paths}")
+      result = execute(%w[grep -IHn \s$] + applicable_files)
       unless result.stdout.empty?
         return :bad, "Trailing whitespace detected:\n#{result.stdout}"
       end

data/lib/overcommit/installer.rb

@@ -101,6 +101,10 @@ module Overcommit
 
     def overcommit_symlink?(file)
       File.symlink?(file) && File.readlink(file) == 'overcommit-hook'
+    rescue Errno::ENOENT
+      # Some Ruby implementations (e.g. JRuby) raise an error when the file
+      # doesn't exist. Standardize the behavior to return false.
+      false
     end
   end
 end

data/lib/overcommit/subprocess.rb

@@ -0,0 +1,37 @@
+require 'childprocess'
+require 'tempfile'
+
+module Overcommit
+  # Manages execution of a child process, collecting the exit status and
+  # standard out/error output.
+  class Subprocess
+    # Encapsulates the result of a process.
+    Result = Struct.new(:status, :stderr, :stdout) do
+      def success?
+        status == 0
+      end
+    end
+
+    # Spawns a new process using the given array of arguments (the first
+    # element is the command).
+    def self.spawn(args)
+      process = ChildProcess.build(*args)
+
+      err = ::Tempfile.new('err')
+      err.sync = true
+      out = ::Tempfile.new('out')
+      out.sync = true
+
+      process.io.stderr = err
+      process.io.stdout = out
+
+      process.start
+      process.wait
+
+      err.rewind
+      out.rewind
+
+      Result.new(process.exit_code, err.read, out.read)
+    end
+  end
+end

data/lib/overcommit/utils.rb

@@ -1,4 +1,4 @@
-require 'wopen3'
+require 'overcommit/subprocess'
 
 module Overcommit
   # Utility functions for general use.
@@ -62,9 +62,9 @@ module Overcommit
       # Overcommit to call other Ruby executables without requiring that they be
       # specified in Overcommit's Gemfile--a nasty consequence of using
       # `bundle exec overcommit` while developing locally.
-      def command(command)
+      def execute(args)
         with_environment 'RUBYOPT' => nil do
-          Wopen3.system(command)
+          Subprocess.spawn(args)
         end
       end
 

data/lib/overcommit/version.rb

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

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: overcommit
 version: !ruby/object:Gem::Version
-  version: 0.6.3
+  version: 0.7.0
 platform: ruby
 authors:
 - Causes Engineering
@@ -9,22 +9,22 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-03-05 00:00:00.000000000 Z
+date: 2014-03-06 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
-  name: wopen3
+  name: childprocess
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - '>='
       - !ruby/object:Gem::Version
-        version: '0'
+        version: 0.5.1
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '>='
       - !ruby/object:Gem::Version
-        version: '0'
+        version: 0.5.1
 - !ruby/object:Gem::Dependency
   name: rspec
   requirement: !ruby/object:Gem::Requirement
@@ -45,14 +45,14 @@ dependencies:
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 0.11.1
+        version: 0.12.0
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 0.11.1
+        version: 0.12.0
 description: Utility to install, configure, and extend Git hooks
 email:
 - eng@causes.com
@@ -71,6 +71,7 @@ files:
 - lib/overcommit/constants.rb
 - lib/overcommit/utils.rb
 - lib/overcommit/hook_runner.rb
+- lib/overcommit/subprocess.rb
 - lib/overcommit/hook/commit_msg/trailing_period.rb
 - lib/overcommit/hook/commit_msg/gerrit_change_id.rb
 - lib/overcommit/hook/commit_msg/single_line_subject.rb