verto 0.9.0 → 0.12.0

data/lib/verto/utils/templates/Vertofile

@@ -1,37 +1,41 @@
-verto_version '0.9.0'
+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
+ ## 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')
     command_options.add(filter: 'release_only')
   }
 
-  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}"})
@@ -39,11 +43,6 @@ 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
@@ -60,13 +59,12 @@ context(branch('master')) {
 #  }
 
 #  after_command_tag_up {
-#    git('push --tags')
-#    git('push origin staging')
+#    sh('some command')
 #  }
 #}
 
 # Uncomment to block tag creation in other branchs
 #context(!branch('master', 'staging')) {
-#  error "Tags only can be created in master or staging branch"
+#  error 'Tags only can be created in master or staging branch'
 #  exit
 #}

data/lib/verto/version.rb

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

data/lib/verto.rb

@@ -1,12 +1,18 @@
-require "thor"
-require "dry-container"
-require "dry-configurable"
-require "dry-auto_inject"
-require "vseries"
-require "pathname"
-
-require "verto/version"
-require "verto/utils/command_options"
+# frozen_string_literal: true
+
+require 'thor'
+require 'dry-container'
+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'
 
 module Verto
   extend Dry::Configurable
@@ -35,6 +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
   end
 
   setting :hooks, []
@@ -44,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
@@ -54,7 +70,10 @@ module Verto
   def self.container
     @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('system_command_executor_without_output') do
+        SystemCommandExecutor.new(stdout: nil, stderr: nil)
+      end
+      container.register('cli_helpers') { CliHelpers }
 
       container.register('tag_repository') { TagRepository.new }
 
@@ -72,6 +91,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
 
@@ -86,19 +109,33 @@ 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/dsl"
-require "verto/dsl/syntax"
-require "verto/dsl/interpreter"
-require "verto/dsl/hook"
-require "verto/dsl/file"
-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"
+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'

data/verto.gemspec

@@ -1,40 +1,48 @@
-lib = File.expand_path("lib", __dir__)
+# frozen_string_literal: true
+
+lib = File.expand_path('lib', __dir__)
 $LOAD_PATH.unshift(lib) unless $LOAD_PATH.include?(lib)
-require "verto/version"
+require 'verto/version'
 
 Gem::Specification.new do |spec|
-  spec.name          = "verto"
+  spec.name          = 'verto'
   spec.version       = Verto::VERSION
-  spec.authors       = ["Carlos Atkinson"]
-  spec.email         = ["carlos.atks@gmail.com"]
-
-  spec.summary       = %q{Verto helps you to versionate your project}
-  spec.homepage      = "https://github.com/catks/verto"
-  spec.license       = "MIT"
+  spec.authors       = ['Carlos Atkinson']
+  spec.email         = ['carlos.atks@gmail.com']
 
+  spec.summary       = 'Verto helps you to versionate your project'
+  spec.homepage      = 'https://github.com/catks/verto'
+  spec.license       = 'MIT'
 
-  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"
+  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.
-  spec.files         = Dir.chdir(File.expand_path('..', __FILE__)) do
+  spec.files = Dir.chdir(File.expand_path(__dir__)) do
     `git ls-files -z`.split("\x0").reject { |f| f.match(%r{^(test|spec|features)/}) }
   end
-  spec.bindir        = "exe"
+  spec.bindir        = 'exe'
   spec.executables   = spec.files.grep(%r{^exe/}) { |f| File.basename(f) }
-  spec.require_paths = ["lib"]
+  spec.require_paths = ['lib']
+  spec.required_ruby_version = '>= 2.5'
 
-  spec.add_dependency             "thor", "~> 1.0.1"
-  spec.add_dependency             "dry-configurable", "~> 0.8"
-  spec.add_dependency             "dry-container", "~> 0.7"
-  spec.add_dependency             "dry-auto_inject", "~> 0.7"
-  spec.add_dependency             "vseries", "~> 0.2"
+  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 "byebug"
-  spec.add_development_dependency "bundler", "~> 2.0"
-  spec.add_development_dependency "rake", "~> 13.0"
-  spec.add_development_dependency "rspec", "~> 3.0"
-  spec.add_development_dependency "simplecov", "~> 0.18.0"
+  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'
+  spec.add_development_dependency 'simplecov', '~> 0.17.0'
 end

metadata

@@ -1,71 +1,127 @@
 --- !ruby/object:Gem::Specification
 name: verto
 version: !ruby/object:Gem::Version
-  version: 0.9.0
+  version: 0.12.0
 platform: ruby
 authors:
 - Carlos Atkinson
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2020-08-08 00:00:00.000000000 Z
+date: 2021-10-28 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
-  name: thor
+  name: dry-auto_inject
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 1.0.1
+        version: 0.7.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 1.0.1
+        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-auto_inject
+  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
+    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: thor
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '0.7'
+        version: 1.0.1
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '0.7'
+        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
@@ -80,6 +136,20 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: '0.2'
+- !ruby/object:Gem::Dependency
+  name: bundler
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '2.0'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '2.0'
 - !ruby/object:Gem::Dependency
   name: byebug
   requirement: !ruby/object:Gem::Requirement
@@ -95,19 +165,19 @@ dependencies:
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
-  name: bundler
+  name: pry-byebug
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '2.0'
+        version: 3.9.0
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '2.0'
+        version: 3.9.0
 - !ruby/object:Gem::Dependency
   name: rake
   requirement: !ruby/object:Gem::Requirement
@@ -136,20 +206,34 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: '3.0'
+- !ruby/object:Gem::Dependency
+  name: rubocop
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: simplecov
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.18.0
+        version: 0.17.0
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.18.0
+        version: 0.17.0
 description: 
 email:
 - carlos.atks@gmail.com
@@ -158,10 +242,12 @@ executables:
 extensions: []
 extra_rdoc_files: []
 files:
+- ".github/workflows/ruby.yml"
 - ".gitignore"
 - ".rspec"
+- ".rubocop.yml"
+- ".rubocop_todo.yml"
 - ".ruby-version"
-- ".travis.yml"
 - CHANGELOG.md
 - Dockerfile
 - Gemfile
@@ -169,9 +255,11 @@ files:
 - LICENSE.txt
 - README.md
 - Rakefile
+- VERTO_SYNTAX.md
 - Vertofile
 - bin/console
 - bin/setup
+- djin.yml
 - docker-entrypoint.sh
 - exe/verto
 - lib/verto.rb
@@ -184,9 +272,15 @@ files:
 - lib/verto/dsl/hook.rb
 - 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
 - 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
@@ -208,7 +302,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
-      version: '0'
+      version: '2.5'
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="

data/.travis.yml

@@ -1,13 +0,0 @@
-sudo: false
-language: ruby
-rvm:
-  - 2.5
-  - 2.6
-  - 2.7
-before_install: gem install bundler -v 2.0.2
-before_script:
-    - curl -L https://codeclimate.com/downloads/test-reporter/test-reporter-latest-linux-amd64 > ./cc-test-reporter
-    - chmod +x ./cc-test-reporter
-    - ./cc-test-reporter before-build
-after_script:
-    - ./cc-test-reporter after-build --exit-code $TRAVIS_TEST_RESULT