mj 1.0.1 → 1.2.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: de854df996b9ec36033b49f7d985e7ccc01a7c0e57c1d1facc62128623ecbda1
-  data.tar.gz: 8525e716e78a261741fae76f10b3e56cc87e6c61d456ebe66b3aa654fb60122a
+  metadata.gz: 719a1dd98c88afa768cf64e3f898ef95535a2b11a1322bad42dd3adaa31cd378
+  data.tar.gz: 17980273bfabcf5b9b2378f7e0687de5c3fd2b4df412caa101ace15aab3ce266
 SHA512:
-  metadata.gz: 1b170449ed5da0e13b54f29f8bfd92c6b928f85882a03f726211bfcb8ad5fb3d6e9b6af27eff1aaeac822ca183b35e7e93f1728993df2f374331bfab80ca6b5e
-  data.tar.gz: 53023f5352259df180d522286f513eb3804f8632465c2eb53dc5b3ebaa812e133ba6a15346290e65bb5c33aa002677127e8082591847d42df36d6b60b49a0fc7
+  metadata.gz: 652fb4a8eb141689c29acfffb70666f1a17ca3acad33a888cd5e86ce2728def89959f3543cebd36e3587cd4227fc7166c7f677657ed9b20ee6b445b4f904fd8e
+  data.tar.gz: 1c9027cbde6e702272eee45edbbf5ad06392e527b32ff37454155541c455d5127a7013308dc38db414b78f4ef8b5d7ecd6c578f9d22b066ddfcb1c140d521f73

data/.rubocop.yml

@@ -66,6 +66,9 @@ Style/GuardClause:
 Style/IfUnlessModifier:
   Enabled: false
 
+Style/NegatedIf:
+  Enabled: false
+
 Style/StringLiterals:
   Enabled: true
   EnforcedStyle: double_quotes

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    mj (1.0.1)
+    mj (1.2.0)
       colorize
       koine-rest_client
       mj-hash_utils
@@ -111,7 +111,7 @@ GEM
     strscan (3.1.0)
     thor (1.2.2)
     unicode-display_width (2.5.0)
-    uri (0.13.0)
+    uri (0.13.1)
 
 PLATFORMS
   arm64-darwin-23

data/README.md

@@ -38,6 +38,9 @@ bundle exec mj git delete_stale_branches \
   [--dry-run] \
   [--only-with-prs] \
   [--only-with-closed-prs] \
+  [--from-commiters=emal@one,email@two] \
+  [--from-pull_requestors=mjacobus,other-gh-username] \
+  [--after-date=2021-01-01] \
   [--before-date=2021-01-01]
 ```
 

data/lib/mj/git/branches.rb

@@ -3,6 +3,7 @@
 require_relative "local_branch"
 require_relative "remote_branch"
 require_relative "pull_request"
+require_relative "pull_request_author"
 
 module Mj
   module Git

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

@@ -12,6 +12,19 @@ module Mj
           @options[:dry_run]
         end
 
+        def after_date
+          if @after_date
+            return @after_date
+          end
+
+          if @options[:after_date]
+            @after_date ||= DateTime.parse(@options[:after_date])
+          end
+
+          # Default to 100+ years ago - sure there are no commits that old
+          @after_date ||= DateTime.new(1900, 1, 1, 0, 0, 0)
+        end
+
         def before_date
           if @before_date
             return @before_date
@@ -32,6 +45,14 @@ module Mj
         def only_with_closed_prs
           @options[:only_with_closed_prs]
         end
+
+        def from_pull_requestors
+          @options[:from_pull_requestors].to_s.split(",")
+        end
+
+        def from_commiters
+          @options[:from_commiters].to_s.split(",")
+        end
       end
     end
   end

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

@@ -28,7 +28,7 @@ module Mj
 
         def delete_branch(branch, command:)
           if delete?(branch, command: command)
-            puts("Deleting branch #{branch.name}", color: :green)
+            puts("Deleting branch #{branch.name} \t| #{branch.summary}", color: :green)
 
             unless command.dry_run?
               delete(branch)
@@ -36,24 +36,35 @@ module Mj
           end
         end
 
-        def delete?(branch, command:) # rubocop:disable Metrics/AbcSize,Metrics/MethodLength
+        def delete?(branch, command:) # rubocop:disable Metrics/AbcSize,Metrics/MethodLength,Metrics/CyclomaticComplexity,Metrics/PerceivedComplexity
           if %w[master main].include?(branch.to_local.name)
-            puts("Skipping #{branch.name}. No, no, no, no.", color: :red)
+            puts("Skipping #{branch.summary}. 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 cannot_delete(branch, "Not before #{command.before_date}.")
+          end
+
+          if branch.last_commit_date < command.after_date
+            return cannot_delete(branch, "Not after #{command.after_date}.")
+          end
+
+          unless commiter_check(command, branch)
             return false
           end
 
+          # PR checks later - more efficient. May not have to check them if any of the above is falsy
+
           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
+            return cannot_delete(branch, "Does not have a PR")
           end
 
           if command.only_with_closed_prs && !branch.pr.closed?
-            puts("Skipping #{branch.name}. PR not closed - state: #{branch.pr.state}.", color: :yellow)
+            return cannot_delete(branch, "PR not closed - state: #{branch.pr.state}.")
+          end
+
+          unless pull_request_author_check(command, branch)
             return false
           end
 
@@ -63,7 +74,37 @@ module Mj
         def delete(branch)
           branch.delete
         rescue Mj::Git::CommandExecuter::Error => exception
-          puts("Could not delete branch #{branch.name}: #{exception.message}", color: :red)
+          puts("Could not delete branch #{branch.name}: #{exception.message}.", color: :red)
+        end
+
+        def cannot_delete(branch, reason)
+          puts("Skipping #{branch.name} \t| #{reason}.", color: :yellow)
+
+          false
+        end
+
+        def pull_request_author_check(command, branch)
+          if command.from_pull_requestors.empty?
+            return true
+          end
+
+          if branch.has_pr? && command.from_pull_requestors.include?(branch.pr.author.login)
+            return true
+          end
+
+          cannot_delete(branch, "PR not from pull requestors: #{command.from_pull_requestors.join(", ")}.")
+        end
+
+        def commiter_check(command, branch)
+          if command.from_commiters.empty?
+            return true
+          end
+
+          if command.from_commiters.map(&:downcase).include?(branch.last_commiter_email.downcase)
+            return true
+          end
+
+          cannot_delete(branch, "PR not from commiters: #{command.from_commiters.join(", ")}.")
         end
 
         def puts(string, color: nil)

data/lib/mj/git/pull_request.rb

@@ -5,14 +5,16 @@ module Mj
     class PullRequest
       attr_reader :number
       attr_reader :title
+      attr_reader :author
       attr_reader :state
       attr_reader :updated_at
 
-      def initialize(number:, title:, state:, updated_at:)
+      def initialize(number:, title:, state:, updated_at:, author:)
         @number = number
         @title = title
         @state = state
         @updated_at = updated_at
+        @author = author
       end
 
       def closed?

data/lib/mj/git/pull_request_author.rb

@@ -0,0 +1,19 @@
+# frozen_string_literal: true
+
+module Mj
+  module Git
+    class PullRequestAuthor
+      attr_reader :id
+      attr_reader :name
+      attr_reader :login
+      attr_reader :is_bot
+
+      def initialize(id:, name:, login:, is_bot:)
+        @id = id
+        @login = login
+        @name = name
+        @is_bot = is_bot
+      end
+    end
+  end
+end

data/lib/mj/git/remote_branch.rb

@@ -18,6 +18,14 @@ module Mj
         @last_commit_date ||= DateTime.parse(@command_executer.execute("git log -1 --format=%cd #{name}").first)
       end
 
+      def last_commiter_name
+        @last_commiter_name ||= @command_executer.execute("git log -1 --pretty=format:'%an' #{name}").first
+      end
+
+      def last_commiter_email
+        @last_commiter_email ||= @command_executer.execute("git log -1 --pretty=format:'%ae' #{name}").first
+      end
+
       def length
         @name.length
       end
@@ -30,6 +38,18 @@ module Mj
         !pr.nil?
       end
 
+      def summary
+        parts = []
+
+        parts << "Last Commited by #{last_commiter_name} (#{last_commiter_email}) on #{last_commit_date.strftime("%Y-%m-%d")}"
+
+        if @pr
+          parts << "PR ##{pr.number} by #{pr.author.login}"
+        end
+
+        parts.join(", ")
+      end
+
       # @return [Git::PullRequest]
       def pr
         if defined?(@pr)
@@ -50,12 +70,12 @@ module Mj
         name.sub(pattern, "")
       end
 
-      def fetch_pr # rubocop:disable Metrics/MethodLength
+      def fetch_pr # rubocop:disable Metrics/MethodLength,Metrics/AbcSize
         data = @command_executer.execute(
-          "gh pr list --head #{local_branch_name} --state=all --json=number,state,title,updatedAt"
+          "gh pr list --head #{local_branch_name} --state=all --json=number,state,title,updatedAt,author"
         )
 
-        data = JSON.parse(data.join("")).first
+        data = JSON.parse(data.join).first
 
         if data.nil?
           return
@@ -63,10 +83,16 @@ module Mj
 
         # 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'])
+          number: data["number"],
+          title: data["title"],
+          state: data["state"],
+          updated_at: DateTime.parse(data["updatedAt"]),
+          author: PullRequestAuthor.new(
+            id: data.dig("author", "id"),
+            name: data.dig("author", "name"),
+            is_bot: data.dig("author", "is_bot"),
+            login: data.dig("author", "login")
+          )
         )
       rescue StandardError
         nil

data/lib/mj/git/thor_command.rb

@@ -30,10 +30,22 @@ module Mj
              type: :boolean,
              banner: "Do not delete if PRs are in DRAFT or OPEN - will they maybe be merged?",
              aliases: :c
+      option :after_date,
+             type: :string,
+             banner: "Formatted date YYY-MM-DD",
+             aliases: :a
       option :before_date,
              type: :string,
              banner: "Formatted date YYY-MM-DD",
              aliases: :b
+      option :from_pull_requestors,
+             type: :string,
+             banner: "Comma separated github usernames",
+             aliases: :u
+      option :from_commiters,
+             type: :string,
+             banner: "Comma separated commiter emails - assumes last commiter",
+             aliases: :e
       def delete_stale_branches
         command = Commands::DeleteStaleBranchesCommand.new(options: options)
         handler = Commands::DeleteStaleBranchesCommandHandler.new(stdout: $stdout)

data/lib/mj/version.rb

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

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: mj
 version: !ruby/object:Gem::Version
-  version: 1.0.1
+  version: 1.2.0
 platform: ruby
 authors:
 - Marcelo Jacobus
-autorequire:
+autorequire: 
 bindir: exe
 cert_chain: []
-date: 2024-12-05 00:00:00.000000000 Z
+date: 2024-12-08 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: colorize
@@ -141,6 +141,7 @@ files:
 - 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/pull_request_author.rb
 - lib/mj/git/remote_branch.rb
 - lib/mj/git/thor_command.rb
 - lib/mj/graphql/client.rb
@@ -162,7 +163,7 @@ metadata:
   source_code_uri: https://github.com/mjacobus/mj
   changelog_uri: https://github.com/mjacobus/mj/blob/main/CHANGELOG.md
   rubygems_mfa_required: 'true'
-post_install_message:
+post_install_message: 
 rdoc_options: []
 require_paths:
 - lib
@@ -177,8 +178,8 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.4.10
-signing_key:
+rubygems_version: 3.5.14
+signing_key: 
 specification_version: 4
 summary: My personal CLI
 test_files: []