verto 0.3.1 → 0.4.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: e9cf99e88c0aba3a13434d4507aa20da7caf42f67fd9e0a466973560ed30c4b6
-  data.tar.gz: 02eef1a0ac463fdbf6e3bd88b78c704bfe0fb5478f02299c6fe1d6a13ee48b9a
+  metadata.gz: 3d8e4c4c7f370860515641f6e6ef1434b9b7d8d99dba5e141d8fec5aaf267293
+  data.tar.gz: 7a1cb951a8ed2bce249ab18b2e27297161d2324db77ab288eb9d2dbd677837f8
 SHA512:
-  metadata.gz: 709df38d0b3579f99521b90d2924fe553f13d7666050b26c4d0785f1a3022dbd97b7287beb80bee0c5b179aa3747a1471ed98e94951ba61586e54eb3b8df09af
-  data.tar.gz: 83c4b2c413d7a37d612704f0f37437ac6f92edc709dacda0c3829a5bd77ce27d5de6db15a0fc30776e38849cd56828f040d042fb86eb93690883a66c195f6928
+  metadata.gz: 7c0965949b73fb2327d943b28b89d796d5e3e7e5358f805c0767778f5b3c15bf10fe6b73af7284e4e800f3314fa7e36d533fef80a263aef1e6ab20b63d3a8f11
+  data.tar.gz: c4b35bf0353b9dfecfdf869edb8aa560616a5c04c46e934876f3e27721d1cf1ed528afd7374bcffe15b6fdc1230a2556e1781b9671b3a4e19b65c6a7886c4d0b

data/Gemfile.lock

@@ -1,11 +1,12 @@
 PATH
   remote: .
   specs:
-    verto (0.3.1)
+    verto (0.4.0)
       dry-auto_inject (~> 0.7)
       dry-configurable (~> 0.8)
       dry-container (~> 0.7)
       thor (~> 1.0.1)
+      vseries (~> 0.1)
 
 GEM
   remote: https://rubygems.org/
@@ -16,7 +17,7 @@ GEM
     docile (1.3.2)
     dry-auto_inject (0.7.0)
       dry-container (>= 0.3.4)
-    dry-configurable (0.11.4)
+    dry-configurable (0.11.5)
       concurrent-ruby (~> 1.0)
       dry-core (~> 0.4, >= 0.4.7)
       dry-equalizer (~> 0.2)
@@ -45,6 +46,7 @@ GEM
       simplecov-html (~> 0.11)
     simplecov-html (0.12.2)
     thor (1.0.1)
+    vseries (0.1.1)
 
 PLATFORMS
   ruby
@@ -58,4 +60,4 @@ DEPENDENCIES
   verto!
 
 BUNDLED WITH
-   2.0.2
+   2.1.4

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:
 
 ```
-alias verto='docker run -v $(pwd):/usr/src/project -it catks/verto:0.3.0'
+alias verto='docker run -v $(pwd):/usr/src/project -it catks/verto:0.4.0'
 ```
 
 If you want you can share your git configuration and known_hosts with:
 
 ```
-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'
+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.0'
 
 ```
 
 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'
+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.0'
 
 ```
 
@@ -53,7 +53,7 @@ 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.3.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.4.0'
 
 ```
 
@@ -73,27 +73,44 @@ You can run verto right out of the box without any configuration:
 
 If you need a more specific configuration or want to reflect your development proccess in some way, you can use Verto DSL creating a Vertofile with the configuration.
 
+You can create a new Vertofile, with `verto init` or following the next example:
+
 ```ruby
 # Vertofile
 
-verto_version "0.3.0"
-
-config {
-  pre_release.initial_number = 0
-  project.path = "my/repo/path"
-}
-
-before { sh('echo "Creating Tag"') }
+verto_version '0.4.0'
 
 context(branch('master')) {
+  before_command('tag_up') {
+    git!('origin master')
+    command_options.add(filter: 'release_only')
+  }
+
   on('before_tag_creation') {
-    version_changes = "## #{new_version} - #{Time.now.strftime('%d/%m/%Y')}\n"
-    exit unless confirm("Create a new release?\n" \
-      "#{version_changes}"
+
+    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')
+
+    # Uncomment to update the version in other files, like package.json
+    # file('package.json').replace(/"(\d+)\.(\d+)\.(\d+)(-?.*)"/, %Q{"#{new_version}"})
+    # git('add package.json')
+
     git('commit -m "Updates CHANGELOG"')
   }
 
@@ -103,21 +120,31 @@ context(branch('master')) {
   }
 }
 
-context(branch('qa')) {
+ context(branch('staging')) {
   before_command('tag_up') {
+    git!('pull origin staging')
     command_options.add(pre_release: 'rc')
   }
 
+  on('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') {
-    file('releases.log').append(new_version.to_s)
+    git('push --tags')
+    git('push origin staging')
   }
 }
 
-context(branch(/feature.+/)) {
-  error "Can't create tags in feature branchs"
+# Block tag creation in other branchs
+context(!branch('master', 'staging')) {
+  error "Tags only can be created in master or staging branch"
   exit
 }
-
 ```
 
 #### Verto Syntax

data/exe/verto

@@ -8,6 +8,8 @@ begin
   Verto::DSL.load_file(vertofile_path) if File.exists?(vertofile_path)
 
   Verto::MainCommand.start(ARGV)
+
+# TODO: Improve error Message Handling
 rescue Verto::ExitError => ex
   Verto.stderr.puts ex.message
   Verto.stderr.puts 'Exiting Verto...'

data/lib/verto/commands/main_command.rb

@@ -2,5 +2,27 @@ module Verto
   class MainCommand < BaseCommand
     desc "tag SUBCOMMAND ...ARGS", "manage the repository tags"
     subcommand 'tag', Verto::TagCommand
+
+    desc "init", "Initialize a Vertofile in your repository"
+
+    option :path, type: :string, default: nil
+    def init
+      path = options[:path] || Verto.config.project.path
+
+      validate_current_vertofile!(path)
+
+      Template.render('Vertofile', to: path)
+    end
+
+    private
+
+    def validate_current_vertofile!(path)
+      command_error!(
+        <<~ERROR
+         Project already have a Vertofile.
+         If you want to generate a new with verto init, delete the current one with: `rm Vertofile`
+        ERROR
+      ) if Pathname.new(path).join('Vertofile').exist?
+    end
   end
 end

data/lib/verto/dsl/interpreter.rb

@@ -3,10 +3,18 @@ module Verto
     class Interpreter
       include DSL::Syntax
 
+      # TODO: Wrap stacktrace
+      Error = Class.new(Verto::ExitError)
+
       def evaluate(vertofile_content=nil, attributes: {}, &block)
         with_attributes(attributes) do
           vertofile_content ? instance_eval(vertofile_content)  : instance_eval(&block)
         end
+
+      rescue StandardError => error
+        raise error if error.is_a?(Verto::ExitError)
+
+        raise Error, error.message
       end
 
       private

data/lib/verto/dsl/syntax.rb

@@ -27,7 +27,7 @@ module Verto
       end
 
       def current_branch
-        git('rev-parse --abbrev-ref HEAD', output: false).output.chomp.strip
+        @current_branch ||= git('rev-parse --abbrev-ref HEAD', output: false).output.chomp.strip
       end
 
       def branch(*branch_names)
@@ -46,6 +46,10 @@ module Verto
         sh("git #{subcommand}", output: output)
       end
 
+      def git!(subcommand, output: :from_config)
+        sh!("git #{subcommand}", output: output)
+      end
+
       def sh(command, output: :from_config)
         command_executor(output: output).run command
       end

data/lib/verto/dsl.rb

@@ -9,5 +9,9 @@ module Verto
     def self.interpreter
       @interpreter ||= Interpreter.new
     end
+
+    def self.reset_interpreter!
+      @interpreter = nil
+    end
   end
 end

data/lib/verto/utils/semantic_version.rb

@@ -1,126 +1,5 @@
 module Verto
-  class SemanticVersion
-    include Comparable
-
-    REGEXP = /(\d+)\.(\d+)\.(\d+)(-?.*)/
-
-    class PreRelease
-      include Comparable
-
-      REGEXP = /-?(.+)\.(\d+)/
-
-      attr_accessor :name, :number
-
-      def self.with(name:, number: Verto.config.pre_release.initial_number)
-        instance = allocate
-        instance.name = name
-        instance.number = number
-        instance
-      end
-
-      def initialize(pre_release, initial_number: Verto.config.pre_release.initial_number)
-        name, number = pre_release.match(REGEXP)&.captures
-
-        @initial_number = initial_number
-        return if name.nil? && number.nil?
-
-        @name = name
-        @number = number ? number.to_i : initial_number
-      end
-
-      def up
-        raise BlankPreRelease if blank?
-
-        new_pre_release = self.dup
-        new_pre_release.number = number ? number + 1 : @initial_number
-        new_pre_release
-      end
-
-      def <=>(other)
-        return -1 if present? && other.blank?
-        return  1 if blank? && other.present?
-        to_s <=> other.to_s
-      end
-
-      def blank?
-        name.nil? && number.nil?
-      end
-
-      def present?
-        !blank?
-      end
-
-      def to_s
-        return '' if blank?
-
-        "-#{@name}.#{@number}"
-      end
-    end
-
-    attr_accessor :major, :minor, :patch, :pre_release
-
-    def initialize(version, pre_release_initial_number: Verto.config.pre_release.initial_number)
-      major, minor, patch, pre_release = version.match(REGEXP).captures
-
-      @major = major.to_i
-      @minor = minor.to_i
-      @patch = patch.to_i
-      @pre_release = PreRelease.new(pre_release)
-
-      @pre_release_initial_number = pre_release_initial_number
-    end
-
-    def up(version_type)
-      new_version = self.dup
-
-      case version_type
-      when :major
-        new_version.major += 1
-        new_version.minor = 0
-        new_version.patch = 0
-        new_version.pre_release.number = @pre_release_initial_number if pre_release?
-      when :minor
-        new_version.minor += 1
-        new_version.patch = 0
-        new_version.pre_release.number = @pre_release_initial_number if pre_release?
-      when :patch
-        new_version.patch += 1
-        new_version.pre_release.number = @pre_release_initial_number if pre_release?
-      when :pre_release
-        new_version.pre_release = new_version.pre_release.up
-      end
-
-      new_version
-    end
-
-    def with_pre_release(name)
-      new_version = self.dup
-
-      return new_version if new_version.pre_release? && new_version.pre_release.name == name
-
-      new_version.pre_release = PreRelease.with(name: name)
-
-      new_version
-    end
-
-    def pre_release?
-      pre_release.present?
-    end
-
-    def <=>(other)
-      return 1 if major > other.major
-      return 1 if major == other.major && minor > other.minor
-      return 1 if major == other.major && minor == other.minor && patch > other.patch
-      return 1 if major == other.major && minor == other.minor && patch == other.patch && pre_release > other.pre_release
-      return 0 if major == other.major && minor == other.minor && patch == other.patch && pre_release == other.pre_release
-
-      -1
-    end
-
-    def to_s
-      version = "#{@major}.#{@minor}.#{@patch}"
-      version << @pre_release.to_s if @pre_release
-      version
-    end
+  class SemanticVersion < Vseries::SemanticVersion
+    DEFAULT_PRE_RELEASE_INITIAL_NUMBER = Verto.config.pre_release.initial_number
   end
 end

data/lib/verto/utils/template.rb

@@ -0,0 +1,26 @@
+module Verto
+  class Template
+    def self.render(template_name, to:)
+      new(template_name).render(to: to)
+    end
+
+    def initialize(template_name)
+      @template_name = template_name
+    end
+
+    def render(to:)
+      path = Pathname.new(to)
+      path.join(@template_name).write(template_content)
+    end
+
+    private
+
+    def template_content
+      @template_content = template_path.join(@template_name).read
+    end
+
+    def template_path
+      Verto.root_path.join('lib/verto/utils/templates')
+    end
+  end
+end

data/lib/verto/utils/templates/Vertofile

@@ -0,0 +1,67 @@
+verto_version '0.4.0'
+
+context(branch('master')) {
+  before_command('tag_up') {
+    git!('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(
+    #  %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')
+
+    # Uncomment to update the version in other files, like package.json
+    # file('package.json').replace(/"(\d+)\.(\d+)\.(\d+)(-?.*)"/, %Q{"#{new_version}"})
+    # git('add package.json')
+
+    git('commit -m "Updates CHANGELOG"')
+  }
+
+  after_command('tag_up') {
+    git('push --tags')
+    git('push origin master')
+  }
+}
+
+# Uncomment to get a specific pre_release proccess, like a staging or qa branch
+# context(branch('staging')) {
+#  before_command('tag_up') {
+#    git!('pull origin staging')
+#    command_options.add(pre_release: 'rc')
+#  }
+#
+#  on('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') {
+#    git('push --tags')
+#    git('push origin staging')
+#  }
+#}
+
+# Uncomment to block tag creation in other branchs
+#context(!branch('master', 'staging')) {
+#  error "Tags only can be created in master or staging branch"
+#  exit
+#}

data/lib/verto/version.rb

@@ -1,3 +1,3 @@
 module Verto
-  VERSION = "0.3.1"
+  VERSION = "0.4.0"
 end

data/lib/verto.rb

@@ -2,6 +2,7 @@ require "thor"
 require "dry-container"
 require "dry-configurable"
 require "dry-auto_inject"
+require "vseries"
 require "pathname"
 
 require "verto/version"
@@ -73,6 +74,7 @@ end
 require "verto/utils/semantic_version.rb"
 require "verto/utils/system_command_executor"
 require "verto/utils/tag_filter"
+require "verto/utils/template"
 require "verto/dsl"
 require "verto/dsl/syntax"
 require "verto/dsl/interpreter"

data/verto.gemspec

@@ -30,6 +30,7 @@ Gem::Specification.new do |spec|
   spec.add_dependency             "dry-configurable", "~> 0.8"
   spec.add_dependency             "dry-container", "~> 0.7"
   spec.add_dependency             "dry-auto_inject", "~> 0.7"
+  spec.add_dependency             "vseries", "~> 0.1"
 
   spec.add_development_dependency "byebug"
   spec.add_development_dependency "bundler", "~> 2.0"

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: verto
 version: !ruby/object:Gem::Version
-  version: 0.3.1
+  version: 0.4.0
 platform: ruby
 authors:
 - Carlos Atkinson
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2020-03-24 00:00:00.000000000 Z
+date: 2020-04-07 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: thor
@@ -66,6 +66,20 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: '0.7'
+- !ruby/object:Gem::Dependency
+  name: vseries
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '0.1'
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '0.1'
 - !ruby/object:Gem::Dependency
   name: byebug
   requirement: !ruby/object:Gem::Requirement
@@ -172,6 +186,8 @@ files:
 - lib/verto/utils/semantic_version.rb
 - lib/verto/utils/system_command_executor.rb
 - lib/verto/utils/tag_filter.rb
+- lib/verto/utils/template.rb
+- lib/verto/utils/templates/Vertofile
 - lib/verto/version.rb
 - verto.gemspec
 homepage: https://github.com/catks/verto