git-trim 0.1.3 → 0.2.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 4c941e5077e893642ba38fbd33d94f9c8fbef9c8590b8b9107457d7027da16ea
-  data.tar.gz: 50297be5101150a1898acef6b2a09da3d82b03878765cf09d36fa0fc6fe769ae
+  metadata.gz: 14a8db7d9bf6cca92301a221f4e096d633882d103f9f7ea4b68e4ce5a6187ce5
+  data.tar.gz: 26a4e8614638c39d3692815c34aee4d4358088e62aa13ebb3d6ff0372d1ee3f7
 SHA512:
-  metadata.gz: e2befed7aefe3649a8fa13b0fd7afbebf630c29f2a788370b0211f3291740ce230cf46f9bd14c42df862d73f32b5d951134c29211da85e1a6b86e57b72f078d4
-  data.tar.gz: 56e28769e4b6554df8c6058d728678600b03082415d8c2043075a4abea758a36df0bb0f02c6d4d676c6ce71c7ea4e4a0ee2c621e6dd2f4bd76db0e58e781fb94
+  metadata.gz: a3915fb4d49379edebb0928cde8f4c7f2774c429f437ee67381edfd263b567c32b3d6f7ae5c922b7c1d963079859ea844b3916d62f7a3a5712a899f2e0a6d75e
+  data.tar.gz: 4e604a55e748caa6af8537b929d6bdde5d50b352c6e5a73cb38950133e9f796f0df855e620b45173928c5ef535b311f8dd28ae8a40d3b5e94c26239815cdbe44

data/.github/workflows/ci.yml

@@ -0,0 +1,18 @@
+name: build
+on: pull_request
+jobs:
+  build:
+    runs-on: ubuntu-latest
+    steps:
+      - uses: actions/checkout@v6
+      - uses: ruby/setup-ruby@v1
+        with:
+          ruby-version: ruby
+          bundler-cache: true
+
+      - name: Run specs
+        run: |
+          git config --global user.email "ci@example.com"
+          git config --global user.name "CI"
+          git config --global init.defaultBranch main
+          bundle exec rake spec

data/.github/workflows/release.yml

@@ -0,0 +1,65 @@
+name: Release
+
+on:
+  workflow_dispatch:
+    inputs:
+      version:
+        description: "Version to release (e.g. 0.2.0)"
+        required: true
+        type: string
+
+jobs:
+  release:
+    runs-on: ubuntu-latest
+    permissions:
+      contents: write
+      id-token: write
+    steps:
+      - uses: actions/checkout@v6
+
+      - uses: ruby/setup-ruby@v1
+        with:
+          ruby-version: "3.3"
+          bundler-cache: true
+
+      - name: Run specs
+        run: bundle exec rake spec
+
+      - name: Update version
+        run: |
+          VERSION="${{ inputs.version }}"
+          sed -i "s/VERSION = \".*\"/VERSION = \"$VERSION\"/" lib/git-trim/version.rb
+          echo "Updated version to $VERSION"
+          cat lib/git-trim/version.rb
+
+      # bundler-cache sets frozen/deployment mode, which rejects the now
+      # out-of-date lockfile entry for git-trim itself. Re-lock so the
+      # release commit keeps the gemspec and lockfile in sync.
+      - name: Update Gemfile.lock
+        run: |
+          bundle config unset deployment
+          bundle config unset frozen
+          BUNDLE_FROZEN=false BUNDLE_DEPLOYMENT=false bundle lock
+
+      - name: Commit version bump
+        run: |
+          VERSION="${{ inputs.version }}"
+          git config user.name "github-actions[bot]"
+          git config user.email "github-actions[bot]@users.noreply.github.com"
+          git add lib/git-trim/version.rb Gemfile.lock
+          git commit -m "Release v$VERSION"
+
+      # Builds the gem into pkg/, tags v$VERSION, pushes the commit and
+      # tag, and publishes to RubyGems via OIDC trusted publishing.
+      - name: Release to RubyGems
+        uses: rubygems/release-gem@v1
+
+      - name: Create GitHub Release
+        env:
+          GH_TOKEN: ${{ github.token }}
+        run: |
+          VERSION="${{ inputs.version }}"
+          gh release create "v$VERSION" \
+            --title "v$VERSION" \
+            --generate-notes \
+            pkg/git-trim-*.gem

data/Gemfile.lock

@@ -1,35 +1,36 @@
 PATH
   remote: .
   specs:
-    git-trim (0.1.2)
+    git-trim (0.2.0)
 
 GEM
   remote: https://rubygems.org/
   specs:
-    diff-lcs (1.3)
-    rake (13.0.1)
-    rspec (3.7.0)
-      rspec-core (~> 3.7.0)
-      rspec-expectations (~> 3.7.0)
-      rspec-mocks (~> 3.7.0)
-    rspec-core (3.7.1)
-      rspec-support (~> 3.7.0)
-    rspec-expectations (3.7.0)
+    diff-lcs (1.6.2)
+    rake (13.4.2)
+    rspec (3.13.2)
+      rspec-core (~> 3.13.0)
+      rspec-expectations (~> 3.13.0)
+      rspec-mocks (~> 3.13.0)
+    rspec-core (3.13.6)
+      rspec-support (~> 3.13.0)
+    rspec-expectations (3.13.5)
       diff-lcs (>= 1.2.0, < 2.0)
-      rspec-support (~> 3.7.0)
-    rspec-mocks (3.7.0)
+      rspec-support (~> 3.13.0)
+    rspec-mocks (3.13.8)
       diff-lcs (>= 1.2.0, < 2.0)
-      rspec-support (~> 3.7.0)
-    rspec-support (3.7.1)
+      rspec-support (~> 3.13.0)
+    rspec-support (3.13.7)
 
 PLATFORMS
+  arm64-darwin-25
   ruby
 
 DEPENDENCIES
-  bundler (~> 1.16)
+  bundler (>= 1.16)
   git-trim!
   rake (~> 13.0)
   rspec (~> 3.0)
 
 BUNDLED WITH
-   1.17.3
+   2.5.3

data/README.md

@@ -1,8 +1,6 @@
 # git trim
 
-Welcome to your new gem! In this directory, you'll find the files you need to be able to package up your Ruby library into a gem. Put your Ruby code in the file `lib/git/trim`. To experiment with that code, run `bin/console` for an interactive prompt.
-
-TODO: Delete this and the text above, and describe your gem
+Deletes local branches — and the [linked worktrees](https://git-scm.com/docs/git-worktree) that hold them — once they are fully merged into `main`. Run it after a round of PRs merge and it cleans up everything that's done, while refusing to touch anything that still has work in it.
 
 ## Installation
 
@@ -22,7 +20,28 @@ Or install it yourself as:
 
 ## Usage
 
-You can call `git trim` and it will remove any branch that isn't currently merged into the current branch that isn't also in the `.git-protected-branches` file. It will not remove the main branch.
+Run `git trim` from anywhere inside a repository. It fetches (with prune), then removes every local branch that is fully merged into `main`, unless the branch is:
+
+- `main` itself,
+- the branch you currently have checked out, or
+- listed in a `.git-protected-branches` file.
+
+If no local `main` exists (common in bare-repo + worktrees layouts), it compares against `origin/main` instead.
+
+### Worktrees
+
+If a merged branch is checked out in a linked worktree, `git trim` removes the worktree first and then deletes the branch. Worktrees with uncommitted changes or untracked files are left alone, along with their branch:
+
+```
+$ git trim
+Removed worktree /Users/you/src/project/feature-a
+Deleted branch feature-a (was fa68cf94).
+Skipping branch 'feature-b': worktree at /Users/you/src/project/feature-b has local changes
+```
+
+Commit or stash the local changes and run `git trim` again to clean up the rest.
+
+### Protected branches
 
 The `.git-protected-branches` file can reside in the current directory or any parent directory. Branch names are each listed on a line in the file. For example:
 
@@ -32,9 +51,13 @@ staging
 production
 ```
 
+## Releasing
+
+Releases are cut from the GitHub Actions **Release** workflow (Actions → Release → Run workflow → enter a version like `0.2.0`). The workflow runs the specs, bumps `lib/git-trim/version.rb`, tags `v<version>`, publishes to RubyGems via [trusted publishing](https://guides.rubygems.org/trusted-publishing/) (no API key), and creates a GitHub release.
+
 ## Contributing
 
-Bug reports and pull requests are welcome on GitHub at https://github.com/[USERNAME]/git-trim. This project is intended to be a safe, welcoming space for collaboration, and contributors are expected to adhere to the [Contributor Covenant](http://contributor-covenant.org) code of conduct.
+Bug reports and pull requests are welcome on GitHub at https://github.com/cpetersen/git-trim. This project is intended to be a safe, welcoming space for collaboration, and contributors are expected to adhere to the [Contributor Covenant](http://contributor-covenant.org) code of conduct.
 
 ## License
 
@@ -42,4 +65,4 @@ The gem is available as open source under the terms of the [MIT License](https:/
 
 ## Code of Conduct
 
-Everyone interacting in the Git::Trim project’s codebases, issue trackers, chat rooms and mailing lists is expected to follow the [code of conduct](https://github.com/[USERNAME]/git-trim/blob/main/CODE_OF_CONDUCT.md).
+Everyone interacting in the Git::Trim project’s codebases, issue trackers, chat rooms and mailing lists is expected to follow the [code of conduct](https://github.com/cpetersen/git-trim/blob/main/CODE_OF_CONDUCT.md).

data/bin/git-trim

@@ -2,4 +2,4 @@
 
 require 'git-trim'
 
-GitTrim.new.run(ARGV)
+exit GitTrim.new.run(ARGV)

data/git-trim.gemspec

@@ -11,7 +11,7 @@ Gem::Specification.new do |spec|
 
   spec.summary       = %q{A script to remove all merged branches that aren't protected.}
   spec.description   = %q{A script to remove all merged branches that aren't specified in the .git-protected-branches file.}
-  spec.homepage      = "https://github.com/assaydepot/git-trim"
+  spec.homepage      = "https://github.com/cpetersen/git-trim"
   spec.license       = "MIT"
 
   # Specify which files should be added to the gem when it is released.
@@ -23,7 +23,7 @@ Gem::Specification.new do |spec|
   spec.executables   = spec.files.grep(%r{^bin/}) { |f| File.basename(f) }
   spec.require_paths = ["lib", "bin"]
 
-  spec.add_development_dependency "bundler", "~> 1.16"
+  spec.add_development_dependency "bundler", ">= 1.16"
   spec.add_development_dependency "rake", "~> 13.0"
   spec.add_development_dependency "rspec", "~> 3.0"
 end

data/lib/git-trim/version.rb

@@ -1,3 +1,3 @@
 class GitTrim
-  VERSION = "0.1.3"
+  VERSION = "0.2.0"
 end

data/lib/git-trim.rb

@@ -1,4 +1,5 @@
 require "git-trim/version"
+require "shellwords"
 
 class GitTrim
   def run(argv=nil)
@@ -10,11 +11,59 @@ class GitTrim
     protected_branches ||= []
     protected_branches << "main"
 
-    branches = %x{git branch --merged main}.split("\n").collect {|b| b.gsub('*', '').strip}
+    base = base_ref
+    unless base
+      warn "git-trim: neither 'main' nor 'origin/main' exists; nothing to trim against"
+      return 1
+    end
+
+    branches = %x{git branch --merged #{Shellwords.escape(base)} --format='%(refname:short)'}.split("\n").collect(&:strip)
     branches -= protected_branches
+    branches -= [current_branch]
+
+    worktrees = linked_worktrees
 
     branches.each do |branch|
-      puts %x{git branch -d #{branch}}
+      if (path = worktrees[branch])
+        output = %x{git worktree remove #{Shellwords.escape(path)} 2>&1}
+        unless $?.success?
+          if output.include?("contains modified or untracked files")
+            puts "Skipping branch '#{branch}': worktree at #{path} has local changes"
+          else
+            puts "Skipping branch '#{branch}': could not remove worktree at #{path}"
+            puts output
+          end
+          next
+        end
+        puts "Removed worktree #{path}"
+      end
+      puts %x{git branch -d #{Shellwords.escape(branch)}}
+    end
+
+    0
+  end
+
+  def current_branch
+    %x{git branch --show-current}.strip
+  end
+
+  # Local main when it exists; otherwise origin/main (e.g. bare-repo +
+  # worktrees layouts where no local main is checked out). Nil if neither.
+  def base_ref
+    ["main", "origin/main"].find do |ref|
+      %x{git rev-parse --verify --quiet #{Shellwords.escape(ref)}}
+      $?.success?
+    end
+  end
+
+  # Maps branch name => worktree path for linked worktrees. The first entry
+  # in `git worktree list` is the main worktree, which is never removable.
+  def linked_worktrees
+    entries = %x{git worktree list --porcelain}.split("\n\n")
+    entries.drop(1).each_with_object({}) do |entry, map|
+      path = entry[/^worktree (.+)$/, 1]
+      branch = entry[/^branch refs\/heads\/(.+)$/, 1]
+      map[branch] = path if path && branch
     end
   end
 

metadata

@@ -1,27 +1,27 @@
 --- !ruby/object:Gem::Specification
 name: git-trim
 version: !ruby/object:Gem::Version
-  version: 0.1.3
+  version: 0.2.0
 platform: ruby
 authors:
 - Christopher Petersen
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2023-10-03 00:00:00.000000000 Z
+date: 2026-06-12 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
         version: '1.16'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
         version: '1.16'
 - !ruby/object:Gem::Dependency
@@ -61,6 +61,8 @@ executables:
 extensions: []
 extra_rdoc_files: []
 files:
+- ".github/workflows/ci.yml"
+- ".github/workflows/release.yml"
 - ".gitignore"
 - ".rspec"
 - ".travis.yml"
@@ -74,7 +76,7 @@ files:
 - git-trim.gemspec
 - lib/git-trim.rb
 - lib/git-trim/version.rb
-homepage: https://github.com/assaydepot/git-trim
+homepage: https://github.com/cpetersen/git-trim
 licenses:
 - MIT
 metadata: {}
@@ -94,7 +96,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.4.10
+rubygems_version: 3.5.22
 signing_key:
 specification_version: 4
 summary: A script to remove all merged branches that aren't protected.