mj 0.9.1 → 1.0.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 7633320d7570f27d4c5b83809bea232a4463b846f2e1aaaabb87e46c9ab372c1
-  data.tar.gz: 48926343cc8c279b3b79bd62bf5151334bcafc94e928d31fd2cf313fd5cc549f
+  metadata.gz: 3ae71fd8808a2f04a8cfb7838d347f529a5df0aa9b5a3d6eb3618b089c9724c3
+  data.tar.gz: e8f7c0778fc83b5fe2e5206b14a84ba297f85c5337d3248d48ff36e5099bfa7b
 SHA512:
-  metadata.gz: 1f27f435a2446273b4c9f79c09397d10ec5c161e3882b4b95ba2052c22cb1da02a3a651acfb9f9076a208cd759f0cdcc63e1148465f8d168f22ca7e7af68d2a8
-  data.tar.gz: d657912df47bf7450436df748f041c4283f25626c4dedf045a61b9248e0a4e577db1e6ef085c9ab51e542bee313d50b154d92aaa695c5ce4372527f823ac7545
+  metadata.gz: 33aafd4dc0b0bc9910442c625b04da211b71fb86d82d2f2b13282fb3a3ded0a081ea3877d98eac8fc5c6b18a0532d90f6d59926c108b5c0b753a672d35d4ffe2
+  data.tar.gz: d9dfd28ccbdc9aa8e615d2fa1ef81d57ccc33707ea8c519fe0cfce55e2fc17b8fc1345d43da241e929da05a70c70fa11bf89376fd1e14beae6d4f895569ca44a

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    mj (0.9.1)
+    mj (1.0.0)
       colorize
       koine-rest_client
       mj-hash_utils

data/README.md

@@ -33,6 +33,12 @@ mj help
 ```
 bundle exec mj git checkout partial-branch-name           # it will create a local branch if that is remote only
 bundle exec mj git checkout partial-branch-name --dry-run # if you want to see the command before executing
+
+bundle exec mj git delete_stale_branches \
+  [--dry-run] \
+  [--only-with-prs] \
+  [--only-with-closed-prs] \
+  [--before-date=2021-01-01]
 ```
 
 ```

data/lib/mj/alternative_file/resolvers/ruby/view_component_resolver.rb

@@ -9,10 +9,10 @@ module Mj
 
           def apply_to?(file)
             file.end_with?(
-              "component.rb",
-              "component.html.erb",
-              "component_test.rb",
-              "component_spec.rb"
+              ".rb",
+              ".html.erb",
+              "_test.rb",
+              "_spec.rb"
             )
           end
 
@@ -28,11 +28,18 @@ module Mj
             file = file.sub(/_component(_test|_spec)?.rb$/, "_component.html.erb")
             file = file.sub(/^(spec|test)/, "app")
             add_candidate(file, "component_template", to: candidates)
+
+            file = file.sub(/(_test|_spec)?.rb$/, ".html.erb")
+            file = file.sub(/^(spec|test)/, "app")
+            add_candidate(file, "component_template", to: candidates)
           end
 
           def resolve_component_class(file, candidates)
             file_name = file.sub(/_component.html.erb$/, "_component.rb")
             add_candidate(file_name, "component_class", to: candidates)
+
+            file_name = file.sub(/.html.erb$/, ".rb")
+            add_candidate(file_name, "component_class", to: candidates)
           end
         end
       end

data/lib/mj/git/branches.rb

@@ -2,6 +2,7 @@
 
 require_relative "local_branch"
 require_relative "remote_branch"
+require_relative "pull_request"
 
 module Mj
   module Git
@@ -43,6 +44,10 @@ module Mj
         @branches.each(&block)
       end
 
+      def sort_by(&block)
+        self.class.new(@branches.sort_by(&block))
+      end
+
       def length
         @branches.length
       end

data/lib/mj/git/commands/delete_stale_branches_command.rb

@@ -0,0 +1,38 @@
+# frozen_string_literal: true
+
+module Mj
+  module Git
+    module Commands
+      class DeleteStaleBranchesCommand
+        def initialize(options: {})
+          @options = options
+        end
+
+        def dry_run?
+          @options[:dry_run]
+        end
+
+        def before_date
+          if @before_date
+            return @before_date
+          end
+
+          if @options[:before_date]
+            @before_date ||= DateTime.parse(@options[:before_date])
+          end
+
+          # Default to now, because all things happened before now.
+          @before_date ||= DateTime.now
+        end
+
+        def only_with_prs
+          @options[:only_with_prs]
+        end
+
+        def only_with_closed_prs
+          @options[:only_with_closed_prs]
+        end
+      end
+    end
+  end
+end

data/lib/mj/git/commands/delete_stale_branches_command_handler.rb

@@ -0,0 +1,79 @@
+# frozen_string_literal: true
+
+module Mj
+  module Git
+    module Commands
+      class DeleteStaleBranchesCommandHandler
+        def initialize(stdout:, command_executer: CommandExecuter.new)
+          @stdout = stdout
+          @command_executer = command_executer
+        end
+
+        def handle(command)
+          puts("Deleting stale branches", color: :blue)
+
+          list_command = "git branch -a"
+          list_command += " | grep remotes/ | grep -v '/HEAD'"
+
+          branches = Git::Branches
+            .from_branch_names(@command_executer.execute(list_command))
+            .sort_by(&:last_commit_date)
+
+          branches.each do |branch|
+            delete_branch(branch, command: command)
+          end
+        end
+
+        private
+
+        def delete_branch(branch, command:)
+          if delete?(branch, command: command)
+            puts("Deleting branch #{branch.name}", color: :green)
+
+            unless command.dry_run?
+              delete(branch)
+            end
+          end
+        end
+
+        def delete?(branch, command:) # rubocop:disable Metrics/AbcSize,Metrics/MethodLength
+          if %w[master main].include?(branch.to_local.name)
+            puts("Skipping #{branch.name}. No, no, no, no.", color: :red)
+            return false
+          end
+
+          if branch.last_commit_date >= command.before_date
+            puts("Skipping #{branch.name}. Not before #{command.before_date}", color: :yellow)
+            return false
+          end
+
+          if (command.only_with_prs || command.only_with_closed_prs) && branch.pr.nil?
+            puts("Skipping #{branch.name}. Does not have PR.", color: :yellow)
+            return false
+          end
+
+          if command.only_with_closed_prs && !branch.pr.closed?
+            puts("Skipping #{branch.name}. PR not closed - state: #{branch.pr.state}.", color: :yellow)
+            return false
+          end
+
+          true
+        end
+
+        def delete(branch)
+          branch.delete
+        rescue StandardError => exception
+          log("Could not delete branch #{branch.name}: #{exception.message}", color: :red)
+        end
+
+        def puts(string, color: nil)
+          if color
+            string = string.colorize(color)
+          end
+
+          @stdout.puts(string)
+        end
+      end
+    end
+  end
+end

data/lib/mj/git/pull_request.rb

@@ -0,0 +1,23 @@
+# frozen_string_literal: true
+
+module Mj
+  module Git
+    class PullRequest
+      attr_reader :number
+      attr_reader :title
+      attr_reader :state
+      attr_reader :updated_at
+
+      def initialize(number:, title:, state:, updated_at:)
+        @number = number
+        @title = title
+        @state = state
+        @updated_at = updated_at
+      end
+
+      def closed?
+        state == "MERGED" || state == "CLOSED"
+      end
+    end
+  end
+end

data/lib/mj/git/remote_branch.rb

@@ -5,14 +5,19 @@ module Mj
     class RemoteBranch
       attr_reader :name
 
-      def initialize(name)
+      def initialize(name, command_executer: CommandExecuter.new)
         @name = name
+        @command_executer = command_executer
       end
 
       def checkout_command
         "git checkout -b #{local_branch_name} #{name}"
       end
 
+      def last_commit_date
+        @last_commit_date ||= DateTime.parse(@command_executer.execute("git log -1 --format=%cd #{name}").first)
+      end
+
       def length
         @name.length
       end
@@ -21,12 +26,51 @@ module Mj
         LocalBranch.new(local_branch_name)
       end
 
+      def has_pr?
+        !pr.nil?
+      end
+
+      # @return [Git::PullRequest]
+      def pr
+        if defined?(@pr)
+          return @pr
+        end
+
+        @pr ||= fetch_pr
+      end
+
+      def delete
+        @command_executer.execute("git push origin :#{local_branch_name}")
+      end
+
       private
 
       def local_branch_name
         pattern = %r{^remotes/\w+/}
         name.sub(pattern, "")
       end
+
+      def fetch_pr # rubocop:disable Metrics/MethodLength
+        data = @command_executer.execute(
+          "gh pr list --head #{local_branch_name} --state=all --json=number,state,title,updatedAt"
+        )
+
+        data = JSON.parse(data.join("")).first
+
+        if data.nil?
+          return
+        end
+
+        # I.E. ["14", "WIP on packer", "handle-packer-files", "DRAFT", "2022-03-14T20:14:17Z"]
+        Git::PullRequest.new(
+          number: data['number'],
+          title: data['title'],
+          state: data['state'],
+          updated_at: DateTime.parse(data['updatedAt'])
+        )
+      rescue StandardError
+        nil
+      end
     end
   end
 end

data/lib/mj/git/thor_command.rb

@@ -2,6 +2,8 @@
 
 require_relative "commands/checkout_command_handler"
 require_relative "commands/checkout_command"
+require_relative "commands/delete_stale_branches_command_handler"
+require_relative "commands/delete_stale_branches_command"
 require_relative "command_executer"
 
 module Mj
@@ -14,6 +16,29 @@ module Mj
         handler = Commands::CheckoutCommandHandler.new(stdout: $stdout)
         handler.handle(command)
       end
+
+      desc "delete_stale_branches", "Delete remote stale branches"
+      option :dry_run,
+             type: :boolean,
+             banner: "Just outputs, does not delete",
+             aliases: :d
+      option :only_with_prs,
+             type: :boolean,
+             banner: "Only branches that have PRs (Branch can be restored from PR page)",
+             aliases: :p
+      option :only_with_closed_prs,
+             type: :boolean,
+             banner: "Do not delete if PRs are in DRAFT or OPEN - will they maybe be merged?",
+             aliases: :c
+      option :before_date,
+             type: :string,
+             banner: "Formatted date YYY-MM-DD",
+             aliases: :b
+      def delete_stale_branches
+        command = Commands::DeleteStaleBranchesCommand.new(options: options)
+        handler = Commands::DeleteStaleBranchesCommandHandler.new(stdout: $stdout)
+        handler.handle(command)
+      end
     end
   end
 end

data/lib/mj/version.rb

@@ -1,5 +1,5 @@
 # frozen_string_literal: true
 
 module Mj
-  VERSION = "0.9.1"
+  VERSION = "1.0.0"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: mj
 version: !ruby/object:Gem::Version
-  version: 0.9.1
+  version: 1.0.0
 platform: ruby
 authors:
 - Marcelo Jacobus
 autorequire:
 bindir: exe
 cert_chain: []
-date: 2024-08-12 00:00:00.000000000 Z
+date: 2024-12-05 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: colorize
@@ -137,7 +137,10 @@ files:
 - lib/mj/git/command_executer.rb
 - lib/mj/git/commands/checkout_command.rb
 - lib/mj/git/commands/checkout_command_handler.rb
+- lib/mj/git/commands/delete_stale_branches_command.rb
+- lib/mj/git/commands/delete_stale_branches_command_handler.rb
 - lib/mj/git/local_branch.rb
+- lib/mj/git/pull_request.rb
 - lib/mj/git/remote_branch.rb
 - lib/mj/git/thor_command.rb
 - lib/mj/graphql/client.rb