executable-hooks 1.4.0.rc1 → 1.4.0

data/.travis.yml

@@ -13,7 +13,7 @@ before_install:
   - gem install executable-hooks-$(awk -F'"' '/VERSION/{print $2}' < lib/executable-hooks/version.rb).gem --development
 before_script:
   - unset BUNDLE_GEMFILE
-script: tf --text test-tf/*
+script: NOEXEC=0 tf --text test-tf${TEST_SUFFIX:-}/*
 notifications:
   irc:
     channels:
@@ -27,6 +27,8 @@ matrix:
   include:
     - rvm: 1.8.7
       env: WITH_RUBYGEMS=1.6.2
+    - rvm: 2.5
+      env: TEST_SUFFIX=-bundle
     - rvm: 1.8.7
     - rvm: 1.9.2
     - rvm: 1.9.3

data/CHANGELOG.md

@@ -1,5 +1,10 @@
 # Changelog
 
+## 1.4.0
+date: 2018-02-08
+
+- Add bindir support, fixes #24
+
 ## 1.3.2
 date: 2014-06-06
 

data/bin/ruby_executable_hooks

@@ -10,6 +10,6 @@ begin
   Gem::ExecutableHooks.run($0)
 rescue LoadError
   warn "unable to load executable-hooks/hooks" if ENV.key?('ExecutableHooks_DEBUG')
-end
+end unless $0.end_with?('/executable-hooks-uninstaller')
 
 eval File.read($0), binding, $0

data/lib/executable-hooks/installer.rb

@@ -2,9 +2,11 @@ module ExecutableHooksInstaller
   # Iterate through executables and generate wrapper for each one,
   # extract of rubygems code
   def self.bundler_generate_bin(inst)
-    return if inst.spec.executables.nil? or inst.spec.executables.empty?
+    return if inst.spec.executables.nil?
+    executables = inst.spec.executables.reject{ |name| name == 'executable-hooks-uninstaller' }
+    return if executables.empty?
     bindir = inst.bin_dir ? inst.bin_dir : Gem.bindir(inst.gem_home)
-    inst.spec.executables.each do |filename|
+    executables.each do |filename|
       filename.untaint
       original = File.join bindir, filename
       if File.exists?( original )

data/lib/executable-hooks/regenerate_binstubs_command.rb

@@ -71,8 +71,9 @@ class RegenerateBinstubsCommand < Gem::Command
     name = get_one_optional_argument || ''
     specs = installed_gems.select{|spec| spec.name =~ /^#{name}/i }
     specs.each do |spec|
-      unless spec.executables.empty?
-        try_to_fix_binstubs(spec, wrapper_name) or
+      executables = spec.executables.reject{ |name| name == 'executable-hooks-uninstaller' }
+      unless executables.empty?
+        try_to_fix_binstubs(spec, executables, wrapper_name) or
         try_to_install_binstubs(spec) or
         $stderr.puts "##{spec.name} #{spec.version} not found in GEM_PATH"
       end
@@ -81,9 +82,9 @@ class RegenerateBinstubsCommand < Gem::Command
 
   private
 
-  def try_to_fix_binstubs(spec, wrapper_name)
+  def try_to_fix_binstubs(spec, executables, wrapper_name)
     executable_paths =
-    spec.executables.map do |executable|
+    executables.map do |executable|
       path = expanded_bin_paths.detect{|bin_path| File.exist?(File.join(bin_path, executable)) }
       File.join(path, executable) if path
     end

data/lib/executable-hooks/version.rb

@@ -1,3 +1,3 @@
 module ExecutableHooks
-  VERSION = "1.4.0.rc1"
+  VERSION = "1.4.0"
 end

data/test-tf-bundle/bundle_comment_test.sh

@@ -0,0 +1,20 @@
+gem install executable-hooks-$(awk -F'"' '/VERSION/{print $2}' < lib/executable-hooks/version.rb).gem --development
+# match=/installed/
+gem install rubygems-bundler bundler
+# match=/installed/
+gem install haml -v "4.0.7"  # match=/installed/
+# match=/installed/
+
+true TMPDIR:${TMPDIR:=/tmp}:
+d=$TMPDIR/test-bundled
+mkdir $d
+pushd $d
+
+NOEXEC=1 haml -v             # match=/4.0.7/
+
+echo -e 'source "https://rubygems.org"\ngem "haml", "4.0.6"' > Gemfile
+bundle install               # match=/haml 4.0.6/
+NOEXEC=1 haml -v             # match=/4.0.6/
+
+popd
+rm -rf $d

metadata

@@ -1,15 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: executable-hooks
 version: !ruby/object:Gem::Version 
-  hash: -3026611996
-  prerelease: 6
+  hash: 7
+  prerelease: 
   segments: 
   - 1
   - 4
   - 0
-  - rc
-  - 1
-  version: 1.4.0.rc1
+  version: 1.4.0
 platform: ruby
 authors: 
 - Michal Papis
@@ -17,7 +15,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2018-01-28 00:00:00 +01:00
+date: 2018-02-08 00:00:00 +01:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -64,6 +62,7 @@ files:
 - lib/executable-hooks/wrapper.rb
 - lib/rubygems_executable_plugin.rb
 - lib/rubygems_plugin.rb
+- test-tf-bundle/bundle_comment_test.sh
 - test-tf/rubygems_comment_test.sh
 has_rdoc: true
 homepage: https://github.com/mpapis/executable-hooks
@@ -89,14 +88,12 @@ 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: