git_curate 0.1.1 → 0.2.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: efe99d35516a3694f9451935f2d33cb90b2f2534
-  data.tar.gz: 23f63f3411b255eebe10039c6705f02d2ba89a01
+  metadata.gz: 62b82ad94f1a3524028e3e9f8b8dd60f1b4f2177
+  data.tar.gz: e01c3ba16c3828cdb511f69fea4f042451c851c3
 SHA512:
-  metadata.gz: f87360f611fb9c29cddadfe0f18178fe541629124ab889ebb1e3d953ba856ee5f1d969a709a3475b36957a3b6a10ccc12d8ed2b169458fe4d20b12599f6dc761
-  data.tar.gz: f98ce30aa2f67e1280b57863103c72558fe70e57c740c806cf970fefd29c275a400b7b6da5a976c88123aca9bcc015204159907c6fa1a5e82a4ae76945e09757
+  metadata.gz: 442a5541be149365e52164ade62f83fef05838baadfc3d34ab5c003963891d3bac2c4bed2c3499e30cdce1a2b8fcdb8f964172ae41228aa0d4af8d99ad153f8d
+  data.tar.gz: cb8dab16a57aadd7dfbdd009663a9fb1bc6eaa74ece51bd880656fa749814b3df01848a9437eddcd53221fdd423e393cbbfb82fb72942fb82ebe6f5c65eb661f

data/CHANGELOG.md

@@ -1,5 +1,10 @@
 # Changelog
 
+### v0.2.0
+
+* Make output more compact.
+* Improve README.
+
 ### v0.1.1
 
 Fix runtime dependency specification.

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    git_curate (0.1.1)
+    git_curate (0.2.0)
       highline (= 2.0.0)
       tabulo (= 1.2.0)
 

data/README.md

@@ -1,5 +1,7 @@
 # git curate
 
+[![Gem Version][GV img]][Gem Version]
+
 ## Motivation
 
 After a while, my local repo becomes cluttered with branches, and `git branch` outputs an awkwardly
@@ -13,10 +15,14 @@ summary), and prompting you either to keep or to delete each branch as you go.
 
 ## Installation
 
+You'll need Ruby v2.1.10 or higher. Run
+
 ```
 gem install git_curate
 ```
 
+to install the executable.
+
 ## Usage
 
 From within a git repo, run:
@@ -27,7 +33,13 @@ git curate
 
 This will step you through your local branches one at a time, asking you whether to keep or
 delete each branch in what should be a fairly self-explanatory fashion. Note the branch
-you are currently on will not be included in the list.
+you are currently on will not be included in the list, as `git` does not allow you to delete
+the branch you're on.
+
+(Note the space after `git`—we have effectively added a subcommand to `git` just by installing
+a gem. When `git_curate` is installed, an executable is created called `git-curate`.
+In general, for any executable of the form _git-xyz_ in your `PATH`, `git` will automatically
+recognize _xyz_ as a subcommand, and will run that executable whenever that subcommand is invoked.)
 
 ## Development
 
@@ -41,3 +53,6 @@ Bug reports and pull requests are welcome on GitHub at https://github.com/matt-h
 
 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

data/Rakefile

@@ -3,5 +3,4 @@ require "rake-version"
 
 RakeVersion::Tasks.new do |v|
   v.copy "lib/git_curate/version.rb"
-  v.copy "README.md", all: true
 end

data/VERSION

@@ -1 +1 @@
-0.1.1
+0.2.0

data/git_curate.gemspec

@@ -14,6 +14,8 @@ Gem::Specification.new do |spec|
   spec.homepage      = "https://github.com/matt-harvey/git_curate"
   spec.license       = "MIT"
 
+  spec.required_ruby_version = ">= 2.1.10"
+
   spec.metadata = {
     "source_code_uri" => "https://github.com/matt-harvey/git_curate",
     "changelog_uri"   => "https://raw.githubusercontent.com/matt-harvey/git_curate/master/CHANGELOG.md"

data/lib/git_curate/runner.rb

@@ -0,0 +1,90 @@
+module GitCurate
+
+  class Runner
+
+    def run
+      if ARGV.length != 0
+        puts "This script does not accept any arguments."
+        exit
+      end
+
+      branches = `git branch`.split($/).reject { |b| current_branch?(b) }.map(&:strip)
+
+      table = Tabulo::Table.new(branches, vertical_rule_character: " ", intersection_character: " ",
+        horizontal_rule_character: "-", column_padding: 0) do |t|
+
+        t.add_column(:branch, header: "Branch", align_header: :left) { |branch| branch }
+
+        t.add_column("Last commit", align_header: :left) do |branch|
+          `git log -n1 --date=short --format='format:%cd' #{branch}`
+        end
+
+        t.add_column("Last author", align_header: :left) do |branch|
+          `git log -n1 --format='format:%an' #{branch}`
+        end
+
+        t.add_column("Last subject", align_header: :left) do |branch|
+          `git log -n1 --format='format:%s' #{branch}`
+        end
+      end
+
+      table.shrinkwrap!(max_table_width: 125)
+
+      branches_to_delete = []
+
+      table.each_with_index do |row, index|
+        case HighLine.ask("#{row} Mark for deletion? [y/n/done/abort/help] ")
+        when "y"
+          branches_to_delete << row.to_h[:branch]
+        when "n"
+          ;  # do nothing
+        when "done"
+          puts table.horizontal_rule
+          finalize(branches_to_delete)
+          exit
+        when "abort"
+          puts table.horizontal_rule
+          puts "\nAborting. No branches deleted."
+          exit
+        else
+          puts table.horizontal_rule
+          print_help
+          puts table.horizontal_rule unless index == 0
+          redo
+        end
+      end
+      puts table.horizontal_rule
+
+      finalize(branches_to_delete)
+    end
+
+    private
+
+    def current_branch?(branch)
+      branch =~ /^\s*\*/
+    end
+
+    def finalize(branches_to_delete)
+      if branches_to_delete.size != 0
+        puts
+        system("git branch -D #{branches_to_delete.join(" ")}")
+        puts "\nDone"
+      else
+        puts "\nNo branches deleted."
+      end
+    end
+
+    def print_help
+      puts <<-EOL
+  Please enter one of:
+    y      -- mark branch for deletion
+    n      -- keep branch
+    done   -- delete marked branches and exit session
+    abort  -- abort without deleting any branches
+    help   -- print this help message
+  EOL
+    end
+
+  end
+
+end

data/lib/git_curate/version.rb

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

data/lib/git_curate.rb

@@ -1,94 +1,4 @@
+require "git_curate/runner"
 require "git_curate/version"
 require "highline/import"
 require "tabulo"
-
-module GitCurate
-
-  class Runner
-
-    def run
-      if ARGV.length != 0
-        puts "This script does not accept any arguments."
-        exit
-      end
-
-      branches = `git branch`.split($/).reject { |b| current_branch?(b) }.map(&:strip)
-
-      table = Tabulo::Table.new(branches, vertical_rule_character: " ", intersection_character: " ",
-        horizontal_rule_character: "-", column_padding: 0) do |t|
-
-        t.add_column(:branch, header: "Branch", align_header: :left) { |branch| branch }
-
-        t.add_column("Last commit date", align_header: :left) do |branch|
-          `git log -n1 --date=short --format='format:%cd' #{branch}`
-        end
-
-        t.add_column("Last commit author", align_header: :left) do |branch|
-          `git log -n1 --format='format:%an' #{branch}`
-        end
-
-        t.add_column("Last commit subject", align_header: :left) do |branch|
-          `git log -n1 --format='format:%s' #{branch}`
-        end
-      end
-
-      table.shrinkwrap!(max_table_width: 200)
-
-      branches_to_delete = []
-
-      table.each_with_index do |row, index|
-        case HighLine.ask("#{row} Mark for deletion? [y/n/done/abort/help] ")
-        when "y"
-          branches_to_delete << row.to_h[:branch]
-        when "n"
-          ;  # do nothing
-        when "done"
-          puts table.horizontal_rule
-          finalize(branches_to_delete)
-          exit
-        when "abort"
-          puts table.horizontal_rule
-          puts "\nAborting. No branches deleted."
-          exit
-        else
-          puts table.horizontal_rule
-          print_help
-          puts table.horizontal_rule unless index == 0
-          redo
-        end
-      end
-      puts table.horizontal_rule
-
-      finalize(branches_to_delete)
-    end
-
-    private
-
-    def current_branch?(branch)
-      branch =~ /^\s*\*/
-    end
-
-    def finalize(branches_to_delete)
-      if branches_to_delete.size != 0
-        puts
-        system("git branch -D #{branches_to_delete.join(" ")}")
-        puts "\nDone"
-      else
-        puts "\nNo branches deleted."
-      end
-    end
-
-    def print_help
-      puts <<-EOL
-  Please enter one of:
-    y      -- mark branch for deletion
-    n      -- keep branch
-    done   -- delete marked branches and exit session
-    abort  -- abort without deleting any branches
-    help   -- print this help message
-  EOL
-    end
-
-  end
-
-end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: git_curate
 version: !ruby/object:Gem::Version
-  version: 0.1.1
+  version: 0.2.0
 platform: ruby
 authors:
 - Matthew Harvey
@@ -101,6 +101,7 @@ files:
 - exe/git-curate
 - git_curate.gemspec
 - lib/git_curate.rb
+- lib/git_curate/runner.rb
 - lib/git_curate/version.rb
 homepage: https://github.com/matt-harvey/git_curate
 licenses:
@@ -116,7 +117,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
-      version: '0'
+      version: 2.1.10
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="