executable-hooks 1.4.0.alpha0 → 1.4.0.rc1

data/.travis.yml

@@ -1,25 +1,19 @@
 language: ruby
 rvm:
-  - 1.8.7
-  - 1.9.2
-  - 1.9.3
-  - 2.0.0
-  - jruby-18mode
-  - jruby-19mode
+  - jruby
   - jruby-head
-  - ruby-head
-  - rbx-18mode
-  - rbx-19mode
+  - rbx-3
 before_install:
+  - 'rvm @global do gem uninstall -a -x rubygems-bundler executable-hooks || true'
+  - 'rm -f $(rvm @global do gem env home)/bin/jruby_executable_hooks'
   - 'rm -rf $rvm_path/gems/*/{bin,gems}/rubygems-bundler-* $rvm_path/gems/*/{bin,gems}/executable-hooks-* $rvm_path/gems/*/bin/ruby_*_{wrapper,hooks}'
   - hash -r
-  - 'curl -L https://get.smf.sh | sh'
-  - 'export PATH=~/.sm/bin:$PATH'
-  - 'sm ext install gem mpapis/sm_gem'
-install: gem install tf -v '>=0.4.1'
+  - 'if [[ -n "${WITH_RUBYGEMS:-}" ]] ; then gem update --system "${WITH_RUBYGEMS}" ; fi'
+  - gem build executable-hooks.gemspec
+  - 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: tf --text test-tf/*
 notifications:
   irc:
     channels:
@@ -29,10 +23,19 @@ notifications:
       - mpapis@gmail.com
     on_failure: change
 matrix:
-  allow_failures:
-    - rvm: jruby-18mode
-    - rvm: jruby-19mode
-    - rvm: jruby-head
-    - rvm: rbx-18mode
-    - rvm: rbx-19mode
+  fast_finish: true
+  include:
+    - rvm: 1.8.7
+      env: WITH_RUBYGEMS=1.6.2
+    - rvm: 1.8.7
+    - rvm: 1.9.2
+    - rvm: 1.9.3
+    - rvm: 2.0.0
+    - rvm: 2.1
+    - rvm: 2.2
+    - rvm: 2.3
+    - rvm: 2.4
+    - rvm: 2.5
     - rvm: ruby-head
+  allow_failures:
+    - rvm: rbx-3

data/executable-hooks.gemspec

@@ -15,7 +15,7 @@ Gem::Specification.new do |s|
   }
   s.post_install_message = <<-MESSAGE
 # In case of problems run the following command to update binstubs:
-gem regenerate_binstubs
+    gem regenerate_binstubs
   MESSAGE
 
 
@@ -24,6 +24,5 @@ gem regenerate_binstubs
   s.extensions  = %w( ext/wrapper_installer/extconf.rb )
   s.executables = %w( executable-hooks-uninstaller )
 
-  s.add_development_dependency "tf"
-  #s.add_development_dependency "smf-gem"
+  s.add_development_dependency "tf", "~>0.4"
 end

data/ext/wrapper_installer/extconf.rb

@@ -15,7 +15,8 @@ $: << File.expand_path("../../../lib", __FILE__)
 require 'executable-hooks/wrapper'
 require 'executable-hooks/regenerate_binstubs_command'
 # call the actions
-ExecutableHooks::Wrapper.install_from(File.expand_path("../../..", __FILE__))
+options = RegenerateBinstubsCommand.default_install_options
+ExecutableHooks::Wrapper.new(options).install_from(File.expand_path("../../..", __FILE__))
 RegenerateBinstubsCommand.new.execute_no_wrapper
 # unload the path, what was required stays ... but there is that much we can do
 $:.pop

data/lib/executable-hooks/regenerate_binstubs_command.rb

@@ -4,6 +4,23 @@ require 'rubygems/version'
 require 'executable-hooks/wrapper'
 
 class RegenerateBinstubsCommand < Gem::Command
+  def self.default_install_options
+    require 'rubygems/commands/install_command'
+    Gem::Command.extra_args = Gem.configuration[:gem]
+    config_args = Gem.configuration[:install]
+    config_args =
+      case config_args
+      when String
+        config_args.split ' '
+      else
+        Array(config_args)
+      end
+    Gem::Command.add_specific_extra_args 'install', config_args
+    ic = Gem::Commands::InstallCommand.new
+    ic.handle_options ["install"]
+    ic.options
+  end
+
   def initialize
     super 'regenerate_binstubs', 'Re run generation of executable wrappers for gems.'
 
@@ -45,17 +62,17 @@ class RegenerateBinstubsCommand < Gem::Command
       # https://github.com/rubygems/rubygems/issues/326
       puts "try also: gem pristine --binstubs"
     end
-    ExecutableHooks::Wrapper.install(options)
+    ExecutableHooks::Wrapper.new(options).install
     execute_no_wrapper
   end
 
-  def execute_no_wrapper
+  def execute_no_wrapper(wrapper_name = ExecutableHooks::Wrapper.expanded_wrapper_name)
     require 'executable-hooks/installer'
     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) or
+        try_to_fix_binstubs(spec, wrapper_name) or
         try_to_install_binstubs(spec) or
         $stderr.puts "##{spec.name} #{spec.version} not found in GEM_PATH"
       end
@@ -64,7 +81,7 @@ class RegenerateBinstubsCommand < Gem::Command
 
   private
 
-  def try_to_fix_binstubs(spec)
+  def try_to_fix_binstubs(spec, wrapper_name)
     executable_paths =
     spec.executables.map do |executable|
       path = expanded_bin_paths.detect{|bin_path| File.exist?(File.join(bin_path, executable)) }
@@ -79,7 +96,7 @@ class RegenerateBinstubsCommand < Gem::Command
     puts "#{spec.name} #{spec.version}"
     executable_mode = 0111
     executable_shebangs.map do |path, lines|
-      lines[0] = "#!#{ExecutableHooksInstaller.env_path} #{ExecutableHooks::Wrapper.expanded_wrapper_name}"
+      lines[0] = "#!#{ExecutableHooksInstaller.env_path} #{wrapper_name}"
       File.open(path, "w") do |file|
         file.puts(lines)
       end
@@ -92,6 +109,7 @@ class RegenerateBinstubsCommand < Gem::Command
     @expanded_bin_paths ||= begin
       paths = expanded_gem_paths.map{|path| File.join(path, "bin") }
       paths << RbConfig::CONFIG["bindir"]
+      # TODO: bindir from options?
       paths
     end
   end

data/lib/executable-hooks/specification.rb

@@ -3,7 +3,7 @@ module ExecutableHooks
     def self.find
       @executable_hooks_spec ||=
         if Gem::Specification.respond_to?(:find_by_name)
-          Gem::Specification.find_by_name("executable-hooks")
+          Gem::Specification.find_by_name("executable-hooks", ">=0", ">=0.alpha")
         else
           Gem.source_index.find_name("executable-hooks").last
         end

data/lib/executable-hooks/uninstaller.rb

@@ -1,10 +1,14 @@
 require 'executable-hooks/wrapper'
 require 'executable-hooks/regenerate_binstubs_command'
+require 'rubygems/uninstaller'
 
 module ExecutableHooks
   def self.uninstall
     Gem.configuration[:custom_shebang] = "$env #{Gem.default_exec_format % "ruby"}"
-    RegenerateBinstubsCommand.new.execute_no_wrapper
-    Wrapper.uninstall
+    options = RegenerateBinstubsCommand.default_install_options
+    RegenerateBinstubsCommand.new.execute_no_wrapper("ruby")
+    ExecutableHooks::Wrapper.new(options).uninstall
+    options.merge!(:executables => true, :all => true, :ignore => true)
+    Gem::Uninstaller.new("executable-hooks", options).uninstall
   end
 end

data/lib/executable-hooks/version.rb

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

data/lib/executable-hooks/wrapper.rb

@@ -13,8 +13,10 @@ module ExecutableHooks
       Gem.default_exec_format % self.wrapper_name
     end
 
-    def initialize(options)
+    attr_reader :options
 
+    def initialize(options)
+      @options = options
     end
 
     def install
@@ -29,7 +31,9 @@ module ExecutableHooks
     end
 
     def install_from(full_gem_path)
-      wrapper_path = File.expand_path( "bin/#{wrapper_name}", full_gem_path )
+      wrapper_path = File.expand_path( "bin/#{self.class.wrapper_name}", full_gem_path )
+      bindir       = calculate_bindir(options)
+      destination  = calculate_destination(bindir)
 
       if File.exist?(wrapper_path) && !File.exist?(destination)
         FileUtils.mkdir_p(bindir) unless File.exist?(bindir)
@@ -41,6 +45,7 @@ module ExecutableHooks
     end
 
     def uninstall
+      destination = calculate_destination(calculate_bindir(options))
       FileUtils.rm_f(destination) if File.exist?(destination)
     end
 
@@ -50,7 +55,7 @@ module ExecutableHooks
     end
 
     def calculate_destination(bindir)
-      File.expand_path( expanded_wrapper_name, bindir )
+      File.expand_path(self.class.expanded_wrapper_name, bindir)
     end
 
 

data/lib/rubygems_plugin.rb

@@ -13,7 +13,7 @@ if
 
   # Set the custom_shebang if user did not set one
   Gem.pre_install do |gem_installer|
-    ExecutableHooks::Wrapper.install(gem_installer.options)
+    ExecutableHooks::Wrapper.new(gem_installer.options).install
   end
 
   if Gem::Version.new(Gem::VERSION) < Gem::Version.new('2.0') then

data/test-tf/rubygems_comment_test.sh

@@ -0,0 +1,15 @@
+gem install executable-hooks-$(awk -F'"' '/VERSION/{print $2}' < lib/executable-hooks/version.rb).gem --development
+# match=/installed/
+wrapper_name=$(ruby -I ./lib/ -r executable-hooks/wrapper -e "puts ExecutableHooks::Wrapper.expanded_wrapper_name")
+
+gem install haml -v "<5"     # match=/installed/
+head -n 1 $(which haml )     # match=/ruby_executable_hooks/
+which ${wrapper_name}        # status=0
+
+gem list                     # match=/haml/
+executable-hooks-uninstaller # match=/haml/
+
+head -n 1 $(which haml)      # match!=/ruby_executable_hooks/
+which ${wrapper_name}        # status=1
+
+gem uninstall -x haml        # match=/Successfully uninstalled/

metadata

@@ -1,7 +1,15 @@
 --- !ruby/object:Gem::Specification 
 name: executable-hooks
 version: !ruby/object:Gem::Version 
-  version: 1.4.0.alpha0
+  hash: -3026611996
+  prerelease: 6
+  segments: 
+  - 1
+  - 4
+  - 0
+  - rc
+  - 1
+  version: 1.4.0.rc1
 platform: ruby
 authors: 
 - Michal Papis
@@ -9,17 +17,22 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2018-01-26 00:00:00 Z
+date: 2018-01-28 00:00:00 +01:00
+default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
   name: tf
   prerelease: false
   requirement: &id001 !ruby/object:Gem::Requirement 
+    none: false
     requirements: 
-    - &id002 
-      - ">="
+    - - ~>
       - !ruby/object:Gem::Version 
-        version: "0"
+        hash: 3
+        segments: 
+        - 0
+        - 4
+        version: "0.4"
   type: :development
   version_requirements: *id001
 description: 
@@ -51,33 +64,45 @@ files:
 - lib/executable-hooks/wrapper.rb
 - lib/rubygems_executable_plugin.rb
 - lib/rubygems_plugin.rb
+- test-tf/rubygems_comment_test.sh
+has_rdoc: true
 homepage: https://github.com/mpapis/executable-hooks
 licenses: 
 - Apache 2.0
-metadata: {}
-
 post_install_message: |
   # In case of problems run the following command to update binstubs:
-  gem regenerate_binstubs
+      gem regenerate_binstubs
 
 rdoc_options: []
 
 require_paths: 
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement 
+  none: false
   requirements: 
-  - *id002
+  - - ">="
+    - !ruby/object:Gem::Version 
+      hash: 3
+      segments: 
+      - 0
+      version: "0"
 required_rubygems_version: !ruby/object:Gem::Requirement 
+  none: false
   requirements: 
   - - ">"
     - !ruby/object:Gem::Version 
+      hash: 25
+      segments: 
+      - 1
+      - 3
+      - 1
       version: 1.3.1
 requirements: []
 
 rubyforge_project: 
-rubygems_version: 2.0.17
+rubygems_version: 1.6.2
 signing_key: 
-specification_version: 4
+specification_version: 3
 summary: Hook into rubygems executables allowing extra actions to be taken before executable is run.
 test_files: []
 

checksums.yaml

@@ -1,7 +0,0 @@
---- 
-SHA1: 
-  metadata.gz: a3043d0088ce1f3b75f8d6b586c9a63a1bdc9d91
-  data.tar.gz: 37aad6f0e9cf450aba70d6ccd31742b11e919365
-SHA512: 
-  metadata.gz: b61715a1115ac1499bbf060d026085f87d796472b736c6fb9bfeeea84a7fd32119d653a01ec94aa5b4ce02d876d4dce43e7b4b1084763b570e292e0f8aca433c
-  data.tar.gz: 82cd911d40f9b4a6abc76ef6df4740f40b628c2143e2e7e3b39cb1c423d4c87c77b698eafc30fc89d19592c0ce6035e52bccacf33b5c43cfc0f641bb475f8a93