git-branch--stray 1.4.0 → 2.0.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 794726db6368eccf8a09286d03014cdc427ffd3dfc896694af1bee038533ac89
-  data.tar.gz: 1f4e78547456b0f15b4a03b6abc96c527b76e58048df9426f88943cbfd6b6838
+  metadata.gz: bbfa10a7a0d8b4278d423308d7bd4ed21363286020f3b879f9160467eb57e1a0
+  data.tar.gz: f02984b76de180144fe1b6ef6da8ff215af2a521885dbe33fcef6c193a191f61
 SHA512:
-  metadata.gz: 97d5f24e9a159cf7bb2e3cfd0bc34a91296e826029eaf98b2265174b990db3a9d187cc88cd83962b79a31dbecaf48309052f88d31bf54d9e8d1cc605084c4c27
-  data.tar.gz: 58be300de49e6822b9db82c31860970b02b20b79f162129b17a6655daf177654863ed941c04a9840a6ee112c3f76ec72f16162ef607a8fb53eeb975e403547e2
+  metadata.gz: c4e96fa238e648c6c3df18b844c89319501c67868644df0238d5d74ad4785cd9ae53c2e2ffc62bf15b341438649c51b93ab9951bbe4a93c6f30cec33965d5865
+  data.tar.gz: 7cd44197c02eaaf8788f500ba0b6dfa277a7ba6487ce2b042bb070672dc0ca4aafabbe4e819879ca288897573e84aa4ba7096485eb0f62e969b3b28786e3c429

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/.rubocop.yml

@@ -1,5 +1,11 @@
-Layout/EmptyLinesAroundModuleBody:
-  Enabled: false
+AllCops:
+  TargetRubyVersion: 2.6
+  NewCops: enable
+  Exclude:
+    - 'doc/*'
+    - 'tmp/*'
+    - 'pkg/*'
+
 Layout/MultilineOperationIndentation:
   Enabled: false
 
@@ -7,6 +13,8 @@ Metrics/AbcSize:
   Enabled: false
 Metrics/MethodLength:
   Enabled: false
+Metrics/ModuleLength:
+  Enabled: false
 
 Style/BlockDelimiters:
   Enabled: false

data/.ruby-version

@@ -1 +1 @@
-2.3.8
+2.6.6

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,56 @@
+PATH
+  remote: .
+  specs:
+    git-branch--stray (2.0.0)
+      consenter (~> 1.0)
+
+GEM
+  remote: https://rubygems.org/
+  specs:
+    ast (2.4.1)
+    coderay (1.1.3)
+    consenter (1.0.6)
+    interception (0.5)
+    method_source (1.0.0)
+    minitest (5.14.1)
+    parallel (1.19.2)
+    parser (2.7.1.4)
+      ast (~> 2.4.1)
+    pry (0.13.1)
+      coderay (~> 1.1)
+      method_source (~> 1.0)
+    pry-rescue (1.5.1)
+      interception (>= 0.5)
+      pry (>= 0.12.0)
+    rainbow (3.0.0)
+    rake (13.0.1)
+    regexp_parser (1.7.1)
+    rexml (3.2.4)
+    rubocop (0.85.1)
+      parallel (~> 1.10)
+      parser (>= 2.7.0.1)
+      rainbow (>= 2.2.2, < 4.0)
+      regexp_parser (>= 1.7)
+      rexml
+      rubocop-ast (>= 0.0.3)
+      ruby-progressbar (~> 1.7)
+      unicode-display_width (>= 1.4.0, < 2.0)
+    rubocop-ast (0.0.3)
+      parser (>= 2.7.0.1)
+    ruby-progressbar (1.10.1)
+    unicode-display_width (1.7.0)
+
+PLATFORMS
+  ruby
+
+DEPENDENCIES
+  bundler (~> 2.1)
+  git-branch--stray!
+  minitest (~> 5.14)
+  pry (~> 0.13)
+  pry-rescue (~> 1.5)
+  rake (~> 13.0)
+  rubocop (~> 0.81)
+
+BUNDLED WITH
+   2.1.4

data/Rakefile

@@ -27,7 +27,12 @@ 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

@@ -1,4 +1,4 @@
-#!/usr/bin/env bash
+#!/usr/bin/env ruby
 
 #
 # inspiration taken from:
@@ -6,50 +6,51 @@
 # 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
-
-case $1 in
-	--all)
-		PATTERN='refs/heads refs/remotes' ;
-		DEREF='' ;
-		shift ;
-		;;
-	--remotes)
-		PATTERN='refs/remotes' ;
-		DEREF='' ;
-		shift ;
-		;;
-	--tags)
-		PATTERN='refs/tags' ;
-		DEREF='*' ;
-		shift ;
-		;;
-	*)
-		PATTERN='refs/heads' ;
-		DEREF='' ;
-		;;
-esac
-
-BRANCH_NAME="%(color:yellow)%(refname:short)%(color:reset)" ;
-OBJECT_NAME="%(color:red)%(objectname:short)%(color:reset)" ;
-COMMIT_DATE="%(color:bold green)(%(${DEREF}committerdate:relative))%(color:reset)" ;
-AUTHOR_NAME="%(color:bold blue)%(${DEREF}authorname)%(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
-
-git for-each-ref \
-	--color=always \
-	--sort=-committerdate \
-	--format="${FORMAT}" \
-	${PATTERN} "$@" | column -t -s $'\a' | less --RAW-CONTROL-CHARS ;
+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

@@ -10,7 +10,7 @@ Gem::Specification.new do |spec|
   spec.email         = ['pvandenberk@mac.com']
 
   spec.summary       = 'Delete stray local remote-tracking branches'
-  spec.description   = 'Delete stray local remote-tracking branches'
+  spec.description   = 'List and delete stray local remote-tracking branches'
   spec.homepage      = 'https://github.com/pvdb/git-branch--stray'
   spec.license       = 'MIT'
 
@@ -27,9 +27,10 @@ Gem::Specification.new do |spec|
 
   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 'rake'
-  spec.add_development_dependency 'rubocop'
+  spec.add_development_dependency 'bundler', '~> 2.1'
+  spec.add_development_dependency 'minitest', '~> 5.14'
+  spec.add_development_dependency 'pry', '~> 0.13'
+  spec.add_development_dependency 'pry-rescue', '~> 1.5'
+  spec.add_development_dependency 'rake', '~> 13.0'
+  spec.add_development_dependency 'rubocop', '~> 0.81'
 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!)
@@ -10,7 +24,6 @@ module Kernel
 end
 
 module Git
-
   module_function
 
   def local_head_refs
@@ -68,11 +81,11 @@ module Git
   end
 
   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
@@ -83,5 +96,4 @@ module Git
       system("git --no-pager branch -vv --list #{stray}")
     end
   end
-
 end

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

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

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: git-branch--stray
 version: !ruby/object:Gem::Version
-  version: 1.4.0
+  version: 2.0.0
 platform: ruby
 authors:
 - Peter Vandenberk
-autorequire: 
+autorequire:
 bindir: exe
 cert_chain: []
-date: 2019-06-26 00:00:00.000000000 Z
+date: 2020-06-20 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: consenter
@@ -28,73 +28,87 @@ dependencies:
   name: bundler
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '0'
+        version: '2.1'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '0'
+        version: '2.1'
 - !ruby/object:Gem::Dependency
   name: minitest
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '0'
+        version: '5.14'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '0'
+        version: '5.14'
 - !ruby/object:Gem::Dependency
   name: pry
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '0'
+        version: '0.13'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '0'
+        version: '0.13'
+- !ruby/object:Gem::Dependency
+  name: pry-rescue
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '1.5'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '1.5'
 - !ruby/object:Gem::Dependency
   name: rake
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '0'
+        version: '13.0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '0'
+        version: '13.0'
 - !ruby/object:Gem::Dependency
   name: rubocop
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '0'
+        version: '0.81'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '0'
-description: Delete stray local remote-tracking branches
+        version: '0.81'
+description: List and delete stray local remote-tracking branches
 email:
 - pvandenberk@mac.com
 executables:
@@ -104,11 +118,14 @@ executables:
 extensions: []
 extra_rdoc_files: []
 files:
+- ".gitconform"
 - ".gitignore"
 - ".pryrc"
 - ".rubocop.yml"
 - ".ruby-version"
+- CODE_OF_CONDUCT.md
 - Gemfile
+- Gemfile.lock
 - LICENSE.txt
 - README.md
 - Rakefile
@@ -144,8 +161,8 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.0.2
-signing_key: 
+rubygems_version: 3.0.3
+signing_key:
 specification_version: 4
 summary: Delete stray local remote-tracking branches
 test_files: []