rubygems-bundler 1.1.1 → 1.2.0.rc1

data/CHANGELOG.md

@@ -1,5 +1,10 @@
 # Changelog
 
+## 1.2.0.rc1
+date: 2013-04-15
+
+ - do not break on broken Gemfile, fix #41
+
 ## 1.1.0
 date: 2012-09-05
 

data/lib/rubygems-bundler/noexec.rb

@@ -23,8 +23,10 @@ else
 
     module Bundler
       class << self
-        def reset!
+        def reset!(rubygems_specs)
           @load = nil
+          ENV.replace(ORIGINAL_ENV)
+          Bundler.rubygems.replace_entrypoints(rubygems_specs)
         end
       end
     end
@@ -39,6 +41,7 @@ else
       end
 
       def candidate?(gemfile, bin)
+        rubygems_specs = Gem::Specification._all
         config_file = File.expand_path('../.noexec.yaml', gemfile)
         log "Considering #{config_file.inspect}"
         if File.exist?(config_file)
@@ -60,12 +63,11 @@ else
           return true if %w(ruby irb).include?(bin) || spec.executables.include?(bin)
         end
         false
-      rescue Bundler::BundlerError => e
+      rescue Bundler::BundlerError, Bundler::GemfileError => e
         warn "Ignoring candidate #{gemfile}:\n#{e}" if RubygemsBundler::DEBUG
         false
       ensure
-        Bundler.reset!
-        ENV['BUNDLE_GEMFILE'] = nil
+        Bundler.reset!(rubygems_specs)
       end
 
       def setup

data/lib/rubygems-bundler/version.rb

@@ -1,3 +1,3 @@
 module RubygemsBundler
-  VERSION = "1.1.1"
+  VERSION = "1.2.0.rc1"
 end

metadata

@@ -1,48 +1,43 @@
---- !ruby/object:Gem::Specification 
+--- !ruby/object:Gem::Specification
 name: rubygems-bundler
-version: !ruby/object:Gem::Version 
-  hash: 17
-  prerelease: 
-  segments: 
-  - 1
-  - 1
-  - 1
-  version: 1.1.1
+version: !ruby/object:Gem::Version
+  version: 1.2.0.rc1
+  prerelease: 6
 platform: ruby
-authors: 
+authors:
 - Josh Hull
 - Michal Papis
 autorequire: 
 bindir: bin
 cert_chain: []
-
-date: 2013-02-25 00:00:00 Z
-dependencies: 
-- !ruby/object:Gem::Dependency 
+date: 2013-04-24 00:00:00.000000000 Z
+dependencies:
+- !ruby/object:Gem::Dependency
   name: tf
-  prerelease: false
-  requirement: &id001 !ruby/object:Gem::Requirement 
+  requirement: !ruby/object:Gem::Requirement
     none: false
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
-        hash: 3
-        segments: 
-        - 0
-        version: "0"
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
   type: :development
-  version_requirements: *id001
-description: Stop using bundle exec. Integrate Rubygems and Bundler. Make rubygems generate bundler aware executable wrappers.
-email: 
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
+description: Stop using bundle exec. Integrate Rubygems and Bundler. Make rubygems
+  generate bundler aware executable wrappers.
+email:
 - joshbuddy@gmail.com
 - mpapis@gmail.com
-executables: 
+executables:
 - rubygems-bundler-uninstaller
 extensions: []
-
 extra_rdoc_files: []
-
-files: 
+files:
 - .gem.config
 - .gitignore
 - .noexec.yaml
@@ -67,38 +62,29 @@ files:
 - test/dtf/rubygems_comment_test.sh
 homepage: http://mpapis.github.com/rubygems-bundler
 licenses: []
-
 post_install_message: 
 rdoc_options: []
-
-require_paths: 
+require_paths:
 - lib
-required_ruby_version: !ruby/object:Gem::Requirement 
+required_ruby_version: !ruby/object:Gem::Requirement
   none: false
-  requirements: 
-  - - ">="
-    - !ruby/object:Gem::Version 
-      hash: 3
-      segments: 
-      - 0
-      version: "0"
-required_rubygems_version: !ruby/object:Gem::Requirement 
+  requirements:
+  - - ! '>='
+    - !ruby/object:Gem::Version
+      version: '0'
+required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
-  requirements: 
-  - - ">="
-    - !ruby/object:Gem::Version 
-      hash: 3
-      segments: 
-      - 0
-      version: "0"
+  requirements:
+  - - ! '>'
+    - !ruby/object:Gem::Version
+      version: 1.3.1
 requirements: []
-
 rubyforge_project: 
-rubygems_version: 1.8.24
+rubygems_version: 1.8.25
 signing_key: 
 specification_version: 3
 summary: Stop using bundle exec
-test_files: 
+test_files:
 - test/dtf/bundler_comment_test.sh
 - test/dtf/rails_and_gemfile_comment_test.sh
 - test/dtf/rubygems_comment_test.sh