deploy_pin 1.3.7 → 1.4.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 4d5801fe8a830296f5f65c20239b11872f2e0c80cde1934a8ab953946b544ed8
-  data.tar.gz: 162751453a48bd062984e378a1bfb33825d76bf2b700e6a38324fd60c5f714e8
+  metadata.gz: 2862b9b718d5a1ce6d6b6af0c10846f1915d7c0a70f13e68c96b2f69d1304bcc
+  data.tar.gz: c849c787465e4022faf6f10674ce53c7e67c71b68f1a2921de3f3e71ae64f8ac
 SHA512:
-  metadata.gz: '0189c0b921ed86800c1d4c7a1ce7b89f6af1a06ee8f2ced34de0797a7318fd7a508335bbd28980d01e07fce6c467c5117c781ee5958b23c0e8e1b76b33640591'
-  data.tar.gz: 1e25f0d9854201ec343414547f3dc720a932cf92053c245c878095480622ac36d8fdb42ed77d6a4bce10348960595742dcc189ba2f8500eeec94073e07f773bf
+  metadata.gz: a6bfd839077a2ca9ccdc75232fb376707ac87475bc6504f365991d01fdd4da81c15617605cc746fb8b1ada5a6dc3da8465b2382b9811f108accbc9a45080e6ff
+  data.tar.gz: f7ef8afae96a3ab5802a5f91de36248637c8eb003a7cbfdb168006373e65c5669360f9cf618f51daff082d41efe34b6ce2c0172cca7e8570717c793a8bc05542

data/README.md

@@ -143,7 +143,7 @@ end
 Check the documentation [here](lib/deploy_pin/parallel_wrapper.rb).
 
 ## Formatting
-`run_formatter` is used to format the output of a `run` task
+`run_formatter` is used to format the output of a `run` task  
 `list_formatter` is used to format the output of a `list` task
 
 A default value must be defined in the deploy_pin initializer. Ex.:
@@ -151,9 +151,9 @@ A default value must be defined in the deploy_pin initializer. Ex.:
 # config/initializers/deploy_pin.rb
 DeployPin.setup do
   run_formatter(
-    lambda do |index, task_count, task, executable, start, time = nil|
+    lambda do |index, task_count, task, executable, start, duration = nil|
       end_of_msg = if executable
-                     start ? '(Started)' : "(Done in #{time})\n\n"
+                     start ? '(Started)' : "(Done in #{duration})\n\n"
                    else
                      "(Skipped)\n\n"
                    end

data/lib/deploy_pin/collector.rb

@@ -3,36 +3,21 @@
 # executes tasks
 module DeployPin
   class Collector
-    include ActionView::Helpers::DateHelper
-
     attr_reader :identifiers, :formatter
 
     def initialize(identifiers:)
       @identifiers = identifiers
     end
 
+    # :reek:TooManyStatements
     def run
       # cache tasks
       _tasks = tasks
       _tasks.each_with_index do |task, index|
-        # run only uniq tasks
-        executable = _tasks[0..index].none? { |_task| task.eql?(_task) }
-
-        DeployPin.run_formatter.call(index, _tasks.count, task, executable, true)
-
-        # run if executable
-        if executable
-          time = execution_time do
-            run_with_timeout(task) { task.run }
-          end
-
-          DeployPin.run_formatter.call(index, _tasks.count, task, executable, false, time)
-        end
-
-        # mark each task as done
-        task.mark unless task.done?
+        DeployPin.task_wrapper.call(task, -> { process(_tasks, task, index) })
       end
     end
+    # :reek:TooManyStatements
 
     def list
       _tasks = tasks
@@ -55,6 +40,26 @@ module DeployPin
 
     private
 
+      # :reek:FeatureEnvy
+      # :reek:TooManyStatements
+      def process(cached_tasks, task, index)
+        # run only uniq tasks
+        executable = cached_tasks[0..index].none? { |_task| task.eql?(_task) }
+
+        DeployPin.run_formatter.call(index, cached_tasks.count, task, executable, true)
+
+        # run if executable
+        if executable
+          duration = execution_duration { run_with_timeout(task) { task.run } }
+          DeployPin.run_formatter.call(index, cached_tasks.count, task, executable, false, duration)
+        end
+
+        # mark each task as done
+        task.mark unless task.done?
+      end
+      # :reek:TooManyStatements
+      # :reek:FeatureEnvy
+
       # :reek:UtilityFunction
       def files
         Dir["#{DeployPin.tasks_path}/*.rb"]
@@ -81,12 +86,12 @@ module DeployPin
         DeployPin::Database.execute_with_timeout(DeployPin.statement_timeout, **{}, &block)
       end
 
-      def execution_time
+      def execution_duration
         start_time = Time.now
 
         yield
 
-        time_ago_in_words(start_time)
+        Time.now - start_time
       end
   end
 end

data/lib/deploy_pin/version.rb

@@ -1,5 +1,5 @@
 # frozen_string_literal: true
 
 module DeployPin
-  VERSION = '1.3.7'
+  VERSION = '1.4.0'
 end

data/lib/deploy_pin.rb

@@ -19,14 +19,15 @@ module DeployPin
     statement_timeout
     run_formatter
     list_formatter
+    task_wrapper
   ].freeze
 
   OPTIONS.each do |option|
     instance_eval %{
       def #{option}(val = nil)
-        return @@#{option} unless val.present?
+        return @#{option} unless val.present?
 
-        @@#{option} = val
+        @#{option} = val
       end
     }, __FILE__, __LINE__ - 6
   end
@@ -34,4 +35,10 @@ module DeployPin
   def self.setup(&block)
     instance_eval(&block)
   end
+
+  def self.setup_defaults!
+    @task_wrapper = ->(_task, task_runner) { task_runner.call }
+  end
+
+  setup_defaults!
 end

data/lib/generators/deploy_pin/install/templates/deploy_pin.rb

@@ -6,9 +6,9 @@ DeployPin.setup do
   fallback_group 'II'
   statement_timeout 10.minutes
   run_formatter(
-    lambda do |index, task_count, task, executable, start, time = nil|
+    lambda do |index, task_count, task, executable, start, duration = nil|
       end_of_msg = if executable
-                     start ? '(Started)' : "(Done in #{time})\n\n"
+                     start ? '(Started)' : "(Done in #{duration})\n\n"
                    else
                      "(Skipped)\n\n"
                    end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: deploy_pin
 version: !ruby/object:Gem::Version
-  version: 1.3.7
+  version: 1.4.0
 platform: ruby
 authors:
 - Viktor Sych
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2023-03-07 00:00:00.000000000 Z
+date: 2023-05-12 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: colorize