verto 0.10.2 → 0.12.0

data/djin.yml

@@ -13,7 +13,7 @@ tasks:
 
   tag_up:
     docker:
-      image: "catks/verto:0.10.0"
+      image: "catks/verto:0.10.1"
       run:
         commands:
           - "verto tag up {{args}}"
@@ -26,6 +26,19 @@ tasks:
       - set_verto_version
 
   release:
+    depends_on:
+      - 'release:gem'
+      - 'release:docker'
+
+  'release:gem':
+    local:
+      run:
+        - bundle exec rake release
+    depends_on:
+      - set_verto_version
+      - tag_up
+
+  'release:docker':
     local:
       run:
         - bundle exec rake release

data/exe/verto

@@ -11,6 +11,8 @@ begin
 
   Verto::MainCommand.start(ARGV)
 
+# TODO: Check why we can't handle this error on CliHelpers
+rescue TTY::Reader::InputInterrupt
 # TODO: Improve error Message Handling
 rescue Verto::ExitError => e
   Verto.stderr.puts e.message

data/lib/verto/commands/tag_command.rb

@@ -1,7 +1,19 @@
 # frozen_string_literal: true
 
+# rubocop:disable Metrics/ClassLength
 module Verto
   class TagCommand < BaseCommand
+    desc 'init', "Create's the first tag"
+
+    def init
+      load_config_hooks!
+
+      error_message = 'This repository already has tags'
+      raise Verto::ExitError, error_message if tag_repository.any?
+
+      create_git_tag('0.1.0')
+    end
+
     desc 'up', "Create's a new tag"
 
     option :major, type: :boolean, default: false
@@ -31,9 +43,7 @@ module Verto
 
       call_hooks(:before_tag_creation, with_attributes: { new_version: new_version })
 
-      stderr.puts "Creating Tag #{version_prefix}#{new_version}..."
-      tag_repository.create!("#{version_prefix}#{new_version}")
-      stderr.puts "Tag #{version_prefix}#{new_version} Created!"
+      create_git_tag(new_version)
 
       call_hooks(:after_tag_up, with_attributes: { new_version: new_version })
       call_hooks(:after)
@@ -62,6 +72,12 @@ module Verto
       new_version
     end
 
+    def create_git_tag(version)
+      stderr.puts "Creating Tag #{version_prefix}#{version}..."
+      tag_repository.create!("#{version_prefix}#{version}")
+      stderr.puts "Tag #{version_prefix}#{version} Created!"
+    end
+
     def pre_release_configured?
       options[:pre_release] != 'pre_release'
     end
@@ -116,10 +132,22 @@ module Verto
     end
 
     def load_config_hooks!
-      if Verto.config.git.pull_before_tag_creation
-        Verto.config.hooks.prepend Verto::DSL::BuiltInHooks::GitPullCurrentBranch
-      end
-      Verto.config.hooks << Verto::DSL::BuiltInHooks::GitPushCurrentBranch if Verto.config.git.push_after_tag_creation
+      enabled_hooks = ->(_, v) { v }
+
+      config_hooks[:before].select(&enabled_hooks).each_key { |hook| Verto.config.hooks.prepend(hook) }
+      config_hooks[:after].select(&enabled_hooks).each_key { |hook| Verto.config.hooks << hook }
+    end
+
+    def config_hooks
+      @config_hooks ||= {
+        before: {
+          Verto::DSL::BuiltInHooks::GitPullCurrentBranch => Verto.config.git.pull_before_tag_creation,
+          Verto::DSL::BuiltInHooks::GitFetch => Verto.config.git.fetch_before_tag_creation
+        },
+        after: {
+          Verto::DSL::BuiltInHooks::GitPushCurrentBranch => Verto.config.git.push_after_tag_creation
+        }
+      }
     end
 
     def default_identifier
@@ -127,3 +155,4 @@ module Verto
     end
   end
 end
+# rubocop:enable Metrics/ClassLength

data/lib/verto/dsl/built_in_hooks.rb

@@ -7,6 +7,10 @@ module Verto
         git!("pull origin #{current_branch}")
       end
 
+      GitFetch = DSL::Hook.new(moment: :before) do
+        git!('fetch')
+      end
+
       GitPushTags = DSL::Hook.new(moment: :after) do
         git!('push --tags')
       end

data/lib/verto/dsl/syntax.rb

@@ -102,6 +102,16 @@ module Verto
         Verto.config.hooks << Hook.new(moment: 'before_tag_creation', &block)
       end
 
+      # Start the flow to Update the CHANGELOG file
+      # @param :with [Symbol] The strategy to search commit messages
+      #   Options include:
+      #   :merged_pull_requests_with_bracketed_labels -> Uses all PR merged commits after the last tag if they have the [***] pattern
+      #   :commits_with_bracketed_labels              -> Uses all commits after the last tag if they have the [***] pattern (Exclude merge commits)
+      #   :merged_pull_requests_messages              -> Uses all merged commit after the last tag
+      #   :commit_messages                            -> Uses all commits after the last tag (Exclude merge commits)
+      # @param :confirmation [Boolean] Adds a confirmation step before updating the CHANGELOG
+      # @param filename [String] The CHANGELOG filename
+      # @param message_pattern [Regexp] A regexp pattern to filter commit messages
       def update_changelog(with: :merged_pull_requests_with_bracketed_labels, confirmation: true, filename: 'CHANGELOG.md')
         permitted_moments = %w[before_tag_creation after_tag_up]
         unless permitted_moments.include? Verto.current_moment.to_s

data/lib/verto/dsl/update_changelog/filtered_by.rb

@@ -0,0 +1,45 @@
+# frozen_string_literal: true
+
+module Verto
+  module DSL
+    class UpdateChangelog
+      module FilteredBy
+        def self.included(klass)
+          klass.extend(ClassMethods)
+        end
+
+        module ClassMethods
+          def filtered_by(filter)
+            Proxy.new(self, filter)
+          end
+        end
+
+        class Proxy
+          def initialize(filter_class, final_filter)
+            @filter_class = filter_class
+            @final_filter = final_filter
+          end
+
+          def new
+            filter_object
+
+            self
+          end
+
+          def call(*args)
+            filter_object
+              .call(*args)
+              .select { |message| @final_filter.match?(message) }
+          end
+
+          private
+
+          # Lazy evaluete object to load Verto dependencies only at the last
+          def filter_object
+            @filter_object ||= @filter_class.new
+          end
+        end
+      end
+    end
+  end
+end

data/lib/verto/dsl/update_changelog/with_commit_messages.rb

@@ -0,0 +1,30 @@
+# frozen_string_literal: true
+
+module Verto
+  module DSL
+    class UpdateChangelog
+      class WithCommitMessages
+        include Verto.import[executor: 'system_command_executor_without_output', tag_repository: 'tag_repository']
+        include FilteredBy
+
+        def call(message_pattern = /.+/)
+          executor.run(
+            "git log --no-merges --pretty=format:%s #{commit_range}"
+          ).output.split("\n").map(&:strip).select { |message| message_pattern.match? message }
+        end
+
+        private
+
+        def commit_range
+          return unless latest_tag
+
+          "HEAD ^#{latest_tag}"
+        end
+
+        def latest_tag
+          tag_repository.latest
+        end
+      end
+    end
+  end
+end

data/lib/verto/dsl/update_changelog/with_merged_pull_requests.rb

@@ -0,0 +1,19 @@
+# frozen_string_literal: true
+
+module Verto
+  module DSL
+    class UpdateChangelog
+      class WithMergedPullRequests
+        include Verto.import[executor: 'system_command_executor_without_output']
+        include FilteredBy
+
+        def call(message_pattern = /.+/)
+          # FIXME: Format the command
+          executor.run(
+            %q(git log --oneline --decorate  | grep -B 100 -m 1 "tag:" | grep "pull request" | awk '{print $1}' | xargs -r git show --format='%b' | grep -v Approved | grep -v "^$") # rubocop:disable Layout/LineLength
+          ).output.split("\n").map(&:strip).select { |pr_message| message_pattern.match? pr_message }
+        end
+      end
+    end
+  end
+end

data/lib/verto/dsl/update_changelog.rb

@@ -3,45 +3,64 @@
 module Verto
   module DSL
     class UpdateChangelog
-      include Verto.import[:cli_helpers, :stdout,
-                           executor: 'system_command_executor_without_output', changelog_format: 'changelog.format']
+      include Verto.import[:cli_helpers, :stdout, changelog_format: 'changelog.format']
 
       InvalidChangelogSource = Class.new(Verto::ExitError)
 
+      BRACKETED_LABELS_REGEXP = /^[[:space:]]*\[.*\]/.freeze
+
       SOURCES = StrictHash.new(
         {
-          merged_pull_requests_with_bracketed_labels: lambda do |executor|
-            executor.run(
-              %q(git log --oneline --decorate  | grep -B 100 -m 1 "tag:" | grep "pull request" | awk '{print $1}' | xargs git show --format='%b' | grep -v Approved | grep -v "^$" | grep -E "^[[:space:]]*\[.*\]")
-            ).output.split("\n").map(&:strip)
-          end
+          merged_pull_requests_with_bracketed_labels: WithMergedPullRequests.filtered_by(BRACKETED_LABELS_REGEXP),
+          commits_with_bracketed_labels: WithCommitMessages.filtered_by(BRACKETED_LABELS_REGEXP),
+          merged_pull_requests_messages: WithMergedPullRequests,
+          commit_messages: WithCommitMessages
         },
         default_proc: ->(hash, _) { raise InvalidChangelogSource, "Invalid CHANGELOG Source, avaliable options: '#{hash.keys.join(',')}'" }
       )
 
-      def call(new_version:, confirmation: true, filename: 'CHANGELOG.md', with: :merged_pull_requests_with_bracketed_labels)
+      def call(new_version:, confirmation: true, filename: 'CHANGELOG.md', with: :merged_pull_requests_with_bracketed_labels, message_pattern: nil)
         verify_file_presence!(filename)
 
-        stdout.puts separator
-        changelog_changes = format_changes(new_version, version_changes(with))
+        changelog_changes = format_changes(new_version, version_changes(with, message_pattern))
+
+        if confirmation
+          stdout.puts separator
+          stdout.puts changelog_changes
+          stdout.puts separator
+          changelog_changes = select_changelog_text(changelog_changes)
+        end
 
-        exit if confirmation && !cli_helpers.confirm("Create new Release?\n" \
-                                                     "#{separator}\n" \
-                                                     "#{changelog_changes}" \
-                                                     "#{separator}\n")
         update_file(filename, changelog_changes)
       end
 
       private
 
+      # TODO: Refactor
+      def select_changelog_text(changelog_changes) # rubocop:disable Metrics/MethodLength
+        choices = [
+          { key: 'y', name: 'Create a new Release CHANGELOG', value: :yes },
+          { key: 'n', name: 'Cancel the Release CHANGELOG', value: :no },
+          { key: 'e', name: 'Edit the Release CHANGELOG before continuing', value: :edit }
+        ]
+        case cli_helpers.select_options('Create new Release?', choices)
+        when :no
+          exit
+        when :edit
+          cli_helpers.edit_text(changelog_changes)
+        else
+          changelog_changes
+        end
+      end
+
       def verify_file_presence!(filename)
         return if Verto.project_path.join(filename).exist?
 
         raise Verto::ExitError, "changelog file '#{filename}' doesnt exist"
       end
 
-      def version_changes(with)
-        SOURCES[with].call(executor)
+      def version_changes(with, message_pattern)
+        SOURCES[with.to_sym].new.call(*args_if_any(message_pattern))
       end
 
       def update_file(filename, changelog_changes)
@@ -49,12 +68,18 @@ module Verto
       end
 
       def format_changes(new_version, version_changes)
-        Mustache.render(changelog_format, { new_version: new_version, version_changes: version_changes }) + "\n"
+        changes = Mustache.render(changelog_format,
+                                  { new_version: new_version, version_changes: version_changes })
+        "#{changes}\n"
       end
 
       def separator
         '---------------------------'
       end
+
+      def args_if_any(arg)
+        [arg].compact
+      end
     end
   end
 end

data/lib/verto/repositories/tag_repository.rb

@@ -13,6 +13,10 @@ module Verto
       executor.run! "git tag #{tag}"
     end
 
+    def any?
+      all.any?
+    end
+
     def all(filter: nil)
       results = executor.run("git tag | grep -Eo '[0-9]+\.[0-9]+\.[0-9]+(-.+\.[0-9]+)*' | sed 's/\([0-9]\.[0-9]\.[0-9]$\)/\1-zzzzzzzzzz/' | sort -V |  sed 's/-zzzzzzzzzz//' | cat").output.split
 

data/lib/verto/utils/cli_helpers.rb

@@ -1,15 +1,37 @@
 # frozen_string_literal: true
 
-module CliHelpers
-  class << self
-    def confirm(text)
-      shell_basic.yes?("#{text} (y/n)")
-    end
+module Verto
+  module CliHelpers
+    class << self
+      def confirm(text)
+        shell_basic.yes?("#{text} (y/n)")
+      end
+
+      def select_options(question, choices)
+        tty_prompt.expand(question, choices)
+      end
+
+      def edit_text(text)
+        tempfile = "/tmp/verto-changelog-edit-#{SecureRandom.hex}"
+
+        TTY::Editor.open(tempfile, text: text)
+
+        edited_text = File.read(tempfile)
+
+        File.delete(tempfile)
+
+        edited_text
+      end
+
+      private
 
-    private
+      def shell_basic
+        @shell_basic ||= Thor::Shell::Basic.new
+      end
 
-    def shell_basic
-      @shell_basic ||= Thor::Shell::Basic.new
+      def tty_prompt
+        @tty_prompt = TTY::Prompt.new
+      end
     end
   end
 end

data/lib/verto/utils/templates/Vertofile

@@ -1,10 +1,11 @@
-verto_version '0.10.2'
+verto_version '0.12.0'
 
 config {
  # version.prefix = 'v' # Adds a version_prefix
  # pre_release.initial_number = 0 # Configures pre_release initial number, defaults to 1
  # project.path = "#{project_path}" # Configures a custom project path
  # git.pull_before_tag_creation = true # Pull Changes before tag creation
+ # git.fetch_before_tag_creation = true # Fetch Branches and Tags before tag creation
  # git.push_after_tag_creation = true # Push changes after tag creation
 
  ## CHANGELOG FORMAT

data/lib/verto/version.rb

@@ -1,5 +1,5 @@
 # frozen_string_literal: true
 
 module Verto
-  VERSION = '0.10.2'
+  VERSION = '0.12.0'
 end

data/lib/verto.rb

@@ -6,7 +6,10 @@ require 'dry-configurable'
 require 'dry-auto_inject'
 require 'vseries'
 require 'mustache'
+require 'tty-prompt'
+require 'tty-editor'
 require 'pathname'
+require 'securerandom'
 
 require 'verto/version'
 require 'verto/utils/command_options'
@@ -38,16 +41,16 @@ module Verto
   setting :git do
     setting :pull_before_tag_creation, false
     setting :push_after_tag_creation, false
+    setting :fetch_before_tag_creation, false
   end
 
   setting :changelog do
-    setting :format,
-            <<~CHANGELOG
-              ## {{new_version}} - #{Time.now.strftime('%d/%m/%Y')}
-              {{#version_changes}}
-               * {{.}}
-              {{/version_changes}}
-            CHANGELOG
+    setting :format, <<~CHANGELOG
+      ## {{new_version}} - #{Time.now.strftime('%d/%m/%Y')}
+      {{#version_changes}}
+       * {{.}}
+      {{/version_changes}}
+    CHANGELOG
   end
 
   setting :hooks, []
@@ -57,7 +60,7 @@ module Verto
   CommandError = Class.new(ExitError)
 
   def self.root_path
-    Pathname.new File.expand_path(File.dirname(__FILE__) + '/..')
+    Pathname.new File.expand_path("#{File.dirname(__FILE__)}/..")
   end
 
   def self.project_path
@@ -116,20 +119,23 @@ module Verto
   end
 end
 
-require 'verto/utils/semantic_version.rb'
+require 'verto/utils/semantic_version'
 require 'verto/utils/system_command_executor'
 require 'verto/utils/tag_filter'
 require 'verto/utils/template'
 require 'verto/utils/cli_helpers'
 require 'verto/utils/strict_hash'
+require 'verto/repositories/tag_repository'
 require 'verto/dsl'
 require 'verto/dsl/syntax'
 require 'verto/dsl/interpreter'
 require 'verto/dsl/hook'
 require 'verto/dsl/file'
+require 'verto/dsl/update_changelog/filtered_by'
+require 'verto/dsl/update_changelog/with_merged_pull_requests'
+require 'verto/dsl/update_changelog/with_commit_messages'
 require 'verto/dsl/update_changelog'
 require 'verto/dsl/built_in_hooks'
 require 'verto/commands/base_command'
 require 'verto/commands/tag_command'
 require 'verto/commands/main_command'
-require 'verto/repositories/tag_repository'

data/verto.gemspec

@@ -28,15 +28,19 @@ Gem::Specification.new do |spec|
   spec.require_paths = ['lib']
   spec.required_ruby_version = '>= 2.5'
 
-  spec.add_dependency             'dry-auto_inject', '~> 0.7'
-  spec.add_dependency             'dry-configurable', '~> 0.8'
-  spec.add_dependency             'dry-container', '~> 0.7'
+  spec.add_dependency             'dry-auto_inject', '~> 0.7.0'
+  spec.add_dependency             'dry-configurable', '~> 0.9.0'
+  spec.add_dependency             'dry-container', '~> 0.7.0'
+  spec.add_dependency             'dry-core', '~> 0.6.0'
   spec.add_dependency             'mustache', '~> 1.1.1'
   spec.add_dependency             'thor', '~> 1.0.1'
+  spec.add_dependency             'tty-editor', '~> 0.7.0'
+  spec.add_dependency             'tty-prompt', '~> 0.23.1'
   spec.add_dependency             'vseries', '~> 0.2'
 
   spec.add_development_dependency 'bundler', '~> 2.0'
   spec.add_development_dependency 'byebug'
+  spec.add_development_dependency 'pry-byebug', '~> 3.9.0'
   spec.add_development_dependency 'rake', '~> 13.0'
   spec.add_development_dependency 'rspec', '~> 3.0'
   spec.add_development_dependency 'rubocop'

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: verto
 version: !ruby/object:Gem::Version
-  version: 0.10.2
+  version: 0.12.0
 platform: ruby
 authors:
 - Carlos Atkinson
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2021-02-23 00:00:00.000000000 Z
+date: 2021-10-28 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: dry-auto_inject
@@ -16,42 +16,56 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '0.7'
+        version: 0.7.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '0.7'
+        version: 0.7.0
 - !ruby/object:Gem::Dependency
   name: dry-configurable
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '0.8'
+        version: 0.9.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '0.8'
+        version: 0.9.0
 - !ruby/object:Gem::Dependency
   name: dry-container
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '0.7'
+        version: 0.7.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '0.7'
+        version: 0.7.0
+- !ruby/object:Gem::Dependency
+  name: dry-core
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: 0.6.0
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: 0.6.0
 - !ruby/object:Gem::Dependency
   name: mustache
   requirement: !ruby/object:Gem::Requirement
@@ -80,6 +94,34 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: 1.0.1
+- !ruby/object:Gem::Dependency
+  name: tty-editor
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: 0.7.0
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: 0.7.0
+- !ruby/object:Gem::Dependency
+  name: tty-prompt
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: 0.23.1
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: 0.23.1
 - !ruby/object:Gem::Dependency
   name: vseries
   requirement: !ruby/object:Gem::Requirement
@@ -122,6 +164,20 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: '0'
+- !ruby/object:Gem::Dependency
+  name: pry-byebug
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: 3.9.0
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: 3.9.0
 - !ruby/object:Gem::Dependency
   name: rake
   requirement: !ruby/object:Gem::Requirement
@@ -199,6 +255,7 @@ files:
 - LICENSE.txt
 - README.md
 - Rakefile
+- VERTO_SYNTAX.md
 - Vertofile
 - bin/console
 - bin/setup
@@ -216,6 +273,9 @@ files:
 - lib/verto/dsl/interpreter.rb
 - lib/verto/dsl/syntax.rb
 - lib/verto/dsl/update_changelog.rb
+- lib/verto/dsl/update_changelog/filtered_by.rb
+- lib/verto/dsl/update_changelog/with_commit_messages.rb
+- lib/verto/dsl/update_changelog/with_merged_pull_requests.rb
 - lib/verto/repositories/tag_repository.rb
 - lib/verto/utils/cli_helpers.rb
 - lib/verto/utils/command_options.rb