decidim-maintainers_toolbox 0.2.0 → 0.3.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: a0b9ae7866429214e90e126591375eac79e09fdc47cf2fb49f6e8bdf69a20c3d
-  data.tar.gz: 30e89f1df16e431b83201ca802e3b85a6de707cdd6c7a8d9d6f0efa0a2949676
+  metadata.gz: 28f518a4728ae94af5041c325e6c3814af3e48740d9c3e6cb28c2f3c83a358f2
+  data.tar.gz: 8700cc97ce988b8500e30961bd1d157f435971b5ea726769bd7df25a8d14e09c
 SHA512:
-  metadata.gz: 571f60cad557dbd12773c93de4d8f2d14f42694338c134d9f0d7d83c9c3ade328df0e474c672208cf5211153b1e719cd8cc81c9841c4ba5cd70b43c5436db2f9
-  data.tar.gz: 0b42c263e333d1c0bb8e18fb58db11bed8e1a491a3fab8f7291b15160b3ff7929c90ba69e4a911602e542a545c25fb93d45fdd070e95a23639ba88ba0d86eedf
+  metadata.gz: 953bb3fd9f7d34dc69797e0d40b874c6c6192a3250ec8533d65da67c32767ddff79b3776ba73d96cc29f595073f0234c4766a64205c28826998bb008441c3ae2
+  data.tar.gz: 1da57e99537368d5af2065745b5808888ef7738ebf2faee5d4d282f5217f726fde64fa492b74ceb784c94109cb0bb3135de0460ec8ec6a1d5c65dcb41c84867a

data/exe/decidim-action-backporter

@@ -0,0 +1,40 @@
+#!/usr/bin/env ruby
+# frozen_string_literal: true
+
+require "thor"
+
+require_relative "../lib/decidim/maintainers_toolbox/github_manager/querier"
+require_relative "../lib/decidim/maintainers_toolbox/action_backporter"
+
+class ActionBackporterCLI < Thor
+  desc "", "Backport a pull request to another branch. This is intended to be run in the GitHub Action environment, for automating the backport processes."
+  option :github_token, required: true, desc: <<~HELP
+    Required. Github Personal Access Token (PAT). It can be obtained from https://github.com/settings/tokens/new. You will need to create one with `public_repo` access.
+    Alternatively, you can use the `gh` CLI tool to authenticate with `gh auth token` (i.e. --github-token=$(gh auth token))
+  HELP
+  option :pull_request_id, required: true, desc: "Required. The ID of the pull request that you want to make the backport from. It should have the \"type: fix\" label."
+  option :exit_with_unstaged_changes, type: :boolean, default: true, desc: <<~HELP
+    Optional. Whether the script should exit with an error if there are unstaged changes in the current project.
+  HELP
+  default_task :backport
+
+  def backport
+    Decidim::MaintainersToolbox::ActionBackporter.new(
+      token: options[:github_token],
+      pull_request_id: options[:pull_request_id],
+      exit_with_unstaged_changes: options[:exit_with_unstaged_changes]
+    ).call
+  rescue Decidim::MaintainersToolbox::GithubManager::Querier::Base::InvalidMetadataError
+    puts "Metadata was not returned from the server. Please check that the provided pull request ID and GitHub token are correct."
+  end
+
+  def help
+    super("backport")
+  end
+
+  def self.exit_on_failure?
+    true
+  end
+end
+
+ActionBackporterCLI.start(ARGV)

data/exe/decidim-backporter

@@ -19,6 +19,9 @@ class BackporterCLI < Thor
   option :exit_with_unstaged_changes, type: :boolean, default: true, desc: <<~HELP
     Optional. Whether the script should exit with an error if there are unstaged changes in the current project.
   HELP
+  option :with_console, required: false, type: :boolean, default: true, desc: <<~HELP
+    Optional. Disables the shell dropout 
+  HELP
   default_task :backport
 
   def backport
@@ -26,7 +29,8 @@ class BackporterCLI < Thor
       token: options[:github_token],
       pull_request_id: options[:pull_request_id],
       version_number: options[:version_number],
-      exit_with_unstaged_changes: options[:exit_with_unstaged_changes]
+      exit_with_unstaged_changes: options[:exit_with_unstaged_changes],
+      with_console: options[:with_console]
     ).call
   rescue Decidim::MaintainersToolbox::GithubManager::Querier::Base::InvalidMetadataError
     puts "Metadata was not returned from the server. Please check that the provided pull request ID and GitHub token are correct."

data/lib/decidim/maintainers_toolbox/action_backporter.rb

@@ -0,0 +1,98 @@
+# frozen_string_literal: true
+
+require_relative "github_manager/querier"
+require_relative "github_manager/poster"
+require_relative "git_backport_manager"
+
+module Decidim
+  module MaintainersToolbox
+    class ActionBackporter
+      class InvalidMetadataError < StandardError; end
+
+      DECIDIM_MAINTAINERS = ["alecslupu", "andreslucena"]
+
+      # @param token [String] token for GitHub authentication
+      # @param pull_request_id [String] the ID of the pull request that we want to backport
+      # @param exit_with_unstaged_changes [Boolean] wheter we should exit cowardly if there is any unstaged change
+      def initialize(token: , pull_request_id: ,exit_with_unstaged_changes: )
+        @token = token
+        @pull_request_id = pull_request_id
+        @exit_with_unstaged_changes = exit_with_unstaged_changes
+      end
+
+      def call
+        exit_with_errors("The requested PR #{pull_request_id} does not contain `type: fix`") unless pull_request_metadata[:labels].include?("type: fix")
+        exit_with_errors("The requested PR #{pull_request_id} is not merged") unless pull_request_metadata[:is_merged]
+        exit_with_errors("The requested PR #{pull_request_id} cannot be backported") if pull_request_metadata[:labels].include?("no-backport")
+
+        extract_versions.each do |version|
+          next if extract_backport_pull_request_for_version(related_issues, version)
+          system("decidim-backporter --github_token=#{token} --pull_request_id=#{pull_request_id} --version_number=#{version} --exit_with_unstaged_changes=#{exit_with_unstaged_changes} --with-console=false", exception: true)
+        rescue RuntimeError => e
+          puts e.message
+          create_backport_issue(version)
+        end
+      end
+
+      private
+
+      attr_reader :token, :pull_request_id, :exit_with_unstaged_changes
+
+      def create_backport_issue(version)
+        some_params = {
+          title: "Fail: automatic backport of \"#{pull_request_metadata[:title]}\"",
+          body: "Automatic backport of ##{pull_request_id} has failed for version #{version}. Please do this action manually.",
+          assignee: DECIDIM_MAINTAINERS,
+          labels: pull_request_metadata[:labels]
+        }
+
+        uri = "https://api.github.com/repos/decidim/decidim/issues"
+        Faraday.post(uri, some_params.to_json, { Authorization: "token #{token}" })
+      end
+
+      # same method exists in lib/decidim/maintainers_toolbox/backports_reporter/report.rb
+      def extract_backport_pull_request_for_version(related_issues, version)
+        related_issues = related_issues.select do |pull_request|
+          pull_request[:title].start_with?("Backport") && pull_request[:title].include?(version)
+        end
+        return if related_issues.empty?
+
+        related_issues.first
+      end
+
+      def extract_versions
+        return [] unless pull_request_metadata[:labels]
+
+        pull_request_metadata[:labels].map do |item|
+          item.match(/release: v(\d+\.\d+)/) { |m| m[1] }
+        end.compact
+      end
+
+      # Asks the metadata for a given issue or pull request on GitHub API
+      #
+      # @return [Faraday::Response] An instance that represents an HTTP response from making an HTTP request
+      # Same method exists in lib/decidim/maintainers_toolbox/backporter.rb
+      def pull_request_metadata
+        @pull_request_metadata ||= Decidim::MaintainersToolbox::GithubManager::Querier::ByIssueId.new(
+          token: token,
+          issue_id: pull_request_id
+        ).call
+      end
+
+      def related_issues
+        @related_issues ||= Decidim::MaintainersToolbox::GithubManager::Querier::RelatedIssues.new(
+          token: token,
+          issue_id: pull_request_id
+        ).call
+      end
+
+      # Exit the script execution with a message
+      #
+      # @return [void]
+      def exit_with_errors(message)
+        puts message
+        exit 1
+      end
+    end
+  end
+end

data/lib/decidim/maintainers_toolbox/backporter.rb

@@ -9,11 +9,12 @@ module Decidim
       # @param pull_request_id [String] the ID of the pull request that we want to backport
       # @param version_number [String] the version number of the release that we want to make the backport to
       # @param exit_with_unstaged_changes [Boolean] wheter we should exit cowardly if there is any unstaged change
-      def initialize(token:, pull_request_id:, version_number:, exit_with_unstaged_changes:)
+      def initialize(token:, pull_request_id:, version_number:, exit_with_unstaged_changes:, with_console:)
         @token = token
         @pull_request_id = pull_request_id
         @version_number = version_number
         @exit_with_unstaged_changes = exit_with_unstaged_changes
+        @with_console = with_console
       end
 
       # Handles the different tasks to create a backport:
@@ -32,7 +33,7 @@ module Decidim
 
       private
 
-      attr_reader :token, :pull_request_id, :version_number, :exit_with_unstaged_changes
+      attr_reader :token, :pull_request_id, :version_number, :exit_with_unstaged_changes, :with_console
 
       # Asks the metadata for a given issue or pull request on GitHub API
       #
@@ -52,7 +53,8 @@ module Decidim
           pull_request_id: pull_request_id,
           release_branch: release_branch,
           backport_branch: backport_branch(metadata[:title]),
-          exit_with_unstaged_changes: exit_with_unstaged_changes
+          exit_with_unstaged_changes: exit_with_unstaged_changes,
+          with_console: with_console
         ).call
       end
 

data/lib/decidim/maintainers_toolbox/git_backport_manager.rb

@@ -14,12 +14,13 @@ module Decidim
       # @param backport_branch [String] the name of the branch that we want to create
       # @param working_dir [String] current working directory. Useful for testing purposes
       # @param exit_with_unstaged_changes [Boolean] wheter we should exit cowardly if there is any unstaged change
-      def initialize(pull_request_id:, release_branch:, backport_branch:, working_dir: Dir.pwd, exit_with_unstaged_changes: false)
+      def initialize(pull_request_id:, release_branch:, backport_branch:, working_dir: Dir.pwd, exit_with_unstaged_changes: false, with_console: true)
         @pull_request_id = pull_request_id
         @release_branch = release_branch
         @backport_branch = sanitize_branch(backport_branch)
         @working_dir = working_dir
         @exit_with_unstaged_changes = exit_with_unstaged_changes
+        @with_console = with_console
       end
 
       # Handles all the different tasks involved on a backport with the git command line utility
@@ -64,7 +65,7 @@ module Decidim
 
       private
 
-      attr_reader :pull_request_id, :release_branch, :backport_branch, :working_dir
+      attr_reader :pull_request_id, :release_branch, :backport_branch, :working_dir, :with_console
 
       # Create the backport branch based on a release branch
       # Checks that this branch does not exist already, if it does then exits
@@ -96,8 +97,14 @@ module Decidim
         `git cherry-pick #{sha_commit}`
 
         unless $CHILD_STATUS.exitstatus.zero?
-          puts "Resolve the cherrypick conflict manually and exit your shell to keep with the process."
-          system ENV.fetch("SHELL")
+          error_message = "Resolve the cherrypick conflict manually and exit your shell to keep with the process."
+
+          if with_console
+            puts error_message
+            system ENV.fetch("SHELL")
+          else
+            exit_with_errors(error_message)
+          end
         end
       end
 

data/lib/decidim/maintainers_toolbox/github_manager/querier/by_issue_id.rb

@@ -35,6 +35,9 @@ module Decidim
 
             {
               id: metadata["number"],
+              state: metadata["state"],
+              is_pull_request: metadata["pull_request"].present?,
+              is_merged: (metadata["pull_request"]["merged_at"].present? rescue false),
               title: metadata["title"],
               labels: labels,
               type: labels.select { |l| l.match(/^type: /) || l == "target: developer-experience" },

data/lib/decidim/maintainers_toolbox/github_manager/querier/{by_title.rb → by_query.rb}

@@ -9,15 +9,13 @@ module Decidim
         # Makes a GET request for the list of Issues or Pull Requests in GitHub.
         #
         # @param token [String] token for GitHub authentication
-        # @param title [String] the title that we want to search by
-        # @param state [String] the state of the issue. By default is "open"
+        # @param query [Hash] the query to search
         #
         # @see https://docs.github.com/en/rest/issues/issues#list-repository-issues GitHub API documentation
-        class ByTitle < Decidim::MaintainersToolbox::GithubManager::Querier::Base
-          def initialize(title:, token:, state: "open")
-            @title = title
+        class ByQuery < Decidim::MaintainersToolbox::GithubManager::Querier::Base
+          def initialize(token:, query: {})
             @token = token
-            @state = state
+            @query = query
           end
 
           # Makes the GET request and parses the response of an Issue or Pull Request in GitHub
@@ -31,14 +29,12 @@ module Decidim
 
           private
 
-          attr_reader :title, :state
+          attr_reader :query
 
           def headers
             {
-              title: title,
-              state: state,
               per_page: 100
-            }
+            }.merge(query)
           end
 
           # Parses the response of an Issue or Pull Request in GitHub

data/lib/decidim/maintainers_toolbox/github_manager/querier.rb

@@ -15,7 +15,7 @@ module Decidim
       module Querier
         autoload :ByIssueId, "decidim/maintainers_toolbox/github_manager/querier/by_issue_id"
         autoload :ByLabel, "decidim/maintainers_toolbox/github_manager/querier/by_label"
-        autoload :ByTitle, "decidim/maintainers_toolbox/github_manager/querier/by_title"
+        autoload :ByQuery, "decidim/maintainers_toolbox/github_manager/querier/by_query"
         autoload :RelatedIssues, "decidim/maintainers_toolbox/github_manager/querier/related_issues"
       end
     end

data/lib/decidim/maintainers_toolbox/releaser.rb

@@ -2,7 +2,7 @@
 
 require "open3"
 require_relative "github_manager/poster"
-require_relative "github_manager/querier/by_title"
+require_relative "github_manager/querier/by_query"
 require_relative "changelog_generator"
 
 module Decidim
@@ -37,11 +37,15 @@ module Decidim
 
           run("git checkout #{release_branch}")
           run("git pull origin #{release_branch}")
+
           bump_decidim_version
           run("bin/rake update_versions")
+
           run("bin/rake patch_generators")
+
           run("bin/rake bundle")
           run("npm install")
+          run("bin/rake webpack") if Dir.exists?("decidim_app-design")
 
           check_tests
 
@@ -176,7 +180,7 @@ module Decidim
       # @return [void]
       def check_tests
         puts "Running specs"
-        output, status = capture("bin/rspec")
+        output, status = capture("bin/rspec", { "ENFORCED_LOCALES" => "en,ca,es", "SKIP_NORMALIZATION" => "true" })
 
         unless status.success?
           run("git restore .")
@@ -244,7 +248,7 @@ You will see errors such as `No matching version found for @decidim/browserslist
       #
       # @return [Boolean] - true if there is any open PR
       def pending_crowdin_pull_requests?
-        pull_requests = Decidim::MaintainersToolbox::GithubManager::Querier::ByTitle.new(token: @token, title: "New Crowdin updates").call
+        pull_requests = Decidim::MaintainersToolbox::GithubManager::Querier::ByQuery.new(token: @token, query: { title: "New Crowdin updates", creator: "decidim-bot" }).call
         pull_requests.any?
       end
 

data/lib/decidim/maintainers_toolbox/version.rb

@@ -2,6 +2,6 @@
 
 module Decidim
   module MaintainersToolbox
-    VERSION = "0.2.0"
+    VERSION = "0.3.0"
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: decidim-maintainers_toolbox
 version: !ruby/object:Gem::Version
-  version: 0.2.0
+  version: 0.3.0
 platform: ruby
 authors:
 - Andrés Pereira de Lucena
-autorequire: 
+autorequire:
 bindir: exe
 cert_chain: []
-date: 2024-04-25 00:00:00.000000000 Z
+date: 2024-09-25 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activesupport
@@ -99,6 +99,7 @@ description: Tools for releasing, backporting, changelog generating, and working
 email:
 - andreslucena@gmail.com
 executables:
+- decidim-action-backporter
 - decidim-backporter
 - decidim-backports-checker
 - decidim-changelog-generator
@@ -108,11 +109,13 @@ extra_rdoc_files: []
 files:
 - README.md
 - decidim-maintainers_toolbox.gemspec
+- exe/decidim-action-backporter
 - exe/decidim-backporter
 - exe/decidim-backports-checker
 - exe/decidim-changelog-generator
 - exe/decidim-releaser
 - lib/decidim/maintainers_toolbox.rb
+- lib/decidim/maintainers_toolbox/action_backporter.rb
 - lib/decidim/maintainers_toolbox/backporter.rb
 - lib/decidim/maintainers_toolbox/backports_reporter/cli_report.rb
 - lib/decidim/maintainers_toolbox/backports_reporter/csv_report.rb
@@ -125,7 +128,7 @@ files:
 - lib/decidim/maintainers_toolbox/github_manager/querier/base.rb
 - lib/decidim/maintainers_toolbox/github_manager/querier/by_issue_id.rb
 - lib/decidim/maintainers_toolbox/github_manager/querier/by_label.rb
-- lib/decidim/maintainers_toolbox/github_manager/querier/by_title.rb
+- lib/decidim/maintainers_toolbox/github_manager/querier/by_query.rb
 - lib/decidim/maintainers_toolbox/github_manager/querier/related_issues.rb
 - lib/decidim/maintainers_toolbox/releaser.rb
 - lib/decidim/maintainers_toolbox/version.rb
@@ -138,7 +141,7 @@ metadata:
   funding_uri: https://opencollective.com/decidim
   homepage_uri: https://decidim.org
   source_code_uri: https://github.com/decidim/decidim
-post_install_message: 
+post_install_message:
 rdoc_options: []
 require_paths:
 - lib
@@ -154,7 +157,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubygems_version: 3.1.6
-signing_key: 
+signing_key:
 specification_version: 4
 summary: Release related tools for the Decidim project
 test_files: []