git_curate 0.6.2 → 0.6.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: d3c5185af90e371c5981ee81a5155ef9d2fedd1f65f461c6464fd35e579f5936
-  data.tar.gz: baac5f23f47c40f59b91ce81fbe0de4c8a6dd5c956ac810f2e9e5c2b6d92e893
+  metadata.gz: 3210c7e8b48389447db001fa0b444b930a764a2c8c390a61827a2d6f01436d3b
+  data.tar.gz: 3b31eb0d7f14f5cc6cad363de5feb41aa9b38c2f3cea985b7ea309bfc0201f2d
 SHA512:
-  metadata.gz: ef680b8d458bcd803f0d848c450dc9858041238861a66ed7ec40be86e10a294b233ed4c4387a483443bcb31a80e47108ea008d59011e60aff16d95ba38a6b33b
-  data.tar.gz: 2de940644c00092336090309c49f499b91bf5cc903710dae67fc0c99ae9e726c7ed35195ad7ae684782a2b2002ba4087cbe7342c3659cbae6fe6c88b44589461
+  metadata.gz: 9c9d9b44f67a34b792045029656cf8c2e5f916d2325c45e6a2cf23989fd4d2c40431107b61405ad05dab21a0b8c80bf8e6ce3051689ca61a0429f0ca0c822ec3
+  data.tar.gz: 4178cf08ef5e4785cb42ec4d9437f1b0079e0adaa5ad8c56f87c25ba00ab6f678a0d1dde64ba57630b43f4376b149aeab7eeb332de28ef7c9cc4419f16137160

data/CHANGELOG.md

@@ -1,5 +1,9 @@
 # Changelog
 
+### v0.6.3
+
+* Fix formatting oof output on Windows.
+
 ### v0.6.2
 
 * Upgrade dependency versions.

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    git_curate (0.6.2)
+    git_curate (0.6.3)
       highline (= 2.0.2)
       tabulo (= 1.5.1)
       tty-screen (= 0.7.0)

data/VERSION

@@ -1 +1 @@
-0.6.2
+0.6.3

data/lib/git_curate.rb

@@ -1,3 +1,4 @@
+require "git_curate/branch"
 require "git_curate/cli_parser"
 require "git_curate/copyright"
 require "git_curate/runner"

data/lib/git_curate/branch.rb

@@ -0,0 +1,42 @@
+module GitCurate
+
+  class Branch
+
+    attr_reader :raw_name
+
+    # raw_name should start in "* " if the current branch, but should otherwise have not whitespace.
+    def initialize(raw_name)
+      @raw_name = raw_name
+    end
+
+    def proper_name
+      @proper_name ||= @raw_name.lstrip.gsub(/^\*\s+/, '')
+    end
+
+    def current?
+      @current ||= /^\*\s+/.match?(@raw_name)
+    end
+
+    def displayable_name(pad:)
+      if pad && !current?
+        "  #{@raw_name}"
+      else
+        @raw_name
+      end
+    end
+
+    def last_author
+      `git log -n1 --format=format:%an #{proper_name}`
+    end
+
+    def last_commit_date
+      `git log -n1 --date=short --format=format:%cd #{proper_name}`
+    end
+
+    def last_subject
+      `git log -n1 --format=format:%s #{proper_name}`
+    end
+
+  end
+
+end

data/lib/git_curate/runner.rb

@@ -10,8 +10,6 @@ module GitCurate
   LEADING_STAR_REGEX = /^\* /
   REMOTE_INFO_REGEX = /^[^\s]+\s+[^\s]+\s+\[(.+?)\]/
 
-  Branch = Struct.new("Branch", :raw, :proper, :displayable)
-
   class Runner
 
     def initialize(opts)
@@ -24,37 +22,20 @@ module GitCurate
         exit
       end
 
-      branches = command_to_a("git branch").reject { |raw_branch| excluded_branch?(raw_branch) }.map do |raw_branch|
-        Struct::Branch.new(raw_branch, proper_branch(raw_branch), displayable_branch(raw_branch))
-      end
-
+      branches = command_to_a("git branch").map { |b| Branch.new(b) }
+      branches.reject!(&:current?) if interactive?
       merged_branches = command_to_a("git branch --merged").to_set
       upstream_branches = get_upstream_branches
 
       table = Tabulo::Table.new(branches, vertical_rule_character: " ", intersection_character: " ",
         horizontal_rule_character: "-", column_padding: 0, align_header: :left) do |t|
 
-        t.add_column(:branch, header: "Branch") { |branch| branch.displayable }
-
-        t.add_column("Last commit") do |branch|
-          `git log -n1 --date=short --format='format:%cd' #{branch.proper}`
-        end
-
-        t.add_column("Last author") do |branch|
-          `git log -n1 --format='format:%an' #{branch.proper}`
-        end
-
-        t.add_column("Last subject") do |branch|
-          `git log -n1 --format='format:%s' #{branch.proper}`
-        end
-
-        t.add_column("Merged\ninto HEAD?") do |branch|
-          merged_branches.include?(branch.proper) ? "Merged" : "Not merged"
-        end
-
-        t.add_column("Status vs\nupstream") do |branch|
-          upstream_branches.fetch(branch.proper, "No upstream")
-        end
+        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("Merged#{$/}into HEAD?") { |b| merged_branches.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] "
@@ -73,7 +54,7 @@ module GitCurate
         if interactive?
           case HighLine.ask("#{row}#{prompt}")
           when "y"
-            branches_to_delete << proper_branch(row.to_h[:branch])
+            branches_to_delete << row.source.proper_name
           when "n", ""
             ;  # do nothing
           when "done"
@@ -82,7 +63,7 @@ module GitCurate
             exit
           when "abort"
             puts table.horizontal_rule
-            puts "\nAborting. No branches deleted."
+            puts "#{$/}Aborting. No branches deleted."
             exit
           else
             puts table.horizontal_rule
@@ -105,24 +86,6 @@ module GitCurate
       !@opts[:list]
     end
 
-    def proper_branch(raw_branch)
-      raw_branch.lstrip.gsub(/^\*\s*/, '')
-    end
-
-    def displayable_branch(raw_branch)
-      return raw_branch if interactive?
-
-      current_branch?(raw_branch) ? raw_branch : "  " + raw_branch
-    end
-
-    def excluded_branch?(raw_branch)
-      interactive? && current_branch?(raw_branch)
-    end
-
-    def current_branch?(raw_branch)
-      raw_branch =~ /^\s*\*/
-    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)
@@ -149,9 +112,9 @@ module GitCurate
       if branches_to_delete.size != 0
         puts
         system("git branch -D #{branches_to_delete.join(" ")}")
-        puts "\nDone"
+        puts "#{$/}Done"
       else
-        puts "\nNo branches deleted."
+        puts "#{$/}No branches deleted."
       end
     end
 

data/lib/git_curate/version.rb

@@ -1,3 +1,3 @@
 module GitCurate
-  VERSION = "0.6.2"
+  VERSION = "0.6.3"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: git_curate
 version: !ruby/object:Gem::Version
-  version: 0.6.2
+  version: 0.6.3
 platform: ruby
 authors:
 - Matthew Harvey
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2019-06-23 00:00:00.000000000 Z
+date: 2019-07-08 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: highline
@@ -116,6 +116,7 @@ files:
 - exe/git-curate
 - git_curate.gemspec
 - lib/git_curate.rb
+- lib/git_curate/branch.rb
 - lib/git_curate/cli_parser.rb
 - lib/git_curate/copyright.rb
 - lib/git_curate/runner.rb