Add execute_job and close issue #24

piotrmurach · Aug 9, 2017 · c5d46fb · c5d46fb
1 parent 5e56886
commit c5d46fb
Show file tree

Hide file tree

Showing 2 changed files with 14 additions and 2 deletions.
diff --git a/lib/tty/spinner.rb b/lib/tty/spinner.rb
@@ -195,6 +195,17 @@ def job(&work)
       end
     end
 
+    # Execute this spinner job
+    #
+    # @api public
+    def execute_job
+      if job.arity.zero?
+        instance_eval(&job)
+      else
+        job.(self)
+      end
+    end
+
     # Check if this spinner has a scheduled job
     #
     # @return [Boolean]
@@ -268,9 +279,10 @@ def resume
     #
     # @api public
     def run(stop_message = '', &block)
+      job(&block)
       auto_spin
 
-      @work = Thread.new { instance_eval(&block) }
+      @work = Thread.new { execute_job }
       @work.join
     ensure
       stop(stop_message)

diff --git a/lib/tty/spinner/multi.rb b/lib/tty/spinner/multi.rb
@@ -118,7 +118,7 @@ def auto_spin
         @spinners.each do |spinner|
           if spinner.job?
             spinner.auto_spin
-            jobs << Thread.new { spinner.instance_eval(&spinner.job) }
+            jobs << Thread.new { spinner.execute_job }
           end
         end
         jobs.each(&:join)