futuroscope 0.0.10 → 0.0.12

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 60ea73929c330082898296c2512037998d2b9ad3
-  data.tar.gz: 8886af488ab4d89dedac2e96488bd89f3e5bfd3c
+  metadata.gz: a1442fb21074e3f1f22aedd46da1880d581436dd
+  data.tar.gz: 47f91c0266f4d75c1c7dafe868deb522f7a60d2a
 SHA512:
-  metadata.gz: fdcd4ef68d0fd26892f76e7f0f6ea0ac451569beac1eff44d697205f82837d5b642a25c4b26fbdea4fbc6565fb181d5bf32966e206482559c3623f8346868b9c
-  data.tar.gz: dda945e88fc5f37816ab99a8882cc042c24c92e709e613a7b51957d8341e14a9fca65cc43a18ab278cc3c4765ceedf48386e192d5bfae7d4cf7e87142a83772f
+  metadata.gz: 64bf9683083deac9fdc9836f4278b8537420cf96cf947720f478708db5dcb6cddac58a33d9602d9dd03e4eb3cf6ce9622ea113e0ef6d1f9c615dc412bf9b57ca
+  data.tar.gz: e5ce587bee8e52b1a306bc1f8292ccec39c06e2f8df60264652e0c64b4612b02ddf703b621021fe53d2c033fd43eb9cd2363a01861e63868b2a71211e1a89c87

data/lib/futuroscope/future.rb

@@ -23,20 +23,17 @@ module Futuroscope
     #
     # Returns a Future
     def initialize(pool = Futuroscope.default_pool, &block)
-      @mutex = Mutex.new
-      @queue = Queue.new
+      @queue = SizedQueue.new(1)
       @pool = pool
       @block = block
       @pool.queue self
     end
 
+    # Semipublic: Forces this future to be run.
     def run_future
-      begin
-        @future_value = @block.call
-      rescue Exception => e
-        @exception = e
-      end
-      @queue.push :ok
+      @queue.push(:value => @block.call)
+    rescue Exception => e
+      @queue.push(:exception => e)
     end
 
     # Semipublic: Returns the future's value. Will wait for the future to be 
@@ -44,12 +41,10 @@ module Futuroscope
     #
     # Returns the Future's block execution result.
     def future_value
-      @mutex.synchronize do
-        begin
-          raise @exception if @exception
-          return @future_value if defined?(@future_value)
-        end while @queue.pop
-      end
+      resolved = resolved_future_value
+
+      raise resolved[:exception] if resolved[:exception]
+      resolved[:value]
     end
 
     def_delegators :future_value, 
@@ -58,6 +53,10 @@ module Futuroscope
 
     private
 
+    def resolved_future_value
+      @resolved_future ||= @queue.pop
+    end
+
     def method_missing(method, *args)
       future_value.send(method, *args)
     end

data/lib/futuroscope/pool.rb

@@ -68,7 +68,12 @@ module Futuroscope
     end
 
     def can_spin_extra_workers?
-      @workers.length < @max_workers
+      @workers.length < @max_workers && span_chance
+    end
+
+    def span_chance
+      values = [true, false]
+      values.respond_to?(:sample) ? values.sample : values.choice
     end
 
     def more_workers_than_needed?

data/lib/futuroscope/version.rb

@@ -1,3 +1,3 @@
 module Futuroscope
-  VERSION = "0.0.10"
+  VERSION = "0.0.12"
 end

data/lib/futuroscope/worker.rb

@@ -19,13 +19,19 @@ module Futuroscope
         while(future = @pool.pop) do
           future.run_future
         end
-        stop
+        die
       end
     end
 
+    # Public: Stops this worker.
+    def stop
+      @thread.kill
+      die
+    end
+
     private
 
-    def stop
+    def die
       @pool.worker_died(self)
     end
   end

data/spec/futuroscope/pool_spec.rb

@@ -25,6 +25,7 @@ module Futuroscope
     describe "worker control" do
       it "adds more workers when needed and returns to the default amount" do
         pool = Pool.new(2, 8)
+        pool.stub(:span_chance).and_return true
         10.times do |future|
           Future.new(pool){ sleep(1) }
         end
@@ -44,6 +45,7 @@ module Futuroscope
 
       it "allows overriding max workers real time" do
         pool = Pool.new(2, 8)
+        pool.stub(:span_chance).and_return true
         pool.max_workers = 4
 
         10.times do |future|
@@ -54,5 +56,24 @@ module Futuroscope
         expect(pool.workers).to have(4).workers
       end
     end
+
+    describe "#finalize" do
+      it "shuts down all its workers" do
+        pool = Pool.new(2, 8)
+
+        pool.send(:finalize)
+        
+        expect(pool.workers).to have(0).workers
+      end
+    end
+
+    describe "#span_chance" do
+      it "returns true or false randomly" do
+        pool = Pool.new
+        chance = pool.send(:span_chance)
+
+        expect([true, false]).to include(chance)
+      end
+    end
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: futuroscope
 version: !ruby/object:Gem::Version
-  version: 0.0.10
+  version: 0.0.12
 platform: ruby
 authors:
 - Josep Jaume Rey Peroy
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-05-05 00:00:00.000000000 Z
+date: 2013-05-06 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -119,7 +119,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.0.2
+rubygems_version: 2.0.3
 signing_key: 
 specification_version: 4
 summary: Futuroscope is yet another simple gem that implements the Futures concurrency