git_toolbox 0.8.0 → 0.9.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 500f22d2000495865a5671476122c580ea0e5fdb6ebf2804ce42d209828a1841
-  data.tar.gz: 70a3c312974ce5ee382a8c6793325bf676dba7fb40206ed828f56c2019ce9d64
+  metadata.gz: d18e02ebf90eb2595af4735f88043d1fdea653a03d8500dec75a7cf9a510bc51
+  data.tar.gz: c0344b2969623ab61aa94c6960fa88bdad522057541ece00052bfdf9f4cbf636
 SHA512:
-  metadata.gz: ce3a643b6a110c7b70e7ddc33649548b15f064e61dbe35c13fa5eba3fa70b7c71a5118185ee88b89aab83f74602b605d9175b4633e58c933ae30ebfae97c2dab
-  data.tar.gz: 5125a3a0af8ab4a6590af9166c95d442c1dae5f89648f1d94224ff5a4d3e18fcaf21ec5e9d52b1f50939340d17d60ddd5cd37fa7bd6bd16b4e7ce88f2ac868da
+  metadata.gz: a9cbe2abd8b068d78436841419dddd776f72e97b57a5575f8447ae31e7744d8a7e54de9eaa55a242ff0c177b52a1f81b74309b044970c12ccaf98f4dc7d431d4
+  data.tar.gz: 9248e4bcce0371b73542e336591bc6844ac8a66f6d93334702fa0e7fbb2b13556c6d914682d9e8f62e964f5eb8aee6462bd4ebe739c4881effe69241c141ca1a

data/lib/get/commons/git.rb

@@ -23,6 +23,15 @@ require_relative './command_issuer'
 module Git
   # Groups: 1 = type, 2 = scope with (), 3 = scope, 4 = breaking change, 5 = summary
   CONVENTIONAL_COMMIT_REGEX = %r{^(\w+)(\(([\w/-]+)\))?(!)?:(.*)}
+  DEFAULT_RELEASE_VERSION = '0.1.0'
+  # Groups:
+  # 1 = full stable version ; 2,3,4 = major,minor,patch
+  # 5 = prerelease ; 6 = metadata
+  FULL_SEMANTIC_VERSION_REGEX = /
+      ^((0|[1-9]\d*)\.(0|[1-9]\d*)\.(0|[1-9]\d*)) # Stable version, major, minor, patch
+      (?:-((?:0|[1-9]\d*|\d*[a-zA-Z-][0-9a-zA-Z-]*)(?:\.(?:0|[1-9]\d*|\d*[a-zA-Z-][0-9a-zA-Z-]*))*))? # prerelease
+      (?:\+([0-9a-zA-Z-]+(?:\.[0-9a-zA-Z-]+)*))?$ # metadata
+    /x
 
   # Check if the command is called while in a git repository.
   # If the command fails, it is assumed to not be in a git repository.
@@ -61,11 +70,12 @@ module Git
   # Returns the last release and caches it for the next calls.
   def self.last_release
     @last_release ||=
-      CommandIssuer.run('git', '--no-pager', 'tag', '--list')
+      CommandIssuer.run('git', '--no-pager', 'tag', '--list', '--merged')
                    .then do |value|
         unless value.output.empty?
           value.output
                .split("\n")
+               .select { |str| str.match(FULL_SEMANTIC_VERSION_REGEX)[5].nil? }
                .map { |str| str.sub('+', '_') }
                .sort
                .map { |str| str.sub('_', '+') }

data/lib/get/subcommand/complete/bash_completion.rb

@@ -28,6 +28,10 @@ module BashCompletion
   private
 
   INITIAL_LEVEL = 1
+  NOT_NEGABLE_OPTIONS = [
+    'help',
+    'version',
+  ].freeze
 
   HEADER = <<~HEADER
     #!/usr/bin/env bash
@@ -77,6 +81,7 @@ module BashCompletion
 
     command_class.instance.option_parser.specs.each_value do |option|
       long_options.push("--#{option.long}")
+      long_options.push("--no-#{option.long}") if option.flag? && !NOT_NEGABLE_OPTIONS.include?(option.long)
       short_options.push("-#{option.short.nil? ? option.long[0] : option.short}") if option.short != :none
     end
 

data/lib/get/subcommand/complete/complete.rb

@@ -33,8 +33,18 @@ class Complete < Command
   def initialize
     super() do
       @usage = 'complete -h|(<subcommand> [<subcommand-options])'
-      @description = 'Print the shell completion script.'
+      @description = 'Print the shell completion script. ' \
+                     'Run \'get complete --info\' to learn how to install the completion.'
       @subcommands = {}
+      @completions = {
+        bash: {
+          generator: proc { bash_completion(Get, 'get') },
+          info: <<~INFO
+            Add the following line to your .bashrc (or a sourced script):
+            eval "$(get complete)" && complete -F _get_completion get
+          INFO
+        }
+      }
     end
   end
 
@@ -51,6 +61,9 @@ class Complete < Command
       opt :shell,
           'Select the type of shell of which the completion will be generated.',
           { type: :string, default: 'bash' }
+      opt :info,
+          'Print the instructions to install the completion for the selected shell.',
+          { short: :none }
       educate_on_error
       stop_on stop_condition
     end
@@ -62,16 +75,19 @@ class Complete < Command
         @option_parser.parse
       end
 
-      @completions = {
-        bash: proc { bash_completion(Get, 'get') }
-      }
-
       selected_shell = @options[:shell].to_sym
 
+      print_info_and_exit(selected_shell) if @options[:info]
+
       Common.error "Completion for shell '#{selected_shell}' not available." unless @completions.key?(selected_shell)
 
-      puts @completions[selected_shell].call
+      puts @completions[selected_shell][:generator].call
     end
   end
+
+  def print_info_and_exit(selected_shell)
+    puts @completions[selected_shell][:info]
+    exit 0
+  end
 end
 # rubocop:enable Metrics/ClassLength

data/lib/get/subcommand/describe/change.rb

@@ -30,6 +30,27 @@ module ChangeHandler
   Common.module_instance_attr(self, 'minor_trigger', :DEFAULT_MINOR_TRIGGER)
   Common.module_instance_attr(self, 'patch_trigger', :DEFAULT_PATCH_TRIGGER)
 
+  def updated_stable_version(stable_version)
+    return Git::DEFAULT_RELEASE_VERSION if stable_version.nil?
+
+    greatest_change_from_stable_version = Git.with_commit_list_from(stable_version) do |commits_from_version|
+      greatest_change_in(commits_from_version)
+    end
+    split_version = stable_version.split('.')
+    case greatest_change_from_stable_version
+    when :MAJOR
+      "#{split_version[0].to_i + 1}.0.0"
+    when :MINOR
+      "#{split_version[0].to_i}.#{split_version[1].to_i + 1}.0"
+    when :PATCH
+      "#{split_version[0].to_i}.#{split_version[1].to_i}.#{split_version[2].to_i + 1}"
+    else
+      "#{split_version[0].to_i}.#{split_version[1].to_i}.#{split_version[2].to_i}"
+    end
+  end
+
+  private
+
   def greatest_change_in(commit_list)
     commit_list
       .grep(Git::CONVENTIONAL_COMMIT_REGEX)
@@ -37,8 +58,6 @@ module ChangeHandler
       .max { |a, b| CHANGE_TYPE.index(a) <=> CHANGE_TYPE.index(b) }
   end
 
-  private
-
   # In this block method arguments can be used by user.
   # Also `eval` is needed to allow users to define their custom triggers.
   # rubocop:disable Lint/UnusedMethodArgument
@@ -61,8 +80,8 @@ module ChangeHandler
   def to_change(commit_message)
     groups = Git::CONVENTIONAL_COMMIT_REGEX.match(commit_message)
     return :MAJOR if triggers_major?(groups[1], groups[3], !groups[4].nil?)
-    return :MINOR if triggers_minor?(groups[1], groups[2])
-    return :PATCH if triggers_patch?(groups[1], groups[2])
+    return :MINOR if triggers_minor?(groups[1], groups[3])
+    return :PATCH if triggers_patch?(groups[1], groups[3])
 
     :NONE
   end

data/lib/get/subcommand/describe/describe.rb

@@ -38,13 +38,6 @@ class Describe < Command
   include PrereleaseHandler
   include MetadataHandler
 
-  DEFAULT_RELEASE_VERSION = '0.1.0'
-  FULL_SEMANTIC_VERSION_REGEX = /
-      ^((0|[1-9]\d*)\.(0|[1-9]\d*)\.(0|[1-9]\d*)) # Stable version, major, minor, patch
-      (?:-((?:0|[1-9]\d*|\d*[a-zA-Z-][0-9a-zA-Z-]*)(?:\.(?:0|[1-9]\d*|\d*[a-zA-Z-][0-9a-zA-Z-]*))*))? # prerelease
-      (?:\+([0-9a-zA-Z-]+(?:\.[0-9a-zA-Z-]+)*))?$ # metadata
-    /x
-
   def initialize
     super() do
       @usage = 'describe -h|(<subcommand> [<subcommand-options])'
@@ -84,50 +77,13 @@ class Describe < Command
 
   def next_release
     if @options[:prerelease]
-      prepare_prerelease_tag(Git.last_release, Git.last_version)
+      updated_stable_version(Git.last_release)
+        .then { |stable| "#{stable}-#{updated_prerelease(Git.last_version, stable)}" }
     else
-      prepare_release_tag(Git.last_release)
+      updated_stable_version(Git.last_release).to_s
     end + metadata
   end
 
-  def prepare_release_tag(last_release)
-    updated_stable_version(last_release).to_s
-  end
-
-  def prepare_prerelease_tag(last_release, last_version)
-    new_stable_version = updated_stable_version(last_release)
-    base_version_match_data = FULL_SEMANTIC_VERSION_REGEX.match(last_version)
-    no_changes_from_last_release = base_version_match_data[1] == new_stable_version && base_version_match_data[5].nil?
-    Common.error 'No changes from last release' if no_changes_from_last_release
-    new_stable_version +
-      "-#{updated_prerelease(base_version_match_data[5], need_reset: base_version_match_data[1] != new_stable_version)}"
-  end
-
-  def updated_stable_version(stable_version)
-    return DEFAULT_RELEASE_VERSION if stable_version.nil?
-
-    greatest_change_from_stable_version = Git.with_commit_list_from(stable_version) do |commits_from_version|
-      greatest_change_in(commits_from_version)
-    end
-    split_version = stable_version.split('.')
-    case greatest_change_from_stable_version
-    when :MAJOR
-      "#{split_version[0].to_i + 1}.0.0"
-    when :MINOR
-      "#{split_version[0].to_i}.#{split_version[1].to_i + 1}.0"
-    when :PATCH
-      "#{split_version[0].to_i}.#{split_version[1].to_i}.#{split_version[2].to_i + 1}"
-    else
-      "#{split_version[0].to_i}.#{split_version[1].to_i}.#{split_version[2].to_i}"
-    end
-  end
-
-  # Return the updated prerelease number
-  def updated_prerelease(prerelease = nil, need_reset: false)
-    compute_prerelease(prerelease, need_reset: prerelease.nil? || need_reset)
-  end
-
-  # Compute the metadata string
   def metadata
     return '' if @options[:exclude_metadata] || @options[:metadata].empty?
 

data/lib/get/subcommand/describe/prerelease.rb

@@ -27,20 +27,31 @@ module PrereleaseHandler
   Common.module_instance_attr(self, 'prerelease_pattern', :DEFAULT_PRERELEASE_PATTERN)
   Common.module_instance_attr(self, 'old_prerelease_pattern', 'proc { prerelease_pattern }')
 
-  def compute_prerelease(current_prerelease, need_reset: false)
-    new_prerelease = (need_reset ? FIRST_PRERELEASE : (extract_prerelease_number(current_prerelease) + 1)).to_s
-    PrereleaseHandler.prerelease_pattern.sub(PRERELEASE_PLACEHOLDER, new_prerelease)
+  def updated_prerelease(last_version, new_stable_version)
+    if last_version.nil?
+      compute_prerelease(nil, need_reset: true)
+    else
+      base_version_match_data = Git::FULL_SEMANTIC_VERSION_REGEX.match(last_version)
+      no_changes_from_last_release = base_version_match_data[1] == new_stable_version &&
+                                     base_version_match_data[5].nil?
+      Common.error 'No changes from last release' if no_changes_from_last_release
+      compute_prerelease(base_version_match_data[5], need_reset: base_version_match_data[1] != new_stable_version)
+    end
   end
 
   private
 
+  def compute_prerelease(current_prerelease, need_reset: false)
+    pattern_changed = PrereleaseHandler.prerelease_pattern != actual_old_prerelease_pattern
+    new_prerelease = if need_reset || pattern_changed
+                       FIRST_PRERELEASE
+                     else
+                       extract_prerelease_number(current_prerelease) + 1
+                     end.to_s
+    PrereleaseHandler.prerelease_pattern.sub(PRERELEASE_PLACEHOLDER, new_prerelease)
+  end
+
   def extract_prerelease_number(current_prerelease)
-    actual_old_prerelease_pattern =
-      if PrereleaseHandler.old_prerelease_pattern.respond_to?('call')
-        PrereleaseHandler.old_prerelease_pattern.call
-      else
-        PrereleaseHandler.old_prerelease_pattern
-      end
     Common.error "The given old pattern does not contains the placeholder '(p)'" unless
       actual_old_prerelease_pattern.include?(PRERELEASE_PLACEHOLDER)
     old_prerelease_regex = actual_old_prerelease_pattern.sub(PRERELEASE_PLACEHOLDER, '(\\d+)')
@@ -51,4 +62,12 @@ module PrereleaseHandler
                    "does not match the analyzed prerelease: '#{current_prerelease}'."
     end
   end
+
+  def actual_old_prerelease_pattern
+    if PrereleaseHandler.old_prerelease_pattern.respond_to?('call')
+      PrereleaseHandler.old_prerelease_pattern.call
+    else
+      PrereleaseHandler.old_prerelease_pattern
+    end
+  end
 end

data/lib/get/subcommand/init/init.rb

@@ -47,7 +47,7 @@ class Init < Command
 
   def create_first_commit
     command_result = CommandIssuer.run('git', 'commit', '--allow-empty', '-m', '"chore: initialize repository"')
-    Common.error 'Failed to create first commit' if command_result.exit_status.positive?
+    Common.error "Failed to create first commit: #{command_result.error}" if command_result.exit_status.positive?
   end
 
   protected

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

@@ -70,21 +70,18 @@ class Tree < Command
     # calc color escape codes length
     time_color_length = first_line_time.length - first_line_time.match(TIME_REGEX)[1].length
 
-    # calc max length of time references
-    time_padding = 0
-    split_lines.each { |element| time_padding = [time_padding, element[1].length - time_color_length].max }
+    time_padding = global_fitting_time_padding(split_lines, time_color_length)
 
-    # format strings
     split_lines
       .map do |element|
         # Only lines with the date reference have the color escape codes,
         # the other lines do not need the additional padding
         left_padding = TIME_MINIMUM_PADDING + time_padding +
-                       (element[1].match?(TIME_REGEX) ? time_color_length : 0)
+          (!element[1].nil? && element[1].match?(TIME_REGEX) ? time_color_length : 0)
         format(
           '%<date>s %<tree_mark>s %<pointers>s %<commit_text>s',
           {
-            date: element[1].rjust(left_padding),
+            date: (element[1].nil? ? '' : element[1]).rjust(left_padding),
             tree_mark: element[0],
             pointers: element[2],
             commit_text: element[3]
@@ -95,6 +92,16 @@ class Tree < Command
   end
   # rubocop:enable Metrics/MethodLength
 
+  def global_fitting_time_padding(lines, time_color_length)
+    time_padding = 0
+    lines
+      # If element[1].nil? then the line refers to a intersection between branch lines
+      # they do not have a time reference
+      .reject { |element| element[1].nil? }
+      .each { |element| time_padding = [time_padding, element[1].length - time_color_length].max }
+    time_padding
+  end
+
   protected
 
   def setup_option_parser

data/lib/get/version.rb

@@ -17,4 +17,4 @@
 
 # frozen_string_literal: true
 
-GET_VERSION = '0.8.0'
+GET_VERSION = '0.9.0'

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: git_toolbox
 version: !ruby/object:Gem::Version
-  version: 0.8.0
+  version: 0.9.0
 platform: ruby
 authors:
 - Alex Speranza
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2023-06-22 00:00:00.000000000 Z
+date: 2023-07-13 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: highline
@@ -96,7 +96,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
-      version: 3.1.0
+      version: 3.0.0
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="