executable-hooks 1.4.1.alpha → 1.6.1

data/.travis.yml

@@ -25,10 +25,14 @@ notifications:
 matrix:
   fast_finish: true
   include:
+    - rvm: 1.8.7
+      env: WITH_RUBYGEMS=1.4.2
     - rvm: 1.8.7
       env: WITH_RUBYGEMS=1.6.2
     - rvm: 2.5
       env: TEST_SUFFIX=-bundle
+    - rvm: 2.5
+      env: TEST_SUFFIX=-truffleruby
     - rvm: 1.8.7
     - rvm: 1.9.2
     - rvm: 1.9.3

data/CHANGELOG.md

@@ -1,5 +1,31 @@
 # Changelog
 
+## 1.6.1
+date: 2021-01-26
+
+- Avoid Ruby 2.7 warning, merge #38
+
+## 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
+
+- Support truffleruby, fixes rvm/rvm#4408
+
+## 1.4.2
+date: 2018-02-14
+
+- Support rubygems 1.4.2, fixes #29
+
+## 1.4.1
+date: 2018-02-12
+
+- Fix bundle install, fixes #28
+
 ## 1.4.0
 date: 2018-02-08
 

data/bin/ruby_executable_hooks

@@ -12,4 +12,12 @@ rescue LoadError
   warn "unable to load executable-hooks/hooks" if ENV.key?('ExecutableHooks_DEBUG')
 end unless $0.end_with?('/executable-hooks-uninstaller')
 
-eval File.read($0), binding, $0
+content = File.read($0)
+
+if (index = content.index("\n#!ruby\n")) && index > 0
+  skipped_content = content.slice!(0..index)
+  start_line = skipped_content.count("\n") + 1
+  eval content, binding, $0, start_line
+else
+  eval content, binding, $0
+end

data/executable-hooks.gemspec

@@ -9,7 +9,7 @@ Gem::Specification.new do |s|
   s.license     = 'Apache 2.0'
   s.authors     = ["Michal Papis"]
   s.email       = ["mpapis@gmail.com"]
-  s.homepage    = "https://github.com/mpapis/executable-hooks"
+  s.homepage    = "https://github.com/rvm/executable-hooks"
   s.summary     = %q{
     Hook into rubygems executables allowing extra actions to be taken before executable is run.
   }

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.4.1.alpha"
+  VERSION = "1.6.1"
 end

data/lib/executable-hooks/wrapper.rb

@@ -16,7 +16,7 @@ module ExecutableHooks
     attr_reader :options
 
     def initialize(options)
-      @options = options || {}
+      @options = options || RegenerateBinstubsCommand.default_install_options
     end
 
     def install
@@ -35,7 +35,7 @@ module ExecutableHooks
       bindir       = calculate_bindir(options)
       destination  = calculate_destination(bindir)
 
-      if File.exist?(wrapper_path) && !File.exist?(destination)
+      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,10 @@ if
 
   # Set the custom_shebang if user did not set one
   Gem.pre_install do |gem_installer|
-    ExecutableHooks::Wrapper.new(gem_installer.options).install
+    options = if gem_installer.methods.map{|m|m.to_s}.include?('options')
+      gem_installer.options
+    end
+    ExecutableHooks::Wrapper.new(options).install
   end
 
   if Gem::Version.new(Gem::VERSION) < Gem::Version.new('2.0') then

data/test-tf-truffleruby/truffleruby_comment_test.sh

@@ -0,0 +1,16 @@
+gem install executable-hooks-$(awk -F'"' '/VERSION/{print $2}' < lib/executable-hooks/version.rb).gem --development
+# match=/installed/
+
+gem install haml -v "4.0.7"    # match=/installed/
+haml_bin=$(which haml )
+head -n 1 $haml_bin            # match=/ruby_executable_hooks/
+
+## simulate truffleruby style binary with shell code mixed in
+## \043 - is a # ... somehow it breaks tf
+( head -n 1 $haml_bin; echo -e 'echo $HOME\n\043!ruby'; tail -n +2 $haml_bin ) > $haml_bin.new
+mv $haml_bin.new $haml_bin
+chmod +x $haml_bin
+
+haml _4.0.7_ -v                # match=/4.0.7/
+
+gem uninstall -x haml -v 4.0.7 # match=/Successfully uninstalled/

metadata

@@ -1,14 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: executable-hooks
 version: !ruby/object:Gem::Version 
-  hash: -1525324220
-  prerelease: 6
+  hash: 13
+  prerelease: false
   segments: 
   - 1
-  - 4
+  - 6
   - 1
-  - alpha
-  version: 1.4.1.alpha
+  version: 1.6.1
 platform: ruby
 authors: 
 - Michal Papis
@@ -16,7 +15,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2018-02-11 00:00:00 +01:00
+date: 2021-01-06 00:00:00 +01:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -64,9 +63,10 @@ files:
 - lib/rubygems_executable_plugin.rb
 - lib/rubygems_plugin.rb
 - test-tf-bundle/bundle_comment_test.sh
+- test-tf-truffleruby/truffleruby_comment_test.sh
 - test-tf/rubygems_comment_test.sh
 has_rdoc: true
-homepage: https://github.com/mpapis/executable-hooks
+homepage: https://github.com/rvm/executable-hooks
 licenses: 
 - Apache 2.0
 post_install_message: |
@@ -89,18 +89,16 @@ required_ruby_version: !ruby/object:Gem::Requirement
 required_rubygems_version: !ruby/object:Gem::Requirement 
   none: false
   requirements: 
-  - - ">"
+  - - ">="
     - !ruby/object:Gem::Version 
-      hash: 25
+      hash: 3
       segments: 
-      - 1
-      - 3
-      - 1
-      version: 1.3.1
+      - 0
+      version: "0"
 requirements: []
 
 rubyforge_project: 
-rubygems_version: 1.6.2
+rubygems_version: 1.3.7
 signing_key: 
 specification_version: 3
 summary: Hook into rubygems executables allowing extra actions to be taken before executable is run.