development 1.0.5 → 1.0.6

data/CHANGELOG.md

@@ -7,4 +7,4 @@ Update for preventing multiple-load.
 Oops! Configuration-file enabling was commented out. So 1.0.3 is the first working version!
 ... And then left comments in.
 Fix for enabling by gemset.
-
+Directories can now specify either the directory the gem directory is in or the gem directory itself.

data/lib/development.rb

@@ -894,32 +894,45 @@ module ::Development
         # ensure we have 'gem-subname' rather than 'gem/subname'
         # we really just need one or the other consistently
         gem_directory_name = gem_name.gsub( '/', '-' )
-      
+
         # look for gem name in enabled gems/gemsets
         if @enabled_gems.include?( gem_name.to_sym ) or 
            @enable_for_all && ! @disabled_gems.include?( gem_name.to_sym )
 
-          if directory_name = @gem_locations[ gem_name.to_sym ]   and
-             load_path = directory( directory_name )              and
-             gem_name_at_load_path?( load_path, gem_directory_name, true )
+          if directory_name = @gem_locations[ gem_name.to_sym ]
+
+            load_path = directory( directory_name )
+          
+            if gem_name_in_load_path?( load_path, gem_directory_name )
+          
+              load_gem_in_path( load_path, gem_directory_name )
+              @loaded_gems.push( gem_name.to_sym )
+              did_load = true
           
-            load_gem_from_path( load_path, gem_directory_name )
-            @loaded_gems.push( gem_name.to_sym )
-            did_load = true
+            elsif gem_name_at_load_path?( load_path, gem_directory_name )
+            
+              load_gem_at_path( load_path, gem_directory_name )
+              @loaded_gems.push( gem_name.to_sym )
+              did_load = true
+            
+            end
+                    
+          end
+    
+          unless did_load
           
-          else
             # look in each path for gem - use first to match
             @general_load_paths.each do |this_load_path|
 
               # look for gem name at load path
               if gem_name_at_load_path?( this_load_path, gem_name )
-                load_gem_from_path( this_load_path, gem_name )
+                load_gem_at_path( this_load_path, gem_name )
                 @loaded_gems.push( gem_name.to_sym )
                 did_load = true
               end
 
             end
-        
+      
           end
     
         end
@@ -932,12 +945,47 @@ module ::Development
     
   end
 
+  #################################
+  #  self.gem_name_in_load_path?  #
+  #################################
+  
+  ###
+  # Query whether gem name is present in load path, meaning load path specifies the gem directory.
+  #
+  # @param load_path 
+  #
+  #        Path where gem directory might be located.
+  #
+  # @param gem_directory_name 
+  #
+  #        Name of gem. Assumes gem-subname is used rather than gem/subname.
+  #
+  # @return [true,false] Whether gem name is present.
+  #
+  def self.gem_name_in_load_path?( gem_path, gem_directory_name, require_gem_at_path = false )
+    
+    exists_at_load_path = false
+    
+    gem_name = gem_directory_name.gsub( '-', '/' )
+    
+    gem_require_file = ::File.join( gem_path, 'lib', gem_name ) + '.rb'
+    
+    if ::File.exist?( ::File.expand_path( gem_require_file ) )
+      
+      exists_at_load_path = true
+    
+    end
+    
+    return exists_at_load_path
+    
+  end
+
   #################################
   #  self.gem_name_at_load_path?  #
   #################################
   
   ###
-  # Query whether gem name is present at load path.
+  # Query whether gem name is present at load path, meaning load path specifies the directory holding gem directory.
   #
   # @param load_path 
   #
@@ -968,13 +1016,39 @@ module ::Development
     return exists_at_load_path
     
   end
+
+  ###########################
+  #  self.load_gem_in_path  #
+  ###########################
   
-  #############################
-  #  self.load_gem_from_path  #
-  #############################
+  ###
+  # Load gem from gem directory path. Assumes gem is present in path.
+  #
+  # @param load_path 
+  #
+  #        Path where gem directory might be located.
+  #
+  # @param gem_directory_name 
+  #
+  #        Name of gem. Assumes gem-subname is used rather than gem/subname.
+  #
+  # @return [true,false] Whether gem name is present.
+  #
+  def self.load_gem_in_path( gem_path, gem_directory_name )
+        
+    gem_name = gem_directory_name.gsub( '-', '/' )
+    
+    gem_require_file = ::File.join( gem_path, 'lib', gem_name ) + '.rb'
+    require_relative( ::File.expand_path( gem_require_file ) )
+    
+  end
+  
+  ###########################
+  #  self.load_gem_at_path  #
+  ###########################
   
   ###
-  # Load gem from gem path. Assumes gem is present at path.
+  # Load gem from path to directory holding gem directory. Assumes gem is present at path.
   #
   # @param load_path 
   #
@@ -986,7 +1060,7 @@ module ::Development
   #
   # @return [true,false] Whether gem name is present.
   #
-  def self.load_gem_from_path( load_path, gem_directory_name )
+  def self.load_gem_at_path( load_path, gem_directory_name )
         
     gem_name = gem_directory_name.gsub( '-', '/' )
     gem_path = ::File.join( load_path, gem_directory_name )

data/lib/development/require.rb

@@ -23,7 +23,7 @@ module ::Development::Require
   def require( gem_name_or_path )
     
     did_load = ::Development.require( gem_name_or_path )
-    
+
     if did_load.nil?
       did_load = super
     end

data/spec/development_spec.rb

@@ -221,30 +221,55 @@ describe ::Development do
     
   end
 
+  #################################
+  #  self.gem_name_in_load_path?  #
+  #################################
+
+  it 'can find a gem name in a load path, meaning load path specifies the gem directory' do
+    ::Development.gem_name_in_load_path?( 'spec/mock_gem', 'mock_gem' ).should == true
+    ::Development.gem_name_in_load_path?( 'spec/mock_gem-subgem', 'mock_gem-subgem' ).should == true
+  end
+
   #################################
   #  self.gem_name_at_load_path?  #
   #################################
 
-  it 'can find a gem name at a load path' do
+  it 'can find a gem name at a load path, meaning load path specifies the directory holding gem directory' do
     ::Development.gem_name_at_load_path?( 'spec', 'mock_gem' ).should == true
     ::Development.gem_name_at_load_path?( 'spec', 'mock_gem-subgem' ).should == true
   end
 
-  #############################
-  #  self.load_gem_from_path  #
-  #############################
+  ###########################
+  #  self.load_gem_in_path  #
+  ###########################
 
   it 'can load a gem from a development path' do
 
     defined?( ::Development::MockGem ).should == nil
-    ::Development.load_gem_from_path( 'spec', 'mock_gem' )
+    ::Development.load_gem_in_path( 'spec/mock_gem', 'mock_gem' )
     defined?( ::Development::MockGem ).should == 'constant'
 
     defined?( ::Development::MockGem::Subgem ).should == nil
-    ::Development.load_gem_from_path( 'spec', 'mock_gem-subgem' )
+    ::Development.load_gem_in_path( 'spec/mock_gem-subgem', 'mock_gem-subgem' )
     defined?( ::Development::MockGem::Subgem ).should == 'constant'
     
   end
+
+  ###########################
+  #  self.load_gem_at_path  #
+  ###########################
+
+  it 'can load a gem from a development path' do
+
+    defined?( ::Development::MockGem2 ).should == nil
+    ::Development.load_gem_at_path( 'spec', 'mock_gem2' )
+    defined?( ::Development::MockGem2 ).should == 'constant'
+
+    defined?( ::Development::MockGem2::Subgem2 ).should == nil
+    ::Development.load_gem_at_path( 'spec', 'mock_gem-subgem2' )
+    defined?( ::Development::MockGem2::Subgem2 ).should == 'constant'
+    
+  end
   
   ##################################
   #  self.load_configuration_file  #
@@ -277,7 +302,7 @@ describe ::Development do
   ####################
   #  Object.require  #
   ####################
-  
+
   it 'hooks require for registered gems' do
     
     ::Development.parse_configuration_expression( '+directory_name ./spec' )
@@ -289,6 +314,18 @@ describe ::Development do
     defined?( ::Development::RequireMock ).should == 'constant'
     
   end
+  
+  it 'hooks require for registered gems' do
+    
+    ::Development.parse_configuration_expression( '+directory_name ./spec/require_mock2' )
+    ::Development.parse_configuration_expression( '@directory_name require_mock2' )
+    ::Development.parse_configuration_expression( '!enable require_mock2' )
+    
+    defined?( ::Development::RequireMock2 ).should == nil
+    require 'require_mock2'
+    defined?( ::Development::RequireMock2 ).should == 'constant'
+    
+  end
 
   it 'hooks require for enable-all' do
     

data/spec/mock_gem-subgem2/lib/mock_gem/subgem2.rb

@@ -0,0 +1,4 @@
+
+class ::Development::MockGem2::Subgem2
+
+end

data/spec/mock_gem2/lib/mock_gem2.rb

@@ -0,0 +1,4 @@
+
+class ::Development::MockGem2
+
+end

data/spec/require_mock2/lib/require_mock2.rb

@@ -0,0 +1,4 @@
+
+class ::Development::RequireMock2
+
+end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: development
 version: !ruby/object:Gem::Version
-  version: 1.0.5
+  version: 1.0.6
   prerelease: 
 platform: ruby
 authors:
@@ -57,8 +57,11 @@ files:
 - spec/development_spec.rb
 - spec/mock_gem/lib/mock_gem.rb
 - spec/mock_gem-subgem/lib/mock_gem/subgem.rb
+- spec/mock_gem-subgem2/lib/mock_gem/subgem2.rb
+- spec/mock_gem2/lib/mock_gem2.rb
 - spec/other_require_mock/lib/other_require_mock.rb
 - spec/require_mock/lib/require_mock.rb
+- spec/require_mock2/lib/require_mock2.rb
 - README.md
 - CHANGELOG.md
 homepage: http://rubygems.org/gems/development
@@ -72,7 +75,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
   - - ! '>='
     - !ruby/object:Gem::Version
-      version: '0'
+      version: 1.9.1
 required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
   requirements: