reverse-require 0.1.1 → 0.1.2

data/History.txt

@@ -1,3 +1,9 @@
+=== 0.1.2 / 2008-10-22
+
+* Fixed a bug where ReverseRequire.require_for would try to activate
+  multiple versions of the same Gem.
+* Refactored ReverseRequire::Gems to store paths and gem specs in reverse.
+
 === 0.1.1 / 2008-10-05
 
 * Renamed the gem file to reverse-require.

data/lib/reverse_require/gems.rb

@@ -1,12 +1,27 @@
 require 'rubygems'
 
 module ReverseRequire
-  class Gems < Hash
+  class Gems
+
+    # Paths of the gems
+    attr_reader :paths
+
+    # Gem specifications
+    attr_reader :gem_specs
+
+    #
+    # Creates a new empty Gems object.
+    #
+    def initialize
+      @paths = []
+      @gem_specs = []
+    end
+
     #
     # Creates a new Gems object containing the gems which depend upon
     # the RubyGem of the specified _name_.
     #
-    def self.depending_on(name)
+    def Gems.depending_on(name)
       name = name.to_s
       spec_dir = File.join(Gem.dir,'specifications')
       gems = Gems.new
@@ -16,19 +31,75 @@ module ReverseRequire
         
         if deps.include?(name)
           gem_path = File.expand_path(File.join(Gem.dir,'gems',path))
-          gems[gem_path] = gem_spec
+
+          gems.enqueue(gem_path,gem_spec)
         end
       end
 
       return gems
     end
 
+    #
+    # Returns the number of paths and gem specs.
+    #
+    def length
+      return 0 if (@paths.empty? || @gem_specs.empty?)
+      return [@paths.length, @gem_specs.length].min
+    end
+
+    #
+    # Returns the gem spec with the specified gem _path_.
+    #
+    def [](path)
+      @gem_specs[@paths.index(path)]
+    end
+
+    #
+    # Adds the specified _gem_spec_ with the specified gem _path_.
+    #
+    def []=(path,gem_spec)
+      if @paths.include?(path)
+        @gem_specs[@paths.index(path)] = gem_spec
+      else
+        @paths << path
+        @gem_specs << gem_spec
+      end
+
+      return gem_spec
+    end
+
+    #
+    # Enqueues the specified _gem_spec_ with the specified gem _path_.
+    #
+    def enqueue(path,gem_spec)
+      if @paths.include?(path)
+        @gem_specs[@paths.index(path)] = gem_spec
+      else
+        @paths.unshift(path)
+        @gem_specs.unshift(gem_spec)
+      end
+
+      return self
+    end
+
+    #
+    # Iterates over each path and gem spec, passing each to the given
+    # _block_.
+    #
+    def each(&block)
+      length.times do |i|
+        block.call(@paths[i], @gem_specs[i])
+      end
+
+      return self
+    end
+
     #
     # Returns a new Gems object containing the names and paths from the
     # gems which match the specified _block_.
     #
     def select(&block)
-      gems = Gems.new
+      gems = self.class.new
 
       each do |path,gem_spec|
         if block.call(path,gem_spec)
@@ -67,7 +138,7 @@ module ReverseRequire
         sub_path += '.rb'
       end
 
-      select do |path,gem_spec|
+      return select do |path,gem_spec|
         File.exists?(File.expand_path(File.join(path,sub_path)))
       end
     end

data/lib/reverse_require/reverse_require.rb

@@ -18,8 +18,19 @@ module ReverseRequire
     lib_path = File.join('lib',sub_path)
 
     was_loaded = gems.with_path(lib_path).map do |path,gem_spec|
-      gem(gem_spec.name,gem_spec.version)
-      require File.expand_path(File.join(path,lib_path))
+      activated = Gem.loaded_specs.any? do |active_path,activated_spec|
+        activated_spec.name == gem_spec.name &&
+          activated_spec.version != gem_spec.version
+      end
+
+      unless activated
+        begin
+          gem(gem_spec.name,gem_spec.version)
+          require File.expand_path(File.join(path,lib_path))
+        rescue Gem::Exception
+          next
+        end
+      end
     end
 
     return was_loaded.include?(true)

data/lib/reverse_require/version.rb

@@ -1,3 +1,3 @@
 module ReverseRequire
-  VERSION = '0.1.1'
+  VERSION = '0.1.2'
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: reverse-require
 version: !ruby/object:Gem::Version 
-  version: 0.1.1
+  version: 0.1.2
 platform: ruby
 authors: 
 - Postmodern Modulus III
@@ -9,7 +9,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2008-10-05 00:00:00 -07:00
+date: 2008-10-22 00:00:00 -07:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -20,7 +20,7 @@ dependencies:
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
-        version: 1.7.0
+        version: 1.8.0
     version: 
 description: "reverse_require requires specific files from the gems which depend on a certain RubyGem and contain the specified path. Using reverse_require one can allow others to easily extend the functionality of a RubyGem. Simply add reverse_require into the code of your RubyGem:  reverse_require 'my_gem', 'some/path'  Then other gems which depend upon +my_gem+ merely have to provide <tt>some/path</tt> within their <tt>lib/</tt> directory, and reverse_require will load them all at run-time. This ability makes designing plug-in systems for a RubyGem trivial."
 email: 
@@ -67,7 +67,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
 requirements: []
 
 rubyforge_project: reverserequire
-rubygems_version: 1.2.0
+rubygems_version: 1.3.0
 signing_key: 
 specification_version: 2
 summary: reverse_require requires specific files from the gems which depend on a certain RubyGem and contain the specified path