bmp 1.2.0 → 1.3.1

data/lib/bump/domain/file_update_rule_factory.rb

@@ -1,30 +1,22 @@
-
-
 module Bump
-
-    # The factory class for the file update rule model
-    class FileUpdateRuleFactory
-
-        # Creates the file update rule from the given params.
-        #
-        # @param [String] file The filename
-        # @param [String|Array] param The version update info
-        # @param [String] before_version
-        # @param [String] after_version
-        # @return [Bump::FileUpdateRule, Array<Bump::FileUpdateRule>]
-        def self.create file, param, before_version, after_version
-
-            case param
-            when String
-                return FileUpdateRule.new file, param, before_version, after_version
-            when Array
-                return param.map { |param| FileUpdateRule.new file, param, before_version, after_version }.flatten
-            else
-                return FileUpdateRule.new file, nil, before_version, after_version
-            end
-
-        end
-
+  # The factory class for the file update rule model
+  class FileUpdateRuleFactory
+    # Creates the file update rule from the given params.
+    #
+    # @param [String] file The filename
+    # @param [String|Array] param The version update info
+    # @param [String] before_version
+    # @param [String] after_version
+    # @return [Bump::FileUpdateRule, Array<Bump::FileUpdateRule>]
+    def self.create(file, param, before_version, after_version)
+      case param
+      when String
+        return FileUpdateRule.new file, param, before_version, after_version
+      when Array
+        return param.map { |param0| FileUpdateRule.new file, param0, before_version, after_version }.flatten
+      else
+        return FileUpdateRule.new file, nil, before_version, after_version
+      end
     end
-
+  end
 end

data/lib/bump/domain/version_number.rb

@@ -1,63 +1,46 @@
-# lib/bump/domain/version.rb
-
 module Bump
+  # The version number model
+  class VersionNumber
+    attr_writer :preid
+
+    # @param [Integer] major
+    # @param [Integer] minor
+    # @param [Integer] patch
+    # @param [String, nil] preid
+    def initialize(major, minor, patch, preid = nil)
+      @major = major
+      @minor = minor
+      @patch = patch
+      @preid = preid
+    end
 
-    # The version number model
-    class VersionNumber
-
-        # @param [Integer] major
-        # @param [Integer] minor
-        # @param [Integer] patch
-        # @param [String, nil] preid
-        def initialize major, minor, patch, preid = nil
-            @major = major
-            @minor = minor
-            @patch = patch
-            @preid = preid
-        end
-
-        # Bumps the version at the given level
-        #
-        # @param [Symbol] level
-        # @return [void]
-        def bump level
-
-            case level
-            when :major
-                @major += 1
-                @minor = 0
-                @patch = 0
-            when :minor
-                @minor += 1
-                @patch = 0
-            when :patch
-                @patch += 1
-            end
-            @preid = nil
-
-        end
-
-        # Sets the preid
-        #
-        # @return [void]
-        def setPreid preid
-            @preid = preid
-        end
-
-        # Returns the string representation of the version
-        #
-        # @return [String]
-        def to_s
-            label = @major.to_s + '.' + @minor.to_s + '.' + @patch.to_s
-
-            if @preid
-                label = label + '-' + @preid
-            end
+    # Bumps the version at the given level
+    #
+    # @param [Symbol] level
+    # @return [void]
+    def bump(level)
+      case level
+      when :major
+        @major += 1
+        @minor = 0
+        @patch = 0
+      when :minor
+        @minor += 1
+        @patch = 0
+      when :patch
+        @patch += 1
+      end
+      @preid = nil
+    end
 
-            label
+    # Returns the string representation of the version
+    # @return [String]
+    def to_s
+      label = @major.to_s + '.' + @minor.to_s + '.' + @patch.to_s
 
-        end
+      label = label + '-' + @preid if @preid
 
+      label
     end
-
+  end
 end

data/lib/bump/domain/version_number_factory.rb

@@ -1,23 +1,17 @@
-
-
 module Bump
-
-    # The factory class for the version number
-    class VersionNumberFactory
-
-        # Regexp for version expression
-        VERSION_REGEXP = /^(\d+).(\d+).(\d+)(-(\S*))?$/
-
-        # Creates the version number object from the string
-        #
-        # @param [String] version_string
-        # @return [Bump::VersionNumber]
-        def self.fromString version_string
-            match = VERSION_REGEXP.match version_string
-
-            return VersionNumber.new match[1].to_i, match[2].to_i, match[3].to_i, match[5]
-        end
-
+  # The factory class for the version number
+  class VersionNumberFactory
+    # Regexp for version expression
+    VERSION_REGEXP = /^(\d+).(\d+).(\d+)(-(\S*))?$/
+
+    # Creates the version number object from the string
+    #
+    # @param [String] version_string
+    # @return [Bump::VersionNumber]
+    def self.from_string(version_string)
+      match = VERSION_REGEXP.match version_string
+
+      VersionNumber.new match[1].to_i, match[2].to_i, match[3].to_i, match[5]
     end
-
+  end
 end

data/lib/bump/logger.rb

@@ -1,54 +1,48 @@
-# lib/bump/logger.rb
-
 module Bump
+  # The logging class
+  class Logger
+    def initialize(no_color = nil)
+      @no_color = no_color
+    end
 
-    # The logging class
-    class Logger
-
-        no_color = false
-
-        # Logs the message.
-        #
-        # @param [String] message
-        # @param [Boolean] breakline
-        # @return [void]
-        def log message = '', breakline = true
-            print message
-
-            if breakline
-                print "\n"
-            end
-        end
-
-        # Colorize the text by the color code.
-        #
-        # @param [String] text
-        # @param [Integer] color_code
-        # @return [String]
-        def colorize text, color_code
-            if @no_color
-                text
-            else
-                "\e[#{color_code}m#{text}\e[0m"
-            end
-        end
+    # Logs the message.
+    #
+    # @param [String] message
+    # @param [Boolean] breakline
+    # @return [void]
+    def log(message = '', breakline = true)
+      print message
 
-        # Returns a green string.
-        #
-        # @param [String] text
-        # @return [String]
-        def green text
-            colorize text, 32
-        end
+      print "\n" if breakline
+    end
 
-        # Returns a red string.
-        #
-        # @param [String] text
-        # @return [String]
-        def red text
-            colorize text, 31
-        end
+    # Colorize the text by the color code.
+    #
+    # @param [String] text
+    # @param [Integer] color_code
+    # @return [String]
+    def colorize(text, color_code)
+      if @no_color
+        text
+      else
+        "\e[#{color_code}m#{text}\e[0m"
+      end
+    end
 
+    # Returns a green string.
+    #
+    # @param [String] text
+    # @return [String]
+    def green(text)
+      colorize text, 32
     end
 
+    # Returns a red string.
+    #
+    # @param [String] text
+    # @return [String]
+    def red(text)
+      colorize text, 31
+    end
+  end
 end

data/lib/bump/version.rb

@@ -1,4 +1,3 @@
 module Bump
-    # The version
-    VERSION = "1.2.0"
+  VERSION = '1.3.1'.freeze
 end

data/spec/bump/application_spec.rb

@@ -3,70 +3,153 @@ require 'spec_helper'
 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 = double 'logger'
+    allow(@logger).to receive(:log)
+    allow(@logger).to receive(:green)
+    allow(@logger).to receive(:red)
+  end
+
+  describe '#select_action' 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.select_action).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.select_action).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.select_action).to eq :info
+    end
 
-    before :each do
-        @help_message = 'help_message'
-        @version_exp = "Bmp #{Bump::VERSION}"
-        @bmp_file = 'spec/fixture/bmp.yml'
-        @logger = Bump::Logger.new
+    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.select_action).to eq :bump
+
+      app = Bump::Application.new({ minor: true }, @help_message, @version_exp, @bmp_file, @logger)
+      expect(app.select_action).to eq :bump
+
+      app = Bump::Application.new({ patch: true }, @help_message, @version_exp, @bmp_file, @logger)
+      expect(app.select_action).to eq :bump
+
+      app = Bump::Application.new({ commit: true }, @help_message, @version_exp, @bmp_file, @logger)
+      expect(app.select_action).to eq :bump
+
+      app = Bump::Application.new({ preid: true }, @help_message, @version_exp, @bmp_file, @logger)
+      expect(app.select_action).to eq :bump
+
+      app = Bump::Application.new({ release: true }, @help_message, @version_exp, @bmp_file, @logger)
+      expect(app.select_action).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.select_action).to eq :info
     end
+  end
 
-    describe 'selectAction' do
+  describe '#main' do
+    it 'logs version and returns true when the version option is given' do
+      expect(@logger).to receive(:log).with("Bmp #{Bump::VERSION}", true).once
 
-        it 'returns :help if the options contain :help' do
+      app = Bump::Application.new({ version: true }, @help_message, @version_exp, @bmp_file, @logger)
+      expect(app.main).to be true
+    end
 
-            app = Bump::Application.new({ :help => true }, @help_message, @version_exp, @bmp_file, @logger)
+    it 'logs help message and returns true when the help option is given' do
+      expect(@logger).to receive(:log).with('help_message', true).once
 
-            expect(app.selectAction).to eq :help
+      app = Bump::Application.new({ help: true }, @help_message, @version_exp, @bmp_file, @logger)
+      expect(app.main).to be true
+    end
 
-        end
+    it 'shows bump info and return true when there is no error' do
+      app = Bump::Application.new({ info: true }, @help_message, @version_exp, @bmp_file, @logger)
 
-        it 'returns :version if the :version option preset' do
+      expect(app.main).to be true
+    end
 
-            app = Bump::Application.new({ :version => true }, @help_message, @version_exp, @bmp_file, @logger)
+    it 'shows bump info and returns false when there are errors' do
+      app = Bump::Application.new({ info: true }, @help_message, @version_exp, 'spec/fixture/bmp_invalid.yml', @logger)
 
-            expect(app.selectAction).to eq :version
+      expect(app.main).to be false
+    end
 
-        end
+    it 'returns false when the pattern in bmp.yml is invalid' do
+      app = Bump::Application.new({ info: true }, @help_message, @version_exp, 'spec/fixture/bmp_invalid_pattern.yml', @logger)
 
-        it 'returns :info if the :info option present' do
+      expect(app.main).to be false
+    end
+
+    it 'returns false when the bmp.yml not found' do
+      app = Bump::Application.new({ info: true }, @help_message, @version_exp, 'spec/fixture/bmp_not_exists.yml', @logger)
 
-            app = Bump::Application.new({ :info => true }, @help_message, @version_exp, @bmp_file, @logger)
+      expect(app.main).to be false
+    end
 
-            expect(app.selectAction).to eq :info
+    describe 'with :major|:minor|:patch|:preid|:release options' do
+      it 'returns false when the pattern in bmp.yml is invalid' do
+        app = Bump::Application.new({ major: true }, @help_message, @version_exp, 'spec/fixture/bmp_invalid_pattern.yml', @logger)
 
-        end
+        expect(app.main).to be false
 
-        it 'returns :bump if one of :major, :minor, :patch, :commit, :preid, :release options present' do
+        app = Bump::Application.new({ minor: true }, @help_message, @version_exp, 'spec/fixture/bmp_invalid_pattern.yml', @logger)
 
-            app = Bump::Application.new({ :major => true }, @help_message, @version_exp, @bmp_file, @logger)
-            expect(app.selectAction).to eq :bump
+        expect(app.main).to be false
 
-            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, 'spec/fixture/bmp_invalid_pattern.yml', @logger)
 
-            app = Bump::Application.new({ :patch => true }, @help_message, @version_exp, @bmp_file, @logger)
-            expect(app.selectAction).to eq :bump
+        expect(app.main).to be false
 
-            app = Bump::Application.new({ :commit => true }, @help_message, @version_exp, @bmp_file, @logger)
-            expect(app.selectAction).to eq :bump
+        app = Bump::Application.new({ preid: 'beta.1' }, @help_message, @version_exp, 'spec/fixture/bmp_invalid_pattern.yml', @logger)
 
-            app = Bump::Application.new({ :preid => true }, @help_message, @version_exp, @bmp_file, @logger)
-            expect(app.selectAction).to eq :bump
+        expect(app.main).to be false
 
-            app = Bump::Application.new({ :release => true }, @help_message, @version_exp, @bmp_file, @logger)
-            expect(app.selectAction).to eq :bump
+        app = Bump::Application.new({ release: true }, @help_message, @version_exp, 'spec/fixture/bmp_invalid_pattern.yml', @logger)
 
-        end
+        expect(app.main).to be false
+      end
 
-        it 'returns :info if none of the above options are present' do
+      it 'returns true when no error found' do
+        File.write 'spec/fixture/tmp_bmp_tmp.yml', File.read('spec/fixture/bmp_tmp.yml', encoding: Encoding::UTF_8)
+        File.write 'spec/fixture/tmp_dummy.txt', File.read('spec/fixture/dummy.txt', encoding: Encoding::UTF_8)
 
-            app = Bump::Application.new({}, @help_message, @version_exp, @bmp_file, @logger)
-            expect(app.selectAction).to eq :info
+        app = Bump::Application.new({ patch: true }, @help_message, @version_exp, 'spec/fixture/tmp_bmp_tmp.yml', @logger)
 
-        end
+        expect(app.main).to be true
 
+        File.delete 'spec/fixture/tmp_bmp_tmp.yml'
+        File.delete 'spec/fixture/tmp_dummy.txt'
+      end
     end
 
+    describe 'with :commit options' do
+      it 'executes git commands if there is no error' do
+        File.write 'spec/fixture/tmp_bmp_tmp.yml', File.read('spec/fixture/bmp_tmp.yml', encoding: Encoding::UTF_8)
+        File.write 'spec/fixture/tmp_dummy.txt', File.read('spec/fixture/dummy.txt', encoding: Encoding::UTF_8)
+
+        command = double 'command'
+
+        app = Bump::Application.new({ patch: true, commit: true }, @help_message, @version_exp, 'spec/fixture/tmp_bmp_tmp.yml', @logger, command)
+
+        expect(command).to receive(:exec).thrice
+
+        expect(app.main).to be true
+
+        File.delete 'spec/fixture/tmp_bmp_tmp.yml'
+        File.delete 'spec/fixture/tmp_dummy.txt'
+      end
+    end
+  end
 end