February 2010 - macruby-changes - lists.macosforge.org

[3501] MacRuby/trunk/spec/macruby/tags/macruby/library/dispatch/ enumerable_tags.txt
by source_changes＠macosforge.org 12 Feb '10

12 Feb '10

Revision: 3501 http://trac.macosforge.org/projects/ruby/changeset/3501 Author: lsansonetti(a)apple.com Date: 2010-02-11 19:03:37 -0800 (Thu, 11 Feb 2010) Log Message: ----------- ditto Added Paths: ----------- MacRuby/trunk/spec/macruby/tags/macruby/library/dispatch/enumerable_tags.txt Added: MacRuby/trunk/spec/macruby/tags/macruby/library/dispatch/enumerable_tags.txt =================================================================== --- MacRuby/trunk/spec/macruby/tags/macruby/library/dispatch/enumerable_tags.txt (rev 0) +++ MacRuby/trunk/spec/macruby/tags/macruby/library/dispatch/enumerable_tags.txt 2010-02-12 03:03:37 UTC (rev 3501) @@ -0,0 +1,2 @@ +fails:parallel Enumerable p_map should behave like map +fails:parallel Enumerable p_find_all should behave like find_all

1 0

[3500] MacRuby/trunk/spec/macruby/tags/macruby
by source_changes＠macosforge.org 12 Feb '10

12 Feb '10

Revision: 3500 http://trac.macosforge.org/projects/ruby/changeset/3500 Author: lsansonetti(a)apple.com Date: 2010-02-11 19:03:12 -0800 (Thu, 11 Feb 2010) Log Message: ----------- tag the GCD specs that always fail, we need to figure out why Modified Paths: -------------- MacRuby/trunk/spec/macruby/tags/macruby/core/gcd/source_tags.txt MacRuby/trunk/spec/macruby/tags/macruby/library/dispatch/queue_source_tags.txt Modified: MacRuby/trunk/spec/macruby/tags/macruby/core/gcd/source_tags.txt =================================================================== --- MacRuby/trunk/spec/macruby/tags/macruby/core/gcd/source_tags.txt 2010-02-12 02:53:17 UTC (rev 3499) +++ MacRuby/trunk/spec/macruby/tags/macruby/core/gcd/source_tags.txt 2010-02-12 03:03:12 UTC (rev 3500) @@ -0,0 +1,3 @@ +fails:Dispatch::Source of type SIGNAL fires on signal with signal count data +fails:Dispatch::Source of type file: READ does close file when cancelled given IO +fails:Dispatch::Source of type file: VNODE fires with data showing mask of vnode events Modified: MacRuby/trunk/spec/macruby/tags/macruby/library/dispatch/queue_source_tags.txt =================================================================== --- MacRuby/trunk/spec/macruby/tags/macruby/library/dispatch/queue_source_tags.txt 2010-02-12 02:53:17 UTC (rev 3499) +++ MacRuby/trunk/spec/macruby/tags/macruby/library/dispatch/queue_source_tags.txt 2010-02-12 03:03:12 UTC (rev 3500) @@ -0,0 +1,3 @@ +fails:Dispatch::Queue source from on_process_event fires with data indicating which process event(s) +fails:Dispatch::Queue source from on_signal fires with data on how often the process was signaled +fails:Dispatch::Queue source from file on_file_event fires with data indicating which file event(s)

1 0

[3499] MacRuby/trunk/spec/frozen/tags/macruby/core/hash
by source_changes＠macosforge.org 12 Feb '10

12 Feb '10

Revision: 3499 http://trac.macosforge.org/projects/ruby/changeset/3499 Author: lsansonetti(a)apple.com Date: 2010-02-11 18:53:17 -0800 (Thu, 11 Feb 2010) Log Message: ----------- untag specs that now pass Modified Paths: -------------- MacRuby/trunk/spec/frozen/tags/macruby/core/hash/eql_tags.txt MacRuby/trunk/spec/frozen/tags/macruby/core/hash/equal_value_tags.txt Removed Paths: ------------- MacRuby/trunk/spec/frozen/tags/macruby/core/hash/flatten_tags.txt MacRuby/trunk/spec/frozen/tags/macruby/core/hash/inspect_tags.txt MacRuby/trunk/spec/frozen/tags/macruby/core/hash/to_s_tags.txt Modified: MacRuby/trunk/spec/frozen/tags/macruby/core/hash/eql_tags.txt =================================================================== --- MacRuby/trunk/spec/frozen/tags/macruby/core/hash/eql_tags.txt 2010-02-12 02:40:11 UTC (rev 3498) +++ MacRuby/trunk/spec/frozen/tags/macruby/core/hash/eql_tags.txt 2010-02-12 02:53:17 UTC (rev 3499) @@ -1,4 +1,3 @@ -critical:Hash#eql? computes equality for complex recursive hashes -critical:Hash#eql? computes equality for recursive hashes & arrays +fails:Hash#eql? computes equality for recursive hashes & arrays fails:Hash#eql? compares keys with matching hash codes via eql? -fails:Hash#eql? compares keys with eql? semantics \ No newline at end of file +fails:Hash#eql? compares keys with eql? semantics Modified: MacRuby/trunk/spec/frozen/tags/macruby/core/hash/equal_value_tags.txt =================================================================== --- MacRuby/trunk/spec/frozen/tags/macruby/core/hash/equal_value_tags.txt 2010-02-12 02:40:11 UTC (rev 3498) +++ MacRuby/trunk/spec/frozen/tags/macruby/core/hash/equal_value_tags.txt 2010-02-12 02:53:17 UTC (rev 3499) @@ -1,4 +1,2 @@ -critical:Hash#== computes equality for complex recursive hashes -critical:Hash#== computes equality for recursive hashes & arrays fails:Hash#== compares keys with matching hash codes via eql? -fails:Hash#== compares keys with eql? semantics \ No newline at end of file +fails:Hash#== compares keys with eql? semantics Deleted: MacRuby/trunk/spec/frozen/tags/macruby/core/hash/flatten_tags.txt =================================================================== --- MacRuby/trunk/spec/frozen/tags/macruby/core/hash/flatten_tags.txt 2010-02-12 02:40:11 UTC (rev 3498) +++ MacRuby/trunk/spec/frozen/tags/macruby/core/hash/flatten_tags.txt 2010-02-12 02:53:17 UTC (rev 3499) @@ -1,6 +0,0 @@ -# DO NOT remove me, this spec may pass on some systems but fail on others. -fails:Hash#flatten sets each even index of the Array to a key of the Hash -fails:Hash#flatten sets each odd index of the Array to the value corresponding to the previous element -fails:Hash#flatten does not recursively flatten Array values when called without arguments -fails:Hash#flatten recursively flattens Array values when called with an argument >= 2 -fails:Hash#flatten recursively flattens Array values to the given depth Deleted: MacRuby/trunk/spec/frozen/tags/macruby/core/hash/inspect_tags.txt =================================================================== --- MacRuby/trunk/spec/frozen/tags/macruby/core/hash/inspect_tags.txt 2010-02-12 02:40:11 UTC (rev 3498) +++ MacRuby/trunk/spec/frozen/tags/macruby/core/hash/inspect_tags.txt 2010-02-12 02:53:17 UTC (rev 3499) @@ -1 +0,0 @@ -critical:Hash#inspect handles hashes with recursive values \ No newline at end of file Deleted: MacRuby/trunk/spec/frozen/tags/macruby/core/hash/to_s_tags.txt =================================================================== --- MacRuby/trunk/spec/frozen/tags/macruby/core/hash/to_s_tags.txt 2010-02-12 02:40:11 UTC (rev 3498) +++ MacRuby/trunk/spec/frozen/tags/macruby/core/hash/to_s_tags.txt 2010-02-12 02:53:17 UTC (rev 3499) @@ -1 +0,0 @@ -critical:Hash#to_s handles hashes with recursive values \ No newline at end of file

1 0

[3498] MacRuby/trunk/spec/frozen/tags/macruby/language/string_tags.txt
by source_changes＠macosforge.org 12 Feb '10

12 Feb '10

Revision: 3498 http://trac.macosforge.org/projects/ruby/changeset/3498 Author: lsansonetti(a)apple.com Date: 2010-02-11 18:40:11 -0800 (Thu, 11 Feb 2010) Log Message: ----------- this spec now passes Removed Paths: ------------- MacRuby/trunk/spec/frozen/tags/macruby/language/string_tags.txt Deleted: MacRuby/trunk/spec/frozen/tags/macruby/language/string_tags.txt =================================================================== --- MacRuby/trunk/spec/frozen/tags/macruby/language/string_tags.txt 2010-02-12 02:39:56 UTC (rev 3497) +++ MacRuby/trunk/spec/frozen/tags/macruby/language/string_tags.txt 2010-02-12 02:40:11 UTC (rev 3498) @@ -1 +0,0 @@ -fails:Ruby character strings interpolates the return value of Object#inspect, without ivars, if Object#to_s does not return a String instance

1 0

[3497] MacRuby/trunk/object.c
by source_changes＠macosforge.org 12 Feb '10

12 Feb '10

Revision: 3497 http://trac.macosforge.org/projects/ruby/changeset/3497 Author: lsansonetti(a)apple.com Date: 2010-02-11 18:39:56 -0800 (Thu, 11 Feb 2010) Log Message: ----------- inspect message should always start by a # Modified Paths: -------------- MacRuby/trunk/object.c Modified: MacRuby/trunk/object.c =================================================================== --- MacRuby/trunk/object.c 2010-02-12 02:02:26 UTC (rev 3496) +++ MacRuby/trunk/object.c 2010-02-12 02:39:56 UTC (rev 3497) @@ -502,7 +502,7 @@ if (has_ivar) { const char *c = rb_obj_classname(obj); - VALUE str = rb_sprintf("<%s:%p", c, (void*)obj); + VALUE str = rb_sprintf("#<%s:%p", c, (void*)obj); return rb_exec_recursive(inspect_obj, obj, str); } }

1 0

[3496] MacRuby/trunk/spec/frozen/tags/macruby/language
by source_changes＠macosforge.org 12 Feb '10

12 Feb '10

Revision: 3496 http://trac.macosforge.org/projects/ruby/changeset/3496 Author: lsansonetti(a)apple.com Date: 2010-02-11 18:02:26 -0800 (Thu, 11 Feb 2010) Log Message: ----------- untag specs that now pass Removed Paths: ------------- MacRuby/trunk/spec/frozen/tags/macruby/language/class_tags.txt MacRuby/trunk/spec/frozen/tags/macruby/language/file_tags.txt MacRuby/trunk/spec/frozen/tags/macruby/language/for_tags.txt MacRuby/trunk/spec/frozen/tags/macruby/language/metaclass_tags.txt Deleted: MacRuby/trunk/spec/frozen/tags/macruby/language/class_tags.txt =================================================================== --- MacRuby/trunk/spec/frozen/tags/macruby/language/class_tags.txt 2010-02-12 00:53:36 UTC (rev 3495) +++ MacRuby/trunk/spec/frozen/tags/macruby/language/class_tags.txt 2010-02-12 02:02:26 UTC (rev 3496) @@ -1,2 +0,0 @@ -# This spec is marked as failing because it messes the top level object, probably a bug in #eval -fails:A Class Definitions extending an object raises a TypeError when trying to extend numbers Deleted: MacRuby/trunk/spec/frozen/tags/macruby/language/file_tags.txt =================================================================== --- MacRuby/trunk/spec/frozen/tags/macruby/language/file_tags.txt 2010-02-12 00:53:36 UTC (rev 3495) +++ MacRuby/trunk/spec/frozen/tags/macruby/language/file_tags.txt 2010-02-12 02:02:26 UTC (rev 3496) @@ -1 +0,0 @@ -fails:The __FILE__ constant equals a relative path when required using a relative path Deleted: MacRuby/trunk/spec/frozen/tags/macruby/language/for_tags.txt =================================================================== --- MacRuby/trunk/spec/frozen/tags/macruby/language/for_tags.txt 2010-02-12 00:53:36 UTC (rev 3495) +++ MacRuby/trunk/spec/frozen/tags/macruby/language/for_tags.txt 2010-02-12 02:02:26 UTC (rev 3496) @@ -1 +0,0 @@ -fails:The for expression splats multiple arguments together if there are fewer arguments than values Deleted: MacRuby/trunk/spec/frozen/tags/macruby/language/metaclass_tags.txt =================================================================== --- MacRuby/trunk/spec/frozen/tags/macruby/language/metaclass_tags.txt 2010-02-12 00:53:36 UTC (rev 3495) +++ MacRuby/trunk/spec/frozen/tags/macruby/language/metaclass_tags.txt 2010-02-12 02:02:26 UTC (rev 3496) @@ -1,2 +0,0 @@ -fails:A constant on a metaclass is not defined on the object's class -fails:A constant on a metaclass does not appear in the object's class constant list

1 0

[3495] MacRuby/trunk/TODO
by source_changes＠macosforge.org 12 Feb '10

12 Feb '10

Revision: 3495 http://trac.macosforge.org/projects/ruby/changeset/3495 Author: lsansonetti(a)apple.com Date: 2010-02-11 16:53:36 -0800 (Thu, 11 Feb 2010) Log Message: ----------- refreshed Modified Paths: -------------- MacRuby/trunk/TODO Modified: MacRuby/trunk/TODO =================================================================== --- MacRuby/trunk/TODO 2010-02-11 22:58:01 UTC (rev 3494) +++ MacRuby/trunk/TODO 2010-02-12 00:53:36 UTC (rev 3495) @@ -9,8 +9,9 @@ [/] debugger [/] command-line tool [ ] Xcode plugin -[ ] MRI C extensions support - [ ] cleanup API (use nokogiri as test bed) +[/] MRI C extensions support + [X] implement missing API (use nokogiri as test bed) + [/] cleanup public headers [ ] define an export file for the linker [ ] GC support [/] rails @@ -18,6 +19,8 @@ [/] development web server [/] hello world should work [ ] support Mocha +[ ] support RSpec +[ ] 90% (min.) of rubyspecs should pass Historical:

1 0

[3494] MacRuby/trunk/string.c
by source_changes＠macosforge.org 11 Feb '10

11 Feb '10

Revision: 3494 http://trac.macosforge.org/projects/ruby/changeset/3494 Author: neeracher(a)apple.com Date: 2010-02-11 14:58:01 -0800 (Thu, 11 Feb 2010) Log Message: ----------- make sure -copy can be sent to instances of hidden NSString subclasses (immutable equivalent to r3477) Revision Links: -------------- http://trac.macosforge.org/projects/ruby/changeset/3477 Modified Paths: -------------- MacRuby/trunk/string.c Modified: MacRuby/trunk/string.c =================================================================== --- MacRuby/trunk/string.c 2010-02-11 22:32:23 UTC (rev 3493) +++ MacRuby/trunk/string.c 2010-02-11 22:58:01 UTC (rev 3494) @@ -5261,6 +5261,16 @@ } static void * +imp_rb_str_copy(void *rcv, SEL sel) +{ + void *dup; + PREPARE_RCV(rcv); + dup = (void *)objc_msgSend(rcv, selCopy); + RESTORE_RCV(rcv); + return dup; +} + +static void * imp_rb_str_mutableCopy(void *rcv, SEL sel) { void *dup; @@ -5285,6 +5295,7 @@ rb_objc_install_method2(klass, "_fastestEncodingInCFStringEncoding", (IMP)imp_rb_str_fastestEncodingInCFStringEncoding); rb_objc_install_method2(klass, "isEqual:", (IMP)imp_rb_str_isEqual); + rb_objc_install_method2(klass, "copy", (IMP)imp_rb_str_copy); rb_objc_install_method2(klass, "mutableCopy", (IMP)imp_rb_str_mutableCopy); const bool mutable = class_getSuperclass(klass)

1 0

[3493] MacRuby/trunk
by source_changes＠macosforge.org 11 Feb '10

11 Feb '10

Revision: 3493 http://trac.macosforge.org/projects/ruby/changeset/3493 Author: ernest.prabhakar(a)gmail.com Date: 2010-02-11 14:32:23 -0800 (Thu, 11 Feb 2010) Log Message: ----------- Added example showing new dispatch methods Modified Paths: -------------- MacRuby/trunk/lib/dispatch/dispatch.rb Added Paths: ----------- MacRuby/trunk/sample-macruby/Scripts/gcd/dispatch_methods.rb Modified: MacRuby/trunk/lib/dispatch/dispatch.rb =================================================================== --- MacRuby/trunk/lib/dispatch/dispatch.rb 2010-02-11 22:32:06 UTC (rev 3492) +++ MacRuby/trunk/lib/dispatch/dispatch.rb 2010-02-11 22:32:23 UTC (rev 3493) @@ -5,7 +5,7 @@ # Asynchronously run the +&block+ # on a concurrent queue of the given (optional) +priority+ # - # Dispatch.async {p "Do this later"} + # Dispatch.async {p "Did this later"} # def async(priority=nil, &block) Dispatch::Queue.concurrent(priority).async &block @@ -27,8 +27,9 @@ # returned for use with +wait+ or +notify+ -- # on a concurrent queue of the given (optional) +priority+ # - # g = Dispatch.group {p "Did this"} - # g.wait # => "Did this" + # g = Dispatch.group {p "Do this"} + # Dispatch.group(g) {p "and that"} + # g.wait # => "Do this" "and that" # def group(grp=nil, priority=nil, &block) grp ||= Dispatch::Group.new @@ -53,7 +54,7 @@ # # a = Array.new # q = Dispatch.queue_for(a) - # q.async {a << Time.now } + # q.async {a << 2 } # def queue_for(obj) Dispatch::Queue.new Dispatch.label_for(obj) @@ -64,8 +65,8 @@ # # a = Dispatch.wrap(Array) # a << Time.now # automatically serialized - # a.size # => 1 (synchronously) - # a.size {|n| p "Size=#{n}"} # => "Size=1" (asynchronously) + # a.size # => 1 (synchronous return) + # a.size {|n| p "Size=#{n}"} # => "Size=1" (asynchronous return) # def wrap(obj) Dispatch::Actor.new( (obj.is_a? Class) ? obj.new : obj) Added: MacRuby/trunk/sample-macruby/Scripts/gcd/dispatch_methods.rb =================================================================== --- MacRuby/trunk/sample-macruby/Scripts/gcd/dispatch_methods.rb (rev 0) +++ MacRuby/trunk/sample-macruby/Scripts/gcd/dispatch_methods.rb 2010-02-11 22:32:23 UTC (rev 3493) @@ -0,0 +1,45 @@ +#!/usr/local/bin/macruby +require 'dispatch' + +puts "\n Use Dispatch.async to do stuff in the background" +Dispatch.async { p "Did this later" } +sleep 0.1 + +puts "\n Use Dispatch.group to track when stuff completes" +g = Dispatch.group { p "Do this" } +Dispatch.group(g) { p "and that" } +g.wait +p "Done" + +puts "\n Use Dispatch.fork to capture return values in a Future" +f = Dispatch.fork { 2+2 } +p f.value +puts " - pass a block to return the value asynchronously" +f.value { |v| p "Returns #{v}" } +sleep 0.1 + +puts "\n Use Dispatch.queue_for to create a private serial queue" +puts " - synchronizes access to shared data structures" +a = Array.new +q = Dispatch.queue_for(a) +puts " - has a (mostly) unique name:" +p q +q.async { a << "change me" } +puts " - uses sync to block and flush queue" +q.sync { p a } + +puts "\n Use with a group for more complex dependencies, " +q.async(g) { a << "more change" } +Dispatch.group(g) do + tmp = "complex calculation" + q.async(g) { a << tmp } +end +puts " - uses notify to execute block when done" +g.notify(q) { p a } +q.sync {} + +puts "\n Use Dispatch.wrap to serialize object using an Actor" +b = Dispatch.wrap(Array) +b << "safely change me" +p b.size # => 1 (synchronous return) +b.size {|n| p "Size=#{n}"} # => "Size=1" (asynchronous return)

1 0

[3492] MacRuby/trunk
by source_changes＠macosforge.org 11 Feb '10

11 Feb '10

Revision: 3492 http://trac.macosforge.org/projects/ruby/changeset/3492 Author: ernest.prabhakar(a)gmail.com Date: 2010-02-11 14:32:06 -0800 (Thu, 11 Feb 2010) Log Message: ----------- Remove Dispatch#sync, reorder and document other methods Modified Paths: -------------- MacRuby/trunk/lib/dispatch/dispatch.rb MacRuby/trunk/spec/macruby/library/dispatch/dispatch_spec.rb Modified: MacRuby/trunk/lib/dispatch/dispatch.rb =================================================================== --- MacRuby/trunk/lib/dispatch/dispatch.rb 2010-02-11 22:12:00 UTC (rev 3491) +++ MacRuby/trunk/lib/dispatch/dispatch.rb 2010-02-11 22:32:06 UTC (rev 3492) @@ -1,55 +1,76 @@ -# Convenience methods for calling the concurrent queues +# Convenience methods for invoking GCD # directly from the top-level Dispatch module module Dispatch - # Returns a unique label based on the ancestor chain and ID of +obj+ - # plus the current time - def label_for(obj) - ancestors = obj.class.ancestors.map {|a| a.to_s} - label = ancestors.uniq.reverse.join("_").downcase - now = Time.now.to_f.to_s.gsub(".","_") - "#{label}__%x__%s" % [obj.object_id, now] + # Asynchronously run the +&block+ + # on a concurrent queue of the given (optional) +priority+ + # + # Dispatch.async {p "Do this later"} + # + def async(priority=nil, &block) + Dispatch::Queue.concurrent(priority).async &block end - # Returns a new serial queue with a unique label based on +obj+ - def queue_for(obj) - Dispatch::Queue.new Dispatch.label_for(obj) + # Asynchronously run the +&block+ inside a Future + # -- which is returned for use with +join+ or +value+ -- + # on a concurrent queue of the given (optional) +priority+ + # + # f = Dispatch.fork { 2+2 } + # f.value # => 4 + # + def fork(priority=nil, &block) + Dispatch::Future.new(priority) { block.call } end - # Run the +&block+ synchronously on a concurrent queue - # of the given (optional) +priority+ - def sync(priority=nil, &block) - Dispatch::Queue.concurrent(priority).sync &block + # Asynchronously run the +&block+ inside a Group + # -- which is created if not specified, and + # returned for use with +wait+ or +notify+ -- + # on a concurrent queue of the given (optional) +priority+ + # + # g = Dispatch.group {p "Did this"} + # g.wait # => "Did this" + # + def group(grp=nil, priority=nil, &block) + grp ||= Dispatch::Group.new + Dispatch::Queue.concurrent(priority).async(grp) { block.call } + grp end - # Run the +&block+ asynchronously on a concurrent queue - # of the given (optional) +priority+ - def async(priority=nil, &block) - Dispatch::Queue.concurrent(priority).async &block + # Returns a mostly unique reverse-DNS-style label based on + # the ancestor chain and ID of +obj+ plus the current time + # + # Dispatch.label_for(Array.new) + # => Dispatch.enumerable.array.0x2000cc2c0.1265915278.97557 + # + def label_for(obj) + names = obj.class.ancestors[0...-2].map {|a| a.to_s.downcase} + label = names.uniq.reverse.join(".") + "#{self}.#{label}.%p.#{Time.now.to_f}" % obj.object_id end - - # Run the +&block+ asynchronously on a concurrent queue - # of the given (optional) +priority+ as part of the specified +grp+ - def group(grp, priority=nil, &block) - Dispatch::Queue.concurrent(priority).async(grp) { block.call } - # Can't pass block directly for some reason + + # Returns a new serial queue with a unique label based on +obj+ + # used to serialize access to objects called from multiple threads + # + # a = Array.new + # q = Dispatch.queue_for(a) + # q.async {a << Time.now } + # + def queue_for(obj) + Dispatch::Queue.new Dispatch.label_for(obj) end - # Wrap the passed +obj+ (or its instance) inside an Actor to serialize access - # and allow asynchronous invocation plus a callback + # Wrap the passed +obj+ (or its instance, if a Class) inside an Actor + # to serialize access and allow asynchronous returns + # + # a = Dispatch.wrap(Array) + # a << Time.now # automatically serialized + # a.size # => 1 (synchronously) + # a.size {|n| p "Size=#{n}"} # => "Size=1" (asynchronously) + # def wrap(obj) Dispatch::Actor.new( (obj.is_a? Class) ? obj.new : obj) end - # Run the +&block+ asynchronously on a concurrent queue of the given - # (optional) +priority+ as part of a Future, which is returned for use with - # +join+ or +value+ - - def fork(priority=nil, &block) - Dispatch::Future.new(priority) { block.call } - # Can't pass block directly for some reason - end - - module_function :label_for, :queue_for, :async, :sync, :group, :wrap, :fork + module_function :async, :fork, :group, :label_for, :queue_for, :wrap end Modified: MacRuby/trunk/spec/macruby/library/dispatch/dispatch_spec.rb =================================================================== --- MacRuby/trunk/spec/macruby/library/dispatch/dispatch_spec.rb 2010-02-11 22:12:00 UTC (rev 3491) +++ MacRuby/trunk/spec/macruby/library/dispatch/dispatch_spec.rb 2010-02-11 22:32:06 UTC (rev 3492) @@ -15,30 +15,6 @@ @actee = Actee.new("my_actee") end - describe :label_for do - it "should return a unique label for any object" do - s1 = Dispatch.label_for(@actee) - s2 = Dispatch.label_for(@actee) - s1.should_not == s2 - end - end - - describe :queue_for do - it "should return a unique queue" do - q1 = Dispatch.queue_for(@actee) - q2 = Dispatch.queue_for(@actee) - q1.should_not == q2 - end - end - - describe :sync do - it "should execute the block Synchronously" do - $dispatch_gval = 0 - Dispatch.sync { @actee.delay_set(42) } - $dispatch_gval.should == 42 - end - end - describe :async do it "should execute the block Asynchronously" do $dispatch_gval = 0 @@ -49,6 +25,17 @@ end end + describe :fork do + it "should return a Future for tracking execution of the passed block" do + $dispatch_gval = 0 + g = Dispatch.fork { @actee.delay_set(42) } + $dispatch_gval.should == 0 + g.should be_kind_of Dispatch::Future + g.join + $dispatch_gval.should == 42 + end + end + describe :group do it "should execute the block with the specified group" do $dispatch_gval = 0 @@ -60,6 +47,22 @@ end end + describe :label_for do + it "should return a unique label for any object" do + s1 = Dispatch.label_for(@actee) + s2 = Dispatch.label_for(@actee) + s1.should_not == s2 + end + end + + describe :queue_for do + it "should return a unique queue" do + q1 = Dispatch.queue_for(@actee) + q2 = Dispatch.queue_for(@actee) + q1.should_not == q2 + end + end + describe :wrap do it "should return an Actor wrapping an instance of a passed class" do actor = Dispatch.wrap(Actee) @@ -74,16 +77,5 @@ end end - describe :fork do - it "should return a Future for tracking execution of the passed block" do - $dispatch_gval = 0 - g = Dispatch.fork { @actee.delay_set(42) } - $dispatch_gval.should == 0 - g.should be_kind_of Dispatch::Future - g.join - $dispatch_gval.should == 42 - end - end - end end

1 0