verto 0.2.1 → 0.3.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 64c9144a82db733e9ba2674535dee22d4615a2a2d4301879b7425295a83820c4
-  data.tar.gz: dd4d498454b23175bb96f514462aab03bed1c9fc3c669ba0cb522204189bf67a
+  metadata.gz: 63e5795954f1a3e1fe31e041a36a6203c9334560fb1257989a10d629d93e0aba
+  data.tar.gz: 7c8210f02f712baed8dfdcdce3028df208734cf20bdc067022444cb4b4bdd472
 SHA512:
-  metadata.gz: d8389934d204774aa1d9effe6db7b00f7b6730fc2ff440985dddecec5a00b2f6f374fed8ffe5d7fef292ff60d090695ae7e264e123d1be4bd950bd181a0e6b70
-  data.tar.gz: 35275e3adc8c853e0064ac4039eb89005f36abe0d63b08a8207aeb9c995507ba103729fa40563d4bcdd20d701af31e36ff93aa24f2f3860eb210f5ac39dfb0f3
+  metadata.gz: 35c5171078261719b1c1f0746aac6542656e98a960eff6db56ebc9b2cfa907ed61e41d41363ebd5613779e4f8e6d2c5a9d7afeb7d629d071fd10e6d0f3c288a4
+  data.tar.gz: 32062358949fcc88c8a74803aae2e9e0e9d12ed913ce9729c83ca215dfefcfe104b13ddf464259c47b1f4d125f6f993352bec04caaec8fa151ac06bd6d03c0c2

data/Gemfile.lock

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

data/README.md

@@ -21,7 +21,7 @@ If you use Rbenv you can install verto only once and create a alias in your .bas
 #### ZSH
     $ RBENV_VERSION=$(rbenv global) gem install verto && echo "alias verto='RBENV_VERSION=$(rbenv global) verto'" >> ~/.zshrc
 
-### Bash
+#### Bash
     $ RBENV_VERSION=$(rbenv global) gem install verto && echo "alias verto='RBENV_VERSION=$(rbenv global) verto'" >> ~/.bashrc
 
 
@@ -32,23 +32,31 @@ 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:
 
 ```
-alias verto='docker run -v $(pwd):/usr/src/project -it catks/verto:0.2.0'
+alias verto='docker run -v $(pwd):/usr/src/project -it catks/verto:0.3.0'
 ```
 
-If you want to use your ssh keys with verto container (for git push) you can set the alias sharing the ssh key file:
+If you want you can share your git configuration and known_hosts with:
 
 ```
-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.2.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.3.0'
 
 ```
 
-You can also share the git config file with:
+You can also use your ssh keys with verto container (for git push):
+
+```
+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.3.0'
+
+```
+
+Or share the git config, known_hosts and ssh_keys:
 
 
 ```
-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.2.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.3.0'
 
 ```
+
 Now you can run any verto command! :)
 
 ## Usage
@@ -67,6 +75,9 @@ If you need a more specific configuration or want to reflect your development pr
 
 ```ruby
 # Vertofile
+
+verto_version "0.3.0"
+
 config {
   pre_release.initial_number = 0
   project.path = "my/repo/path"

data/exe/verto

@@ -8,7 +8,8 @@ begin
   Verto::DSL.load_file(vertofile_path) if File.exists?(vertofile_path)
 
   Verto::MainCommand.start(ARGV)
-rescue Verto::ExitError
+rescue Verto::ExitError => ex
+  Verto.stderr.puts ex.message
   Verto.stderr.puts 'Exiting Verto...'
   exit 1
 end

data/lib/verto/commands/base_command.rb

@@ -11,7 +11,7 @@ module Verto
     end
 
     def options
-      super.merge Verto.config.command_options
+      Verto.config.command_options.merge(super)
     end
 
     def call_hooks(moments = [], with_attributes: {})

data/lib/verto/commands/tag_command.rb

@@ -9,7 +9,7 @@ module Verto
     option :filter, type: :string
 
     def up
-      call_hooks(%i[before before_tag_up])
+      call_hooks(%i[before before_tag_up], with_attributes: { command_options: options} )
 
       validate_version_option_presence!
 
@@ -19,18 +19,11 @@ module Verto
 
       latest_version = SemanticVersion.new(latest_tag)
 
-      version_up_options = options.select { |key,value| value == true }.keys.map(&:to_sym) & [:major, :minor, :patch]
-
-      new_version = version_up_options.reduce(latest_version) { |version, up_option| version.up(up_option) }
-
-      if options[:pre_release]
-        identifier = pre_release_configured? ? options[:pre_release] : latest_version.pre_release.name
-        new_version = new_version.with_pre_release(identifier)
-        new_version = new_version.up(:pre_release) if new_version.pre_release.name == latest_version.pre_release.name
-      end
+      new_version = up_version(latest_version, options)
 
       validate_new_version!(new_version, latest_version)
-      call_hooks(:before_tag_creation, with_attributes: { new_version: new_version, latest_version: latest_version } )
+
+      call_hooks(:before_tag_creation, with_attributes: { new_version: new_version } )
       tag_repository.create!(new_version.to_s)
 
       call_hooks(:after_tag_up, with_attributes: { new_version: new_version })
@@ -41,6 +34,20 @@ module Verto
 
     include Verto.import['tag_repository']
 
+    def up_version(version, options)
+      version_up_options = options.select { |key,value| value == true }.keys.map(&:to_sym) & [:major, :minor, :patch]
+
+      new_version = version_up_options.reduce(version) { |version, up_option| version.up(up_option) }
+
+      if options[:pre_release]
+        identifier = pre_release_configured? ? options[:pre_release] : version.pre_release.name
+        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
+      end
+
+      new_version
+    end
+
     def pre_release_configured?
       options[:pre_release] != 'pre_release'
     end

data/lib/verto/dsl/syntax.rb

@@ -1,12 +1,33 @@
 module Verto
   module DSL
     module Syntax
+      def verto_version(expected_version_string)
+        expected_version = Verto::SemanticVersion.new(expected_version_string)
+
+        verto_version = Verto::SemanticVersion.new(Verto::VERSION)
+
+        error_message = "Current Verto version is #{verto_version}, required version is #{expected_version} or higher"
+        raise Verto::ExitError, error_message unless expected_version <= verto_version
+      end
+
       def config(&block)
         Verto.config.instance_eval(&block)
       end
 
+      def latest_version
+        @latest_version ||= latest_semantic_version_for(:all)
+      end
+
+      def latest_release_version
+        @latest_release_version ||= latest_semantic_version_for(:release_only)
+      end
+
+      def latest_pre_release_version
+        @latest_pre_release_version ||= latest_semantic_version_for(:pre_release_only)
+      end
+
       def current_branch
-        git('rev-parse --abbrev-ref HEAD').output.chomp.strip
+        git('rev-parse --abbrev-ref HEAD', stdout_output: false).output.chomp.strip
       end
 
       def branch(*branch_names)
@@ -21,16 +42,16 @@ module Verto
         block.call if condition
       end
 
-      def git(subcommand)
-        sh("git #{subcommand}")
+      def git(subcommand, stdout_output: :from_config)
+        sh("git #{subcommand}", stdout_output: stdout_output)
       end
 
-      def sh(command)
-        command_executor.run command
+      def sh(command, stdout_output: :from_config)
+        command_executor(stdout_output: stdout_output).run command
       end
 
-      def sh!(command)
-        raise Verto::ExitError unless sh(command).success?
+      def sh!(command, stdout_output: :from_config)
+        raise Verto::ExitError unless sh(command, stdout_output: stdout_output).success?
       end
 
       def command_options
@@ -81,8 +102,14 @@ module Verto
 
       private
 
-      def command_executor
-        @command_executor ||= SystemCommandExecutor.new
+      def command_executor(stdout_output: :from_config)
+        @executors ||= {
+          from_config: SystemCommandExecutor.new,
+          true => SystemCommandExecutor.new(stdout: $stdout),
+          false => SystemCommandExecutor.new(stdout: nil)
+        }
+
+        @executors[stdout_output]
       end
 
       def shell_basic
@@ -92,6 +119,18 @@ module Verto
       def stderr
         Verto.stderr
       end
+
+      def tag_repository
+        @tag_repository ||= TagRepository.new
+      end
+
+      def latest_semantic_version_for(filter)
+        tag_version = tag_repository.latest(filter: TagFilter.for(filter))
+
+        return SemanticVersion.new('0.0.0') unless tag_version
+
+        SemanticVersion.new(tag_version)
+      end
     end
   end
 end

data/lib/verto/utils/command_options.rb

@@ -0,0 +1,9 @@
+module Verto
+  class CommandOptions < Thor::CoreExt::HashWithIndifferentAccess
+    alias_method :add, :merge!
+
+    def except(*keys)
+      self.reject { |key, v| keys.include?(key) }
+    end
+  end
+end

data/lib/verto/utils/tag_filter.rb

@@ -5,6 +5,7 @@ module TagFilter
   FILTERS = {
     release_only: REALEASE_ONLY,
     pre_release_only: PRE_REALEASE_ONLY,
+    all: nil
   }
 
   def self.for(tag_key)

data/lib/verto/version.rb

@@ -1,3 +1,3 @@
 module Verto
-  VERSION = "0.2.1"
+  VERSION = "0.3.0"
 end

data/lib/verto.rb

@@ -5,6 +5,7 @@ require "dry-auto_inject"
 require "pathname"
 
 require "verto/version"
+require "verto/utils/command_options"
 
 module Verto
   extend Dry::Configurable
@@ -23,7 +24,7 @@ module Verto
   end
 
   setting :hooks, []
-  setting :command_options, Class.new(Hash) { alias_method :add, :merge! }.new
+  setting :command_options, CommandOptions.new
 
   ExitError = Class.new(Thor::Error)
   CommandError = Class.new(ExitError)

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: verto
 version: !ruby/object:Gem::Version
-  version: 0.2.1
+  version: 0.3.0
 platform: ruby
 authors:
 - Carlos Atkinson
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2020-03-16 00:00:00.000000000 Z
+date: 2020-03-20 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: thor
@@ -168,6 +168,7 @@ files:
 - lib/verto/dsl/interpreter.rb
 - lib/verto/dsl/syntax.rb
 - lib/verto/repositories/tag_repository.rb
+- lib/verto/utils/command_options.rb
 - lib/verto/utils/semantic_version.rb
 - lib/verto/utils/system_command_executor.rb
 - lib/verto/utils/tag_filter.rb