rubygems-bundler 1.0.1 → 1.0.2

data/CHANGELOG.md

@@ -1,5 +1,10 @@
 # Changelog
 
+## 1.0.2
+date: 2012-05-18
+
+ - fix #24 disable loading plugin in case of disabled shared gems in bundler
+
 ## 1.0.1
 date: 2012-05-17
 

data/lib/rubygems-bundler/version.rb

@@ -1,3 +1,3 @@
 module RubygemsBundler
-  VERSION = "1.0.1"
+  VERSION = "1.0.2"
 end

data/lib/rubygems_plugin.rb

@@ -7,8 +7,10 @@ rubygems_bundler_spec =
 
 called_version = __FILE__.sub(/^.*\/rubygems-bundler-([^\/]+)\/.*$/,'\1')
 
-# continue only if loaded and called versions all the same
-if rubygems_bundler_spec and rubygems_bundler_spec.version.to_s == called_version
+# continue only if loaded and called versions all the same, and not shared gems disabled in bundler
+if rubygems_bundler_spec and rubygems_bundler_spec.version.to_s == called_version and
+  ( !defined?(Bundler) || ( defined?(Bundler) && !Bundler.settings[:disable_shared_gems]) )
+
   require 'rubygems/version'
   require 'rubygems-bundler/wrapper'
 

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: rubygems-bundler
 version: !ruby/object:Gem::Version 
-  hash: 21
+  hash: 19
   prerelease: 
   segments: 
   - 1
   - 0
-  - 1
-  version: 1.0.1
+  - 2
+  version: 1.0.2
 platform: ruby
 authors: 
 - Josh Hull
@@ -16,7 +16,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2012-05-17 00:00:00 Z
+date: 2012-05-18 00:00:00 Z
 dependencies: 
 - !ruby/object:Gem::Dependency 
   name: dtf