rubygems-bundler 1.2.2 → 1.3.0.rc1

data/lib/rubygems-bundler/version.rb

@@ -1,3 +1,3 @@
 module RubygemsBundler
-  VERSION = "1.2.2"
+  VERSION = "1.3.0.rc1"
 end

data/lib/rubygems_executable_plugin.rb

@@ -0,0 +1,8 @@
+Gem.execute do |original_file|
+  require 'rubygems'
+  begin
+    require 'rubygems-bundler/noexec'
+  rescue LoadError
+    warn "unable to load rubygems-bundler/noexec" if ENV.key?('NOEXEC_DEBUG')
+  end
+end

data/rubygems-bundler.gemspec

@@ -14,9 +14,9 @@ Gem::Specification.new do |s|
 
   s.files       = `git ls-files`.split("\n")
   s.test_files  = `git ls-files -- {test,spec,features}/*`.split("\n")
-  s.executables = %w( rubygems-bundler-uninstaller )
 
   s.add_dependency "bundler-unload", ">=1.0.1"
+  s.add_dependency "executable-hooks", ">=1.1.0"
   s.add_development_dependency "tf"
   #s.add_development_dependency "smf-gem"
 end

metadata

@@ -1,13 +1,14 @@
 --- !ruby/object:Gem::Specification 
 name: rubygems-bundler
 version: !ruby/object:Gem::Version 
-  hash: 27
-  prerelease: 
+  hash: -1228271734
+  prerelease: true
   segments: 
   - 1
-  - 2
-  - 2
-  version: 1.2.2
+  - 3
+  - 0
+  - rc1
+  version: 1.3.0.rc1
 platform: ruby
 authors: 
 - Josh Hull
@@ -16,7 +17,8 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2013-07-10 00:00:00 Z
+date: 2013-07-11 00:00:00 +02:00
+default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
   name: bundler-unload
@@ -35,9 +37,25 @@ dependencies:
   type: :runtime
   version_requirements: *id001
 - !ruby/object:Gem::Dependency 
-  name: tf
+  name: executable-hooks
   prerelease: false
   requirement: &id002 !ruby/object:Gem::Requirement 
+    none: false
+    requirements: 
+    - - ">="
+      - !ruby/object:Gem::Version 
+        hash: 19
+        segments: 
+        - 1
+        - 1
+        - 0
+        version: 1.1.0
+  type: :runtime
+  version_requirements: *id002
+- !ruby/object:Gem::Dependency 
+  name: tf
+  prerelease: false
+  requirement: &id003 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ">="
@@ -47,13 +65,13 @@ dependencies:
         - 0
         version: "0"
   type: :development
-  version_requirements: *id002
+  version_requirements: *id003
 description: Stop using bundle exec. Integrate Rubygems and Bundler. Make rubygems generate bundler aware executable wrappers.
 email: 
 - joshbuddy@gmail.com
 - mpapis@gmail.com
-executables: 
-- rubygems-bundler-uninstaller
+executables: []
+
 extensions: []
 
 extra_rdoc_files: []
@@ -67,20 +85,14 @@ files:
 - Gemfile
 - LICENSE
 - README.md
-- bin/ruby_noexec_wrapper
-- bin/rubygems-bundler-uninstaller
-- lib/rubygems-bundler/fix_wrapper.rb
 - lib/rubygems-bundler/noexec.rb
-- lib/rubygems-bundler/regenerate_binstubs_command.rb
-- lib/rubygems-bundler/rubygems_bundler_installer.rb
-- lib/rubygems-bundler/uninstaller.rb
 - lib/rubygems-bundler/version.rb
-- lib/rubygems-bundler/wrapper.rb
-- lib/rubygems_plugin.rb
+- lib/rubygems_executable_plugin.rb
 - rubygems-bundler.gemspec
 - test/dtf/bundler_comment_test.sh
 - test/dtf/rails_and_gemfile_comment_test.sh
 - test/dtf/rubygems_comment_test.sh
+has_rdoc: true
 homepage: http://mpapis.github.com/rubygems-bundler
 licenses: []
 
@@ -101,16 +113,18 @@ required_ruby_version: !ruby/object:Gem::Requirement
 required_rubygems_version: !ruby/object:Gem::Requirement 
   none: false
   requirements: 
-  - - ">="
+  - - ">"
     - !ruby/object:Gem::Version 
-      hash: 3
+      hash: 25
       segments: 
-      - 0
-      version: "0"
+      - 1
+      - 3
+      - 1
+      version: 1.3.1
 requirements: []
 
 rubyforge_project: 
-rubygems_version: 1.8.24
+rubygems_version: 1.3.7
 signing_key: 
 specification_version: 3
 summary: Stop using bundle exec

data/bin/ruby_noexec_wrapper

@@ -1,14 +0,0 @@
-#!/usr/bin/env ruby
-
-original_file=ARGV[0]
-ARGV.shift
-$PROGRAM_NAME=original_file
-
-require 'rubygems'
-begin
-  require 'rubygems-bundler/noexec'
-rescue LoadError
-  warn "unable to load rubygems-bundler/noexec" if ENV.key?('NOEXEC_DEBUG')
-end
-
-eval File.read(original_file), binding, original_file

data/bin/rubygems-bundler-uninstaller

@@ -1,5 +0,0 @@
-#!/usr/bin/env ruby
-
-require 'rubygems-bundler/uninstaller'
-
-RubygemsBundler.uninstall

data/lib/rubygems-bundler/fix_wrapper.rb

@@ -1,14 +0,0 @@
-msg = "\n\nOlder rubygems-bundler found, please uninstall it with:\n\n    "
-
-here = Regexp.new(__FILE__)
-error_source = caller.to_a.reject{|s| s=~ here }.find{|s| s=~/\/rubygems-bundler-/ }.first
-gem_source = File.expand_path("../../../..", error_source)
-gem_version = error_source.sub(/^.*\/rubygems-bundler-([^\/]+)\/.*$/,'\1')
-
-if ENV['GEM_HOME'] or ENV['GEM_PATH']
-  msg << "GEM_HOME=\"#{gem_source}\" " unless ENV['GEM_HOME'] == gem_source
-end
-
-msg << "gem uninstall -ax rubygems-bundler -v #{gem_version}\n\n"
-
-raise msg

data/lib/rubygems-bundler/regenerate_binstubs_command.rb

@@ -1,70 +0,0 @@
-require 'rubygems/command_manager'
-require 'rubygems/installer'
-require 'rubygems/version'
-require 'rubygems-bundler/wrapper'
-
-class RegenerateBinstubsCommand < Gem::Command
-  def initialize
-    super 'regenerate_binstubs', 'Re run generation of executable wrappers for gems.'
-  end
-
-  def arguments # :nodoc:
-    "STRING        start of gem name to regenerate binstubs"
-  end
-
-  def usage # :nodoc:
-    "#{program_name} [STRING]"
-  end
-
-  def defaults_str # :nodoc:
-    ""
-  end
-
-  def description # :nodoc:
-    'Re run generation of executable wrappers for all gems. '+
-    'Wrappers will be compatible with both rubygems and bundler. '+
-    'The switcher is BUNDLE_GEMFILE environment variable, '+
-    'when set it switches to bundler mode, when not set, '+
-    'then the command will work as it was with pure rubygems.'
-  end
-
-  def execute
-    if Gem::Version.new(Gem::VERSION) >= Gem::Version.new('2.0.0') then
-      # https://github.com/rubygems/rubygems/issues/326
-      puts "try also: gem pristine --binstubs"
-    end
-    Gem.configuration[:custom_shebang] ||= '$env ruby_noexec_wrapper'
-    RubygemsBundler::Wrapper.install
-    execute_no_wrapper
-  end
-
-  def execute_no_wrapper
-    require 'rubygems-bundler/rubygems_bundler_installer'
-    name = get_one_optional_argument || ''
-    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
-          RubyGemsBundlerInstaller.bundler_generate_bin(inst)
-        else
-          puts "##{spec.name} #{spec.version} not found in GEM_PATH"
-        end
-      end
-    end
-  end
-
-  private
-  def installed_gems
-    if Gem::VERSION > '1.8' then
-      Gem::Specification.to_a
-    else
-      Gem.source_index.map{|name,spec| spec}
-    end
-  end
-end

data/lib/rubygems-bundler/rubygems_bundler_installer.rb

@@ -1,95 +0,0 @@
-module RubyGemsBundlerInstaller
-  # 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?
-    bindir = inst.bin_dir ? inst.bin_dir : Gem.bindir(inst.gem_home)
-    inst.spec.executables.each do |filename|
-      filename.untaint
-      original = File.join bindir, filename
-      if File.exists?( original )
-        bin_script_path = File.join bindir, inst.formatted_program_filename(filename)
-        FileUtils.rm_f bin_script_path
-        File.open bin_script_path, 'wb', 0755 do |file|
-          file.print bundler_app_script_text(inst, filename)
-        end
-        inst.say bin_script_path if Gem.configuration.really_verbose
-      else
-        inst.say "Can not find #{inst.spec.name} in GEM_PATH"
-        break
-      end
-    end
-  end
-
-
-  def self.shebang(inst, bin_file_name)
-    # options were defined first in 1.5, we want to support back to 1.3.7
-    ruby_name = Gem::ConfigMap[:ruby_install_name] if inst.instance_variable_get(:@env_shebang)
-    bindir = inst.bin_dir ? inst.bin_dir : Gem.bindir(inst.gem_home)
-    path = File.join bindir, inst.formatted_program_filename(bin_file_name)
-    first_line = File.open(path, "rb") {|file| file.gets}
-
-    if /\A#!/ =~ first_line then
-      # Preserve extra words on shebang line, like "-w". Thanks RPA.
-      shebang = first_line.sub(/\A\#!.*?ruby\S*((\s+\S+)+)/, "#!#{Gem.ruby}")
-      opts = $1
-      shebang.strip! # Avoid nasty ^M issues.
-    end
-
-    if which = Gem.configuration[:custom_shebang]
-      which = which.gsub(/\$(\w+)/) do
-        case $1
-        when "env"
-          @env_path ||= Gem::Installer::ENV_PATHS.find {|env_path| File.executable? env_path }
-        when "ruby"
-          "#{Gem.ruby}#{opts}"
-        when "exec"
-          bin_file_name
-        when "name"
-          inst.spec.name
-        end
-      end
-
-      return "#!#{which}"
-    end
-
-    if not ruby_name then
-      "#!#{Gem.ruby}#{opts}"
-    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}"
-    end
-  end
-
-  # Return the text for an application file.
-  def self.bundler_app_script_text(inst, bin_file_name)
-    <<-TEXT
-#{shebang inst, bin_file_name}
-#
-# This file was generated by RubyGems.
-#
-# The application '#{inst.spec.name}' is installed as part of a gem, and
-# this file is here to facilitate running it.
-#
-
-require 'rubygems'
-
-version = "#{Gem::Requirement.default}"
-
-if ARGV.first =~ /^_(.*)_$/ and Gem::Version.correct? $1 then
-  version = $1
-  ARGV.shift
-end
-
-gem '#{inst.spec.name}', version
-load Gem.bin_path('#{inst.spec.name}', '#{bin_file_name}', version)
-TEXT
-  end
-
-end
-
-Gem.post_install do |inst|
-  RubyGemsBundlerInstaller.bundler_generate_bin(inst)
-end

data/lib/rubygems-bundler/uninstaller.rb

@@ -1,10 +0,0 @@
-require 'rubygems-bundler/wrapper'
-require 'rubygems-bundler/regenerate_binstubs_command'
-
-module RubygemsBundler
-  def self.uninstall
-    Gem.configuration[:custom_shebang] = '$env ruby'
-    RegenerateBinstubsCommand.new.execute_no_wrapper
-    Wrapper.uninstall
-  end
-end

data/lib/rubygems-bundler/wrapper.rb

@@ -1,38 +0,0 @@
-# install / uninstall wrapper
-require 'fileutils'
-require 'rubygems'
-
-module RubygemsBundler
-  module Wrapper
-    def self.wrapper_name
-      'ruby_noexec_wrapper'
-    end
-    def self.bindir
-      Gem.respond_to?(:bindir,true) ? Gem.send(:bindir) : File.join(Gem.dir, 'bin')
-    end
-    def self.destination
-      File.expand_path( wrapper_name, bindir )
-    end
-    def self.install
-      rubygems_bundler_spec =
-        if Gem::Specification.respond_to?(:find_by_name)
-          Gem::Specification.find_by_name("rubygems-bundler")
-        else
-          Gem.source_index.find_name("rubygems-bundler").last
-        end
-
-      if rubygems_bundler_spec
-        wrapper_path = File.expand_path( "bin/#{wrapper_name}", rubygems_bundler_spec.full_gem_path )
-      end
-
-      if rubygems_bundler_spec && File.exist?(wrapper_path) && !File.exist?(destination)
-        FileUtils.mkdir_p(bindir)
-        FileUtils.cp(wrapper_path, destination)
-        File.chmod(0775, destination)
-      end
-    end
-    def self.uninstall
-      FileUtils.rm_f(destination) if File.exist?(destination)
-    end
-  end
-end

data/lib/rubygems_plugin.rb

@@ -1,52 +0,0 @@
-module RubygemsBundler
-  def self.spec_version
-    @rubygems_bundler_spec ||=
-      if Gem::Specification.respond_to?(:find_by_name)
-        Gem::Specification.find_by_name("rubygems-bundler")
-      else
-        Gem.source_index.find_name("rubygems-bundler").last
-      end
-    @rubygems_bundler_spec ? @rubygems_bundler_spec.version.to_s : nil
-  rescue Gem::LoadError
-    nil
-  end
-end
-
-called_path, called_version = __FILE__.match(/^(.*\/rubygems-bundler-([^\/]+)\/lib).*$/)[1..2]
-
-# continue only if loaded ($: or gem) and called versions is the same and not shared gems disabled in bundler
-if
-  ( $:.include?(called_path) || RubygemsBundler.spec_version == called_version ) and
-  ( !defined?(Bundler) || ( defined?(Bundler) && Bundler::SharedHelpers.in_bundle? && !Bundler.settings[:disable_shared_gems]) )
-
-  require 'rubygems/version'
-  require 'rubygems-bundler/wrapper'
-
-  # Set the custom_shebang if user did not set one
-  Gem.pre_install do |inst|
-    Gem.configuration[:custom_shebang] ||= '$env ruby_noexec_wrapper'
-    RubygemsBundler::Wrapper.install
-  end
-
-  if Gem::Version.new(Gem::VERSION) < Gem::Version.new('2.0') then
-    # Add custom_shebang support to rubygems
-    require 'rubygems-bundler/rubygems_bundler_installer'
-  end
-
-  require 'rubygems-bundler/regenerate_binstubs_command'
-  Gem::CommandManager.instance.register_command :regenerate_binstubs
-elsif ENV.key?('NOEXEC_DEBUG')
-  msg = "Older rubygems-bundler found, loaded: #{RubygemsBundler.spec_version}, called: #{called_version}, you can uninstall it with:\n\n    "
-
-  error_source = __FILE__
-  gem_source = File.expand_path("../../../..", error_source)
-  gem_version = error_source.sub(/^.*\/rubygems-bundler-([^\/]+)\/.*$/,'\1')
-
-  if ENV['GEM_HOME'] or ENV['GEM_PATH']
-    msg << "GEM_HOME=\"#{gem_source}\" " unless ENV['GEM_HOME'] == gem_source
-  end
-
-  msg << "gem uninstall -ax rubygems-bundler -v #{gem_version}\n\n"
-
-  puts msg
-end