go 1.0.1 → 1.1.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 09ae6d77311c5f0093959d0b0b1701cc7684bda4
-  data.tar.gz: 8a5be4a29e3bdcb3df09c1d2a591a869527a4c80
+  metadata.gz: 5d9a1e19c34020700bd447ec9b86dae9d5553de9
+  data.tar.gz: 751dfbc41b3303002078ea20c8dfbe9b78c68cf0
 SHA512:
-  metadata.gz: 2ec5750139e08493cf506268455bd3908fd0ff3329b3793ef4a456ed3c20b9b8364982bc6f8e40e7dc3490f309d310a46dda11dec18876fae12443ae4ca1d049
-  data.tar.gz: ad7e364559a0c86edbab73a0a1fe48b79c73d4761bab05325dc9493bce7e2d0a1609a0c8144aac36773d08b3a02577584e460f9e859f22ebe9ad69f209eca161
+  metadata.gz: 242ffa4e12d8b0ef1a4ac43909546aefd80b88a19247b587282d230974f66c6ecb69af8961bf40c5ed0afc51cdc766268fcc22cef67b60ee03cfb940287abdbb
+  data.tar.gz: 17673a4ba50edbffe3965408f71865fb88915dac199db4a1efee8c3fb568114825510009647fe07b54b84bbbe12ff9090de5d9c92b39170cc620b19752fb86ac

data/README.md

@@ -92,3 +92,11 @@ You can close the channel with the close() method which will stop all the listen
 ch.close()
 ```
 
+#### Automatically closing the channel after x messages
+
+When making the channel, pass in :close_after parameter:
+
+```ruby
+ch = Go::Channel.new(:close_after=>100)
+```
+

data/lib/go.rb

@@ -2,14 +2,13 @@ require 'logger'
 require 'concur'
 
 require_relative 'go/version'
-require_relative 'go/config'
 require_relative 'go/channel'
 require_relative 'go/kernel'
 
 module Go
   @@logger = Logger.new(STDOUT)
   @@logger.level = Logger::INFO
-  @@config = Config.new
+  @@config = Concur::Config.new
 
   def self.logger
     @@logger

data/lib/go/channel.rb

@@ -1,8 +1,11 @@
 module Go
   class Channel
-    attr_reader :closed
+    attr_reader :closed, :msg_counter
+    attr_accessor :options
 
-    def initialize
+    def initialize(options={})
+      @options = options
+      @msg_counter = 0
       @queue = Queue.new
     end
 
@@ -12,12 +15,14 @@ module Go
 
     def shift
       begin
+        @msg_counter += 1
+        if @options[:close_after] && @msg_counter >= @options[:close_after]
+          close()
+        end
         @queue.shift
       rescue Exception => ex
-        puts ex.class.name
-        p ex
-        puts ex.message
-        if ex.class.name == "fatal" && ex.message.include?("deadlock")
+        Go.logger.debug "#{ex.class.name}: #{ex.message}"
+        if (ex.message.include?("deadlock") || ex.message.include?("Deadlock")) # ruby 2.0 uses Deadlock, capitalized
           close()
           return Go::Exit
         end

data/lib/go/version.rb

@@ -1,3 +1,3 @@
 module Go
-  VERSION = "1.0.1"
+  VERSION = "1.1.0"
 end

data/test/test_go.rb

@@ -8,6 +8,7 @@ class TestGo < Test::Unit::TestCase
 
     Go.config.max_threads = 10
 
+
     3.times do |i|
       go do
         puts "#{i} sleeping..."
@@ -83,6 +84,49 @@ class TestGo < Test::Unit::TestCase
     assert_equal times / errmod, errs
     puts 'donezo'
 
+
+    # Convenience trick with channels
+    ch = Go::Channel.new
+    times = 10
+    errmod = 5
+    times.times do |i|
+      go(ch) do
+        puts "raise? #{i % errmod == 0}"
+        raise "Error yo!" if i % errmod == 0
+        s = "hello channel #{i}"
+        sleep 1
+        s # don't put the return keyword, it doesn't work with threads for some reason, you'll get "unexpected return"
+      end
+    end
+    go do
+      # wait for a bit, then close channel
+      sleep 10
+      ch.close
+    end
+    puts "waiting on channel..."
+    i = 0
+    errs = 0
+    ch.each do |x|
+      puts "Got #{x} from channel"
+      i += 1
+      case x
+        when String
+          puts "Is String"
+        when Exception
+          puts "Is Exception!"
+          errs += 1
+        when nil
+          puts "got nil, breaking"
+          break
+        else
+          puts "Is something else"
+      end
+    end
+    assert_equal times, i
+    assert_equal times / errmod, errs
+    puts 'donezo'
+
+
   end
 
 

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: go
 version: !ruby/object:Gem::Version
-  version: 1.0.1
+  version: 1.1.0
 platform: ruby
 authors:
 - Travis Reeder
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-02-27 00:00:00.000000000 Z
+date: 2013-04-15 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: concur
@@ -52,7 +52,6 @@ files:
 - go.gemspec
 - lib/go.rb
 - lib/go/channel.rb
-- lib/go/config.rb
 - lib/go/kernel.rb
 - lib/go/version.rb
 - test/test_go.rb
@@ -75,7 +74,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: 1.3.6
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.0.0
+rubygems_version: 2.0.3
 signing_key: 
 specification_version: 4
 summary: A concurrency library for Ruby inspired by Go (golang).

data/lib/go/config.rb

@@ -1,36 +0,0 @@
-module Go
-  class Config
-    attr_reader :defaults
-
-    def initialize(options={})
-      init_defaults
-      @listeners = []
-      @max_threads = options[:max_threads] || defaults[:max_threads]
-    end
-
-    def init_defaults
-      @defaults = {
-          max_threads: 20
-      }
-    end
-
-    def max_threads=(x)
-      @max_threads = x
-      notify_listeners(:max_threads=>x)
-    end
-
-    def max_threads
-      @max_threads
-    end
-
-    def add_listener(l)
-      @listeners << l
-    end
-
-    def notify_listeners(changes)
-      @listeners.each do |l|
-        l.update(changes)
-      end
-    end
-  end
-end