davinci_threader 2.0.0 → 2.0.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: e559ab8c3238af1b99fe848efc0d99b7013e8b1fe8bcd78717fb1e0933d0beb6
-  data.tar.gz: cb695b3ab7e189d0f0556ef968e02aadd2329fd882389c23981f6ae06cbfb67b
+  metadata.gz: 6860aea4e0212e000626749ce01741bb838fc906bc519ae03527ab15750ca7fc
+  data.tar.gz: a68a066cc391ab7f133d4bb2cacfe6e66a3e7ed045a2d172d4d8cd5977b03a35
 SHA512:
-  metadata.gz: 2727dd3ccd7438d5b4c28a43b7d959a4918ac331de16e0c21c197ea21c174c017548d97aa54ff68fb614914ee28162642d0553631a65d00499dbf7474a9cdea6
-  data.tar.gz: 38a0775392777694711199b034260e7c45a00da7c9c7439dfa4b90e3d68c36deb479e483a877513094ecba367f96d75d089c6b8098b15407cf3f5d0546879976
+  metadata.gz: e68d045efd1505421ea255aa60f3a90a37c60362c71187e16e201d608f5d4bb7361f21f1ee4fc41cf51e3faabc1dab376d52bb2d8f75cf25b56c3ce2e648045b
+  data.tar.gz: 97cf086fcaecfc891329ab9c504040105d90653f3e9c2faf5fe66d0bb7e6b8e33c5f1b0e0f7ac3df5afcfab2e112ddede5e23c3d85f45fbacc04ebe5166da163

data/lib/davinci_threader/main.rb

@@ -35,6 +35,7 @@ module DavinciThreader
       @show_output
     end
     attr_accessor :synchronous_items
+    attr_accessor :synchronous_completed
     attr_reader :thread_count
     # ======================================================
 
@@ -53,6 +54,7 @@ module DavinciThreader
       self.asynchronous = true
       self.show_output = true
       self.synchronous_items = []
+      self.synchronous_completed = 0
       @threads = []
       @thread_count = 0
 
@@ -68,7 +70,10 @@ module DavinciThreader
       @threads.each(&:join)
       @threads_finished_at = Time.now
       @monitor.try(:exit)
-      print "\n" if self.show_output && @synchronous
+      if self.show_output && @synchronous
+        self.printout
+        print "\n"
+      end
       @synchronous.try(:join)
       @synchronous.try(:exit)
       puts "\n-> Done!".light_green if self.show_output && self.log
@@ -102,6 +107,7 @@ module DavinciThreader
             else
               yield(self.synchronous_items.first)
               self.synchronous_items.shift
+              self.synchronous_completed += 1
               self.synchronous_printout if self.show_output && @threads_finished_at
             end
           end
@@ -183,13 +189,13 @@ module DavinciThreader
       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
+      @synchronous_completed_after_start = @synchronous_start_count - @synchronous_remaining
+      if @synchronous_completed_after_start > 0
+        @synchronous_rate_per_second = @synchronous_completed_after_start.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}  "
+      print "\r#{"Synchronous".purple} -> Remaining: #{"#{@synchronous_remaining}".light_yellow} :: Completed: #{"#{self.synchronous_completed}".light_green} :: Rate: #{"#{'%.2f' % ((@synchronous_rate_per_second || 0) * 60.0)}".light_cyan} :: #{"#{@synchronous_nice_time}".light_green}  "
     end
     # ======================================================
 

data/lib/davinci_threader/version.rb

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

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: davinci_threader
 version: !ruby/object:Gem::Version
-  version: 2.0.0
+  version: 2.0.1
 platform: ruby
 authors:
 - onlyexcellence
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2019-10-30 00:00:00.000000000 Z
+date: 2019-10-31 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler