December 2009 - macruby-changes - lists.macosforge.org

[3100] MacRuby/trunk/sample-macruby
by source_changes＠macosforge.org 10 Dec '09

10 Dec '09

Revision: 3100 http://trac.macosforge.org/projects/ruby/changeset/3100 Author: lsansonetti(a)apple.com Date: 2009-12-10 15:58:55 -0800 (Thu, 10 Dec 2009) Log Message: ----------- delete SDKROOT variable Modified Paths: -------------- MacRuby/trunk/sample-macruby/ABPresence/ABPresence.xcodeproj/project.pbxproj MacRuby/trunk/sample-macruby/AnimatingViews/AnimatingViews.xcodeproj/project.pbxproj MacRuby/trunk/sample-macruby/CircleView/CircleView.xcodeproj/project.pbxproj MacRuby/trunk/sample-macruby/DotView/DotView.xcodeproj/project.pbxproj MacRuby/trunk/sample-macruby/EmbeddedMacRuby/EmbeddedMacRuby.xcodeproj/project.pbxproj MacRuby/trunk/sample-macruby/FlickrDemo/FlickrDemo.xcodeproj/project.pbxproj MacRuby/trunk/sample-macruby/MacOnRack/MacOnRack.xcodeproj/project.pbxproj MacRuby/trunk/sample-macruby/OutlineView/OutlineView.xcodeproj/project.pbxproj MacRuby/trunk/sample-macruby/PathDemo/PathDemo.xcodeproj/project.pbxproj MacRuby/trunk/sample-macruby/RoundTransparentWindow/RoundTransparentWindow.xcodeproj/project.pbxproj MacRuby/trunk/sample-macruby/ViewModelDemo/ViewModelDemo.xcodeproj/project.pbxproj MacRuby/trunk/sample-macruby/YamlTable/yaml_table.xcodeproj/project.pbxproj Modified: MacRuby/trunk/sample-macruby/ABPresence/ABPresence.xcodeproj/project.pbxproj =================================================================== --- MacRuby/trunk/sample-macruby/ABPresence/ABPresence.xcodeproj/project.pbxproj 2009-12-10 23:56:33 UTC (rev 3099) +++ MacRuby/trunk/sample-macruby/ABPresence/ABPresence.xcodeproj/project.pbxproj 2009-12-10 23:58:55 UTC (rev 3100) @@ -248,7 +248,6 @@ GCC_WARN_ABOUT_RETURN_TYPE = YES; GCC_WARN_UNUSED_VARIABLE = YES; PREBINDING = NO; - SDKROOT = "$(DEVELOPER_SDK_DIR)/MacOSX10.5.sdk"; }; name = Debug; }; @@ -260,7 +259,6 @@ GCC_WARN_ABOUT_RETURN_TYPE = YES; GCC_WARN_UNUSED_VARIABLE = YES; PREBINDING = NO; - SDKROOT = "$(DEVELOPER_SDK_DIR)/MacOSX10.5.sdk"; }; name = Release; }; Modified: MacRuby/trunk/sample-macruby/AnimatingViews/AnimatingViews.xcodeproj/project.pbxproj =================================================================== --- MacRuby/trunk/sample-macruby/AnimatingViews/AnimatingViews.xcodeproj/project.pbxproj 2009-12-10 23:56:33 UTC (rev 3099) +++ MacRuby/trunk/sample-macruby/AnimatingViews/AnimatingViews.xcodeproj/project.pbxproj 2009-12-10 23:58:55 UTC (rev 3100) @@ -243,7 +243,6 @@ LIBRARY_SEARCH_PATHS = ""; OTHER_LDFLAGS = ""; PREBINDING = NO; - SDKROOT = "$(DEVELOPER_SDK_DIR)/MacOSX10.5.sdk"; }; name = Debug; }; @@ -258,7 +257,6 @@ LIBRARY_SEARCH_PATHS = ""; OTHER_LDFLAGS = ""; PREBINDING = NO; - SDKROOT = "$(DEVELOPER_SDK_DIR)/MacOSX10.5.sdk"; }; name = Release; }; Modified: MacRuby/trunk/sample-macruby/CircleView/CircleView.xcodeproj/project.pbxproj =================================================================== --- MacRuby/trunk/sample-macruby/CircleView/CircleView.xcodeproj/project.pbxproj 2009-12-10 23:56:33 UTC (rev 3099) +++ MacRuby/trunk/sample-macruby/CircleView/CircleView.xcodeproj/project.pbxproj 2009-12-10 23:58:55 UTC (rev 3100) @@ -262,7 +262,6 @@ OTHER_CPLUSPLUSFLAGS = ""; OTHER_LDFLAGS = ""; PREBINDING = NO; - SDKROOT = "$(DEVELOPER_SDK_DIR)/MacOSX10.5.sdk"; }; name = Debug; }; @@ -279,7 +278,6 @@ OTHER_CPLUSPLUSFLAGS = ""; OTHER_LDFLAGS = ""; PREBINDING = NO; - SDKROOT = "$(DEVELOPER_SDK_DIR)/MacOSX10.5.sdk"; }; name = Release; }; Modified: MacRuby/trunk/sample-macruby/DotView/DotView.xcodeproj/project.pbxproj =================================================================== --- MacRuby/trunk/sample-macruby/DotView/DotView.xcodeproj/project.pbxproj 2009-12-10 23:56:33 UTC (rev 3099) +++ MacRuby/trunk/sample-macruby/DotView/DotView.xcodeproj/project.pbxproj 2009-12-10 23:58:55 UTC (rev 3100) @@ -240,7 +240,6 @@ GCC_WARN_ABOUT_RETURN_TYPE = YES; GCC_WARN_UNUSED_VARIABLE = YES; PREBINDING = NO; - SDKROOT = "$(DEVELOPER_SDK_DIR)/MacOSX10.5.sdk"; }; name = Debug; }; @@ -252,7 +251,6 @@ GCC_WARN_ABOUT_RETURN_TYPE = YES; GCC_WARN_UNUSED_VARIABLE = YES; PREBINDING = NO; - SDKROOT = "$(DEVELOPER_SDK_DIR)/MacOSX10.5.sdk"; }; name = Release; }; Modified: MacRuby/trunk/sample-macruby/EmbeddedMacRuby/EmbeddedMacRuby.xcodeproj/project.pbxproj =================================================================== --- MacRuby/trunk/sample-macruby/EmbeddedMacRuby/EmbeddedMacRuby.xcodeproj/project.pbxproj 2009-12-10 23:56:33 UTC (rev 3099) +++ MacRuby/trunk/sample-macruby/EmbeddedMacRuby/EmbeddedMacRuby.xcodeproj/project.pbxproj 2009-12-10 23:58:55 UTC (rev 3100) @@ -247,7 +247,6 @@ GCC_WARN_ABOUT_RETURN_TYPE = YES; GCC_WARN_UNUSED_VARIABLE = YES; PREBINDING = NO; - SDKROOT = "$(DEVELOPER_SDK_DIR)/MacOSX10.5.sdk"; VALID_ARCHS = "i386 x86_64"; }; name = Debug; @@ -265,7 +264,6 @@ GCC_WARN_ABOUT_RETURN_TYPE = YES; GCC_WARN_UNUSED_VARIABLE = YES; PREBINDING = NO; - SDKROOT = "$(DEVELOPER_SDK_DIR)/MacOSX10.5.sdk"; VALID_ARCHS = "i386 x86_64"; }; name = Release; Modified: MacRuby/trunk/sample-macruby/FlickrDemo/FlickrDemo.xcodeproj/project.pbxproj =================================================================== --- MacRuby/trunk/sample-macruby/FlickrDemo/FlickrDemo.xcodeproj/project.pbxproj 2009-12-10 23:56:33 UTC (rev 3099) +++ MacRuby/trunk/sample-macruby/FlickrDemo/FlickrDemo.xcodeproj/project.pbxproj 2009-12-10 23:58:55 UTC (rev 3100) @@ -248,7 +248,6 @@ GCC_WARN_ABOUT_RETURN_TYPE = YES; GCC_WARN_UNUSED_VARIABLE = YES; PREBINDING = NO; - SDKROOT = "$(DEVELOPER_SDK_DIR)/MacOSX10.5.sdk"; }; name = Debug; }; @@ -260,7 +259,6 @@ GCC_WARN_ABOUT_RETURN_TYPE = YES; GCC_WARN_UNUSED_VARIABLE = YES; PREBINDING = NO; - SDKROOT = "$(DEVELOPER_SDK_DIR)/MacOSX10.5.sdk"; }; name = Release; }; Modified: MacRuby/trunk/sample-macruby/MacOnRack/MacOnRack.xcodeproj/project.pbxproj =================================================================== --- MacRuby/trunk/sample-macruby/MacOnRack/MacOnRack.xcodeproj/project.pbxproj 2009-12-10 23:56:33 UTC (rev 3099) +++ MacRuby/trunk/sample-macruby/MacOnRack/MacOnRack.xcodeproj/project.pbxproj 2009-12-10 23:58:55 UTC (rev 3100) @@ -409,7 +409,6 @@ GCC_WARN_ABOUT_RETURN_TYPE = YES; GCC_WARN_UNUSED_VARIABLE = YES; PREBINDING = NO; - SDKROOT = "$(DEVELOPER_SDK_DIR)/MacOSX10.5.sdk"; }; name = Debug; }; @@ -421,7 +420,6 @@ GCC_WARN_ABOUT_RETURN_TYPE = YES; GCC_WARN_UNUSED_VARIABLE = YES; PREBINDING = NO; - SDKROOT = "$(DEVELOPER_SDK_DIR)/MacOSX10.5.sdk"; }; name = Release; }; Modified: MacRuby/trunk/sample-macruby/OutlineView/OutlineView.xcodeproj/project.pbxproj =================================================================== --- MacRuby/trunk/sample-macruby/OutlineView/OutlineView.xcodeproj/project.pbxproj 2009-12-10 23:56:33 UTC (rev 3099) +++ MacRuby/trunk/sample-macruby/OutlineView/OutlineView.xcodeproj/project.pbxproj 2009-12-10 23:58:55 UTC (rev 3100) @@ -247,7 +247,6 @@ LIBRARY_SEARCH_PATHS = ""; OTHER_LDFLAGS = ""; PREBINDING = NO; - SDKROOT = "$(DEVELOPER_SDK_DIR)/MacOSX10.5.sdk"; }; name = Debug; }; @@ -262,7 +261,6 @@ LIBRARY_SEARCH_PATHS = ""; OTHER_LDFLAGS = ""; PREBINDING = NO; - SDKROOT = "$(DEVELOPER_SDK_DIR)/MacOSX10.5.sdk"; }; name = Release; }; Modified: MacRuby/trunk/sample-macruby/PathDemo/PathDemo.xcodeproj/project.pbxproj =================================================================== --- MacRuby/trunk/sample-macruby/PathDemo/PathDemo.xcodeproj/project.pbxproj 2009-12-10 23:56:33 UTC (rev 3099) +++ MacRuby/trunk/sample-macruby/PathDemo/PathDemo.xcodeproj/project.pbxproj 2009-12-10 23:58:55 UTC (rev 3100) @@ -244,7 +244,6 @@ GCC_WARN_ABOUT_RETURN_TYPE = YES; GCC_WARN_UNUSED_VARIABLE = YES; PREBINDING = NO; - SDKROOT = "$(DEVELOPER_SDK_DIR)/MacOSX10.5.sdk"; }; name = Debug; }; @@ -256,7 +255,6 @@ GCC_WARN_ABOUT_RETURN_TYPE = YES; GCC_WARN_UNUSED_VARIABLE = YES; PREBINDING = NO; - SDKROOT = "$(DEVELOPER_SDK_DIR)/MacOSX10.5.sdk"; }; name = Release; }; Modified: MacRuby/trunk/sample-macruby/RoundTransparentWindow/RoundTransparentWindow.xcodeproj/project.pbxproj =================================================================== --- MacRuby/trunk/sample-macruby/RoundTransparentWindow/RoundTransparentWindow.xcodeproj/project.pbxproj 2009-12-10 23:56:33 UTC (rev 3099) +++ MacRuby/trunk/sample-macruby/RoundTransparentWindow/RoundTransparentWindow.xcodeproj/project.pbxproj 2009-12-10 23:58:55 UTC (rev 3100) @@ -256,7 +256,6 @@ GCC_WARN_ABOUT_RETURN_TYPE = YES; GCC_WARN_UNUSED_VARIABLE = YES; PREBINDING = NO; - SDKROOT = "$(DEVELOPER_SDK_DIR)/MacOSX10.5.sdk"; }; name = Debug; }; @@ -268,7 +267,6 @@ GCC_WARN_ABOUT_RETURN_TYPE = YES; GCC_WARN_UNUSED_VARIABLE = YES; PREBINDING = NO; - SDKROOT = "$(DEVELOPER_SDK_DIR)/MacOSX10.5.sdk"; }; name = Release; }; Modified: MacRuby/trunk/sample-macruby/ViewModelDemo/ViewModelDemo.xcodeproj/project.pbxproj =================================================================== --- MacRuby/trunk/sample-macruby/ViewModelDemo/ViewModelDemo.xcodeproj/project.pbxproj 2009-12-10 23:56:33 UTC (rev 3099) +++ MacRuby/trunk/sample-macruby/ViewModelDemo/ViewModelDemo.xcodeproj/project.pbxproj 2009-12-10 23:58:55 UTC (rev 3100) @@ -248,7 +248,6 @@ GCC_WARN_ABOUT_RETURN_TYPE = YES; GCC_WARN_UNUSED_VARIABLE = YES; PREBINDING = NO; - SDKROOT = "$(DEVELOPER_SDK_DIR)/MacOSX10.5.sdk"; }; name = Debug; }; @@ -260,7 +259,6 @@ GCC_WARN_ABOUT_RETURN_TYPE = YES; GCC_WARN_UNUSED_VARIABLE = YES; PREBINDING = NO; - SDKROOT = "$(DEVELOPER_SDK_DIR)/MacOSX10.5.sdk"; }; name = Release; }; Modified: MacRuby/trunk/sample-macruby/YamlTable/yaml_table.xcodeproj/project.pbxproj =================================================================== --- MacRuby/trunk/sample-macruby/YamlTable/yaml_table.xcodeproj/project.pbxproj 2009-12-10 23:56:33 UTC (rev 3099) +++ MacRuby/trunk/sample-macruby/YamlTable/yaml_table.xcodeproj/project.pbxproj 2009-12-10 23:58:55 UTC (rev 3100) @@ -417,7 +417,6 @@ GCC_WARN_ABOUT_RETURN_TYPE = YES; GCC_WARN_UNUSED_VARIABLE = YES; PREBINDING = NO; - SDKROOT = "$(DEVELOPER_SDK_DIR)/MacOSX10.5.sdk"; }; name = Debug; }; @@ -429,7 +428,6 @@ GCC_WARN_ABOUT_RETURN_TYPE = YES; GCC_WARN_UNUSED_VARIABLE = YES; PREBINDING = NO; - SDKROOT = "$(DEVELOPER_SDK_DIR)/MacOSX10.5.sdk"; }; name = Release; };

1 0

[3099] MacRuby/trunk/sample-macruby/WhoIsGettingLunch/
by source_changes＠macosforge.org 10 Dec '09

10 Dec '09

Revision: 3099 http://trac.macosforge.org/projects/ruby/changeset/3099 Author: lsansonetti(a)apple.com Date: 2009-12-10 15:56:33 -0800 (Thu, 10 Dec 2009) Log Message: ----------- delete the WhoIsGettingLunch sample, it's too simple Removed Paths: ------------- MacRuby/trunk/sample-macruby/WhoIsGettingLunch/

1 0

[3098] MacRuby/trunk/spec/macruby/core/gcd/group_spec.rb
by source_changes＠macosforge.org 10 Dec '09

10 Dec '09

Revision: 3098 http://trac.macosforge.org/projects/ruby/changeset/3098 Author: ernest.prabhakar(a)gmail.com Date: 2009-12-10 15:26:45 -0800 (Thu, 10 Dec 2009) Log Message: ----------- Fixed errors in Dispatch::Group spec, still have failures Modified Paths: -------------- MacRuby/trunk/spec/macruby/core/gcd/group_spec.rb Modified: MacRuby/trunk/spec/macruby/core/gcd/group_spec.rb =================================================================== --- MacRuby/trunk/spec/macruby/core/gcd/group_spec.rb 2009-12-10 22:57:37 UTC (rev 3097) +++ MacRuby/trunk/spec/macruby/core/gcd/group_spec.rb 2009-12-10 23:26:45 UTC (rev 3098) @@ -2,15 +2,80 @@ if MACOSX_VERSION >= 10.6 describe "Dispatch::Group" do + before :each do + @q = Dispatch::Queue.new('org.macruby.gcd_spec.group') + @g = Dispatch::Group.new + @i = 0 + end + it "returns an instance of Group" do - @group = Dispatch::Group.new - @group.should be_kind_of(Dispatch::Group) + @g.should be_kind_of(Dispatch::Group) end - describe "#notify" do + it "is passed as an argument to Dispatch::Queue#async" do + lambda { @q.async(@g) { @i = 42 } }.should_not raise_error(ArgumentError) + lambda { @q.async(42) }.should raise_error(ArgumentError) end + + describe :wait do + + it "can wait forever until associated blocks have been run" do + @q.async(@g) { @i = 42 } + @g.wait(Dispatch::TIME_FOREVER) + @i.should == 42 + end + + it "can only wait until timeout for associated blocks to run" do + @i.should == 0 + @q.async(@g) { sleep 5; @i = 42 } + @g.wait(0.1) + @i.should == 0 + end + + it "will wait forever if no timeout is specified" do + @q.async(@g) {sleep 0.2; @i = 42 } + @g.wait + @i.should == 42 + end + + it "will return non-zero if it times out" do + @q.async(@g) {sleep 1} + @g.wait(0.2).should_not == 0 + end + + it "will return zero if succeeds" do + @g.wait(Dispatch::TIME_FOREVER).should == 0 + end + + end + + describe :notify, :shared => true do + it "will run a notify block on the specified queue" do + @g.notify(@q) { @i += 58 } + @q.sync {} + @i.should == 58 + end + + it "will run the notify block only after all associated blocks have been run" do + q2 = Dispatch::Queue.new('org.macruby.gcd_spec.group2') + @q.suspend! + @q.async(@g) { @i = 42 } + @i.should == 0 + @g.notify(q2) { @i += 58 } + @i.should == 0 + q2.suspend! + @q.resume! + @q.sync {} + @i.should == 42 + q2.resume! + q2.sync {} + @i.should == 100 + end + end - describe "#wait" do + describe "Dispatch::Group#on_completion" do + it_should_behave_like "notify" end end -end + + end

1 0

[3097] MacRuby/trunk/spec/macruby/tags/macruby/core/gcd/queue_tags.txt
by source_changes＠macosforge.org 10 Dec '09

10 Dec '09

Revision: 3097 http://trac.macosforge.org/projects/ruby/changeset/3097 Author: ernest.prabhakar(a)gmail.com Date: 2009-12-10 14:57:37 -0800 (Thu, 10 Dec 2009) Log Message: ----------- Added fails tag for failed arity check on Queue.new Modified Paths: -------------- MacRuby/trunk/spec/macruby/tags/macruby/core/gcd/queue_tags.txt Modified: MacRuby/trunk/spec/macruby/tags/macruby/core/gcd/queue_tags.txt =================================================================== --- MacRuby/trunk/spec/macruby/tags/macruby/core/gcd/queue_tags.txt 2009-12-10 22:51:02 UTC (rev 3096) +++ MacRuby/trunk/spec/macruby/tags/macruby/core/gcd/queue_tags.txt 2009-12-10 22:57:37 UTC (rev 3097) @@ -0,0 +1,2 @@ +fails:Dispatch::Queue.new raises an ArgumentError if not passed a string +

1 0

[3096] MacRuby/trunk/spec/macruby/tags/macruby/core
by source_changes＠macosforge.org 10 Dec '09

10 Dec '09

Revision: 3096 http://trac.macosforge.org/projects/ruby/changeset/3096 Author: ernest.prabhakar(a)gmail.com Date: 2009-12-10 14:51:02 -0800 (Thu, 10 Dec 2009) Log Message: ----------- Created tag files for gcd specs Added Paths: ----------- MacRuby/trunk/spec/macruby/tags/macruby/core/gcd/ MacRuby/trunk/spec/macruby/tags/macruby/core/gcd/queue_tags.txt MacRuby/trunk/spec/macruby/tags/macruby/core/gcd/semaphore_tags.txt MacRuby/trunk/spec/macruby/tags/macruby/core/gcd/source_tags.txt MacRuby/trunk/spec/macruby/tags/macruby/core/group_tags.txt

1 0

[3095] MacRuby/trunk/gcd.c
by source_changes＠macosforge.org 10 Dec '09

10 Dec '09

Revision: 3095 http://trac.macosforge.org/projects/ruby/changeset/3095 Author: ernest.prabhakar(a)gmail.com Date: 2009-12-10 14:28:52 -0800 (Thu, 10 Dec 2009) Log Message: ----------- Per #475, aliased 'label' to 'to_s' Modified Paths: -------------- MacRuby/trunk/gcd.c Modified: MacRuby/trunk/gcd.c =================================================================== --- MacRuby/trunk/gcd.c 2009-12-10 21:31:01 UTC (rev 3094) +++ MacRuby/trunk/gcd.c 2009-12-10 22:28:52 UTC (rev 3095) @@ -921,6 +921,7 @@ rb_objc_define_method(cQueue, "sync", rb_queue_dispatch_sync, 0); rb_objc_define_method(cQueue, "after", rb_queue_dispatch_after, 1); rb_objc_define_method(cQueue, "label", rb_queue_label, 0); + rb_objc_define_method(cQueue, "to_s", rb_queue_label, 0); rb_objc_define_method(cQueue, "resume!", rb_dispatch_resume, 0); rb_objc_define_method(cQueue, "suspend!", rb_dispatch_suspend, 0); rb_objc_define_method(cQueue, "suspended?", rb_dispatch_suspended_p, 0);

1 0

[3094] MacRuby/trunk/spec/macruby/core/gcd/queue_spec.rb
by source_changes＠macosforge.org 10 Dec '09

10 Dec '09

Revision: 3094 http://trac.macosforge.org/projects/ruby/changeset/3094 Author: ernest.prabhakar(a)gmail.com Date: 2009-12-10 13:31:01 -0800 (Thu, 10 Dec 2009) Log Message: ----------- Cleanup per #487; now has two failing tests Modified Paths: -------------- MacRuby/trunk/spec/macruby/core/gcd/queue_spec.rb Modified: MacRuby/trunk/spec/macruby/core/gcd/queue_spec.rb =================================================================== --- MacRuby/trunk/spec/macruby/core/gcd/queue_spec.rb 2009-12-10 21:05:42 UTC (rev 3093) +++ MacRuby/trunk/spec/macruby/core/gcd/queue_spec.rb 2009-12-10 21:31:01 UTC (rev 3094) @@ -1,5 +1,7 @@ require File.dirname(__FILE__) + "/../../spec_helper" +#TODO: Dispatch::Queue.main.run (without killing spec runner!) + if MACOSX_VERSION >= 10.6 describe "Dispatch::Queue.concurrent" do it "returns an instance of Queue" do @@ -16,8 +18,6 @@ o = Dispatch::Queue.concurrent(:high) o.should be_kind_of(Dispatch::Queue) - - lambda { Dispatch::Queue.concurrent(42) }.should raise_error(TypeError) end it "raises an ArgumentError if the given argument is not a valid priority symbol" do @@ -42,7 +42,7 @@ end it "should return the parent queue when inside an executing block" do - q = Dispatch::Queue.new('org.macruby.rubyspecs.gcd.test') + q = Dispatch::Queue.new('org.macruby.gcd_spec.queue') @q2 = nil q.async do @q2 = Dispatch::Queue.current @@ -67,6 +67,10 @@ lambda { Dispatch::Queue.new('foo', 42) }.should raise_error(ArgumentError) lambda { Dispatch::Queue.new(42) }.should raise_error(TypeError) end + + it "raises an ArgumentError if not passed a string" do + lambda { Dispatch::Queue.new() }.should raise_error(ArgumentError) + end end describe "Dispatch::Queue#async" do @@ -78,17 +82,7 @@ @i.should == 42 end - it "accepts a block and yields it asynchronously through a group if given" do - o = Dispatch::Queue.new('foo') - g = Dispatch::Group.new - @i = 0 - o.async(g) { @i = 42 } - g.wait - @i.should == 42 - lambda { o.async(42) }.should raise_error(ArgumentError) - end - it "raises an ArgumentError if no block is given" do o = Dispatch::Queue.new('foo') lambda { o.async }.should raise_error(ArgumentError) @@ -157,6 +151,19 @@ o = Dispatch::Queue.main o.label.should == 'com.apple.main-thread' end + + it "is also returned by to_s" do + o = Dispatch::Queue.new('foo') + o.to_s.should == o.label + + o = Dispatch::Queue.main + o.to_s.should == 'com.apple.main-thread' + end + + it "is included as part of inspect" do + o = Dispatch::Queue.new('foo') + o.inspect.index('foo').should.be_kind_of(Fixnum) + end end describe "Dispatch::Queue#suspend!" do @@ -171,16 +178,4 @@ end end - describe "Dispatch::Group" do - it "returns an instance of Group" do - @group = Dispatch::Group.new - @group.should be_kind_of(Dispatch::Group) - end - - describe "#notify" do - end - - describe "#wait" do - end - end end

1 0

[3093] MacRuby/trunk/spec/macruby/core/gcd
by source_changes＠macosforge.org 10 Dec '09

10 Dec '09

Revision: 3093 http://trac.macosforge.org/projects/ruby/changeset/3093 Author: ernest.prabhakar(a)gmail.com Date: 2009-12-10 13:05:42 -0800 (Thu, 10 Dec 2009) Log Message: ----------- Per #490 and #492, added FAILING specs for Source and Semaphore Added Paths: ----------- MacRuby/trunk/spec/macruby/core/gcd/semaphore_spec.rb MacRuby/trunk/spec/macruby/core/gcd/source_spec.rb Added: MacRuby/trunk/spec/macruby/core/gcd/semaphore_spec.rb =================================================================== --- MacRuby/trunk/spec/macruby/core/gcd/semaphore_spec.rb (rev 0) +++ MacRuby/trunk/spec/macruby/core/gcd/semaphore_spec.rb 2009-12-10 21:05:42 UTC (rev 3093) @@ -0,0 +1,62 @@ +require File.dirname(__FILE__) + "/../../spec_helper" + +if MACOSX_VERSION >= 10.6 + + describe "Dispatch::Semaphore" do + it "returns an instance of Semaphore" do + @sema = Dispatch::Semaphore.new 1 + @sema.should be_kind_of(Dispatch::Semaphore) + end + + it "takes a non-negative Fixnum representing the width of the semaphore" do + sema0 = Dispatch::Semaphore.new 0 + sema0.should be_kind_of(Dispatch::Semaphore) + sema10 = Dispatch::Semaphore.new 10 + sema10.should be_kind_of(Dispatch::Semaphore) + end + + it "raises an ArgumentError if the width isn't specified" do + lambda { Dispatch::Semaphore.new }.should raise_error(ArgumentError) + end + + it "raises an TypeError if a non-integer width is provided" do + lambda { Dispatch::Semaphore.new :foo }.should raise_error(TypeError) + lambda { Dispatch::Semaphore.new 3.5 }.should raise_error(TypeError) + end + + it "returns nil object if the specified width is less than zero" do + sema = Dispatch::Semaphore.new -1 + sema.should.be_kind_of(NilClass) + end + + it "returns non-zero from 'signal' if it does wake a thread" do + sema = Dispatch::Semaphore.new 0 + sema.signal.should_not == 0 + end + + it "returns zero from 'signal' if it does NOT wake a thread" do + sema = Dispatch::Semaphore.new 1 + sema.signal.should == 0 + end + + it "returns non-zero from wait if explicit timeout does expire" do + sema = Dispatch::Semaphore.new 0 + sema.wait(0.01).should_not == 0 + end + + it "returns zero from wait if explicit timeout does NOT expire" do + sema = Dispatch::Semaphore.new 0 + q = Dispatch::Queue.new('foo') + q.async {sema.signal.should_not == 0 } + sema.wait(1).should == 0 + end + + it "always returns zero from wait with default timeout FOREVER" do + sema = Dispatch::Semaphore.new 0 + q = Dispatch::Queue.new('foo') + q.async {sema.signal.should_not == 0 } + sema.wait.should == 0 + end + + end +end \ No newline at end of file Added: MacRuby/trunk/spec/macruby/core/gcd/source_spec.rb =================================================================== --- MacRuby/trunk/spec/macruby/core/gcd/source_spec.rb (rev 0) +++ MacRuby/trunk/spec/macruby/core/gcd/source_spec.rb 2009-12-10 21:05:42 UTC (rev 3093) @@ -0,0 +1,315 @@ +require File.dirname(__FILE__) + "/../../spec_helper" + +if MACOSX_VERSION >= 10.6 + + describe "Dispatch::Source" do + before :each do + @q = Dispatch::Queue.new('org.macruby.gcd_spec.sources') + end + + describe "custom events" do + describe "on_add" do + before :each do + @src = @q.on_add {|count| count.should == 42} + end + + it "returns a Source for a queue " do + @src.should be_kind_of(Dispatch::Source) + end + + it "should not be suspended" do + @src.suspended?.should == false + end + + it "takes an event handler block" do + lambda { @q.on_add }.should raise_error(ArgumentError) + end + + it "takes no arguments" do + lambda { @q.on_add(1) { }}.should raise_error(ArgumentError) + end + + it "should execute event handler when Fixnum merged with <<" do + @src.suspend + @src << 20 + @src << 22 + @src.resume + @q.sync {} + end + + it "will only merge Fixnum arguments" do + lambda { @src << :foo}.should raise_error(ArgumentError) + end + end + + describe "on_or" do + before :each do + @src = @q.on_or {|count| count.should == 0b1011} + end + + it "returns a Source for a queue " do + @src.should be_kind_of(Dispatch::Source) + end + + it "should not be suspended" do + @src.suspended?.should == false + end + + it "takes an event handler block" do + lambda { @q.on_or }.should raise_error(ArgumentError) + end + + it "takes no arguments" do + lambda { @q.on_or(1) { }}.should raise_error(ArgumentError) + end + + it "fires the event handler when merging data using <<" do + @src.suspend + @src << 0b0011 + @src << 0b1010 + @src.resume + @q.sync {} + end + + it "will only merge Fixnum arguments" do + lambda { @src << :foo}.should raise_error(ArgumentError) + end + end + end + + describe "process events" do + before :each do + @test_signal = "USR1" + end + + describe "on_process_event" do + before :each do + @src = @q.on_process_event($$, :exit, :fork, :exec, :reap, :signal) { |mask| mask[0].should == :signal } + end + + after :each do + @src.cancel + end + + it "returns a Source for a queue " do + @src.should be_kind_of(Dispatch::Source) + end + + it "should not be suspended" do + @src.suspended?.should == false + end + + it "takes an event handler block" do + lambda { @q.on_process_event($$, :exit, :fork, :exec, :reap, :signal) }.should raise_error(ArgumentError) + end + + it "takes a process_id plus one or more symbols" do + lambda { @q.on_process_event(:exit, :fork, :exec, :reap, :signal) {} }.should raise_error(ArgumentError) + lambda { @q.on_process_event($$) {} }.should raise_error(ArgumentError) + end + + it "should automatically mask any handled signals (?)" do + @q.on_signal(:KILL) {} + #@Process.kill(:KILL, $$) Don't try this very often until it works :-) + @q.sync {} + + end + + it "fires the event handler with a mask indicating the process event" do + Process.kill(@test_signal, $$) # send myself a SIGUSR1 + @q.sync {} + end + end + + describe "on_signal" do + before :each do + @src = @q.on_signal(@test_signal) { |count| count == 2 } + end + + after :each do + @src.cancel + end + + it "returns a Source for a queue " do + @src.should be_kind_of(Dispatch::Source) + end + + it "should not be suspended" do + @src.suspended?.should == false + end + + it "takes an event handler block" do + lambda { @q.on_signal(@test_signal) }.should raise_error(ArgumentError) + end + + it "takes the same signal identifiers as Process#kill" do + lambda { @q.on_signal(9) {} }.should_not raise_error(ArgumentError) + lambda { @q.on_signal("KILL") {} }.should_not raise_error(ArgumentError) + lambda { @q.on_signal("SIG_KILL") {} }.should_not raise_error(ArgumentError) + lambda { @q.on_signal(:KILL) {} }.should_not raise_error(ArgumentError) + lambda { @q.on_signal(9.5) {} }.should raise_error(ArgumentError) + end + + it "fires the event handler with count of how often the current process is signaled" do + @src.suspend + Process.kill(@test_signal, $$) # send myself a SIGUSR1 + Process.kill(@test_signal, $$) # send myself a SIGUSR1 + @src.resume + @q.sync {} + end + + end + + end + + describe "on_timer" do + before :each do + @src = @q.on_timer(Time.now, 0.1, 0.01) { |count| count.should >= 2 } + end + + after :each do + @src.cancel + end + + it "returns a Source for a queue " do + @src.should be_kind_of(Dispatch::Source) + end + + it "should not be suspended" do + @src.suspended?.should == false + end + + it "takes an event handler block" do + lambda { @q.on_timer(Time.now, 0.1, 0.01) }.should raise_error(ArgumentError) + end + + it "takes start time, interval in seconds, and optional leeway" do + lambda { @q.on_timer(Time.now, 0.1, 0.01) {} }.should_not raise_error(ArgumentError) + lambda { @q.on_timer(Time.now, 0.1) {} }.should_not raise_error(ArgumentError) + lambda { @q.on_timer(0.1, Time.now) {} }.should raise_error(TypeError) + end + + it "fires the event handler with count of how often the timer has fired" do + sleep 0.3 + @q.sync {} + end + + end + + describe "file events" do + before :each do + @filename = tmp("gcd_spec_source-#{$$}") + @msg = "#{Time.now}: on_file_event" + end + + describe "on_file_event" do + before :each do + @file = File.open(@filename, "w") + @src = @q.on_file_event(@file, :delete, :write, :extend, :attrib, :link, :rename, :revoke) {|mask| mask[0].should == :write} + end + + after :each do + @src.cancel + @file.close + end + + it "returns a Source for a queue " do + @src.should be_kind_of(Dispatch::Source) + end + + it "should not be suspended" do + @src.suspended?.should == false + end + + it "takes an event handler block" do + lambda { @q.on_file_event(file, :delete) }.should raise_error(ArgumentError) + end + + it "takes an IO object plus one or more symbols" do + lambda { @q.on_file_event(file, :delete) {}}.should_not raise_error(ArgumentError) + lambda { @q.on_file_event(file) {} }.should raise_error(ArgumentError) + lambda { @q.on_file_event(:delete) {} }.should raise_error(ArgumentError) + end + + it "fires the event handler with a mask indicating the file event" do + @file.puts @msg + @q.sync {} + end + end + + describe "on_write" do + before :each do + @file = File.open(@filename, "w") + @src = @q.on_write(@file) { |count| @file.puts @msg if @msg.size < count} + end + + after :each do + @file.close + end + + it "returns a Source for a queue " do + @src.should be_kind_of(Dispatch::Source) + end + + it "should not be suspended" do + @src.suspended?.should == false + end + + it "takes an event handler block" do + lambda { @q.on_write(@file) }.should raise_error(ArgumentError) + end + + it "takes an IO object" do + lambda { @q.on_write(@file) {}}.should_not raise_error(ArgumentError) + lambda { @q.on_write(@filename) {}}.should raise_error(ArgumentError) + end + + it "fires the event handler with the number of bytes that can be written" do + @q.sync {} + end + + it "should ensure the file is closed when the source is cancelled (?)" do + end + end + + + describe "on_read" do + before :each do + @file = File.open(@filename, "r") + @src = @q.on_read(@file) { |count| d = file.gets if count > @msg.size } + end + + after :each do + @file.close + end + + it "returns a Source for a queue " do + @src.should be_kind_of(Dispatch::Source) + end + + it "should not be suspended" do + @src.suspended?.should == false + end + + it "takes an event handler block" do + lambda { @q.on_read(@file) }.should raise_error(ArgumentError) + end + + it "takes an IO object" do + lambda { @q.on_read(@file) {}}.should_not raise_error(ArgumentError) + lambda { @q.on_read(@filename) {}}.should raise_error(ArgumentError) + end + + it "fires the event handler with the number of bytes that can be read" do + @q.sync {} + end + + it "should ensure the file is closed when the source is cancelled (?)" do + end + + end + end + + end + +end

1 0

[3092] MacRuby/trunk/spec/macruby/core
by source_changes＠macosforge.org 10 Dec '09

10 Dec '09

Revision: 3092 http://trac.macosforge.org/projects/ruby/changeset/3092 Author: ernest.prabhakar(a)gmail.com Date: 2009-12-10 12:58:41 -0800 (Thu, 10 Dec 2009) Log Message: ----------- Per #496, migrated gcd_spec.rb into gcd/{queue,group}_spec.rb Added Paths: ----------- MacRuby/trunk/spec/macruby/core/gcd/ MacRuby/trunk/spec/macruby/core/gcd/group_spec.rb MacRuby/trunk/spec/macruby/core/gcd/queue_spec.rb Added: MacRuby/trunk/spec/macruby/core/gcd/group_spec.rb =================================================================== --- MacRuby/trunk/spec/macruby/core/gcd/group_spec.rb (rev 0) +++ MacRuby/trunk/spec/macruby/core/gcd/group_spec.rb 2009-12-10 20:58:41 UTC (rev 3092) @@ -0,0 +1,16 @@ +require File.dirname(__FILE__) + "/../../spec_helper" + +if MACOSX_VERSION >= 10.6 + describe "Dispatch::Group" do + it "returns an instance of Group" do + @group = Dispatch::Group.new + @group.should be_kind_of(Dispatch::Group) + end + + describe "#notify" do + end + + describe "#wait" do + end + end +end Added: MacRuby/trunk/spec/macruby/core/gcd/queue_spec.rb =================================================================== --- MacRuby/trunk/spec/macruby/core/gcd/queue_spec.rb (rev 0) +++ MacRuby/trunk/spec/macruby/core/gcd/queue_spec.rb 2009-12-10 20:58:41 UTC (rev 3092) @@ -0,0 +1,186 @@ +require File.dirname(__FILE__) + "/../../spec_helper" + +if MACOSX_VERSION >= 10.6 + describe "Dispatch::Queue.concurrent" do + it "returns an instance of Queue" do + o = Dispatch::Queue.concurrent + o.should be_kind_of(Dispatch::Queue) + end + + it "can accept a symbol argument which represents the priority" do + o = Dispatch::Queue.concurrent(:low) + o.should be_kind_of(Dispatch::Queue) + + o = Dispatch::Queue.concurrent(:default) + o.should be_kind_of(Dispatch::Queue) + + o = Dispatch::Queue.concurrent(:high) + o.should be_kind_of(Dispatch::Queue) + + lambda { Dispatch::Queue.concurrent(42) }.should raise_error(TypeError) + end + + it "raises an ArgumentError if the given argument is not a valid priority symbol" do + lambda { Dispatch::Queue.concurrent(:foo) }.should raise_error(ArgumentError) + end + + it "should return the same queue object across invocations" do + a = Dispatch::Queue.concurrent(:low) + b = Dispatch::Queue.concurrent(:low) + a.should eql?(b) + end + + it "raises a TypeError if the provided priority is not a symbol" do + lambda { Dispatch::Queue.concurrent(42) }.should raise_error(TypeError) + end + end + + describe "Dispatch::Queue.current" do + it "returns an instance of Queue" do + o = Dispatch::Queue.current + o.should be_kind_of(Dispatch::Queue) + end + + it "should return the parent queue when inside an executing block" do + q = Dispatch::Queue.new('org.macruby.rubyspecs.gcd.test') + @q2 = nil + q.async do + @q2 = Dispatch::Queue.current + end + q.sync {} + q.label.should == @q2.label + end + end + + describe "Dispatch::Queue.main" do + it "returns an instance of Queue" do + o = Dispatch::Queue.main + o.should be_kind_of(Dispatch::Queue) + end + end + + describe "Dispatch::Queue.new" do + it "accepts a name and returns an instance of Queue" do + o = Dispatch::Queue.new('foo') + o.should be_kind_of(Dispatch::Queue) + + lambda { Dispatch::Queue.new('foo', 42) }.should raise_error(ArgumentError) + lambda { Dispatch::Queue.new(42) }.should raise_error(TypeError) + end + end + + describe "Dispatch::Queue#async" do + it "accepts a block and yields it asynchronously" do + o = Dispatch::Queue.new('foo') + @i = 0 + o.async { @i = 42 } + while @i == 0 do; end + @i.should == 42 + end + + it "accepts a block and yields it asynchronously through a group if given" do + o = Dispatch::Queue.new('foo') + g = Dispatch::Group.new + @i = 0 + o.async(g) { @i = 42 } + g.wait + @i.should == 42 + + lambda { o.async(42) }.should raise_error(ArgumentError) + end + + it "raises an ArgumentError if no block is given" do + o = Dispatch::Queue.new('foo') + lambda { o.async }.should raise_error(ArgumentError) + end + end + + describe "Dispatch::Queue#sync" do + it "accepts a block and yields it synchronously" do + o = Dispatch::Queue.new('foo') + @i = 0 + o.sync { @i = 42 } + @i.should == 42 + end + + it "raises an ArgumentError if no block is given" do + o = Dispatch::Queue.new('foo') + lambda { o.sync }.should raise_error(ArgumentError) + end + end + + describe "Dispatch::Queue#apply" do + it "accepts an input size and a block and yields it as many times" do + o = Dispatch::Queue.new('foo') + @i = 0 + o.apply(10) { @i += 1 } + @i.should == 10 + @i = 42 + o.apply(0) { @i += 1 } + @i.should == 42 + + lambda { o.apply(nil) {} }.should raise_error(TypeError) + end + + it "raises an ArgumentError if no block is given" do + o = Dispatch::Queue.new('foo') + lambda { o.apply(42) }.should raise_error(ArgumentError) + end + end + + describe "Dispatch::Queue#after" do + it "accepts a given time (in seconds) and a block and yields it after" do + o = Dispatch::Queue.new('foo') + @i = 0 + t = Time.now + o.after(0.2) { @i = 42 } + while @i == 0 do; end + t2 = Time.now - t + t2.should >= 0.2 + t2.should < 0.5 + @i.should == 42 + + lambda { o.after(nil) {} }.should raise_error(TypeError) + end + + it "raises an ArgumentError if no block is given" do + o = Dispatch::Queue.new('foo') + lambda { o.after(42) }.should raise_error(ArgumentError) + end + end + + describe "Dispatch::Queue#label" do + it "returns the name of the queue" do + o = Dispatch::Queue.new('foo') + o.label.should == 'foo' + + o = Dispatch::Queue.main + o.label.should == 'com.apple.main-thread' + end + end + + describe "Dispatch::Queue#suspend!" do + it "suspends the queue which can be resumed by calling #resume!" do + o = Dispatch::Queue.new('foo') + o.async { sleep 1 } + o.suspended?.should == false + o.suspend! + o.suspended?.should == true + o.resume! + o.suspended?.should == false + end + end + + describe "Dispatch::Group" do + it "returns an instance of Group" do + @group = Dispatch::Group.new + @group.should be_kind_of(Dispatch::Group) + end + + describe "#notify" do + end + + describe "#wait" do + end + end +end

1 0

[3091] MacRuby/trunk/spec/frozen/core/string/dump_spec.rb
by source_changes＠macosforge.org 09 Dec '09

09 Dec '09

Revision: 3091 http://trac.macosforge.org/projects/ruby/changeset/3091 Author: lsansonetti(a)apple.com Date: 2009-12-09 14:13:04 -0800 (Wed, 09 Dec 2009) Log Message: ----------- fixed the definition of a spec Modified Paths: -------------- MacRuby/trunk/spec/frozen/core/string/dump_spec.rb Modified: MacRuby/trunk/spec/frozen/core/string/dump_spec.rb =================================================================== --- MacRuby/trunk/spec/frozen/core/string/dump_spec.rb 2009-12-09 02:21:10 UTC (rev 3090) +++ MacRuby/trunk/spec/frozen/core/string/dump_spec.rb 2009-12-09 22:13:04 UTC (rev 3091) @@ -15,15 +15,15 @@ ruby_version_is "1.9" do it "returns a string with nonprinting charaters replaced by \\x notation" do ("\000".."A").to_a.join('').should == "\x00\x01\x02\x03\x04\x05\x06\a\b\t\n\v\f\r\x0E\x0F\x10\x11\x12\x13\x14\x15\x16\x17\x18\x19\x1A\e\x1C\x1D\x1E\x1F !\"\#$%&'()*+,-./0123456789:;<=>?@A" - # This test is based on my observations; the precise workings of this - # feature are unknown to me - it "includes .force_encoding(name) if the encoding isn't ASCII compatiable" do - "\u{876}".encode('utf-16be').dump.should == - "\"\\bv\".force_encoding(\"UTF-16BE\")" - "\u{876}".encode('utf-16le').dump.should == - "\"v\\b\".force_encoding(\"UTF-16LE\")" - end end + # This test is based on my observations; the precise workings of this + # feature are unknown to me + it "includes .force_encoding(name) if the encoding isn't ASCII compatiable" do + "\u{876}".encode('utf-16be').dump.should == + "\"\\bv\".force_encoding(\"UTF-16BE\")" + "\u{876}".encode('utf-16le').dump.should == + "\"v\\b\".force_encoding(\"UTF-16LE\")" + end end # $KCODE is deprecated on 1.9

1 0