bmp 1.1.0 → 1.2.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: fc7fc09eab106321ca1b52cc1500b2d108cf38dc
-  data.tar.gz: 62a64013e198ab097c8d40a1f00d4b9aca495116
+  metadata.gz: d2c8239d42b3a23ccafc9aa63bb1d68c0b93771c
+  data.tar.gz: 5428fb76d0951706ff3c538d12059d8931594ba9
 SHA512:
-  metadata.gz: 529f725cfecf105095a16ba8d624c5e257637dc88d7e13d5f55239b9f70f1f10c966483db7f5048ac9c693420a8f989b84204bdb67f1e2138761328962c0ced0
-  data.tar.gz: cb568f521ee91577b8ee81d8ec7a9cb6aa26a8e1b97fbd2f7510949bb5c85bba8f8101c9a1c633b0915bf6c4bd237184ff58b74d2ac6bd36cbb7ab089b3004fe
+  metadata.gz: ce2e10ce24b53b7f515106ed3b3eb83f5b4332a97718e363f127d91eb20226f0ba1046724267c8f01e3c2f3c00574e146008172e174fcd33e2ddd7a8c77156f5
+  data.tar.gz: dd40f2c484593c87a248a8ecb77531f438debb64eec606cff7c5041592859f5d5ae5826949bf45290568300304ab7dd33a8a864171c450d4f2d9c77bc80f2caf

data/.bmp.yml

@@ -1,5 +1,6 @@
 ---
-version: 1.1.0
+version: 1.2.0
+commit: 'chore(version): bump to v%.%.%'
 files:
   README.md: Bmp v%.%.%
   lib/bump/version.rb: VERSION = "%.%.%"

data/.travis.yml

@@ -1 +1,8 @@
 language: ruby
+
+rvm:
+- 2.0.0
+- 2.1
+- 2.2
+
+sudo: false

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    bmp (1.1.0)
+    bmp (1.2.0)
       slop (~> 4.2.0)
 
 GEM
@@ -65,3 +65,6 @@ DEPENDENCIES
   rspec
   simplecov
   slop (~> 4.2.0)
+
+BUNDLED WITH
+   1.10.6

data/{LICENSE.txt → LICENSE}

@@ -1,4 +1,4 @@
-Copyright (c) 2015 Yoshiya Hinosawa
+Copyright (c) 2016 Yoshiya Hinosawa
 
 MIT License
 

data/README.md

@@ -1,4 +1,4 @@
-# Bmp v1.1.0
+# Bmp v1.2.0
 
 [![Gem Version](https://img.shields.io/gem/v/bmp.svg)](http://badge.fury.io/rb/bmp)
 [![Build Status](https://img.shields.io/travis/kt3k/bmp.svg)](https://travis-ci.org/kt3k/bmp)
@@ -19,37 +19,55 @@ This install `bmp` command
 
 ## Usage
 
-### `.bmp.yml` version description file
+### `.bmp.yml` file
 
-put `.bmp.yml` file on the top of your repository like following:
+First you need to put `.bmp.yml` file on the top of your repository like the following:
 
-```
+```yml
 ---
 version: 0.1.6
+commit: Bump to version v%.%.%
 files:
   gradle.properties: version=%.%.%
   README.md:
-  - coveralls-gradle-plugin v%.%.%
-  - org.kt3k.gradle.plugin:coveralls-gradle-plugin:%.%.%
+    - coveralls-gradle-plugin v%.%.%
+    - org.kt3k.gradle.plugin:coveralls-gradle-plugin:%.%.%
 ```
 
-`version` value is the current version number of the repository.
+`version` property is the current version number of the repository.
 
-`files` are the mappings of the files which contain version numbers in them.
+`commit` property is the commit comment of bump commits. This field is optional. The default is `Bump to version v%.%.%`.
 
-```
+`files` are the patterns of the files which contain version numbers in them. The key is the filename and value is the pattern containing the version number. `%.%.%` in the pettern string expresses the current vesion number.
+
+Example:
+```yml
 gradle.properties: version=%.%.%
 ```
 
-The expression above means the file `./gradle.properties` contains the string `version=0.1.6` (because the current version is 0.1.6) and `%.%.%` is the placeholder for current version number and will updated on version bumps.
+The expression above means the file `./gradle.properties` contains the pattern `version=0.1.6` (for now) and `%.%.%` part means the current version number (`0.1.6`) and it will be replaced in each version bumping.
+
+You can set arrays of string to the value for a pattern. In that case, every string is considered as a separate pattern and all will be replaced with the next version in each bump
+
+Example:
+```yml
+README.md:
+  - coveralls-gradle-plugin v%.%.%
+  - org.kt3k.gradle.plugin:coveralls-gradle-plugin:%.%.%
+```
+
+## The commands
 
-### bmp command
+### Info
 
 Show current version info:
 ```
 bmp [-i|--info]
 ```
 
+This shows errors if exist. You can check the contents of `.bmp.yml` with this command.
+
+### Bump
 
 bump patch (0.0.1) level:
 ```
@@ -71,10 +89,30 @@ bmp -j|--major
 ```
 
 
-commit bump results
+Add `preid`:
+```
+bmp --preid beta.1 # This performs 1.2.3 => 1.2.3-beta.1
+```
+
+Remove `preid` (which means you `release` it):
+```
+bmp --release
+```
+
+### Commit (and tag)
+
+Commit bump results (and tag it):
 ```
 bmp -c|--commit
 ```
 
 `bmp -c` commits all the changes now the repository has. Be careful.
 And this command also tag it as `vX.Y.Z`.
+
+# History
+
+- 2016-05-15   v1.2.0   Add commit property in `.bmp.yml`.
+
+# License
+
+MIT

data/TODO.md

@@ -1,5 +1,7 @@
 # TODO
 
+- Add frontend layer between slop and application
+- use mock library
 - gh-pages yardoc
 - bmp -t|--touch -> create empty .bmp.yml
 

data/lib/bump/application.rb

@@ -98,15 +98,28 @@ module Bump
             log "Version patterns:"
 
             bumpInfo.updateRules.each do |rule|
+
+                if not rule.fileExists
+
+                    log_red "  #{rule.file}:", false
+                    log_red " '#{rule.beforePattern}' (file not found)"
+
+                    next
+
+                end
+
                 log "  #{rule.file}:", false
 
-                if rule.patternExists
-                    log_green " '#{rule.beforePattern}'"
-                else
+                if not rule.patternExists
+
                     log_red " '#{rule.beforePattern}' (pattern not found)"
+
+                    next
+
                 end
-            end
 
+                log_green " '#{rule.beforePattern}'"
+            end
         end
 
         # handler of `bmp [--info]`
@@ -204,7 +217,7 @@ module Bump
 
             if @options[:commit]
                 comm.exec "git add ."
-                comm.exec "git commit -m 'Bump to version v#{bumpInfo.afterVersion}'"
+                comm.exec "git commit -m '#{bumpInfo.getCommitMessage}'"
                 comm.exec "git tag v#{bumpInfo.afterVersion}"
             end
         end
@@ -247,7 +260,7 @@ module Bump
         # @return [void]
         def log_red message, newline = true
 
-            @logger.log_red message, newline
+            log @logger.red(message), newline
 
         end
 
@@ -258,7 +271,7 @@ module Bump
         # @return [void]
         def log_green message, newline = true
 
-            @logger.log_green message, newline
+            log @logger.green(message), newline
 
         end
 

data/lib/bump/domain/bump_info.rb

@@ -1,4 +1,3 @@
-
 require 'yaml'
 
 module Bump
@@ -6,11 +5,17 @@ module Bump
     # The bump information model
     class BumpInfo
 
-        # @param [Bump::VersionNumber] version
-        # @param [Array] files
-        def initialize version, files
+        # @param [Bump::VersionNumber] version The version
+        # @param [Array] files The replace patterns
+        # @param [String] commit The commit message
+        def initialize version, files, commit
             @version = version
             @files = files
+            @commit = commit
+
+            if not @commit
+                @commit = 'Bump to version v%.%.%'
+            end
 
             @before_version = @version.to_s
             @after_version = @version.to_s
@@ -31,6 +36,20 @@ module Bump
             @files
         end
 
+        # Returns the commit message
+        #
+        # @return [String]
+        def commit
+            @commit
+        end
+
+        # Gets the commit message with the current version number
+        #
+        # @return [String]
+        def getCommitMessage
+            @commit.sub '%.%.%', @after_version
+        end
+
         # Performs bumping version
         #
         # @param [Symbol] level
@@ -85,7 +104,7 @@ module Bump
 
             createUpdateRules.each do |rule|
 
-                if not rule.patternExists
+                if not rule.fileExists or not rule.patternExists
                     return false
                 end
 

data/lib/bump/domain/bump_info_repository.rb

@@ -1,5 +1,3 @@
-
-
 require 'yaml'
 
 module Bump
@@ -21,9 +19,8 @@ module Bump
 
             config = YAML.load_file @file
             version = VersionNumberFactory.fromString config['version']
-            files = config['files']
 
-            BumpInfo.new version, files
+            BumpInfo.new version, config['files'], config['commit']
 
         end
 
@@ -40,7 +37,15 @@ module Bump
         # @return [Hash]
         def toYaml bumpInfo
 
-            {"version" => bumpInfo.version.to_s, "files" => bumpInfo.files}.to_yaml
+            hash = { "version" => bumpInfo.version.to_s }
+
+            if bumpInfo.commit
+                hash["commit"] = bumpInfo.commit
+            end
+
+            hash["files"] = bumpInfo.files
+
+            hash.to_yaml
 
         end
 

data/lib/bump/domain/file_update_rule.rb

@@ -51,11 +51,17 @@ module Bump
             File.read @file, :encoding => Encoding::UTF_8
         end
 
+        # Returns true if the file exists
+        # @return [Boolean]
+        def fileExists
+            File.exist? @file
+        end
+
         # Checks if the pattern found in the file
         #
         # @return [Boolean]
         def patternExists
-            fileGetContents.index @before_pattern
+            fileGetContents.index(@before_pattern) != nil
         end
 
         # Performs file update

data/lib/bump/logger.rb

@@ -20,24 +20,6 @@ module Bump
             end
         end
 
-        # Logs the message in green.
-        #
-        # @param [String] message
-        # @param [Boolean] breakline
-        # @return [void]
-        def log_green message = '', breakline = true
-            log green(message), breakline
-        end
-
-        # Logs the message in red.
-        #
-        # @param [String] message
-        # @param [Boolean] breakline
-        # @return [void]
-        def log_red message = '', breakline = true
-            log red(message), breakline
-        end
-
         # Colorize the text by the color code.
         #
         # @param [String] text

data/lib/bump/version.rb

@@ -1,4 +1,4 @@
 module Bump
     # The version
-    VERSION = "1.1.0"
+    VERSION = "1.2.0"
 end

data/spec/bump/application_spec.rb

@@ -4,4 +4,69 @@ require 'bump'
 
 describe Bump::Application do
 
+    before :each do
+        @help_message = 'help_message'
+        @version_exp = "Bmp #{Bump::VERSION}"
+        @bmp_file = 'spec/fixture/bmp.yml'
+        @logger = Bump::Logger.new
+
+    end
+
+    describe 'selectAction' do
+
+        it 'returns :help if the options contain :help' do
+
+            app = Bump::Application.new({ :help => true }, @help_message, @version_exp, @bmp_file, @logger)
+
+            expect(app.selectAction).to eq :help
+
+        end
+
+        it 'returns :version if the :version option preset' do
+
+            app = Bump::Application.new({ :version => true }, @help_message, @version_exp, @bmp_file, @logger)
+
+            expect(app.selectAction).to eq :version
+
+        end
+
+        it 'returns :info if the :info option present' do
+
+            app = Bump::Application.new({ :info => true }, @help_message, @version_exp, @bmp_file, @logger)
+
+            expect(app.selectAction).to eq :info
+
+        end
+
+        it 'returns :bump if one of :major, :minor, :patch, :commit, :preid, :release options present' do
+
+            app = Bump::Application.new({ :major => true }, @help_message, @version_exp, @bmp_file, @logger)
+            expect(app.selectAction).to eq :bump
+
+            app = Bump::Application.new({ :minor => true }, @help_message, @version_exp, @bmp_file, @logger)
+            expect(app.selectAction).to eq :bump
+
+            app = Bump::Application.new({ :patch => true }, @help_message, @version_exp, @bmp_file, @logger)
+            expect(app.selectAction).to eq :bump
+
+            app = Bump::Application.new({ :commit => true }, @help_message, @version_exp, @bmp_file, @logger)
+            expect(app.selectAction).to eq :bump
+
+            app = Bump::Application.new({ :preid => true }, @help_message, @version_exp, @bmp_file, @logger)
+            expect(app.selectAction).to eq :bump
+
+            app = Bump::Application.new({ :release => true }, @help_message, @version_exp, @bmp_file, @logger)
+            expect(app.selectAction).to eq :bump
+
+        end
+
+        it 'returns :info if none of the above options are present' do
+
+            app = Bump::Application.new({}, @help_message, @version_exp, @bmp_file, @logger)
+            expect(app.selectAction).to eq :info
+
+        end
+
+    end
+
 end

data/spec/bump/command_spec.rb

@@ -0,0 +1,23 @@
+
+
+
+describe Bump::Command do
+
+    describe '#exec' do
+
+        it 'prints and executes the command' do
+
+            logger = double()
+
+            comm = Bump::Command.new logger
+
+            expect(logger).to receive(:log).with "===> echo 1"
+            expect(logger).to receive(:log).with "1\n"
+
+            comm.exec "echo 1"
+
+        end
+
+    end
+
+end

data/spec/bump/domain/bump_info_repository_spec.rb

@@ -4,4 +4,35 @@ require 'spec_helper'
 
 describe Bump::BumpInfoRepository do
 
+    describe '#fromFile' do
+
+        it 'gets the bump info from the file' do
+
+            repo = Bump::BumpInfoRepository.new 'spec/fixture/bmp.yml'
+
+            bumpInfo = repo.fromFile
+
+            expect(bumpInfo.class).to eq Bump::BumpInfo
+
+        end
+
+    end
+
+    describe '#save' do
+
+        it 'saves the current info to the file' do
+
+            repo = Bump::BumpInfoRepository.new 'spec/fixture/bmp.yml'
+
+            bumpInfo = repo.fromFile
+            bumpInfo = Bump::BumpInfo.new Bump::VersionNumber.new(1, 2, 4), bumpInfo.files, bumpInfo.commit
+
+            repo.save bumpInfo
+
+            bumpInfo = repo.fromFile
+            expect(bumpInfo.version.to_s).to eq '1.2.4'
+
+        end
+    end
+
 end

data/spec/bump/domain/bump_info_spec.rb

@@ -4,4 +4,47 @@ require 'spec_helper'
 
 describe Bump::BumpInfo do
 
+    before :each do
+
+        @info = Bump::BumpInfo.new Bump::VersionNumber.new(1, 2, 3), { "README.md" => "v%.%.%", "package.json" => "v%.%.%" }, nil
+
+    end
+
+    describe '#version' do
+
+        it 'returns the version object' do
+
+            expect(@info.version.class).to eq Bump::VersionNumber
+            expect(@info.version.to_s).to eq '1.2.3'
+
+        end
+
+    end
+
+    describe '#files' do
+
+        it 'returns the hash of the files' do
+
+            expect(@info.files).to eq({ "README.md" => "v%.%.%", "package.json" => "v%.%.%" })
+
+        end
+
+    end
+
+    describe '#bump' do
+
+        it 'bumps the version with the give level' do
+
+            @info.bump :patch
+            expect(@info.version.to_s).to eq '1.2.4'
+
+            @info.bump :minor
+            expect(@info.version.to_s).to eq '1.3.0'
+
+            @info.bump :major
+            expect(@info.version.to_s).to eq '2.0.0'
+
+        end
+    end
+
 end

data/spec/bump/domain/file_update_rule_factory_spec.rb

@@ -4,4 +4,34 @@ require 'spec_helper'
 
 describe Bump::FileUpdateRuleFactory do
 
+    describe 'self.create' do
+
+        it 'creates a FileUpdateRule if the give param is string' do
+
+            rule = Bump::FileUpdateRuleFactory.create 'README.md', 'v%.%.%', '1.2.3', '2.0.0'
+
+            expect(rule.class).to eq Bump::FileUpdateRule
+
+        end
+
+        it 'craetes a list of FileUpdateRules if the give param is an array of string' do
+
+            rules = Bump::FileUpdateRuleFactory.create 'READEME.md', ['v%.%.%', 'w%.%.%'], '1.2.3', '2.0.0'
+
+            expect(rules.class).to eq Array
+            expect(rules[0].class).to eq Bump::FileUpdateRule
+            expect(rules[1].class).to eq Bump::FileUpdateRule
+            expect(rules.size).to eq 2
+        end
+
+        it 'creates a FileUpdateRule if the given param is not a string nor an array' do
+
+            rule = Bump::FileUpdateRuleFactory.create 'READEME.md', nil, '1.2.3', '2.0.0'
+
+            expect(rule.class).to eq Bump::FileUpdateRule
+
+        end
+
+    end
+
 end

data/spec/bump/domain/file_update_rule_spec.rb

@@ -1,15 +1,18 @@
-
 require 'bump'
 require 'spec_helper'
 
 describe Bump::FileUpdateRule do
 
+    before :each do
+        @rule = Bump::FileUpdateRule.new 'spec/fixture/dummy.txt', 'v%.%.%', '1.2.3', '2.0.0'
+    end
+
     describe '#file' do
 
         it 'returns file property' do
-            rule = Bump::FileUpdateRule.new 'abc', '%.%.%', '0.0.1', '1.0.0'
 
-            expect(rule.file).to eq 'abc'
+            expect(@rule.file).to eq 'spec/fixture/dummy.txt'
+
         end
 
     end
@@ -17,9 +20,9 @@ describe Bump::FileUpdateRule do
     describe '#beforePattern' do
 
         it 'returns before_pattern property' do
-            rule = Bump::FileUpdateRule.new 'abc', 'v%.%.%', '0.0.1', '1.0.0'
 
-            expect(rule.beforePattern).to eq 'v0.0.1'
+            expect(@rule.beforePattern).to eq 'v1.2.3'
+
         end
 
     end
@@ -27,9 +30,9 @@ describe Bump::FileUpdateRule do
     describe '#afterPattern' do
 
         it 'returns before_pattern property' do
-            rule = Bump::FileUpdateRule.new 'abc', 'v%.%.%', '0.0.1', '1.0.0'
 
-            expect(rule.afterPattern).to eq 'v1.0.0'
+            expect(@rule.afterPattern).to eq 'v2.0.0'
+
         end
 
     end
@@ -38,7 +41,7 @@ describe Bump::FileUpdateRule do
 
         it 'checks if the given pattern found in the file' do
 
-            rule = Bump::FileUpdateRule.new 'abc', 'v%.%.%', '0.0.1', '1.0.0'
+            expect(@rule.patternExists).to be true
 
         end
 

data/spec/fixture/bmp.yml

@@ -0,0 +1,5 @@
+---
+version: 1.2.3
+commit: 'chore(version): bump to v%.%.%'
+files:
+  dummy.txt: v%.%.%

data/spec/fixture/dummy.txt

@@ -0,0 +1 @@
+dummy v1.2.3-rc1

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: bmp
 version: !ruby/object:Gem::Version
-  version: 1.1.0
+  version: 1.2.0
 platform: ruby
 authors:
 - Yoshiya Hinosawa
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-10-16 00:00:00.000000000 Z
+date: 2016-05-15 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: slop
@@ -66,7 +66,7 @@ files:
 - ".travis.yml"
 - Gemfile
 - Gemfile.lock
-- LICENSE.txt
+- LICENSE
 - README.md
 - Rakefile
 - TODO.md
@@ -87,6 +87,7 @@ files:
 - lib/bump/version.rb
 - spec/bump/application_spec.rb
 - spec/bump/cli_spec.rb
+- spec/bump/command_spec.rb
 - spec/bump/domain/bump_info_repository_spec.rb
 - spec/bump/domain/bump_info_spec.rb
 - spec/bump/domain/file_update_rule_factory_spec.rb
@@ -94,6 +95,8 @@ files:
 - spec/bump/domain/version_number_factory_spec.rb
 - spec/bump/domain/version_number_spec.rb
 - spec/bump/logger_spec.rb
+- spec/fixture/bmp.yml
+- spec/fixture/dummy.txt
 - spec/spec_helper.rb
 homepage: https://github.com/kt3k/bump
 licenses:
@@ -122,6 +125,7 @@ summary: No hassle on bumping
 test_files:
 - spec/bump/application_spec.rb
 - spec/bump/cli_spec.rb
+- spec/bump/command_spec.rb
 - spec/bump/domain/bump_info_repository_spec.rb
 - spec/bump/domain/bump_info_spec.rb
 - spec/bump/domain/file_update_rule_factory_spec.rb
@@ -129,4 +133,6 @@ test_files:
 - spec/bump/domain/version_number_factory_spec.rb
 - spec/bump/domain/version_number_spec.rb
 - spec/bump/logger_spec.rb
+- spec/fixture/bmp.yml
+- spec/fixture/dummy.txt
 - spec/spec_helper.rb