bumpversion 0.5.0 → 1.1.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
-SHA1:
-  metadata.gz: 6a474ecb623c32953955e82e550defd2a14b9516
-  data.tar.gz: c07a7af0c0a0ad7ccec664cb9c7c90b39c87deed
+SHA256:
+  metadata.gz: 3491fe3bc5c9fcfe7206dcb9ed25a27b8e87cfed33c9262604653c11252c8f79
+  data.tar.gz: 7d1b1b9f3b07cdb3b50418e31b51eef23918c812db19b10dbad887a8662f0325
 SHA512:
-  metadata.gz: e6f24ed84f572379b01731938a9cae98b62cad3a0a803a8c23fe1acc9424955928529d92ad006aa4c1218c232f6d3d440435d0764c3fc3765e6f38de609d188b
-  data.tar.gz: a88d2db13f2f95be1846ff740f30f796cf1e486b3e74b8603fa87bf89c7b076a51184d2c44833092b5ae6ef5c617c3574c326d4b3b7f57866ceabb8b061774c2
+  metadata.gz: 51fdddc11bfd76ac16b4531a71ce6682b02dbb644ba79767adf61644e4208a920f68246ecd538960ac1be296a1bccceb99e6b7d1a89f49555b93a2c0dce2ca70
+  data.tar.gz: 30ff050a7a45e0135d8804cb39507e48b7fd7b7f70f419fe9010e630056f9f17c967b22204710f7c29edea471e3433327fe700080caef16357bb80fd57878fad

data/README.md

@@ -6,16 +6,16 @@ Simple command to Bump version your project in shell.
 - Git operations like commit, tag and push
 - Customizables Hooks
 
+# Screencast
+
+[![asciicast](docs/demo.svg)]()
+
 # Code Status
 
 Service | Status
 --------|----------
-Issues Ready to Work|[![Waffle.io](https://img.shields.io/waffle/label/dlanileonardo/bumpversion/in%20progress.svg?maxAge=2592000&style=flat-square)](https://waffle.io/dlanileonardo/bumpversion)
 Gems Version|[![Gem](https://img.shields.io/gem/v/bumpversion.svg?maxAge=2592000&style=flat-square)](http://badge.fury.io/rb/bumpversion)
-Code Climate|[![Code Climate](https://img.shields.io/codeclimate/github/kabisaict/flow.svg?maxAge=2592000&style=flat-square)](https://codeclimate.com/github/dlanileonardo/bumpversion)
-Coverage|[![Code Climate](https://img.shields.io/codeclimate/coverage/github/dlanileonardo/bumpversion.svg?maxAge=2592000&style=flat-square)](https://codeclimate.com/github/dlanileonardo/bumpversion/coverage)
-Build Status|[![Travis](https://img.shields.io/travis/dlanileonardo/bumpversion.svg?maxAge=2592000&style=flat-square)](https://travis-ci.org/dlanileonardo/bumpversion)
-Dependencies|[![Gemnasium](https://img.shields.io/gemnasium/dlanileonardo/bumpversion.svg?maxAge=2592000&style=flat-square)]()
+Build Status|[![CI](https://github.com/dlanileonardo/bumpversion/workflows/CI/badge.svg)](https://github.com/dlanileonardo/bumpversion/actions?query=workflow%3ACI)
 
 ## Installation
 

data/lib/bumpversion.rb

@@ -12,6 +12,7 @@ module Bumpversion
   class Bumpversion
     def initialize(arguments = nil)
       PrettyOutput.start("Bump your project ... ☺ ")
+      @options = {}
 
       PrettyOutput.begin("Parsing Options Start")
       parser = Parser.new @options, arguments
@@ -27,6 +28,7 @@ module Bumpversion
       bump_string = BumpString.new @options
       @options = bump_string.bump
       PrettyOutput.sucess("Done!")
+
       @git = GitOperation.new @options
     end
 
@@ -44,9 +46,11 @@ module Bumpversion
       Hook.pre_commit_hook @options
       PrettyOutput.sucess("Done!")
 
-      PrettyOutput.begin("Git Operations")
-      @git.do!
-      PrettyOutput.sucess("Done!")
+      if @options[:git_commit] || @options[:git_tag] || @options[:git_push]
+        PrettyOutput.begin("Git Operations")
+        @git.do!
+        PrettyOutput.sucess("Done!")
+      end
 
       PrettyOutput.begin("Pos Commit Hooks")
       Hook.pos_commit_hook @options

data/lib/bumpversion/bump_string.rb

@@ -5,7 +5,7 @@ module Bumpversion
     end
 
     def dictionary
-      { major: 1, minor: 2, patch: 3 }
+      %w[major minor patch build].map { |k| k.to_sym }
     end
 
     def key_part
@@ -13,22 +13,23 @@ module Bumpversion
     end
 
     def pattern
-      /([0-9]+)\.([0-9]+)\.([0-9]+)/
+      /(?<major>\d+).(?<minor>\d+).(?<patch>\d+).?(?<build>\d+)?/
+    end
+
+    def pattern_replace
+      /(?<major>\d+)(?<a>.)(?<minor>\d+)(?<b>.)(?<patch>\d+)(?<c>.)?(?<build>\d+)?/
     end
 
     def matched
-      match = pattern.match(@options[:current_version])
-      matched = {}
-      dictionary.each { |part, number| matched[part] = match[number].to_i }
-      matched
+      @match ||= pattern.match(@options[:current_version])
     end
 
     def update_version(matched_version)
       bumped = false
       matched_version.each do | part, number |
-        matched_version[part] = 0 if bumped
+        matched_version[part] = 0 if bumped && part.to_sym != :build
 
-        if part == key_part
+        if part.to_sym == key_part || part.to_sym == :build
           matched_version[part] += 1
           bumped = true
         end
@@ -39,9 +40,12 @@ module Bumpversion
 
     def bump
       unless @options[:new_version]
-        matched_version = update_version(matched)
-        new_version_hash = matched_version.map { |_key, value| value.to_s }
-        @options[:new_version] = new_version_hash.join('.')
+        actual_version = matched.named_captures.reject { |k,v| v.nil? }.map { |k, v| [k.to_sym, v.to_i] }.to_h
+        matched_version = update_version(actual_version)
+        new_version = pattern_replace.match(@options[:current_version]).named_captures.map do |k, v|
+          dictionary.include?(k.to_sym) ? "#{matched_version[k.to_sym]}" : v || ""
+        end.join("")
+        @options[:new_version] = new_version
       end
       @options
     end

data/lib/bumpversion/git_operation.rb

@@ -10,6 +10,7 @@ module Bumpversion
 
     def commit!
       if @options[:git_commit]
+        PrettyOutput.info("git commit")
         file = @options[:file].split(',') + [@options[:config_file]]
         file += @options[:git_extra_add].split(',') if @options[:git_extra_add]
         @git.add(file)
@@ -18,12 +19,22 @@ module Bumpversion
     end
 
     def tag!
-      @git.add_tag("v#{@options[:new_version]}") if @options[:git_tag]
+      if @options[:git_tag]
+        PrettyOutput.info("git tag")
+        @git.add_tag("v#{@options[:new_version]}")
+      end
     end
 
     def push!
-      @git.push if @options[:git_push]
-      @git.push(@git.remote.name, @git.branch.name, :tags => true) if @options[:git_push] && @options[:git_tag]
+      if @options[:git_push]
+        @git.push
+        if @options[:git_tag]
+          PrettyOutput.info("git push with tags")
+          @git.push(@git.remote.name, @git.branch.name, :tags => true)
+        else
+          PrettyOutput.info("git push")
+        end
+      end
     end
 
     def do!

data/lib/bumpversion/parser.rb

@@ -1,4 +1,4 @@
-require 'trollop'
+require 'optimist'
 require 'bumpversion/version'
 
 module Bumpversion
@@ -10,7 +10,7 @@ module Bumpversion
 
     def mount_banner
       version_number = VERSION
-      Trollop::Parser.new do
+      Optimist::Parser.new do
         version "Bumpversion #{version_number} ☺"
         usage "bumpversion [options] --part [major|minor|patch]
         where [options] are:"
@@ -48,12 +48,12 @@ Usage:
 
     def parse
       banner = mount_banner
-      @options = Trollop.with_standard_exception_handling banner do
-        fail Trollop::HelpNeeded if @args.empty?
+      @options = Optimist.with_standard_exception_handling banner do
+        fail Optimist::HelpNeeded if @args.empty?
         banner.parse @args
       end
 
-      Trollop.die if @options[:help]
+      Optimist.die if @options[:help]
 
       @options
     end

data/lib/bumpversion/parser_file.rb

@@ -19,7 +19,7 @@ module Bumpversion
         key_given_file = "#{key_given}_file"
 
         unless options[key_given.to_sym]
-          options[key.to_sym] = value
+          options[key.to_sym] = %w[yes no].include?(value) ? { "yes" => true, "no" => false }[value] : value
           options[key_given_file.to_sym] = value
         end
       end

data/lib/bumpversion/version.rb

@@ -1,3 +1,3 @@
 module Bumpversion
-  VERSION = '0.5.0'.freeze
+  VERSION = '1.1.0'.freeze
 end

data/spec/bumpversion_spec.rb

@@ -74,11 +74,24 @@ describe Bumpversion::Bumpversion do
       it { is_expected.to include current_version: '1.1.1' }
       it { is_expected.to include new_version: '1.1.2' }
     end
+    context 'major with build' do
+      let(:arguments) { ['--current-version=1.0.1+10', '--part=major'] }
+      let(:bump_instance) { Bumpversion::Bumpversion.new arguments }
+      subject { bump_instance.instance_variable_get(:@options) }
+
+      it { expect(bump_instance).to be_a Bumpversion::Bumpversion }
+      it { is_expected.to be_a Hash }
+      it { is_expected.to include :help  }
+      it { is_expected.to include :part  }
+      it { is_expected.to include :file  }
+      it { is_expected.to include current_version: '1.0.1+10' }
+      it { is_expected.to include new_version: '2.0.0+11' }
+    end
   end
 
   describe 'with file' do
     before do
-      File.write('./spec/files/bumpversion.cfg', "[bumpversion]\ncurrent-version=2.1.1\n")
+      File.write('./spec/files/bumpversion.cfg', "[bumpversion]\ncurrent-version=2.1.1\ngit-commit=no\n")
       File.write('./spec/files/VERSION', "version=2.1.1\n")
       File.write('./spec/files/VERSION_EXTRA', "version=2.1.1\n")
     end

metadata

@@ -1,29 +1,29 @@
 --- !ruby/object:Gem::Specification
 name: bumpversion
 version: !ruby/object:Gem::Version
-  version: 0.5.0
+  version: 1.1.0
 platform: ruby
 authors:
 - Dlani Mendes
-autorequire: 
+autorequire:
 bindir: bin
 cert_chain: []
-date: 2016-05-18 00:00:00.000000000 Z
+date: 2021-06-13 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
-  name: trollop
+  name: optimist
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '2.1'
+        version: '3.0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '2.1'
+        version: '3.0'
 - !ruby/object:Gem::Dependency
   name: parseconfig
   requirement: !ruby/object:Gem::Requirement
@@ -72,62 +72,6 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: 1.2.9
-- !ruby/object:Gem::Dependency
-  name: bundler
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '1.10'
-  type: :development
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '1.10'
-- !ruby/object:Gem::Dependency
-  name: rake
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '10.0'
-  type: :development
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '10.0'
-- !ruby/object:Gem::Dependency
-  name: rspec
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: 3.0.0
-  type: :development
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: 3.0.0
-- !ruby/object:Gem::Dependency
-  name: rspec-core
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: 3.0.0
-  type: :development
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: 3.0.0
 description: Bump version by params or config file with Hooks! :).
 email:
 - dlanileonardo@gmail.com
@@ -158,7 +102,7 @@ homepage: https://github.com/dlanileonardo/bumpversion
 licenses:
 - MIT
 metadata: {}
-post_install_message: 
+post_install_message:
 rdoc_options: []
 require_paths:
 - lib
@@ -173,9 +117,8 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubyforge_project: 
-rubygems_version: 2.6.4
-signing_key: 
+rubygems_version: 3.1.2
+signing_key:
 specification_version: 4
 summary: Auto Bump Version to any project
 test_files: