math_ml 0.9 → 0.10

data/Rakefile

@@ -1,6 +1,6 @@
 load "Rakefile.utirake"
 
-VER = "0.9"
+VER = "0.10"
 
 UtiRake.setup do
 	external("https://hg.hinet.mydns.jp", %w[eim_xml])
@@ -27,7 +27,10 @@ UtiRake.setup do
 	end
 
 	rcov_spec do |s|
-		s.spec_files << FileList["symbols/**/*_spec.rb"]
+		s.ruby_opts = %w[-rubygems]
+		s.pattern ||= %w[spec/util.rb spec/*_spec.rb]
+		s.pattern = [s.pattern] unless s.pattern.is_a?(Array)
+		s.pattern << "symbols/**/*_spec.rb"
 	end
 
 	spec do |s|
@@ -37,10 +40,18 @@ UtiRake.setup do
 end
 
 namespace :spec do
-	Spec::Rake::SpecTask.new(:symbols) do |s|
-		s.spec_files = FileList["./symbols/**/*_spec.rb"]
-		s.spec_opts << "-c"
-		s.libs << "lib" << "external/lib"
+	RSpec::Core::RakeTask.new(:symbols) do |s|
+		s.pattern = "./symbols/**/*_spec.rb"
+		s.rspec_opts = %w[-c -I lib -I external/lib]
+	end
+end
+
+task :package do
+	name = "math_ml-#{VER}"
+	cp "external/eim_xml/lib/eim_xml.rb", "pkg/#{name}/lib/"
+	Dir.chdir "pkg" do
+		rm "#{name}.tar.gz"
+		sh "tar zcf #{name}.tar.gz #{name}/"
 	end
 end
 

data/Rakefile.utirake

@@ -6,7 +6,6 @@
 require "rake/clean"
 require "rake/testtask"
 require "rake/rdoctask"
-require "rake/gempackagetask"
 require "rake/contrib/rubyforgepublisher"
 require "rubygems/package_task"
 
@@ -23,12 +22,19 @@ class UtiRake
 	def setup(opt={}, &proc)
 		@opt = opt
 		directory "external"
-		CLOBBER << "external" << "coverage" << "coverage.spec" << "coverage.cuke" << "doc"
+		CLEAN << "coverage" << "coverage.spec" << "coverage.cuke" << "doc"
+		CLOBBER << "external"
 
 		instance_eval(&proc) if proc
 
 		if need_spec?
-			require "spec/rake/spectask"
+			begin
+				@rspec2_flg = false
+				require "rspec/core/rake_task"
+				@rspec2_flg = true
+			rescue LoadError
+				require "spec/rake/spectask"
+			end
 			define_spec_task
 		end
 
@@ -44,6 +50,12 @@ class UtiRake
 		define_alias_task if @alias_task
 	end
 
+	def rspec2?; @rspec2_flg; end
+
+	def spec_task
+		rspec2? ? RSpec::Core::RakeTask : Spec::Rake::SpecTask
+	end
+
 	def need_spec?
 		File.directory?("spec")
 	end
@@ -160,22 +172,21 @@ class UtiRake
 		spec = Gem::Specification.new do |s|
 			s.platform = Gem::Platform::RUBY
 			s.files = FileList["Rakefile*", "lib/**/*", "spec/**/*"]
-			s.version = ENV["VER"] || "0.0.0.noversion"
+			s.version = "0.0.0.noversion"
 			gemspec_proc.call(s) if gemspec_proc
 		end
 
 		gem = Gem::PackageTask.new(spec) do |t|
 			t.need_tar_gz = true
-			t.need_zip = true
 			package_proc.call(t) if package_proc
 		end
 
-		task "utirake:gem" do
+		task "utirake:copy_for_package" do
 			mv "Rakefile.utirake", "Rakefile.utirake_#{$$}"
-			symlink "external/utirake/utirake.rb", "Rakefile.utirake"
+			cp "external/utirake/utirake.rb", "Rakefile.utirake"
 		end
 
-		file "#{gem.package_dir}/#{gem.gem_spec.file_name}" => "utirake:gem"
+		file gem.package_dir_path => "utirake:copy_for_package"
 
 		task :gem do
 			rm "Rakefile.utirake"
@@ -197,8 +208,15 @@ class UtiRake
 	end
 
 	def set_spec_opts(spec)
-		spec.spec_opts << "-c"
-		spec.libs << "." << "./lib" << "./external/lib"
+		spec.verbose = false
+		if rspec2?
+			spec.rspec_opts ||= []
+			spec.rspec_opts << "-c"
+			spec.rspec_opts << "-I" << "." << "-I" << "./lib" << "-I" << "./external/lib"
+		else
+			spec.spec_opts << "-c"
+			spec.libs << "." << "./lib" << "./external/lib"
+		end
 	end
 
 	def define_spec_task
@@ -206,8 +224,12 @@ class UtiRake
 		namespace :spec do
 			spec_files.each do |f|
 				desc ""
-				Spec::Rake::SpecTask.new(:apart) do |s|
-					s.spec_files = FileList[f]
+				spec_task.new(:apart) do |s|
+					if rspec2?
+						s.pattern = f
+					else
+						s.spec_files = FileList[f]
+					end
 					set_spec_opts(s)
 					spec_proc.call(s) if spec_proc
 				end
@@ -215,27 +237,36 @@ class UtiRake
 			task(:apart).comment = "Run all specs separately"
 
 			desc "Run all specs in a lump"
-			Spec::Rake::SpecTask.new(:lump) do |s|
-				s.spec_files = spec_files
+			spec_task.new(:lump) do |s|
+				s.spec_files = spec_files unless rspec2?
 				set_spec_opts(s)
 				spec_proc.call(s) if spec_proc
 			end
 
 			desc "Run all specs to profile"
-			Spec::Rake::SpecTask.new(:profile) do |s|
+			spec_task.new(:profile) do |s|
 				set_spec_opts(s)
-				s.spec_opts << "-f" << "profile"
+				if rspec2?
+					s.rspec_opts << "-p"
+				else
+					s.spec_opts << "-f" << "profile"
+				end
 			end
 
-			`grep -sRn '#[[:space:]]*here[[:space:]]*$' spec`.split(/\n/).map{|l|
+			`grep -sRn '#[[:space:]]*here\\([[:space:]]\\|$\\)' spec`.split(/\n/).map{|l|
 				next nil unless l=~/\A(.*?):(\d+):/
 				[$1, $2.to_i]
 			}.compact.sort{|a, b| FILE_SORT.call(a[0], b[0])}.reverse.each do |file, line|
 				desc ""
-				Spec::Rake::SpecTask.new(:here) do |s|
-					s.spec_files = [file]
+				spec_task.new(:here) do |s|
 					set_spec_opts(s)
-					s.spec_opts << "-l#{line}"
+					if rspec2?
+						s.pattern = file
+						s.rspec_opts << "-l#{line}"
+					else
+						s.spec_files = [file]
+						s.spec_opts << "-l#{line}"
+					end
 					spec_proc.call(s) if spec_proc
 				end
 			end
@@ -273,6 +304,8 @@ class UtiRake
 	end
 
 	def rcov_opts(t, aggregation)
+		t.rcov_opts ||= []
+		t.rcov_opts << "-I" << "./spec:./lib:./external/lib"
 		t.rcov_opts << "--exclude" << "gems\/,features\/,external\/"
 		t.rcov_opts << "--aggregate" << "coverage.data" if aggregation
 		t.rcov = true
@@ -280,12 +313,17 @@ class UtiRake
 
 	def define_rcov_each_task(aggregation)
 		if need_spec?
-			Spec::Rake::SpecTask.new do |t|
-				t.spec_files = spec_files
+			spec_task.new do |t|
+				t.verbose = false
 				rcov_opts(t, aggregation)
-				set_spec_opts(t)
+				if rspec2?
+					t.rcov_opts << "-o" << "coverage.spec" unless aggregation
+				else
+					set_spec_opts(t)
+					t.spec_files = spec_files
+					t.rcov_dir = "coverage.spec" unless aggregation
+				end
 				rcov_spec_proc.call(t) if rcov_spec_proc
-				t.rcov_dir = "coverage.spec" unless aggregation
 			end
 		else
 			task "spec"