git_toolbox 0.7.2 → 0.8.0

data/lib/get/subcommand/tree/tree.rb

@@ -17,64 +17,44 @@
 
 # frozen_string_literal: true
 
-require 'English'
-require 'get/commons/common'
-require 'get/commons/git'
-require 'get/subcommand/command'
+require_relative '../../commons/common'
+require_relative '../../commons/git'
+require_relative '../command'
 
 # Class length is disabled as most of its length is given by formatting.
 # rubocop:disable Metrics/ClassLength
 # Subcommand, it allow to create a new repository and add an initial, empty commit to it.
 class Tree < Command
-  def self.command
-    @@command ||= new
-    @@command
-  end
-
-  private_class_method :new
-
   private
 
-  @@command = nil
-
-  @@usage = 'tree -h|(<subcommand> [<subcommand-options])'
-  @@description = 'Print the tree of commits.'
-  @@subcommands = {}
-  # This block is Optimist configuration. It is as long as the number of options of the command.
-  # rubocop:disable Metrics/BlockLength
-  @@option_parser = Optimist::Parser.new do
-    subcommand_max_length = @@subcommands.keys.map { |k| k.to_s.length }.max
-    subcommand_section = <<~SUBCOMMANDS unless @@subcommands.empty?
-      Subcommands:
-      #{@@subcommands.keys.map { |k| "  #{k.to_s.ljust(subcommand_max_length)} => #{@@subcommands[k].description}" }.join("\n")}
-    SUBCOMMANDS
-    usage @@usage
-    synopsis @@description + (subcommand_section.nil? ? '' : "\n") + subcommand_section.to_s
-    educate_on_error
-    stop_on @@subcommands.keys.map(&:to_s)
-  end
-  # rubocop:enable Metrics/BlockLength
-
   def initialize
-    super(@@usage, @@description) do
-      @options = Common.with_subcommand_exception_handling @@option_parser do
-        @@option_parser.parse
-      end
-      Common.error 'tree need to be run inside a git repository' unless Git.in_repo?
-
-      view_tree
+    super() do
+      @usage = 'tree -h|(<subcommand> [<subcommand-options])'
+      @description = 'Print the tree of commits. ' \
+                     'If the output is redirected to a pager (i.e. \'less\'), ' \
+                     'you may need to enable the parsing of escape sequences.'
+      @subcommands = {}
     end
   end
 
   def view_tree
-    page_log(transform_log(log))
+    puts transform_log(log)
   end
 
   TREE_FORMAT = '%C(bold blue)%h%C(reset)§%C(dim normal)(%cr)%C(reset)§%C(auto)%d%C(reset)§§%n' \
                 '§§§       %C(normal)%an%C(reset)%C(dim normal): %s%C(reset)'
 
   def log
-    `git log --all --graph --decorate=short --date-order --color --pretty=format:"#{TREE_FORMAT}"`
+    CommandIssuer.run(
+      'git',
+      'log',
+      '--all',
+      '--graph',
+      '--decorate=short',
+      '--date-order',
+      '--color',
+      "--pretty=format:\"#{TREE_FORMAT}\""
+    ).output
   end
 
   TIME_REGEX = /(\([a-z0-9 ,]+\))/
@@ -115,8 +95,30 @@ class Tree < Command
   end
   # rubocop:enable Metrics/MethodLength
 
-  def page_log(text)
-    system("less -RfS <(echo -e '#{text}')")
+  protected
+
+  def setup_option_parser
+    @option_parser = Optimist::Parser.new(
+      @usage,
+      full_description,
+      stop_condition
+    ) do |usage_header, description, stop_condition|
+      usage usage_header
+      synopsis description
+      educate_on_error
+      stop_on stop_condition
+    end
+  end
+
+  def setup_action
+    @action = lambda do
+      @options = Common.with_subcommand_exception_handling @option_parser do
+        @option_parser.parse
+      end
+      Common.error 'tree need to be run inside a git repository' unless Git.in_repo?
+
+      view_tree
+    end
   end
 end
 # rubocop:enable Metrics/ClassLength

data/lib/get/version.rb

@@ -17,6 +17,4 @@
 
 # frozen_string_literal: true
 
-module Get
-  VERSION = '0.7.2'
-end
+GET_VERSION = '0.8.0'

data/lib/get.rb

@@ -28,48 +28,61 @@ require 'get/subcommand/changelog/changelog'
 require 'get/subcommand/tree/tree'
 require 'get/version'
 require 'get/commons/common'
+require 'get/subcommand/command'
 
-# Entrypoint of Get
-module Get
+# Main command of Get.
+class Get < Command
   class Error < StandardError; end
 
-  @@subcommands = {
-    describe: Describe.command,
-    commit: Commit.command,
-    init: Init.command,
-    license: License.command,
-    complete: Complete.command,
-    changelog: Changelog.command,
-    tree: Tree.command,
-  }
-  @@option_parser = Optimist::Parser.new do
-    subcommand_max_length = @@subcommands.keys.map { |k| k.to_s.length }.max
-    usage '-h|-v|(<subcommand> [<subcommand-options])'
-    synopsis <<~SUBCOMMANDS unless @@subcommands.empty?
-      Subcommands:
-      #{@@subcommands.keys.map { |k| "  #{k.to_s.ljust(subcommand_max_length)} => #{@@subcommands[k].description}" }.join("\n")}
-    SUBCOMMANDS
-    version "Get version: #{Get::VERSION}"
-    educate_on_error
-    stop_on @@subcommands.keys.map(&:to_s)
+  def initialize
+    super() do
+      @usage = '-h|-v|(<subcommand> [<subcommand-options])'
+      @description = ''
+      @subcommands = {
+        describe: Describe.instance,
+        commit: Commit.instance,
+        init: Init.instance,
+        license: License.instance,
+        complete: Complete.instance,
+        changelog: Changelog.instance,
+        tree: Tree.instance,
+      }
+    end
   end
 
-  def self.main
-    @options = Optimist.with_standard_exception_handling(@@option_parser) do
-      @@option_parser.parse
-    end
-    error 'No command or option specified' if ARGV.empty?
-    command = ARGV.shift.to_sym
-    if @@subcommands.include?(command)
-      @@subcommands[command].action.call
-    else
-      error "Unknown subcommand '#{command}'"
+  def main
+    @action.call
+  end
+
+  protected
+
+  def setup_option_parser
+    @option_parser = Optimist::Parser.new(
+      @usage,
+      full_description,
+      GET_VERSION,
+      stop_condition
+    ) do |usage_header, description, version, stop_condition|
+      usage usage_header
+      synopsis description
+      version "Get version: #{version}"
+      educate_on_error
+      stop_on stop_condition
     end
   end
 
-  def self.error(message)
-    Common.error message do
-      @@option_parser.educate
+  def setup_action
+    @action = lambda do
+      @options = Optimist.with_standard_exception_handling(@option_parser) do
+        @option_parser.parse
+      end
+      educated_error 'No command or option specified' if ARGV.empty?
+      command = ARGV.shift.to_sym
+      if @subcommands.include?(command)
+        @subcommands[command].action.call
+      else
+        educated_error "Unknown subcommand '#{command}'"
+      end
     end
   end
 end

metadata

@@ -1,49 +1,49 @@
 --- !ruby/object:Gem::Specification
 name: git_toolbox
 version: !ruby/object:Gem::Version
-  version: 0.7.2
+  version: 0.8.0
 platform: ruby
 authors:
 - Alex Speranza
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2023-06-02 00:00:00.000000000 Z
+date: 2023-06-22 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
-  name: optimist
+  name: highline
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '3.0'
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: 3.0.1
+        version: 2.0.3
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '3.0'
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: 3.0.1
+        version: 2.0.3
 - !ruby/object:Gem::Dependency
-  name: highline
+  name: optimist
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 2.0.3
+        version: '3.0'
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: 3.0.1
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 2.0.3
+        version: '3.0'
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: 3.0.1
 description:
 email:
 - alex.speranza@studio.unibo.it
@@ -55,8 +55,10 @@ files:
 - bin/get
 - bin/setup
 - lib/get.rb
+- lib/get/commons/command_issuer.rb
 - lib/get/commons/common.rb
 - lib/get/commons/git.rb
+- lib/get/commons/http_client.rb
 - lib/get/subcommand/changelog/changelog.rb
 - lib/get/subcommand/command.rb
 - lib/get/subcommand/commit/commit.rb