executable-hooks 1.5.0 → 1.6.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: d8af7d04b6fa2b7c8bfb0885cc012c386128e57fe295175c090e2d6bf8c7185f
-  data.tar.gz: f1762977f60bc39d2d036c10b10290d6be62eeba76eac44666dd4ff0c770220b
+  metadata.gz: a8e3c13fca83fa0756a3bf325a0c78770cf491ab9bf163c1577c28073ba1a091
+  data.tar.gz: 5f2fb952f2b1fe6b8c089ae1003f1b42f9ca61ff5a9b488ec438d85588b82d15
 SHA512:
-  metadata.gz: 72625ddbc7242affafdf245404a0f0fd5fc426775f23d7556b0c1898a970c70f7e41c170dd7b387fb6b2423aace86b0461659fc8ecb3c8aee3ae7f907c127cd0
-  data.tar.gz: e946e2d8f38cb8a91ca477c7884c0279f217c0a742c6af32b67e43d880bec04c502f957343776f8b008a625656197980fc28157920577d425d26e513371eeccb
+  metadata.gz: 301de90b40f74a867a1f6e674bdd0c97b468f71d02e3eb8f9339b9b65008b4e71b96a6f87bb18d8016fe2f7708a95a067f0f5d77d5c6086c25649bb5f8db6abb
+  data.tar.gz: 41b3f27a63ead68eba66da52d9105d7c1eddee0836044ca676d36c09a931e2943de7764dabdbe73d487026f1b34f6b574a56adea3e1445d9f2d6891ba0cf3d7f

data/CHANGELOG.md

@@ -1,5 +1,11 @@
 # Changelog
 
+## 1.6.0
+date: 2018-10-25
+
+- Restore support for ruby-1.8.6, fixes #34
+- Do not force overwrite wrapper, fixes #33
+
 ## 1.5.0
 date: 2018-06-25
 

data/lib/executable-hooks/regenerate_binstubs_command.rb

@@ -91,7 +91,7 @@ class RegenerateBinstubsCommand < Gem::Command
     return false if executable_paths.include?(nil) # not found
     executable_shebangs =
     executable_paths.map do |path|
-      [path, File.readlines(path).map(&:chomp)]
+      [path, File.readlines(path).map{|l|l.chomp}]
     end
     return false if executable_shebangs.detect{|path, lines| !(lines[0] =~ /^#!\//) }
     puts "#{spec.name} #{spec.version}"
@@ -128,7 +128,7 @@ class RegenerateBinstubsCommand < Gem::Command
   end
 
   def existing_gem_path(full_name)
-    expanded_gem_paths.find{|path| File.exists? File.join path, 'gems', full_name}
+    expanded_gem_paths.find{|path| File.exists?(File.join(path, 'gems', full_name))}
   end
 
   def expanded_gem_paths

data/lib/executable-hooks/version.rb

@@ -1,3 +1,3 @@
 module ExecutableHooks
-  VERSION = "1.5.0"
+  VERSION = "1.6.0"
 end

data/lib/executable-hooks/wrapper.rb

@@ -35,7 +35,7 @@ module ExecutableHooks
       bindir       = calculate_bindir(options)
       destination  = calculate_destination(bindir)
 
-      if File.exist?(wrapper_path)
+      if File.exist?(wrapper_path) && !same_file(wrapper_path, destination)
         FileUtils.mkdir_p(bindir) unless File.exist?(bindir)
         # exception based on Gem::Installer.generate_bin
         raise Gem::FilePermissionError.new(bindir) unless File.writable?(bindir)
@@ -44,6 +44,12 @@ module ExecutableHooks
       end
     end
 
+    def same_file(file1, file2)
+      File.exist?(file1) && File.exist?(file2) &&
+        File.read(file1) == File.read(file2)
+    end
+    private :same_file
+
     def uninstall
       destination = calculate_destination(calculate_bindir(options))
       FileUtils.rm_f(destination) if File.exist?(destination)

data/lib/rubygems_plugin.rb

@@ -13,7 +13,7 @@ if
 
   # Set the custom_shebang if user did not set one
   Gem.pre_install do |gem_installer|
-    options = if gem_installer.methods.map(&:to_s).include?('options')
+    options = if gem_installer.methods.map{|m|m.to_s}.include?('options')
       gem_installer.options
     end
     ExecutableHooks::Wrapper.new(options).install

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: executable-hooks
 version: !ruby/object:Gem::Version
-  version: 1.5.0
+  version: 1.6.0
 platform: ruby
 authors:
 - Michal Papis
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2018-06-24 00:00:00.000000000 Z
+date: 2018-10-24 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: tf
@@ -77,7 +77,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.7.6
+rubygems_version: 2.7.7
 signing_key: 
 specification_version: 4
 summary: Hook into rubygems executables allowing extra actions to be taken before