git_curate 0.7.5 → 0.8.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 90d60b797ee454f3938bd46038a6c7e805f209af540bc46579a10abfbb1c428b
-  data.tar.gz: 64752a180b3fe5f73977f7eb1a7d3382f3f2cd00c639d12e792d9689b6855bfe
+  metadata.gz: a28aa1f3d401c90e8955406bd6917d5669af3c21be54e548c23a46370254383d
+  data.tar.gz: c33041318700ca15a1f592e29ecee075f58776ce972b178c13fe90356cdbd560
 SHA512:
-  metadata.gz: 3e51d0d5ee3ea6e9932f7ef35c4f5e5507f5cd47238edc6dc6107e08c3c3a7b611cfe5e80445b2a2af5cc100f88a76c1de90bc45f408f41a09995805f555510e
-  data.tar.gz: 19aee7094f8e682b165560c82931d3ae72ce28d399221dc464795846d91fb8b0e0e991268d0b57f678aee9833d32a69ce16e74ce25b09d3bd725cbce612d1cb1
+  metadata.gz: 3539fde73f294610c797ab422b6503d893b74af254a2fc524ee8d338341b953a4775c179875c146ae3942f08dd2c606eae547d328b6aaa3363f5f1122e32ce20
+  data.tar.gz: ecd19b5b368d86911627176f84ad4f06bfffe921813a07bd42554a08bb2411a12d6e93b4fba3a65072208972f7a299d4a34791dfb748f2cfd14ee77eba0c43d4

data/CHANGELOG.md

@@ -1,5 +1,14 @@
 # Changelog
 
+### v0.8.0
+
+* Change options to make them more memorable/obvious
+* Always print options legend at top, if in interactive mode
+* Add a column showing last commit hash
+* Tweak column header layout
+* Fix warnings on Ruby 2.7
+* Fix minor error in README
+
 ### v0.7.5
 
 * Drop support for Ruby 2.1

data/README.md

@@ -17,6 +17,7 @@ one at a time and _then_ running `git branch -D` in a separate step, is painful.
 a time, outputting the following information about each:
 
 * Last commit date
+* Last commit hash
 * Last commit author
 * Last commit subject
 * Whether the branch has been merged into the current HEAD
@@ -49,18 +50,18 @@ git curate
 This will step you through your local branches one at a time, outputting some information about
 each, and asking you whether to keep or delete each branch.
 
-At each branch, enter "n"—or simply press Enter—to _keep_ the branch and move to the next one;
-or enter "y" to select the branch for deletion.
+At each branch, enter "k"—or simply press Enter—to _keep_ the branch and move to the next one;
+or enter "d" to select the branch for deletion.
 
-Entering "done" will conclude the session immediately, deleting all selected branches; and "abort" will
-end the session without deleting any branches. Once the final branch has been considered,
+Entering "e" will end the session immediately, deleting all selected branches; and "a" will
+abort the session without deleting any branches. Once the final branch has been considered,
 any selected branches will be immediately deleted.
 
 Note the branch you are currently on will not be included in the list, as `git` does not allow you to delete
 the branch you're on.
 
 If you just want to view the information about your local branches without stepping through
-them interactively, enter `git branch --list` or `git branch -l`. Your current branch _will_
+them interactively, enter `git curate --list` or `git curate -l`. Your current branch _will_
 be included in this list in this case.
 
 ## Contributing

data/VERSION

@@ -1 +1 @@
-0.7.5
+0.8.0

data/git_curate.gemspec

@@ -29,7 +29,7 @@ Gem::Specification.new do |spec|
   spec.require_paths = ["lib"]
 
   spec.add_runtime_dependency "highline", "2.0.3"
-  spec.add_runtime_dependency "tabulo", "2.4.0"
+  spec.add_runtime_dependency "tabulo", "2.4.1"
   spec.add_runtime_dependency "tty-screen", "0.7.1"
 
   spec.add_development_dependency "bundler"

data/lib/git_curate/branch.rb

@@ -50,6 +50,11 @@ module GitCurate
       @last_commit_date
     end
 
+    def hash
+      initialize_last_commit_data
+      @hash
+    end
+
     def last_author
       initialize_last_commit_data
       @last_author
@@ -109,10 +114,10 @@ module GitCurate
 
       # For Windows compatibility we need double quotes around the format string, as well as spaces
       # between the placeholders.
-      command = %Q(git log -n1 --date=short --format=format:"%cd %n %an %n %s" #{proper_name} --)
+      command = %Q(git log -n1 --date=short --format=format:"%cd %n %h %n %an %n %s" #{proper_name} --)
       @last_commit_data = Util.command_to_a(command)
 
-      @last_commit_date, @last_author, @last_subject = @last_commit_data
+      @last_commit_date, @hash, @last_author, @last_subject = @last_commit_data
     end
 
   end

data/lib/git_curate/runner.rb

@@ -26,21 +26,27 @@ module GitCurate
         return EXIT_FAILURE
       end
 
+      if interactive?
+        puts
+        print_help
+        puts
+      end
+
       branches = Branch.local
       branches.reject!(&:current?) if interactive?
 
       table = Tabulo::Table.new(branches, border: :reduced_ascii, column_padding: 0, align_header: :left) do |t|
         t.add_column(:branch, header: "Branch") { |b| b.displayable_name(pad: !interactive?) }
-        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("Last commit:#{$/}Date", &:last_commit_date)
+        t.add_column("#{$/}Hash", &:hash)
+        t.add_column("#{$/}Author", &:last_author)
+        t.add_column("#{$/}Subject", &:last_subject)
         t.add_column("Merged#{$/}into HEAD?") { |b| b.merged? ? "Merged" : "Not merged" }
         t.add_column("Status vs#{$/}upstream", &:upstream_info)
       end
 
-      prompt = " Delete? [y/N/done/abort/help] "
-      longest_response = "abort"
-      prompt_and_response_width = (interactive? ? (prompt.length + longest_response.length + 1) : 0)
+      prompt = " d/[k]/e/a ? "
+      prompt_and_response_width = (interactive? ? (prompt.length + 2) : 0)
       max_table_width = TTY::Screen.width - prompt_and_response_width
       table.pack(max_table_width: max_table_width)
 
@@ -53,15 +59,15 @@ module GitCurate
 
       table.each_with_index do |row, index|
         case HighLine.ask("#{row} #{prompt}").downcase
-        when "y"
+        when "d"
           branches_to_delete << row.source
-        when "n", ""
+        when "k", ""
           ;  # do nothing
-        when "done"
+        when "e"
           puts table.horizontal_rule
           finalize(branches_to_delete)
           return EXIT_SUCCESS
-        when "abort"
+        when "a"
           puts table.horizontal_rule
           puts "#{$/}Aborting. No branches deleted."
           return EXIT_SUCCESS
@@ -95,15 +101,19 @@ module GitCurate
     end
 
     def print_help
-      puts <<-EOL
-  Simply hit <Enter> to keep this branch and skip to the next one;
-  or enter one of the following commands:
-    y      -- mark branch for deletion
-    n      -- keep branch (equivalent to just <Enter>)
-    done   -- delete selected branches and exit session
-    abort  -- abort without deleting any branches
-    help   -- print this help message
-  EOL
+      instructions = [
+        ["d :", "delete branch"],
+        ["k / <enter> :", "keep branch"],
+        ["e :", "end session, deleting all selected branches"],
+        ["a :", "abort session, keeping all branches"],
+      ]
+      instructions_table = Tabulo::Table.new(instructions, border: :blank, header_frequency: nil,
+        column_padding: [1, 0]) do |t|
+
+        t.add_column(0, align_body: :right, &:first)
+        t.add_column(1, &:last)
+      end
+      puts instructions_table.pack
     end
 
   end

data/lib/git_curate/version.rb

@@ -1,3 +1,3 @@
 module GitCurate
-  VERSION = "0.7.5"
+  VERSION = "0.8.0"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: git_curate
 version: !ruby/object:Gem::Version
-  version: 0.7.5
+  version: 0.8.0
 platform: ruby
 authors:
 - Matthew Harvey
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2020-04-03 00:00:00.000000000 Z
+date: 2020-04-17 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: highline
@@ -30,14 +30,14 @@ dependencies:
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 2.4.0
+        version: 2.4.1
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 2.4.0
+        version: 2.4.1
 - !ruby/object:Gem::Dependency
   name: tty-screen
   requirement: !ruby/object:Gem::Requirement
@@ -188,8 +188,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubyforge_project: 
-rubygems_version: 2.7.6
+rubygems_version: 3.1.2
 signing_key: 
 specification_version: 4
 summary: Simple git branch curation tool