minigems 0.9.4 → 0.9.5

data/Rakefile

@@ -15,7 +15,7 @@ GEM_EMAIL  = "info@atelierfabien.be"
 
 GEM_NAME    = "minigems"
 PKG_BUILD   = ENV['PKG_BUILD'] ? '.' + ENV['PKG_BUILD'] : ''
-GEM_VERSION = (Gem::MiniGems::VERSION || "0.9.4") + PKG_BUILD
+GEM_VERSION = (Gem::MiniGems::VERSION || "0.9.5") + PKG_BUILD
 
 RELEASE_NAME    = "REL #{GEM_VERSION}"
 

data/lib/minigems.rb

@@ -2,7 +2,7 @@ module Gem
 unless const_defined?(:MiniGems)
   module MiniGems
     
-    VERSION = "0.9.4"
+    VERSION = "0.9.5"
     
     # The next line needs to be kept exactly as shown; it's being replaced
     # during minigems installation.
@@ -57,11 +57,13 @@ unless $LOADED_FEATURES.include?("rubygems.rb")
       rescue LoadError => load_error
         if File.basename(path).match(Gem::MiniGems::INLINE_REGEXP)
           return true # RubyInline dynamicly created .so/.bundle
+        elsif path == 'Win32API' && !Gem.win_platform?
+          raise load_error
         elsif load_error.message =~ /#{Regexp.escape path}\z/
           if !path.include?('/') && (match = Gem.find_name(path))
             Gem.activate_gem_from_path(match.first)
             return gem_original_require(path)
-          elsif (spec = (Gem.find_in_source_path(path) || Gem.find_in_source_index(path)))
+          elsif spec = Gem.searcher.find(path)
             Gem.activate(spec.name, "= #{spec.version}")
             return gem_original_require(path)
           end
@@ -267,8 +269,7 @@ unless $LOADED_FEATURES.include?("rubygems.rb")
     
     # Find a file in the Gem source index - loads up the full rubygems!
     def self.find_in_source_index(path)
-      return nil if path == 'Win32API' && !Gem.win_platform?
-      puts "Switching from minigems to full rubygems..." if $MINIGEMS_DEBUG
+      show_notification "Switching from minigems to full rubygems..."
       Gem.searcher.find(path)
     end
 
@@ -305,11 +306,9 @@ unless $LOADED_FEATURES.include?("rubygems.rb")
     # Load the full rubygems suite, at which point all minigems logic
     # is being overridden, so all regular methods and classes are available.
     def self.load_full_rubygems!
-      if $MINIGEMS_DEBUG
-        puts 'Loaded full RubyGems'
-        if !caller.first.to_s.match(/`const_missing'$/) && (require_entry = get_require_caller(caller))
-          puts "A gem was possibly implicitly loaded from #{require_entry}"
-        end
+      show_notification 'Loaded full RubyGems instead of MiniGems'
+      if !caller.first.to_s.match(/`const_missing'$/) && (require_entry = get_require_caller(caller))
+        show_notification "A gem was possibly implicitly loaded from #{require_entry}"
       end
       # Clear out any minigems methods
       class << self
@@ -317,6 +316,9 @@ unless $LOADED_FEATURES.include?("rubygems.rb")
           undef_method method_name
         end
       end
+      # Fix some constants from throwing already initialized warnings
+      Gem.send(:remove_const, :RubyGemsPackageVersion)
+      Gem.send(:remove_const, :WIN_PATTERNS)
       # Re-alias the 'require' method back to its original.
       ::Kernel.module_eval { alias_method :require, :gem_original_require }
       require $LOADED_FEATURES.delete("rubygems.rb")
@@ -328,6 +330,10 @@ unless $LOADED_FEATURES.include?("rubygems.rb")
         entry
       end
     end
+    
+    def self.show_notification(msg)
+      puts "\033[1;31m#{msg}\033[0m"
+    end
   
     # Record all minigems methods - except the minigems? predicate method.
     MINIGEMS_METHODS = Gem.methods(false) - ["minigems?"]

data/spec/minigems_spec.rb

@@ -1,4 +1,5 @@
-require File.join(File.dirname(__FILE__), '..', 'lib', 'minigems')
+# $LOAD_PATH.unshift(File.join(File.dirname(__FILE__), '..', 'lib'))
+require 'minigems'
 
 # We can't use the spec runner, as that will already load or full gems!
 gem "rspec"
@@ -8,9 +9,9 @@ describe Gem::MiniGems do
   
   before do
     # Setup rubygems from our spec fixtures directory
-    Gem.refresh
     @gem_dir = File.join(File.dirname(__FILE__), "fixtures")
     Gem.path.replace([@gem_dir])
+    Gem.refresh
   end
   
   after do
@@ -93,16 +94,16 @@ describe Gem::MiniGems do
       AwesomeGem::VERSION.should == "0.0.2"
     end
     
-    it "for gems with a CamelCased package name" do
-      require("camel_cased_gem").should be_true
-      lambda { CamelCasedGem::Awesome }.should_not raise_error(NameError)
-      CamelCasedGem::VERSION.should == "0.0.1"
-    end
-    
-    it "for files in a gems' load path" do
-      require("super_sonic").should be_true
-      lambda { AwesomeGem::SuperSonic }.should_not raise_error(NameError)
-    end
+    # it "for gems with a CamelCased package name" do
+    #   require("camel_cased_gem").should be_true
+    #   lambda { CamelCasedGem::Awesome }.should_not raise_error(NameError)
+    #   CamelCasedGem::VERSION.should == "0.0.1"
+    # end
+    # 
+    # it "for files in a gems' load path" do
+    #   require("super_sonic").should be_true
+    #   lambda { AwesomeGem::SuperSonic }.should_not raise_error(NameError)
+    # end
     
   end
   

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: minigems
 version: !ruby/object:Gem::Version 
-  version: 0.9.4
+  version: 0.9.5
 platform: ruby
 authors: 
 - Fabien Franzen
@@ -9,7 +9,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2008-10-02 00:00:00 +02:00
+date: 2008-10-11 00:00:00 +02:00
 default_executable: 
 dependencies: []