verto 0.6.1 → 0.10.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 3f133ca9770197a96c51bf790c7ad1370b16927a6a651ef8392b04bfb58d894d
-  data.tar.gz: 7b30716c515ebf40d095bf7e0a684de630c10fdba522a4f9273722d2bc748803
+  metadata.gz: 9185dc3395380b1defa2ec58cc79067e4f94c3fb612067eb7b2f57c422599f85
+  data.tar.gz: e2f144854a7acce5c07f32faa407ec11b45f855b0bfa4ceb4fbafb8329a86a4a
 SHA512:
-  metadata.gz: a9c790091841b1f6825ac130f9f3b0affc84acd8856fa385a76a06603d9fdaa8768b4a8a72833146a2b44033cfafdaf724d9c73031ba4299b252e42cd415a7f0
-  data.tar.gz: 7ad45eacb814408b1a99064ca3e6419d818969b607c591f50d5f89ff3ab2274f39b4513458b513536f41e533daca77ba73266b9462a14ac958b351b644a5e948
+  metadata.gz: 45f95bbbc09c4b64c65071fa24aa1641c0b3180ce06aee785f23a4e02bde95f6c77291e7c00974faba90d861dd107cf95149643af24d99da32c022f5c5050e1c
+  data.tar.gz: abe98354760214070d5a3b7422b1f6a1706bae93d4812f1e5913bbfa7901f3d45bf5e8aaed0d21fbe58d6e858d8ec5b4d8e06133d463bfe0cb72c4a9938dbbdc

data/.github/workflows/ruby.yml

@@ -0,0 +1,51 @@
+name: Ruby
+
+on: [push]
+
+jobs:
+  build:
+    runs-on: ubuntu-16.04
+    strategy:
+      matrix:
+        ruby: ['2.5', '2.6', '2.7']
+    name: Ruby ${{ matrix.ruby }}
+    steps:
+      - uses: actions/checkout@v2
+      - uses: actions/setup-ruby@v1
+        with:
+          ruby-version: ${{ matrix.ruby }}
+
+      - name: Setup Code Climate test-reporter
+        run: |
+          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
+
+      - name: Install Gems
+        run: |
+          gem install bundler
+          bundle install --jobs 4 --retry 3
+
+      - name: Run tests
+        run: |
+          git config --global user.email "github_actions@test.com"
+          git config --global user.name "Github Actions Test"
+          bundle exec rake
+
+      - name: Publish code coverage
+        run: |
+          export GIT_BRANCH="${GITHUB_REF/refs\/heads\//}"
+          ./cc-test-reporter after-build -r ${{secrets.CC_TEST_REPORTER_ID}}
+
+  lint:
+    runs-on: ubuntu-16.04
+    name: Lint
+    steps:
+      - uses: actions/checkout@v2
+      - uses: actions/setup-ruby@v1
+        with:
+          ruby-version: '2.5'
+      - run: |
+          gem install bundler
+          bundle install --jobs 4 --retry 3
+          bundle exec rubocop

data/.rubocop.yml

@@ -0,0 +1,23 @@
+# TODO: Remove and use pronto
+inherit_from: .rubocop_todo.yml
+
+# The behavior of RuboCop can be controlled via the .rubocop.yml
+# configuration file. It makes it possible to enable/disable
+# certain cops (checks) and to alter their behavior if they accept
+# any parameters. The file can be placed either in your home
+# directory or in some project directory.
+#
+# RuboCop will start looking for the configuration file in the directory
+# where the inspected file is and continue its way up to the root directory.
+#
+# See https://docs.rubocop.org/rubocop/configuration
+AllCops:
+  TargetRubyVersion: 2.5
+
+Metrics/BlockLength:
+  Exclude:
+    - 'spec/**/*.rb'
+    - verto.gemspec
+
+Style/Documentation:
+  Enabled: false

data/.rubocop_todo.yml

@@ -0,0 +1,50 @@
+# This configuration was generated by
+# `rubocop --auto-gen-config --auto-gen-only-exclude --exclude-limit 2000`
+# on 2020-10-16 18:48:37 UTC using RuboCop version 0.93.1.
+# The point is for the user to remove these configuration records
+# one by one as the offenses are removed from the code base.
+# Note that changes in the inspected code, or installation of new
+# versions of RuboCop, may require this file to be generated again.
+
+# Offense count: 4
+# Configuration parameters: IgnoredMethods, Max.
+Metrics/AbcSize:
+  Exclude:
+    - 'lib/verto.rb'
+    - 'lib/verto/commands/tag_command.rb'
+    - 'lib/verto/utils/system_command_executor.rb'
+
+# Offense count: 1
+# Configuration parameters: IgnoredMethods, Max.
+Metrics/CyclomaticComplexity:
+  Exclude:
+    - 'lib/verto/commands/tag_command.rb'
+
+# Offense count: 4
+# Configuration parameters: CountComments, Max, CountAsOne, ExcludedMethods.
+Metrics/MethodLength:
+  Exclude:
+    - 'lib/verto.rb'
+    - 'lib/verto/commands/tag_command.rb'
+
+# Offense count: 1
+# Configuration parameters: CountComments, Max, CountAsOne.
+Metrics/ModuleLength:
+  Exclude:
+    - 'lib/verto/dsl/syntax.rb'
+
+# Offense count: 1
+# Configuration parameters: IgnoredMethods, Max.
+Metrics/PerceivedComplexity:
+  Exclude:
+    - 'lib/verto/commands/tag_command.rb'
+
+# Offense count: 5
+# Cop supports --auto-correct.
+# Configuration parameters: AutoCorrect, Max, AllowHeredoc, AllowURI, URISchemes, IgnoreCopDirectives, IgnoredPatterns.
+# URISchemes: http, https
+Layout/LineLength:
+  Exclude:
+    - 'lib/verto/dsl/syntax.rb'
+    - 'lib/verto/dsl/update_changelog.rb'
+    - 'lib/verto/repositories/tag_repository.rb'

data/.ruby-version

@@ -1 +1 @@
-2.6.5
+2.6.6

data/CHANGELOG.md

@@ -1,3 +1,20 @@
+## 0.10.1 - 14/01/2021
+ * [FIX] UpdateChangelog Versions
+ * [TECH] Adds Rubocop
+ * [TECH] Github Actions CI
+
+## 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
 

data/Gemfile

@@ -1,4 +1,6 @@
-source "https://rubygems.org"
+# frozen_string_literal: true
+
+source 'https://rubygems.org'
 
 # Specify your gem's dependencies in verto.gemspec
 gemspec

data/Gemfile.lock

@@ -1,33 +1,41 @@
 PATH
   remote: .
   specs:
-    verto (0.6.1)
+    verto (0.10.1)
       dry-auto_inject (~> 0.7)
       dry-configurable (~> 0.8)
       dry-container (~> 0.7)
+      mustache (~> 1.1.1)
       thor (~> 1.0.1)
       vseries (~> 0.2)
 
 GEM
   remote: https://rubygems.org/
   specs:
+    ast (2.4.1)
     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.12.0)
       concurrent-ruby (~> 1.0)
-      dry-core (~> 0.4, >= 0.4.7)
-      dry-equalizer (~> 0.2)
+      dry-core (~> 0.5, >= 0.5.0)
     dry-container (0.7.2)
       concurrent-ruby (~> 1.0)
       dry-configurable (~> 0.1, >= 0.1.3)
-    dry-core (0.4.9)
+    dry-core (0.5.0)
       concurrent-ruby (~> 1.0)
-    dry-equalizer (0.3.0)
+    json (2.3.1)
+    mustache (1.1.1)
+    parallel (1.19.2)
+    parser (2.7.2.0)
+      ast (~> 2.4.1)
+    rainbow (3.0.0)
     rake (13.0.1)
+    regexp_parser (1.8.2)
+    rexml (3.2.4)
     rspec (3.9.0)
       rspec-core (~> 3.9.0)
       rspec-expectations (~> 3.9.0)
@@ -41,11 +49,25 @@ GEM
       diff-lcs (>= 1.2.0, < 2.0)
       rspec-support (~> 3.9.0)
     rspec-support (3.9.2)
-    simplecov (0.18.5)
+    rubocop (0.93.1)
+      parallel (~> 1.10)
+      parser (>= 2.7.1.5)
+      rainbow (>= 2.2.2, < 4.0)
+      regexp_parser (>= 1.8)
+      rexml
+      rubocop-ast (>= 0.6.0)
+      ruby-progressbar (~> 1.7)
+      unicode-display_width (>= 1.4.0, < 2.0)
+    rubocop-ast (0.8.0)
+      parser (>= 2.7.1.5)
+    ruby-progressbar (1.10.1)
+    simplecov (0.17.1)
       docile (~> 1.1)
-      simplecov-html (~> 0.11)
-    simplecov-html (0.12.2)
+      json (>= 1.8, < 3)
+      simplecov-html (~> 0.10.0)
+    simplecov-html (0.10.2)
     thor (1.0.1)
+    unicode-display_width (1.7.0)
     vseries (0.2.0)
 
 PLATFORMS
@@ -56,7 +78,8 @@ DEPENDENCIES
   byebug
   rake (~> 13.0)
   rspec (~> 3.0)
-  simplecov (~> 0.18.0)
+  rubocop
+  simplecov (~> 0.17.0)
   verto!
 
 BUNDLED WITH

data/README.md

@@ -1,5 +1,5 @@
 # Verto
-[![Build Status](https://travis-ci.org/catks/verto.svg?branch=master)](https://travis-ci.org/catks/verto)
+![Build](https://github.com/catks/verto/workflows/Ruby/badge.svg)
 [![Maintainability](https://api.codeclimate.com/v1/badges/b699d13df33e33bbe2d0/maintainability)](https://codeclimate.com/github/catks/verto/maintainability)
 [![Test Coverage](https://api.codeclimate.com/v1/badges/39e7c6f1f5f57b8555ed/test_coverage)](https://codeclimate.com/github/catks/verto/test_coverage)\
 Verto is a CLI to generate git tags (following the [Semantic Versioning](https://semver.org/) system)
@@ -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.1'
+alias verto='docker run --rm -v $(pwd):/usr/src/project -it catks/verto:0.10.1'
 ```
 
 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.1'
+alias verto='docker run --rm -v ~/.gitconfig:/etc/gitconfig -v $(pwd):/usr/src/project -v $HOME/.ssh/known_hosts:/root/.ssh/known_hosts -it catks/verto:0.10.1'
 
 ```
 
-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.1'
-
-```
-
-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.1'
+alias verto='docker run --rm -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.1'
 
 ```
 
@@ -93,72 +85,75 @@ You can create a new Vertofile with `verto init` or following the next example:
 ```ruby
 # Vertofile
 
-verto_version '0.6.1'
+verto_version '0.10.1'
 
 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/Rakefile

@@ -1,11 +1,13 @@
-require "bundler/gem_tasks"
-require "rspec/core/rake_task"
-require_relative "lib/verto"
-require_relative "spec/helpers/test_repo.rb"
+# frozen_string_literal: true
+
+require 'bundler/gem_tasks'
+require 'rspec/core/rake_task'
+require_relative 'lib/verto'
+require_relative 'spec/helpers/test_repo.rb'
 
 RSpec::Core::RakeTask.new(:spec)
 
-task :default => :spec
+task default: :spec
 
 desc 'Verto REPL'
 task :console do

data/Vertofile

@@ -1,32 +1,18 @@
-verto_version '0.5.0'
+verto_version '0.10.1'
 
 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,7 +22,9 @@ 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')
@@ -44,12 +32,4 @@ context(branch('master')) {
 
     git!('commit -m "Bumps Version"')
   }
-
-  after_command('tag_up') {
-    exit
-    git!('push --tags')
-    git!('push origin master')
-    sh!('rake release')
-  }
 }
-