[macruby-changes] [4719] DietRB/trunk

[source_changes at macosforge.org]

Revision: 4719
          http://trac.macosforge.org/projects/ruby/changeset/4719
Author:   eloy.de.enige at gmail.com
Date:     2010-10-08 04:04:18 -0700 (Fri, 08 Oct 2010)
Log Message:
-----------
Also merge the specs into the MacRuby repo.

From: Eloy Duran <eloy.de.enige at gmail.com>

Modified Paths:
--------------
    DietRB/trunk/Rakefile
    DietRB/trunk/spec/spec_helper.rb

Modified: DietRB/trunk/Rakefile
===================================================================
--- DietRB/trunk/Rakefile	2010-10-08 11:04:11 UTC (rev 4718)
+++ DietRB/trunk/Rakefile	2010-10-08 11:04:18 UTC (rev 4719)
@@ -33,16 +33,19 @@
   desc "Merge source into the MacRuby repo"
   task :merge do
     if (repo = ENV['macruby_repo']) && File.exist?(repo)
-      bin = File.join(repo, 'bin/irb')
-      lib = File.join(repo, 'lib')
+      bin  = File.join(repo, 'bin/irb')
+      lib  = File.join(repo, 'lib')
+      spec = File.join(repo, 'spec/dietrb')
       
-      rm_f bin
-      rm_f File.join(lib, 'irb.rb')
+      rm_f  bin
+      rm_f  File.join(lib, 'irb.rb')
       rm_rf File.join(lib, 'irb')
+      rm_rf spec
       
-      cp 'bin/dietrb', bin
-      cp 'lib/irb.rb', lib
-      cp_r 'lib/irb', lib
+      cp   'bin/dietrb', bin
+      cp   'lib/irb.rb', lib
+      cp_r 'lib/irb',    lib
+      cp_r 'spec',       spec
     else
       puts "[!] Set the `macruby_repo' env variable to point to the MacRuby repo checkout"
       exit 1

Modified: DietRB/trunk/spec/spec_helper.rb
===================================================================
--- DietRB/trunk/spec/spec_helper.rb	2010-10-08 11:04:11 UTC (rev 4718)
+++ DietRB/trunk/spec/spec_helper.rb	2010-10-08 11:04:18 UTC (rev 4719)
@@ -1,9 +1,17 @@
-require 'rubygems'
-require 'mspec'
+unless defined?(MSpec)
+  require 'rubygems'
+  require 'mspec'
+end
 
 ENV['SPECCING'] = 'true'
 
-ROOT = File.expand_path('../../', __FILE__)
+root = File.expand_path('../../', __FILE__)
+if File.basename(root) == 'spec'
+  # running from the MacRuby repo
+  ROOT = File.expand_path('../../../', __FILE__)
+else
+  ROOT = root
+end
 $:.unshift File.join(ROOT, 'lib')
 
-require 'irb'
+require 'irb'
\ No newline at end of file
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://lists.macosforge.org/pipermail/macruby-changes/attachments/20101008/4e0896d4/attachment.html>