Merge pull request #1 from kompiro/add_add_command

Add AddCommand

Author: kompiro

lib/git_topic/cli.rb

@@ -4,8 +4,9 @@
 require 'open3'
 
 require 'git_topic/version'
-require 'git_topic/commands/list'
+require 'git_topic/commands/add'
 require 'git_topic/commands/edit'
+require 'git_topic/commands/list'
 require 'git_topic/commands/show'
 
 module GitTopic
@@ -15,14 +16,15 @@ class Cli < Thor
 
     desc 'list', 'Show managed topics'
     option :version, aliases: 'v'
+    option :all, aliases: 'a'
     def list
       # Show version if -v specified
       if options[:version]
         version if options[:version]
         return
       end
 
-      command = GitTopic::Commands::List.new
+      command = GitTopic::Commands::List.new options
       command.execute
     end
 
@@ -43,10 +45,10 @@ def version
       puts GitTopic::VERSION
     end
 
-    desc 'add topic_name', 'Remember topic'
-    def add(topic_name)
-      puts "add #{topic_name}"
-      raise 'not implemented'
+    desc 'add topic_name summary', 'Remember topic'
+    def add(topic_name, summary)
+      command = GitTopic::Commands::Add.new topic_name, summary
+      command.execute
     end
 
     desc 'start topic_name', 'Transfer topic_name to branch to implement code'

lib/git_topic/commands/add.rb

@@ -0,0 +1,17 @@
+# frozen_string_literal: true
+
+module GitTopic
+  module Commands
+    # add command register topic summary
+    class Add
+      def initialize(topic_name, summary)
+        @topic_name = topic_name
+        @summary = summary
+      end
+
+      def execute
+        system("git config --add topic.#{@topic_name} #{@summary}")
+      end
+    end
+  end
+end

lib/git_topic/commands/list.rb

@@ -1,96 +1,24 @@
 # frozen_string_literal: true
 
-require 'term/ansicolor'
+require 'git_topic/formatter/branches'
+require 'git_topic/formatter/topics'
 
 module GitTopic
   module Commands
     # list command shows summarized topic information
     class List
-      include Term::ANSIColor
-      def execute
-        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(branch)
-        rev_length = branch.rev.length
-        header_format = "  %-20s %-#{rev_length}s %s"
-        puts format(header_format, :Branch, :Rev, :Summary)
-        puts '-' * 80
+      def initialize(options = {})
+        @options = options
+        @all = options[:all]
       end
 
-      def print_contents(branches, current_branch)
-        branches.each do |branch|
-          print_line(current_branch, branch)
-        end
-      end
-
-      def parse_branches
-        branches = []
-        current_branch = nil
-        _stdin, stdout, _stderr, _wait_thr = *Open3.popen3('git branch -v')
-        stdout.each do |line|
-          branch_name, rev, current_candidate = parse_branch(line)
-          current_branch ||= current_candidate
-          branches << Branch.new(branch_name, rev)
-        end
-        [branches, current_branch]
-      end
-
-      BRANCH_FORMAT = /
-        \s*(?<current_exp>\*\ )?
-        (?<branch_name>\S+)\s+
-        (?<rev>\S+)\s+(.*)
-      /x
-
-      def parse_branch(line)
-        matched = line.match(BRANCH_FORMAT)
-        raise 'cannot parse branch' unless matched
-        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
-        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.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
+      def execute
+        branches = ::GitTopic::Formatter::Branches.new @options
+        branches.print
+        return unless @all
+        puts ''
+        topics = ::GitTopic::Formatter::Topics.new
+        topics.print
       end
     end
   end

lib/git_topic/formatter/branches.rb

@@ -0,0 +1,92 @@
+# frozen_string_literal: true
+
+require 'git_topic/formatter/helper'
+require 'term/ansicolor'
+
+module GitTopic
+  module Formatter
+    # summarizes branches information
+    class Branches
+      include Term::ANSIColor
+      include GitTopic::Formatter::Helper
+
+      def initialize(options)
+        @all = options[:all]
+      end
+      Branch = Struct.new('Branch', :name, :rev)
+
+      def print
+        puts "#{bold}[Branches]#{clear}" if @all
+        branches, current_branch = parse_branches
+        print_header(branches.first)
+        print_contents(branches, current_branch)
+      end
+
+      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)
+        branches.each do |branch|
+          print_line(current_branch, branch)
+        end
+      end
+
+      def parse_branches
+        branches = []
+        current_branch = nil
+        _stdin, stdout, _stderr, _wait_thr = *Open3.popen3('git branch -v')
+        stdout.each do |line|
+          branch_name, rev, current_candidate = parse_branch(line)
+          current_branch ||= current_candidate
+          branches << Branch.new(branch_name, rev)
+        end
+        [branches, current_branch]
+      end
+
+      BRANCH_FORMAT = /
+        \s*(?<current_exp>\*\ )?
+        (?<branch_name>\S+)\s+
+        (?<rev>\S+)\s+(.*)
+      /x
+
+      def parse_branch(line)
+        matched = line.match(BRANCH_FORMAT)
+        raise 'cannot parse branch' unless matched
+        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
+        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.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
+    end
+  end
+end

lib/git_topic/formatter/helper.rb

@@ -0,0 +1,18 @@
+# frozen_string_literal: true
+
+module GitTopic
+  module Formatter
+    # Helper class for Formatter classes
+    module Helper
+      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

lib/git_topic/formatter/topics.rb

@@ -0,0 +1,62 @@
+# frozen_string_literal: true
+
+require 'term/ansicolor'
+
+module GitTopic
+  module Formatter
+    # summarizes topics information
+    # Topic means theme that not start to implement
+    class Topics
+      include Term::ANSIColor
+      include GitTopic::Formatter::Helper
+
+      def print
+        puts "#{bold}[Topics]#{clear}"
+        topics = parse_topics
+        print_header
+        print_contents topics
+      end
+
+      private
+
+      def print_header
+        header_format = '  %-20s %s'
+        puts format(header_format, :Topic, :Summary)
+        puts '-' * 80
+      end
+
+      Topic = Struct.new('Topic', :name, :summary)
+      LIST_TOPIC_COMMAND = 'git config --get-regexp ^topic.\*'
+
+      def parse_topics
+        topics = []
+        _stdin, stdout, _stderr, _wait_thr = *Open3.popen3(LIST_TOPIC_COMMAND)
+        stdout.each do |line|
+          name, summary = parse_topic(line)
+          topics << Topic.new(name, summary)
+        end
+        topics
+      end
+
+      def parse_topic(line)
+        matched = line.match(/topic\.(?<topic_name>\S+)\s+(?<summary>.*)/)
+        raise 'cannot parse topic' unless matched
+        topic_name = matched[:topic_name]
+        summary = matched[:summary]
+        [topic_name, summary]
+      end
+
+      def print_contents(topics)
+        topics.each do |topic|
+          print_line topic
+        end
+      end
+
+      def print_line(topic)
+        truncated_name = truncate(topic.name)
+        summary = topic.summary
+        puts format("  #{bold}%-20s#{clear} %s", truncated_name, summary)
+      end
+    end
+  end
+end

lib/git_topic/version.rb

@@ -1,5 +1,5 @@
 # frozen_string_literal: true
 
 module GitTopic
-  VERSION = '0.2.5'
+  VERSION = '0.3.0'
 end

spec/git_topic/commands/list_spec.rb

@@ -5,13 +5,9 @@
 RSpec.describe GitTopic::Commands::List do
   subject(:command) { described_class.new }
 
-  it { is_expected.to be_truthy }
-
   describe '#execute' do
     def setup_git_branch(output)
-      stdout = StringIO.new(output)
-      allow(Open3).to receive(:popen3)
-        .with('git branch -v').and_return([nil, stdout, nil, nil])
+      setup_command('git branch -v', output)
     end
 
     def setup_git_config
@@ -20,12 +16,7 @@ def setup_git_config
     end
 
     def setup_branch_description(branch_name, description)
-      stdout = instance_double(IO)
-      allow(stdout).to receive(:readline).and_return(description)
-      allow(stdout).to receive(:eof?).and_return(false)
-      allow(Open3).to receive(:popen3)
-        .with("git config branch.#{branch_name}.description")
-        .and_return([nil, stdout, nil, nil])
+      setup_command("git config branch.#{branch_name}.description", description)
     end
 
     context 'rev length is 7' do