verto 0.6.0 → 0.10.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 768852b8be876572bb72068a3865eaeee672d20baa976923758c9634b901a52d
-  data.tar.gz: 98339f920377dd25299a8240d5e10da2f5161fd749f5753d593d1878de4e6e9c
+  metadata.gz: ec5d303284b7d17001dacb3f3daa72ba1d47601dffb325790e61ec941f2f2b84
+  data.tar.gz: f078471b8bb4cb5243cfdb5748332a7582a8d26f3da17a19d6b3777757b8a2d0
 SHA512:
-  metadata.gz: 8532433e33edc4061b286d8ab409c70d668d231eed44a20b245243f94de4cdf794754c39b588212c71a10ec8522aa02f5b76ee21b6f636f2e283c2219989da66
-  data.tar.gz: c04e86927b7edcece876e739fc149743e99f972d86bbab755f86b0c006abf90caa255be1f35bdd6366e0e0387b6c9dbe80d97475394c7263c979cd86d89492d8
+  metadata.gz: 21e6d0f0e89edcb6f0ec6b2892ad0a8c71d81623f602daacc9103b2d51508c570273e05151e0143f2e7915678faa4e598eab10efd369058041bf892112fdc38b
+  data.tar.gz: 534cc6aecfd85f5e027d0fd6e31dcfe4b41e88c33aedff39b5f66919826005a8bab6ced748fc70471086a9b4eabadf6ebde208b591b2d08b633a482e548730b2

data/CHANGELOG.md

@@ -1,3 +1,18 @@
+## 0.10.0 - 14/10/2020
+ * [FEATURE] Adds update_changelog in DSL
+
+## 0.9.0 - 08/08/2020
+ * [FEATURE] Custom Default Pre-Release Identifier
+
+## 0.8.0 - 05/05/2020
+ * [PATCH] Handles Ctrl-C / SIGINT in CLI
+
+## 0.7.0 - 29/04/2020
+ * [FEATURE Built In Git Hooks]
+
+## 0.6.1 - 15/04/2020
+ * [FIX] Fix Vertofile to add Gemfile.lock before release
+
 ## 0.6.0 - 14/04/2020
  * [FEATURE] Adds Version Prefix
 

data/Gemfile.lock

@@ -1,10 +1,11 @@
 PATH
   remote: .
   specs:
-    verto (0.5.0)
+    verto (0.10.0)
       dry-auto_inject (~> 0.7)
       dry-configurable (~> 0.8)
       dry-container (~> 0.7)
+      mustache (~> 1.1.1)
       thor (~> 1.0.1)
       vseries (~> 0.2)
 
@@ -12,12 +13,12 @@ GEM
   remote: https://rubygems.org/
   specs:
     byebug (11.1.1)
-    concurrent-ruby (1.1.6)
+    concurrent-ruby (1.1.7)
     diff-lcs (1.3)
     docile (1.3.2)
     dry-auto_inject (0.7.0)
       dry-container (>= 0.3.4)
-    dry-configurable (0.11.5)
+    dry-configurable (0.11.6)
       concurrent-ruby (~> 1.0)
       dry-core (~> 0.4, >= 0.4.7)
       dry-equalizer (~> 0.2)
@@ -27,6 +28,7 @@ GEM
     dry-core (0.4.9)
       concurrent-ruby (~> 1.0)
     dry-equalizer (0.3.0)
+    mustache (1.1.1)
     rake (13.0.1)
     rspec (3.9.0)
       rspec-core (~> 3.9.0)

data/README.md

@@ -32,28 +32,20 @@ You don't need to install verto in your machine, you can run verto via the docke
 To use verto in the same way that you use any other cli, you can set an alias in your `.bashrc`, `.zshrc`, etc:
 
 ```shell
-alias verto='docker run -v $(pwd):/usr/src/project -it catks/verto:0.6.0'
+alias verto='docker run -v $(pwd):/usr/src/project -it catks/verto:0.10.0'
 ```
 
 If you want you can share your git configuration and known_hosts with:
 
 ```shell
-alias verto='docker run -v ~/.gitconfig:/etc/gitconfig -v $(pwd):/usr/src/project -v $HOME/.ssh/known_hosts:/root/.ssh/known_hosts -it catks/verto:0.6.0'
+alias verto='docker run -v ~/.gitconfig:/etc/gitconfig -v $(pwd):/usr/src/project -v $HOME/.ssh/known_hosts:/root/.ssh/known_hosts -it catks/verto:0.10.0'
 
 ```
 
-You can also use your ssh keys with verto container (for git push):
+You can also use your ssh keys, know_hosts and git config with verto container (for git push):
 
 ```shell
-alias verto='docker run -v $(pwd):/usr/src/project -v $HOME/.ssh/known_hosts:/root/.ssh/known_hosts -v $HOME/.ssh/id_rsa:/root/.ssh/id_rsa -e SSH_PRIVATE_KEY=/root/.ssh/id_rsa -it catks/verto:0.6.0'
-
-```
-
-Or share the git config, known_hosts and ssh_keys:
-
-
-```shell
-alias verto='docker run -v ~/.gitconfig:/etc/gitconfig -v $(pwd):/usr/src/project -v $HOME/.ssh/known_hosts:/root/.ssh/known_hosts -v $HOME/.ssh/id_rsa:/root/.ssh/id_rsa -e SSH_PRIVATE_KEY=/root/.ssh/id_rsa -it catks/verto:0.6.0'
+alias verto='docker run -v ~/.gitconfig:/etc/gitconfig -v $(pwd):/usr/src/project -v $HOME/.ssh/known_hosts:/root/.ssh/known_hosts -v $HOME/.ssh/id_rsa:/root/.ssh/id_rsa -e SSH_PRIVATE_KEY=/root/.ssh/id_rsa -it catks/verto:0.10.0'
 
 ```
 
@@ -93,72 +85,75 @@ You can create a new Vertofile with `verto init` or following the next example:
 ```ruby
 # Vertofile
 
-verto_version '0.6.0'
+verto_version '0.10.0'
 
 config {
  # version.prefix = 'v' # Adds a version_prefix
+ # pre_release.default_identifier = 'alpha' } # Defaults to 'rc'
+ git.pull_before_tag_creation = true # Pull Changes before tag creation
+ git.push_after_tag_creation = true # Push changes after tag creation
+
+ ## CHANGELOG FORMAT
+ ## Verto uses Mustache template rendering to render changelog updates, the default value is:
+ ##
+ ##   ## {{new_version}} - #{Time.now.strftime('%d/%m/%Y')}
+ ##       {{#version_changes}}
+ ##       * {{.}}
+ ##       {{/version_changes}}
+ ##
+ ## A custom format can be specified, eg:
+ # changelog.format =  <<~CHANGELOG
+ #                       ## {{new_version}}
+ #                        {{#version_changes}}
+ #                        * {{.}}
+ #                        {{/version_changes}}
+ #                      CHANGELOG
 }
 
 context(branch('master')) {
-  before_command('tag_up') {
-    git!('origin master')
+  before_command_tag_up {
     command_options.add(filter: 'release_only')
   }
 
-  on('before_tag_creation') {
-
-    version_changes = sh(
-      %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:]]*\[.*\]" | sed 's/^[[:space:]]*\(.*\)/ * \1/'#, output: false
-    ).output
-
-    puts "---------------------------"
-    version_changes = "## #{new_version} - #{Time.now.strftime('%d/%m/%Y')}\n#{version_changes}\n"
-    exit unless confirm("Create new Realease?\n" \
-      "---------------------------\n" \
-      "#{version_changes}" \
-      "---------------------------\n"
+  before_tag_creation {
+    update_changelog(
+      with: :merged_pull_requests_with_bracketed_labels, # Optional, defines the strategy to retrive the changes, default: :merged_pull_requests_with_bracketed_labels
+      confirmation: true, # Optional, asks for confirmation before updating the changelog, default: true
+      filename: 'CHANGELOG.md' # Optional, defines the filename of the CHANGELOG file, default: 'CHANGELOG.md'
     )
-
-    # CHANGELOG
-    file('CHANGELOG.md').prepend(version_changes)
     git('add CHANGELOG.md')
 
     # Uncomment to update the version in other files, like package.json
     # file('package.json').replace(/"(\d+)\.(\d+)\.(\d+)(-?.*)"/, %Q{"#{new_version}"})
     # git('add package.json')
 
-    git('commit -m "Updates CHANGELOG"')
+    git!('commit -m "Updates CHANGELOG"')
   }
 
-  after_command('tag_up') {
-    git('push --tags')
-    git('push origin master')
-  }
+  # After Hooks
+  # after_command_tag_up {
+  #  git('push --tags')
+  #  git('push origin master')
+  # }
 }
 
  context(branch('staging')) {
-  before_command('tag_up') {
+  before_command_tag_up {
     git!('pull origin staging')
     command_options.add(pre_release: 'rc')
   }
 
-  on('before_tag_creation') {
+  before_tag_creation {
     # file('package.json').replace(/"(\d+)\.(\d+)\.(\d+)(-?.*)"/, %Q{"#{new_version}"})
     # git('add package.json')
 
-    git('commit -m "Release QA"')
-    git('commit --allow-empty -m "Staging Release"')
-  }
-
-  after_command('tag_up') {
-    git('push --tags')
-    git('push origin staging')
+    git!('commit --allow-empty -m "Staging Release"')
   }
 }
 
 # Block tag creation in other branchs
 context(!branch('master', 'staging')) {
-  error "Tags only can be created in master or staging branch"
+  error "Tags can only be created in master or staging branch"
   exit
 }
 ```
@@ -171,7 +166,7 @@ context(!branch('master', 'staging')) {
 
   1. Complete README.md description
   2. Add a configuration to enable, disable or specify the number of tags that a single commit can have(eg: only one release and one pre-release)
-  5. Adds more specs and test coverage in CI
+  3. Adds more specs and test coverage in CI
 
 ## Contributing
 

data/Vertofile

@@ -1,32 +1,18 @@
-verto_version '0.5.0'
+verto_version '0.10.0'
 
 config {
- version.prefix = 'v' # Adds a version_prefix
+  version.prefix = 'v' # Adds a version_prefix
+  git.pull_before_tag_creation = true
+  git.push_after_tag_creation = true
 }
 
 context(branch('master')) {
-  before_command('tag_up') {
-    git!('pull origin master')
+  before_command_tag_up {
     command_options.add(filter: 'release_only')
   }
 
-  on('before_tag_creation') {
-    version_changes = ""
-     bitbucket_changes = sh(
-      %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:]]*\[.*\]" | sed 's/^[[:space:]]*\(.*\)/ * \1/'#, output: false
-     ).output
-     version_changes = bitbucket_changes
-
-    puts "---------------------------"
-    version_changes = "## #{new_version} - #{Time.now.strftime('%d/%m/%Y')}\n#{version_changes}\n"
-    exit unless confirm("Create new Realease?\n" \
-      "---------------------------\n" \
-      "#{version_changes}" \
-      "---------------------------\n"
-    )
-
-    # CHANGELOG
-    file('CHANGELOG.md').prepend(version_changes)
+  before_tag_creation {
+    update_changelog
     git!('add CHANGELOG.md')
 
     file('lib/verto/version.rb').replace(latest_version.to_s, new_version.to_s)
@@ -36,18 +22,14 @@ context(branch('master')) {
     git!('add README.md')
 
     file('lib/verto/utils/templates/Vertofile').replace(latest_version.to_s, new_version.to_s)
-    git!('add lib/verto/utils/templates/Vertofile')
+    file('Vertofile').replace(latest_version.to_s, new_version.to_s)
 
+    git!('add Vertofile lib/verto/utils/templates/Vertofile')
+
+    sh!('bundle install')
     sh!('rake install')
     git!('add Gemfile.lock')
 
     git!('commit -m "Bumps Version"')
   }
-
-  after_command('tag_up') {
-    git!('push --tags')
-    git!('push origin master')
-    sh!('rake release')
-  }
 }
-

data/djin.yml

@@ -0,0 +1,8 @@
+djin_version: '0.6.0'
+
+tasks:
+  release:
+    local:
+      run:
+        - verto tag up {{args}}
+        - bundle exec rake release

data/exe/verto

@@ -1,9 +1,9 @@
 #!/usr/bin/env ruby
+Signal.trap("INT") { exit 2 }
 
 require_relative '../lib/verto'
 
 vertofile_path = ENV['VERTOFILE_PATH'] || Pathname.new(Dir.pwd).join('Vertofile').to_s
-
 begin
   Verto::DSL.load_file(vertofile_path) if File.exists?(vertofile_path)
 

data/lib/verto.rb

@@ -3,6 +3,7 @@ require "dry-container"
 require "dry-configurable"
 require "dry-auto_inject"
 require "vseries"
+require "mustache"
 require "pathname"
 
 require "verto/version"
@@ -13,6 +14,7 @@ module Verto
 
   setting :pre_release do
     setting :initial_number, 1
+    setting :default_identifier, 'rc'
   end
 
   setting :project do
@@ -26,6 +28,24 @@ module Verto
 
   setting :version do
     setting :prefix, ''
+    setting :validations do
+      setting :new_version_must_be_bigger, true
+    end
+  end
+
+  setting :git do
+    setting :pull_before_tag_creation, false
+    setting :push_after_tag_creation, false
+  end
+
+  setting :changelog do
+    setting :format,
+            <<~CHANGELOG
+              ## {{new_version}} - #{Time.now.strftime('%d/%m/%Y')}
+               {{#version_changes}}
+               * {{.}}
+               {{/version_changes}}
+            CHANGELOG
   end
 
   setting :hooks, []
@@ -46,6 +66,7 @@ module Verto
     @container ||= Dry::Container.new.tap do |container|
       container.register('system_command_executor') { SystemCommandExecutor.new }
       container.register('system_command_executor_without_output') { SystemCommandExecutor.new(stdout: nil, stderr: nil) }
+      container.register('cli_helpers') { CliHelpers }
 
       container.register('tag_repository') { TagRepository.new }
 
@@ -63,6 +84,10 @@ module Verto
       container.namespace('project') do
         register('path') { Verto.config.project.path }
       end
+
+      container.namespace('changelog') do
+        register('format') { Verto.config.changelog.format }
+      end
     end
   end
 
@@ -77,17 +102,29 @@ module Verto
   def self.stderr
     Verto.container.resolve('stderr')
   end
+
+  def self.current_moment
+    @current_moment
+  end
+
+  def self.current_moment=(moment)
+    @current_moment = moment
+  end
 end
 
 require "verto/utils/semantic_version.rb"
 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/dsl"
 require "verto/dsl/syntax"
 require "verto/dsl/interpreter"
 require "verto/dsl/hook"
 require "verto/dsl/file"
+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"

data/lib/verto/commands/base_command.rb

@@ -24,7 +24,10 @@ module Verto
       moments_to_call.each do |moment|
         Verto.config.hooks
           .select { |hook| hook.moment == moment.to_sym }
-          .each { |hook| hook.call(with_attributes: with_attributes) }
+          .each do |hook|
+            Verto.current_moment = hook.moment
+            hook.call(with_attributes: with_attributes)
+          end
       end
     end
   end

data/lib/verto/commands/tag_command.rb

@@ -11,6 +11,8 @@ module Verto
     option :version_prefix, type: :string, default: nil
 
     def up
+      load_config_hooks!
+
       call_hooks(%i[before before_tag_up], with_attributes: { command_options: options} )
 
       validate_version_option_presence!
@@ -40,13 +42,13 @@ module Verto
     include Verto.import['tag_repository']
 
     def up_version(version, options)
-      up_options = options.select { |key,value| value == true }.keys.map(&:to_sym) & [:major, :minor, :patch]
-      up_option = up_options.sort.first
+      up_options = options.select { |_, value| value == true }.keys.map(&:to_sym) & [:major, :minor, :patch]
+      up_option = up_options.min
 
       new_version = version.up(up_option)
 
       if options[:pre_release]
-        identifier = pre_release_configured? ? options[:pre_release] : version.pre_release.name
+        identifier = pre_release_configured? ? options[:pre_release] : version.pre_release.name || default_identifier
         new_version = new_version.with_pre_release(identifier)
         new_version = new_version.up(:pre_release) if new_version.pre_release.name == version.pre_release.name && new_version == version
       end
@@ -75,11 +77,11 @@ module Verto
       command_error!(
         <<~TEXT
         New version(#{new_version}) can't be equal or lower than latest version(#{latest_version})
-        run up --pre-release with --patch, --minor or --major (eg: verto tag up --pre-release --patch),
+        run up --pre-release with --patch, --minor or --major (eg: verto tag up --patch --pre-release=rc),
         add filters (eg: verto tag up --pre-release --filter=pre_release_only)
         or disable tag validation in Vertofile with config.version.validations.new_version_must_be_bigger = false
         TEXT
-      ) if new_version < latest_version
+      ) if new_version < latest_version && Verto.config.version.validations.new_version_must_be_bigger
     end
 
     def validate_version_option_presence!
@@ -104,5 +106,14 @@ module Verto
     def version_prefix
       options[:version_prefix] || Verto.config.version.prefix
     end
+
+    def load_config_hooks!
+      Verto.config.hooks.prepend Verto::DSL::BuiltInHooks::GitPullCurrentBranch if Verto.config.git.pull_before_tag_creation
+      Verto.config.hooks << Verto::DSL::BuiltInHooks::GitPushCurrentBranch if Verto.config.git.push_after_tag_creation
+    end
+
+    def default_identifier
+      Verto.config.pre_release.default_identifier
+    end
   end
 end

data/lib/verto/dsl/built_in_hooks.rb

@@ -0,0 +1,22 @@
+module Verto
+  module DSL
+    module BuiltInHooks
+      GitPullCurrentBranch = DSL::Hook.new(moment: :before) do
+        git!("pull origin #{current_branch}")
+      end
+
+      GitPushTags = DSL::Hook.new(moment: :after) do
+        git!("push --tags")
+      end
+
+      GitPushCurrentBranchCommits = DSL::Hook.new(moment: :after) do
+        git!("push origin #{current_branch}")
+      end
+
+      GitPushCurrentBranch = DSL::Hook.new(moment: :after) do
+        GitPushTags.call
+        GitPushCurrentBranchCommits.call
+      end
+    end
+  end
+end

data/lib/verto/dsl/syntax.rb

@@ -55,17 +55,13 @@ module Verto
       end
 
       def sh!(command, output: :from_config)
-        raise Verto::ExitError unless sh(command, output: output).success?
+        raise Verto::ExitError, command unless sh(command, output: output).success?
       end
 
       def command_options
         Verto.config.command_options
       end
 
-      def on(moment, &block)
-        Verto.config.hooks << Hook.new(moment: moment, &block)
-      end
-
       def before(&block)
         Verto.config.hooks << Hook.new(moment: :before, &block)
       end
@@ -74,14 +70,48 @@ module Verto
         Verto.config.hooks << Hook.new(moment: :after, &block)
       end
 
+      def on(moment, &block)
+        deprecate('on', use: 'before_tag_creation')
+
+        Verto.config.hooks << Hook.new(moment: moment, &block)
+      end
+
       def before_command(command_name, &block)
+        deprecate('before_command', use: 'before_command_tag_up')
+
         Verto.config.hooks << Hook.new(moment: "before_#{command_name}", &block)
       end
 
       def after_command(command_name, &block)
+        deprecate('after_command', use: 'after_command_tag_up')
+
         Verto.config.hooks << Hook.new(moment: "after_#{command_name}", &block)
       end
 
+      def before_command_tag_up(&block)
+        Verto.config.hooks << Hook.new(moment: 'before_tag_up', &block)
+      end
+
+      def after_command_tag_up(&block)
+        Verto.config.hooks << Hook.new(moment: 'after_tag_up', &block)
+      end
+
+      def before_tag_creation(&block)
+        Verto.config.hooks << Hook.new(moment: 'before_tag_creation', &block)
+      end
+
+      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
+          raise ExitError, 'update_changelog is only supported in before_tag_creation or after_command_tag_up'
+        end
+
+        UpdateChangelog.new.call(with: with,
+                                 new_version: new_version,
+                                 confirmation: confirmation,
+                                 filename: filename)
+      end
+
       def file(filepath)
         DSL::File.new(filepath)
       end
@@ -90,8 +120,9 @@ module Verto
         ENV[environment_name]
       end
 
+      # TODO: Use delegator
       def confirm(text)
-        shell_basic.yes?("#{text} (y/n)")
+        CliHelpers.confirm(text)
       end
 
       def error(text)
@@ -110,16 +141,12 @@ module Verto
         @executors ||= {
           from_config: Verto::SystemCommandExecutor.new,
           true => Verto::SystemCommandExecutor.new(stdout: $stdout, stderr: $stderr),
-          false => Verto::SystemCommandExecutor.new(stdout: nil, stderr: nil),
+          false => Verto::SystemCommandExecutor.new(stdout: nil, stderr: nil)
         }
 
         @executors[output]
       end
 
-      def shell_basic
-        @shell_basic ||= Thor::Shell::Basic.new
-      end
-
       def stderr
         Verto.stderr
       end
@@ -135,6 +162,10 @@ module Verto
 
         SemanticVersion.new(tag_version)
       end
+
+      def deprecate(current, use:)
+        warn "[DEPRECATED] `#{current}` is deprecated and will be removed in a future release, use `#{use}` instead"
+      end
     end
   end
 end

data/lib/verto/dsl/update_changelog.rb

@@ -0,0 +1,56 @@
+module Verto
+  module DSL
+    class UpdateChangelog
+      include Verto.import[:cli_helpers, :stdout,
+                           executor: 'system_command_executor_without_output', changelog_format: 'changelog.format']
+
+      InvalidChangelogSource = Class.new(Verto::ExitError)
+
+      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
+        },
+        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)
+        verify_file_presence!(filename)
+
+        stdout.puts separator
+        changelog_changes = format_changes(new_version, version_changes(with))
+
+        exit if confirmation && !cli_helpers.confirm("Create new Realease?\n" \
+                                                     "#{separator}\n" \
+                                                     "#{changelog_changes}" \
+                                                     "#{separator}\n")
+        update_file(filename, changelog_changes)
+      end
+
+      private
+
+      def verify_file_presence!(filename)
+        raise Verto::ExitError, "changelog file '#{filename}' doesnt exist" unless Verto.project_path.join(filename).exist?
+      end
+
+      def version_changes(with)
+        SOURCES[with].call(executor)
+      end
+
+      def update_file(filename, changelog_changes)
+        DSL::File.new(filename).prepend(changelog_changes)
+      end
+
+      def format_changes(new_version, version_changes)
+        Mustache.render(changelog_format, { new_version: new_version, version_changes: version_changes }) + "\n"
+      end
+
+      def separator
+        '---------------------------'
+      end
+    end
+  end
+end

data/lib/verto/utils/cli_helpers.rb

@@ -0,0 +1,13 @@
+module CliHelpers
+  class << self
+    def confirm(text)
+      shell_basic.yes?("#{text} (y/n)")
+    end
+
+    private
+
+    def shell_basic
+      @shell_basic ||= Thor::Shell::Basic.new
+    end
+  end
+end

data/lib/verto/utils/strict_hash.rb

@@ -0,0 +1,7 @@
+class StrictHash < Hash
+  def initialize(hash, default_proc: nil)
+    super()
+    self.default_proc = default_proc if default_proc
+    merge!(hash)
+  end
+end

data/lib/verto/utils/templates/Vertofile

@@ -1,36 +1,40 @@
-verto_version '0.6.0'
+verto_version '0.10.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.push_after_tag_creation = true # Push changes after tag creation
+
+ ## CHANGELOG FORMAT
+ ## Verto uses Mustache template rendering to render changelog updates, the default value is:
+ ##
+ ##   ## {{new_version}} - #{Time.now.strftime('%d/%m/%Y')}
+ ##       {{#version_changes}}
+ ##       * {{.}}
+ ##       {{/version_changes}}
+ ##
+ ## A custom format can be specified, eg:
+ # changelog.format =  <<~CHANGELOG
+ #                       ## {{new_version}}
+ #                        {{#version_changes}}
+ #                        * {{.}}
+ #                        {{/version_changes}}
+ #                      CHANGELOG}
 }
 
 context(branch('master')) {
-  before_command('tag_up') {
-    git!('pull origin master')
+  before_command_tag_up {
     command_options.add(filter: 'release_only')
   }
 
-  on('before_tag_creation') {
-
-    version_changes = ""
-    # Uncomment to get Merged PRs Titles as changes to add in CHANGELOG.
-    # version_changes = sh(
-    #  %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:]]*\[.*\]" | sed 's/^[[:space:]]*\(.*\)/ * \1/'#, output: false
-    # ).output
-
-    puts "---------------------------"
-    version_changes = "## #{new_version} - #{Time.now.strftime('%d/%m/%Y')}\n#{version_changes}\n"
-    exit unless confirm("Create new Realease?\n" \
-      "---------------------------\n" \
-      "#{version_changes}" \
-      "---------------------------\n"
-    )
-
-    # CHANGELOG
-    file('CHANGELOG.md').prepend(version_changes)
-    git('add CHANGELOG.md')
+  before_tag_creation{
+    # Uncomment to update CHANGELOG file
+    # update_changelog(with: :merged_pull_requests_with_bracketed_labels,
+    #                  confirmation: true,
+    #                  filename: 'CHANGELOG.md')
+    # git('add CHANGELOG.md')
 
     # Uncomment to update the version in other files, like package.json
     # file('package.json').replace(/"(\d+)\.(\d+)\.(\d+)(-?.*)"/, %Q{"#{new_version}"})
@@ -38,29 +42,23 @@ context(branch('master')) {
 
     git('commit -m "Updates CHANGELOG"')
   }
-
-  after_command('tag_up') {
-    git('push --tags')
-    git('push origin master')
-  }
 }
 
 # Uncomment to get a specific pre_release proccess, like a staging or qa branch
 # context(branch('staging')) {
-#  before_command('tag_up') {
+#  before_command_tag_up {
 #    git!('pull origin staging')
 #    command_options.add(pre_release: 'rc')
 #  }
 #
-#  on('before_tag_creation') {
+#  before_tag_creation {
 #    file('package.json').replace(/"(\d+)\.(\d+)\.(\d+)(-?.*)"/, %Q{"#{new_version}"}) # Atualiza versão do package.json
 #    git('add package.json')
 #    git('commit --allow-empty -m "Staging Release"')
 #  }
 
-#  after_command('tag_up') {
-#    git('push --tags')
-#    git('push origin staging')
+#  after_command_tag_up {
+#    sh('some command')
 #  }
 #}
 

data/lib/verto/version.rb

@@ -1,3 +1,3 @@
 module Verto
-  VERSION = "0.6.0"
+  VERSION = "0.10.0"
 end

data/verto.gemspec

@@ -13,9 +13,9 @@ Gem::Specification.new do |spec|
   spec.license       = "MIT"
 
 
-  # spec.metadata["homepage_uri"] = spec.homepage
-  # spec.metadata["source_code_uri"] = "TODO: Put your gem's public repo URL here."
-  # spec.metadata["changelog_uri"] = "TODO: Put your gem's CHANGELOG.md URL here."
+  spec.metadata["homepage_uri"] = spec.homepage
+  spec.metadata["source_code_uri"] = "https://github.com/catks/verto"
+  spec.metadata["changelog_uri"] = "https://github.com/catks/verto/blob/master/CHANGELOG.md"
 
   # Specify which files should be added to the gem when it is released.
   # The `git ls-files -z` loads the files in the RubyGem that have been added into git.
@@ -31,6 +31,7 @@ Gem::Specification.new do |spec|
   spec.add_dependency             "dry-container", "~> 0.7"
   spec.add_dependency             "dry-auto_inject", "~> 0.7"
   spec.add_dependency             "vseries", "~> 0.2"
+  spec.add_dependency             "mustache", "~> 1.1.1"
 
   spec.add_development_dependency "byebug"
   spec.add_development_dependency "bundler", "~> 2.0"

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: verto
 version: !ruby/object:Gem::Version
-  version: 0.6.0
+  version: 0.10.0
 platform: ruby
 authors:
 - Carlos Atkinson
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2020-04-15 00:00:00.000000000 Z
+date: 2021-01-11 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: thor
@@ -80,6 +80,20 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: '0.2'
+- !ruby/object:Gem::Dependency
+  name: mustache
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: 1.1.1
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: 1.1.1
 - !ruby/object:Gem::Dependency
   name: byebug
   requirement: !ruby/object:Gem::Requirement
@@ -172,6 +186,7 @@ files:
 - Vertofile
 - bin/console
 - bin/setup
+- djin.yml
 - docker-entrypoint.sh
 - exe/verto
 - lib/verto.rb
@@ -179,13 +194,17 @@ files:
 - lib/verto/commands/main_command.rb
 - lib/verto/commands/tag_command.rb
 - lib/verto/dsl.rb
+- lib/verto/dsl/built_in_hooks.rb
 - lib/verto/dsl/file.rb
 - lib/verto/dsl/hook.rb
 - lib/verto/dsl/interpreter.rb
 - lib/verto/dsl/syntax.rb
+- lib/verto/dsl/update_changelog.rb
 - lib/verto/repositories/tag_repository.rb
+- lib/verto/utils/cli_helpers.rb
 - lib/verto/utils/command_options.rb
 - lib/verto/utils/semantic_version.rb
+- lib/verto/utils/strict_hash.rb
 - lib/verto/utils/system_command_executor.rb
 - lib/verto/utils/tag_filter.rb
 - lib/verto/utils/template.rb
@@ -195,7 +214,10 @@ files:
 homepage: https://github.com/catks/verto
 licenses:
 - MIT
-metadata: {}
+metadata:
+  homepage_uri: https://github.com/catks/verto
+  source_code_uri: https://github.com/catks/verto
+  changelog_uri: https://github.com/catks/verto/blob/master/CHANGELOG.md
 post_install_message: 
 rdoc_options: []
 require_paths: