strand 0.1.0 → 0.2.0.rc0

data/spec/support/scratch.rb

@@ -0,0 +1,17 @@
+module ScratchPad
+  def self.clear
+    @record = nil
+  end
+
+  def self.record(arg)
+    @record = arg
+  end
+
+  def self.<<(arg)
+    @record << arg
+  end
+
+  def self.recorded
+    @record
+  end
+end

data/spec/thread_spec.rb

@@ -0,0 +1,20 @@
+require 'spec_helper'
+require 'strand/shared'
+
+describe ::Thread do
+
+    let (:strand_type) { ::Thread }
+    let (:strand_exception) { ThreadError }
+
+    around(:each) do |example|
+       ScratchPad.clear
+       example.run
+    end
+
+    it "should not be running in event machine" do
+        Strand.event_machine?.should be_false
+    end
+
+    include_examples Strand
+end
+

data/strand.gemspec

@@ -0,0 +1,23 @@
+# -*- encoding: utf-8 -*-
+lib = File.expand_path('../lib', __FILE__)
+$LOAD_PATH.unshift(lib) unless $LOAD_PATH.include?(lib)
+require 'strand/version'
+
+Gem::Specification.new do |gem|
+  gem.name          = "strand"
+  gem.version       = Strand::VERSION
+  gem.authors       = ["Grant Gardner","Christopher J. Bottaro"]
+  gem.email         = ["grant@lastweekend.com.au", "cjbottaro@alumni.cs.utexas.edu"]
+  gem.description   = %q{Get thread-like behavior from fibers using EventMachine.}
+  gem.summary       = %q{Make fibers behave like threads using EventMachine}
+  gem.homepage      = "http://rubygems.org/gems/strand"
+  gem.files         = `git ls-files`.split($/)
+  gem.test_files    = `git ls-files -- {test,spec}/*`.split($/)
+  gem.require_paths = ["lib"]
+  gem.licenses      = %q{MIT}
+
+  gem.add_development_dependency 'rspec'
+  gem.add_development_dependency 'em-spec'
+  gem.add_development_dependency 'rr'
+  gem.add_development_dependency 'eventmachine', '~> 0.12.0'
+end

metadata

@@ -1,63 +1,52 @@
 --- !ruby/object:Gem::Specification
 name: strand
 version: !ruby/object:Gem::Version
-  version: 0.1.0
-  prerelease: 
+  version: 0.2.0.rc0
+  prerelease: 6
 platform: ruby
 authors:
+- Grant Gardner
 - Christopher J. Bottaro
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2011-08-24 00:00:00.000000000 Z
+date: 2012-12-13 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
-  name: bundler
-  requirement: &70284397102060 !ruby/object:Gem::Requirement
+  name: rspec
+  requirement: !ruby/object:Gem::Requirement
     none: false
     requirements:
-    - - ~>
+    - - ! '>='
       - !ruby/object:Gem::Version
-        version: 1.0.0
+        version: '0'
   type: :development
   prerelease: false
-  version_requirements: *70284397102060
-- !ruby/object:Gem::Dependency
-  name: em-spec
-  requirement: &70284397100280 !ruby/object:Gem::Requirement
+  version_requirements: !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
         version: '0'
-  type: :development
-  prerelease: false
-  version_requirements: *70284397100280
 - !ruby/object:Gem::Dependency
-  name: eventmachine
-  requirement: &70284397098140 !ruby/object:Gem::Requirement
+  name: em-spec
+  requirement: !ruby/object:Gem::Requirement
     none: false
     requirements:
-    - - ~>
+    - - ! '>='
       - !ruby/object:Gem::Version
-        version: 0.12.0
+        version: '0'
   type: :development
   prerelease: false
-  version_requirements: *70284397098140
-- !ruby/object:Gem::Dependency
-  name: jeweler
-  requirement: &70284397153900 !ruby/object:Gem::Requirement
+  version_requirements: !ruby/object:Gem::Requirement
     none: false
     requirements:
-    - - ~>
+    - - ! '>='
       - !ruby/object:Gem::Version
-        version: 1.6.4
-  type: :development
-  prerelease: false
-  version_requirements: *70284397153900
+        version: '0'
 - !ruby/object:Gem::Dependency
-  name: rcov
-  requirement: &70284397151160 !ruby/object:Gem::Requirement
+  name: rr
+  requirement: !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -65,53 +54,81 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *70284397151160
-- !ruby/object:Gem::Dependency
-  name: rr
-  requirement: &70284397150240 !ruby/object:Gem::Requirement
+  version_requirements: !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
         version: '0'
-  type: :development
-  prerelease: false
-  version_requirements: *70284397150240
 - !ruby/object:Gem::Dependency
-  name: rspec
-  requirement: &70284397293200 !ruby/object:Gem::Requirement
+  name: eventmachine
+  requirement: !ruby/object:Gem::Requirement
     none: false
     requirements:
-    - - ! '>='
+    - - ~>
       - !ruby/object:Gem::Version
-        version: '0'
+        version: 0.12.0
   type: :development
   prerelease: false
-  version_requirements: *70284397293200
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ~>
+      - !ruby/object:Gem::Version
+        version: 0.12.0
 description: Get thread-like behavior from fibers using EventMachine.
-email: cjbottaro@alumni.cs.utexas.edu
+email:
+- grant@lastweekend.com.au
+- cjbottaro@alumni.cs.utexas.edu
 executables: []
 extensions: []
-extra_rdoc_files:
-- LICENSE.txt
-- README.rdoc
+extra_rdoc_files: []
 files:
 - .document
+- .gitignore
 - .rspec
+- CHANGELOG
 - Gemfile
-- Gemfile.lock
 - LICENSE.txt
 - README.rdoc
 - Rakefile
 - VERSION
 - lib/strand.rb
 - lib/strand/atc.rb
-- lib/strand/condition_variable.rb
-- spec/condition_variable_spec.rb
+- lib/strand/em/condition_variable.rb
+- lib/strand/em/mutex.rb
+- lib/strand/em/queue.rb
+- lib/strand/em/thread.rb
+- lib/strand/monitor.rb
+- lib/strand/version.rb
 - spec/spec_helper.rb
-- test/helper.rb
-- test/test_strand.rb
-homepage: http://github.com/cjbottaro/strand
+- spec/strand/alive.rb
+- spec/strand/condition_variable.rb
+- spec/strand/condition_variable/broadcast.rb
+- spec/strand/condition_variable/signal.rb
+- spec/strand/condition_variable/wait.rb
+- spec/strand/current.rb
+- spec/strand/exit.rb
+- spec/strand/join.rb
+- spec/strand/local_storage.rb
+- spec/strand/mutex.rb
+- spec/strand/pass.rb
+- spec/strand/queue.rb
+- spec/strand/raise.rb
+- spec/strand/run.rb
+- spec/strand/shared.rb
+- spec/strand/sleep.rb
+- spec/strand/status.rb
+- spec/strand/stop.rb
+- spec/strand/strand.rb
+- spec/strand/value.rb
+- spec/strand/wakeup.rb
+- spec/strand_spec.rb
+- spec/support/fixtures.rb
+- spec/support/scratch.rb
+- spec/thread_spec.rb
+- strand.gemspec
+homepage: http://rubygems.org/gems/strand
 licenses:
 - MIT
 post_install_message: 
@@ -124,19 +141,16 @@ required_ruby_version: !ruby/object:Gem::Requirement
   - - ! '>='
     - !ruby/object:Gem::Version
       version: '0'
-      segments:
-      - 0
-      hash: -933947513672593859
 required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
   requirements:
-  - - ! '>='
+  - - ! '>'
     - !ruby/object:Gem::Version
-      version: '0'
+      version: 1.3.1
 requirements: []
 rubyforge_project: 
-rubygems_version: 1.8.7
+rubygems_version: 1.8.24
 signing_key: 
 specification_version: 3
-summary: Make fibers behave like threads using EventMachine.
+summary: Make fibers behave like threads using EventMachine
 test_files: []

data/Gemfile.lock

@@ -1,40 +0,0 @@
-GEM
-  remote: http://rubygems.org/
-  specs:
-    bacon (1.1.0)
-    diff-lcs (1.1.2)
-    em-spec (0.2.5)
-      bacon
-      eventmachine
-      rspec (~> 2.6.0)
-      test-unit
-    eventmachine (0.12.10)
-    git (1.2.5)
-    jeweler (1.6.4)
-      bundler (~> 1.0)
-      git (>= 1.2.5)
-      rake
-    rake (0.9.2)
-    rcov (0.9.9)
-    rr (1.0.3)
-    rspec (2.6.0)
-      rspec-core (~> 2.6.0)
-      rspec-expectations (~> 2.6.0)
-      rspec-mocks (~> 2.6.0)
-    rspec-core (2.6.4)
-    rspec-expectations (2.6.0)
-      diff-lcs (~> 1.1.2)
-    rspec-mocks (2.6.0)
-    test-unit (2.3.2)
-
-PLATFORMS
-  ruby
-
-DEPENDENCIES
-  bundler (~> 1.0.0)
-  em-spec
-  eventmachine (~> 0.12.0)
-  jeweler (~> 1.6.4)
-  rcov
-  rr
-  rspec

data/lib/strand/condition_variable.rb

@@ -1,78 +0,0 @@
-class Strand
-  # Provides for Strands (Fibers) what Ruby's ConditionVariable provides for Threads.
-  class ConditionVariable
-
-    # Create a new condition variable.
-    def initialize
-      @waiters = []
-    end
-
-    # Wait until signaled.  Returns true upon returning.
-    #   x = nil
-    #   cond = Strand::ConditionVariable.new
-    #   Strand.new{ cond.wait; x = 1; cond.signal }
-    #   puts x # => nil
-    #   cond.signal
-    #   cond.wait # => true
-    #   puts x # => 1
-    # If timeout is a number, then returns false if timed out or true if signaled.
-    #   x = nil
-    #   cond = Strand::ConditionVariable.new
-    #   Strand.new{ cond.wait; x = 1; cond.signal }
-    #   puts x # => nil
-    #   cond.wait(0.01) # => false
-    #   puts x # => nil
-    def wait(timeout = nil)
-      # Get the fiber that called us.
-      fiber = Fiber.current
-
-      # Add the fiber to the list of waiters.
-      @waiters << fiber
-
-      # Setup the timer if they specified a timeout
-      timer = EM::Timer.new(timeout){ fiber.resume(:timeout) } if timeout
-
-      # Wait for signal or timeout.
-      if Fiber.yield == :timeout
-        # Timeout occurred.
-
-        # Remove from list of waiters.
-        @waiters.delete(fiber)
-
-        false
-      else
-        # Ok we were signaled.
-
-        # Cancel the timer if there is one.
-        timer.cancel if timer
-
-        true
-      end
-
-    end
-
-    # Asynchronously resume a fiber waiting on this condition variable.
-    # The waiter is not resumed immediately, but on the next tick of EM's reactor loop.
-    #   cond = Strand::ConditionVariable.new
-    #   Strand.new{ puts 1; cond.wait; puts 2 }
-    #   puts 3
-    #   cond.signal
-    #   puts 4
-    #   # output is...
-    #   1
-    #   3
-    #   4
-    #   2
-    def signal
-      # If there are no waiters, do nothing.
-      return if @waiters.empty?
-
-      # Find a waiter to wake up.
-      waiter = @waiters.shift
-
-      # Resume it on next tick.
-      EM.next_tick{ waiter.resume }
-    end
-
-  end
-end

data/spec/condition_variable_spec.rb

@@ -1,82 +0,0 @@
-require "spec_helper"
-
-describe Strand::ConditionVariable do
-  include EM::SpecHelper
-
-  context "calling #wait" do
-    before(:each) do
-      @cond = described_class.new
-      @atc = Atc.new :timeout => 0.01
-    end
-    it "should block until signaled" do
-      em do
-        Strand.new{ @cond.wait; @atc.signal(1) }
-        @atc.wait(1).should be_false
-        @cond.signal
-        @atc.wait(1).should be_true
-        done
-      end
-    end
-    it "should block until timed out" do
-      em do
-        Strand.new{ @cond.wait(0.02); @atc.signal(1) }
-        @atc.wait(1).should be_false
-        @atc.wait(1).should be_true
-        done
-      end
-    end
-  end
-
-  context "calling #signal" do
-    context "with no waiters" do
-      before(:all){ @cond = described_class.new }
-      it "should not do anything" do
-        @cond.signal.should be_nil
-      end
-    end
-    context "with a single waiter" do
-      before(:all) do
-        @cond = described_class.new
-        @atc = Atc.new :timeout => 0.01
-        Strand.new{ @cond.wait; @atc.signal(1) }
-      end
-      it "should wake up the waiter" do
-        em do
-          @atc.wait(1).should be_false
-          @cond.signal
-          @atc.wait(1).should be_true
-          done
-        end
-      end
-    end
-    context "with multiple waiters" do
-      before(:all) do
-        @cond = described_class.new
-        @atc = Atc.new :timeout => 0.01
-        Strand.new{ @cond.wait; @atc.signal(1) }
-        Strand.new{ @cond.wait; @atc.signal(2) }
-      end
-      it "should wake up the first waiter" do
-        em do
-          @atc.wait(1).should be_false
-          @atc.wait(2).should be_false
-          @cond.signal
-          @atc.wait(1).should be_true
-          @atc.wait(2).should be_false
-          done
-        end
-      end
-      it "then wake up the second waiter" do
-        em do
-          @atc.wait(1).should be_true
-          @atc.wait(2).should be_false
-          @cond.signal
-          @atc.wait(1).should be_true
-          @atc.wait(2).should be_true
-          done
-        end
-      end
-    end
-  end
-
-end