bumpversion 0.5.2 → 1.0.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: af627449c595232bca1375afd2d3894488b58096ea7101b056f04aca656b0e65
-  data.tar.gz: c3d74976ec4fc1b00b71f19e7144378044f853e59bc43e49130c1f06a11c33d5
+  metadata.gz: 0ee7c37fdf3f69afb4a7b1cf258fc4e19792df1c8cc0d6854d203c951188a33c
+  data.tar.gz: c148c731dec29928cb268cd737c558ad82fc8fa36bfe4b252e189e931fc41c32
 SHA512:
-  metadata.gz: 21ebff69c512abd92bb0f443ca8a8de7b36e599b4226e6c2cb5f7ba9a011aa06d8aee6c268e95475f29097989c26af696383ca49637ad0f9eff4ceb5c27d1c66
-  data.tar.gz: b5b4e531fc8d377e87d509addca464128ae8d179e9d62144c05bf24fa4b23932483bf1cd8c85b64c7dd83e62021bd73f1f4fdd086a3cf5a07f43709795577c02
+  metadata.gz: fa9c7b28bf7c2cbe6487246e68720b7f052ad30296f8b9e9d9bf88056597eaa4638d8fdcbb4a1d20c57b788f7bebd0d8dfdd0f96446ae913c459021637c8e121
+  data.tar.gz: e8254cd6fcb8a3b6711dff7f7d5cd85cb931aeed894d73a0c1463a30d0ea7e32831186d579fcff833f10a655ca7bbe37e07887e9a615428b9005639de59c56c3

data/README.md

@@ -8,18 +8,14 @@ Simple command to Bump version your project in shell.
 
 # Screencast
 
-[![asciicast](https://asciinema.org/a/c1o6gpp63xggu3w49n3xzte65.png)](https://asciinema.org/a/c1o6gpp63xggu3w49n3xzte65)
+[![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/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/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/version.rb

@@ -1,3 +1,3 @@
 module Bumpversion
-  VERSION = '0.5.2'.freeze
+  VERSION = '1.0.0'.freeze
 end

data/spec/bumpversion_spec.rb

@@ -74,6 +74,19 @@ 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

metadata

@@ -1,29 +1,29 @@
 --- !ruby/object:Gem::Specification
 name: bumpversion
 version: !ruby/object:Gem::Version
-  version: 0.5.2
+  version: 1.0.0
 platform: ruby
 authors:
 - Dlani Mendes
-autorequire: 
+autorequire:
 bindir: bin
 cert_chain: []
-date: 2018-04-24 00:00:00.000000000 Z
+date: 2021-06-11 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.7.3
-signing_key: 
+rubygems_version: 3.1.2
+signing_key:
 specification_version: 4
 summary: Auto Bump Version to any project
 test_files: