executable-hooks 1.2.6 → 1.3.0.rc1

checksums.yaml

@@ -1,7 +1,7 @@
 --- 
 SHA512: 
-  metadata.gz: e35ba7b65ef4ba5f283e9630c4dd721c4ffa09ecb5e7f7314b293f91ebb14f4afc0cbb01de7029b64e831eca600d0de6227647722c52669c9f387080adf894d5
-  data.tar.gz: 3d49ba9813fe7a7e555373851b46b0306e561b42dc1dff1958926011b7976447c949ea910ccb578d2e67a401895afc1d1a6dea0d69ece5f1acb824cc73982e8c
+  data.tar.gz: ac97ad868f8c6e566b51f669c92151457a0740981119cdb204fd0ffba79b84f16f730d182c7e174a2b471b024bdebc9449f24f431585226113d74adffde6c1ae
+  metadata.gz: 49f4041aed512b6fcf2ec997c079909a3faa8b6362960cfcce3a37bf83b5da551c05139087257965128cdca3288e2f7fcef2a19c5811e98a981252561d820283
 SHA1: 
-  metadata.gz: 8fc3bfae3d897325e4e5c076a32bf557d999038f
-  data.tar.gz: dffd168e778704f26da8439a34b29dedf1cd9b21
+  data.tar.gz: d6bff930419c641ed06b5a0d4ab9ed4a27af4b7b
+  metadata.gz: cc7ab71d2dd5ffc2a18454a044378bf8654bfe77

data/CHANGELOG.md

@@ -1,5 +1,10 @@
 # Changelog
 
+## 1.3.0
+date: 2014-01-11
+
+- First try to fix binstubs before installing them, fix wayneeseguin/rvm#2536
+
 ## 1.2.6
 date: 2013-10-21
 

data/lib/executable-hooks/regenerate_binstubs_command.rb

@@ -43,22 +43,70 @@ class RegenerateBinstubsCommand < Gem::Command
     specs = installed_gems.select{|spec| spec.name =~ /^#{name}/i }
     specs.each do |spec|
       unless spec.executables.empty?
-        org_gem_path = Gem.path.find{|path|
-          File.exists? File.join path, 'gems', spec.full_name
-        } || Gem.dir
-        cache_gem = File.join(org_gem_path, 'cache', spec.file_name)
-        if File.exist? cache_gem
-          puts "#{spec.name} #{spec.version}"
-          inst = Gem::Installer.new Dir[cache_gem].first, :wrappers => true, :force => true, :install_dir => org_gem_path
-          ExecutableHooksInstaller.bundler_generate_bin(inst)
-        else
-          $stderr.puts "##{spec.name} #{spec.version} not found in GEM_PATH"
-        end
+        try_to_fix_binstubs(spec) or
+        try_to_install_binstubs(spec) or
+        $stderr.puts "##{spec.name} #{spec.version} not found in GEM_PATH"
       end
     end
   end
 
   private
+
+  def try_to_fix_binstubs(spec)
+    executable_paths =
+    spec.executables.map do |executable|
+      path = expanded_bin_paths.detect{|path| File.exist?(File.join(path, executable)) }
+      File.join(path, executable) if path
+    end
+    return false if executable_paths.include?(nil) # not found
+    executable_shebangs =
+    executable_paths.map do |path|
+      [path, File.readlines(path).map(&:chomp)]
+    end
+    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"
+      File.open(path, "w") do |file|
+        file.puts(lines)
+      end
+    end
+  end
+
+  def expanded_bin_paths
+    @expanded_bin_paths ||= begin
+      paths = expanded_gem_paths.map{|path| File.join(path, "bin") }
+      paths << RbConfig::CONFIG["bindir"]
+      paths
+    end
+  end
+
+  def try_to_install_binstubs(spec)
+    org_gem_path = expanded_gem_paths.find{|path|
+      File.exists? File.join path, 'gems', spec.full_name
+    } || Gem.dir
+    cache_gem = File.join(org_gem_path, 'cache', spec.file_name)
+    if File.exist? cache_gem
+      puts "#{spec.name} #{spec.version}"
+      inst = Gem::Installer.new Dir[cache_gem].first, :wrappers => true, :force => true, :install_dir => org_gem_path
+      ExecutableHooksInstaller.bundler_generate_bin(inst)
+    else
+      false
+    end
+  end
+
+  def expanded_gem_paths
+    @expanded_gem_paths ||=
+    Gem.path.map do |path|
+      paths = [path]
+      while File.symlink?(path)
+        path = File.readlink(path)
+        paths << path
+      end
+      paths
+    end.flatten
+  end
+
   def installed_gems
     if Gem::VERSION > '1.8' then
       Gem::Specification.to_a

data/lib/executable-hooks/version.rb

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

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: executable-hooks
 version: !ruby/object:Gem::Version 
-  version: 1.2.6
+  version: 1.3.0.rc1
 platform: ruby
 authors: 
 - Michal Papis
@@ -9,7 +9,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2013-10-21 00:00:00 Z
+date: 2014-01-11 00:00:00 Z
 dependencies: 
 - !ruby/object:Gem::Dependency 
   name: tf
@@ -69,11 +69,13 @@ required_ruby_version: !ruby/object:Gem::Requirement
   - *id002
 required_rubygems_version: !ruby/object:Gem::Requirement 
   requirements: 
-  - *id002
+  - - ">"
+    - !ruby/object:Gem::Version 
+      version: 1.3.1
 requirements: []
 
 rubyforge_project: 
-rubygems_version: 2.0.12
+rubygems_version: 2.0.14
 signing_key: 
 specification_version: 4
 summary: Hook into rubygems executables allowing extra actions to be taken before executable is run.