git-branch--stray 1.2.0 → 1.7.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 10812240d1b566db422d53a3fb276550639a7aa3
-  data.tar.gz: b3694ca3a11419afac909c725f142332d1c424ea
+  metadata.gz: 71743dca125cf6a754f34f14b635ad2828680098
+  data.tar.gz: 2a62139dbff48e6237b767ba023ff4fd81ec2626
 SHA512:
-  metadata.gz: 526f52a9fd9baba2cab559846a641ae1505c92721a49130202e953d6caa30a93254e667a959e59e232065d7eddd3e21a8092411c9b0999ac6e90f5bb4bdf9b60
-  data.tar.gz: 3cb825338019007b243d211865269ea3b7a19638d49e619c968242533aa573ede93cae4a1c0c3d1cd9256901e02349a946ad03543d628708528600a987350082
+  metadata.gz: bc9d5d699c6a21945af805e09e9547bd8f53c13cb77d6b7c0781d24cffb41650edf2c89308d2d190f6facd514df0f9c92aeb152504270364cd83c437a997c4a5
+  data.tar.gz: 9c712c1207415d3356faec31f44bd67fe3eae7e6d2a192dacbe27627b9f8df286805e3bafb81f6061cbcb4c076a32708882a2c4e35e4b217ca6debf09cf1e6a3

data/.gitconform

@@ -0,0 +1,9 @@
+[git "conform"]
+	checker = CarriageReturnCharacterChecker
+	checker = FileNotEmptyChecker
+	checker = LowercaseFilenameChecker
+	checker = NonAsciiCharacterChecker
+	checker = NonAsciiFilenameChecker
+	checker = TabCharacterChecker
+	checker = TrailingWhitespaceChecker
+	checker = WhitespaceFilenameChecker

data/.gitignore

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

data/CODE_OF_CONDUCT.md

@@ -0,0 +1,74 @@
+# Contributor Covenant Code of Conduct
+
+## Our Pledge
+
+In the interest of fostering an open and welcoming environment, we as
+contributors and maintainers pledge to making participation in our project and
+our community a harassment-free experience for everyone, regardless of age, body
+size, disability, ethnicity, gender identity and expression, level of experience,
+nationality, personal appearance, race, religion, or sexual identity and
+orientation.
+
+## Our Standards
+
+Examples of behavior that contributes to creating a positive environment
+include:
+
+* Using welcoming and inclusive language
+* Being respectful of differing viewpoints and experiences
+* Gracefully accepting constructive criticism
+* Focusing on what is best for the community
+* Showing empathy towards other community members
+
+Examples of unacceptable behavior by participants include:
+
+* The use of sexualized language or imagery and unwelcome sexual attention or
+advances
+* Trolling, insulting/derogatory comments, and personal or political attacks
+* Public or private harassment
+* Publishing others' private information, such as a physical or electronic
+  address, without explicit permission
+* Other conduct which could reasonably be considered inappropriate in a
+  professional setting
+
+## Our Responsibilities
+
+Project maintainers are responsible for clarifying the standards of acceptable
+behavior and are expected to take appropriate and fair corrective action in
+response to any instances of unacceptable behavior.
+
+Project maintainers have the right and responsibility to remove, edit, or
+reject comments, commits, code, wiki edits, issues, and other contributions
+that are not aligned to this Code of Conduct, or to ban temporarily or
+permanently any contributor for other behaviors that they deem inappropriate,
+threatening, offensive, or harmful.
+
+## Scope
+
+This Code of Conduct applies both within project spaces and in public spaces
+when an individual is representing the project or its community. Examples of
+representing a project or community include using an official project e-mail
+address, posting via an official social media account, or acting as an appointed
+representative at an online or offline event. Representation of a project may be
+further defined and clarified by project maintainers.
+
+## Enforcement
+
+Instances of abusive, harassing, or otherwise unacceptable behavior may be
+reported by contacting the project team at peter.vandenberk@simplybusiness.co.uk. All
+complaints will be reviewed and investigated and will result in a response that
+is deemed necessary and appropriate to the circumstances. The project team is
+obligated to maintain confidentiality with regard to the reporter of an incident.
+Further details of specific enforcement policies may be posted separately.
+
+Project maintainers who do not follow or enforce the Code of Conduct in good
+faith may face temporary or permanent repercussions as determined by other
+members of the project's leadership.
+
+## Attribution
+
+This Code of Conduct is adapted from the [Contributor Covenant][homepage], version 1.4,
+available at [http://contributor-covenant.org/version/1/4][version]
+
+[homepage]: http://contributor-covenant.org
+[version]: http://contributor-covenant.org/version/1/4/

data/Gemfile.lock

@@ -0,0 +1,51 @@
+PATH
+  remote: .
+  specs:
+    git-branch--stray (1.7.0)
+      consenter (~> 1.0)
+
+GEM
+  remote: https://rubygems.org/
+  specs:
+    ast (2.4.0)
+    coderay (1.1.2)
+    consenter (1.0.5)
+    interception (0.5)
+    jaro_winkler (1.5.3)
+    method_source (0.9.2)
+    minitest (5.11.3)
+    parallel (1.17.0)
+    parser (2.6.3.0)
+      ast (~> 2.4.0)
+    pry (0.12.2)
+      coderay (~> 1.1.0)
+      method_source (~> 0.9.0)
+    pry-rescue (1.5.0)
+      interception (>= 0.5)
+      pry (>= 0.12.0)
+    rainbow (3.0.0)
+    rake (12.3.2)
+    rubocop (0.72.0)
+      jaro_winkler (~> 1.5.1)
+      parallel (~> 1.10)
+      parser (>= 2.6)
+      rainbow (>= 2.2.2, < 4.0)
+      ruby-progressbar (~> 1.7)
+      unicode-display_width (>= 1.4.0, < 1.7)
+    ruby-progressbar (1.10.1)
+    unicode-display_width (1.6.0)
+
+PLATFORMS
+  ruby
+
+DEPENDENCIES
+  bundler
+  git-branch--stray!
+  minitest
+  pry
+  pry-rescue
+  rake
+  rubocop
+
+BUNDLED WITH
+   2.0.2

data/Rakefile

@@ -8,7 +8,7 @@ task :validate_gemspec do
 end
 
 task :version => :validate_gemspec do
-  puts Git::Branch::Stray::VERSION
+  puts Git::Branch::Stray.version
 end
 
 require 'rubocop/rake_task'
@@ -23,11 +23,16 @@ Rake::TestTask.new(:test) do |t|
   t.test_files = FileList['test/**/*_test.rb']
 end
 
-task :default => [:rubocop, :test]
+task :default => [:version, :rubocop, :test]
 
 task :documentation
 
-Rake::Task['build'].enhance([:default, :documentation])
+task :ready => :documentation do
+  sh('bundle --quiet') # regenerate Gemfile.lock e.g. if version has changed
+  sh('git diff-index --quiet HEAD --') # https://stackoverflow.com/a/2659808
+end
+
+Rake::Task['build'].enhance([:default, :ready])
 
 # rubocop:enable Style/HashSyntax
 # rubocop:enable Style/SymbolArray

data/bin/setup

@@ -3,6 +3,8 @@ set -euo pipefail
 IFS=$'\n\t'
 set -vx
 
+[ -f Brewfile ] && brew bundle
+
 rbenv install -s
 gem install --conservative bundler
 bundle install

data/exe/git-branch--list--recent

@@ -0,0 +1,56 @@
+#!/usr/bin/env ruby
+
+#
+# inspiration taken from:
+#
+# https://github.com/paulirish/git-recent
+#
+
+nl = '%0a' # ASCII NEWLINE
+delim = '%07' # ASCII BELL
+
+head = '%(if)%(HEAD)%(then)%(end)'     # emoji prefix for current branch
+empty = '%(color:black) %(color:reset)' # to make `column` work correctly
+
+pattern, deref = if ARGV.delete('--tags')
+                   ['refs/tags', '*']
+                 elsif ARGV.delete('--all')
+                   'refs/heads refs/remotes'
+                 elsif ARGV.delete('--remotes')
+                   'refs/remotes'
+                 else
+                   'refs/heads'
+                 end
+
+branch_name = '%(refname:short)'
+branch_name = "%(color:yellow)#{branch_name}%(color:reset)"
+
+object_name = '%(objectname:short)'
+object_name = "%(color:red)#{object_name}%(color:reset)"
+
+commit_date = "%(#{deref}committerdate:relative)"
+commit_date = "%(color:bold green)(#{commit_date})%(color:reset)"
+
+author_name = "%(#{deref}authorname)"
+author_name = "%(color:bold blue)#{author_name}%(color:reset)"
+
+commit_subject = '%(contents:subject)'
+
+format = "#{head} #{branch_name}#{delim}"
+format = "#{format}#{object_name} #{commit_date} #{author_name}"
+format = "#{format}#{nl}#{empty}#{delim}#{commit_subject}"
+format = "#{format}#{nl}#{empty}#{delim}" # empty separator line
+
+require 'shellwords'
+
+cmd = <<-"EOCMD"
+  git for-each-ref \
+  --color=always \
+  --sort=-committerdate \
+  --format="#{format}" \
+  #{pattern} #{ARGV.shelljoin} | column -t -s $'\a' | less --RAW-CONTROL-CHARS
+EOCMD
+
+Kernel.exec(cmd)
+
+# That's all Folks!

data/git-branch--stray.gemspec

@@ -1,6 +1,7 @@
 lib = File.expand_path('lib', __dir__)
 $LOAD_PATH.unshift(lib) unless $LOAD_PATH.include?(lib)
 require 'git/branch/stray/version'
+require 'git/branch/stray/gemspec'
 
 Gem::Specification.new do |spec|
   spec.name          = Git::Branch::Stray::NAME
@@ -8,8 +9,8 @@ Gem::Specification.new do |spec|
   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.summary       = 'Delete stray local remote-tracking branches'
+  spec.description   = 'Delete stray local remote-tracking branches'
   spec.homepage      = 'https://github.com/pvdb/git-branch--stray'
   spec.license       = 'MIT'
 
@@ -22,10 +23,14 @@ Gem::Specification.new do |spec|
   spec.executables   = spec.files.grep(%r{^exe/}) { |f| File.basename(f) }
   spec.require_paths = ['lib']
 
+  spec.post_install_message = Git::Branch::Stray::PIM
+
   spec.add_dependency 'consenter', '~> 1.0'
 
   spec.add_development_dependency 'bundler'
+  spec.add_development_dependency 'minitest'
   spec.add_development_dependency 'pry'
+  spec.add_development_dependency 'pry-rescue'
   spec.add_development_dependency 'rake'
   spec.add_development_dependency 'rubocop'
 end

data/lib/git/branch/stray.rb

@@ -3,6 +3,20 @@ require 'git/branch/stray/version'
 require 'English'
 require 'consenter'
 
+class String
+  def colorize(color_code)
+    "\e[#{color_code}m#{self}\e[0m"
+  end
+
+  def red
+    colorize('31')
+  end
+
+  def yellow
+    colorize('33')
+  end
+end
+
 module Kernel
   def git(command)
     `git #{command}`.split($RS).each(&:strip!)
@@ -67,16 +81,18 @@ module Git
     }
   end
 
+  # rubocop:disable Layout/LineLength
   def delete_stray_branches
-    stray_branches.each_consented('Delete stray branch "%s"') do |stray|
+    stray_branches.each_consented('Delete stray branch "%s"', inspector: :yellow) do |stray|
       system("git branch -d #{stray}")
       next if $CHILD_STATUS.success?
 
-      Array(stray).each_consented('Delete unmerged branch "%s"') do |unmerged|
+      Array(stray).each_consented('Delete unmerged branch "%s"', inspector: :red) do |unmerged|
         system("git branch -D #{unmerged}")
       end
     end
   end
+  # rubocop:enable Layout/LineLength
 
   def list_stray_branches
     stray_branches.each do |stray|

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

@@ -0,0 +1,20 @@
+module Git
+  module Branch
+    module Stray
+      PIM = <<~"PIM".freeze
+
+        The following aliases are recommended for \033[1mgit branch--stray\33[0m:
+
+        \tgit config --global \033[1malias.bls\033[0m branch--list--stray
+        \tgit config --global \033[1malias.bds\033[0m branch--delete--stray
+
+        The following is an optional convenience alias:
+
+        \tgit config --global \033[1malias.blr\033[0m branch--list--recent
+
+        Thanks for using \033[1mgit branch--stray\033[0m ... the ultimate housekeeping tool for git branches!
+
+      PIM
+    end
+  end
+end

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

@@ -2,7 +2,11 @@ module Git
   module Branch
     module Stray
       NAME = 'git-branch--stray'.freeze
-      VERSION = '1.2.0'.freeze
+      VERSION = '1.7.0'.freeze
+
+      def self.version
+        "#{NAME} v#{VERSION}"
+      end
     end
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: git-branch--stray
 version: !ruby/object:Gem::Version
-  version: 1.2.0
+  version: 1.7.0
 platform: ruby
 authors:
 - Peter Vandenberk
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2018-11-13 00:00:00.000000000 Z
+date: 2020-05-27 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: consenter
@@ -38,6 +38,20 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: '0'
+- !ruby/object:Gem::Dependency
+  name: minitest
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: pry
   requirement: !ruby/object:Gem::Requirement
@@ -52,6 +66,20 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: '0'
+- !ruby/object:Gem::Dependency
+  name: pry-rescue
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: rake
   requirement: !ruby/object:Gem::Requirement
@@ -80,35 +108,45 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: '0'
-description: Delete local tracking branches that have been strayed
+description: Delete stray local remote-tracking branches
 email:
 - pvandenberk@mac.com
 executables:
 - git-branch--delete--stray
+- git-branch--list--recent
 - git-branch--list--stray
 extensions: []
 extra_rdoc_files: []
 files:
+- ".gitconform"
 - ".gitignore"
 - ".pryrc"
 - ".rubocop.yml"
 - ".ruby-version"
+- CODE_OF_CONDUCT.md
 - Gemfile
+- Gemfile.lock
 - LICENSE.txt
 - README.md
 - Rakefile
 - bin/console
 - bin/setup
 - exe/git-branch--delete--stray
+- exe/git-branch--list--recent
 - exe/git-branch--list--stray
 - git-branch--stray.gemspec
 - lib/git/branch/stray.rb
+- lib/git/branch/stray/gemspec.rb
 - lib/git/branch/stray/version.rb
 homepage: https://github.com/pvdb/git-branch--stray
 licenses:
 - MIT
 metadata: {}
-post_install_message: 
+post_install_message: "\nThe following aliases are recommended for \e[1mgit branch--stray\e[0m:\n\n\tgit
+  config --global \e[1malias.bls\e[0m branch--list--stray\n\tgit config --global \e[1malias.bds\e[0m
+  branch--delete--stray\n\nThe following is an optional convenience alias:\n\n\tgit
+  config --global \e[1malias.blr\e[0m branch--list--recent\n\nThanks for using \e[1mgit
+  branch--stray\e[0m ... the ultimate housekeeping tool for git branches!\n\n"
 rdoc_options: []
 require_paths:
 - lib
@@ -127,5 +165,5 @@ rubyforge_project:
 rubygems_version: 2.5.2.3
 signing_key: 
 specification_version: 4
-summary: Delete local tracking branches that have been strayed
+summary: Delete stray local remote-tracking branches
 test_files: []