git_topic 0.2.4 → 0.2.5

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 17b7ec4e03f88c30a17b7bc3200226bbae89b918
-  data.tar.gz: 3da57e5fa72a110885e67077c544052a1c1b2681
+  metadata.gz: a3a1fbd3275258c0fcffe1d33ebbfcc00e4560fb
+  data.tar.gz: e8e6eabf616a0fcfcd99cc7cf08753885237cccd
 SHA512:
-  metadata.gz: cbe31c7efc9c451e4113e69d9c75a9c3b2d2fae52aad93d61c479a066f29c3212da6f329d3882712f6bda50e71e1ee96b611e3dc59215352490d7ff0171cbcc5
-  data.tar.gz: 427344fb6beb0968645035d8da75aaac3ddce2f7461b1b51cfaeb9fdd573c8ec15f77b69a6d3d77f2615dab6a1176f1fea18b9868e5d7ef03f3c24a1b937420f
+  metadata.gz: e87fa603e0db2ebe0638cb187f9cb6c94c2b7bcd5c83eb4379fda312fb7508d895d2693640e0b569ab3ff134d195b9a8c8f981b3e603d76ad7e2ae58eb54ca52
+  data.tar.gz: 50e122a241ba983e2f869dc92f18bc3b888e6fc8341989481deaa0c420c64e21c7eb5d374957eb3f1a7aeae21c2bfc24da7f6f8f8e4edfc7b8f1759aaffc3919

data/.rubocop.yml

@@ -1,8 +1,13 @@
 require: rubocop-rspec
 AllCops:
+  TargetRubyVersion: 2.3
   Exclude:
       - 'vendor/**/*'
       - 'bin/**/*'
   RSpec:
     Patterns:
       - '.+'
+
+Metrics/BlockLength:
+  Exclude:
+    - 'spec/**/*'

data/lib/git_topic/cli.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 require 'thor'
 require 'open3'
 

data/lib/git_topic/commands/edit.rb

@@ -1,3 +1,4 @@
+# frozen_string_literal: true
 
 module GitTopic
   module Commands

data/lib/git_topic/commands/list.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 require 'term/ansicolor'
 
 module GitTopic
@@ -6,27 +8,25 @@ module GitTopic
     class List
       include Term::ANSIColor
       def execute
-        print_header
-        print_contents
+        branches, current_branch = parse_branches
+        print_header(branches.first)
+        print_contents(branches, current_branch)
       end
 
       private
 
       Branch = Struct.new('Branch', :name, :rev)
 
-      def print_header
-        printf "  %-20s %-7s %s\n", 'Branch', 'Rev', 'Summary'
+      def print_header(branch)
+        rev_length = branch.rev.length
+        header_format = "  %-20s %-#{rev_length}s %s"
+        puts format(header_format, :Branch, :Rev, :Summary)
         puts '-' * 80
       end
 
-      def print_contents
-        branches, current_branch = parse_branches
+      def print_contents(branches, current_branch)
         branches.each do |branch|
-          begin
-            print_line(current_branch, branch)
-          rescue EOFError => _ex
-            # nop
-          end
+          print_line(current_branch, branch)
         end
       end
 
@@ -42,33 +42,56 @@ module GitTopic
         [branches, current_branch]
       end
 
+      BRANCH_FORMAT = /
+        \s*(?<current_exp>\*\ )?
+        (?<branch_name>\S+)\s+
+        (?<rev>\S+)\s+(.*)
+      /x
+
       def parse_branch(line)
-        matched = line.match(/\s*(\* )?(\S+)\s+(\S+)\s+(.*)/)
+        matched = line.match(BRANCH_FORMAT)
         raise 'cannot parse branch' unless matched
-        branch_name = matched[2]
-        current_branch = matched[1] ? branch_name : nil
-        rev = matched[3]
+        branch_name = matched[:branch_name]
+        rev = matched[:rev]
+        current_branch = matched[:current_exp] ? branch_name : nil
         [branch_name, rev, current_branch]
       end
 
       def print_line(current_branch, branch)
         branch_name = branch.name
         rev = branch.rev
-        description = get_description_of branch_name
-        branch_format = if branch_name == current_branch
-                          "* #{green}#{bold}%-20s#{clear}"
-                        else
-                          "  #{bold}%-20s#{clear}"
-                        end
-        printf "#{branch_format} %s %s", branch_name, rev, description
+        description = get_description_of branch
+        return if description.nil?
+        branch_format = branch_format(branch_name, current_branch)
+        truncated_name = truncate(branch_name)
+        puts format("#{branch_format} %s %s", truncated_name, rev, description)
       end
 
       def get_description_of(branch)
-        config_key = "branch.#{branch}.description"
+        config_key = "branch.#{branch.name}.description"
         command = "git config #{config_key}"
         _stdin, stdout, _stderr, _wait_thr = *Open3.popen3(command)
+        return nil if stdout.eof?
         stdout.readline
       end
+
+      def branch_format(branch_name, current_branch)
+        if branch_name == current_branch
+          "* #{green}#{bold}%-20s#{clear}"
+        else
+          "  #{bold}%-20s#{clear}"
+        end
+      end
+
+      def truncate(str, truncate_at: 20)
+        omission = '...'
+        length_with_room_for_omission = truncate_at - omission.length
+        if str.length > truncate_at
+          "#{str[0, length_with_room_for_omission]}#{omission}"
+        else
+          str
+        end
+      end
     end
   end
 end

data/lib/git_topic/commands/show.rb

@@ -1,3 +1,4 @@
+# frozen_string_literal: true
 
 module GitTopic
   module Commands

data/lib/git_topic/version.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 module GitTopic
-  VERSION = '0.2.4'.freeze
+  VERSION = '0.2.5'
 end

data/lib/git_topic.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 require 'git_topic/version'
 require 'git_topic/cli'
 

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: git_topic
 version: !ruby/object:Gem::Version
-  version: 0.2.4
+  version: 0.2.5
 platform: ruby
 authors:
 - Hiroki Kondo
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2017-09-25 00:00:00.000000000 Z
+date: 2017-09-29 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: thor