git_curate 0.6.4 → 0.7.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 104be2a4415dd003c7c407d28ffcabb1eda79e0f8276e7be30aa5387592fe0ef
-  data.tar.gz: 2636466a92daeda271e41ebd4b10003f10703f792f1b41c0f5757089ed7aa932
+  metadata.gz: 7f019dd79a60464f73b25ee00bcd5f0a5bb07f696fb873ce288d05b3aeacdcb4
+  data.tar.gz: b29735e0e19a7f3c1110d19bca33811dce1875f9b097d12fb64010a312d680dc
 SHA512:
-  metadata.gz: 4cf19b5538b1a996c29e260e7d576e9f12dade39bc506c008946aaec2ef4f2042fe2b4f85b7c66fe1c87c9db5d1c69815ded3e38496226bfc5f6354ef62ae07b
-  data.tar.gz: 0521c60590d20e6fd36aecc5b8759a38c7d30077043e1b64d33cab6d8d200fb179af6091a52c24be8a63352af82128bbef0d7a317ff5b96ad9e74a1f579280aa
+  metadata.gz: 335169413223db9f953f974533e3255dc51b5a42abd970dcbbcc37d743bb0302053204f51cfed51ee1859c4f8bdd7f1e975937f3c4d9abef35ad72bf01fd92e8
+  data.tar.gz: b9a30efa63839e7bd84354dce75b8604b9af34ad6ab04c2b57363ce14dea9e42093080ff8cacf8701a6babd30ac5f2e76a225c14ce5303acd45dfba54ea74376

data/.gitignore

@@ -1,6 +1,7 @@
 /.bundle/
 /.yardoc
 /_yardoc/
+/Gemfile.lock
 /coverage/
 /doc/
 /pkg/

data/.rspec

@@ -0,0 +1,2 @@
+--format documentation
+--color

data/.travis.yml

@@ -0,0 +1,9 @@
+sudo: false
+language: ruby
+rvm:
+  - 2.1.10
+  - 2.2.10
+  - 2.3.8
+  - 2.4.6
+  - 2.5.5
+  - 2.6.3

data/CHANGELOG.md

@@ -1,5 +1,12 @@
 # Changelog
 
+### v0.7.0
+
+* Show "no" option as capital "N", to hint that it's the default
+* Get user input case-insensitively
+* More unit tests
+* Build status and coverage badges added to README
+
 ### v0.6.4
 
 * Fix breakage on Ruby <= 2.3 due to unsupported Regex #match? method.

data/README.md

@@ -1,8 +1,10 @@
 # git curate
 
 [![Gem Version][GV img]][Gem Version]
+[![Build Status][BS img]][Build Status]
+[![Coverage Status][CS img]][Coverage Status]
 
-<img src="https://raw.githubusercontent.com/matt-harvey/git_curate/master/assets/demo2.gif" width="1000" alt="Demo" />
+<img src="https://raw.githubusercontent.com/matt-harvey/git_curate/master/assets/demo.gif" width="1000" alt="Demo" />
 
 ## Motivation
 
@@ -68,7 +70,7 @@ Bug reports and pull requests are welcome on [GitHub](https://github.com/matt-ha
 To start working on `git_curate`, `git clone` and `cd` into your fork of the repo, then run `bin/setup` to
 install dependencies.
 
-To run the test suite, run `rake spec`. For a list of other Rake tasks, run `rake -T`.
+To run the test suite, run `bundle exec rake spec`. For a list of other Rake tasks, run `bundle exec rake -T`.
 
 ## License
 
@@ -76,4 +78,9 @@ The gem is available as open source under the terms of the [MIT
 License](http://opensource.org/licenses/MIT).
 
 [Gem Version]: https://rubygems.org/gems/git_curate
-[GV img]: https://img.shields.io/gem/v/git_curate.svg?style=plastic
+[Build Status]: https://travis-ci.org/matt-harvey/git_curate
+[Coverage Status]: https://coveralls.io/github/matt-harvey/git_curate
+
+[GV img]: https://img.shields.io/gem/v/git_curate.svg
+[BS img]: https://img.shields.io/travis/matt-harvey/git_curate.svg
+[CS img]: https://img.shields.io/coveralls/matt-harvey/git_curate.svg

data/VERSION

@@ -1 +1 @@
-0.6.4
+0.7.0

data/git_curate.gemspec

@@ -33,7 +33,9 @@ Gem::Specification.new do |spec|
   spec.add_runtime_dependency "tty-screen", "0.7.0"
 
   spec.add_development_dependency "bundler"
+  spec.add_development_dependency "coveralls"
   spec.add_development_dependency "rake", "~> 12.3"
   spec.add_development_dependency "rake-version", "~> 1.0"
   spec.add_development_dependency "rspec", "~> 3.0"
+  spec.add_development_dependency "simplecov"
 end

data/lib/git_curate.rb

@@ -2,4 +2,5 @@ require "git_curate/branch"
 require "git_curate/cli_parser"
 require "git_curate/copyright"
 require "git_curate/runner"
+require "git_curate/util"
 require "git_curate/version"

data/lib/git_curate/branch.rb

@@ -1,9 +1,15 @@
-require "open3"
-
 module GitCurate
 
   class Branch
 
+    # Regex for determining whether a "raw" branch name is the name of the current branch
+    CURRENT_BRANCH_REGEX = /^\*\s+/
+
+    # Regexes for unpacking the output of `git branch -vv`
+    BRANCH_NAME_REGEX = /\s+/
+    LEADING_STAR_REGEX = /^\* /
+    REMOTE_INFO_REGEX = /^[^\s]+\s+[^\s]+\s+\[(.+?)\]/
+
     attr_reader :raw_name
 
     # raw_name should start in "* " if the current branch, but should otherwise have not whitespace.
@@ -12,11 +18,11 @@ module GitCurate
     end
 
     def proper_name
-      @proper_name ||= @raw_name.lstrip.gsub(/^\*\s+/, '')
+      @proper_name ||= @raw_name.lstrip.sub(CURRENT_BRANCH_REGEX, '')
     end
 
     def current?
-      @current ||= (/^\*\s+/ =~ @raw_name)
+      @current ||= (@raw_name =~ CURRENT_BRANCH_REGEX)
     end
 
     def displayable_name(pad:)
@@ -28,15 +34,53 @@ module GitCurate
     end
 
     def last_author
-      Open3.capture2("git log -n1 --format=format:%an #{proper_name}").first
+      Util.command_output("git log -n1 --format=format:%an #{proper_name}")
     end
 
     def last_commit_date
-      Open3.capture2("git log -n1 --date=short --format=format:%cd #{proper_name}").first
+      Util.command_output("git log -n1 --date=short --format=format:%cd #{proper_name}")
     end
 
     def last_subject
-      Open3.capture2("git log -n1 --format=format:%s #{proper_name}").first
+      Util.command_output("git log -n1 --format=format:%s #{proper_name}")
+    end
+
+    # Returns the local branches
+    def self.local
+      command_to_branches("git branch")
+    end
+
+    # Returns local branches that are merged into current HEAD
+    def self.local_merged
+      command_to_branches("git branch --merged")
+    end
+
+    # Returns a Hash containing, as keys, the proper names of all local branches that have upstream branches,
+    # and, as values, a brief description of each branch's status relative to its upstream
+    # branch (up to date, or ahead/behind)
+    def self.upstream_info
+      Util.command_to_a("git branch -vv").map do |line|
+        line.gsub!(LEADING_STAR_REGEX, "")
+        branch_name = line.split(BRANCH_NAME_REGEX)[0]
+        remote_info = line[REMOTE_INFO_REGEX, 1]
+        if remote_info.nil?
+          nil
+        else
+          comparison_raw = remote_info.split(":")
+          comparison = if comparison_raw.length < 2
+                         "Up to date"
+                       else
+                         comparison_raw[1].strip.capitalize
+                       end
+          [branch_name, comparison]
+        end
+      end.compact.to_h
+    end
+
+    private
+
+    def self.command_to_branches(command)
+      Util.command_to_a(command).map { |raw_branch_name| self.new(raw_branch_name) }
     end
 
   end

data/lib/git_curate/runner.rb

@@ -5,11 +5,6 @@ require "tty-screen"
 
 module GitCurate
 
-  # Regexes for unpacking the output of `git branch -vv`
-  BRANCH_NAME_REGEX = /\s+/
-  LEADING_STAR_REGEX = /^\* /
-  REMOTE_INFO_REGEX = /^[^\s]+\s+[^\s]+\s+\[(.+?)\]/
-
   class Runner
 
     def initialize(opts)
@@ -22,10 +17,10 @@ module GitCurate
         exit
       end
 
-      branches = command_to_a("git branch").map { |b| Branch.new(b) }
+      branches = Branch.local
       branches.reject!(&:current?) if interactive?
-      merged_branches = command_to_a("git branch --merged").to_set
-      upstream_branches = get_upstream_branches
+      merged_branch_names = Branch.local_merged.map(&:proper_name).to_set
+      upstream_branches = Branch.upstream_info
 
       table = Tabulo::Table.new(branches, vertical_rule_character: " ", intersection_character: " ",
         horizontal_rule_character: "-", column_padding: 0, align_header: :left) do |t|
@@ -34,50 +29,47 @@ module GitCurate
         t.add_column("Last commit", &:last_commit_date)
         t.add_column("Last author", &:last_author)
         t.add_column("Last subject", &:last_subject)
-        t.add_column("Merged#{$/}into HEAD?") { |b| merged_branches.include?(b.proper_name) ? "Merged" : "Not merged" }
+        t.add_column("Merged#{$/}into HEAD?") { |b| merged_branch_names.include?(b.proper_name) ? "Merged" : "Not merged" }
         t.add_column("Status vs#{$/}upstream") { |b| upstream_branches.fetch(b.proper_name, "No upstream") }
       end
 
-      prompt = " Delete? [y/n/done/abort/help] "
+      prompt = " Delete? [y/N/done/abort/help] "
       longest_response = "abort"
-      prompt_and_response_width =
-        if interactive?
-          prompt.length + longest_response.length + 1
-        else
-          0
-        end
+      prompt_and_response_width = (interactive? ? (prompt.length + longest_response.length + 1) : 0)
       table.pack(max_table_width: TTY::Screen.width - prompt_and_response_width)
 
       branches_to_delete = []
 
+      if !interactive?
+        puts table
+        puts table.horizontal_rule
+        return
+      end
+
       table.each_with_index do |row, index|
-        if interactive?
-          case HighLine.ask("#{row}#{prompt}")
-          when "y"
-            branches_to_delete << row.source.proper_name
-          when "n", ""
-            ;  # do nothing
-          when "done"
-            puts table.horizontal_rule
-            finalize(branches_to_delete)
-            exit
-          when "abort"
-            puts table.horizontal_rule
-            puts "#{$/}Aborting. No branches deleted."
-            exit
-          else
-            puts table.horizontal_rule
-            print_help
-            puts table.horizontal_rule unless index == 0
-            redo
-          end
+        case HighLine.ask("#{row}#{prompt}").downcase
+        when "y"
+          branches_to_delete << row.source.proper_name
+        when "n", ""
+          ;  # do nothing
+        when "done"
+          puts table.horizontal_rule
+          finalize(branches_to_delete)
+          exit
+        when "abort"
+          puts table.horizontal_rule
+          puts "#{$/}Aborting. No branches deleted."
+          exit
         else
-          puts row
+          puts table.horizontal_rule
+          print_help
+          puts table.horizontal_rule unless index == 0
+          redo
         end
       end
       puts table.horizontal_rule
 
-      finalize(branches_to_delete) if interactive?
+      finalize(branches_to_delete)
     end
 
     private
@@ -86,28 +78,6 @@ module GitCurate
       !@opts[:list]
     end
 
-    # Returns a Hash containing, as keys, all local branches that have upstream branches,
-    # and, as values, a brief description of each branch's status relative to its upstream
-    # branch (up to date, or ahead/behind)
-    def get_upstream_branches
-      command_to_a("git branch -vv").map do |line|
-        line.gsub!(LEADING_STAR_REGEX, "")
-        branch_name = line.split(BRANCH_NAME_REGEX)[0]
-        remote_info = line[REMOTE_INFO_REGEX, 1]
-        if remote_info.nil?
-          nil
-        else
-          comparison_raw = remote_info.split(":")
-          comparison = if comparison_raw.length < 2
-                         "Up to date"
-                       else
-                         comparison_raw[1].strip.capitalize
-                       end
-          [branch_name, comparison]
-        end
-      end.compact.to_h
-    end
-
     def finalize(branches_to_delete)
       if branches_to_delete.size != 0
         puts
@@ -130,12 +100,6 @@ module GitCurate
   EOL
     end
 
-    # Runs the passed string command as a system command, gathers any lines of output, stripped of
-    # leading and trailing whitespace, and returns them as an array.
-    def command_to_a(command)
-      `#{command}`.split($/).map(&:strip)
-    end
-
   end
 
 end

data/lib/git_curate/util.rb

@@ -0,0 +1,20 @@
+require "open3"
+
+module GitCurate
+
+  module Util
+
+    # Runs the passed string as a system command, gathers any lines of output, stripped of
+    # leading and trailing whitespace, and returns them as an array.
+    def self.command_to_a(command)
+      command_output(command).split($/).map(&:strip)
+    end
+
+    # Runs the passed string as a system command and returns its output.
+    def self.command_output(command)
+      Open3.capture2(command).first
+    end
+
+  end
+
+end

data/lib/git_curate/version.rb

@@ -1,3 +1,3 @@
 module GitCurate
-  VERSION = "0.6.4"
+  VERSION = "0.7.0"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: git_curate
 version: !ruby/object:Gem::Version
-  version: 0.6.4
+  version: 0.7.0
 platform: ruby
 authors:
 - Matthew Harvey
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2019-07-26 00:00:00.000000000 Z
+date: 2019-08-03 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: highline
@@ -66,6 +66,20 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: '0'
+- !ruby/object:Gem::Dependency
+  name: coveralls
+  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
@@ -108,6 +122,20 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: '3.0'
+- !ruby/object:Gem::Dependency
+  name: simplecov
+  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'
 description: Step through local git branches from the command line, keeping or deleting
   each.
 email:
@@ -118,14 +146,15 @@ extensions: []
 extra_rdoc_files: []
 files:
 - ".gitignore"
+- ".rspec"
+- ".travis.yml"
 - CHANGELOG.md
 - Gemfile
-- Gemfile.lock
 - LICENSE.txt
 - README.md
 - Rakefile
 - VERSION
-- assets/demo2.gif
+- assets/demo.gif
 - bin/setup
 - exe/git-curate
 - git_curate.gemspec
@@ -134,6 +163,7 @@ files:
 - lib/git_curate/cli_parser.rb
 - lib/git_curate/copyright.rb
 - lib/git_curate/runner.rb
+- lib/git_curate/util.rb
 - lib/git_curate/version.rb
 homepage: https://github.com/matt-harvey/git_curate
 licenses:

data/Gemfile.lock

@@ -1,47 +0,0 @@
-PATH
-  remote: .
-  specs:
-    git_curate (0.6.4)
-      highline (= 2.0.2)
-      tabulo (= 1.5.1)
-      tty-screen (= 0.7.0)
-
-GEM
-  remote: https://rubygems.org/
-  specs:
-    diff-lcs (1.3)
-    highline (2.0.2)
-    rake (12.3.2)
-    rake-version (1.0.1)
-      rake (> 11.1)
-    rspec (3.8.0)
-      rspec-core (~> 3.8.0)
-      rspec-expectations (~> 3.8.0)
-      rspec-mocks (~> 3.8.0)
-    rspec-core (3.8.2)
-      rspec-support (~> 3.8.0)
-    rspec-expectations (3.8.4)
-      diff-lcs (>= 1.2.0, < 2.0)
-      rspec-support (~> 3.8.0)
-    rspec-mocks (3.8.1)
-      diff-lcs (>= 1.2.0, < 2.0)
-      rspec-support (~> 3.8.0)
-    rspec-support (3.8.2)
-    tabulo (1.5.1)
-      tty-screen (= 0.7.0)
-      unicode-display_width (= 1.6.0)
-    tty-screen (0.7.0)
-    unicode-display_width (1.6.0)
-
-PLATFORMS
-  ruby
-
-DEPENDENCIES
-  bundler
-  git_curate!
-  rake (~> 12.3)
-  rake-version (~> 1.0)
-  rspec (~> 3.0)
-
-BUNDLED WITH
-   2.0.1