verto 0.6.1 → 0.10.1

data/bin/console

@@ -1,7 +1,8 @@
 #!/usr/bin/env ruby
+# frozen_string_literal: true
 
-require "bundler/setup"
-require "verto"
+require 'bundler/setup'
+require 'verto'
 
 # You can add fixtures and/or initialization code here to make experimenting
 # with your gem easier. You can also use a different console, if you like.
@@ -10,5 +11,5 @@ require "verto"
 # require "pry"
 # Pry.start
 
-require "irb"
+require 'irb'
 IRB.start(__FILE__)

data/djin.yml

@@ -0,0 +1,37 @@
+djin_version: '0.10.0'
+
+tasks:
+  run:
+    local:
+      run:
+        - {{args}}
+
+  set_verto_version:
+    local:
+      run:
+        - VERTO_BUILD_VERSION=$(cat lib/verto/version.rb | grep -ohE '\d+\.\d+\.\d+')
+
+  tag_up:
+    docker:
+      image: "catks/verto:0.10.0"
+      run:
+        commands:
+          - "verto tag up {{args}}"
+        options: |
+          -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 \
+          --entrypoint='' \
+    depends_on:
+      - set_verto_version
+
+  release:
+    local:
+      run:
+        - bundle exec rake release
+        - docker build . -t verto
+        - docker tag verto catks/verto:$VERTO_BUILD_VERSION
+        - docker push catks/verto:$VERTO_BUILD_VERSION
+    depends_on:
+      - set_verto_version
+      - tag_up

data/exe/verto

@@ -1,17 +1,19 @@
 #!/usr/bin/env ruby
+# frozen_string_literal: true
+
+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)
+  Verto::DSL.load_file(vertofile_path) if File.exist?(vertofile_path)
 
   Verto::MainCommand.start(ARGV)
 
 # TODO: Improve error Message Handling
-rescue Verto::ExitError => ex
-  Verto.stderr.puts ex.message
+rescue Verto::ExitError => e
+  Verto.stderr.puts e.message
   Verto.stderr.puts 'Exiting Verto...'
   exit 1
 end

data/lib/verto.rb

@@ -1,18 +1,22 @@
-require "thor"
-require "dry-container"
-require "dry-configurable"
-require "dry-auto_inject"
-require "vseries"
-require "pathname"
+# frozen_string_literal: true
 
-require "verto/version"
-require "verto/utils/command_options"
+require 'thor'
+require 'dry-container'
+require 'dry-configurable'
+require 'dry-auto_inject'
+require 'vseries'
+require 'mustache'
+require 'pathname'
+
+require 'verto/version'
+require 'verto/utils/command_options'
 
 module Verto
   extend Dry::Configurable
 
   setting :pre_release do
     setting :initial_number, 1
+    setting :default_identifier, 'rc'
   end
 
   setting :project do
@@ -26,6 +30,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, []
@@ -45,7 +67,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 }
 
@@ -63,6 +88,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,18 +106,30 @@ 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/commands/base_command"
-require "verto/commands/tag_command"
-require "verto/commands/main_command"
-require "verto/repositories/tag_repository"
+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'
+require 'verto/repositories/tag_repository'

data/lib/verto/commands/base_command.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 module Verto
   class BaseCommand < Thor
     def self.exit_on_failure?
@@ -23,8 +25,11 @@ 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) }
+             .select { |hook| hook.moment == moment.to_sym }
+             .each do |hook|
+          Verto.current_moment = hook.moment
+          hook.call(with_attributes: with_attributes)
+        end
       end
     end
   end

data/lib/verto/commands/main_command.rb

@@ -1,9 +1,11 @@
+# frozen_string_literal: true
+
 module Verto
   class MainCommand < BaseCommand
-    desc "tag SUBCOMMAND ...ARGS", "manage the repository tags"
+    desc 'tag SUBCOMMAND ...ARGS', 'manage the repository tags'
     subcommand 'tag', Verto::TagCommand
 
-    desc "init", "Initialize a Vertofile in your repository"
+    desc 'init', 'Initialize a Vertofile in your repository'
 
     option :path, type: :string, default: nil
     def init
@@ -14,7 +16,7 @@ module Verto
       Template.render('Vertofile', to: path)
     end
 
-    desc "version", "Shows Verto version"
+    desc 'version', 'Shows Verto version'
 
     def version
       Verto.stdout.puts Verto::VERSION
@@ -23,12 +25,14 @@ module Verto
     private
 
     def validate_current_vertofile!(path)
+      return unless Pathname.new(path).join('Vertofile').exist?
+
       command_error!(
         <<~ERROR
-         Project already have a Vertofile.
-         If you want to generate a new with verto init, delete the current one with: `rm Vertofile`
+          Project already have a Vertofile.
+          If you want to generate a new with verto init, delete the current one with: `rm Vertofile`
         ERROR
-      ) if Pathname.new(path).join('Vertofile').exist?
+      )
     end
   end
 end

data/lib/verto/commands/tag_command.rb

@@ -1,6 +1,8 @@
+# frozen_string_literal: true
+
 module Verto
   class TagCommand < BaseCommand
-    desc "up", "Create's a new tag"
+    desc 'up', "Create's a new tag"
 
     option :major, type: :boolean, default: false
     option :minor, type: :boolean, default: false
@@ -11,7 +13,9 @@ module Verto
     option :version_prefix, type: :string, default: nil
 
     def up
-      call_hooks(%i[before before_tag_up], with_attributes: { command_options: options} )
+      load_config_hooks!
+
+      call_hooks(%i[before before_tag_up], with_attributes: { command_options: options })
 
       validate_version_option_presence!
 
@@ -25,7 +29,7 @@ module Verto
 
       validate_new_version!(new_version, latest_version)
 
-      call_hooks(:before_tag_creation, with_attributes: { new_version: new_version } )
+      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}")
@@ -40,20 +44,20 @@ 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) & %i[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
+        if new_version.pre_release.name == version.pre_release.name && new_version == version
+          new_version = new_version.up(:pre_release)
+        end
       end
 
-      if options[:release]
-        new_version = new_version.release_version
-      end
+      new_version = new_version.release_version if options[:release]
 
       new_version
     end
@@ -63,38 +67,44 @@ module Verto
     end
 
     def validate_latest_tag!(latest_tag)
+      return if latest_tag
+
       command_error!(
         <<~TEXT
           Project doesn't have a previous tag version, create a new tag with git.
           eg: `git tag #{version_prefix}0.1.0`
         TEXT
-      ) unless latest_tag
+      )
     end
 
     def validate_new_version!(new_version, latest_version)
+      return unless new_version < latest_version && Verto.config.version.validations.new_version_must_be_bigger
+
       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),
-        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
+          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 --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
+      )
     end
 
     def validate_version_option_presence!
+      return if options[:major] || options[:minor] || options[:patch] || options[:pre_release] || options[:release]
+
       command_error!(
         <<~TEXT
-        You must specify the version number to be increased, use the some of the options(eg: --major, --minor, --patch, --pre_release=rc)
-        or configure a Vertofile to specify a default option for current context, eg:
+          You must specify the version number to be increased, use the some of the options(eg: --major, --minor, --patch, --pre_release=rc)
+          or configure a Vertofile to specify a default option for current context, eg:
 
-        context('qa') {
-          before_command('tag_up') {
-            command_options.add(pre_release: 'rc')
+          context('qa') {
+            before_command('tag_up') {
+              command_options.add(pre_release: 'rc')
+            }
           }
-        }
         TEXT
-      ) unless options[:major] || options[:minor] || options[:patch] || options[:pre_release] || options[:release]
+      )
     end
 
     def load_filter
@@ -104,5 +114,16 @@ module Verto
     def version_prefix
       options[:version_prefix] || Verto.config.version.prefix
     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
+    end
+
+    def default_identifier
+      Verto.config.pre_release.default_identifier
+    end
   end
 end

data/lib/verto/dsl.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 module Verto
   module DSL
     def self.load_file(filepath)

data/lib/verto/dsl/built_in_hooks.rb

@@ -0,0 +1,24 @@
+# frozen_string_literal: true
+
+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/file.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 module Verto
   module DSL
     class File
@@ -36,8 +38,8 @@ module Verto
         end
       end
 
-      alias_method :gsub, :replace_all
-      alias_method :sub, :replace
+      alias gsub replace_all
+      alias sub replace
 
       private
 

data/lib/verto/dsl/hook.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 module Verto
   module DSL
     class Hook