cond 0.2.1 → 0.3.0

data/lib/cond/message_proc.rb

@@ -0,0 +1,15 @@
+
+module Cond
+  #
+  # Common base for Handler and Restart.  A Proc with a message.
+  #
+  class MessageProc < Proc
+    def initialize(message = "", &block)
+      @message = message
+    end
+
+    def message
+      @message
+    end
+  end
+end

data/lib/cond/restart.rb

@@ -0,0 +1,10 @@
+
+module Cond
+  #
+  # A restart.  Use of this class is optional: you could pass lambdas
+  # to Cond.with_restarts, but you'll miss the description string
+  # shown inside Cond.default_handler.
+  #
+  class Restart < MessageProc
+  end
+end

data/lib/cond/restartable_section.rb

@@ -0,0 +1,12 @@
+
+module Cond
+  class RestartableSection < CodeSection  #:nodoc:
+    def initialize(&block)
+      super(:with_restarts, &block)
+    end
+    
+    def restart(sym, message, &block)
+      Cond.restarts_stack.last[sym] = Restart.new(message, &block)
+    end
+  end
+end

data/lib/cond/symbol_generator.rb

@@ -0,0 +1,41 @@
+
+module Cond
+  module SymbolGenerator
+    @count = 'a'
+    @mutex = Mutex.new
+    @recycled = []
+    @object_id_to_sym_list = Hash.new
+    @finalizer = lambda { |id|
+      recycle(@object_id_to_sym_list.delete(id))
+    }
+
+    class << self
+      def gensym
+        @mutex.synchronize {
+          if @recycled.empty?
+            @count.succ!
+            :"|#{@count}"
+          else
+            @recycled.shift
+          end
+        }
+      end
+
+      def recycle(syms)
+        @mutex.synchronize {
+          @recycled.concat(syms)
+        }
+      end
+      
+      def track(object, *syms)
+        @mutex.synchronize {
+          @object_id_to_sym_list[object.object_id] = syms.flatten
+          ObjectSpace.define_finalizer(object, @finalizer)
+        }
+      end
+    end
+    
+    define_method :gensym, &method(:gensym)
+    private :gensym
+  end
+end

data/lib/cond/thread_local.rb

@@ -0,0 +1,71 @@
+
+module Cond
+  #
+  # Thread-local variable.
+  #
+  class ThreadLocal
+    include SymbolGenerator
+
+    #
+    # If +value+ is called before +value=+ then the result of
+    # &default is used.
+    #
+    # &default normally creates a new object, otherwise the returned
+    # object will be shared across threads.
+    #
+    def initialize(&default)
+      @name = gensym
+      @accessed = gensym
+      @default = default
+    end
+
+    #
+    # Reset to just-initialized state for all threads.
+    #
+    def clear(&default)
+      Thread.exclusive {
+        @default = default
+        Thread.list.each { |thread|
+          thread[@accessed] = nil
+          thread[@name] = nil
+        }
+      }
+    end
+    
+    def value
+      unless Thread.current[@accessed]
+        if @default
+          Thread.current[@name] = @default.call
+        end
+        Thread.current[@accessed] = true
+      end
+      Thread.current[@name]
+    end
+    
+    def value=(value)
+      Thread.current[@accessed] = true
+      Thread.current[@name] = value
+    end
+
+    class << self
+      def accessor_module(name, subclass = self, &block)
+        var = subclass.new(&block)
+        Module.new {
+          define_method(name) {
+            var.value
+          }
+          define_method("#{name}=") { |value|
+            var.value = value
+          }
+        }
+      end
+      
+      def reader_module(name, subclass = self, &block)
+        accessor_module(name, subclass, &block).instance_eval {
+          remove_method "#{name}="
+          self
+        }
+      end
+    end
+  end
+end

data/lib/cond/wrapping.rb

@@ -0,0 +1,45 @@
+
+module Cond
+  module Wrapping
+    #
+    # Allow handlers to be called from C code by wrapping a method with
+    # begin/rescue.  Returns the aliased name of the original method.
+    #
+    # See the README.
+    #
+    # Example:
+    #
+    #   Cond.wrap_instance_method(Fixnum, :/)
+    #
+    def wrap_instance_method(mod, method)
+      original = "cond_original_#{mod.inspect}_#{method.inspect}"
+      # TODO: jettison 1.8.6, remove eval and use |&block|
+      mod.module_eval <<-eval_end
+        alias_method :'#{original}', :'#{method}'
+        def #{method}(*args, &block)
+          begin
+            send(:'#{original}', *args, &block)
+          rescue Exception => e
+            raise e
+          end
+        end
+      eval_end
+      original
+    end
+  
+    #
+    # Allow handlers to be called from C code by wrapping a method with
+    # begin/rescue.  Returns the aliased name of the original method.
+    #
+    # See the README.
+    #
+    # Example:
+    #
+    #   Cond.wrap_singleton_method(IO, :read)
+    #
+    def wrap_singleton_method(mod, method)
+      singleton_class = class << mod ; self ; end
+      wrap_instance_method(singleton_class, method)
+    end
+  end
+end

data/readmes/restarts.rb

@@ -5,8 +5,7 @@ $LOAD_PATH.unshift "#{File.dirname(__FILE__)}/../lib"
 #
 
 require 'pp'
-require 'cond'
-include Cond
+require 'cond/dsl'
 
 class RestartableFetchError < RuntimeError
 end

data/readmes/seibel_pcl.rb

@@ -13,9 +13,8 @@ $LOAD_PATH.unshift "#{File.dirname(__FILE__)}/../lib"
 ##########################################################
 # setup
 
-require 'cond'
+require 'cond/dsl'
 require 'time'
-include Cond
 
 class MalformedLogEntryError < StandardError
 end

data/{examples/bad_example.rb → spec/bad_spec.rb}

@@ -1,4 +1,4 @@
-require File.dirname(__FILE__) + "/../spec/common"
+require File.dirname(__FILE__) + '/cond_spec_base'
 
 #
 # This is a bad example because a handler should re-raise if no
@@ -6,7 +6,7 @@ require File.dirname(__FILE__) + "/../spec/common"
 # 'raise' gets executed.  But for fun let's see what it looks like.
 #
 
-include Cond
+require 'cond/dsl'
 
 module BadExample
   A, B = (1..2).map { Class.new RuntimeError }

data/spec/basic_spec.rb

@@ -1,9 +1,9 @@
-require File.dirname(__FILE__) + "/common"
+require File.dirname(__FILE__) + '/cond_spec_base'
 
 class ExampleError < RuntimeError
 end
 
-include Cond
+require 'cond/dsl'
 
 describe "basic handler/restart functionality" do
   it "should work using the raw form" do

data/{examples/calc_example.rb → spec/calc_spec.rb}

@@ -1,6 +1,6 @@
-require File.dirname(__FILE__) + "/../spec/common"
+require File.dirname(__FILE__) + '/cond_spec_base'
 
-include Cond
+require 'cond/dsl'
 
 class DivergedError < StandardError
   attr_reader :epsilon

data/spec/{common.rb → cond_spec_base.rb}

@@ -1,31 +1,14 @@
 $LOAD_PATH.unshift File.dirname(__FILE__) + "/../lib"
-$LOAD_PATH.unshift File.dirname(__FILE__) + "/../support"
+$LOAD_PATH.unshift File.dirname(__FILE__) + "/../devel"
 
-# darn rspec warnings
-$VERBOSE = false
-begin
-  require 'spec'
-rescue LoadError
-  require 'rubygems'
-  require 'spec'
-end
+require 'rubygems'
+require 'spec/autorun'
 
 # NOTE: In jruby this must come after require 'rubygems'
 require 'cond'
 
-require 'pathname'
 require 'stringio'
 
-def pipe_to_ruby(code)
-  require 'quix/ruby'
-  IO.popen(%{"#{Quix::Ruby::EXECUTABLE}"}, "r+") { |pipe|
-    pipe.puts code
-    pipe.flush
-    pipe.close_write
-    pipe.read
-  }
-end
-
 def capture(input_string)
   previous = [
     $stdout, $stdin, Cond.defaults.stream_out, Cond.defaults.stream_in

data/spec/error_spec.rb

@@ -1,6 +1,6 @@
-require File.dirname(__FILE__) + "/common"
+require File.dirname(__FILE__) + '/cond_spec_base'
 
-include Cond
+require 'cond/dsl'
 
 describe "error reporting" do
   it "should raise NoRestartError when restart is not found" do

data/spec/leave_again_spec.rb

@@ -1,6 +1,6 @@
-require File.dirname(__FILE__) + "/common"
+require File.dirname(__FILE__) + '/cond_spec_base'
 
-include Cond
+require 'cond/dsl'
 
 [:handling, :restartable].each { |keyword|
   describe "arguments to 'leave' have semantics of 'return'" do
@@ -36,10 +36,10 @@ include Cond
       send(keyword) do |*args|
         @memo.push :visit
         if @memo.size == 2
-          args.should == []
+          args.should eql([])
           again
         elsif @memo.size == 3
-          args.should == []
+          args.should eql([])
           leave
         end
         again
@@ -49,10 +49,10 @@ include Cond
       send(keyword) do |*args|
         @memo.push :visit
         if @memo.size == 2
-          args.should == [3]
+          args.should eql([3])
           again
         elsif @memo.size == 3
-          args.should == []
+          args.should eql([])
           leave
         end
         again 3
@@ -62,10 +62,10 @@ include Cond
       send(keyword) do |*args|
         @memo.push :visit
         if @memo.size == 2
-          args.should == [4, 5]
+          args.should eql([4, 5])
           again
         elsif @memo.size == 3
-          args.should == []
+          args.should eql([])
           leave
         end
         again 4, 5
@@ -75,10 +75,10 @@ include Cond
       send(keyword) do |*args|
         @memo.push :visit
         if @memo.size == 2
-          args.should == [6, 7]
+          args.should eql([6, 7])
           again
         elsif @memo.size == 3
-          args.should == []
+          args.should eql([])
           leave
         end
         again [6, 7]

data/spec/matching_spec.rb

@@ -1,4 +1,4 @@
-require File.dirname(__FILE__) + "/common"
+require File.dirname(__FILE__) + '/cond_spec_base'
 
 class AnimalError < StandardError ; end
 class BirdError < AnimalError ; end

data/spec/raise_spec.rb

@@ -1,4 +1,4 @@
-require File.dirname(__FILE__) + "/common"
+require File.dirname(__FILE__) + '/cond_spec_base'
 
 describe "raise replacement" do
   it "should raise" do

data/spec/readme_spec.rb

@@ -0,0 +1,10 @@
+require File.dirname(__FILE__) + '/cond_spec_base'
+
+require "jumpstart"
+
+Jumpstart.doc_to_spec(
+  "README.rdoc",
+  "Synopsis",
+  "DSL Form and Raw Form",
+  "Synopsis 2.0"
+)

data/spec/reraise_spec.rb

@@ -1,9 +1,9 @@
-require File.dirname(__FILE__) + "/common"
+require File.dirname(__FILE__) + '/cond_spec_base'
 
 class ReraiseExampleError < Exception
 end
 
-include Cond
+require 'cond/dsl'
 
 describe "re-raise" do
   it "should work work with no arguments" do

data/{examples/restarts_example.rb → spec/restarts_spec.rb}

@@ -1,11 +1,14 @@
-here = File.dirname(__FILE__)
-require here + "/../spec/common"
+require File.dirname(__FILE__) + '/cond_spec_base'
 
-RESTARTS_FILE = here + "/../readmes/restarts.rb"
+require 'jumpstart'
+
+RESTARTS_FILE = File.dirname(__FILE__) + '/../readmes/restarts.rb'
 
 def run_restarts(input_string)
   capture(input_string) {
-    load RESTARTS_FILE
+    Jumpstart::Ruby.no_warnings {
+      load RESTARTS_FILE
+    }
   }
 end
 

data/{examples/seibel_example.rb → spec/seibel_spec.rb}

@@ -1,11 +1,9 @@
-here = File.dirname(__FILE__)
-require here + "/../spec/common"
+require File.dirname(__FILE__) + '/cond_spec_base'
+require 'cond/dsl'
 
-seibel_file = here + "/../readmes/seibel_pcl.rb"
+seibel_file = File.dirname(__FILE__) + "/../readmes/seibel_pcl.rb"
 
-include Cond
-
-if RUBY_VERSION > "1.8.6"
+if RUBY_VERSION >= "1.8.7"
   describe seibel_file do
     it "should run" do
       lambda {