afterlife 1.8.0 → 1.9.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 6f862660ef3c576008d2054a427dcd03fbbbd8a1fe070158507f1eeaa32d288c
-  data.tar.gz: 9cc64fe488e5c3da7213bd8ca3b61d86539207dfef6a42fc5e043cb5047d3246
+  metadata.gz: ded787195d0197794e9ce63aab421fd0b9f4168208bab96b1cdab4e34f22d955
+  data.tar.gz: f9305bba34772dbe134eedad518d67ad371e85a1e8b6f28b25785f54f8737e58
 SHA512:
-  metadata.gz: 7a81d5767dadaf2ef615236856124f26fb17bdaaf198a5fef2edbfe520ca0aacb8196deab2345605f5d591ecfa35dbffd516db9061c98628b2aecf808986c8df
-  data.tar.gz: 8666f13424d39b7b5bc045e7b04c0b71de3a5842d3c519963e399fd62fc465ca6242711ad3ed79a1d4ce25e4b5db70065a6ff7fb2774bc1b9954c5851745fe9e
+  metadata.gz: decbc189d4fc9e422ab524fdd80adc4234d919542350db532bc04a69a48cdef40220fde5331fb94fa77c1427a59df5d4328f7d454e50d8a8b20d336c239e976b
+  data.tar.gz: 394711b68721f95e338b558c51d86581537b6a0ddf7f4dcd31646420cf0a9cebcdfbff60ef2395f4b13acaae1e44856aac5b57b0d690402f46c51b8053a94d81

data/.rubocop.yml

@@ -1,10 +1,10 @@
-require:
+plugins:
   - rubocop-rspec
   - rubocop-rake
 
 AllCops:
   NewCops: enable
-  TargetRubyVersion: 2.6
+  TargetRubyVersion: 3.3
 
 Lint/ConstantDefinitionInBlock:
   Enabled: false
@@ -44,3 +44,24 @@ Layout/AccessModifierIndentation:
 
 Style/SignalException:
   EnforcedStyle: semantic
+
+Metrics/ClassLength:
+  Enabled: false
+
+Metrics/CyclomaticComplexity:
+  Enabled: false
+
+Metrics/MethodLength:
+  Enabled: false
+
+Metrics/ParameterLists:
+  Enabled: false
+
+Metrics/PerceivedComplexity:
+  Enabled: false
+
+RSpec/MultipleExpectations:
+  Enabled: false
+
+RSpec/MultipleMemoizedHelpers:
+  Enabled: false

data/.ruby-version

@@ -1 +1 @@
-3.0.5
+3.3.5

data/Gemfile

@@ -14,3 +14,6 @@ gem 'rspec'
 gem 'rubocop'
 gem 'rubocop-rake'
 gem 'rubocop-rspec'
+
+gem 'base64', '~> 0.3.0'
+gem 'benchmark', '~> 0.5.0'

data/afterlife.gemspec

@@ -10,7 +10,7 @@ Gem::Specification.new do |spec|
 
   spec.summary = 'Devops utils'
   spec.description = 'Afterlife helps you setup your development environment and deploy code easily'
-  spec.required_ruby_version = '>= 2.6'
+  spec.required_ruby_version = '>= 3.3'
 
   spec.metadata['source_code_uri'] = 'https://bitbucket.org/volabit/afterlife'
   spec.metadata['changelog_uri'] = 'https://bitbucket.org/volabit/afterlife/src/master/CHANGELOG.md'
@@ -29,6 +29,7 @@ Gem::Specification.new do |spec|
   spec.require_paths = ['lib']
 
   spec.add_dependency 'faraday'
+  spec.add_dependency 'ostruct'
   spec.add_dependency 'racc' # rubocop dependency, cannot run `bundle exec rubocop` without it
   spec.add_dependency 'thor'
   spec.add_dependency 'zeitwerk'

data/config.ru

@@ -3,8 +3,7 @@
 require 'logger'
 require 'rack/directory'
 
-logger_file = File.open(Afterlife::Cdn.log_path, 'a')
-logger_file.sync = true
+logger = Logger.new(Afterlife::Cdn.log_path)
 
 class AssetHeaders
   def initialize(app)
@@ -19,7 +18,7 @@ class AssetHeaders
 end
 
 use AssetHeaders
-use Rack::CommonLogger, Logger.new(logger_file)
+use Rack::CommonLogger, logger
 run do |env|
   Rack::Directory.new(Afterlife::Cdn.local_path).call(env)
 end

data/lib/afterlife/bump/semver.rb

@@ -6,9 +6,9 @@ module Afterlife
     module_function
 
       DEFAULT_PRERELEASE_NAME = 'rc'
-      VERSION_REGEX = /(\d+\.\d+\.\d+(?:-(?:.+))?)/.freeze
+      VERSION_REGEX = /(\d+\.\d+\.\d+(?:-(?:.+))?)/
 
-      def calculate_next(part, pre = nil) # rubocop:disable Metrics/MethodLength
+      def calculate_next(part, pre = nil)
         x, y, z = release
         case part.to_sym
         when :major

data/lib/afterlife/cdn/cli.rb

@@ -6,6 +6,7 @@ module Afterlife
   module Cdn
     class Cli < Thor
       include BaseCli
+
       def self.exit_on_failure?
         true
       end

data/lib/afterlife/cli.rb

@@ -5,6 +5,7 @@ require 'thor'
 module Afterlife
   class Cli < Thor
     include BaseCli
+
     def self.exit_on_failure?
       true
     end

data/lib/afterlife/clickup/cli.rb

@@ -37,10 +37,23 @@ module Afterlife
                      desc: 'Force update status of tasks even if they would not be updated due to status precedence'
       option :dry_run, type: :boolean, default: false, aliases: '-d',
                        desc: 'Do not actually update the status of the tasks, just print what would be done'
-      def update_status(target_status, *task_ids)
+      option :cherry_pick, type: :boolean, default: false, aliases: '-c',
+                           desc: 'Include cherry pick status in the output'
+      option :verbose, type: :boolean, default: true, aliases: '-v',
+                       desc: 'Print skipped tasks'
+      option :commits, type: :string,
+                       desc: 'Commit messages used to detect reverted tasks'
+      def update_status(target_status, *task_ids) # rubocop:disable Metrics/AbcSize
         task_ids = $stdin.read.strip.split("\n") if task_ids.empty?
 
-        UpdateTaskStatus.call(task_ids, target_status, force: options[:force], dry_run: options[:dry_run])
+        UpdateTaskStatus.call(
+          task_ids, target_status,
+          force: options[:force],
+          dry_run: options[:dry_run],
+          cherry_pick: options[:cherry_pick],
+          verbose: options[:verbose],
+          commits: options[:commits],
+        )
       rescue StandardError => e
         fatal!(e.message)
       end

data/lib/afterlife/clickup/commit_input_splitter.rb

@@ -0,0 +1,64 @@
+# frozen_string_literal: true
+
+module Afterlife
+  module Clickup
+    class CommitInputSplitter
+      SUBJECT_PATTERN = /\A(?:revert\b|\w+(?:\(.+\))?!?:\s|.+#(?:CU[-_])?[a-z0-9]{8,})/i
+
+      def self.call(input)
+        new(input).call
+      end
+
+      def initialize(input)
+        @input = input.to_s.strip
+      end
+
+      def call
+        return [] if input.empty?
+
+        return split_github_input if input.include?('\\n')
+
+        split_real_newline_input
+      end
+
+    private
+
+      attr_reader :input
+
+      def split_github_input
+        input.lines(chomp: true).filter_map do |line|
+          line = line.strip
+          line.gsub('\\n', "\n") unless line.empty?
+        end
+      end
+
+      def split_real_newline_input
+        commits = []
+        current = []
+
+        input.lines(chomp: true).each do |line|
+          if subject?(line) && current.any?
+            commits << normalize(current)
+            current = []
+          end
+
+          current << line
+        end
+
+        commits << normalize(current) if current.any?
+        commits.reject(&:empty?)
+      end
+
+      def subject?(line)
+        return false if line.empty? || line.start_with?('*', '-', ' ')
+        return false if line.match?(/\AThis reverts commit\b/i)
+
+        line.match?(SUBJECT_PATTERN)
+      end
+
+      def normalize(lines)
+        lines.join("\n").strip
+      end
+    end
+  end
+end

data/lib/afterlife/clickup/get_ids_from_text.rb

@@ -10,7 +10,7 @@ module Afterlife
         /CU-([a-z0-9]+)/i,
       ].freeze
 
-      def self.call(text, convert_to_link = false) # rubocop:disable Metrics/MethodLength
+      def self.call(text, convert_to_link = false)
         ids = Set.new
 
         ID_PATTERNS.each do |pattern|

data/lib/afterlife/clickup/next_task_status_decider.rb

@@ -0,0 +1,46 @@
+# frozen_string_literal: true
+
+module Afterlife
+  module Clickup
+    class NextTaskStatusDecider
+      REVERT_SOURCE_STATUS = 'ready for qa'
+      REVERT_TARGET_STATUS = 'needs rework'
+
+      def self.call(**args)
+        new(**args).call
+      end
+
+      def initialize(clickup_task:, target_status:, force: false, reverted: false)
+        @clickup_task = clickup_task
+        @target_status = target_status
+        @force = force
+        @reverted = reverted
+        @precedence_checker = StatusPrecedenceChecker.new
+      end
+
+      def call
+        return if current_status.nil?
+
+        return reverted_status if reverted
+
+        skip_update? ? nil : target_status
+      end
+
+    private
+
+      attr_reader :clickup_task, :target_status, :force, :reverted, :precedence_checker
+
+      def current_status
+        @current_status ||= clickup_task&.dig('status', 'status')&.downcase
+      end
+
+      def reverted_status
+        REVERT_TARGET_STATUS if current_status == REVERT_SOURCE_STATUS
+      end
+
+      def skip_update?
+        !force && precedence_checker.should_skip_update?(current_status, target_status)
+      end
+    end
+  end
+end

data/lib/afterlife/clickup/status_precedence_checker.rb

@@ -14,7 +14,9 @@ module Afterlife
         'trunk merged',
         'ready for qa',
         'validated qa',
+        'deployed',
         'completed',
+        'closed',
       ].freeze
 
       def should_skip_update?(current_status, target_status)

data/lib/afterlife/clickup/task_revert_detector.rb

@@ -0,0 +1,30 @@
+# frozen_string_literal: true
+
+module Afterlife
+  module Clickup
+    class TaskRevertDetector
+      def initialize(commits)
+        @commits = CommitInputSplitter.call(commits)
+      end
+
+      def reverted?(task_id)
+        reverted = false
+
+        @commits.each do |commit|
+          next unless commit.match?(/#?(?:CU[-_])?#{Regexp.escape(task_id)}/i)
+
+          reverted = revert_count(commit, task_id).odd?
+        end
+
+        reverted
+      end
+
+    private
+
+      def revert_count(line, task_id)
+        before_task_id = line.split(/#?(?:CU[-_])?#{Regexp.escape(task_id)}/i, 2).first
+        before_task_id.scan(/\brevert\b/i).count
+      end
+    end
+  end
+end

data/lib/afterlife/clickup/update_task_status.rb

@@ -3,50 +3,101 @@
 module Afterlife
   module Clickup
     class UpdateTaskStatus
-      attr_reader :target_status, :precedence_checker, :api, :force, :dry_run
+      attr_reader :api, :force, :dry_run, :cherry_pick, :verbose, :revert_detector, :slack_output_path
 
-      def self.call(task_ids, target_status, force: false, dry_run: false)
-        new(force: force, dry_run: dry_run).call(task_ids, target_status)
+      def self.call(
+        task_ids, target_status, force: false, dry_run: false, cherry_pick: false, verbose: true, commits: nil
+      )
+        new(force:, dry_run:, cherry_pick:, verbose:, commits:).call(task_ids, target_status)
       end
 
-      def initialize(force: false, dry_run: false)
+      def initialize(force: false, dry_run: false, cherry_pick: false, verbose: true, commits: nil)
         @force = force
         @dry_run = dry_run
+        @cherry_pick = cherry_pick
+        @verbose = verbose
+        @slack_output_path = ENV.fetch('AFTERLIFE_SLACK_OUTPUT', nil)
+        write_slack_output('') if slack_output_path
+        @revert_detector = TaskRevertDetector.new(commits)
         token = ENV['CLICKUP_TOKEN'] || fail('CLICKUP_TOKEN required, put `export CLICKUP_TOKEN=...` or the equivalent in your shell') # rubocop:disable Layout/LineLength
-        @api = Api.new(token: token)
-        @precedence_checker = StatusPrecedenceChecker.new
+        @api = Api.new(token:)
       end
 
-      def call(task_ids, target_status) # rubocop:disable Metrics/AbcSize,Metrics/MethodLength
+      def call(task_ids, target_status) # rubocop:disable Metrics/AbcSize
         if task_ids.empty?
-          puts 'No tasks to update'
+          log 'No tasks to update'
           return []
         end
 
-        puts 'WARNING: Forcing status updates...' if force
-        puts 'WARNING: Dry run, no tasks will be updated' if dry_run
-        puts "Updating #{task_ids.length} tasks to '#{target_status}'"
+        log 'WARNING: Forcing status updates...' if force
+        log 'WARNING: Dry run, no tasks will be updated' if dry_run
+        log "#{dry_run ? 'Would update' : 'Updating'} #{task_ids.length} tasks to '#{target_status}'"
         moved_task_ids = task_ids.map { |task_id| move_task(task_id, target_status) }.compact
-        puts "#{dry_run ? 'Would have moved' : 'Moved'} #{moved_task_ids.length} tasks:"
+        log "#{dry_run ? 'Would have moved' : 'Moved'} #{moved_task_ids.length} tasks:"
         moved_task_ids.each do |task|
-          puts "- #{task[:link]} (from '#{task[:previous_status]}' to '#{task[:new_status]}')"
+          cherry_pick_status = " - Cherry Pick: #{task[:is_cherry_pick] ? '✅' : '❌'}" if cherry_pick
+          log "- #{task[:link]} (from '#{task[:previous_status]}' to '#{task[:new_status]}')#{cherry_pick_status}"
         end
         moved_task_ids
       end
 
     private
 
-      def move_task(task_id, target_status)
-        current_status = api.get_task(task_id).dig('status', 'status')&.downcase
+      def move_task(task_id, target_status) # rubocop:disable Metrics/AbcSize
+        task = api.get_task(task_id)
+        current_status = task&.dig('status', 'status')&.downcase
+        if current_status.nil?
+          log "WARNING: Task #{task_id} not found", verbose: true
+          return
+        end
 
-        return puts "WARNING: Task #{task_id} not found" if current_status.nil?
+        is_cherry_pick = Array(task['custom_fields']).any? do |field|
+          field['name'].match?(/cherry pick/i) && [true, 'true'].include?(field['value'])
+        end
 
-        should_skip_update = !force && precedence_checker.should_skip_update?(current_status, target_status)
         task_link = "https://app.clickup.com/t/#{task_id}"
-        return puts "Skipping task #{task_link} because it's already at '#{current_status}'" if should_skip_update
+        next_status = next_status_for(task_id, task, target_status)
+        return if next_status.nil?
+
+        api.update_task(task_id, { status: next_status }) unless dry_run
+
+        {
+          id: task_id,
+          link: task_link,
+          previous_status: current_status,
+          new_status: next_status,
+          is_cherry_pick:,
+        }
+      end
+
+      def next_status_for(task_id, task, target_status)
+        current_status = task.dig('status', 'status')&.downcase
+        reverted = revert_detector.reverted?(task_id)
+        next_status = NextTaskStatusDecider.call(clickup_task: task, target_status:, force:, reverted:)
+
+        if reverted && next_status
+          log "Moving task https://app.clickup.com/t/#{task_id} to '#{next_status}': reverted in pushed commits"
+        elsif !reverted && next_status.nil?
+          log(
+            "Skipping task https://app.clickup.com/t/#{task_id} because it's already at '#{current_status}'",
+            verbose: true,
+          )
+        end
+
+        next_status
+      end
+
+      def log(message, verbose: false)
+        return if verbose && !@verbose
+
+        puts message
+        write_slack_output("#{message}\n", mode: 'a') if !verbose && slack_output_path
+      end
 
-        api.update_task(task_id, { status: target_status }) unless dry_run
-        { id: task_id, link: task_link, previous_status: current_status, new_status: target_status }
+      def write_slack_output(message, mode: 'w')
+        File.write(slack_output_path, message, mode:)
+      rescue SystemCallError
+        nil
       end
     end
   end

data/lib/afterlife/config/cli.rb

@@ -4,6 +4,7 @@ module Afterlife
   module Config
     class Cli < Thor
       include BaseCli
+
       def self.exit_on_failure?
         true
       end

data/lib/afterlife/config/provider.rb

@@ -20,7 +20,7 @@ module Afterlife
         config.key?(sym) || super
       end
 
-      def method_missing(sym, *args, &block)
+      def method_missing(sym, *args, &)
         config.key?(sym) ? config[sym] : super
       end
 

data/lib/afterlife/deploy/cli.rb

@@ -4,6 +4,7 @@ module Afterlife
   module Deploy
     class Cli < Thor
       include BaseCli
+
       def self.exit_on_failure?
         true
       end

data/lib/afterlife/notify.rb

@@ -28,8 +28,8 @@ module Afterlife
     def send_request(repository, branch)
       uri = URI(notification_url)
       body = {
-        branch: branch,
-        repository: repository,
+        branch:,
+        repository:,
       }
       headers = { 'Content-Type': 'application/json' }
       Net::HTTP.post(uri, body.to_json, headers)

data/lib/afterlife/propagate/cli.rb

@@ -4,6 +4,7 @@ module Afterlife
   module Propagate
     class Cli < Thor
       include BaseCli
+
       def self.exit_on_failure?
         true
       end

data/lib/afterlife/propagate/propagate_qa_to_sandbox.rb

@@ -116,7 +116,7 @@ module Afterlife
 
       def generate_tag_name
         now = Time.now
-        year = now.year.to_s[2..3]  # Last two digits of year
+        year = now.year.to_s[2..3] # Last two digits of year
         month = format('%02d', now.month)
         day = format('%02d', now.day)
         "#{year}#{month}#{day}"

data/lib/afterlife/release/change_version.rb

@@ -3,7 +3,7 @@
 module Afterlife
   module Release
     class ChangeVersion
-      RUBY_REGEXP = /VERSION\s*=\s*['"]#{Bump::Semver::VERSION_REGEX}['"]/.freeze
+      RUBY_REGEXP = /VERSION\s*=\s*['"]#{Bump::Semver::VERSION_REGEX}['"]/
       REGEXPS = {
         ruby: RUBY_REGEXP,
         gem: RUBY_REGEXP,

data/lib/afterlife/release/cli.rb

@@ -26,7 +26,7 @@ module Afterlife
         assert_git_dependency
         fatal! "Part '#{part}' is not allowed" unless CreateHelper::PARTS.include?(part.to_sym)
 
-        CreateHelper.call(self, options.merge(part: part))
+        CreateHelper.call(self, options.merge(part:))
       end
 
       desc 'hotfix', 'create a hotfix branch'

data/lib/afterlife/release/create_helper.rb

@@ -19,7 +19,7 @@ module Afterlife
       end
 
       def call
-        confirm_creation unless cli.options[:yes]
+        creation_prompt unless cli.options[:yes]
         make_assertions unless cli.options[:force]
         create_branch
         ChangeVersion.call(new_version)
@@ -49,10 +49,11 @@ module Afterlife
         cli.fatal! 'Local and remote are not on the same commit'
       end
 
-      def confirm_creation
+      def creation_prompt
         cli.sure? 'You are about to create the branch ' \
                   "#{cli.set_color(branch_name, :bold)} " \
                   "from #{cli.set_color(from, :bold)}"
+        nil
       end
 
       def create_branch

data/lib/afterlife/release/pre_helper.rb

@@ -4,20 +4,21 @@ module Afterlife
   module Release
     class PreHelper < Helper
       def call
-        confirm_creation
+        creation_prompt
         check_tag_does_not_exist
         commit
         create_tag
         push_tag if cli.options[:push]
       end
 
-      def confirm_creation
+      def creation_prompt
         return if cli.options[:yes]
 
-        cli.sure? 'You are about to create ' \
-                  "#{cli.options[:push] ? '(and push) ' : ''}" \
+        action = cli.options[:push] ? '(and push) ' : ''
+        cli.sure? "You are about to create #{action}" \
                   "the tag #{cli.set_color(tag, :bold)} " \
                   'in the current commit'
+        nil
       end
 
       def check_tag_does_not_exist

data/lib/afterlife/repo/config.rb

@@ -5,24 +5,24 @@ module Afterlife
     # Reads configuration from the repo,
     # either from YML or from the repo instance methods
     class Config
-      Error = Class.new StandardError
+      class Error < StandardError; end
 
       attr_reader :path
 
-      def self.read(path, &block)
-        new(path).read(&block)
+      def self.read(path, &)
+        new(path).read(&)
       end
 
       def initialize(path)
         @path = path
       end
 
-      def read(&block) # rubocop:disable Metrics/MethodLength
+      def read(&)
         case from_yml
         when Hash
           yield(JSON.generate(from_yml))
         when Array
-          from_yml.each(&block)
+          from_yml.each(&)
         when String, Symbol
           yield(from_yml)
         else

data/lib/afterlife/version.rb

@@ -1,5 +1,5 @@
 # frozen_string_literal: true
 
 module Afterlife
-  VERSION = '1.8.0'
+  VERSION = '1.9.0'
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: afterlife
 version: !ruby/object:Gem::Version
-  version: 1.8.0
+  version: 1.9.0
 platform: ruby
 authors:
 - Genaro Madrid
 autorequire:
 bindir: exe
 cert_chain: []
-date: 2025-11-10 00:00:00.000000000 Z
+date: 2026-07-03 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: faraday
@@ -24,6 +24,20 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: '0'
+- !ruby/object:Gem::Dependency
+  name: ostruct
+  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: racc
   requirement: !ruby/object:Gem::Requirement
@@ -97,9 +111,12 @@ files:
 - lib/afterlife/clickup.rb
 - lib/afterlife/clickup/api.rb
 - lib/afterlife/clickup/cli.rb
+- lib/afterlife/clickup/commit_input_splitter.rb
 - lib/afterlife/clickup/get_ids_from_text.rb
 - lib/afterlife/clickup/get_range_commits.rb
+- lib/afterlife/clickup/next_task_status_decider.rb
 - lib/afterlife/clickup/status_precedence_checker.rb
+- lib/afterlife/clickup/task_revert_detector.rb
 - lib/afterlife/clickup/update_task_status.rb
 - lib/afterlife/config.rb
 - lib/afterlife/config/cli.rb
@@ -144,14 +161,14 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
-      version: '2.6'
+      version: '3.3'
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.2.33
+rubygems_version: 3.5.16
 signing_key:
 specification_version: 4
 summary: Devops utils