agent 0.11.0 → 0.12.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: cb98d2b1912834ca7a296fb6dd1895c90c62d371
-  data.tar.gz: ea72c26e2be6e8bbd7ef710a2a2a87e0ef8141c6
+  metadata.gz: 49fb01139596ed5444f28e53516a1567faa9ff2c
+  data.tar.gz: 74fdbf57532666cf21f26ed158d956a8a8bdfabf
 SHA512:
-  metadata.gz: c3bcd58b2138db30b0c1f732673b7b9654f90b26358cf89c480efab7aa7ef8e9b5ae876949d726f64c93459cd8b995b35ff5202bf2665be23656632340b64094
-  data.tar.gz: 30116a292e6d8e36894b2da56638bda87a817be19355f4c7ffe0d70a243d3a11c9cc13e913705c4eec067f3a95c75badd62b42279c469874764adef23e20097e
+  metadata.gz: 5dd1e17dba7f99429440b138012251937059c4abfa2534b9302980ad97edb044e34dfc00a7910717c5f5b109a5e1073d3e549d14deec2943f5cb2955397524c2
+  data.tar.gz: b164a7c641eddd088cdeb970f5bd319831cdfff523e377f4da99edc5e6ea54cd3ca4cd09d11ef2a93d3c2b877a7aa94efb966bab22224abf759a93dd6ffa13f0

data/.travis.yml

@@ -1,16 +1,22 @@
+sudo: false  # to run on the new travis container infrastructure
 language: ruby
+addons:
+  apt:
+  packages:
+    - idn
+    - build-essential  # this and following ensure rubinius is setup ok
+    - bison
+    - ruby-dev
+    - rake
+    - lib1g-dev
+    - libyaml-dev
+    - libssl-dev
+    - libreadline-dev
+    - libncurses5-dev
+    - llvm
+    - llvm-dev
+    - libeditline-dev
+    - libedit-dev
 rvm:
-  - 1.8.7
-  - ree
-  - 1.9.2
-  - 1.9.3
-  - 2.0
-  - 2.1
-  - 2.2
-  - ruby-head
-  - jruby-18mode
-  - jruby-19mode
-  - jruby-head
-  - rbx-2.2
-  - rbx-2.4
-
+  - 2.3.1
+  - jruby

data/Gemfile.lock

@@ -1,26 +1,26 @@
 PATH
   remote: .
   specs:
-    agent (0.10.0)
+    agent (0.11.0)
 
 GEM
   remote: http://rubygems.org/
   specs:
     diff-lcs (1.2.5)
-    rake (10.4.2)
-    rspec (3.2.0)
-      rspec-core (~> 3.2.0)
-      rspec-expectations (~> 3.2.0)
-      rspec-mocks (~> 3.2.0)
-    rspec-core (3.2.0)
-      rspec-support (~> 3.2.0)
-    rspec-expectations (3.2.0)
+    rake (11.2.2)
+    rspec (3.5.0)
+      rspec-core (~> 3.5.0)
+      rspec-expectations (~> 3.5.0)
+      rspec-mocks (~> 3.5.0)
+    rspec-core (3.5.3)
+      rspec-support (~> 3.5.0)
+    rspec-expectations (3.5.0)
       diff-lcs (>= 1.2.0, < 2.0)
-      rspec-support (~> 3.2.0)
-    rspec-mocks (3.2.0)
+      rspec-support (~> 3.5.0)
+    rspec-mocks (3.5.0)
       diff-lcs (>= 1.2.0, < 2.0)
-      rspec-support (~> 3.2.0)
-    rspec-support (3.2.1)
+      rspec-support (~> 3.5.0)
+    rspec-support (3.5.0)
 
 PLATFORMS
   java
@@ -30,3 +30,6 @@ DEPENDENCIES
   agent!
   rake
   rspec
+
+BUNDLED WITH
+   1.12.5

data/lib/agent/channel.rb

@@ -26,7 +26,6 @@ module Agent
       @queue        = Queues.register(@name, @type, @max)
     end
 
-
     # Serialization methods
 
     def marshal_load(ary)
@@ -45,8 +44,8 @@ module Agent
 
     def send(object, options={})
       check_direction(:send)
-      q = queue
-      raise Errors::ChannelClosed unless q
+      raise Errors::ChannelClosed if @closed
+      q = @queue
       q.push(object, {:skip_marshal => @skip_marshal}.merge(options))
     end
     alias :push :send
@@ -55,23 +54,18 @@ module Agent
     def push?; queue.push?; end
     alias :send? :push?
 
-
     # Receiving methods
 
     def receive(options={})
       check_direction(:receive)
       q = queue
-      return q.pop(options) if q
-      pop = Pop.new(options)
-      pop.close
-      [pop.object, false]
+      return q.pop(options)
     end
     alias :pop  :receive
 
     def pop?; queue.pop?; end
     alias :receive? :pop?
 
-
     # Closing methods
 
     def close
@@ -79,7 +73,6 @@ module Agent
         raise Errors::ChannelClosed if @closed
         @closed = true
         @queue.close
-        @queue = nil
         Queues.delete(@name)
       end
     end
@@ -101,7 +94,6 @@ module Agent
       as_direction_only(:receive)
     end
 
-
   private
 
     def as_direction_only(direction)

data/lib/agent/pop.rb

@@ -28,7 +28,8 @@ module Agent
         until @received || @closed
           @cvar.wait(@mutex)
         end
-        return received?
+        return false if @closed
+        received?
       end
     end
 

data/lib/agent/queue.rb

@@ -1,10 +1,20 @@
+require "forwardable"
+
 require "agent/queue/buffered"
 require "agent/queue/unbuffered"
 require "agent/errors"
 
 module Agent
   class Queue
-    attr_reader :type, :queue, :operations, :pushes, :pops, :mutex
+    extend Forwardable
+    attr_reader :type, :operations
+
+    # protected attributes
+    attr_reader :mutex, :queue, :pops, :pushes
+    protected :mutex, :queue, :pops, :pushes
+
+    # size is the queue size
+    def_delegators :@queue, :size
 
     def initialize(type)
       @type = type
@@ -47,12 +57,8 @@ module Agent
     def close
       mutex.synchronize do
         raise Errors::ChannelClosed if @closed
-        @closed = true
         @operations.each{|o| o.close }
-        @operations.clear
-        @queue.clear
-        @pushes.clear
-        @pops.clear
+        @closed = true
 
         reset_custom_state
       end
@@ -82,7 +88,7 @@ module Agent
       pop = Pop.new(options)
 
       mutex.synchronize do
-        pop.close if @closed
+        pop.close if @closed and queue.size == 0
         operations << pop
         pops << pop
         process

data/lib/agent/queue/buffered.rb

@@ -31,9 +31,11 @@ module Agent
         loop do
           if operation.is_a?(Push)
             if push?
-              operation.receive do |obj|
-                @size += 1
-                queue.push(obj)
+              unless operation.closed?
+                operation.receive do |obj|
+                  @size += 1
+                  queue.push(obj)
+                end
               end
               operations.delete(operation)
               pushes.delete(operation)

data/lib/agent/version.rb

@@ -1,3 +1,3 @@
 module Agent
-  VERSION = "0.11.0"
+  VERSION = "0.12.0"
 end

data/spec/channel_spec.rb

@@ -79,7 +79,7 @@ describe Agent::Channel do
 
   context "closing" do
     before do
-      @c = channel!(String)
+      @c = channel!(Integer, 3)
     end
 
     it "not raise an error the first time it is called" do
@@ -113,6 +113,16 @@ describe Agent::Channel do
       @c.close
       expect(@c.receive).to eq([nil, false])
     end
+
+    it "should return buffered items from a closed channel" do
+      @c << 1
+      @c << 2
+      @c.close
+      expect(@c.receive).to eq([1, true])
+      expect(@c.receive).to eq([2, true])
+      expect(@c.receive).to eq([nil, false])
+      expect(@c.receive).to eq([nil, false])
+    end
   end
 
   context "deadlock" do

data/spec/pop_spec.rb

@@ -28,7 +28,7 @@ describe Agent::Pop do
 
       s, _ = @ack.receive
 
-      expect(Time.now - s).to be_within(0.01).of(0)
+      expect(Time.now - s).to be_within(0.2).of(0)
     end
 
     it "should continue when closed" do
@@ -38,7 +38,7 @@ describe Agent::Pop do
 
       s, _ = @ack.receive
 
-      expect(Time.now - s).to be_within(0.01).of(0)
+      expect(Time.now - s).to be_within(0.2).of(0)
     end
 
     it "should be able to be gracefully rolled back" do
@@ -56,7 +56,7 @@ describe Agent::Pop do
 
       s, _ = @ack.receive
 
-      expect(Time.now - s).to be_within(0.01).of(0.2)
+      expect(Time.now - s).to be_within(0.05).of(0.2)
     end
   end
 

data/spec/queue_spec.rb

@@ -2,7 +2,7 @@ require "spec_helper"
 
 describe Agent::Queue do
 
-  context "with an buffered queue" do
+  context "with a buffered queue" do
     before do
       @queue = Agent::Queue::Buffered.new(String, 2)
     end
@@ -20,7 +20,7 @@ describe Agent::Queue do
       expect{ Agent::Queue::Buffered.new(String, -1) }.to raise_error(Agent::Errors::InvalidQueueSize)
     end
 
-    it "should raise an erro when an object of an invalid type is pushed" do
+    it "should raise an error when an object of an invalid type is pushed" do
       expect { @queue.push(1) }.to raise_error(Agent::Errors::InvalidType)
     end
 
@@ -144,22 +144,8 @@ describe Agent::Queue do
         expect(@push3).to be_closed
       end
 
-      it "should clear all waiting operations" do
-        expect(@queue.operations.size).to   eq(1)
-        expect(@queue.pushes.size).to eq(1)
-        @queue.close
-        expect(@queue.operations.size).to eq(0)
-        expect(@queue.pushes.size).to eq(0)
-      end
-
-      it "should clear all elements at rest" do
-        expect(@queue.queue.size).to eq(2)
-        @queue.close
-        expect(@queue.queue.size).to eq(0)
-      end
-
       context "after it is closed" do
-        before{ @queue.close }
+        before(:example) { @queue.close }
 
         it "should raise an error when #close is called again" do
           expect{ @queue.close }.to raise_error(Agent::Errors::ChannelClosed)
@@ -169,7 +155,9 @@ describe Agent::Queue do
           expect{ @queue.push("1") }.to raise_error(Agent::Errors::ChannelClosed)
         end
 
-        it "should return [nil, false] when popping from the queue" do
+        it "should return the buffered items when popping from the queue" do
+          2.times { expect(@queue.pop).to eq(["1", true]) }
+          expect(@queue.pop).to eq([nil, false])
           expect(@queue.pop).to eq([nil, false])
         end
       end
@@ -323,14 +311,6 @@ describe Agent::Queue do
         expect(@push2).to be_closed
       end
 
-      it "should clear all waiting operations" do
-        expect(@queue.operations.size).to   eq(2)
-        expect(@queue.pushes.size).to eq(2)
-        @queue.close
-        expect(@queue.operations.size).to eq(0)
-        expect(@queue.pushes.size).to eq(0)
-      end
-
       context "after it is closed" do
         before{ @queue.close }
 

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: agent
 version: !ruby/object:Gem::Version
-  version: 0.11.0
+  version: 0.12.0
 platform: ruby
 authors:
 - Ilya Grigorik
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-03-10 00:00:00.000000000 Z
+date: 2016-09-21 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rake
@@ -120,7 +120,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: agent
-rubygems_version: 2.2.2
+rubygems_version: 2.5.1
 signing_key: 
 specification_version: 4
 summary: Agent is a diverse family of related approaches for modelling concurrent
@@ -145,3 +145,4 @@ test_files:
 - spec/spec_helper.rb
 - spec/uuid_spec.rb
 - spec/wait_group_spec.rb
+has_rdoc: