git_topic 0.2.1 → 0.2.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: a78e853f3748e22b11099cbb12d637596b6a073f
-  data.tar.gz: c563916e2cb7f05401fb5d1b4f4f972cc6cc6562
+  metadata.gz: e8f1c24c1b4142264dc07264c30a643eaaa77143
+  data.tar.gz: 3ae34a090719fbabd42fa3b4627f1f0660fc34e7
 SHA512:
-  metadata.gz: f5dab730cbd9a30b332ed22bd42d94dfec7f84a83357ef0838c7c8b4d5fe8d814c3d00a429959845e477548fb7f9469c29608fc74207c9f2587f4ede35bd061b
-  data.tar.gz: f97b8a6b4b563e72481910d472d7d5e2db5c734253d0aec224add2455229995dad48fee49ebcda4dd3ac18586c66f0b0bdf79dcdc9ae3561be32bcaa25680359
+  metadata.gz: 1dc2315a42e587f02d70962282c431413c1fdc42327f8635bd93f9a9dfde77cc9f4b243837cee669125d7a0bbcbe9ac555a115bfb9e39d0f943afdfe2364d893
+  data.tar.gz: 59e5adeb6b5cee7fa5eb49d4db88f6d9594e6bffbdabf94d51e164f4ab6a3c67d96331ef49ecff022b922e782b986017080d06144160bff20f826d251298e328

data/README.md

@@ -26,7 +26,7 @@ Install it yourself as:
 
 After checking out the repo, run `bin/setup` to install dependencies. Then, run `rake spec` to run the tests. You can also run `bin/console` for an interactive prompt that will allow you to experiment.
 
-To install this gem onto your local machine, run `bundle exec rake install`. To release a new version, update the version number in `version.rb`, and then run `bundle exec rake release`, which will create a git tag for the version, push git commits and tags, and push the `.gem` file to [rubygems.org](https://rubygems.org).
+To install this gem onto your local machine, run `bundle exec rake install`. To release a new version, update the version number in `version.rb`, and then run `OVERCOMMIT_DISABLED=1 bundle exec rake release`, which will create a git tag for the version, push git commits and tags, and push the `.gem` file to [rubygems.org](https://rubygems.org).
 
 ## Contributing
 

data/lib/git_topic/commands/list.rb

@@ -12,43 +12,55 @@ module GitTopic
 
       private
 
+      Branch = Struct.new('Branch', :name, :rev)
+
       def print_header
-        printf "  %-20s %s\n", 'Branch', 'Summary'
+        printf "  %-20s %-7s %s\n", 'Branch', 'Rev', 'Summary'
         puts '-' * 80
       end
 
       def print_contents
-        branches, current_branch = parse_branch
-        branches.each do |branch_name|
+        branches, current_branch = parse_branches
+        branches.each do |branch|
           begin
-            print_line(current_branch, branch_name)
+            print_line(current_branch, branch)
           rescue EOFError => _ex
             nop
           end
         end
       end
 
-      def parse_branch
+      def parse_branches
         branches = []
         current_branch = nil
-        _stdin, stdout, _stderr, _wait_thr = *Open3.popen3('git branch')
+        _stdin, stdout, _stderr, _wait_thr = *Open3.popen3('git branch -v')
         stdout.each do |line|
-          matched = line.match(/\s*(\* )?(.*)/)
-          next unless matched
-          branches << branch_name = matched[2]
-          current_branch = branch_name if matched[1]
+          branch_name, rev, current_branch = parse_branch(line)
+          branches << Branch.new(branch_name, rev)
         end
         [branches, current_branch]
       end
 
-      def print_line(current_branch, branch_name)
+      def parse_branch(line)
+        matched = line.match(/\s*(\* )?(\S+)\s+(\S+)\s+(.*)/)
+        raise 'cannot parse branch' unless matched
+        branch_name = matched[2]
+        current_branch = nil
+        current_branch = branch_name if matched[1]
+        rev = matched[3]
+        [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", branch_name, description
+        printf "#{branch_format} %s %s", branch_name, rev, description
       end
 
       def get_description_of(branch)

data/lib/git_topic/version.rb

@@ -1,3 +1,3 @@
 module GitTopic
-  VERSION = '0.2.1'.freeze
+  VERSION = '0.2.2'.freeze
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: git_topic
 version: !ruby/object:Gem::Version
-  version: 0.2.1
+  version: 0.2.2
 platform: ruby
 authors:
 - Hiroki Kondo