cond 0.2.1 → 0.3.0

data/spec/symbols_spec.rb

@@ -1,4 +1,4 @@
-require File.dirname(__FILE__) + "/common"
+require File.dirname(__FILE__) + '/cond_spec_base'
 
 #
 # Try to demonstrate symbol recycling by calling GC.start on each pass
@@ -21,7 +21,7 @@ describe "generated symbols" do
     histogram = Hash.new { |hash, key| hash[key] = 0 }
 
     300.times { |n|
-      obj = Cond::CondPrivate::CodeSection.new(:foo)
+      obj = Cond::CodeSection.new(:foo)
       leave, again = obj.instance_eval { [@leave, @again] }
       histogram[leave] += 1
       histogram[again] += 1

data/spec/thread_local_spec.rb

@@ -1,10 +1,10 @@
-require File.dirname(__FILE__) + "/common"
+require File.dirname(__FILE__) + '/cond_spec_base'
 
 require 'ostruct'
 
 describe "ThreadLocal" do
   it "should keep independent values in separate threads" do
-    a = Cond::CondPrivate::ThreadLocal.new { OpenStruct.new }
+    a = Cond::ThreadLocal.new { OpenStruct.new }
     a.value.x = 33
     other_value = nil
     Thread.new {
@@ -12,18 +12,18 @@ describe "ThreadLocal" do
       other_value = a.value.x
     }.join
   
-    a.value.x.should == 33
-    other_value.should == 44
+    a.value.x.should eql(33)
+    other_value.should eql(44)
     a.clear { 99 }
-    a.value.should == 99
+    a.value.should eql(99)
   end
   
   it "should work with included accessor_module" do
     a = Class.new {
-      include Cond::CondPrivate::ThreadLocal.accessor_module(:x) { 33 }
+      include Cond::ThreadLocal.accessor_module(:x) { 33 }
     }.new
-    a.x.should == 33
+    a.x.should eql(33)
     a.x = 44
-    a.x.should == 44
+    a.x.should eql(44)
   end
 end

data/spec/wrapping_spec.rb

@@ -1,6 +1,6 @@
-require File.dirname(__FILE__) + "/common"
+require File.dirname(__FILE__) + '/cond_spec_base'
 
-include Cond
+require 'cond/dsl'
 
 describe "singleton method defined in C" do
   before :all do

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: cond
 version: !ruby/object:Gem::Version 
-  version: 0.2.1
+  version: 0.3.0
 platform: ruby
 authors: 
 - James M. Lawrence
@@ -9,65 +9,133 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2009-03-22 00:00:00 -04:00
+date: 2009-09-13 00:00:00 -04:00
 default_executable: 
 dependencies: []
 
-description: +Cond+ allows errors to be handled at the place where they occur. You decide whether or not the stack should be unwound, depending on the circumstance and the error.
-email: quixoticsycophant@gmail.com
+description: Cond allows errors to be handled near the place where they occur, before the stack unwinds.  It offers several advantages over exceptions while peacefully coexisting with the standard exception behavior.
+email: 
+- quixoticsycophant@gmail.com
 executables: []
 
 extensions: []
 
 extra_rdoc_files: 
-- README
+- README.rdoc
 files: 
-- README
-- cond.gemspec
-- ./examples/bad_example.rb
-- ./examples/calc_example.rb
-- ./examples/readme_example.rb
-- ./examples/restarts_example.rb
-- ./examples/seibel_example.rb
-- ./install.rb
-- ./lib/cond/cond_private/defaults.rb
-- ./lib/cond/cond_private/symbol_generator.rb
-- ./lib/cond/cond_private/thread_local.rb
-- ./lib/cond.rb
-- ./readmes/restarts.rb
-- ./readmes/seibel_pcl.rb
-- ./spec/basic_spec.rb
-- ./spec/common.rb
-- ./spec/error_spec.rb
-- ./spec/leave_again_spec.rb
-- ./spec/matching_spec.rb
-- ./spec/raise_spec.rb
-- ./spec/reraise_spec.rb
-- ./spec/specs_spec.rb
-- ./spec/symbols_spec.rb
-- ./spec/thread_local_spec.rb
-- ./spec/wrapping_spec.rb
-- ./support/quix/ruby.rb
-- ./support/quix/simple_installer.rb
-- ./Rakefile
+- CHANGES.rdoc
+- README.rdoc
+- Rakefile
+- devel/jumpstart.rb
+- install.rb
+- lib/cond.rb
+- lib/cond/code_section.rb
+- lib/cond/cond.rb
+- lib/cond/defaults.rb
+- lib/cond/dsl.rb
+- lib/cond/dsl_definition.rb
+- lib/cond/error.rb
+- lib/cond/handler.rb
+- lib/cond/handling_section.rb
+- lib/cond/kernel_raise.rb
+- lib/cond/message_proc.rb
+- lib/cond/restart.rb
+- lib/cond/restartable_section.rb
+- lib/cond/symbol_generator.rb
+- lib/cond/thread_local.rb
+- lib/cond/wrapping.rb
+- readmes/restarts.rb
+- readmes/seibel_pcl.rb
+- spec/bad_spec.rb
+- spec/basic_spec.rb
+- spec/calc_spec.rb
+- spec/cond_spec_base.rb
+- spec/error_spec.rb
+- spec/leave_again_spec.rb
+- spec/matching_spec.rb
+- spec/raise_spec.rb
+- spec/readme_spec.rb
+- spec/reraise_spec.rb
+- spec/restarts_spec.rb
+- spec/seibel_spec.rb
+- spec/symbols_spec.rb
+- spec/thread_local_spec.rb
+- spec/wrapping_spec.rb
+- MANIFEST
 has_rdoc: true
-homepage: cond.rubyforge.org
+homepage: http://cond.rubyforge.org
+licenses: []
+
 post_install_message: 
 rdoc_options: 
 - --main
-- README
+- README.rdoc
 - --title
 - "cond: Resolve errors without unwinding the stack."
 - --exclude
-- spec
+- CHANGES.rdoc
+- --exclude
+- README.rdoc
+- --exclude
+- Rakefile
+- --exclude
+- devel/jumpstart.rb
+- --exclude
+- install.rb
+- --exclude
+- lib/cond.rb
+- --exclude
+- lib/cond/code_section.rb
+- --exclude
+- lib/cond/defaults.rb
+- --exclude
+- lib/cond/dsl.rb
+- --exclude
+- lib/cond/handling_section.rb
+- --exclude
+- lib/cond/kernel_raise.rb
+- --exclude
+- lib/cond/restartable_section.rb
+- --exclude
+- lib/cond/symbol_generator.rb
+- --exclude
+- lib/cond/thread_local.rb
+- --exclude
+- readmes/restarts.rb
+- --exclude
+- readmes/seibel_pcl.rb
+- --exclude
+- spec/bad_spec.rb
+- --exclude
+- spec/basic_spec.rb
+- --exclude
+- spec/calc_spec.rb
+- --exclude
+- spec/cond_spec_base.rb
+- --exclude
+- spec/error_spec.rb
+- --exclude
+- spec/leave_again_spec.rb
+- --exclude
+- spec/matching_spec.rb
+- --exclude
+- spec/raise_spec.rb
+- --exclude
+- spec/readme_spec.rb
+- --exclude
+- spec/reraise_spec.rb
+- --exclude
+- spec/restarts_spec.rb
+- --exclude
+- spec/seibel_spec.rb
 - --exclude
-- examples
+- spec/symbols_spec.rb
 - --exclude
-- readmes
+- spec/thread_local_spec.rb
 - --exclude
-- support
+- spec/wrapping_spec.rb
 - --exclude
-- lib/cond/cond_private
+- MANIFEST
 require_paths: 
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement 
@@ -85,9 +153,9 @@ required_rubygems_version: !ruby/object:Gem::Requirement
 requirements: []
 
 rubyforge_project: cond
-rubygems_version: 1.3.1
+rubygems_version: 1.3.5
 signing_key: 
-specification_version: 2
+specification_version: 3
 summary: Resolve errors without unwinding the stack.
 test_files: []
 

data/cond.gemspec

@@ -1,37 +0,0 @@
-
-Gem::Specification.new { |t|
-  t.author = "James M. Lawrence"
-  t.email = "quixoticsycophant@gmail.com"
-  t.summary = "Resolve errors without unwinding the stack."
-  t.name = "cond"
-  t.rubyforge_project = t.name
-  t.homepage = "#{t.name}.rubyforge.org"
-  t.version = "0.2.1"
-  t.description = <<-EOS
-    +Cond+ allows errors to be handled at the place where they occur.
-    You decide whether or not the stack should be unwound, depending on
-    the circumstance and the error.
-  EOS
-  t.files = (
-    %W[README #{t.name}.gemspec] +
-    Dir["./**/*.rb"] +
-    Dir["./**/Rakefile"]
-  )
-  rdoc_exclude = %w[
-    spec
-    examples
-    readmes
-    support
-    lib/cond/cond_private
-  ]
-  t.has_rdoc = true
-  t.extra_rdoc_files = %w[README]
-  t.rdoc_options += [
-    "--main",
-    "README",
-    "--title",
-    "#{t.name}: #{t.summary}",
-  ] + rdoc_exclude.inject(Array.new) { |acc, pattern|
-    acc + ["--exclude", pattern]
-  }
-}

data/examples/readme_example.rb

@@ -1,27 +0,0 @@
-require File.dirname(__FILE__) + "/../spec/common"
-
-require 'quix/ruby'
-
-root = Pathname(__FILE__).dirname + ".."
-file = root + "README"
-lib = root + "lib"
-
-describe file do
-  ["Synopsis",
-   "Raw Form",
-   "Synopsis 2.0",
-  ].each { |section|
-    it "#{section} should run as claimed" do
-      contents = file.read
-
-      code = %{
-        $LOAD_PATH.unshift "#{lib.expand_path}"
-        require 'cond'
-        include Cond
-      } + contents.match(%r!== #{section}.*?\n(.*?)^\S!m)[1]
-
-      expected = code.scan(%r!\# => (.*?)\n!).flatten.join("\n")
-      pipe_to_ruby(code).chomp.should == expected
-    end
-  }
-end

data/lib/cond/cond_private/defaults.rb

@@ -1,78 +0,0 @@
-
-require 'cond/cond_private/symbol_generator'
-require 'enumerator' if RUBY_VERSION <= "1.8.6"
-
-module Cond
-  module CondPrivate
-    class Defaults
-      def initialize
-        @stream_in = STDIN
-        @stream_out = STDERR
-      end
-
-      attr_accessor :stream_in, :stream_out
-      
-      def handlers
-        {
-          Exception => method(:handler)
-        }
-      end
-
-      def handler(exception)
-        stream_out.puts exception.backtrace.last
-
-        if exception.respond_to? :message
-          stream_out.puts exception.message, ""
-        end
-          
-        #
-        # Show restarts in the order they appear on the stack (via
-        # partial differences).
-        #
-        # grr:
-        #
-        #   % ruby186 -ve 'p({:x => 33}.eql?({:x => 33}))'
-        #   ruby 1.8.6 (2009-03-10 patchlevel 362) [i686-darwin9.6.0]
-        #   false
-        #
-        #   % ruby187 -ve 'p({:x => 33}.eql?({:x => 33}))'
-        #   ruby 1.8.7 (2009-03-09 patchlevel 150) [i686-darwin9.6.0]
-        #   true
-        #
-        stack_arrays = Cond.restarts_stack.map { |level|
-          level.to_a.sort_by { |t| t.first.to_s }
-        }
-        restart_names = stack_arrays.to_enum(:each_with_index).map {
-          |level, index|
-          if index == 0
-            level
-          else
-            level - stack_arrays[index - 1]
-          end
-        }.map { |level| level.map { |t| t.first } }.flatten
-
-        restart_index = loop {
-          restart_names.each_with_index { |name, index|
-            func = Cond.available_restarts[name]
-            message = (
-              if func.respond_to?(:message) and func.message != ""
-                func.message + " "
-              else
-                ""
-              end
-            )
-            stream_out.printf("%3d: %s(%s)\n", index, message, name.inspect)
-          }
-          stream_out.print "Choose number: "
-          stream_out.flush
-          input = stream_in.readline.strip
-          if input =~ %r!\A\d+\Z! and
-              (0...restart_names.size).include?(input.to_i)
-            break input.to_i
-          end
-        }
-        Cond.invoke_restart(restart_names[restart_index])
-      end
-    end
-  end
-end

data/lib/cond/cond_private/symbol_generator.rb

@@ -1,45 +0,0 @@
-
-require 'thread'
-
-module Cond
-  module CondPrivate
-    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.dup
-            ObjectSpace.define_finalizer(object, @finalizer)
-          }
-        end
-      end
-      
-      define_method :gensym, &method(:gensym)
-      private :gensym
-    end
-  end
-end