verto 0.1.0 → 0.2.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 57720313b35dae31896c4cc8ed940487c14c6f268269474dcaf7a739eb31f371
-  data.tar.gz: 37b947db3e863ba538e945eff7f02241f862b6d021b43223c9c95d28bf7df144
+  metadata.gz: ccba2d3e689dff838d612930a75a88c445f40dfb7a783179dee0fd8abdfe207a
+  data.tar.gz: d9ac8120dfba52e31efb8c40d8c3d057f499fd73ef69443430a61beb0aaa5a31
 SHA512:
-  metadata.gz: e3791c56946d015d4199863331a836d661d159ceed0c817f80c169ee8ea71523a874b31a656be6df2fb7bf7671041ab2430dac4fcc08420292ee76e0fe826997
-  data.tar.gz: dc69546ca9d8427bfe51610fd6444061d3356f840a6836fe81c275ad0bba5abe14592095b92be5bb719392e32de9678ecc9b85785d382084c22f8a2cd92f233a
+  metadata.gz: aedc4f24da4845fde6bd377f75a041dd6c6b683cb524a6e58843f80c12c18849d9844c665c65c51853186489f63e5527a8e5a5af310883f64c7b5bcbcdd329ec
+  data.tar.gz: 1557b99f71c2e81d69fb7e2c4dfd732bcdd4b86794e3ab71b65e17ce77e3683e593244ca2081fe2c23da08eff2088988ed514730c1322bc1fb5cc2c13fbd759a

data/.ruby-version

@@ -0,0 +1 @@
+2.6.5

data/Dockerfile

@@ -0,0 +1,43 @@
+FROM ruby:2.6.5-alpine AS builder
+
+ENV BUILD_PACKAGES build-base git
+
+RUN mkdir /bundle
+
+RUN apk update && \
+    apk upgrade && \
+    apk add $BUILD_PACKAGES && \
+    rm -rf /var/cache/apk/*
+
+COPY verto.gemspec Gemfile Gemfile.lock ./
+
+COPY lib/verto/version.rb lib/verto/version.rb
+
+RUN gem install bundler -v 2.0.2
+
+RUN bundle install
+
+FROM ruby:2.6.5-alpine
+
+ENV DEPENDENCIES git openssh-client
+
+RUN apk update && \
+    apk upgrade && \
+    apk add $DEPENDENCIES && \
+    rm -rf /var/cache/apk/*
+
+WORKDIR /usr/src/verto
+
+COPY --from=builder /usr/local/bundle/ /usr/local/bundle
+
+RUN gem install bundler -v 2.0.2
+
+COPY . .
+
+RUN chmod +x docker-entrypoint.sh
+
+RUN rake install
+
+WORKDIR /usr/src/project
+
+ENTRYPOINT ["/usr/src/verto/docker-entrypoint.sh"]

data/Gemfile.lock

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

data/README.md

@@ -4,15 +4,37 @@ Verto is a CLI to generate git tags (following the [Semantic Versioning](https:/
 
 ## Installation
 
+
+### Ruby Gem
 Verto is distributed as a ruby gem, to install run:
 
 ```
 $ gem install verto
 ```
 
+
+### Docker Image
+
+You don't need to install verto in your machine, you can run verto via the docker image
+
+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'
+```
+
+If you want to use your ssh keys with verto container (for git push) you can set the alias sharing the ssh key file:
+
+```
+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'
+
+```
+
+Now you can run any verto command! :)
+
 ## Usage
 
-Now you can run verto right out of the box without any configuration:
+You can run verto right out of the box without any configuration:
 
 ```
   verto tag up --patch # Creates a new tag increasing the patch number
@@ -35,12 +57,12 @@ before { sh('echo "Creating Tag"') }
 
 context(branch('master')) {
   on('before_tag_creation') {
-    versions_changes = "## #{new_version} - #{Time.now.strftime('%d/%m/%Y')}\n"
+    version_changes = "## #{new_version} - #{Time.now.strftime('%d/%m/%Y')}\n"
     exit unless confirm("Create a new release?\n" \
-      "#{versions_changes}"
+      "#{version_changes}"
     )
 
-    file('CHANGELOG.md').prepend(versions_changes)
+    file('CHANGELOG.md').prepend(version_changes)
     git('add CHANGELOG.md')
     git('commit -m "Updates CHANGELOG"')
   }
@@ -61,6 +83,10 @@ context(branch('qa')) {
   }
 }
 
+context(branch(/feature.+/)) {
+  error "Can't create tags in feature branchs"
+}
+
 ```
 
 #### Verto Syntax
@@ -71,7 +97,8 @@ context(branch('qa')) {
 
   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. Enable the *sh* dsl output to be show as default
+  3. Configure tag prefix (eg: 'v' to generate v0.1.0)
+  4. Improve DSL Syntax Errors Messages(Ruby backtrace is printed currently)
 
 ## Contributing
 

data/Rakefile

@@ -9,7 +9,9 @@ task :default => :spec
 
 desc 'Verto REPL'
 task :console do
-  exec 'irb -r ./lib/verto -r ./spec/helpers/test_repo.rb'
+  require 'irb'
+  ARGV.clear
+  IRB.start
 end
 
 namespace :temp_repo do
@@ -20,6 +22,6 @@ namespace :temp_repo do
 
   desc 'clear the temp git repo'
   task :clear do
-    TestRepo.new.clear
+    TestRepo.new.clear!
   end
 end

data/docker-entrypoint.sh

@@ -0,0 +1,11 @@
+#!/bin/sh
+
+set -e
+
+if [[ -n "${SSH_PRIVATE_KEY}" ]]; then
+  eval `ssh-agent -s` > /dev/null
+  ssh-add $SSH_PRIVATE_KEY 2> /dev/null
+fi
+
+exec verto "$@"
+

data/exe/verto

@@ -4,6 +4,11 @@ require_relative '../lib/verto'
 
 vertofile_path = ENV['VERTOFILE_PATH'] || Pathname.new(Dir.pwd).join('Vertofile').to_s
 
-Verto::DSL.load_file(vertofile_path) if File.exists?(vertofile_path)
-
-Verto::MainCommand.start(ARGV)
+begin
+  Verto::DSL.load_file(vertofile_path) if File.exists?(vertofile_path)
+
+  Verto::MainCommand.start(ARGV)
+rescue Verto::ExitError
+  Verto.stderr.puts 'Exiting Verto...'
+  exit 1
+end

data/lib/verto/commands/base_command.rb

@@ -7,7 +7,7 @@ module Verto
     private
 
     def command_error!(message)
-      raise Thor::Error, message
+      raise Verto::CommandError, message
     end
 
     def options

data/lib/verto/dsl/syntax.rb

@@ -10,7 +10,11 @@ module Verto
       end
 
       def branch(*branch_names)
-        branch_names.map(&:to_s).include? current_branch
+        branch_names.any? do |branch|
+          return branch.match?(current_branch) if branch.is_a?(Regexp)
+
+          branch.to_s.include? current_branch
+        end
       end
 
       def context(condition, &block)
@@ -25,6 +29,10 @@ module Verto
         command_executor.run command
       end
 
+      def sh!(command)
+        raise Verto::ExitError unless sh(command).success?
+      end
+
       def command_options
         Verto.config.command_options
       end
@@ -61,6 +69,16 @@ module Verto
         shell_basic.yes?("#{text} (y/n)")
       end
 
+      def error(text)
+        stderr.puts text
+      end
+
+      def error!(text)
+        error(text)
+
+        raise Verto::ExitError
+      end
+
       private
 
       def command_executor
@@ -70,6 +88,10 @@ module Verto
       def shell_basic
         @shell_basic ||= Thor::Shell::Basic.new
       end
+
+      def stderr
+        Verto.stderr
+      end
     end
   end
 end

data/lib/verto/repositories/tag_repository.rb

@@ -1,6 +1,6 @@
 module Verto
   class TagRepository
-    include Verto.import[executor: 'system_command_executor']
+    include Verto.import[executor: 'system_command_executor_without_output']
 
     def latest(filter: nil)
       all(filter: filter).last

data/lib/verto/utils/system_command_executor.rb

@@ -2,11 +2,11 @@ require 'open3'
 
 module Verto
   class SystemCommandExecutor
-    include Verto.import['project.path']
+    include Verto.import['project.path', 'stdout', 'stderr']
 
     class Result < Struct.new(:output, :error, :result)
       def success?
-        @result.success?
+        result.success?
       end
 
       def error?
@@ -16,19 +16,24 @@ module Verto
     Error = Class.new(StandardError)
 
     def run(command)
-      Open3.popen3(command, chdir: path.to_s) do |stdin, stdout, stderr, wait_thread|
+      Open3.popen3(command, chdir: path.to_s) do |_, stdout, stderr, wait_thread|
         @output = stdout.read
         @error = stderr.read
         @result = wait_thread.value
       end
 
+      stdout << @output if stderr
+      stderr << @error if stderr
+
       Result.new(@output, @error, @result)
     end
 
     def run!(command)
-      run(command)
+      result = run(command)
 
       raise Error, @error unless @error.empty?
+
+      result
     end
   end
 end

data/lib/verto/version.rb

@@ -1,3 +1,3 @@
 module Verto
-  VERSION = "0.1.0"
+  VERSION = "0.2.0"
 end

data/lib/verto.rb

@@ -17,19 +17,42 @@ module Verto
     setting :path, './'
   end
 
+  setting :output do
+    setting :stdout_to, nil
+    setting :stderr_to, nil
+  end
+
   setting :hooks, []
   setting :command_options, Class.new(Hash) { alias_method :add, :merge! }.new
 
+  ExitError = Class.new(Thor::Error)
+  CommandError = Class.new(ExitError)
+
   def self.root_path
     Pathname.new File.expand_path(File.dirname(__FILE__) + '/..')
   end
 
+  def self.project_path
+    Pathname.new Verto.config.project.path
+  end
 
   def self.container
     @container ||= Dry::Container.new.tap do |container|
       container.register('system_command_executor') { SystemCommandExecutor.new }
+      container.register('system_command_executor_without_output') { SystemCommandExecutor.new(stdout: nil, stderr: nil) }
+
       container.register('tag_repository') { TagRepository.new }
 
+      container.register('stdout', memoize: true) do
+        stdout = Verto.config.output.stdout_to
+        stdout && Verto.project_path.join(stdout).open('a+') || $stdout
+      end
+
+      container.register('stderr', memoize: true) do
+        stderr = Verto.config.output.stderr_to
+        stderr && Verto.project_path.join(stderr).open('a+') || $stderr
+      end
+
       # TODO: Remove project.path from container
       container.namespace('project') do
         register('path') { Verto.config.project.path }
@@ -40,6 +63,10 @@ module Verto
   def self.import
     @import ||= Dry::AutoInject(container)
   end
+
+  def self.stderr
+    Verto.container.resolve('stderr')
+  end
 end
 
 require "verto/utils/semantic_version.rb"

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: verto
 version: !ruby/object:Gem::Version
-  version: 0.1.0
+  version: 0.2.0
 platform: ruby
 authors:
 - Carlos Atkinson
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2020-02-14 00:00:00.000000000 Z
+date: 2020-02-28 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: thor
@@ -132,7 +132,9 @@ extra_rdoc_files: []
 files:
 - ".gitignore"
 - ".rspec"
+- ".ruby-version"
 - ".travis.yml"
+- Dockerfile
 - Gemfile
 - Gemfile.lock
 - LICENSE.txt
@@ -140,6 +142,7 @@ files:
 - Rakefile
 - bin/console
 - bin/setup
+- docker-entrypoint.sh
 - exe/verto
 - lib/verto.rb
 - lib/verto/commands/base_command.rb