verto 0.6.1 → 0.7.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 3f133ca9770197a96c51bf790c7ad1370b16927a6a651ef8392b04bfb58d894d
-  data.tar.gz: 7b30716c515ebf40d095bf7e0a684de630c10fdba522a4f9273722d2bc748803
+  metadata.gz: cfd9726849a396c41f007f2fab517a0df8785a803abe7e1a0f9d612ad24b91bb
+  data.tar.gz: 7eb69cf6a56f0b754c83007ba047e916ce42cb093358b8b38284f5305ef04a64
 SHA512:
-  metadata.gz: a9c790091841b1f6825ac130f9f3b0affc84acd8856fa385a76a06603d9fdaa8768b4a8a72833146a2b44033cfafdaf724d9c73031ba4299b252e42cd415a7f0
-  data.tar.gz: 7ad45eacb814408b1a99064ca3e6419d818969b607c591f50d5f89ff3ab2274f39b4513458b513536f41e533daca77ba73266b9462a14ac958b351b644a5e948
+  metadata.gz: 79883291888bd50b34a5965fb70a6a1fb8b2dcfbb5f9b2d837253f7ee2484a09ba9f8087d783bfac4e0d9abbe3db86f9f2f5519699ad532a6d5e8b669944f103
+  data.tar.gz: 4db6f9d35a10d97de50b8f9e61c4dea72e1d3f8ff038bd915d34357d8b7bef4fd91cc17bb14220fa366f14b216fffd873bf7a3b810d5c8fa051a4873b1b5ba7a

data/CHANGELOG.md

@@ -1,3 +1,6 @@
+## 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.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    verto (0.6.1)
+    verto (0.7.0)
       dry-auto_inject (~> 0.7)
       dry-configurable (~> 0.8)
       dry-container (~> 0.7)

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.1'
+alias verto='docker run -v $(pwd):/usr/src/project -it catks/verto:0.7.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.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.7.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.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 -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.7.0'
 
 ```
 
@@ -93,20 +85,21 @@ You can create a new Vertofile with `verto init` or following the next example:
 ```ruby
 # Vertofile
 
-verto_version '0.6.1'
+verto_version '0.7.0'
 
 config {
  # version.prefix = 'v' # Adds a version_prefix
+ 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') {
+  before_command_tag_up {
     git!('origin master')
     command_options.add(filter: 'release_only')
   }
 
-  on('before_tag_creation') {
-
+  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
@@ -130,30 +123,26 @@ context(branch('master')) {
     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')
-  }
 }
 
 # Block tag creation in other branchs
@@ -171,7 +160,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,16 +1,17 @@
-verto_version '0.5.0'
+verto_version '0.6.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') {
+  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
@@ -44,12 +45,5 @@ context(branch('master')) {
 
     git!('commit -m "Bumps Version"')
   }
-
-  after_command('tag_up') {
-    exit
-    git!('push --tags')
-    git!('push origin master')
-    sh!('rake release')
-  }
 }
 

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!
@@ -79,7 +81,7 @@ module Verto
         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,10 @@ 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
   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 wil be removed in a future release, use `#{use}` instead"
+      end
     end
   end
 end

data/lib/verto/utils/templates/Vertofile

@@ -1,19 +1,20 @@
-verto_version '0.6.1'
+verto_version '0.7.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') {
+  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 Merged PRs Titles as changes to add in CHANGELOG.
     # version_changes = sh(
@@ -39,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')
   }
@@ -47,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.6.1"
+  VERSION = "0.7.0"
 end

data/lib/verto.rb

@@ -26,6 +26,14 @@ 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 :hooks, []
@@ -88,6 +96,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/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.6.1
+  version: 0.7.0
 platform: ruby
 authors:
 - Carlos Atkinson
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2020-04-15 00:00:00.000000000 Z
+date: 2020-04-29 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: thor
@@ -179,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
@@ -195,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: