workaholic 0.0.0 → 0.0.1

data/README.rdoc

@@ -13,7 +13,7 @@ Parallel job runner.
    def run;        @count += 1 end
  end
  
- worker = Workaholic::Worker.new
+ worker = Workaholic.new
  job    = TestJob.new
  
  worker.start 100 do # 100 threads

data/VERSION

@@ -1 +1 @@
-0.0.0
+0.0.1

data/lib/workaholic.rb

@@ -1,6 +1,6 @@
 require 'workaholic/job'
 require 'workaholic/worker'
 
-module Workaholic
+class Workaholic
 
 end

data/lib/workaholic/job.rb

@@ -1,4 +1,4 @@
-module Workaholic
+class Workaholic
   class Job
     def run
       # override me

data/lib/workaholic/worker.rb

@@ -1,60 +1,72 @@
 require 'thread'
 
-module Workaholic
+class Workaholic
   class RunningError < StandardError; end
-  class Worker
-    attr_reader :queue
-    attr_reader :state
-
-    def initialize
-      @queue = Queue.new
-      @state = :stopped
-      @threads ||= []
-    end
+  attr_reader :queue
+  attr_reader :state
+  attr_reader :running
+
+  def initialize
+    @queue = Queue.new
+    @state = :stopped
+    @threads ||= []
+    @running = 0
+  end
 
-    def start( thread_count = 2 )
-      raise RunningError unless state == :stopped
+  def start( thread_count = 2 )
+    raise RunningError unless state == :stopped
 
-      @state = :running
-      thread_count.times do |i|
-        t = Thread.start do
-          while [:running, :stopping].include? @state
+    @state = :running
+    thread_count.times do |i|
+      t = Thread.start do
+        while [:running, :stopping].include? @state
+          begin
+            @running += 1
             run @queue.pop( true )
-            sleep 0.016
-            break if @state == :stopping
+          rescue ThreadError # when queue is empty
+          rescue
+            puts $!
+            puts caller.join("\n")
+          ensure
+            @running -= 1
           end
+          sleep 0.016
+          break if @state == :stopping
         end
-        @threads.push t
-      end
-
-      if block_given?
-        yield self
-        sleep 0.1 while queue.size > 0
-        stop
       end
+      @threads.push t
     end
 
-    def stop
-      @state = :stopping
-      while !@threads.select{ |t| t.alive? }.empty?
-        sleep 1
-      end
-      @state = :stopped
-      @threads = []
+    if block_given?
+      yield self
+      sleep 0.1 while queue.size > 0
+      stop
     end
+  end
 
-    def run( job )
-      begin
-        job.run
-      rescue ThreadError # when queue is empty
-        sleep 0.1
-      rescue e
-        raise e
-      end
+  def running?
+    @queue.size > 0 || @running > 0
+  end
+
+  def stop
+    @state = :stopping
+    while !@threads.select{ |t| t.alive? }.empty?
+      sleep 1
     end
+    @state = :stopped
+    @threads = []
+  end
 
-    def push( job )
-      @queue.push job
+  def run( job )
+    begin
+      job.run
+    rescue
+      puts $!
+      puts caller.join("\n")
     end
   end
+
+  def push( job )
+    @queue.push job
+  end
 end

data/spec/workaholic/worker_spec.rb

@@ -1,7 +1,7 @@
 require File.expand_path(File.dirname(__FILE__) + '/../spec_helper')
 
 describe Workaholic do
-  let(:worker) { Workaholic::Worker.new }
+  let(:worker) { Workaholic.new }
 
   describe '#start' do
     subject { worker.start( 1 ) }

data/spec/workaholic_spec.rb

@@ -13,7 +13,7 @@ class TestJob < Workaholic::Job
 end
 
 describe Workaholic do
-  let(:worker) { Workaholic::Worker.new }
+  let(:worker) { Workaholic.new }
   let(:job1) { TestJob.new }
   let(:job2) { TestJob.new }
 

data/workaholic.gemspec

@@ -5,7 +5,7 @@
 
 Gem::Specification.new do |s|
   s.name = "workaholic"
-  s.version = "0.0.0"
+  s.version = "0.0.1"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["mewlist"]

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: workaholic
 version: !ruby/object:Gem::Version
-  version: 0.0.0
+  version: 0.0.1
   prerelease: 
 platform: ruby
 authors:
@@ -13,7 +13,7 @@ date: 2012-05-15 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rspec
-  requirement: &70164952939080 !ruby/object:Gem::Requirement
+  requirement: &70245403917700 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -21,10 +21,10 @@ dependencies:
         version: 2.8.0
   type: :development
   prerelease: false
-  version_requirements: *70164952939080
+  version_requirements: *70245403917700
 - !ruby/object:Gem::Dependency
   name: yard
-  requirement: &70164952938000 !ruby/object:Gem::Requirement
+  requirement: &70245403916960 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -32,10 +32,10 @@ dependencies:
         version: '0.7'
   type: :development
   prerelease: false
-  version_requirements: *70164952938000
+  version_requirements: *70245403916960
 - !ruby/object:Gem::Dependency
   name: rdoc
-  requirement: &70164952936080 !ruby/object:Gem::Requirement
+  requirement: &70245403916260 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -43,10 +43,10 @@ dependencies:
         version: '3.12'
   type: :development
   prerelease: false
-  version_requirements: *70164952936080
+  version_requirements: *70245403916260
 - !ruby/object:Gem::Dependency
   name: bundler
-  requirement: &70164952847480 !ruby/object:Gem::Requirement
+  requirement: &70245403915400 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -54,10 +54,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *70164952847480
+  version_requirements: *70245403915400
 - !ruby/object:Gem::Dependency
   name: jeweler
-  requirement: &70164952846900 !ruby/object:Gem::Requirement
+  requirement: &70245403914520 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -65,10 +65,10 @@ dependencies:
         version: 1.8.3
   type: :development
   prerelease: false
-  version_requirements: *70164952846900
+  version_requirements: *70245403914520
 - !ruby/object:Gem::Dependency
   name: simplecov
-  requirement: &70164952846080 !ruby/object:Gem::Requirement
+  requirement: &70245403908180 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -76,7 +76,7 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *70164952846080
+  version_requirements: *70245403908180
 description: Parallel job runner
 email: mewlist@mewlist.com
 executables: []
@@ -116,7 +116,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: -4376389024857191322
+      hash: 3261985381907931287
 required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
   requirements: