rubygems-bundler 1.2.0 → 1.2.1

data/lib/rubygems-bundler/version.rb

@@ -1,3 +1,3 @@
 module RubygemsBundler
-  VERSION = "1.2.0"
+  VERSION = "1.2.1"
 end

data/lib/rubygems_plugin.rb

@@ -1,14 +1,22 @@
-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
+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_version = __FILE__.sub(/^.*\/rubygems-bundler-([^\/]+)\/.*$/,'\1')
+called_path, called_version = __FILE__.match(/^(.*\/rubygems-bundler-([^\/]+)\/lib).*$/)[1..2]
 
-# 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
+# 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'

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: rubygems-bundler
 version: !ruby/object:Gem::Version 
-  hash: 31
+  hash: 29
   prerelease: 
   segments: 
   - 1
   - 2
-  - 0
-  version: 1.2.0
+  - 1
+  version: 1.2.1
 platform: ruby
 authors: 
 - Josh Hull
@@ -16,8 +16,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2013-06-02 00:00:00 +02:00
-default_executable: 
+date: 2013-07-05 00:00:00 Z
 dependencies: 
 - !ruby/object:Gem::Dependency 
   name: bundler-unload
@@ -82,7 +81,6 @@ 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: []
 
@@ -112,7 +110,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
 requirements: []
 
 rubyforge_project: 
-rubygems_version: 1.6.2
+rubygems_version: 1.8.24
 signing_key: 
 specification_version: 3
 summary: Stop using bundle exec