overcommit 0.74.0 → 0.75.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 429fa7e31530c84fe84b624201dfb77296f31fd34be4e1fb10a354b3dc4ce9ff
-  data.tar.gz: ab2319699f8e677cab7ed3dc24854e12a7b6cfe7a911b9bcab3b8c2a82bead10
+  metadata.gz: 825a9ffd0ad7bacf35ecb3901ead1f1249085cad5536314434e89ce5ff802d15
+  data.tar.gz: f4d3ea4ecbc7d2fe7d2c35e1dd4d44f86e30a2e31ba241366735937952a95c30
 SHA512:
-  metadata.gz: 3d7967d9579fb937a29a851157f4d74d620fe7e4fc3841b63a33bff84809038a49326a1d148fbe57872b1e90e42558b04027901d0193968626d74e72230ba3f5
-  data.tar.gz: a21c06966bdf3817034b98f4d7f06a0810a522d9234534402fc3ec77abbf26d22278e25fc42741c88d9a693ef27d0fab8c7d029e6a979e596710d7cf1952abd6
+  metadata.gz: 590bcf4bdb5bb506425bbc41050adaa16311baa45f37071d1ffc0a9d96412f508f552eeea2278946bbab622af3aa0a6d216d388c520e41804a4f4dc7ee69e381
+  data.tar.gz: 73222064a9fcc44930ae9c027c19bb851004d5d1000303854b52c2650ef52ef29177f783e9faa5e064717be3ea03e676512a1dd631ddf68f459acbeb46e08df4

data/lib/overcommit/git_repo.rb

@@ -163,10 +163,10 @@ module Overcommit
       end
 
       merge_mode_file = Overcommit::Utils.git_path('MERGE_MODE')
-      @merge_mode = File.open(merge_mode_file).read if File.exist?(merge_mode_file)
+      @merge_mode = File.read(merge_mode_file) if File.exist?(merge_mode_file)
 
       merge_msg_file = Overcommit::Utils.git_path('MERGE_MSG')
-      @merge_msg = File.open(merge_msg_file).read if File.exist?(merge_msg_file)
+      @merge_msg = File.read(merge_msg_file) if File.exist?(merge_msg_file)
     end
 
     # Store any relevant files that are present when repo is in the middle of a

data/lib/overcommit/utils/file_utils.rb

@@ -1,70 +1,19 @@
 # frozen_string_literal: true
 
-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
+        File.symlink(old_name, new_name)
       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)
+        File.symlink?(file_name)
       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[cmd.exe /c dir #{win32_fix_pathsep(file_name)}]
-        )
-      end
-
-      def win32_mklink_cmd(old_name, new_name)
-        Overcommit::Subprocess.spawn(
-          %W[cmd.exe /c mklink #{win32_fix_pathsep(new_name)} #{win32_fix_pathsep(old_name)}]
-        )
-      end
-
-      def win32_fix_pathsep(path)
-        path.tr(File::SEPARATOR, Overcommit::OS::SEPARATOR)
-      end
-
-      def win32_symlink?(dir_output)
-        !(dir_output =~ /<SYMLINK>/).nil?
+        File.readlink(link_name)
       end
     end
   end

data/lib/overcommit/utils.rb

@@ -166,9 +166,12 @@ module Overcommit
         return if Process.ppid.zero?
 
         if OS.windows?
-          `wmic process where ProcessId=#{Process.ppid} get CommandLine /FORMAT:VALUE`.
-            strip.
-            slice(/(?<=CommandLine=).+/)
+          result = execute([
+            'powershell.exe', '-NoProfile', '-NonInteractive', '-Command',
+            "(Get-CimInstance Win32_Process -Filter 'ProcessId = #{Process.ppid}').CommandLine",
+          ])
+          command = result.stdout.strip
+          command if result.success? && !command.empty?
         elsif OS.cygwin?
           # Cygwin's `ps` command behaves differently than the traditional
           # Linux version, but a comparable `procps` is provided to compensate.
@@ -176,7 +179,7 @@ module Overcommit
         else
           `ps -ocommand= -p #{Process.ppid}`.chomp
         end
-      rescue Errno::EPERM, Errno::ENOENT
+      rescue Errno::EPERM, Errno::ENOENT, ChildProcess::LaunchError
         # Process information may not be available, such as inside sandboxed environments
         nil
       end

data/lib/overcommit/version.rb

@@ -2,5 +2,5 @@
 
 # Defines the gem version.
 module Overcommit
-  VERSION = '0.74.0'
+  VERSION = '0.75.0'
 end

data/template-dir/hooks/commit-msg

@@ -27,7 +27,7 @@ if hook_type == 'overcommit-hook'
 end
 
 # Check if Overcommit should invoke a Bundler context for loading gems
-File.read('.overcommit.yml') =~ /gemfile: (?:false|['"]?(.*)['"]?)/
+File.read('.overcommit.yml', encoding: 'UTF-8') =~ /gemfile: (?:false|['"]?(.*)['"]?)/
 gemfile = Regexp.last_match(1)
 
 if gemfile

data/template-dir/hooks/overcommit-hook

@@ -27,7 +27,7 @@ if hook_type == 'overcommit-hook'
 end
 
 # Check if Overcommit should invoke a Bundler context for loading gems
-File.read('.overcommit.yml') =~ /gemfile: (?:false|['"]?(.*)['"]?)/
+File.read('.overcommit.yml', encoding: 'UTF-8') =~ /gemfile: (?:false|['"]?(.*)['"]?)/
 gemfile = Regexp.last_match(1)
 
 if gemfile

data/template-dir/hooks/post-checkout

@@ -27,7 +27,7 @@ if hook_type == 'overcommit-hook'
 end
 
 # Check if Overcommit should invoke a Bundler context for loading gems
-File.read('.overcommit.yml') =~ /gemfile: (?:false|['"]?(.*)['"]?)/
+File.read('.overcommit.yml', encoding: 'UTF-8') =~ /gemfile: (?:false|['"]?(.*)['"]?)/
 gemfile = Regexp.last_match(1)
 
 if gemfile

data/template-dir/hooks/post-commit

@@ -27,7 +27,7 @@ if hook_type == 'overcommit-hook'
 end
 
 # Check if Overcommit should invoke a Bundler context for loading gems
-File.read('.overcommit.yml') =~ /gemfile: (?:false|['"]?(.*)['"]?)/
+File.read('.overcommit.yml', encoding: 'UTF-8') =~ /gemfile: (?:false|['"]?(.*)['"]?)/
 gemfile = Regexp.last_match(1)
 
 if gemfile

data/template-dir/hooks/post-merge

@@ -27,7 +27,7 @@ if hook_type == 'overcommit-hook'
 end
 
 # Check if Overcommit should invoke a Bundler context for loading gems
-File.read('.overcommit.yml') =~ /gemfile: (?:false|['"]?(.*)['"]?)/
+File.read('.overcommit.yml', encoding: 'UTF-8') =~ /gemfile: (?:false|['"]?(.*)['"]?)/
 gemfile = Regexp.last_match(1)
 
 if gemfile

data/template-dir/hooks/post-rewrite

@@ -27,7 +27,7 @@ if hook_type == 'overcommit-hook'
 end
 
 # Check if Overcommit should invoke a Bundler context for loading gems
-File.read('.overcommit.yml') =~ /gemfile: (?:false|['"]?(.*)['"]?)/
+File.read('.overcommit.yml', encoding: 'UTF-8') =~ /gemfile: (?:false|['"]?(.*)['"]?)/
 gemfile = Regexp.last_match(1)
 
 if gemfile

data/template-dir/hooks/pre-commit

@@ -27,7 +27,7 @@ if hook_type == 'overcommit-hook'
 end
 
 # Check if Overcommit should invoke a Bundler context for loading gems
-File.read('.overcommit.yml') =~ /gemfile: (?:false|['"]?(.*)['"]?)/
+File.read('.overcommit.yml', encoding: 'UTF-8') =~ /gemfile: (?:false|['"]?(.*)['"]?)/
 gemfile = Regexp.last_match(1)
 
 if gemfile

data/template-dir/hooks/pre-push

@@ -27,7 +27,7 @@ if hook_type == 'overcommit-hook'
 end
 
 # Check if Overcommit should invoke a Bundler context for loading gems
-File.read('.overcommit.yml') =~ /gemfile: (?:false|['"]?(.*)['"]?)/
+File.read('.overcommit.yml', encoding: 'UTF-8') =~ /gemfile: (?:false|['"]?(.*)['"]?)/
 gemfile = Regexp.last_match(1)
 
 if gemfile

data/template-dir/hooks/pre-rebase

@@ -27,7 +27,7 @@ if hook_type == 'overcommit-hook'
 end
 
 # Check if Overcommit should invoke a Bundler context for loading gems
-File.read('.overcommit.yml') =~ /gemfile: (?:false|['"]?(.*)['"]?)/
+File.read('.overcommit.yml', encoding: 'UTF-8') =~ /gemfile: (?:false|['"]?(.*)['"]?)/
 gemfile = Regexp.last_match(1)
 
 if gemfile

data/template-dir/hooks/prepare-commit-msg

@@ -27,7 +27,7 @@ if hook_type == 'overcommit-hook'
 end
 
 # Check if Overcommit should invoke a Bundler context for loading gems
-File.read('.overcommit.yml') =~ /gemfile: (?:false|['"]?(.*)['"]?)/
+File.read('.overcommit.yml', encoding: 'UTF-8') =~ /gemfile: (?:false|['"]?(.*)['"]?)/
 gemfile = Regexp.last_match(1)
 
 if gemfile

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: overcommit
 version: !ruby/object:Gem::Version
-  version: 0.74.0
+  version: 0.75.0
 platform: ruby
 authors:
 - Shane da Silva