git-branch--stray 1.0.0

checksums.yaml

@@ -0,0 +1,7 @@
+---
+SHA256:
+  metadata.gz: 4c4dd87337d21115aebe331f57a12fdddff6cef940956e63adadda37e465c5ec
+  data.tar.gz: e160bdbfa27758e704935d27df66c03bd2077d633afc1d95b780337d320138e2
+SHA512:
+  metadata.gz: 1c81e946ca83b3c3cb388c611d644e8e9536beca3ff658788f75b0036c45ea068864485f6cf1cc30e874ecc42f0b83fc950a73bb1cd111ef6a4367ebb967ff3c
+  data.tar.gz: deff72901ca564f32cfc0bd3f4b7aec878ae38ff33d9d6c1792ae5ea8c8b2960df60041de061e393ebaea69c91c24390ed86d7a7c946d406dd59fdc1bfe49052

data/.gitignore

@@ -0,0 +1,9 @@
+/.bundle/
+/.yardoc
+/Gemfile.lock
+/_yardoc/
+/coverage/
+/doc/
+/pkg/
+/spec/reports/
+/tmp/

data/.pryrc

@@ -0,0 +1,2 @@
+require 'bundler/setup'
+require 'git/branch/stray'

data/.rubocop.yml

@@ -0,0 +1,16 @@
+Layout/EmptyLinesAroundModuleBody:
+  Enabled: false
+Layout/MultilineOperationIndentation:
+  Enabled: false
+
+Metrics/AbcSize:
+  Enabled: false
+Metrics/MethodLength:
+  Enabled: false
+
+Style/BlockDelimiters:
+  Enabled: false
+Style/Documentation:
+  Enabled: false
+Style/FrozenStringLiteralComment:
+  Enabled: false

data/.ruby-version

@@ -0,0 +1 @@
+2.5.1

data/.travis.yml

@@ -0,0 +1,7 @@
+---
+sudo: false
+language: ruby
+cache: bundler
+rvm:
+  - 2.5.1
+before_install: gem install bundler -v 1.16.6

data/Gemfile

@@ -0,0 +1,6 @@
+source 'https://rubygems.org'
+
+git_source(:github) { |repo_name| "https://github.com/#{repo_name}" }
+
+# Specify your gem's dependencies in git-branch--stray.gemspec
+gemspec

data/README.md

@@ -0,0 +1,83 @@
+# Delete "stray" git branches
+
+## tl;dr
+
+Run `git branch--delete--stray` to delete local "remote-tracking" branches for which the branch being tracked has been deleted on the remote.
+
+## Background
+
+Git has a default disposition of keeping data unless it's explicitly thrown away; this extends to _(unnecessarily)_ holding onto references to so-called local "remote-tracking" branches where the branch being tracked has long since been deleted on the remote itself.
+
+This utility refers to these local branches as "stray" branches, and includes two git extensions: one for listing all "stray" branches, and a second one for _(selectively)_ deleting them.
+
+In case of the [GitHub Flow](https://guides.github.com/introduction/flow/) for instance, a local branch would become "stray" after a pull request gets merged and the underlying remote branch gets deleted... after the next `git fetch` it would be possible to identify the "stray" branch with something akin to `git branch --list --merged`.
+
+But that's not the only scenario that results in "stray" branches, which is why the various "solutions" you find on Stack Overflow don't typically cover all edge cases, whereas this utility does;  it also prefers git plumbing over git porcelain, and it implements most of its logic in a library, making it very easy indeed to implement even more git extensions for dealing with "stray" branches.
+
+## What's in a name?
+
+In the context of this utility, a branch is considered "stray" if it is what git calls a "remote-tracking" branch but one where the remote branch it was tracking no longer exists _(ie. where the branch it was tracking has been deleted on the remote, e.g. on GitHub or on Bitbucket)_.
+
+The term "stray" was chosen to avoid confusion with existing git terminology like ''merged", "tracked" and even "orpaned".
+
+Also, the names of the two git extensions implemented by this utility:
+
+* `git-branch--list--stray`
+* `git-branch--delete--stray`
+
+... were chosen two mimic some existing `git branch` commands:
+
+* `git branch --list --merged`
+* `git branch --delete`
+
+respectively.
+
+## Installation
+
+Add this line to your application's Gemfile:
+
+```ruby
+gem 'git-branch--stray'
+```
+
+And then execute:
+
+    $ bundle
+
+Or install it yourself as:
+
+    $ gem install git-branch--stray
+
+## Usage
+
+After installing the gem, you will have two new git extensions in your environment: `git-branch--list--stray` will list all stray branches, whereas `git-branch--delete--stray` will iterate over the list and - after prompting for confirmation - delete any stray branches in your git workarea.
+
+Because they will be in your local `$PATH` you can run them as so-called git subcommands as follows:
+
+```
+git branch--list--stray
+git branch--delete-stray
+```
+
+Most likely, though, you will want to create some [git aliases](https://git-scm.com/book/en/v2/Git-Basics-Git-Aliases) to make it easier to work with the two utility scripts:
+
+```
+git config --global alias.bls branch--list--stray
+git config --global alias.bds branch--delete--stray
+```
+
+Alternatively, a similar approach can be used to add either of the scripts to your existing git aliases and/or git utility scripts.
+
+## Pruning
+
+The two git extensions work best if your git workflow includes regular pruning of remote-tracking references that no longer exist on the remote, either by running `git fetch --prune` when syncing with the remote in question, or else configuring [git's pruning behaviour](https://git-scm.com/docs/git-fetch#_pruning) for your environment.
+
+## Development
+
+After checking out the repo, run `bin/setup` to install dependencies. Then, run `rake test` 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 tags, and push the `.gem` file to [rubygems.org](https://rubygems.org).
+
+## Contributing
+
+Bug reports and pull requests are welcome on GitHub at https://github.com/pvdb/git-branch--stray.

data/Rakefile

@@ -0,0 +1,33 @@
+# rubocop:disable Style/SymbolArray
+# rubocop:disable Style/HashSyntax
+
+require 'bundler/gem_tasks'
+
+task :validate_gemspec do
+  Bundler.load_gemspec('git-branch--stray.gemspec').validate
+end
+
+task :version => :validate_gemspec do
+  puts Git::Branch::Stray::VERSION
+end
+
+require 'rubocop/rake_task'
+
+RuboCop::RakeTask.new(:rubocop)
+
+require 'rake/testtask'
+
+Rake::TestTask.new(:test) do |t|
+  t.libs << 'test'
+  t.libs << 'lib'
+  t.test_files = FileList['test/**/*_test.rb']
+end
+
+task :default => [:rubocop, :test]
+
+task :documentation
+
+Rake::Task['build'].enhance([:default, :documentation])
+
+# rubocop:enable Style/HashSyntax
+# rubocop:enable Style/SymbolArray

data/bin/console

@@ -0,0 +1,7 @@
+#!/usr/bin/env ruby
+
+require 'bundler/setup'
+require 'git/branch/stray'
+
+require 'pry'
+Pry.start

data/bin/setup

@@ -0,0 +1,13 @@
+#!/usr/bin/env bash
+set -euo pipefail
+IFS=$'\n\t'
+set -vx
+
+rbenv install -s
+gem install --conservative bundler
+bundle install
+
+set +vxeu
+echo
+
+# That's all Folks!

data/exe/git-branch--delete--stray

@@ -0,0 +1,21 @@
+#!/usr/bin/env ruby
+
+lib = File.expand_path('../../lib', __FILE__)
+$LOAD_PATH.unshift(lib) unless $LOAD_PATH.include?(lib)
+require 'git/branch/stray'
+
+%w[TERM INT].each do |signal|
+  Signal.trap(signal) do
+    exit(0)
+  end
+end
+
+if git('rev-parse --show-toplevel').first
+  Git.delete_stray_branches
+  exit(0)
+else
+  puts "Please run #{File.basename(__FILE__)} from inside a git repo!"
+  exit(-1)
+end
+
+# That's all Folks!

data/exe/git-branch--list--stray

@@ -0,0 +1,15 @@
+#!/usr/bin/env ruby
+
+lib = File.expand_path('../../lib', __FILE__)
+$LOAD_PATH.unshift(lib) unless $LOAD_PATH.include?(lib)
+require 'git/branch/stray'
+
+if git('rev-parse --show-toplevel').first
+  Git.list_stray_branches
+  exit(0)
+else
+  puts "Please run #{File.basename(__FILE__)} from inside a git repo!"
+  exit(-1)
+end
+
+# That's all Folks!

data/git-branch--stray.gemspec

@@ -0,0 +1,30 @@
+lib = File.expand_path('../lib', __FILE__)
+$LOAD_PATH.unshift(lib) unless $LOAD_PATH.include?(lib)
+require 'git/branch/stray/version'
+
+Gem::Specification.new do |spec|
+  spec.name          = 'git-branch--stray'
+  spec.version       = Git::Branch::Stray::VERSION
+  spec.authors       = ['Peter Vandenberk']
+  spec.email         = ['pvandenberk@mac.com']
+
+  spec.summary       = 'Delete local tracking branches that have been strayed'
+  spec.description   = 'Delete local tracking branches that have been strayed'
+  spec.homepage      = 'https://github.com/pvdb/git-branch--stray'
+
+  spec.files         = Dir.chdir(File.expand_path('..', __FILE__)) do
+    `git ls-files -z`
+      .split("\x0")
+      .reject { |f| f.match(%r{^(test|spec|features)/}) }
+  end
+  spec.bindir        = 'exe'
+  spec.executables   = spec.files.grep(%r{^exe/}) { |f| File.basename(f) }
+  spec.require_paths = ['lib']
+
+  spec.add_dependency 'consenter', '~> 1.0'
+
+  spec.add_development_dependency 'bundler', '~> 1.16'
+  spec.add_development_dependency 'minitest', '~> 5.0'
+  spec.add_development_dependency 'pry', '~> 0.11'
+  spec.add_development_dependency 'rake', '~> 10.0'
+end

data/lib/git/branch/stray/version.rb

@@ -0,0 +1,7 @@
+module Git
+  module Branch
+    module Stray
+      VERSION = '1.0.0'.freeze
+    end
+  end
+end

data/lib/git/branch/stray.rb

@@ -0,0 +1,86 @@
+require 'git/branch/stray/version'
+
+require 'English'
+require 'consenter'
+
+module Kernel
+  def git(command)
+    `git #{command}`.split($RS).each(&:strip!)
+  end
+end
+
+module Git
+
+  module_function
+
+  def local_head_refs
+    git("for-each-ref --format='%(refname)' refs/heads")
+  end
+
+  def head_refs_for(remote)
+    # alternative implementation that requires
+    # access to the remote tracking repository
+    #
+    # git("ls-remote --quiet --refs --heads #{remote}")
+    #   .map { |sha_and_ref| sha_and_ref.split(/\s+/).last }
+    #
+    # but we assume that this utility will mainly be
+    # used as part of a "git workflow" that includes
+    # regular pruning of remote tracking references,
+    # which means we don't have to go over the wire!
+    git("for-each-ref --format='%(refname)' refs/remotes/#{remote}")
+  end
+
+  def upstream_reference_for(branch)
+    git("rev-parse --verify --abbrev-ref #{branch}@{upstream}").first
+  end
+
+  def remote_for(branch)
+    git("config --local --get branch.#{branch}.remote").first
+  end
+
+  def merge_ref_for(branch)
+    git("config --local --get branch.#{branch}.merge").first
+  end
+
+  def branch_name_from(symbolic_ref)
+    # extract the branch name from a given symbolic ref
+    # local:  e.g. "refs/heads/master"
+    # remote: e.g. "refs/remotes/origin/master"
+    symbolic_ref.sub(%r{\Arefs/(heads|remotes/[^/]+)/}, '')
+  end
+
+  def stray_branches
+    to_branch_name = method(:branch_name_from)
+
+    local_branch_names = local_head_refs.map(&to_branch_name)
+
+    remote_branch_names = Hash.new { |branch_names, remote|
+      branch_names[remote] = head_refs_for(remote).map(&to_branch_name)
+    }
+
+    local_branch_names.find_all { |local_branch|
+      (remote = remote_for(local_branch)) &&
+      (merge_ref = merge_ref_for(local_branch)) &&
+      (upstream_branch = to_branch_name[merge_ref]) &&
+      !remote_branch_names[remote].include?(upstream_branch)
+    }
+  end
+
+  def delete_stray_branches
+    stray_branches.each_consented('Delete stray branch "%s"') do |stray|
+      system("git branch -d #{stray}")
+      next if $CHILD_STATUS.success?
+      Array(stray).each_consented('Delete unmerged branch "%s"') do |unmerged|
+        system("git branch -D #{unmerged}")
+      end
+    end
+  end
+
+  def list_stray_branches
+    stray_branches.each do |stray|
+      system("git --no-pager branch -vv --list #{stray}")
+    end
+  end
+
+end

metadata

@@ -0,0 +1,130 @@
+--- !ruby/object:Gem::Specification
+name: git-branch--stray
+version: !ruby/object:Gem::Version
+  version: 1.0.0
+platform: ruby
+authors:
+- Peter Vandenberk
+autorequire: 
+bindir: exe
+cert_chain: []
+date: 2018-10-08 00:00:00.000000000 Z
+dependencies:
+- !ruby/object:Gem::Dependency
+  name: consenter
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '1.0'
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '1.0'
+- !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
+  name: minitest
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '5.0'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '5.0'
+- !ruby/object:Gem::Dependency
+  name: pry
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '0.11'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '0.11'
+- !ruby/object:Gem::Dependency
+  name: rake
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '10.0'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '10.0'
+description: Delete local tracking branches that have been strayed
+email:
+- pvandenberk@mac.com
+executables:
+- git-branch--delete--stray
+- git-branch--list--stray
+extensions: []
+extra_rdoc_files: []
+files:
+- ".gitignore"
+- ".pryrc"
+- ".rubocop.yml"
+- ".ruby-version"
+- ".travis.yml"
+- Gemfile
+- README.md
+- Rakefile
+- bin/console
+- bin/setup
+- exe/git-branch--delete--stray
+- exe/git-branch--list--stray
+- git-branch--stray.gemspec
+- lib/git/branch/stray.rb
+- lib/git/branch/stray/version.rb
+homepage: https://github.com/pvdb/git-branch--stray
+licenses: []
+metadata: {}
+post_install_message: 
+rdoc_options: []
+require_paths:
+- lib
+required_ruby_version: !ruby/object:Gem::Requirement
+  requirements:
+  - - ">="
+    - !ruby/object:Gem::Version
+      version: '0'
+required_rubygems_version: !ruby/object:Gem::Requirement
+  requirements:
+  - - ">="
+    - !ruby/object:Gem::Version
+      version: '0'
+requirements: []
+rubyforge_project: 
+rubygems_version: 2.7.6
+signing_key: 
+specification_version: 4
+summary: Delete local tracking branches that have been strayed
+test_files: []