gemdev 0.1.2 → 0.1.3

data/README

@@ -1,100 +1,73 @@
-# = GemDev
-# Utilities simplifying gem development. 
-#
-# == Introduction
-# RubyGems is an amazing packaging system, hands down.  GemDev
-# provides some extensions to make it easy to develop multiple, 
-# interrelated gems at once by allowing you to specify your gem 
-# development folders in the RubyGems configuration file (.gemrc). Additionally, test 
-# extensions are provided to permit test subsetting.
-#
-# Copyright (c) 2006-2007, Regents of the University of Colorado.
-# Developer:: Simon Chiang, Biomolecular Structure Program
-# Support:: UCHSC School of Medicine Deans Academic Enrichment Fund
-# Licence:: MIT-Style
-#
-# == GemDev Usage
-# For specifying development folders, add one big glob or a list of filepaths
-# to the .gemrc file, keyed by 'development'.  GemDev will look for 'Rakefile'
-# in every folder specified and read and instantiate each Gem::Specification  
-# included therein.  As a result, you can require the gems as if they were 
-# already installed.
-#
-# Say you were developing 'ioutils' in folder '/path/to/ioutils' with the sample
-# Rakefile (see below) at '/path/to/ioutils/Rakefile'.
-#
-# To specify this file add to '.gemrc':
-#
-#   development: /path/to/{ioutils, another_gem}
-#
-# or:
-#
-#   development: 
-#     - /path/to/ioutils
-#     - /path/to/another_gem
-#
-# In your scripts:
-# 
-#   require 'gemdev'
-#   require 'ioutils' # => now works 
-#
-# == Subsets Usage
-# Subsets are provided to make unit testing more convenient.
-#
-# Example:
-#
-#   require 'gemdev'
-#   require 'test/unit/subsets'
-#
-#   class YourTest < Test::Unit::TestCase
-#     # only runs if ENV['benchmark']=true
-#     def test_benchmark_some_method
-#       benchmark_test do |x|
-#          x.report("speed") {...}
-#       end
-#     end
-#   end
-#
-# == Sample Rakefile
-#
-#   require 'rake'
-#   require 'rake/testtask'
-#   require 'rake/rdoctask'
-#   require 'rake/gempackagetask'
-#  
-#   # tasks
-#   desc 'Default: Run tests.'
-#   task :default => :test
-#  
-#   desc 'Run tests.'
-#   Rake::TestTask.new(:test) do |t|
-#     t.libs << 'lib'
-#     t.pattern = File.join('test', ENV['subset'] || '', ENV['pattern'] || '**/*_test.rb')
-#     t.verbose = true
-#   end
-#  
-#   #
-#   # Gem specification
-#   #
-#   Gem::manage_gems
-#   spec = Gem::Specification.new do |s|
-#  	 s.name = "ioutils"
-#  	 s.version = "0.1.0"
-#  	 s.author = "Simon Chiang"
-#  	 s.email = "simon.chiang@uchsc.edu"
-#  	 s.homepage = "http://rubyforge.org/projects/ioutils/"
-#  	 s.platform = Gem::Platform::RUBY
-#  	 s.files = Dir.glob("{test,lib,docs}/**/*")
-#  	 s.require_path = "lib"
-#  	 s.autorequire = "ioutils"
-#  	 s.test_file = "test/ioutils_test_suite.rb"
-#  	
-#  	 s.has_rdoc = true
-#  	 s.extra_rdoc_files = ["README"]
-#  	 s.add_dependency("gemdev", ">= 0.1.1")
-#  	 s.add_dependency("activesupport", ">= 1.4.2")
-#   end
-#  
-#   Rake::GemPackageTask.new(spec) do |pkg|
-#  	 pkg.need_tar = true
-#   end
+= GemDev
+Utilities simplifying gem development. 
+
+== Introduction
+GemDev provides some extensions to make it easy to develop multiple, 
+interrelated gems at once by allowing you to specify your gem 
+development folders in the RubyGems configuration file (.gemrc). 
+
+Additionally, test extensions are provided to permit test subsetting.
+
+Copyright (c) 2006-2007, Regents of the University of Colorado.
+Developer:: Simon Chiang, Biomolecular Structure Program
+Support:: UCHSC School of Medicine Deans Academic Enrichment Fund
+Licence:: MIT-Style
+
+== GemDev Usage
+Specify development folders using one big glob or an array of globs 
+keyed by 'development' in the '.gemrc' file.  GemDev will load each
+'gemspecs/*.gemspec' file along every path specified, and set the 
+gem path so you can require the gems as if they were already installed.
+
+Say you were developing 'ioutils' with the following:
+  /path/to/ioutils # => your development folder
+  /path/to/ioutils/gemspecs/0.7.0.gemspec  # => a released gemspec
+  /path/to/ioutils/gemspecs/0.8.0.gemspec  # => the lastest, unreleased gemspec
+
+To specify this gem, you add to '.gemrc':
+
+  development: /path/to/ioutils
+
+or if you have a bunch of other gems:
+
+  development: 
+    - /path/to/{ioutils,another_gem}
+    - /path/to/yet_another_gem
+
+In your scripts:
+
+  require 'gemdev'
+  require 'ioutils' # => now works without installing ioutils
+  
+Requiring ioutils as above will load the latest version (0.8.0) by default, but
+nothing prevents you from requiring a different version if you need to.  
+
+== Working with Rakefiles
+Splitting gemspecs out of a Rakefile while preserving a GemPackageTask is easy:
+
+  # Normally here you'd have your definition
+  # Gem::Specification.new ... 
+  #
+  # Just replace with the path to the gemspec you want to package
+  spec = Gem::SourceIndex.load_specification("./gemspecs/0.8.0.gemspec")
+  Rake::GemPackageTask.new(spec) do |pkg|
+	  pkg.need_tar = true
+  end
+
+== Subsets Usage
+Subsets are provided to make unit testing more convenient.
+
+Example:
+
+  require 'gemdev'
+  require 'test/unit/subsets'
+
+  class YourTest < Test::Unit::TestCase
+    # only runs if ENV['benchmark']=true
+    def test_benchmark_some_method
+      benchmark_test do |x|
+         x.report("speed") {...}
+      end
+    end
+  end
+

data/lib/gemdev.rb

@@ -1,69 +1,63 @@
 require 'rubygems'
 require 'yaml'
-require 'strscan'
 
-module Gem
-  class Specification
-	# The full path to the gem (install path + full name).
-	#
-	# return:: [String] the full gem path
-	#
-	def full_gem_path
-	      @full_gem_path || File.join(installation_path, "gems", full_name)
-        end  
+module Gem # :nodoc:
+  class Specification 
+	  # The full path to the gem (install path + full name).
+	  #
+	  # return:: [String] the full gem path
+  	#
+	  def full_gem_path
+      @full_gem_path || File.join(installation_path, "gems", full_name)
+    end  
       
-        def full_gem_path=(input)
-		@full_gem_path = input
-	end
+    def full_gem_path=(input)
+		  @full_gem_path = input
+	  end
 
-	def self.load_devel(path)	
-		gemspecs = []
-		fail "NESTED Specification.load calls not allowed!" if @@gather
-		@@gather = proc do |gs| 
-		      gs.full_gem_path = path
-		      gemspecs << gs
-		end
+	  def self.load_devel(path)	
+		  gemspecs = []
+		  fail "NESTED Specification.load calls not allowed!" if @@gather
+		  @@gather = proc do |gs| 
+        gs.full_gem_path = path
+        gemspecs << gs
+  		end
 
-		#full rakefile is not needed or desired... just gemspecs
-		data = File.read(File.join(path,"Rakefile"))
-		scanner = StringScanner.new(data)
-		specs = []
-		while scanner.skip_until(/Gem::Specification\.new do/)
-			start = scanner.pos - 25 # length of 'Gem::Specification.new do'
-			scanner.skip_until(/\send/)
-		
-			specs << data[start..scanner.pos]
-		end
-	     
-		eval(specs.join("\n"))
-		gemspecs
-	    ensure
-		@@gather = nil
-	end
+		  # load any gemspecs
+      specs = Dir.glob( File.expand_path(File.join(path, "gemspecs/*.gemspec")) ).collect do |spec|
+        File.read(spec)
+      end
+      
+		  eval(specs.join("\n"))
+		  gemspecs
+      ensure
+      @@gather = nil
+    end
   end
 
-  class GemPathSearcher
-	def refresh!
+  class GemPathSearcher 
+	  def refresh!
 	      # cut and paste of the initialize routine
 	      @gemspecs = init_gemspecs
 	      @lib_dirs = {}
 	      @gemspecs.each do |spec|
-		@lib_dirs[spec.object_id] = lib_dirs(spec)
+		    @lib_dirs[spec.object_id] = lib_dirs(spec)
 	      end
-	end
+	  end
   end
 end
 
 if File.exists?(Gem.config_file)
 	config = YAML.load_file(Gem.config_file)
-	devel = config['development']
+	devel_paths = config['development']
 
 	# File.expand_path required to change windows filepaths to unix filepaths
-	paths = case devel
-	when Array then devel
-	when String then Dir.glob(File.expand_path(devel))
-	end.collect {|p| File.expand_path(p)}
-
+	devel_paths = [devel_paths] unless devel_paths.kind_of?(Array)
+  paths = devel_paths.collect do |path|
+    Dir.glob(File.expand_path(path))
+  end
+  
+  paths = paths.flatten.collect {|path| File.expand_path(path)}
 	paths.each do |path|
 		next if File.file?(path)
 		Gem::Specification.load_devel(path).each do |spec|
@@ -72,4 +66,5 @@ if File.exists?(Gem.config_file)
 	end
 end
 
+raise "RubyGems version is too old for GemDev.\nUpdate with 'gem update --server' or download the latest One-Click installer for Windows, then try again." unless Gem.respond_to?(:searcher)
 Gem.searcher.refresh!

data/lib/test/unit/subsets.rb

@@ -2,264 +2,267 @@ require 'test/unit'
 require 'benchmark'
 require 'pp'
 
-# These subsets facilitate testing by using the ENV variables specified on the command line
-# to indicate which tests to run.  The ENV variables are set by rake, so this code implicitly 
-# assumes that you're running your tests through rake.
-# 
-class Test::Unit::TestCase
+module Test # :nodoc:
+  module Unit # :nodoc:
+    
+    # These subsets facilitate testing by using the ENV variables specified on the command line
+    # to indicate which tests to run.  The ENV variables are set by rake, so this code implicitly 
+    # assumes that you're running your tests through rake.
+    class TestCase
+      class << self
+        # Access to the case-insensitive ENV variables
+        def env(type, reset=false)
+          if @env_vars.nil? || reset
+            @env_vars = {}
+            ENV.each_pair do |key, value|
+              @env_vars[key.downcase] = value
+            end
+          end
+          @env_vars[type.downcase]
+        end
+        
+        # Causes a whole test suite to require one of the listed platforms 
+        # in order to run.  See match_platform? for details.
+        #
+        # Simply declare like:
+        #
+        #   class Test::Unit::TestCase
+        #     require_platform 'mswin'
+        #   end
+        def require_platform(*platforms)
+          @platforms = platforms
+        end
+        
+        # Returns true if RUBY_PLATFORM matches one of the specfied
+        # platforms.  Use the prefix 'non_' to specify any plaform but the 
+        # specified platform (ex: 'non_mswin')
+        #
+        # Some common platforms:
+        # - mswin:: Windows
+        def match_platform?(*platforms)
+          platforms.each do |platform|
+            platform.to_s =~ /^(non_)?(.*)/
+          
+            non = true if $1
+            match_platform = !RUBY_PLATFORM.index($2).nil?
+            return false unless (non && !match_platform) || (!non && match_platform)
+          end
+          
+          true
+        end
+        
+        alias :original_suite :suite
+      end
+      
+      def self.suite
+        if match_platform?(*@platforms)
+          original_suite
+        else
+          # if platforms are specfied for the tests and the platform does NOT
+          # match, remake the suite to skip all tests.
+          method_names = public_instance_methods(true)
+          suite = Test::Unit::TestSuite.new(name)
+                method_names.each do |method_name| 
+            catch(:invalid_test) do
+              suite << new('on_test_skipped') if method_name =~ /^test/
+            end
+          end
+          suite
+        end
+      end
 
-	class << self
-		# Access to the case-insensitive ENV variables
-		def env(type, reset=false)
-			if @env_vars.nil? || reset
-				@env_vars = {}
-				ENV.each_pair do |key, value|
-					@env_vars[key.downcase] = value
-				end
-			end
-			@env_vars[type.downcase]
-		end
-		
-		# Causes a whole test suite to require one of the listed platforms 
-		# in order to run.  See match_platform? for details.
-		#
-		# Simply declare like:
-		#
-		#   class Test::Unit::TestCase
-		#     require_platform 'mswin'
-		#   end
-		def require_platform(*platforms)
-			@platforms = platforms
-		end
-		
-		# Returns true if RUBY_PLATFORM matches one of the specfied
-		# platforms.  Use the prefix 'non_' to specify any plaform but the 
-		# specified platform (ex: 'non_mswin')
-		#
-		# Some common platforms:
-		# - mswin:: Windows
-		def match_platform?(*platforms)
-			platforms.each do |platform|
-				platform.to_s =~ /^(non_)?(.*)/
-			
-				non = true if $1
-				match_platform = !RUBY_PLATFORM.index($2).nil?
-				return false unless (non && !match_platform) || (!non && match_platform)
-			end
-			
-			true
-		end
-		
-		alias :original_suite :suite
-	end
-	
-	def self.suite
-		if match_platform?(*@platforms)
-			original_suite
-		else
-			# if platforms are specfied for the tests and the platform does NOT
-			# match, remake the suite to skip all tests.
-			method_names = public_instance_methods(true)
-			suite = Test::Unit::TestSuite.new(name)
-		        method_names.each do |method_name| 
-				catch(:invalid_test) do
-					suite << new('on_test_skipped') if method_name =~ /^test/
-				end
-			end
-			suite
-		end
-	end
+      # Platform-specific test.  Useful for specifying test that should only be run on,
+      # for instance, windows.  See match_platform? for details.
+      def platform_test(*platforms, &block)
+        if self.class.match_platform?(*platforms)
+          yield
+        else
+          print ' '
+        end
+      end
+      
+      # Subset test declaration for extended tests -- type: EXTENDED
+      # Prints 'x' unless run.
+        def extended_test(&block) 
+        subset_test("EXTENDED", "x", &block)
+      end
+      
+      # Subset test declaration for benchmark tests -- type: BENCHMARK
+      # Prints 'b' unless run.
+      def benchmark_test(length=10, &block) 
+        subset_test("BENCHMARK") do
+          puts
+          puts calling_method
+          bm(length) do |x|
+            yield(x)
+          end
+        end
+      end
 
-	# Platform-specific test.  Useful for specifying test that should only be run on,
-	# for instance, windows.  See match_platform? for details.
-	def platform_test(*platforms, &block)
-		if self.class.match_platform?(*platforms)
-			yield
-		else
-			print ' '
-		end
-	end
-	
-	# Subset test declaration for extended tests -- type: EXTENDED
-	# Prints 'x' unless run.
-  	def extended_test(&block) 
-		subset_test("EXTENDED", "x", &block)
-	end
-	
-	# Subset test declaration for benchmark tests -- type: BENCHMARK
-	# Prints 'b' unless run.
-	def benchmark_test(length=10, &block) 
-		subset_test("BENCHMARK") do
-			puts
-			puts calling_method
-			bm(length) do |x|
-				yield(x)
-			end
-		end
-	end
+      # Case tests take a hash of testcases and expected values.  Each pair in the hash will 
+      # be passed to the block if type CASE_TEST is specified.  Individual cases tests can be 
+      # specified by providing a regexp in CASE; the testcase will run if the pretty-print of
+      # the testcase matches the provided regexp.  Example:
+      #
+      #   case_test(
+      #     [1,2,3] => 'an array testcase',
+      #     '[1, 2, 3]' => 'the pretty print of the array',
+      #     'another testcase' => 'some third testcase'
+      #   ).do |testcase, expected|
+      #      ...your test code...
+      #   end
+      #
+      #   ENV['CASE_TEST']=true  => all tests run
+      #   ENV['CASE']='1, 2, 3' => first two tests run
+      #   ENV['CASE']='another' => only last test runs
+      def case_test(hash, &block)
+        if match_regexp?("CASE_TEST", calling_method)
+          hash.each_pair do |testcase, expected|
+            yield(testcase, expected) if match_regexp?("CASE", testcase)
+          end
+        end
+      end
+      
+      # Acase tests take an array of testcases.  Each testcase in the array will 
+      # be passed to the block if type CASE_TEST is specified.  Individual cases tests can be 
+      # specified by providing a regexp in CASE; the testcase will run if the pretty-print of
+      # the testcase matches the provided regexp.  Example:
+      #
+      #   case_test(
+      #     [1,2,3] ,
+      #     '[1, 2, 3]',
+      #     'another testcase'
+      #   ).do |testcase|
+      #      ...your test code...
+      #   end
+      #
+      #   ENV['CASE_TEST']=true  => all tests run
+      #   ENV['CASE']='1, 2, 3' => first two tests run
+      #   ENV['CASE']='another' => only last test runs
+      def acase_test(*array)
+        if match_regexp?("CASE_TEST", calling_method)
+          array.each do |testcase|
+            yield(testcase) if match_regexp?("CASE", testcase)
+          end
+        end	
+      end
 
-	# Case tests take a hash of testcases and expected values.  Each pair in the hash will 
-	# be passed to the block if type CASE_TEST is specified.  Individual cases tests can be 
-	# specified by providing a regexp in CASE; the testcase will run if the pretty-print of
-	# the testcase matches the provided regexp.  Example:
-	#
-	#   case_test(
-	#     [1,2,3] => 'an array testcase',
-	#     '[1, 2, 3]' => 'the pretty print of the array',
-	#     'another testcase' => 'some third testcase'
-	#   ).do |testcase, expected|
-	#      ...your test code...
-	#   end
-	#
-	#   ENV['CASE_TEST']=true  => all tests run
-	#   ENV['CASE']='1, 2, 3' => first two tests run
-	#   ENV['CASE']='another' => only last test runs
-	def case_test(hash, &block)
-		if match_regexp?("CASE_TEST", calling_method)
-			hash.each_pair do |testcase, expected|
-				yield(testcase, expected) if match_regexp?("CASE", testcase)
-			end
-		end
-	end
-	
-	# Acase tests take an array of testcases.  Each testcase in the array will 
-	# be passed to the block if type CASE_TEST is specified.  Individual cases tests can be 
-	# specified by providing a regexp in CASE; the testcase will run if the pretty-print of
-	# the testcase matches the provided regexp.  Example:
-	#
-	#   case_test(
-	#     [1,2,3] ,
-	#     '[1, 2, 3]',
-	#     'another testcase'
-	#   ).do |testcase|
-	#      ...your test code...
-	#   end
-	#
-	#   ENV['CASE_TEST']=true  => all tests run
-	#   ENV['CASE']='1, 2, 3' => first two tests run
-	#   ENV['CASE']='another' => only last test runs
-	def acase_test(*array)
-		if match_regexp?("CASE_TEST", calling_method)
-			array.each do |testcase|
-				yield(testcase) if match_regexp?("CASE", testcase)
-			end
-		end	
-	end
+      
+      # Subset test declaration for prompt tests -- type: PROMPT
+      # Prints 'p' unless run.
+      #
+      # Useful for tests that require user input.  If run, then this test will
+      # prompt the user for an input for each item in the array.  The results
+      # are collected in a hash and passed to the block.
+      #
+      # Example:
+      # 
+      #   def test_something_important
+      #     prompt_test(:a, :b, :c).do |config|
+      #        ...your test code...
+      #     end
+      #   end
+      #
+      #   (if run, prompts print to $stdout the following:)
+      #   test_something_important: Enter values or 'skip'
+      #   a: # => enter 'avalue'
+      #   b: # => enter 'bvalue'
+      #   c: # => enter 'cvalue'
+      #
+      #   # config => {:a => 'avalue', :b => 'bvalue', :c => 'cvalue'}
+      def prompt_test(*array, &block)
+        subset_test("PROMPT", "p") do
+          puts "\n#{calling_method} -- Enter values or 'skip'."
+        
+          config = {}
+          array.each do |key|
+            print "#{key}: "
+            value = gets.strip
+            flunk "skipped test" if value =~ /skip/i
+            
+            config[key] = value
+          end
+            
+          yield(config)
+        end
+      end
+      
+      protected
+      
+      # Formats the input by using singleline_pp
+      def spp(input, str='')
+        PP.singleline_pp(input, str)
+      end
+      
+      # Required for platform tests
+      def on_test_skipped
+        print ' '
+      end
+      
+      # Access to the case-insensitive ENV variables
+      def env(type)
+        self.class.env(type)
+      end
+      
+      # Returns true if the env_var(var) is set and matches /^true%/i
+      def env_true?(var)
+        env(var) && env(var) =~ /^true$/i
+      end
+      
+      # Returns true if the subset type or 'ALL' is specified in ENV
+      def run_subset?(type)
+        env_true?(type) || env_true?("ALL") ? true : false
+      end
 
-	
-	# Subset test declaration for prompt tests -- type: PROMPT
-	# Prints 'p' unless run.
-	#
-	# Useful for tests that require user input.  If run, then this test will
-	# prompt the user for an input for each item in the array.  The results
-	# are collected in a hash and passed to the block.
-	#
-	# Example:
-	# 
-	#   def test_something_important
-	#     prompt_test(:a, :b, :c).do |config|
-	#        ...your test code...
-	#     end
-	#   end
-	#
-	#   (if run, prompts print to $stdout the following:)
-	#   test_something_important: Enter values or 'skip'
-	#   a: # => enter 'avalue'
-	#   b: # => enter 'bvalue'
-	#   c: # => enter 'cvalue'
-	#
-	#   # config => {:a => 'avalue', :b => 'bvalue', :c => 'cvalue'}
-	def prompt_test(*array, &block)
-		subset_test("PROMPT", "p") do
-			puts "\n#{calling_method} -- Enter values or 'skip'."
-		
-			config = {}
-			array.each do |key|
-				print "#{key}: "
-				value = gets.strip
-				flunk "skipped test" if value =~ /skip/i
-				
-				config[key] = value
-			end
-				
-			yield(config)
-		end
-	end
-	
-	protected
-	
-	# Formats the input by using singleline_pp
-	def spp(input, str='')
-		PP.singleline_pp(input, str)
-	end
-	
-	# Required for platform tests
-	def on_test_skipped
-		print ' '
-	end
-	
-	# Access to the case-insensitive ENV variables
-	def env(type)
-		self.class.env(type)
-	end
-	
-	# Returns true if the env_var(var) is set and matches /^true%/i
-	def env_true?(var)
-		env(var) && env(var) =~ /^true$/i
-	end
-	
-	# Returns true if the subset type or 'ALL' is specified in ENV
-	def run_subset?(type)
-		env_true?(type) || env_true?("ALL") ? true : false
-	end
-
-	# Returns true if the pretty-print string for obj matches the regexp specified in env_var(type).
-        # Returns the default value if 'ALL' is specified in ENV or type is not specified in ENV.  
-	def match_regexp?(type, obj, default=true)
-		return true if env_true?("ALL")
-		return default unless env(type)
-		
-		spp(obj) =~ Regexp.new(env(type)) ? true : false
-	end
-	
-	# Calling method iterates over the call stack, and returns the first calling
-	# method name that matches the input pattern (by default /^test/)
-	def calling_method(pattern=/^test/)
-		0.upto(caller.length) do |i|
-			caller[i] =~ /:in `(.*)'$/
-			method_name = $1
-			return method_name if method_name =~ pattern
-		end
-			
-		''
-	end
-	
-	# Basic method for a subset test.  The provided block will run if:
-	#   - The subset type or 'ALL' is specified in ENV
-	#   - The calling method matches the regexp provided in the "TYPE_TEST" ENV variable
-	#  
-	# Otherwise the block will be skipped and +skip+ will be printed.  By default skip
-	# is the first letter of +type+.
-	def subset_test(type, skip=type[0..0].downcase, &block)
-		type = type.upcase
-		type_test = "#{type}_TEST"
-		if run_subset?(type) || env(type_test)
-			if match_regexp?(type_test,  calling_method)
-				yield
-			else
-				print skip
-			end
-		else
-			print skip
-		end
-	end
-	
-	# Runs only if the first argument causes an 'if' statement to return true.
-	def switch_test(run_test, skip="!", &block)
-		if run_test
-			yield
-		else
-			print skip
-		end
-	end
+      # Returns true if the pretty-print string for obj matches the regexp specified in env_var(type).
+            # Returns the default value if 'ALL' is specified in ENV or type is not specified in ENV.  
+      def match_regexp?(type, obj, default=true)
+        return true if env_true?("ALL")
+        return default unless env(type)
+        
+        spp(obj) =~ Regexp.new(env(type)) ? true : false
+      end
+      
+      # Calling method iterates over the call stack, and returns the first calling
+      # method name that matches the input pattern (by default /^test/)
+      def calling_method(pattern=/^test/)
+        0.upto(caller.length) do |i|
+          caller[i] =~ /:in `(.*)'$/
+          method_name = $1
+          return method_name if method_name =~ pattern
+        end
+          
+        ''
+      end
+      
+      # Basic method for a subset test.  The provided block will run if:
+      #   - The subset type or 'ALL' is specified in ENV
+      #   - The calling method matches the regexp provided in the "TYPE_TEST" ENV variable
+      #  
+      # Otherwise the block will be skipped and +skip+ will be printed.  By default skip
+      # is the first letter of +type+.
+      def subset_test(type, skip=type[0..0].downcase, &block)
+        type = type.upcase
+        type_test = "#{type}_TEST"
+        if run_subset?(type) || env(type_test)
+          if match_regexp?(type_test,  calling_method)
+            yield
+          else
+            print skip
+          end
+        else
+          print skip
+        end
+      end
+      
+      # Runs only if the first argument causes an 'if' statement to return true.
+      def switch_test(run_test, skip="!", &block)
+        if run_test
+          yield
+        else
+          print skip
+        end
+      end
+    end
+  end
 end

data/test/gemdev/gem_with_folder_require/gemspecs/some.gemspec

@@ -0,0 +1,9 @@
+#
+# Gem specification
+#
+Gem::Specification.new do |s|
+	s.name = "gem_with_folder_require"
+	s.version = "0.1.1"
+	s.require_path = "lib"
+	s.autorequire = "folder_require"
+end

data/test/gemdev/rakefile_with_multiple_specs/gemspecs/1.gemspec

@@ -0,0 +1,9 @@
+#
+# Gem specification
+#
+Gem::Specification.new do |s|
+	s.name = "rakefile_with_multiple_specs"
+	s.version = "0.1.2"
+	s.require_path = "lib"
+	s.autorequire = "unrequired"
+end

data/test/gemdev/rakefile_with_multiple_specs/gemspecs/2.gemspec

@@ -0,0 +1,9 @@
+#
+# Gem specification
+#
+Gem::Specification.new { |s|
+	s.name = "rakefile_with_multiple_specs"
+	s.version = "0.1.3"
+	s.require_path = "lib"
+	s.autorequire = "multiple_spec_require"
+}

data/test/gemdev/rakefile_with_multiple_specs/gemspecs/3.gemspec

@@ -0,0 +1,9 @@
+#
+# Gem specification
+#
+Gem::Specification.new do |s|
+	s.name = "rakefile_with_multiple_specs"
+	s.version = "0.1.1"
+	s.require_path = "lib"
+	s.autorequire = "unrequired"
+end

metadata

@@ -3,8 +3,8 @@ rubygems_version: 0.9.2
 specification_version: 1
 name: gemdev
 version: !ruby/object:Gem::Version 
-  version: 0.1.2
-date: 2007-05-08 00:00:00 -06:00
+  version: 0.1.3
+date: 2007-05-29 00:00:00 -06:00
 summary: Making gem development a bit easier.
 require_paths: 
 - lib
@@ -30,20 +30,24 @@ authors:
 - Simon Chiang
 files: 
 - test/gemdev
-- test/gemdev_test.rb
-- test/gemdev_test_helper.rb
-- test/gemdev_test_suite.rb
-- test/subsets_test.rb
 - test/gemdev/gemrc
 - test/gemdev/gem_with_folder_require
-- test/gemdev/rakefile_with_multiple_specs
+- test/gemdev/gem_with_folder_require/gemspecs
+- test/gemdev/gem_with_folder_require/gemspecs/some.gemspec
 - test/gemdev/gem_with_folder_require/lib
-- test/gemdev/gem_with_folder_require/Rakefile
 - test/gemdev/gem_with_folder_require/lib/folder_require.rb
+- test/gemdev/rakefile_with_multiple_specs
+- test/gemdev/rakefile_with_multiple_specs/gemspecs
+- test/gemdev/rakefile_with_multiple_specs/gemspecs/1.gemspec
+- test/gemdev/rakefile_with_multiple_specs/gemspecs/2.gemspec
+- test/gemdev/rakefile_with_multiple_specs/gemspecs/3.gemspec
 - test/gemdev/rakefile_with_multiple_specs/lib
-- test/gemdev/rakefile_with_multiple_specs/Rakefile
 - test/gemdev/rakefile_with_multiple_specs/lib/multiple_spec_require.rb
 - test/gemdev/rakefile_with_multiple_specs/lib/unrequired.rb
+- test/gemdev_test.rb
+- test/gemdev_test_helper.rb
+- test/gemdev_test_suite.rb
+- test/subsets_test.rb
 - lib/gemdev.rb
 - lib/test
 - lib/test/unit

data/test/gemdev/gem_with_folder_require/Rakefile

@@ -1,15 +0,0 @@
-require 'rake'
-require 'rake/testtask'
-require 'rake/rdoctask'
-require 'rake/gempackagetask'
-
-#
-# Gem specification
-#
-Gem::manage_gems
-spec = Gem::Specification.new do |s|
-	s.name = "gem_with_folder_require"
-	s.version = "0.1.1"
-	s.require_path = "lib"
-	s.autorequire = "folder_require"
-end

data/test/gemdev/rakefile_with_multiple_specs/Rakefile

@@ -1,29 +0,0 @@
-require 'rake'
-require 'rake/testtask'
-require 'rake/rdoctask'
-require 'rake/gempackagetask'
-
-#
-# Gem specification
-#
-spec = Gem::Specification.new do |s|
-	s.name = "rakefile_with_multiple_specs"
-	s.version = "0.1.2"
-	s.require_path = "lib"
-	s.autorequire = "unrequired"
-end
-
-spec = Gem::Specification.new { |s|
-	s.name = "rakefile_with_multiple_specs"
-	s.version = "0.1.3"
-	s.require_path = "lib"
-	s.autorequire = "multiple_spec_require"
-}
-
-# out of order
-spec = Gem::Specification.new do |s|
-	s.name = "rakefile_with_multiple_specs"
-	s.version = "0.1.1"
-	s.require_path = "lib"
-	s.autorequire = "unrequired"
-end