verto 0.5.0 → 0.6.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 373195fc35ee48db23ce27dd6bc67105cb510761f7ea6eebe66a5f701bc86283
-  data.tar.gz: 296d975bf93678478a0b182265ec4c5d6f816d24b32520fcd9f1aadbf3f6999b
+  metadata.gz: 768852b8be876572bb72068a3865eaeee672d20baa976923758c9634b901a52d
+  data.tar.gz: 98339f920377dd25299a8240d5e10da2f5161fd749f5753d593d1878de4e6e9c
 SHA512:
-  metadata.gz: bc6dad7a9b95e58284c7f59ed6bfeccb27339fdf8f6125117cde49ad7cfa951d5927b2578f47cb0b83c3c719e52b6be046fe6b77e43aa07e3877d297b0496b26
-  data.tar.gz: 65d0d53a12a166ce5c890c2f1349a21ff43726f3158df7df402d3c6170d9f70bc1a26375194302c35d512474c5bbcf4ef172b74cc5ef92b82a41ab025255cb14
+  metadata.gz: 8532433e33edc4061b286d8ab409c70d668d231eed44a20b245243f94de4cdf794754c39b588212c71a10ec8522aa02f5b76ee21b6f636f2e283c2219989da66
+  data.tar.gz: c04e86927b7edcece876e739fc149743e99f972d86bbab755f86b0c006abf90caa255be1f35bdd6366e0e0387b6c9dbe80d97475394c7263c979cd86d89492d8

data/CHANGELOG.md

@@ -0,0 +1,3 @@
+## 0.6.0 - 14/04/2020
+ * [FEATURE] Adds Version Prefix
+

data/README.md

@@ -32,20 +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.6.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.6.0'
 
 ```
 
 You can also use your ssh keys 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'
+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.0'
 
 ```
 
@@ -53,7 +53,7 @@ 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.6.0'
 
 ```
 
@@ -93,7 +93,11 @@ You can create a new Vertofile with `verto init` or following the next example:
 ```ruby
 # Vertofile
 
-verto_version '0.4.1'
+verto_version '0.6.0'
+
+config {
+ # version.prefix = 'v' # Adds a version_prefix
+}
 
 context(branch('master')) {
   before_command('tag_up') {
@@ -103,12 +107,9 @@ context(branch('master')) {
 
   on('before_tag_creation') {
 
-    version_changes = ""
-    bitbucket_changes = sh(
+    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"
@@ -170,8 +171,6 @@ 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
 
 ## Contributing

data/Vertofile

@@ -0,0 +1,53 @@
+verto_version '0.5.0'
+
+config {
+ version.prefix = 'v' # Adds a version_prefix
+}
+
+context(branch('master')) {
+  before_command('tag_up') {
+    git!('pull origin master')
+    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)
+    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!('rake install')
+    git!('add Gemfile.lock')
+
+    git!('commit -m "Bumps Version"')
+  }
+
+  after_command('tag_up') {
+    git!('push --tags')
+    git!('push origin master')
+    sh!('rake release')
+  }
+}
+

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,6 +8,7 @@ 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
       call_hooks(%i[before before_tag_up], with_attributes: { command_options: options} )
@@ -26,9 +27,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)
@@ -65,7 +66,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
@@ -99,5 +100,9 @@ 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
   end
 end

data/lib/verto/utils/templates/Vertofile

@@ -1,20 +1,24 @@
-verto_version '0.4.0'
+verto_version '0.6.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
+}
 
 context(branch('master')) {
   before_command('tag_up') {
-    git!('origin master')
+    git!('pull origin master')
     command_options.add(filter: 'release_only')
   }
 
   on('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"

data/lib/verto/version.rb

@@ -1,3 +1,3 @@
 module Verto
-  VERSION = "0.5.0"
+  VERSION = "0.6.0"
 end

data/lib/verto.rb

@@ -24,6 +24,10 @@ module Verto
     setting :stderr_to, nil
   end
 
+  setting :version do
+    setting :prefix, ''
+  end
+
   setting :hooks, []
   setting :command_options, CommandOptions.new
 

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: verto
 version: !ruby/object:Gem::Version
-  version: 0.5.0
+  version: 0.6.0
 platform: ruby
 authors:
 - Carlos Atkinson
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2020-04-09 00:00:00.000000000 Z
+date: 2020-04-15 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