<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.1//EN"
"http://www.w3.org/TR/xhtml11/DTD/xhtml11.dtd">
<html xmlns="http://www.w3.org/1999/xhtml">
<head><meta http-equiv="content-type" content="text/html; charset=utf-8" />
<title>[1961] MacRuby/branches/experimental</title>
</head>
<body>
<style type="text/css"><!--
#msg dl.meta { border: 1px #006 solid; background: #369; padding: 6px; color: #fff; }
#msg dl.meta dt { float: left; width: 6em; font-weight: bold; }
#msg dt:after { content:':';}
#msg dl, #msg dt, #msg ul, #msg li, #header, #footer, #logmsg { font-family: verdana,arial,helvetica,sans-serif; font-size: 10pt; }
#msg dl a { font-weight: bold}
#msg dl a:link { color:#fc3; }
#msg dl a:active { color:#ff0; }
#msg dl a:visited { color:#cc6; }
h3 { font-family: verdana,arial,helvetica,sans-serif; font-size: 10pt; font-weight: bold; }
#msg pre { overflow: auto; background: #ffc; border: 1px #fa0 solid; padding: 6px; }
#logmsg { background: #ffc; border: 1px #fa0 solid; padding: 1em 1em 0 1em; }
#logmsg p, #logmsg pre, #logmsg blockquote { margin: 0 0 1em 0; }
#logmsg p, #logmsg li, #logmsg dt, #logmsg dd { line-height: 14pt; }
#logmsg h1, #logmsg h2, #logmsg h3, #logmsg h4, #logmsg h5, #logmsg h6 { margin: .5em 0; }
#logmsg h1:first-child, #logmsg h2:first-child, #logmsg h3:first-child, #logmsg h4:first-child, #logmsg h5:first-child, #logmsg h6:first-child { margin-top: 0; }
#logmsg ul, #logmsg ol { padding: 0; list-style-position: inside; margin: 0 0 0 1em; }
#logmsg ul { text-indent: -1em; padding-left: 1em; }#logmsg ol { text-indent: -1.5em; padding-left: 1.5em; }
#logmsg > ul, #logmsg > ol { margin: 0 0 1em 0; }
#logmsg pre { background: #eee; padding: 1em; }
#logmsg blockquote { border: 1px solid #fa0; border-left-width: 10px; padding: 1em 1em 0 1em; background: white;}
#logmsg dl { margin: 0; }
#logmsg dt { font-weight: bold; }
#logmsg dd { margin: 0; padding: 0 0 0.5em 0; }
#logmsg dd:before { content:'\00bb';}
#logmsg table { border-spacing: 0px; border-collapse: collapse; border-top: 4px solid #fa0; border-bottom: 1px solid #fa0; background: #fff; }
#logmsg table th { text-align: left; font-weight: normal; padding: 0.2em 0.5em; border-top: 1px dotted #fa0; }
#logmsg table td { text-align: right; border-top: 1px dotted #fa0; padding: 0.2em 0.5em; }
#logmsg table thead th { text-align: center; border-bottom: 1px solid #fa0; }
#logmsg table th.Corner { text-align: left; }
#logmsg hr { border: none 0; border-top: 2px dashed #fa0; height: 1px; }
#header, #footer { color: #fff; background: #636; border: 1px #300 solid; padding: 6px; }
#patch { width: 100%; }
#patch h4 {font-family: verdana,arial,helvetica,sans-serif;font-size:10pt;padding:8px;background:#369;color:#fff;margin:0;}
#patch .propset h4, #patch .binary h4 {margin:0;}
#patch pre {padding:0;line-height:1.2em;margin:0;}
#patch .diff {width:100%;background:#eee;padding: 0 0 10px 0;overflow:auto;}
#patch .propset .diff, #patch .binary .diff {padding:10px 0;}
#patch span {display:block;padding:0 10px;}
#patch .modfile, #patch .addfile, #patch .delfile, #patch .propset, #patch .binary, #patch .copfile {border:1px solid #ccc;margin:10px 0;}
#patch ins {background:#dfd;text-decoration:none;display:block;padding:0 10px;}
#patch del {background:#fdd;text-decoration:none;display:block;padding:0 10px;}
#patch .lines, .info {color:#888;background:#fff;}
--></style>
<div id="msg">
<dl class="meta">
<dt>Revision</dt> <dd><a href="http://trac.macosforge.org/projects/ruby/changeset/1961">1961</a></dd>
<dt>Author</dt> <dd>eloy.de.enige@gmail.com</dd>
<dt>Date</dt> <dd>2009-07-01 16:47:00 -0700 (Wed, 01 Jul 2009)</dd>
</dl>
<h3>Log Message</h3>
<pre>Cleaning up after merging RubySpec changes upstream</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#MacRubybranchesexperimentalrakelibrubyspec_mspecrake">MacRuby/branches/experimental/rakelib/rubyspec_mspec.rake</a></li>
<li><a href="#MacRubybranchesexperimentalrakelibupstream_git_repo_tasksrb">MacRuby/branches/experimental/rakelib/upstream_git_repo_tasks.rb</a></li>
<li><a href="#MacRubybranchesexperimentalspecfrozencoreioputc_specrb">MacRuby/branches/experimental/spec/frozen/core/io/putc_spec.rb</a></li>
<li><a href="#MacRubybranchesexperimentalspecfrozencoreiosharedeachrb">MacRuby/branches/experimental/spec/frozen/core/io/shared/each.rb</a></li>
<li><a href="#MacRubybranchesexperimentalspecfrozencoreiosharednewrb">MacRuby/branches/experimental/spec/frozen/core/io/shared/new.rb</a></li>
<li><a href="#MacRubybranchesexperimentalspecfrozencoreiosharedposrb">MacRuby/branches/experimental/spec/frozen/core/io/shared/pos.rb</a></li>
<li><a href="#MacRubybranchesexperimentalspecfrozencoreiosharedwriterb">MacRuby/branches/experimental/spec/frozen/core/io/shared/write.rb</a></li>
<li><a href="#MacRubybranchesexperimentalspecfrozenlanguageeigenclass_specrb">MacRuby/branches/experimental/spec/frozen/language/eigenclass_spec.rb</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="MacRubybranchesexperimentalrakelibrubyspec_mspecrake"></a>
<div class="modfile"><h4>Modified: MacRuby/branches/experimental/rakelib/rubyspec_mspec.rake (1960 => 1961)</h4>
<pre class="diff"><span>
<span class="info">--- 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)
</span><span class="lines">@@ -1,4 +1,4 @@
</span><del>-require 'rakelib/upstream_git_repo_tasks'
</del><ins>+require File.expand_path('../upstream_git_repo_tasks', __FILE__)
</ins><span class="cx">
</span><span class="cx"> root = File.expand_path("../../", __FILE__)
</span><span class="cx">
</span></span></pre></div>
<a id="MacRubybranchesexperimentalrakelibupstream_git_repo_tasksrb"></a>
<div class="modfile"><h4>Modified: MacRuby/branches/experimental/rakelib/upstream_git_repo_tasks.rb (1960 => 1961)</h4>
<pre class="diff"><span>
<span class="info">--- 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)
</span><span class="lines">@@ -1,4 +1,4 @@
</span><del>-require 'rakelib/git'
</del><ins>+require File.expand_path('../git', __FILE__)
</ins><span class="cx">
</span><span class="cx"> class Rake::UpstreamGitRepoTasks
</span><span class="cx"> attr_accessor :name, :local_dir, :upstream_dir, :anon_url, :commit_url, :upstream_options
</span></span></pre></div>
<a id="MacRubybranchesexperimentalspecfrozencoreioputc_specrb"></a>
<div class="modfile"><h4>Modified: MacRuby/branches/experimental/spec/frozen/core/io/putc_spec.rb (1960 => 1961)</h4>
<pre class="diff"><span>
<span class="info">--- 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)
</span><span class="lines">@@ -5,7 +5,7 @@
</span><span class="cx"> describe "IO#putc" do
</span><span class="cx"> before :each do
</span><span class="cx"> @filename = tmp "IO_putc_file_#{$$}"
</span><del>- @io = File.open @filename, 'w+'
</del><ins>+ @io = File.open @filename, 'w'
</ins><span class="cx"> @io.sync = true
</span><span class="cx"> end
</span><span class="cx">
</span><span class="lines">@@ -20,8 +20,7 @@
</span><span class="cx">
</span><span class="cx"> it "writes the first byte of a String" do
</span><span class="cx"> @io.putc "foo"
</span><del>- @io.rewind
- @io.getc.should == 'f'
</del><ins>+ File.read(@filename).should == 'f'
</ins><span class="cx"> end
</span><span class="cx">
</span><span class="cx"> it "writes the first byte of an object's string representation" do
</span></span></pre></div>
<a id="MacRubybranchesexperimentalspecfrozencoreiosharedeachrb"></a>
<div class="modfile"><h4>Modified: MacRuby/branches/experimental/spec/frozen/core/io/shared/each.rb (1960 => 1961)</h4>
<pre class="diff"><span>
<span class="info">--- 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)
</span><span class="lines">@@ -1,7 +1,7 @@
</span><span class="cx"> # encoding: utf-8
</span><span class="cx"> require File.dirname(__FILE__) + '/../fixtures/classes'
</span><span class="cx">
</span><del>-describe(:io_each, {:shared => true}) do
</del><ins>+describe :io_each, :shared => true do
</ins><span class="cx"> before(:each) do
</span><span class="cx"> @io = File.open(IOSpecs.gets_fixtures)
</span><span class="cx"> end
</span></span></pre></div>
<a id="MacRubybranchesexperimentalspecfrozencoreiosharednewrb"></a>
<div class="modfile"><h4>Modified: MacRuby/branches/experimental/spec/frozen/core/io/shared/new.rb (1960 => 1961)</h4>
<pre class="diff"><span>
<span class="info">--- 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)
</span><span class="lines">@@ -1,6 +1,6 @@
</span><span class="cx"> require File.dirname(__FILE__) + '/../fixtures/classes'
</span><span class="cx">
</span><del>-describe(:io_new, {:shared => true}) do
</del><ins>+describe :io_new, :shared => true do
</ins><span class="cx"> before :all do
</span><span class="cx"> @filename = tmp("rubinius-spec-io-new-#{$$}.txt")
</span><span class="cx"> end
</span></span></pre></div>
<a id="MacRubybranchesexperimentalspecfrozencoreiosharedposrb"></a>
<div class="modfile"><h4>Modified: MacRuby/branches/experimental/spec/frozen/core/io/shared/pos.rb (1960 => 1961)</h4>
<pre class="diff"><span>
<span class="info">--- 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)
</span><span class="lines">@@ -1,4 +1,4 @@
</span><del>-describe(:io_pos, {:shared => true}) do
</del><ins>+describe :io_pos, :shared => true do
</ins><span class="cx"> before :each do
</span><span class="cx"> @fname = 'test.txt'
</span><span class="cx"> File.open @fname, 'w' do |f| f.write "123" end
</span></span></pre></div>
<a id="MacRubybranchesexperimentalspecfrozencoreiosharedwriterb"></a>
<div class="modfile"><h4>Modified: MacRuby/branches/experimental/spec/frozen/core/io/shared/write.rb (1960 => 1961)</h4>
<pre class="diff"><span>
<span class="info">--- 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)
</span><span class="lines">@@ -1,6 +1,6 @@
</span><span class="cx"> require File.dirname(__FILE__) + '/../fixtures/classes'
</span><span class="cx">
</span><del>-describe(:io_write, {:shared => true}) do
</del><ins>+describe :io_write, :shared => true do
</ins><span class="cx"> before :each do
</span><span class="cx"> @filename = tmp("IO_syswrite_file") + $$.to_s
</span><span class="cx"> File.open(@filename, "w") do |file|
</span></span></pre></div>
<a id="MacRubybranchesexperimentalspecfrozenlanguageeigenclass_specrb"></a>
<div class="modfile"><h4>Modified: MacRuby/branches/experimental/spec/frozen/language/eigenclass_spec.rb (1960 => 1961)</h4>
<pre class="diff"><span>
<span class="info">--- 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)
</span><span class="lines">@@ -165,7 +165,7 @@
</span><span class="cx"> end
</span><span class="cx">
</span><span class="cx"> it "appears in the eigenclass constant list" do
</span><del>- klass = (class << @object; self; end )
</del><ins>+ klass = class << @object; self; end
</ins><span class="cx"> klass.should have_constant(:CONST)
</span><span class="cx"> end
</span><span class="cx">
</span></span></pre>
</div>
</div>
</body>
</html>