verto 0.5.0 → 0.9.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 373195fc35ee48db23ce27dd6bc67105cb510761f7ea6eebe66a5f701bc86283
-  data.tar.gz: 296d975bf93678478a0b182265ec4c5d6f816d24b32520fcd9f1aadbf3f6999b
+  metadata.gz: bfde45c8eb00cd3302f89417e1302b90e2fd41a2fd49a5c402c6e29ec2e46fdf
+  data.tar.gz: d6822ed93c979646fc7c0064b39310a1a180ae632a92ea53b2a7b7841503c138
 SHA512:
-  metadata.gz: bc6dad7a9b95e58284c7f59ed6bfeccb27339fdf8f6125117cde49ad7cfa951d5927b2578f47cb0b83c3c719e52b6be046fe6b77e43aa07e3877d297b0496b26
-  data.tar.gz: 65d0d53a12a166ce5c890c2f1349a21ff43726f3158df7df402d3c6170d9f70bc1a26375194302c35d512474c5bbcf4ef172b74cc5ef92b82a41ab025255cb14
+  metadata.gz: f93afd8ec28cfcf7a6183d82570da5e5636f23ffd1387c111de3bbbbddae2db114b7022207a953f47e45020f6069024a1cdeffca419aec6fe0ca0d923583fc78
+  data.tar.gz: c07c60169151793d64806ae93851aabd649233f2d8364fe1aba2e896a57c89054dfd634d37b69554f934219420964f76ae3b932504b7964a2f3c14b9aeb8fe57

data/CHANGELOG.md

@@ -0,0 +1,15 @@
+## 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,7 +1,7 @@
 PATH
   remote: .
   specs:
-    verto (0.5.0)
+    verto (0.9.0)
       dry-auto_inject (~> 0.7)
       dry-configurable (~> 0.8)
       dry-container (~> 0.7)
@@ -17,7 +17,7 @@ GEM
     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)

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.4.1'
+alias verto='docker run -v $(pwd):/usr/src/project -it catks/verto:0.9.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.4.1'
+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.9.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.4.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.4.1'
+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.9.0'
 
 ```
 
@@ -93,22 +85,24 @@ You can create a new Vertofile with `verto init` or following the next example:
 ```ruby
 # Vertofile
 
-verto_version '0.4.1'
+verto_version '0.9.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
+}
 
 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 = ""
-    bitbucket_changes = sh(
+  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
-    version_changes = bitbucket_changes
-
 
     puts "---------------------------"
     version_changes = "## #{new_version} - #{Time.now.strftime('%d/%m/%Y')}\n#{version_changes}\n"
@@ -126,38 +120,33 @@ context(branch('master')) {
     # 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
 }
 ```
@@ -170,9 +159,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)
-  3. Configure tag prefix (eg: 'v' to generate v0.1.0)
-  4. Improve DSL Syntax Errors Messages(Ruby backtrace is printed currently)
-  5. Adds more specs and test coverage in CI
+  3. Adds more specs and test coverage in CI
 
 ## Contributing
 

data/Vertofile

@@ -0,0 +1,49 @@
+verto_version '0.7.0'
+
+config {
+  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 {
+    command_options.add(filter: 'release_only')
+  }
+
+  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)
+    git!('add CHANGELOG.md')
+
+    file('lib/verto/version.rb').replace(latest_version.to_s, new_version.to_s)
+    git!('add lib/verto/version.rb')
+
+    file('README.md').replace_all(latest_version.to_s, new_version.to_s)
+    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')
+
+    sh!('bundle install')
+    sh!('rake install')
+    git!('add Gemfile.lock')
+
+    git!('commit -m "Bumps Version"')
+  }
+}
+

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

@@ -13,6 +13,7 @@ module Verto
 
   setting :pre_release do
     setting :initial_number, 1
+    setting :default_identifier, 'rc'
   end
 
   setting :project do
@@ -24,6 +25,18 @@ module Verto
     setting :stderr_to, nil
   end
 
+  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 :hooks, []
   setting :command_options, CommandOptions.new
 
@@ -84,6 +97,7 @@ 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"

data/lib/verto/commands/main_command.rb

@@ -14,7 +14,7 @@ module Verto
       Template.render('Vertofile', to: path)
     end
 
-    desc "version", "Show Verto version"
+    desc "version", "Shows Verto version"
 
     def version
       Verto.stdout.puts Verto::VERSION

data/lib/verto/commands/tag_command.rb

@@ -8,8 +8,11 @@ module Verto
     option :pre_release, type: :string
     option :filter, type: :string
     option :release, type: :boolean, default: false
+    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!
@@ -26,9 +29,9 @@ module Verto
 
       call_hooks(:before_tag_creation, with_attributes: { new_version: new_version } )
 
-      stderr.puts "Creating Tag #{new_version}..."
-      tag_repository.create!(new_version.to_s)
-      stderr.puts "Tag #{new_version} Created!"
+      stderr.puts "Creating Tag #{version_prefix}#{new_version}..."
+      tag_repository.create!("#{version_prefix}#{new_version}")
+      stderr.puts "Tag #{version_prefix}#{new_version} Created!"
 
       call_hooks(:after_tag_up, with_attributes: { new_version: new_version })
       call_hooks(:after)
@@ -39,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
@@ -65,7 +68,7 @@ module Verto
       command_error!(
         <<~TEXT
           Project doesn't have a previous tag version, create a new tag with git.
-          eg: `git tag 0.1.0`
+          eg: `git tag #{version_prefix}0.1.0`
         TEXT
       ) unless latest_tag
     end
@@ -74,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!
@@ -99,5 +102,18 @@ module Verto
     def load_filter
       TagFilter.for(options[:filter]) || Regexp.new(options[:filter].to_s)
     end
+
+    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,36 @@ 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 file(filepath)
         DSL::File.new(filepath)
       end
@@ -135,6 +153,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/utils/templates/Vertofile

@@ -1,20 +1,25 @@
-verto_version '0.4.0'
+verto_version '0.9.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
+}
 
 context(branch('master')) {
-  before_command('tag_up') {
-    git!('origin master')
+  before_command_tag_up {
+    git!('pull origin master')
     command_options.add(filter: 'release_only')
   }
 
-  on('before_tag_creation') {
-
+  before_tag_creation{
     version_changes = ""
-    # Uncomment to get Bitbucket Merged PRs Titles as changes to add in CHANGELOG.
-    # bitbucket_changes = sh(
+    # 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
-    # version_changes = bitbucket_changes
-
 
     puts "---------------------------"
     version_changes = "## #{new_version} - #{Time.now.strftime('%d/%m/%Y')}\n#{version_changes}\n"
@@ -35,7 +40,7 @@ context(branch('master')) {
     git('commit -m "Updates CHANGELOG"')
   }
 
-  after_command('tag_up') {
+  after_command_tag_up {
     git('push --tags')
     git('push origin master')
   }
@@ -43,18 +48,18 @@ context(branch('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') {
+#  after_command_tag_up {
 #    git('push --tags')
 #    git('push origin staging')
 #  }

data/lib/verto/version.rb

@@ -1,3 +1,3 @@
 module Verto
-  VERSION = "0.5.0"
+  VERSION = "0.9.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.

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: verto
 version: !ruby/object:Gem::Version
-  version: 0.5.0
+  version: 0.9.0
 platform: ruby
 authors:
 - Carlos Atkinson
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2020-04-09 00:00:00.000000000 Z
+date: 2020-08-08 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: thor
@@ -162,12 +162,14 @@ files:
 - ".rspec"
 - ".ruby-version"
 - ".travis.yml"
+- CHANGELOG.md
 - Dockerfile
 - Gemfile
 - Gemfile.lock
 - LICENSE.txt
 - README.md
 - Rakefile
+- Vertofile
 - bin/console
 - bin/setup
 - docker-entrypoint.sh
@@ -177,6 +179,7 @@ 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
@@ -193,7 +196,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: