executable-hooks 1.3.0 → 1.3.1

checksums.yaml

@@ -1,7 +1,7 @@
 --- 
-SHA512: 
-  data.tar.gz: 494470f263730eb7308becc9012b1447df3e43159dd10ab6d92baec783dacc6436b646f1ccbff0bc77822f7f34fe18b1bf2773b68056a3ff8cab68436952a515
-  metadata.gz: 92d5aac126ef3f17a7e229e9495ee336b6431745935e333b86c1f1046684a98c483ce1a81d89b9dbfb39fcc451e752bc94362ee4f246808e08729539fe12c8a3
 SHA1: 
-  data.tar.gz: 5de3851f77d90a9fd3e0da3bd6b1a4776fa1ec66
-  metadata.gz: df6f674249adc2c10d22b003b667acc6dff75004
+  data.tar.gz: 6bca2965635c5b28af835801e0133c8936f9eee4
+  metadata.gz: 783bacc41e69e60e9eb9f3079f23890dc5d56ea2
+SHA512: 
+  data.tar.gz: 0785726aa6db6768efaf97cf723e2d167a6764b78152dfa695a7ce54ec057a594291d1e1a6d603386b25c285d47315bcc1adc4ed30873602d9c9d401fc3f859a
+  metadata.gz: 2ad2ad4de5f6298d15322ffa5b6f30157b3390d38cd517254b729beb9179e1797b6c4b5d8c561571bf696621f2ee779bf87b97794dc84ab041125b3527868069

data/CHANGELOG.md

@@ -1,5 +1,10 @@
 # Changelog
 
+## 1.3.1
+date: 2014-01-16
+
+- do not hardcode env ruby_executable_hooks when using shortcut try_to_fix_binstubs, fix #12
+
 ## 1.3.0
 date: 2014-01-11
 

data/lib/executable-hooks/installer.rb

@@ -40,7 +40,7 @@ module ExecutableHooksInstaller
       which = which.gsub(/\$(\w+)/) do
         case $1
         when "env"
-          @env_path ||= Gem::Installer::ENV_PATHS.find {|env_path| File.executable? env_path }
+          env_path
         when "ruby"
           "#{Gem.ruby}#{opts}"
         when "exec"
@@ -58,11 +58,14 @@ module ExecutableHooksInstaller
     elsif opts then
       "#!/bin/sh\n'exec' #{ruby_name.dump} '-x' \"$0\" \"$@\"\n#{shebang}"
     else
-      @env_path ||= Gem::Installer::ENV_PATHS.find {|env_path| File.executable? env_path }
-      "#!#{@env_path} #{ruby_name}"
+      "#!#{env_path} #{ruby_name}"
     end
   end
 
+  def self.env_path
+    @env_path ||= Gem::Installer::ENV_PATHS.find {|path| File.executable?(path) }
+  end
+
   # Return the text for an application file.
   def self.bundler_app_script_text(inst, bin_file_name)
     <<-TEXT

data/lib/executable-hooks/regenerate_binstubs_command.rb

@@ -66,7 +66,7 @@ class RegenerateBinstubsCommand < Gem::Command
     return false if executable_shebangs.detect{|path, lines| !lines[0] =~ /^#!\// }
     puts "#{spec.name} #{spec.version}"
     executable_shebangs.map do |path, lines|
-      lines[0] = "#!/usr/bin/env ruby_executable_hooks"
+      lines[0] = "#!#{ExecutableHooksInstaller.env_path} #{ExecutableHooks::Wrapper.expanded_wrapper_name}"
       File.open(path, "w") do |file|
         file.puts(lines)
       end

data/lib/executable-hooks/version.rb

@@ -1,3 +1,3 @@
 module ExecutableHooks
-  VERSION = "1.3.0"
+  VERSION = "1.3.1"
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: executable-hooks
 version: !ruby/object:Gem::Version 
-  version: 1.3.0
+  version: 1.3.1
 platform: ruby
 authors: 
 - Michal Papis
@@ -9,7 +9,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2014-01-11 00:00:00 Z
+date: 2014-01-16 00:00:00 Z
 dependencies: 
 - !ruby/object:Gem::Dependency 
   name: tf