deploy_pin 1.0.4 → 1.1.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 5dc4d23b4c55d02c475eb9d557750af92c09c7aada2673ff42419ed86d1dc7be
-  data.tar.gz: 2d1a28450273d9d88e85756c2e1e85a49d5c3f7e9faf98612e395080c144c153
+  metadata.gz: 659cf4687485ab93ec0b463064d347ffaaeb18625e63d916047c372c15e01b0d
+  data.tar.gz: '0797eb2b2baf73f3bdc699c257dea2a18210d93d7f892926041558a793e296c7'
 SHA512:
-  metadata.gz: 0251a330a53102637a20b08feee13bbdde2eafa88b9c2278fe93eabefa1bedf7a05ff9b2ba6a9974703607a5ea3b708d02159df13b593817339c49960e7eccb3
-  data.tar.gz: 4161069f4c5f477bfff9398469ccda0a4479a05d86aeeea45adf72979a1fd4d95c3d8500c0336230ae593eb408260f9923ad1bdf40c729bf1d708f9518027086
+  metadata.gz: 47128a423ef37a1535fd9637ae0d327df547a48d9bdfffe668c7881b1cd96fc904948d264cff825bffe58a17415dbb4de1d97a77fcd713ee43ac3188a5502c94
+  data.tar.gz: e70850c635689e803d07c14289597bf466aa123f9162c23a70781a4f9e788fd4441db4abcc5bceb9f6e65849ecdca8689fd4944f9f338fae825e33dae7dfdcf8

data/README.md

@@ -1,4 +1,5 @@
 [![Gem Version](https://badge.fury.io/rb/deploy_pin.svg)](https://badge.fury.io/rb/deploy_pin)
+![](https://ruby-gem-downloads-badge.herokuapp.com/deploy_pin)
 [![Build Status](https://travis-ci.org/skcc321/deploy_pin.svg?branch=master)](https://travis-ci.org/skcc321/deploy_pin)
 [![Maintainability](https://api.codeclimate.com/v1/badges/c0a9ca97c1f9c0478ffc/maintainability)](https://codeclimate.com/github/skcc321/deploy_pin/maintainability)
 [![Test Coverage](https://api.codeclimate.com/v1/badges/c0a9ca97c1f9c0478ffc/test_coverage)](https://codeclimate.com/github/skcc321/deploy_pin/test_coverage)

data/lib/deploy_pin/collector.rb

@@ -0,0 +1,50 @@
+# frozen_string_literal: true
+
+# executes tasks
+module DeployPin
+  class Collector
+    attr_reader :groups
+
+    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
+    end
+
+    def run
+      count = tasks.count
+
+      tasks.each_with_index do |task, index|
+        yield(index, count, task)
+
+        # run only uniq tasks
+        task.run if tasks.none? { |_task| task.eql?(_task) }
+
+        # mark each task as done
+        task.mark
+      end
+    end
+
+    def list
+      count = tasks.count
+
+      tasks.each_with_index do |task, index|
+        yield(index, count, task)
+      end
+    end
+  end
+end

data/lib/deploy_pin/runner.rb

@@ -4,43 +4,32 @@
 module DeployPin
   module Runner
     def self.run(groups:)
-      tasks = pending(groups: groups)
-      tasks.each_with_index do |task, index|
-        puts "[#{index + 1}/#{tasks.count}] Task UUID #{task.uuid}"
-        task.run
-        puts ""
+      DeployPin::Collector.new(groups: groups).run do |index, count, task|
+        puts("[#{index + 1}/#{count}] Task #{task.title} #{task.uuid}##{task.group}")
       end
     end
 
     def self.list(groups:)
-      pending(groups: groups).each_with_index do |task, index|
-        puts "======= Task ##{index} ========"
-        puts task.script
-        puts ""
+      DeployPin::Collector.new(groups: groups).list do |index, count, task|
+        puts("======= Task ##{index} ========".white)
+
+        # print details
+        task.details.each do |key, value|
+          puts "#{key}:\t\t#{value}"
+        end
+
+        puts("")
+        puts("<<<")
+        puts task.script.strip.green
+        puts(">>>")
+        puts("")
       end
-
-      puts "======= summary ========"
-      puts "tasks number: #{pending(groups: groups).count}"
     end
 
-    def self.pending(groups:)
-      files = Dir["#{DeployPin.tasks_path}/*.rb"]
-
-      # get done records uuids
-      records = DeployPin::Record.pluck(:uuid)
-
-      files.map do |file|
-        task = DeployPin::Task.new(file)
-        task.parse_file
-
-        # task is done
-        next if records.include?(task.uuid)
-
-        # group mismatch
-        next unless groups.include?(task.group)
-
-        task
-      end.compact.sort # sort by group position in config
+    def self.summary(groups:)
+      # print summary
+      puts("======= summary ========")
+      puts("tasks number: #{DeployPin::Collector.new(groups: groups).tasks.count}")
     end
   end
 end

data/lib/deploy_pin/task.rb

@@ -4,39 +4,68 @@
 module DeployPin
   class Task
     attr_reader :file,
-      :group,
       :uuid,
+      :group,
+      :title,
       :script
 
     def initialize(file)
       @file = file
       @uuid = nil
       @group = nil
+      @title = ""
       @script = ""
     end
 
     def run
-      eval(@script)
+      # eval script
+      eval(script)
+    end
+
+    def mark
+      # store record in the DB
+      DeployPin::Record.create(uuid: uuid)
+    end
+
+    def done?
+      DeployPin::Record.where(uuid: uuid).exists?
     end
 
     def parse_file
-      @script = File.read(file)
-      @script.lines[0] =~ /\A# (\d+):(\w+)/
-      @uuid = $1
-      @group = $2
+      File.foreach(file) do |line|
+        case line.strip
+        when /\A# (\d+):(\w+)/
+          @uuid = $1
+          @group = $2
+        when /\A# task_title:(.+)/
+          @title = $1.strip
+        when /\A[^#].*/
+          @script += line
+        end
+      end
     end
 
     def details
-      puts @uuid, @group, @script
+      {
+        uuid: uuid,
+        group: group,
+        title: title
+      }
     end
 
-    # for sorting
-    def <=>(task_b)
-      group_index <=> task_b.group_index
+    def eql?(task_b)
+      script == task_b.script
     end
 
-    def group_index
-      DeployPin.groups.index(group)
-    end
+    protected
+
+      # for sorting
+      def <=>(task_b)
+        group_index <=> task_b.group_index
+      end
+
+      def group_index
+        DeployPin.groups.index(group)
+      end
   end
 end

data/lib/deploy_pin/version.rb

@@ -1,3 +1,3 @@
 module DeployPin
-  VERSION = '1.0.4'
+  VERSION = '1.1.0'
 end

data/lib/deploy_pin.rb

@@ -1,8 +1,10 @@
 require "deploy_pin/runner"
+require "deploy_pin/collector"
 require "deploy_pin/task"
 require "deploy_pin/engine"
 require "parallel"
 require "ruby-progressbar"
+require "colorize"
 
 module DeployPin
   OPTIONS = %i(

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

@@ -2,6 +2,6 @@
 
 DeployPin.setup do
   tasks_path "lib/deploy_pin"
-  groups ["post_script"]
-  fallback_group "post_script"
+  groups ["I", "II", "III"]
+  fallback_group "II"
 end

data/lib/generators/deploy_pin/task/templates/parallel_task.rb.erb

@@ -1,4 +1,5 @@
 # <%= @uuid %>:<%= group %>
+# task_title: super duper task
 
 # === parallel task code goes down here ===
 10.times { DeployPin::Record.create(uuid: "hello") }
@@ -9,8 +10,3 @@ Parallel.each(DeployPin::Record.where(uuid: "hello"), progress: "Doing stuff") d
   end
   sleep(0.2)
 end
-
-
-
-# Create record in the DB to avoid multiple execution
-DeployPin::Record.create(uuid: "<%= @uuid %>")

data/lib/generators/deploy_pin/task/templates/task.rb.erb

@@ -1,13 +1,7 @@
 # <%= @uuid %>:<%= group %>
+# task_title: super duper task
 
 # === task code goes down here ===
 progressbar = ProgressBar.create(title: "Doing stuff", total: 20, format: '%t |%E | %B | %a')
 
 20.times { progressbar.increment; sleep(0.2) }
-
-
-
-
-
-# Create record in the DB to avoid multiple execution
-DeployPin::Record.create(uuid: "<%= @uuid %>")

data/lib/tasks/deploy_pin_tasks.rake

@@ -10,5 +10,6 @@ namespace :deploy_pin do
     args.with_defaults(groups: DeployPin.groups)
 
     DeployPin::Runner.list(args)
+    DeployPin::Runner.summary(args)
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: deploy_pin
 version: !ruby/object:Gem::Version
-  version: 1.0.4
+  version: 1.1.0
 platform: ruby
 authors:
 - rafael
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2019-03-28 00:00:00.000000000 Z
+date: 2019-03-29 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails
@@ -72,6 +72,20 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: 12.3.2
+- !ruby/object:Gem::Dependency
+  name: colorize
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: simplecov
   requirement: !ruby/object:Gem::Requirement
@@ -175,6 +189,7 @@ files:
 - app/models/deploy_pin/application_record.rb
 - app/models/deploy_pin/record.rb
 - lib/deploy_pin.rb
+- lib/deploy_pin/collector.rb
 - lib/deploy_pin/engine.rb
 - lib/deploy_pin/runner.rb
 - lib/deploy_pin/task.rb
@@ -208,7 +223,8 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.0.2
+rubyforge_project: 
+rubygems_version: 2.7.6
 signing_key: 
 specification_version: 4
 summary: pin some task around deployment