deploy_pin 1.1.3 → 1.2.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 46972e3ae1de0473d6bc9cfa562d1278bc4063a1023586c677edaa9bf8b47466
-  data.tar.gz: c31626b6f0711cf7d7db14258ff4a64c1bca3b96058bf2dcbeb810eccb38fa45
+  metadata.gz: ea0329967282201470ee39ab8cf9bad06a025f7b9e450a48f3fda96e48433d7f
+  data.tar.gz: 35f10a49f28f6194f1b1e68d58f7a8958f47c1e254b6b38c56445c782e28ca0d
 SHA512:
-  metadata.gz: 906f19ce26ce0bdd3d29b124ea5e4327f53f8ad5c24945a630a00320348263831457939155cbf1ffde7035bd334f282b74ee2adc125f23f0e5e880f9e1486f84
-  data.tar.gz: 447c61ad0c2eddc0af71f1b2eee7cf74b65857567c631ada48e71762d599e2bff15209cc2c4f4820a58738d85fba35b75718303d3c4a45a81613ae4871845aa8
+  metadata.gz: ddfc115d8671ce6d5c677bf07f47f88b07eae65e845f5380c7d71caa3ee544d435dd7d773af306ccd4ab6fb1d9e0f558ac23ad37ecc46d88d43440a2c5de1d8b
+  data.tar.gz: dc42d8b471074663325db88614c1a51f2ce538ac377c8fee07b8f655b09cf60df34791adb0da30e8d0d2237d452e54771936009c23e68413139169f0aa062425

data/README.md

@@ -36,9 +36,9 @@ To run all pending tasks
 rake deploy_pin:run
 ```
 
-### Groupped tasks
-~~~ please define allowed groups in config/initializers/deploy_pin.rb ~~~
+## Groupped tasks
 
+Please define allowed groups in `config/initializers/deploy_pin.rb`
 if you want to group tasks around "allowed_group"
 
 ```bash
@@ -57,7 +57,24 @@ To run all pending tasks
 rake deploy_pin:run[allowed_group]
 ```
 
+## Run by uuid
+
+To run some specific task by uuid
+```bash
+rake deploy_pin:run[uuid_1, uuid_2]
+```
+Or you can combine uuid and group
+```bash
+rake deploy_pin:run[uuid, allowed_group]
+```
+In case if you want to rerun task you should add exclamation mark in the end of uuid
+```bash
+rake deploy_pin:run['uuid_1!', 'uuid_2!']
+```
+
 ## Installation
+
+
 Add this line to your application's Gemfile:
 
 ```ruby
@@ -74,7 +91,7 @@ Or install it yourself as:
 $ gem install deploy_pin
 ```
 
-### then generate configuration file
+then generate configuration file
 ```bash
 rails g deploy_pin:install
 ```

data/lib/deploy_pin.rb

@@ -1,6 +1,7 @@
 require "deploy_pin/runner"
 require "deploy_pin/collector"
 require "deploy_pin/task"
+require "deploy_pin/task_criteria"
 require "deploy_pin/engine"
 require "parallel"
 require "ruby-progressbar"

data/lib/deploy_pin/collector.rb

@@ -3,26 +3,10 @@
 # executes tasks
 module DeployPin
   class Collector
-    attr_reader :groups
+    attr_reader :identifiers
 
-    def initialize(groups:)
-      @groups = groups
-    end
-
-    def files
-      Dir["#{DeployPin.tasks_path}/*.rb"]
-    end
-
-    def tasks
-      files.map do |file|
-        task = DeployPin::Task.new(file)
-        task.parse_file
-
-        next if task.done?  # task is done
-        next unless groups.include?(task.group) # group mismatch
-
-        task
-      end.compact.sort # sort by group position in config
+    def initialize(identifiers:)
+      @identifiers = identifiers
     end
 
     def run
@@ -38,7 +22,7 @@ module DeployPin
         task.run if executable
 
         # mark each task as done
-        task.mark
+        task.mark unless task.done?
       end
     end
 
@@ -56,5 +40,29 @@ module DeployPin
         task if _tasks[0..index].none? { |_task| task.eql?(_task) }
       end.compact
     end
+
+    def tasks_count
+      tasks.count
+    end
+
+    private
+
+      def files
+        Dir["#{DeployPin.tasks_path}/*.rb"]
+      end
+
+      def tasks
+        files.map do |file|
+          task = DeployPin::Task.new(file)
+          task.parse_file
+
+          # check if task is suitable
+          task if task_criteria.suitable?(task)
+        end.compact.sort # sort by group position in config
+      end
+
+      def task_criteria
+        @task_criteria ||= DeployPin::TaskCriteria.new(identifiers: identifiers)
+      end
   end
 end

data/lib/deploy_pin/runner.rb

@@ -3,14 +3,14 @@
 # executes tasks
 module DeployPin
   module Runner
-    def self.run(groups:)
-      DeployPin::Collector.new(groups: groups).run do |index, count, task, executable|
+    def self.run(identifiers:)
+      DeployPin::Collector.new(identifiers: identifiers).run do |index, count, task, executable|
         self.print("[#{index + 1}/#{count}] Task #{task.title} #{task.uuid}##{task.group} (#{executable ? 'run' : 'skip'})")
       end
     end
 
-    def self.list(groups:)
-      DeployPin::Collector.new(groups: groups).list do |index, count, task|
+    def self.list(identifiers:)
+      DeployPin::Collector.new(identifiers: identifiers).list do |index, count, task|
         self.print("======= Task ##{index} ========".white)
 
         # print details
@@ -26,10 +26,10 @@ module DeployPin
       end
     end
 
-    def self.summary(groups:)
+    def self.summary(identifiers:)
       # print summary
       self.print("======= Summary ========")
-      self.print("tasks number: #{DeployPin::Collector.new(groups: groups).tasks.count}")
+      self.print("tasks number: #{DeployPin::Collector.new(identifiers: identifiers).tasks_count}")
     end
 
     def self.print(msg)

data/lib/deploy_pin/task_criteria.rb

@@ -0,0 +1,29 @@
+# frozen_string_literal: true
+
+# check task criteria
+module DeployPin
+  class TaskCriteria
+    SKIP_REGEXEP = /\A-(.+[^!])\z/
+    FORCE_REGEXP = /\A([^-].+)!\z/
+    COMMON_REGEXP = /(^[^-]*.+[^!]*$)/
+
+    attr_reader :identifiers
+
+    def initialize(identifiers:)
+      @identifiers = identifiers
+    end
+
+    def suitable?(task)
+      task_cover = ->(task, regexp) {
+        items = identifiers.flat_map {|x| x.to_s.scan(regexp) }.flatten
+
+        items & [task.group, task.uuid]
+      }
+
+      return false if task_cover.(task, SKIP_REGEXEP).any?
+      return true if task_cover.(task, FORCE_REGEXP).any?
+
+      task_cover.(task, COMMON_REGEXP).any? && !task.done?
+    end
+  end
+end

data/lib/deploy_pin/version.rb

@@ -1,3 +1,3 @@
 module DeployPin
-  VERSION = '1.1.3'
+  VERSION = '1.2.1'
 end

data/lib/tasks/deploy_pin_tasks.rake

@@ -1,13 +1,13 @@
 namespace :deploy_pin do
   desc "run pending tasks"
-  task :run, [:groups] => :environment do |t, args|
-    args.with_defaults(groups: DeployPin.groups)
+  task :run, [:identifiers] => :environment do |t, args|
+    args.with_defaults(identifiers: DeployPin.groups)
 
     DeployPin::Runner.run(args)
   end
 
-  task :list, [:groups] => :environment  do |t, args|
-    args.with_defaults(groups: DeployPin.groups)
+  task :list, [:identifiers] => :environment  do |t, args|
+    args.with_defaults(identifiers: DeployPin.groups)
 
     DeployPin::Runner.list(args)
     DeployPin::Runner.summary(args)

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: deploy_pin
 version: !ruby/object:Gem::Version
-  version: 1.1.3
+  version: 1.2.1
 platform: ruby
 authors:
 - rafael
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2019-04-09 00:00:00.000000000 Z
+date: 2019-10-30 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails
@@ -193,6 +193,7 @@ files:
 - lib/deploy_pin/engine.rb
 - lib/deploy_pin/runner.rb
 - lib/deploy_pin/task.rb
+- lib/deploy_pin/task_criteria.rb
 - lib/deploy_pin/version.rb
 - lib/generators/deploy_pin/install/USAGE
 - lib/generators/deploy_pin/install/install_generator.rb
@@ -223,7 +224,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.0.2
+rubygems_version: 3.0.6
 signing_key: 
 specification_version: 4
 summary: pin some task around deployment