bumpversion 0.3.2 → 1.0.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
-SHA1:
-  metadata.gz: a583f181e8fa65d58b13c7aa9d7c8444e05ab7d5
-  data.tar.gz: 150f4f40d44860769b9f2160ffd0790bb1a0eb09
+SHA256:
+  metadata.gz: 0ee7c37fdf3f69afb4a7b1cf258fc4e19792df1c8cc0d6854d203c951188a33c
+  data.tar.gz: c148c731dec29928cb268cd737c558ad82fc8fa36bfe4b252e189e931fc41c32
 SHA512:
-  metadata.gz: 00532156bfd8ab63ba24bc024af71656b1f9f2941b9b9f965e02061c2dec3bbe2902ad5a64058c303c9275a1bec6cad7a9820eed5595541792dc02cf32568dfe
-  data.tar.gz: 32bb4710a7d86d08d6feb7e3465b3faf7f042a66113d636f54813713ea858b3dbd6e6ee6e33a898621c7918b7a5ffcf4e79dfeab7953c4bc69f0ff151e076599
+  metadata.gz: fa9c7b28bf7c2cbe6487246e68720b7f052ad30296f8b9e9d9bf88056597eaa4638d8fdcbb4a1d20c57b788f7bebd0d8dfdd0f96446ae913c459021637c8e121
+  data.tar.gz: e8254cd6fcb8a3b6711dff7f7d5cd85cb931aeed894d73a0c1463a30d0ea7e32831186d579fcff833f10a655ca7bbe37e07887e9a615428b9005639de59c56c3

data/README.md

@@ -1,20 +1,21 @@
 # Bumpversion
 
-Welcome to your new gem! In this directory, you'll find the files you need to be able to package up your Ruby library into a gem. Put your Ruby code in the file `lib/bumpversion`. To experiment with that code, run `bin/console` for an interactive prompt.
+Simple command to Bump version your project in shell.
 
-TODO: Delete this and the text above, and describe your gem
+- Bump multiple files version in your project
+- Git operations like commit, tag and push
+- Customizables Hooks
 
-# Code Status
+# 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)
+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

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

@@ -8,17 +8,12 @@ module Bumpversion
       Git.init('.')
     end
 
-    def config!
-      @git.config('user.name', @options[:git_user])
-      @git.config('user.email', @options[:git_email])
-    end
-
     def commit!
       if @options[:git_commit]
         file = @options[:file].split(',') + [@options[:config_file]]
         file += @options[:git_extra_add].split(',') if @options[:git_extra_add]
         @git.add(file)
-        @git.commit("Bump version: #{@options[:current_version]} → #{@options[:new_version]}")
+        @git.commit("Bump version: #{@options[:current_version]} → #{@options[:new_version]}", {author: "#{@options[:git_user]} <#{@options[:git_email]}>"})
       end
     end
 
@@ -32,7 +27,6 @@ module Bumpversion
     end
 
     def do!
-      config!
       commit!
       tag!
       push!

data/lib/bumpversion/parser.rb

@@ -1,4 +1,5 @@
-require 'trollop'
+require 'optimist'
+require 'bumpversion/version'
 
 module Bumpversion
   class Parser
@@ -8,14 +9,19 @@ module Bumpversion
     end
 
     def mount_banner
-      Trollop::Parser.new do
+      version_number = VERSION
+      Optimist::Parser.new do
+        version "Bumpversion #{version_number} ☺"
+        usage "bumpversion [options] --part [major|minor|patch]
+        where [options] are:"
+
         banner <<-EOS
-  Bumpversion 0.1.0
+#{version}
 
-  Usage:
-    bumpversion [options]
-    where [options] are:
+Usage:
+#{usage}
         EOS
+
         opt :help, 'Show this help!'
         opt :part, 'The part of the version to increase, [major, minor, patch]', default: 'minor'
         opt :file, 'The file that will be modified can be multi-files separated by comma.
@@ -42,12 +48,12 @@ module Bumpversion
 
     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.3.2'.freeze
+  VERSION = '1.0.0'.freeze
 end

data/spec/bumpversion_spec.rb

@@ -11,6 +11,16 @@ describe Bumpversion::Bumpversion do
     end
   end
 
+  context 'mount banner' do
+    let(:parser){ Bumpversion::Parser.new({}, {}) }
+    let(:capture_stdout){ StringIO.new }
+    let(:mount_banner){ parser.mount_banner }
+    let!(:educate){ mount_banner.educate(capture_stdout) }
+    subject{ capture_stdout.string }
+    it{ is_expected.to include "Bumpversion" }
+    it{ is_expected.to include Bumpversion::VERSION }
+  end
+
   describe 'wihout file' do
     context 'with current and new version' do
       let(:arguments) { ['--new-version=1.1.0', '--current-version=1.0.0'] }
@@ -64,16 +74,31 @@ 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/VERSION', "version=2.1.1\n")
+      File.write('./spec/files/VERSION_EXTRA', "version=2.1.1\n")
     end
     after(:all) do
       File.write('./spec/files/bumpversion.cfg', '')
       File.write('./spec/files/VERSION', '')
+      File.write('./spec/files/VERSION_EXTRA', '')
     end
     context 'patch' do
       let(:arguments) { ['--config-file=./spec/files/bumpversion.cfg', '--file=./spec/files/VERSION', '--part=patch'] }
@@ -129,5 +154,24 @@ describe Bumpversion::Bumpversion do
         expect(File.read('./spec/files/VERSION')).to include("version=3.0.0")
       end
     end
+    context 'major with extra file' do
+      let(:arguments) { ['--config-file=./spec/files/bumpversion.cfg', '--file=./spec/files/VERSION,./spec/files/VERSION_EXTRA', '--part=major'] }
+      let(:bump_instance) { Bumpversion::Bumpversion.new arguments }
+      let!(:bump_run) { bump_instance.run }
+      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: '2.1.1' }
+      it { is_expected.to include new_version: '3.0.0' }
+      it "do bump file" do
+        expect(File.read('./spec/files/bumpversion.cfg')).to include("current-version=3.0.0")
+        expect(File.read('./spec/files/VERSION')).to include("version=3.0.0")
+        expect(File.read('./spec/files/VERSION_EXTRA')).to include("version=3.0.0")
+      end
+    end
   end
 end

metadata

@@ -1,29 +1,29 @@
 --- !ruby/object:Gem::Specification
 name: bumpversion
 version: !ruby/object:Gem::Version
-  version: 0.3.2
+  version: 1.0.0
 platform: ruby
 authors:
 - Dlani Mendes
-autorequire: 
+autorequire:
 bindir: bin
 cert_chain: []
-date: 2016-04-27 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
@@ -151,13 +95,14 @@ files:
 - lib/bumpversion/writer.rb
 - spec/bumpversion_spec.rb
 - spec/files/VERSION
+- spec/files/VERSION_EXTRA
 - spec/files/bumpversion.cfg
 - spec/spec_helper.rb
 homepage: https://github.com/dlanileonardo/bumpversion
 licenses:
 - MIT
 metadata: {}
-post_install_message: 
+post_install_message:
 rdoc_options: []
 require_paths:
 - lib
@@ -172,13 +117,13 @@ 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:
 - spec/bumpversion_spec.rb
 - spec/files/VERSION
+- spec/files/VERSION_EXTRA
 - spec/files/bumpversion.cfg
 - spec/spec_helper.rb