afterlife 1.7.3 → 1.8.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 04142460aa12c27177dd71d0450a10930e27370ab91b753f107ace751735ebbd
-  data.tar.gz: a9f0f37abc39566e8c7a5660b5a86108a7e1dcc88f87936e882f0364f00687c7
+  metadata.gz: 6f862660ef3c576008d2054a427dcd03fbbbd8a1fe070158507f1eeaa32d288c
+  data.tar.gz: 9cc64fe488e5c3da7213bd8ca3b61d86539207dfef6a42fc5e043cb5047d3246
 SHA512:
-  metadata.gz: c503b855bd1257b9266c010ca4364fc894d26aefaccb65f2debaba46859bf7af51e661265f148bb0119ea1432e3edc7fd21d5f89ba546e8be719c7f26e1c960c
-  data.tar.gz: 9e046b5c9bb75f1ffd71edf220935260423c5d4d7d5fffabaedffc82a849944e0850458ac1e90885ccb96ad5072d802cac06bfa1851139f27295287386b42f1f
+  metadata.gz: 7a81d5767dadaf2ef615236856124f26fb17bdaaf198a5fef2edbfe520ca0aacb8196deab2345605f5d591ecfa35dbffd516db9061c98628b2aecf808986c8df
+  data.tar.gz: 8666f13424d39b7b5bc045e7b04c0b71de3a5842d3c519963e399fd62fc465ca6242711ad3ed79a1d4ce25e4b5db70065a6ff7fb2774bc1b9954c5851745fe9e

data/README.md

@@ -40,12 +40,29 @@ To not do this blindly, you can run just `afterlife clickup get-commits <revisio
 clickup extract-ids` to review if the tasks being moved are correct. But the `update-status` in the
 full command will print the list of moved or ignored tasks anyway.
 
+Also, to easily run these commands, is recommended to setup an alias:
+
+For bash or zsh:
+```bash
+alias ci="afterlife clickup"
+```
+
+For fish:
+```fish
+alias ci 'afterlife clickup'
+```
+
 ## Development
 
 After checking out the repo, run `bin/setup` to install dependencies. Then, run `rake spec` to run the tests. You can also run `bin/console` for an interactive prompt that will allow you to experiment.
 
 To install this gem onto your local machine, run `bundle exec rake install`. To release a new version, update the version number in `version.rb`, and then run `bundle exec rake release`, which will create a git tag for the version, push git commits and the created tag, and push the `.gem` file to [rubygems.org](https://rubygems.org).
 
+## Publishing
+This gem is published on rubygems. To publish there, just:
+1. Do a version bump in `lib/afterlife/version.rb`.
+2. Execute `bundle exec rake release`. This will ask you for rubygems credentials. You'll access, ask Genaro for it. 
+
 ## Contributing
 
 Bug reports and pull requests are welcome on GitHub at https://github.com/[USERNAME]/afterlife.

data/lib/afterlife/cli.rb

@@ -50,6 +50,9 @@ module Afterlife
     desc 'clickup', 'ClickUp integration commands'
     subcommand 'clickup', Clickup::Cli
 
+    desc 'propagate', 'Propagate commands'
+    subcommand 'propagate', Propagate::Cli
+
     map %w[-v --version] => :version
     desc 'version', 'Prints afterlife version'
     def version

data/lib/afterlife/clickup/cli.rb

@@ -12,16 +12,20 @@ module Afterlife
       end
 
       desc 'extract-ids [TEXT]', 'Extract ClickUp task IDs from text or stdin'
+      option :link, type: :boolean, default: false, aliases: '-l',
+                    desc: 'Convert task IDs to links'
       def extract_ids(text = nil)
         text ||= $stdin.read
-        ids = GetIdsFromText.call(text)
+        ids = GetIdsFromText.call(text, options[:link])
         ids.each { |id| puts id }
       end
 
       desc 'get-commits FROM_REVISION [TO_REVISION]',
            'Get commits between revisions. The revision can be a short or long version of the commit sha.'
+      option :short, type: :boolean, default: false, aliases: '-s',
+                     desc: 'Only prints a short version of the commit, do not use it on CI.'
       def get_commits(from_revision, to_revision = 'HEAD')
-        messages = GetRangeCommits.call(from_revision, to_revision)
+        messages = GetRangeCommits.call(from_revision, to_revision, short: options[:short])
         puts messages
       rescue StandardError => e
         fatal!(e.message)
@@ -29,10 +33,14 @@ module Afterlife
 
       desc 'update-status TARGET_STATUS TASK_ID [TASK_ID...]',
            "Update status of ClickUp tasks. Possible values for TARGET_STATUS: #{CLICKUP_STATUS_OPTIONS}"
+      option :force, type: :boolean, default: false, aliases: '-f',
+                     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)
         task_ids = $stdin.read.strip.split("\n") if task_ids.empty?
 
-        UpdateTaskStatus.call(task_ids, target_status)
+        UpdateTaskStatus.call(task_ids, target_status, force: options[:force], dry_run: options[:dry_run])
       rescue StandardError => e
         fatal!(e.message)
       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)
+      def self.call(text, convert_to_link = false) # rubocop:disable Metrics/MethodLength
         ids = Set.new
 
         ID_PATTERNS.each do |pattern|
@@ -19,7 +19,11 @@ module Afterlife
           end
         end
 
-        ids.to_a
+        if convert_to_link
+          ids.map { |id| "https://app.clickup.com/t/#{id}" }
+        else
+          ids.to_a
+        end
       end
     end
   end

data/lib/afterlife/clickup/get_range_commits.rb

@@ -5,9 +5,13 @@ require 'English'
 module Afterlife
   module Clickup
     class GetRangeCommits
-      def self.call(from_revision, to_revision = 'HEAD')
+      SHORT_PARAMS = "--graph --decorate --pretty=format:'%C(yellow)%h %C(cyan)%ad %C(cyan)%d %Creset%s %Cgreen[%an]' --date=relative" # rubocop:disable Layout/LineLength
+      DEFAULT_PARAMS = "--pretty=format:'%s%n%b'"
+
+      def self.call(from_revision, to_revision = 'HEAD', short: nil)
         range = "#{from_revision}..#{to_revision}"
-        commit_messages = `git log --pretty=format:"%s%n%b" #{range}`.strip
+        params = short ? SHORT_PARAMS : DEFAULT_PARAMS
+        commit_messages = `git log #{params} #{range}`.strip
         fail "Error getting commits for range #{range}" unless $CHILD_STATUS.success?
 
         commit_messages

data/lib/afterlife/clickup/update_task_status.rb

@@ -3,27 +3,34 @@
 module Afterlife
   module Clickup
     class UpdateTaskStatus
-      attr_reader :target_status, :precedence_checker, :api
+      attr_reader :target_status, :precedence_checker, :api, :force, :dry_run
 
-      def self.call(task_ids, target_status)
-        new.call(task_ids, target_status)
+      def self.call(task_ids, target_status, force: false, dry_run: false)
+        new(force: force, dry_run: dry_run).call(task_ids, target_status)
       end
 
-      def initialize
+      def initialize(force: false, dry_run: false)
+        @force = force
+        @dry_run = dry_run
         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
       end
 
-      def call(task_ids, target_status)
+      def call(task_ids, target_status) # rubocop:disable Metrics/AbcSize,Metrics/MethodLength
         if task_ids.empty?
           puts '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}'"
         moved_task_ids = task_ids.map { |task_id| move_task(task_id, target_status) }.compact
-        puts "Moved #{moved_task_ids.length} tasks, with ids: #{moved_task_ids.join(', ')}"
+        puts "#{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]}')"
+        end
         moved_task_ids
       end
 
@@ -34,11 +41,12 @@ module Afterlife
 
         return puts "WARNING: Task #{task_id} not found" if current_status.nil?
 
-        should_skip_update = precedence_checker.should_skip_update?(current_status, target_status)
-        return puts "Skipping task #{task_id} because it's already at '#{current_status}'" if should_skip_update
+        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
 
-        api.update_task(task_id, { status: target_status })
-        task_id
+        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 }
       end
     end
   end

data/lib/afterlife/config/provider.rb

@@ -11,6 +11,7 @@ module Afterlife
       CLOUD_PROFILES = {
         staging: PROFILE_TESTING,
         qa: PROFILE_TESTING,
+        dev: PROFILE_TESTING,
         sandbox: PROFILE_PRODUCTION,
         production: PROFILE_PRODUCTION,
       }.freeze

data/lib/afterlife/deploy/docker_deployment.rb

@@ -0,0 +1,103 @@
+# frozen_string_literal: true
+
+module Afterlife
+  module Deploy
+    class DockerDeployment < Deployment
+      def setup
+        Afterlife.current_repo.env.set('PLATFORM' => 'linux/amd64') if deploy_stage?
+
+        Afterlife.current_repo.env.set!(
+          'REGISTRY' => registry,
+          'TAG' => tag,
+        )
+      end
+
+      def run
+        Exec.run(commands)
+      end
+
+      def confirmation_message
+        'You are about to deploy the current directory'
+      end
+
+    private
+
+      def commands
+        [
+          authenticate_command,
+          build_command,
+        ].flatten.compact
+      end
+
+      # commands
+
+      def authenticate_command
+        return if options['no-auth'] || local_stage?
+
+        AwsAuth.new(registry).commands
+      end
+
+      def build_command
+        return if options['no-build']
+
+        <<-BASH
+          docker buildx bake --allow=ssh -f docker-bake.hcl #{targets.join(' ')} #{local_stage? ? '--load' : '--push'}
+        BASH
+      end
+
+      def targets
+        repo.conf.dig(:deploy, :targets) || %w[app]
+      end
+
+      def tag
+        repo.conf.dig(:deploy, :tag) || repo.current_revision
+      end
+
+      # utils
+
+      def local_stage?
+        Afterlife.current_stage.name.to_sym == :local
+      end
+
+      def deploy_stage?
+        %i[qa production staging dev].include?(Afterlife.current_stage.name.to_sym)
+      end
+
+      # Priority:
+      # 1. Uses AFTERLIFE_DEPLOY_REGISTRY from the ENV if it's defined. It can be
+      #    either in real system ENV, or defined in the env section of the repo
+      #    .afterlife.yml config
+      # 2. Uses repo .afterlife.yml config at deploy.registry
+      # 3. Uses stages.$current_stage.registry if exists in ~/.afterlife/config.yml
+      def registry
+        @registry ||= Afterlife.current_repo.variable('deploy.registry') || Afterlife.current_stage.registry
+      end
+
+      class AwsAuth
+        attr_reader :registry
+
+        def initialize(registry)
+          @registry = registry
+        end
+
+        def commands
+          [docker_login]
+        end
+
+        def docker_login
+          <<-BASH
+            echo "#{aws_ecr_token}" | docker login --username AWS --password-stdin #{registry}
+          BASH
+        end
+
+        def aws_ecr_token
+          @aws_ecr_token ||= Exec.result("aws ecr get-login-password --region #{region}")
+        end
+
+        def region
+          @region ||= registry.gsub(/[^.]+\.dkr\.ecr\.([^.]+)\.amazonaws\.com/, '\1')
+        end
+      end
+    end
+  end
+end

data/lib/afterlife/deploy/kubernetes_deployment.rb

@@ -2,16 +2,7 @@
 
 module Afterlife
   module Deploy
-    class KubernetesDeployment < Deployment
-      def setup
-        Afterlife.current_repo.env.set('PLATFORM' => 'linux/amd64') if deploy_stage?
-
-        Afterlife.current_repo.env.set!(
-          'REGISTRY' => registry,
-          'TAG' => repo.current_revision,
-        )
-      end
-
+    class KubernetesDeployment < DockerDeployment
       def run
         Exec.run(commands)
       end
@@ -24,7 +15,9 @@ module Afterlife
 
       def commands
         [
+          # from DockerDeployment
           authenticate_command,
+          # from DockerDeployment
           build_command,
           set_image_command,
           apply_kubernetes_settings,
@@ -33,20 +26,6 @@ module Afterlife
 
       # commands
 
-      def authenticate_command
-        return if options['no-auth'] || local_stage?
-
-        AwsAuth.new(registry).commands
-      end
-
-      def build_command
-        return if options['no-build']
-
-        <<-BASH
-          docker buildx bake --allow=ssh -f docker-bake.hcl #{targets.join(' ')} #{local_stage? ? '--load' : '--push'}
-        BASH
-      end
-
       def set_image_command
         <<-BASH
           cd #{kubelocation} &&
@@ -58,10 +37,6 @@ module Afterlife
         BASH
       end
 
-      def targets
-        repo.conf.dig(:deploy, :targets) || %w[app]
-      end
-
       def registry_image_name(target)
         "#{registry}/#{full_image_name(target)}:#{repo.current_revision}"
       end
@@ -82,6 +57,7 @@ module Afterlife
       end
 
       def assert_correct_context
+        return if Afterlife.current_stage.name == 'local'
         return if current_context == expected_context
 
         fail Error, "kubectl context should be '#{expected_context}' but you are in '#{current_context}'"
@@ -97,14 +73,6 @@ module Afterlife
 
       # utils
 
-      def local_stage?
-        Afterlife.current_stage.name.to_sym == :local
-      end
-
-      def deploy_stage?
-        %i[qa production staging].include?(Afterlife.current_stage.name.to_sym)
-      end
-
       def kubelocation
         ".afterlife/#{Afterlife.current_stage.name}"
       end
@@ -114,42 +82,6 @@ module Afterlife
           fail Error, 'deploy.image_name for kubernetes deployments' unless result
         end
       end
-
-      # Priority:
-      # 1. Uses AFTERLIFE_DEPLOY_REGISTRY from the ENV if it's defined. It can be
-      #    either in real system ENV, or defined in the env section of the repo
-      #    .afterlife.yml config
-      # 2. Uses repo .afterlife.yml config at deploy.registry
-      # 3. Uses stages.$current_stage.registry if exists in ~/.afterlife/config.yml
-      def registry
-        @registry ||= Afterlife.current_repo.variable('deploy.registry') || Afterlife.current_stage.registry
-      end
-
-      class AwsAuth
-        attr_reader :registry
-
-        def initialize(registry)
-          @registry = registry
-        end
-
-        def commands
-          [docker_login]
-        end
-
-        def docker_login
-          <<-BASH
-            echo "#{aws_ecr_token}" | docker login --username AWS --password-stdin #{registry}
-          BASH
-        end
-
-        def aws_ecr_token
-          @aws_ecr_token ||= Exec.result("aws ecr get-login-password --region #{region}")
-        end
-
-        def region
-          @region ||= registry.gsub(/[^.]+\.dkr\.ecr\.([^.]+)\.amazonaws\.com/, '\1')
-        end
-      end
     end
   end
 end

data/lib/afterlife/deploy.rb

@@ -8,6 +8,7 @@ module Afterlife
       cdn: 'CdnDeployment',
       cdn_stenciljs: 'CdnStenciljsDeployment',
       custom: 'CustomDeployment',
+      docker: 'DockerDeployment',
       kubernetes: 'KubernetesDeployment',
     }.freeze
 

data/lib/afterlife/propagate/cli.rb

@@ -0,0 +1,44 @@
+# frozen_string_literal: true
+
+module Afterlife
+  module Propagate
+    class Cli < Thor
+      include BaseCli
+      def self.exit_on_failure?
+        true
+      end
+
+      desc 'propagate-qa-to-sandbox', 'Propagate QA branch to Sandbox branch (fetch, reset, push)'
+      option :yes, type: :boolean, aliases: '-y',
+                   desc: 'Skip confirmation prompt'
+      def propagate_qa_to_sandbox
+        confirmation_message = <<~MSG
+          This command will perform the following actions:
+
+          1. Fetch the latest changes from origin/qa
+          2. Switch to the sandbox branch
+          3. Reset sandbox branch to match origin/qa exactly
+          4. Force push the changes to origin/sandbox
+          5. Return to your original branch
+
+          This operation will completely overwrite the sandbox branch with the current state of QA.
+          Are you sure you want to proceed?
+        MSG
+
+        sure?(confirmation_message) unless options[:yes]
+
+        PropagateQaToSandbox.call
+      rescue StandardError => e
+        fatal!(e.message)
+      rescue Interrupt
+        log_interrupted
+      end
+
+    private
+
+      def repo
+        Afterlife.current_repo
+      end
+    end
+  end
+end

data/lib/afterlife/propagate/propagate_qa_to_sandbox.rb

@@ -0,0 +1,148 @@
+# frozen_string_literal: true
+
+module Afterlife
+  module Propagate
+    class PropagateQaToSandbox
+      def self.call(repo_path = nil)
+        new(repo_path).call
+      end
+
+      def initialize(repo_path = nil)
+        @repo_path = repo_path || Afterlife.current_repo.full_path
+        @original_branch = nil
+      end
+
+      def call
+        log_info "Starting QA to Sandbox propagation in #{@repo_path}"
+
+        @original_branch = current_branch
+        log_info "Current branch: #{@original_branch}"
+
+        fetch_qa_branch
+        switch_to_sandbox
+        reset_sandbox_to_qa
+        push_sandbox_changes
+
+        log_success 'Successfully propagated QA to Sandbox'
+
+        return_to_original_branch if @original_branch != 'sandbox'
+      rescue StandardError => e
+        log_error "Error during propagation: #{e.message}"
+        return_to_original_branch if @original_branch && @original_branch != current_branch
+        raise
+      end
+
+    private
+
+      def fetch_qa_branch
+        log_info 'Fetching latest changes from remote...'
+        `cd #{@repo_path} && git fetch origin qa`
+        fail 'Failed to fetch origin/qa' unless $CHILD_STATUS.success?
+
+        log_success 'Successfully fetched origin/qa'
+      end
+
+      def switch_to_sandbox
+        log_info 'Switching to sandbox branch...'
+        `cd #{@repo_path} && git checkout sandbox`
+        fail 'Failed to switch to sandbox branch' unless $CHILD_STATUS.success?
+
+        log_success 'Successfully switched to sandbox branch'
+      end
+
+      def reset_sandbox_to_qa
+        log_info 'Resetting sandbox to origin/qa...'
+        `cd #{@repo_path} && git reset --hard origin/qa`
+        fail 'Failed to reset sandbox to origin/qa' unless $CHILD_STATUS.success?
+
+        log_success 'Successfully reset sandbox to origin/qa'
+      end
+
+      def push_sandbox_changes
+        log_info 'About to push changes to remote sandbox...'
+        log_info 'This will force push and overwrite the remote sandbox branch'
+
+        unless yes?('Do you want to continue? [y/n]')
+          log_info 'Push cancelled by user. Reverting changes...'
+          revert_sandbox_changes
+          return
+        end
+
+        log_info 'Pushing changes to remote sandbox...'
+        `cd #{@repo_path} && git push origin sandbox --force-with-lease`
+        fail 'Failed to push to origin/sandbox' unless $CHILD_STATUS.success?
+
+        create_and_push_tag
+
+        log_success 'Successfully pushed to origin/sandbox'
+      end
+
+      def revert_sandbox_changes
+        log_info 'Reverting sandbox to previous state...'
+        `cd #{@repo_path} && git reset --hard HEAD@{1}`
+        if $CHILD_STATUS.success?
+          log_success 'Successfully reverted sandbox changes'
+        else
+          log_error 'Failed to revert changes. Manual intervention may be required.'
+          fail 'Failed to revert sandbox changes'
+        end
+      end
+
+      def return_to_original_branch
+        log_info "Returning to original branch: #{@original_branch}"
+        `cd #{@repo_path} && git checkout #{@original_branch}`
+        fail "Failed to return to original branch #{@original_branch}" unless $CHILD_STATUS.success?
+
+        log_success "Successfully returned to #{@original_branch}"
+      end
+
+      def current_branch
+        `cd #{@repo_path} && git rev-parse --abbrev-ref HEAD`.chomp
+      end
+
+      def create_and_push_tag
+        tag_name = generate_tag_name
+        log_info "Creating tag: #{tag_name}"
+
+        `cd #{@repo_path} && git tag #{tag_name}`
+        fail "Failed to create tag #{tag_name}" unless $CHILD_STATUS.success?
+
+        log_info 'Pushing tag to remote...'
+        `cd #{@repo_path} && git push origin #{tag_name}`
+        fail "Failed to push tag #{tag_name}" unless $CHILD_STATUS.success?
+
+        log_success "Successfully created and pushed tag: #{tag_name}"
+      end
+
+      def generate_tag_name
+        now = Time.now
+        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}"
+      end
+
+      def log_info(message)
+        puts "\e[36m#{message}\e[0m"
+      end
+
+      def log_success(message)
+        puts "\e[32m#{message}\e[0m"
+      end
+
+      def log_error(message)
+        puts "\e[31m#{message}\e[0m"
+      end
+
+      def fail(message)
+        fail StandardError, message
+      end
+
+      def yes?(question)
+        print "#{question} "
+        response = $stdin.gets.chomp.downcase
+        %w[y yes].include?(response)
+      end
+    end
+  end
+end

data/lib/afterlife/propagate.rb

@@ -0,0 +1,6 @@
+# frozen_string_literal: true
+
+module Afterlife
+  module Propagate
+  end
+end

data/lib/afterlife/version.rb

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

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: afterlife
 version: !ruby/object:Gem::Version
-  version: 1.7.3
+  version: 1.8.0
 platform: ruby
 authors:
 - Genaro Madrid
 autorequire:
 bindir: exe
 cert_chain: []
-date: 2025-07-29 00:00:00.000000000 Z
+date: 2025-11-10 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: faraday
@@ -110,10 +110,14 @@ files:
 - lib/afterlife/deploy/cli.rb
 - lib/afterlife/deploy/custom_deployment.rb
 - lib/afterlife/deploy/deployment.rb
+- lib/afterlife/deploy/docker_deployment.rb
 - lib/afterlife/deploy/kubernetes_deployment.rb
 - lib/afterlife/environment.rb
 - lib/afterlife/exec.rb
 - lib/afterlife/notify.rb
+- lib/afterlife/propagate.rb
+- lib/afterlife/propagate/cli.rb
+- lib/afterlife/propagate/propagate_qa_to_sandbox.rb
 - lib/afterlife/release.rb
 - lib/afterlife/release/change_version.rb
 - lib/afterlife/release/cli.rb
@@ -147,7 +151,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.5.16
+rubygems_version: 3.2.33
 signing_key:
 specification_version: 4
 summary: Devops utils