davinci_threader 1.0.0 → 2.0.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
-SHA1:
-  metadata.gz: 993763e15a5925b9ddf6b573291691d90981c7e3
-  data.tar.gz: 6e6e4c2cc7c76a2109ac178bdd17fb357a09515f
+SHA256:
+  metadata.gz: e559ab8c3238af1b99fe848efc0d99b7013e8b1fe8bcd78717fb1e0933d0beb6
+  data.tar.gz: cb695b3ab7e189d0f0556ef968e02aadd2329fd882389c23981f6ae06cbfb67b
 SHA512:
-  metadata.gz: '01539586ff72cd4b619229a707efad51b6b61535608dab0c53acc4a49fb8529a32f52ce67efc918aa0942bc06c63b242eaae14ca217622b82c9168ad6f162178'
-  data.tar.gz: b158a7beebb8f78efcaf283fec4384796c367f710f6e463f177f4f4e4842c4d5dd6165c64039b1f68d6326957a13998f7beb50e3b2c16f8c4112654405e0201b
+  metadata.gz: 2727dd3ccd7438d5b4c28a43b7d959a4918ac331de16e0c21c197ea21c174c017548d97aa54ff68fb614914ee28162642d0553631a65d00499dbf7474a9cdea6
+  data.tar.gz: 38a0775392777694711199b034260e7c45a00da7c9c7439dfa4b90e3d68c36deb479e483a877513094ecba367f96d75d089c6b8098b15407cf3f5d0546879976

data/lib/davinci_threader/main.rb

@@ -1,4 +1,5 @@
 require 'colorize'
+require 'awesome_print'
 require 'active_support/core_ext/numeric/time'
 
 
@@ -23,6 +24,17 @@ module DavinciThreader
     attr_accessor :extras
     attr_accessor :max_threads
     attr_accessor :asynchronous
+    def show_output=(_on)
+      @show_output = _on
+      if !_on
+        @monitor.try(:exit)
+        @monitor = nil
+      end
+    end
+    def show_output
+      @show_output
+    end
+    attr_accessor :synchronous_items
     attr_reader :thread_count
     # ======================================================
 
@@ -39,30 +51,36 @@ module DavinciThreader
       self.extras = []
       self.max_threads = 10
       self.asynchronous = true
+      self.show_output = true
+      self.synchronous_items = []
       @threads = []
       @thread_count = 0
 
       @monitor = Thread.new do
         while self.log
-          printout if @start_time
+          printout if self.show_output && @start_time
           sleep 0.1
         end
       end
 
-      yield self
+      yield(self)
 
-      @threads.each &:join
-      sleep 1
-      @monitor.exit
-      puts "\n-> Done!".light_green if self.log
+      @threads.each(&:join)
+      @threads_finished_at = Time.now
+      @monitor.try(:exit)
+      print "\n" if self.show_output && @synchronous
+      @synchronous.try(:join)
+      @synchronous.try(:exit)
+      puts "\n-> Done!".light_green if self.show_output && self.log
 
     rescue Interrupt
 
-      @monitor.exit
+      @monitor.try(:exit)
 
       begin
         puts "\n-> Waiting for remaining threads to finish...".yellow
         @threads.each(&:join)
+        @synchronous.try(:exit)
         puts "-> Exited!".yellow
       rescue Interrupt
         force_exit
@@ -73,6 +91,27 @@ module DavinciThreader
     end
     # ======================================================
 
+    # Synchronous Action
+    # ======================================================
+    def synchronous_action
+      @synchronous = Thread.new do
+        begin
+          while !@threads_finished_at || self.synchronous_items.count > 0
+            if self.synchronous_items.count == 0
+              sleep(1)
+            else
+              yield(self.synchronous_items.first)
+              self.synchronous_items.shift
+              self.synchronous_printout if self.show_output && @threads_finished_at
+            end
+          end
+        rescue => e
+          ap e.message
+          ap e.backtrace
+        end
+      end
+    end
+    # ======================================================
 
     # Make Thread
     # ======================================================
@@ -82,7 +121,7 @@ module DavinciThreader
 
       if !self.asynchronous
         yield(*args)
-        self.printout
+        self.printout if self.show_output
         return
       end
 
@@ -119,24 +158,41 @@ module DavinciThreader
     # ======================================================
     def printout
 
-        c = Time.now - @start_time
+        c = (@threads_finished_at || Time.now) - @start_time
         output = []
         if self.asynchronous
           output << "#{"#{@rpm.to_i}/MIN".cyan}"
           output << "#{Time.at(c.to_f).utc.strftime("%H:%M:%S")}"
           if self.completed > 100
             actual_rate = (self.completed.to_f / c.to_f) * 60.0
-            output << "#{actual_rate.round}/MIN".light_green
+            output << "#{'%.2f' % actual_rate}/MIN".light_green
             output << "#{Time.at(((self.total-self.completed).to_f / actual_rate) * 60.0).utc.strftime("%H:%M:%S")}".light_green
           end
         end
         output << "#{self.completed}/#{self.total} (#{self.successful.to_s.light_green} <--> #{self.errors.to_s.light_red})"
+        output << "Synchronous: #{"#{self.synchronous_items.count}".purple}" if @synchronous
         output += self.extras
         print "\r#{output.join(" :: ".yellow)}    "
 
       end
     # ======================================================
 
+    # Synchronous Printout
+    # ======================================================
+    def synchronous_printout
+      elapsed_time = Time.now - @threads_finished_at
+      @synchronous_remaining = self.synchronous_items.count
+      @synchronous_start_count ||= @synchronous_remaining
+      @synchronous_completed = @synchronous_start_count - @synchronous_remaining
+      if @synchronous_completed > 0
+        @synchronous_rate_per_second = @synchronous_completed.to_f / elapsed_time
+        seconds_remaining = @synchronous_remaining.to_f / @synchronous_rate_per_second
+        @synchronous_nice_time = Time.at(seconds_remaining).utc.strftime("%H:%M:%S")
+      end
+      print "\r#{"Synchronous".purple} -> Remaining: #{"#{@synchronous_remaining}".light_yellow} :: Completed: #{"#{@synchronous_completed}".light_green} :: Rate: #{"#{'%.2f' % ((@synchronous_rate_per_second || 0) * 60.0)}".light_cyan} :: #{"#{@synchronous_nice_time}".light_green}  "
+    end
+    # ======================================================
+
     # Increment Methods
     # ======================================================
     def success
@@ -156,6 +212,7 @@ module DavinciThreader
       @monitor.try(:exit)
       puts "\n-> Killing remaining threads...".light_red
       @threads.each(&:exit)
+      @synchronous.try(:exit)
       puts "-> Forced Exit!".light_red
     end
     # ======================================================

data/lib/davinci_threader/version.rb

@@ -1,3 +1,3 @@
 module DavinciThreader
-  VERSION = "1.0.0"
+  VERSION = "2.0.0"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: davinci_threader
 version: !ruby/object:Gem::Version
-  version: 1.0.0
+  version: 2.0.0
 platform: ruby
 authors:
 - onlyexcellence
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2019-09-11 00:00:00.000000000 Z
+date: 2019-10-30 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -38,6 +38,20 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: '10.0'
+- !ruby/object:Gem::Dependency
+  name: rspec
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '3.9'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '3.9'
 - !ruby/object:Gem::Dependency
   name: activesupport
   requirement: !ruby/object:Gem::Requirement
@@ -66,6 +80,20 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: 0.8.1
+- !ruby/object:Gem::Dependency
+  name: awesome_print
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '1.8'
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '1.8'
 description: Useful for APIs that limit requests
 email:
 - will@wambl.com
@@ -100,8 +128,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubyforge_project: 
-rubygems_version: 2.6.13
+rubygems_version: 3.0.6
 signing_key: 
 specification_version: 4
 summary: Thread Throttling