thread_watcher 0.7.1 → 0.8.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: c9b0bc53f876da8367422fb55bd662be466325aa
-  data.tar.gz: d807ec01f1c8f992a17fa92e4ba531ac86d18ba9
+  metadata.gz: 8a152351cdaecbd2d8db6e0035114db2ff37c5da
+  data.tar.gz: 762752fbcd844ca408434bfcbf00c3cf9469d9bd
 SHA512:
-  metadata.gz: 8a5f146bf2f34289e4974d8b79181a3055ded44f0af771985c0a517b3a78a0bb8013cf457a0caa0984117d0e4284b28ab2ede31ec3ab53d6bfd993c0ea502aea
-  data.tar.gz: a4b721d97eb8eb5bb24890374e5a57c2432e6a8995b550ea5d41547c72a29d474a2bc3c57cc52b59035289de75002de4116a407a4d88a31cf5e9c06d14e8707e
+  metadata.gz: 4a42ce1a54d92f7c346a53877e4d01b8f8234bf4c5b078a2a220d199930b3ac79b571090cfe76d2b388c3abc83f9d2edb443fb857a09daee83af51f7f5ac596d
+  data.tar.gz: 40241f40ddcb63b7da1a66c57a6418f64ecdbabf17092ecdcec196401acece2aa2fb4bf39423c939e90c9187d7285ac75e55db7adf491de27edac4df2a6f7fc2

data/README.md

@@ -10,7 +10,7 @@ Build for ruby 1.8.7 and newer.
 hm, yeah. just add this to your Gemfile:
 
 ```ruby
-gem 'thread_watcher', '~> 0.7.0'
+gem 'thread_watcher', '~> 0.8.0'
 ```
 
 And then execute:

data/lib/thread_watcher/process_watch.rb

@@ -1,54 +1,16 @@
-require "thread_watcher/thread_formatter"
-
 module ThreadWatcher
   class ProcessWatch
     attr_accessor :threads
-    class ThreadHolder
-      attr_accessor :thread, :id, :options, :block
-      def initialize thread, options
-        @thread = thread
-        @id = time_to_i
-        @options = available_options.merge options
-      end
-
-      def stop!
-        @thread.kill
-      end
-      
-      def restart!
-        @thread = Thread.new { block.call }
-      end
-
-      def alive?
-        @thread.alive?
-      end
-
-      def runtime
-        time_to_i - @id
-      end
-
-      def time_to_i
-        Time.now.to_i
-      end
-
-      private
-
-      def available_options
-        { :name => nil, :keep_alive => false }
-      end
-    end
 
     def initialize
       @threads = {}
-      @blocks = {}
-      run(:name => 'Cleaning Jobs', :keep_alive => true) { while true; self.clear!; sleep(60); end; }
+      start_cleaning_job
     end
 
     def run options = {}, &block
-      thread_holder = ThreadHolder.new(Thread.new { block.call }, options)
-      thread_holder
+      thread_holder = ThreadHolder.new(block, options)
+      thread_holder.start!
       @threads[thread_holder.id] = thread_holder
-      thread_holder.block = block
       thread_holder.id
     end
 
@@ -86,6 +48,12 @@ module ThreadWatcher
       end
       ''
     end
+
+    private
+
+    def start_cleaning_job
+      run(:name => 'Cleaning Jobs', :keep_alive => true) { while true; self.clear!; sleep(60); end; }
+    end
     
   end
 end

data/lib/thread_watcher/thread_holder.rb

@@ -0,0 +1,50 @@
+module ThreadWatcher
+  class ThreadHolder
+    attr_accessor :thread, :id, :options, :block, :start_time
+    def initialize block, options
+      @block = block
+      set_id
+      @options = available_options.merge options
+    end
+
+    def start!
+      initialize_starttime
+      @thread = Thread.new{ block.call }
+    end
+
+    def stop!
+      @thread.kill
+    end
+    
+    def restart!
+      stop!
+      start!
+    end
+
+    def alive?
+      @thread.alive?
+    end
+
+    def runtime
+      time_to_i - start_time
+    end
+
+    def time_to_i
+      Time.now.to_i
+    end
+
+    private
+
+    def available_options
+      { :name => nil, :keep_alive => false }
+    end
+
+    def initialize_starttime
+      @start_time = time_to_i
+    end
+
+    def set_id
+      @id = start_time || time_to_i
+    end
+  end
+end

data/lib/thread_watcher/version.rb

@@ -1,3 +1,3 @@
 module ThreadWatcher
-  VERSION = "0.7.1"
+  VERSION = "0.8.0"
 end

data/lib/thread_watcher.rb

@@ -1,4 +1,6 @@
 require "thread_watcher/version"
+require "thread_watcher/thread_formatter"
+require "thread_watcher/thread_holder"
 require "thread_watcher/process_watch"
 
 module ThreadWatcher

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: thread_watcher
 version: !ruby/object:Gem::Version
-  version: 0.7.1
+  version: 0.8.0
 platform: ruby
 authors:
 - Robert Starke
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2016-01-29 00:00:00.000000000 Z
+date: 2016-02-12 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -60,6 +60,7 @@ files:
 - lib/thread_watcher.rb
 - lib/thread_watcher/process_watch.rb
 - lib/thread_watcher/thread_formatter.rb
+- lib/thread_watcher/thread_holder.rb
 - lib/thread_watcher/version.rb
 - thread_watcher.gemspec
 homepage: https://github.com/robst/thread_watcher