git_curate 0.2.0 → 0.3.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
-SHA1:
-  metadata.gz: 62b82ad94f1a3524028e3e9f8b8dd60f1b4f2177
-  data.tar.gz: e01c3ba16c3828cdb511f69fea4f042451c851c3
+SHA256:
+  metadata.gz: 354154ef2b612e1b4831e2c42296317782e313286ea8686e039d8a96b406c4bc
+  data.tar.gz: ec34593d4e28187ab7d6e9aa45dbf5aa9e5689e2075427034e19738cb70e3357
 SHA512:
-  metadata.gz: 442a5541be149365e52164ade62f83fef05838baadfc3d34ab5c003963891d3bac2c4bed2c3499e30cdce1a2b8fcdb8f964172ae41228aa0d4af8d99ad153f8d
-  data.tar.gz: cb8dab16a57aadd7dfbdd009663a9fb1bc6eaa74ece51bd880656fa749814b3df01848a9437eddcd53221fdd423e393cbbfb82fb72942fb82ebe6f5c65eb661f
+  metadata.gz: 8fbb8bfce7b43df4eafc43933fe88fdaf283940475f3c2b6fb665f8c62d1ce2a044e6938850e10e789b9df757662d8353535411eedf7caa1842d4a1e0c837fff
+  data.tar.gz: 1bb25f41bb89503970202c6169dfeac3c5f7e957fb5227347f8fd0ca665d480f43846205316b1ea21c03cad76241e64a9b7c8681984e225417275000881aff3d

data/CHANGELOG.md

@@ -1,5 +1,9 @@
 # Changelog
 
+### v0.3.0
+
+* Add "Merged into HEAD?" column.
+
 ### v0.2.0
 
 * Make output more compact.

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    git_curate (0.2.0)
+    git_curate (0.3.0)
       highline (= 2.0.0)
       tabulo (= 1.2.0)
 
@@ -24,4 +24,4 @@ DEPENDENCIES
   rake-version (~> 1.0)
 
 BUNDLED WITH
-   1.16.1
+   1.16.6

data/README.md

@@ -2,6 +2,8 @@
 
 [![Gem Version][GV img]][Gem Version]
 
+<img src="https://raw.githubusercontent.com/matt-harvey/git_curate/master/assets/demo2.gif" width="1000" alt="Demo" />
+
 ## Motivation
 
 After a while, my local repo becomes cluttered with branches, and `git branch` outputs an awkwardly
@@ -9,9 +11,10 @@ long list. I want to delete some of those branches to bring that list back under
 can't always remember which branches I want to keep from the branch names alone; and inspecting them
 one at a time and _then_ running `git branch -D` in a separate step, is painful.
 
-`git curate` is intended to ease this pain. It steps you through the local branches of a repo one at a
-time, outputting a small amount of information about each branch (last commit date, author and
-summary), and prompting you either to keep or to delete each branch as you go.
+`git curate` is intended to ease this pain. It steps you through the local branches of a repo one at
+a time, outputting a small amount of information about each branch (last commit date, author and
+summary, and whether the branch has been merged into the current HEAD), and prompting you either to
+keep or to delete each branch as you go.
 
 ## Installation
 
@@ -47,7 +50,7 @@ After checking out the repo, run `bin/setup` to install dependencies.
 
 ## Contributing
 
-Bug reports and pull requests are welcome on GitHub at https://github.com/matt-harvey/git_curate.
+Bug reports and pull requests are welcome on [GitHub](https://github.com/matt-harvey/git_curate).
 
 ## License
 

data/VERSION

@@ -1 +1 @@
-0.2.0
+0.3.0

data/lib/git_curate.rb

@@ -1,4 +1,5 @@
 require "git_curate/runner"
 require "git_curate/version"
 require "highline/import"
+require "set"
 require "tabulo"

data/lib/git_curate/runner.rb

@@ -8,7 +8,8 @@ module GitCurate
         exit
       end
 
-      branches = `git branch`.split($/).reject { |b| current_branch?(b) }.map(&:strip)
+      branches = command_to_a("git branch").reject { |b| current_branch?(b) }
+      merged_branches = command_to_a("git branch --merged").reject { |b| current_branch?(b) }.to_set
 
       table = Tabulo::Table.new(branches, vertical_rule_character: " ", intersection_character: " ",
         horizontal_rule_character: "-", column_padding: 0) do |t|
@@ -26,6 +27,10 @@ module GitCurate
         t.add_column("Last subject", align_header: :left) do |branch|
           `git log -n1 --format='format:%s' #{branch}`
         end
+
+        t.add_column("Merged into HEAD?", align_header: :left) do |branch|
+          merged_branches.include?(branch) ? "Merged" : "Not merged"
+        end
       end
 
       table.shrinkwrap!(max_table_width: 125)
@@ -85,6 +90,12 @@ 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/version.rb

@@ -1,3 +1,3 @@
 module GitCurate
-  VERSION = "0.2.0"
+  VERSION = "0.3.0"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: git_curate
 version: !ruby/object:Gem::Version
-  version: 0.2.0
+  version: 0.3.0
 platform: ruby
 authors:
 - Matthew Harvey
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2018-07-16 00:00:00.000000000 Z
+date: 2019-03-10 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: highline
@@ -97,6 +97,7 @@ files:
 - README.md
 - Rakefile
 - VERSION
+- assets/demo2.gif
 - bin/setup
 - exe/git-curate
 - git_curate.gemspec
@@ -125,7 +126,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.4.5.1
+rubygems_version: 2.7.6
 signing_key: 
 specification_version: 4
 summary: Simple git branch curation tool