rubygems-bundler 1.4.2 → 1.4.3

data/.travis.yml

@@ -1,17 +1,16 @@
 language: ruby
 rvm:
   - 1.8.7
-  - 1.9.2
   - 1.9.3
   - 2.0.0
   - ruby-head
-  - rbx-18mode
-  - rbx-19mode
+  - rbx
 before_install:
   - 'rm -rvf $rvm_path/gems/*/{bin,gems}/{rubygems-bundler-,executable-hooks-}* $rvm_path/gems/*/bin/ruby_*_wrapper'
   - hash -r
   - 'curl -L https://get.smf.sh | sh'
   - 'export PATH=~/.sm/bin:$PATH'
+  - 'gem install executable-hooks'
   - 'sm ext install gem mpapis/sm_gem'
 install: gem install tf -v '>=0.4.1'
 before_script:
@@ -27,25 +26,13 @@ notifications:
     on_failure: change
 matrix:
   include:
-    - rvm: jruby-18mode
-      env: 'JRUBY_OPTS="-X-C --server -J-XX:+TieredCompilation"'
-      jdk: openjdk7
-    - rvm: jruby-19mode
-      env: 'JRUBY_OPTS="-X-C --server -J-XX:+TieredCompilation"'
-      jdk: openjdk7
     - rvm: jruby-head
       env: 'JRUBY_OPTS="-X-C --server -J-XX:+TieredCompilation"'
       jdk: openjdk7
   allow_failures:
-    - rvm: jruby-18mode
-      env: 'JRUBY_OPTS="-X-C --server -J-XX:+TieredCompilation"'
-      jdk: openjdk7
-    - rvm: jruby-19mode
-      env: 'JRUBY_OPTS="-X-C --server -J-XX:+TieredCompilation"'
-      jdk: openjdk7
     - rvm: jruby-head
       env: 'JRUBY_OPTS="-X-C --server -J-XX:+TieredCompilation"'
       jdk: openjdk7
-    - rvm: rbx-18mode
-    - rvm: rbx-19mode
     - rvm: ruby-head
+    - rvm: rbx
+  fast_finish: true

data/CHANGELOG.md

@@ -1,5 +1,11 @@
 # Changelog
 
+## 1.4.3
+date: 2014-04-04
+
+ - deferred log2 for performance, update #59
+ - fix filtering gem executables on old rubygems, fix #59
+
 ## 1.4.2
 date: 2013-10-28
 

data/README.md

@@ -101,15 +101,23 @@ rubygems-bundler was merged with [noexec gem](https://github.com/joshbuddy/noexe
 
 ## Uninstallation
 
-    rubygems-bundler-uninstaller
     gem uninstall rubygems-bundler
 
+### Uninstallation of executable-hooks
+
+`rubygems-bundler` does not change the shebangs itself anymore, this was extracted to `executable-hooks`:
+
+    executable-hooks-uninstaller
+    gem uninstall executable-hooks
+
 this will set all gems to `/usr/bin/env ruby`, which is one of the safest choices (especially when using rvm).
 
+### Removing from RVM
+
 When using rvm, these additional steps will ensure this gem is removed and not installed again:
 
-    rvm get stable --without-gems=rubygems-bundler
-    rvm all-gemsets do gem uninstall --all --executables rubygems-bundler
+    rvm get stable --without-gems="rubygems-bundler executable-hooks"
+    rvm all-gemsets do gem uninstall --all --executables rubygems-bundler executable-hooks
 
 
 ## Authors

data/lib/rubygems-bundler/noexec.rb

@@ -17,8 +17,11 @@ class Noexec
     puts msg if Noexec::DEBUG
   end
 
-  def log2(msg)
-    puts msg if Noexec::DEBUG == "2"
+  def log2(msg=nil)
+    if Noexec::DEBUG == "2"
+      msg=yield if msg.nil? && block_given?
+      puts msg
+    end
   end
 
   def candidate?
@@ -41,7 +44,7 @@ class Noexec
       log "Config based matching didn't find it, resorting to Gemfile lookup"
     end
     runtime = Bundler.load
-    log2 "runtime specs: #{runtime.specs.map{|g| "#{g.name}-#{g.version}"}*" "}"
+    log2(){ "runtime specs: #{runtime.specs.map{|g| "#{g.name}-#{g.version}"}*" "}" }
     if rubygems_spec # that single gem
       missing_spec = runtime.
         instance_variable_get(:@definition).
@@ -63,8 +66,15 @@ class Noexec
     false
   end
 
+  def old_specs
+    if Hash === rubygems_specs
+    then @rubygems_specs.values
+    else @rubygems_specs
+    end
+  end
+
   def rubygems_spec
-    @rubygems_spec ||= rubygems_specs.detect{|spec| spec.executables.include?(bin) }
+    @rubygems_spec ||= old_specs.detect{|spec| spec.executables.include?(bin) }
   end
 
   def setup
@@ -72,7 +82,7 @@ class Noexec
     require "bundler-unload"
 
     @rubygems_specs = Bundler.rubygems.plain_specs # save it for unloading and checking binary
-    log2 "rubygems_specs: #{rubygems_specs.map{|g| "#{g.name}-#{g.version}"}*" "}"
+    log2(){ "rubygems_specs: #{rubygems_specs.map{|g| "#{g.name}-#{g.version}"}*" "}" }
 
     @gemfile = ENV['BUNDLE_GEMFILE'] || File.join(Noexec::CURRENT, "Gemfile")
     initial_env_gemfile = ENV['BUNDLE_GEMFILE']

data/lib/rubygems-bundler/version.rb

@@ -1,3 +1,3 @@
 module RubygemsBundler
-  VERSION = "1.4.2"
+  VERSION = "1.4.3"
 end

metadata

@@ -1,7 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: rubygems-bundler
 version: !ruby/object:Gem::Version 
-  version: 1.4.2
+  hash: 1
+  prerelease: false
+  segments: 
+  - 1
+  - 4
+  - 3
+  version: 1.4.3
 platform: ruby
 authors: 
 - Josh Hull
@@ -10,15 +16,22 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2013-10-28 00:00:00 Z
+date: 2014-04-04 00:00:00 +02:00
+default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
   name: bundler-unload
   prerelease: false
   requirement: &id001 !ruby/object:Gem::Requirement 
+    none: false
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
+        hash: 19
+        segments: 
+        - 1
+        - 0
+        - 2
         version: 1.0.2
   type: :runtime
   version_requirements: *id001
@@ -26,9 +39,15 @@ dependencies:
   name: executable-hooks
   prerelease: false
   requirement: &id002 !ruby/object:Gem::Requirement 
+    none: false
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
+        hash: 21
+        segments: 
+        - 1
+        - 2
+        - 5
         version: 1.2.5
   type: :runtime
   version_requirements: *id002
@@ -36,10 +55,13 @@ dependencies:
   name: tf
   prerelease: false
   requirement: &id003 !ruby/object:Gem::Requirement 
+    none: false
     requirements: 
-    - &id004 
-      - ">="
+    - - ">="
       - !ruby/object:Gem::Version 
+        hash: 3
+        segments: 
+        - 0
         version: "0"
   type: :development
   version_requirements: *id003
@@ -70,28 +92,39 @@ files:
 - 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: 
 - Apache 2.0
-metadata: {}
-
 post_install_message: 
 rdoc_options: []
 
 require_paths: 
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement 
+  none: false
   requirements: 
-  - *id004
+  - - ">="
+    - !ruby/object:Gem::Version 
+      hash: 3
+      segments: 
+      - 0
+      version: "0"
 required_rubygems_version: !ruby/object:Gem::Requirement 
+  none: false
   requirements: 
-  - *id004
+  - - ">="
+    - !ruby/object:Gem::Version 
+      hash: 3
+      segments: 
+      - 0
+      version: "0"
 requirements: []
 
 rubyforge_project: 
-rubygems_version: 2.0.12
+rubygems_version: 1.3.7
 signing_key: 
-specification_version: 4
+specification_version: 3
 summary: Stop using bundle exec
 test_files: 
 - test/dtf/binary_comment_test.sh

checksums.yaml

@@ -1,7 +0,0 @@
---- 
-SHA1: 
-  metadata.gz: 4dcac37a7d79d4fcfb24178acdfebdc0b48e60c0
-  data.tar.gz: fa45200c534dbdb5ebc117e253f76096161d8a47
-SHA512: 
-  metadata.gz: 8bf988fb799d252c84b97c3323f9dc44f611f79a900939220309688d76226dc1088d93b7de43ce0a6aa1c0f34147c696501d04187f792bbd7bb528096458a48f
-  data.tar.gz: bf3521a90859314c2417c450181f373f7d0f540bb8c4580d43ad73e0f2cfe77b290717df6ac3c79fb99abd41b462aeb12f951b91d0783c1834214ce6fa974343