verto 0.8.0 → 0.9.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 471a84a0013e6c3c02501ec32d3b45f09bf37d806bc94daeb5ef986d5ad11b33
-  data.tar.gz: ff2c2b197c9473bf78468f0ef563968e1a34a4e191e10fffccba639e51c6d564
+  metadata.gz: bfde45c8eb00cd3302f89417e1302b90e2fd41a2fd49a5c402c6e29ec2e46fdf
+  data.tar.gz: d6822ed93c979646fc7c0064b39310a1a180ae632a92ea53b2a7b7841503c138
 SHA512:
-  metadata.gz: 9426206069ea3f3a3d65f5ef2eb7ff95e97d1f89329d40f6e64f235590eaef80c713cf1ea1ba3700ea7ac4e0a9ed96a66a035109614d792734ae5693988ab819
-  data.tar.gz: 52a1daaeaf66b8a84acffbd1b2f9b720fde0ca3275f8f4c0fd3dbad46ca7aa56e9540d5642415bb053129f8b4d548adaf959c1c033dafd89d4bf664e766d3bf5
+  metadata.gz: f93afd8ec28cfcf7a6183d82570da5e5636f23ffd1387c111de3bbbbddae2db114b7022207a953f47e45020f6069024a1cdeffca419aec6fe0ca0d923583fc78
+  data.tar.gz: c07c60169151793d64806ae93851aabd649233f2d8364fe1aba2e896a57c89054dfd634d37b69554f934219420964f76ae3b932504b7964a2f3c14b9aeb8fe57

data/CHANGELOG.md

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

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    verto (0.8.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,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.8.0'
+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.8.0'
+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, know_hosts and git config with verto container (for git push):
 
 ```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.8.0'
+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'
 
 ```
 
@@ -85,17 +85,17 @@ You can create a new Vertofile with `verto init` or following the next example:
 ```ruby
 # Vertofile
 
-verto_version '0.8.0'
+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')
     command_options.add(filter: 'release_only')
   }
 
@@ -120,7 +120,7 @@ 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 Hooks
@@ -140,14 +140,13 @@ context(branch('master')) {
     # 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"')
+    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
 }
 ```

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

data/lib/verto/commands/tag_command.rb

@@ -42,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
@@ -77,7 +77,7 @@ 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
@@ -111,5 +111,9 @@ module Verto
       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/utils/templates/Vertofile

@@ -1,4 +1,4 @@
-verto_version '0.8.0'
+verto_version '0.9.0'
 
 config {
  # version.prefix = 'v' # Adds a version_prefix

data/lib/verto/version.rb

@@ -1,3 +1,3 @@
 module Verto
-  VERSION = "0.8.0"
+  VERSION = "0.9.0"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: verto
 version: !ruby/object:Gem::Version
-  version: 0.8.0
+  version: 0.9.0
 platform: ruby
 authors:
 - Carlos Atkinson
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2020-05-05 00:00:00.000000000 Z
+date: 2020-08-08 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: thor