silent_worker 0.1.1 → 0.2.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 80d7a8fb43c309b68d209965410868524c497689
-  data.tar.gz: c3ba3f235cd1afe51e3c857b56b7268a26c7a614
+  metadata.gz: 73bc5d82b300cd804ce3001b57f386755d868ca7
+  data.tar.gz: 2cc6e8bbf5c0cd9e7415a5a9bbff7386ead2a754
 SHA512:
-  metadata.gz: 9f84945e8e958909e5eb92c80ef343812cd43a196c94813eaf91f428e04698f83bfcbce4fee8d87e813115097b9783cbd32291000908812aafd249ec58d428ee
-  data.tar.gz: 09e195ebf3cfd72d7eb6f2cd3dc2449746944a63fe942d35f500f8cc214aec613635a5ffa1a2d37db8150953da1238d90d1c913352773d882d6f1c90e3774b8b
+  metadata.gz: 41a03163ed2afd3e83c7906ffa57dd631c0486e2b548b86c21691e404d7afcb840bc4ab318ceafff59fc62e013de54531b8ac50e39e8a9f2a4e5e5320ba87d96
+  data.tar.gz: f9d1b47f994058f7d6a0c3518ec59c992c3b8781dd76c7d5ff563adc7c7c4626b39c52992d475a1cb1b8c203a518fd59ab367117070c11f83012ff8a99d28c74

data/.travis.yml

@@ -2,4 +2,4 @@ language: ruby
 rvm:
   - 1.9.3
   - 2.0.0
-script: "bundle exec rspec -f d -c"
+script: "TRAVIS_CI=true bundle exec rspec -f d -c"

data/README.md

@@ -57,12 +57,12 @@ sw = SilentWorker.new(parallel) do |url|
   system("wget", url)
 end
 
-File.open('url_list.txt') do |f|
-  sw << f.gets.strip
+File.open('url_list.txt').each_line do |line|
+  sw << line.strip
 end
 
-File.open('url_list2.txt') do |f|
-  sw << f.gets.strip
+File.open('url_list2.txt').each_line do |line|
+  sw << line.strip
 end
 
 sw.wait

data/lib/silent_worker.rb

@@ -11,35 +11,39 @@ class SilentWorker
     @workers = workers
     @threads = []
     @queue = Queue.new
+    setup_signal_traps
     start
   end
 
   def <<(data)
-    @queue.push(data)
+    @queue.enq(data)
   end
 
   def wait
     finish!
-    @workers.times do
-      @queue.push(FINISH_DATA)
-    end
-    @threads.each(&:join)
+    @threads.find_all(&:alive?).each(&:join)
   end
 
   def abort
     @threads.each(&:kill)
     wait
   end
+  alias :stop! :abort
 
   def stop
-    wait
+    finish!
   end
 
   def start
-    @workers.times do
-      @threads << Thread.start(@job, @queue) do |job, queue|
+    return if @working
+
+    @working = true
+    @finished = false
+    @workers.times do |n|
+      @threads << Thread.start(@job, @queue, n) do |job, queue, n|
+        Thread.current[:num] = n
         loop do
-          data = queue.pop
+          data = queue.deq
           break if @finished && data == FINISH_DATA
           job.call(data)
         end
@@ -50,7 +54,27 @@ class SilentWorker
   private
 
   def finish!
-    @finished = true
+    @working = false
+
+    unless @finished
+      @finished = true
+      @workers.times do
+        @queue.enq(FINISH_DATA)
+      end
+    end
+  end
+
+  def setup_signal_traps
+    Signal.trap("INT") { abort }
+    Signal.trap("TERM") { abort }
+    Signal.trap("QUIT") { abort }
+
+    # Maybe forgotten to call #wait
+    Signal.trap("EXIT") do
+      return if @finished
+      warn "\nWARNING: You should call SilentWorker#wait to wait jobs are completed. Now abort them.\n"
+      abort
+    end
   end
 
 end

data/lib/silent_worker/version.rb

@@ -1,3 +1,3 @@
 class SilentWorker
-  VERSION = "0.1.1"
+  VERSION = "0.2.0"
 end

data/spec/silent_worker_spec.rb

@@ -43,12 +43,13 @@ describe SilentWorker do
   describe "#stop and #start" do
     let(:sw) { SilentWorker.new {|data| data } }
 
-    after { sw.abort }
+    after { sw.abort; sw.queue.clear }
 
     it "jobs won't be fired when stopping workers" do
       sw << 1
       sw.stop
       sw << 2
+      sw.wait
       sw.queue.pop.should == 2
     end
 
@@ -57,10 +58,37 @@ describe SilentWorker do
       sw << 1
       sw.stop
       sw << 2
+      sw.wait
       sw.queue.length.should == 1
+
       sw.start
       sw.wait
       sw.queue.length.should == 0
     end
   end
+
+  describe "Signal trapping" do
+    context "should abort" do
+      before do
+        sw = SilentWorker.new { sleep 10 }
+        sw.should_receive(:abort)
+        sleep 0.1 if ENV["TRAVIS_CI"]
+      end
+
+      it "INT" do
+        Process.kill("INT", $$)
+      end
+
+      it "TERM" do
+        Process.kill("TERM", $$)
+      end
+
+      it "QUIT" do
+        Process.kill("QUIT", $$)
+      end
+
+      it "EXIT", :pending => "How to test this?" do
+      end
+    end
+  end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: silent_worker
 version: !ruby/object:Gem::Version
-  version: 0.1.1
+  version: 0.2.0
 platform: ruby
 authors:
 - uu59
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-07-23 00:00:00.000000000 Z
+date: 2013-07-27 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler