[macruby-changes] [1961] MacRuby/branches/experimental

[source_changes at macosforge.org]

Revision: 1961
          http://trac.macosforge.org/projects/ruby/changeset/1961
Author:   eloy.de.enige at gmail.com
Date:     2009-07-01 16:47:00 -0700 (Wed, 01 Jul 2009)
Log Message:
-----------
Cleaning up after merging RubySpec changes upstream

Modified Paths:
--------------
    MacRuby/branches/experimental/rakelib/rubyspec_mspec.rake
    MacRuby/branches/experimental/rakelib/upstream_git_repo_tasks.rb
    MacRuby/branches/experimental/spec/frozen/core/io/putc_spec.rb
    MacRuby/branches/experimental/spec/frozen/core/io/shared/each.rb
    MacRuby/branches/experimental/spec/frozen/core/io/shared/new.rb
    MacRuby/branches/experimental/spec/frozen/core/io/shared/pos.rb
    MacRuby/branches/experimental/spec/frozen/core/io/shared/write.rb
    MacRuby/branches/experimental/spec/frozen/language/eigenclass_spec.rb

Modified: MacRuby/branches/experimental/rakelib/rubyspec_mspec.rake
===================================================================
--- MacRuby/branches/experimental/rakelib/rubyspec_mspec.rake	2009-07-01 23:46:39 UTC (rev 1960)
+++ MacRuby/branches/experimental/rakelib/rubyspec_mspec.rake	2009-07-01 23:47:00 UTC (rev 1961)
@@ -1,4 +1,4 @@
-require 'rakelib/upstream_git_repo_tasks'
+require File.expand_path('../upstream_git_repo_tasks', __FILE__)
 
 root = File.expand_path("../../", __FILE__)
 

Modified: MacRuby/branches/experimental/rakelib/upstream_git_repo_tasks.rb
===================================================================
--- MacRuby/branches/experimental/rakelib/upstream_git_repo_tasks.rb	2009-07-01 23:46:39 UTC (rev 1960)
+++ MacRuby/branches/experimental/rakelib/upstream_git_repo_tasks.rb	2009-07-01 23:47:00 UTC (rev 1961)
@@ -1,4 +1,4 @@
-require 'rakelib/git'
+require File.expand_path('../git', __FILE__)
 
 class Rake::UpstreamGitRepoTasks
   attr_accessor :name, :local_dir, :upstream_dir, :anon_url, :commit_url, :upstream_options

Modified: MacRuby/branches/experimental/spec/frozen/core/io/putc_spec.rb
===================================================================
--- MacRuby/branches/experimental/spec/frozen/core/io/putc_spec.rb	2009-07-01 23:46:39 UTC (rev 1960)
+++ MacRuby/branches/experimental/spec/frozen/core/io/putc_spec.rb	2009-07-01 23:47:00 UTC (rev 1961)
@@ -5,7 +5,7 @@
 describe "IO#putc" do
   before :each do
     @filename = tmp "IO_putc_file_#{$$}"
-    @io = File.open @filename, 'w+'
+    @io = File.open @filename, 'w'
     @io.sync = true
   end
 
@@ -20,8 +20,7 @@
 
   it "writes the first byte of a String" do
     @io.putc "foo"
-    @io.rewind
-    @io.getc.should == 'f'
+    File.read(@filename).should == 'f'
   end
 
   it "writes the first byte of an object's string representation" do

Modified: MacRuby/branches/experimental/spec/frozen/core/io/shared/each.rb
===================================================================
--- MacRuby/branches/experimental/spec/frozen/core/io/shared/each.rb	2009-07-01 23:46:39 UTC (rev 1960)
+++ MacRuby/branches/experimental/spec/frozen/core/io/shared/each.rb	2009-07-01 23:47:00 UTC (rev 1961)
@@ -1,7 +1,7 @@
 # encoding: utf-8
 require File.dirname(__FILE__) + '/../fixtures/classes'
 
-describe(:io_each, {:shared => true}) do
+describe :io_each, :shared => true do
   before(:each) do
     @io = File.open(IOSpecs.gets_fixtures)
   end

Modified: MacRuby/branches/experimental/spec/frozen/core/io/shared/new.rb
===================================================================
--- MacRuby/branches/experimental/spec/frozen/core/io/shared/new.rb	2009-07-01 23:46:39 UTC (rev 1960)
+++ MacRuby/branches/experimental/spec/frozen/core/io/shared/new.rb	2009-07-01 23:47:00 UTC (rev 1961)
@@ -1,6 +1,6 @@
 require File.dirname(__FILE__) + '/../fixtures/classes'
 
-describe(:io_new, {:shared => true}) do
+describe :io_new, :shared => true do
   before :all do
     @filename = tmp("rubinius-spec-io-new-#{$$}.txt")
   end

Modified: MacRuby/branches/experimental/spec/frozen/core/io/shared/pos.rb
===================================================================
--- MacRuby/branches/experimental/spec/frozen/core/io/shared/pos.rb	2009-07-01 23:46:39 UTC (rev 1960)
+++ MacRuby/branches/experimental/spec/frozen/core/io/shared/pos.rb	2009-07-01 23:47:00 UTC (rev 1961)
@@ -1,4 +1,4 @@
-describe(:io_pos, {:shared => true}) do
+describe :io_pos, :shared => true do
   before :each do
     @fname = 'test.txt'
     File.open @fname, 'w' do |f| f.write "123" end

Modified: MacRuby/branches/experimental/spec/frozen/core/io/shared/write.rb
===================================================================
--- MacRuby/branches/experimental/spec/frozen/core/io/shared/write.rb	2009-07-01 23:46:39 UTC (rev 1960)
+++ MacRuby/branches/experimental/spec/frozen/core/io/shared/write.rb	2009-07-01 23:47:00 UTC (rev 1961)
@@ -1,6 +1,6 @@
 require File.dirname(__FILE__) + '/../fixtures/classes'
 
-describe(:io_write, {:shared => true}) do
+describe :io_write, :shared => true do
   before :each do
     @filename = tmp("IO_syswrite_file") + $$.to_s
     File.open(@filename, "w") do |file|

Modified: MacRuby/branches/experimental/spec/frozen/language/eigenclass_spec.rb
===================================================================
--- MacRuby/branches/experimental/spec/frozen/language/eigenclass_spec.rb	2009-07-01 23:46:39 UTC (rev 1960)
+++ MacRuby/branches/experimental/spec/frozen/language/eigenclass_spec.rb	2009-07-01 23:47:00 UTC (rev 1961)
@@ -165,7 +165,7 @@
   end
 
   it "appears in the eigenclass constant list" do
-    klass = (class << @object; self; end )
+    klass = class << @object; self; end
     klass.should have_constant(:CONST)
   end
 
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://lists.macosforge.org/pipermail/macruby-changes/attachments/20090701/6e7858ab/attachment-0001.html>