gemdev 0.1.0 → 0.1.1

data/lib/gemdev.rb

@@ -1,27 +1,67 @@
 require 'rubygems'
 require 'yaml'
+require 'strscan'
 
-module Kernel
-  alias development_gem_orginal_require require
+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  
+      
+        def full_gem_path=(input)
+		@full_gem_path = input
+	end
+  end
 
-  def require(path)
-    development_gem_orginal_require path
-  rescue LoadError => load_error
-	raise load_error unless Gem.require_development(path)
+  class Specification
+	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
   end
 end
 
-module Gem
-	def self.require_development(path)
-		#File.touch(config_file) if !File.exists?(config_file)
-		
-		config = YAML.load_file(config_file)
-		return false unless config.kind_of?(Hash)
-		
-		development = config['development']
-		return false if development.nil? || !development.has_key?(path)
+# reset the gem path searcher
+@gempath_searcher = nil
+
+if File.exists?(Gem.config_file)
+	config = YAML.load_file(Gem.config_file)
+	devel = 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)}
 
-		require development[path] 
-		true
+	paths.each do |path|
+		next if File.file?(path)
+		Gem::Specification.load_devel(path).each do |spec|
+			Gem.source_index.add_spec(spec)
+		end
 	end
 end

data/lib/test/unit/subsets.rb

@@ -9,10 +9,24 @@ require 'pp'
 class Test::Unit::TestCase
 
 	class << self
+		# 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_)?(.*)/
@@ -32,6 +46,8 @@ class Test::Unit::TestCase
 		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| 
@@ -43,9 +59,11 @@ class Test::Unit::TestCase
 		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)
-			block.call 
+			yield
 		else
 			print ' '
 		end
@@ -57,12 +75,15 @@ class Test::Unit::TestCase
 		subset_test("EXTENDED", "x", &block)
 	end
 	
-	# Subset test declaration for benchmard tests -- type: BENCHMARK
+	# Subset test declaration for benchmark tests -- type: BENCHMARK
 	# Prints 'b' unless run.
-	def benchmark_test(&block) 
+	def benchmark_test(length=10, &block) 
 		subset_test("BENCHMARK") do
+			puts
 			puts calling_method
-			block.call
+			bm(length) do |x|
+				yield(x)
+			end
 		end
 	end
 
@@ -89,16 +110,63 @@ class Test::Unit::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 "This test requires your input.\nEnter 'exit' to skip the test."
+			puts "\n#{calling_method} -- Enter values or 'skip'."
 		
 			config = {}
 			array.each do |key|
 				print "#{key}: "
 				value = gets.strip
-				flunk "exited test" if value =~ /exit/i
+				flunk "skipped test" if value =~ /skip/i
 				
 				config[key] = value
 			end
@@ -109,6 +177,12 @@ class Test::Unit::TestCase
 	
 	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
@@ -120,18 +194,16 @@ class Test::Unit::TestCase
 	
 	# Returns true if the subset type or 'ALL' is specified in ENV
 	def run_subset?(type)
-		env_true?(type) || env_true?("ALL")
+		env_true?(type) || env_true?("ALL") ? true : false
 	end
 
 	# Returns true if the pretty-print string for obj matches the regexp specified in ENV[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 default if env_true?("ALL")
+		return true if env_true?("ALL")
 		return default unless ENV[type]
 		
-		str = ""
-		PP.singleline_pp(obj, str)
-		str =~ Regexp.new(ENV[type])
+		spp(obj) =~ Regexp.new(ENV[type]) ? true : false
 	end
 	
 	# Calling method iterates over the call stack, and returns the first calling
@@ -157,7 +229,7 @@ class Test::Unit::TestCase
 		type_test = "#{type}_TEST"
 		if run_subset?(type) || ENV[type_test]
 			if match_regexp?(type_test,  calling_method)
-				block.call 
+				yield
 			else
 				print skip
 			end
@@ -165,4 +237,13 @@ class Test::Unit::TestCase
 			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

data/test/gemdev/gem_with_folder_require/Rakefile

@@ -0,0 +1,15 @@
+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/gem_with_folder_require/lib/folder_require.rb

@@ -0,0 +1,3 @@
+
+module FolderRequire
+end

data/test/gemdev/gemrc

@@ -0,0 +1,3 @@
+development:
+  - ./test/gemdev/gem_with_folder_require
+  - ./test/gemdev/rakefile_with_multiple_specs

data/test/gemdev/rakefile_with_multiple_specs/Rakefile

@@ -0,0 +1,29 @@
+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

data/test/gemdev/rakefile_with_multiple_specs/lib/multiple_spec_require.rb

@@ -0,0 +1,3 @@
+
+module MultipleSpecRequire
+end

data/test/gemdev/rakefile_with_multiple_specs/lib/unrequired.rb

@@ -0,0 +1,3 @@
+
+module Unrequired
+end

data/test/gemdev_test.rb

@@ -0,0 +1,36 @@
+require File.join(File.dirname(__FILE__), 'gemdev_test_helper.rb') 
+
+# override config accessor for testing
+module Gem
+	def self.config_file
+		"./test/gemdev/gemrc"
+	end
+end
+
+require File.join(File.dirname(__FILE__), '../lib/gemdev')
+
+class GemdevTest < Test::Unit::TestCase
+
+	def test_setup
+		assert File.exists?(Gem.config_file)
+	end
+	
+	def test_require_unregistered_gem
+		assert_raise(Gem::LoadError) { gem('unregistered') }
+	end
+	
+	def test_require_gem_with_folder
+		assert_raise(NameError) { Object::FolderRequire }
+		
+		assert_equal true, require('folder_require')
+		assert Object::FolderRequire
+	end
+	
+	def test_require_rakefile_with_multiple_specs
+		assert_raise(NameError) { Object::MultipleSpecRequire }
+		assert_raise(NameError) { Object::Unrequired }
+		assert_equal true, require('multiple_spec_require')
+		assert Object::MultipleSpecRequire
+		assert_raise(NameError) { Object::Unrequired }
+	end
+end

data/test/gemdev_test_helper.rb

@@ -1 +1 @@
-require 'extensions/test/unit/subsets'
+require 'test/unit'

data/test/gemdev_test_suite.rb

@@ -1,4 +1,3 @@
 $:.unshift File.join(File.dirname(__FILE__), '../lib')
 
-ENV["ALL"] = 'true'
-Dir.glob("./**/*_test.rb").each {|test| require test}
+require File.join(File.dirname(__FILE__), 'subsets_test')

data/test/subsets_test.rb

@@ -0,0 +1,100 @@
+require File.join(File.dirname(__FILE__), 'gemdev_test_helper.rb') 
+require 'test/unit/subsets'
+
+class SubsetsTest < Test::Unit::TestCase
+	
+	def setup
+		ENV['ALL'] = nil
+		ENV['type'] = nil
+	end
+
+	#
+	# env_true test
+	#
+	
+	def test_env_true_is_true_if_var_is_true
+		assert !ENV['type']
+		assert !env_true?('type')
+		
+		ENV['type'] = "false"
+		assert !env_true?('type')
+		
+		ENV['type'] = "true"
+		assert env_true?('type')
+		
+		ENV['type'] = "True"
+		assert env_true?('type')
+		
+		ENV['type'] = "TRUE"
+		assert env_true?('type')
+	end
+
+	#
+	# run subset test
+	#
+
+	def test_run_subset_true_if_ENV_type_is_true
+		assert_equal false, run_subset?('type')
+		
+		ENV['type'] = "true"
+		assert_equal true, run_subset?('type')
+	end
+
+	def test_run_subset_true_if_ENV_ALL_is_true
+		ENV['ALL'] = "true"
+		assert_equal true, run_subset?('type')
+	end
+
+	#
+	# match_regexp test
+	#
+	
+	def test_match_regexp
+		[1, [1,2]].each do |input|
+			ENV['type'] = "1"
+			assert_equal true, match_regexp?('type', input)
+		end
+		
+		["one", ["one", "two"]].each do |input|
+			ENV['type'] = "one"
+			assert_equal true, match_regexp?('type', input)
+		end
+	end
+
+	def test_match_regexp_returns_true_if_ENV_ALL_true
+		ENV['ALL'] = "true"
+		assert_equal true, match_regexp?('type', 1, "default")
+	end
+
+	def test_match_regexp_returns_default_unless_ENV_type_is_set
+		assert_equal "default", match_regexp?('type', 1, "default")
+	end
+	
+	#
+	# calling method tests
+	#
+	
+	def nested_call_to_calling_method
+		assert_equal 'test_calling_method', calling_method
+	end
+	
+	def nested_call_with_alternate_pattern
+		assert_equal 'nested_call_with_alternate_pattern', calling_method(/^nested/)
+	end
+	
+	def test_calling_method
+		assert_equal 'test_calling_method', calling_method
+		nested_call_to_calling_method
+		nested_call_with_alternate_pattern
+	end
+	
+	#
+	# singleline pp test
+	#
+	
+	def test_format_pps_input
+		[1, "two", [:three, 4]].each do |input|
+			assert_equal PP.singleline_pp(input, ''), spp(input)
+		end
+	end
+end

metadata

@@ -3,8 +3,8 @@ rubygems_version: 0.9.0
 specification_version: 1
 name: gemdev
 version: !ruby/object:Gem::Version 
-  version: 0.1.0
-date: 2007-03-21 00:00:00 -06:00
+  version: 0.1.1
+date: 2007-04-30 00:00:00 -06:00
 summary: Making gem development a bit easier.
 require_paths: 
 - lib
@@ -29,8 +29,21 @@ post_install_message:
 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/lib
+- test/gemdev/gem_with_folder_require/Rakefile
+- test/gemdev/gem_with_folder_require/lib/folder_require.rb
+- 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
 - lib/gemdev.rb
 - lib/test
 - lib/test/unit