executable-hooks 1.3.2 → 1.4.0.alpha0

checksums.yaml

@@ -1,7 +1,7 @@
 --- 
 SHA1: 
-  data.tar.gz: c6d0e07559a393e32f639010a23c1768c2c17de4
-  metadata.gz: 7c112f1e4747066cf4a9e229e7d48e9040b47745
+  metadata.gz: a3043d0088ce1f3b75f8d6b586c9a63a1bdc9d91
+  data.tar.gz: 37aad6f0e9cf450aba70d6ccd31742b11e919365
 SHA512: 
-  data.tar.gz: bc74ad2e0a9481ee4c386f6b48cb1d71264d967b98d47beef5745187f413cfdcde35cb918acba381810ffcf9c98e1a69ba321221af2f8007fdf002181700e287
-  metadata.gz: 0780a086ab4873cc086c7e86cf803f3b67f1c06dda798e94e88f022a5dbf9f7cb8eec9a41f416f6afe5b17dd03071e5cf18156361614498ead2b5695aeb2624c
+  metadata.gz: b61715a1115ac1499bbf060d026085f87d796472b736c6fb9bfeeea84a7fd32119d653a01ec94aa5b4ce02d876d4dce43e7b4b1084763b570e292e0f8aca433c
+  data.tar.gz: 82cd911d40f9b4a6abc76ef6df4740f40b628c2143e2e7e3b39cb1c423d4c87c77b698eafc30fc89d19592c0ce6035e52bccacf33b5c43cfc0f641bb475f8a93

data/lib/executable-hooks/regenerate_binstubs_command.rb

@@ -6,6 +6,18 @@ require 'executable-hooks/wrapper'
 class RegenerateBinstubsCommand < Gem::Command
   def initialize
     super 'regenerate_binstubs', 'Re run generation of executable wrappers for gems.'
+
+    add_option(:"Install/Update", '-i', '--install-dir DIR',
+      'Gem repository directory to get installed',
+      'gems') do |value, options|
+      options[:install_dir] = File.expand_path(value)
+    end
+
+    add_option(:"Install/Update", '-n', '--bindir DIR',
+      'Directory where binary files are',
+      'located') do |value, options|
+      options[:bin_dir] = File.expand_path(value)
+    end
   end
 
   def arguments # :nodoc:
@@ -33,7 +45,7 @@ class RegenerateBinstubsCommand < Gem::Command
       # https://github.com/rubygems/rubygems/issues/326
       puts "try also: gem pristine --binstubs"
     end
-    ExecutableHooks::Wrapper.install
+    ExecutableHooks::Wrapper.install(options)
     execute_no_wrapper
   end
 
@@ -55,7 +67,7 @@ class RegenerateBinstubsCommand < Gem::Command
   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)) }
+      path = expanded_bin_paths.detect{|bin_path| File.exist?(File.join(bin_path, executable)) }
       File.join(path, executable) if path
     end
     return false if executable_paths.include?(nil) # not found
@@ -63,7 +75,7 @@ class RegenerateBinstubsCommand < Gem::Command
     executable_paths.map do |path|
       [path, File.readlines(path).map(&:chomp)]
     end
-    return false if executable_shebangs.detect{|path, lines| !lines[0] =~ /^#!\// }
+    return false if executable_shebangs.detect{|path, lines| !(lines[0] =~ /^#!\//) }
     puts "#{spec.name} #{spec.version}"
     executable_mode = 0111
     executable_shebangs.map do |path, lines|
@@ -85,19 +97,21 @@ class RegenerateBinstubsCommand < Gem::Command
   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
+    org_gem_path = options[:install_dir] || existing_gem_path(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
+      inst = Gem::Installer.new Dir[cache_gem].first, :wrappers => true, :force => true, :install_dir => org_gem_path, :bin_dir => options[:bin_dir]
       ExecutableHooksInstaller.bundler_generate_bin(inst)
     else
       false
     end
   end
 
+  def existing_gem_path(full_name)
+    expanded_gem_paths.find{|path| File.exists? File.join path, 'gems', full_name}
+  end
+
   def expanded_gem_paths
     @expanded_gem_paths ||=
     Gem.path.map do |path|

data/lib/executable-hooks/version.rb

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

data/lib/executable-hooks/wrapper.rb

@@ -4,35 +4,21 @@ require 'rubygems'
 require 'executable-hooks/specification'
 
 module ExecutableHooks
-  module Wrapper
+  class Wrapper
     def self.wrapper_name
       'ruby_executable_hooks'
     end
+
     def self.expanded_wrapper_name
       Gem.default_exec_format % self.wrapper_name
     end
-    def self.bindir
-      Gem.respond_to?(:bindir,true) ? Gem.send(:bindir) : File.join(Gem.dir, 'bin')
-    end
-    def self.destination
-      File.expand_path( expanded_wrapper_name, bindir )
-    end
-    def self.ensure_custom_shebang
-      expected_shebang = "$env #{expanded_wrapper_name}"
 
-      Gem.configuration[:custom_shebang] ||= expected_shebang
+    def initialize(options)
 
-      if Gem.configuration[:custom_shebang] != expected_shebang
-        warn("
-Warning:
-    Found    custom_shebang: '#{Gem.configuration[:custom_shebang]}',
-    Expected custom_shebang: '#{expected_shebang}',
-this can potentially break 'executable-hooks' and gem executables overall!
-Check your '~/.gemrc' and '/etc/gemrc' for 'custom_shebang' and remove it.
-")
-      end
     end
-    def self.install
+
+    def install
+      @bindir = options[:bin_dir] if options[:bin_dir]
       ensure_custom_shebang
 
       executable_hooks_spec = ExecutableHooks::Specification.find
@@ -42,7 +28,7 @@ Check your '~/.gemrc' and '/etc/gemrc' for 'custom_shebang' and remove it.
       end
     end
 
-    def self.install_from(full_gem_path)
+    def install_from(full_gem_path)
       wrapper_path = File.expand_path( "bin/#{wrapper_name}", full_gem_path )
 
       if File.exist?(wrapper_path) && !File.exist?(destination)
@@ -53,8 +39,36 @@ Check your '~/.gemrc' and '/etc/gemrc' for 'custom_shebang' and remove it.
         File.chmod(0775, destination)
       end
     end
-    def self.uninstall
+
+    def uninstall
       FileUtils.rm_f(destination) if File.exist?(destination)
     end
+
+    def calculate_bindir(options)
+      return options[:bin_dir] if options[:bin_dir]
+      Gem.respond_to?(:bindir,true) ? Gem.send(:bindir) : File.join(Gem.dir, 'bin')
+    end
+
+    def calculate_destination(bindir)
+      File.expand_path( expanded_wrapper_name, bindir )
+    end
+
+
+    def ensure_custom_shebang
+      expected_shebang = "$env #{self.class.expanded_wrapper_name}"
+
+      Gem.configuration[:custom_shebang] ||= expected_shebang
+
+      if Gem.configuration[:custom_shebang] != expected_shebang
+        warn("
+Warning:
+    Found    custom_shebang: '#{Gem.configuration[:custom_shebang]}',
+    Expected custom_shebang: '#{expected_shebang}',
+this can potentially break 'executable-hooks' and gem executables overall!
+Check your '~/.gemrc' and '/etc/gemrc' for 'custom_shebang' and remove it.
+")
+      end
+    end
+
   end
 end

data/lib/rubygems_plugin.rb

@@ -12,8 +12,8 @@ if
   require 'executable-hooks/wrapper'
 
   # Set the custom_shebang if user did not set one
-  Gem.pre_install do |inst|
-    ExecutableHooks::Wrapper.install
+  Gem.pre_install do |gem_installer|
+    ExecutableHooks::Wrapper.install(gem_installer.options)
   end
 
   if Gem::Version.new(Gem::VERSION) < Gem::Version.new('2.0') then

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: executable-hooks
 version: !ruby/object:Gem::Version 
-  version: 1.3.2
+  version: 1.4.0.alpha0
 platform: ruby
 authors: 
 - Michal Papis
@@ -9,7 +9,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2014-06-06 00:00:00 Z
+date: 2018-01-26 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.14
+rubygems_version: 2.0.17
 signing_key: 
 specification_version: 4
 summary: Hook into rubygems executables allowing extra actions to be taken before executable is run.