bmp 1.2.0 → 1.3.1

data/lib/bump/cli.rb

@@ -1,44 +1,24 @@
-
 require 'bump/version'
 require 'yaml'
-require 'slop'
 
 module Bump
+  # The command line interface
+  class CLI
+    attr_reader :app
 
-    # The command line interface
-    class CLI
-
-        # The bump info filename
-        VERSION_FILE = '.bmp.yml'
-
-        # The cli name
-        CLI_NAME = 'bmp'
-
-        # The main routine
-        #
-        # @return [void]
-        def main
-
-            opts = Slop.parse do |o|
-                o.banner = "Usage: #{CLI_NAME} [-p|-m|-j] [-c]"
+    # The bump info filename
+    VERSION_FILE = '.bmp.yml'.freeze
 
-                o.bool '-i', '--info', 'show current version info'
-                o.bool '-p', '--patch', 'bump patch (0.0.1) level'
-                o.bool '-m', '--minor', 'bump minor (0.1.0) level'
-                o.bool '-j', '--major', 'bump major (1.0.0) level'
-                o.bool '-c', '--commit', 'commit bump changes (git required)'
-                o.bool '-h', '--help', 'show this help and exit'
-                o.bool '-v', '--version', 'show the version of this command and exit'
-                o.bool '-r', '--release', 'remove the pre-release version id'
-                o.string '-s', '--preid', 'set the pre-release version id (e.g. alpha, beta.1)'
-            end
-
-            app = Application.new opts.to_hash, opts.to_s, "#{CLI_NAME} v#{Bump::VERSION}", VERSION_FILE, Logger.new
-
-            app.main
-
-        end
+    # The cli name
+    CLI_NAME = 'bmp'.freeze
 
+    def initialize(opts)
+      @app = Application.new opts.to_hash, opts.to_s, "#{CLI_NAME} v#{Bump::VERSION}", VERSION_FILE, Logger.new
     end
 
+    # The main of cli
+    def main
+      @app.main
+    end
+  end
 end

data/lib/bump/command.rb

@@ -1,22 +1,16 @@
-
-
 module Bump
-
-    # Command class executes shell command
-    class Command
-
-        # @param [Bump::Logger] logger
-        def initialize logger
-            @logger = logger
-        end
-
-        # @param [String] command
-        # @return [void]
-        def exec command
-            @logger.log "===> " + command
-            @logger.log `#{command}`
-        end
-
+  # Command class executes shell command
+  class Command
+    # @param [Bump::Logger] logger
+    def initialize(logger)
+      @logger = logger
     end
 
+    # @param [String] command
+    # @return [void]
+    def exec(command)
+      @logger.log @logger.green('+' + command)
+      @logger.log `#{command}`, nil
+    end
+  end
 end

data/lib/bump/domain.rb

@@ -1,5 +1,3 @@
-# lib/bump/domain.rb
-
 require 'bump/domain/version_number'
 require 'bump/domain/version_number_factory'
 require 'bump/domain/bump_info'

data/lib/bump/domain/bump_info.rb

@@ -1,133 +1,74 @@
 require 'yaml'
 
 module Bump
+  # The bump information model
+  class BumpInfo
+    attr_reader :version, :files, :commit, :after_version, :before_version
+
+    # @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
+
+      @commit = 'Bump to version v%.%.%' unless @commit
+
+      @before_version = @version.to_s
+      @after_version = @version.to_s
+    end
 
-    # The bump information model
-    class BumpInfo
-
-        # @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
-
-        end
-
-        # Returns the version number object
-        #
-        # @return [Bump::VersionNumber]
-        def version
-            @version
-        end
-
-        # Returns files setting list
-        #
-        # @return [Array]
-        def files
-            @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
-        # @return [void]
-        def bump level
-            @version.bump level
-            @after_version = @version.to_s
-        end
-
-        # Sets the preid
-        #
-        # @return [void]
-        def setPreid preid
-            @version.setPreid preid
-            @after_version = @version.to_s
-        end
-
-        # Gets the file update rules
-        #
-        # @return [Array<Bump::FileUpdateRules>]
-        def updateRules
-            createUpdateRules
-        end
-
-        # Creates file update rules according to the current settings.
-        #
-        # @private
-        # @return [Array<Bump::FileUpdateRule>]
-        def createUpdateRules
-            @files.map { |file, pattern|
-                FileUpdateRuleFactory.create(file, pattern, @before_version, @after_version)
-            }.flatten
-        end
-
-        # Performs all updates.
-        #
-        # @return [void]
-        def performUpdate
-
-            createUpdateRules.each do |rule|
-
-                rule.perform
-
-            end
-
-        end
-
-        # Checks the all the version patterns are available
-        #
-        # @return [Boolean]
-        def check
-
-            createUpdateRules.each do |rule|
+    # Gets the commit message with the current version number
+    # @return [String]
+    def commit_message
+      @commit.sub '%.%.%', @after_version
+    end
 
-                if not rule.fileExists or not rule.patternExists
-                    return false
-                end
+    # Performs bumping version.
+    # @param [Symbol] level
+    def bump(level)
+      @version.bump level
+      @after_version = @version.to_s
+    end
 
-            end
+    # Sets the preid.
+    # @param [String] preid The pre id
+    def preid=(preid)
+      @version.preid = preid
+      @after_version = @version.to_s
+    end
 
-            return true
+    # Gets the file update rules.
+    # @return [Array<Bump::FileUpdateRules>]
+    def update_rules
+      create_update_rules
+    end
 
-        end
+    # Creates file update rules according to the current settings.
+    # @private
+    # @return [Array<Bump::FileUpdateRule>]
+    def create_update_rules
+      @files.map do |file, pattern|
+        FileUpdateRuleFactory.create(file, pattern, @before_version, @after_version)
+      end.flatten
+    end
 
-        # Returns the version number after the bumping.
-        #
-        # @return [String]
-        def afterVersion
-            @after_version
-        end
+    # Performs all updates.
+    #
+    # @return [void]
+    def perform_update
+      create_update_rules.each(&:perform)
+    end
 
-        # Returns the version number before the bumping.
-        #
-        # @return [String]
-        def beforeVersion
-            @before_version
-        end
+    # Checks the all the version patterns are available
+    # @return [Boolean]
+    def valid?
+      create_update_rules.each do |rule|
+        return false if !rule.file_exists || !rule.pattern_exists
+      end
 
+      true
     end
-
+  end
 end

data/lib/bump/domain/bump_info_repository.rb

@@ -1,54 +1,44 @@
 require 'yaml'
 
 module Bump
+  # The repository class for the bump info
+  # persistence in file as yaml string
+  class BumpInfoRepository
+    # @param [String] file
+    def initialize(file)
+      @file = file
+    end
 
-    # The repository class for the bump info
-    # persistence in file as yaml string
-    class BumpInfoRepository
-
-        # @param [String] file
-        def initialize file
-            @file = file
-        end
-
-        # Gets the bump info from the given file
-        #
-        # @param [String] file
-        # @return [Bump::BumpInfo]
-        def fromFile
-
-            config = YAML.load_file @file
-            version = VersionNumberFactory.fromString config['version']
-
-            BumpInfo.new version, config['files'], config['commit']
-
-        end
-
-        # Saves the bump info
-        #
-        # @param [Bump::BumpInfo] bumpInfo
-        # @return [void]
-        def save bumpInfo
-            File.write @file, toYaml(bumpInfo)
-        end
-
-        # @private
-        # @param [Bump::BumpInfo] bumpInfo
-        # @return [Hash]
-        def toYaml bumpInfo
+    # Gets the bump info from the given file
+    #
+    # @param [String] file
+    # @return [Bump::BumpInfo]
+    def from_file
+      config = YAML.load_file @file
+      version = VersionNumberFactory.from_string config['version']
 
-            hash = { "version" => bumpInfo.version.to_s }
+      BumpInfo.new version, config['files'], config['commit']
+    end
 
-            if bumpInfo.commit
-                hash["commit"] = bumpInfo.commit
-            end
+    # Saves the bump info
+    #
+    # @param [Bump::BumpInfo] bumpInfo
+    # @return [void]
+    def save(bump_info)
+      File.write @file, to_yaml(bump_info)
+    end
 
-            hash["files"] = bumpInfo.files
+    # @private
+    # @param [Bump::BumpInfo] bumpInfo
+    # @return [Hash]
+    def to_yaml(bump_info)
+      hash = { 'version' => bump_info.version.to_s }
 
-            hash.to_yaml
+      hash['commit'] = bump_info.commit if bump_info.commit
 
-        end
+      hash['files'] = bump_info.files
 
+      hash.to_yaml
     end
-
+  end
 end

data/lib/bump/domain/file_update_rule.rb

@@ -1,76 +1,49 @@
-
-
 module Bump
+  # The file update rule model
+  #
+  # is able to perform actual file update
+  class FileUpdateRule
+    attr_reader :file, :before_pattern, :after_pattern
+
+    # The placeholder pattern
+    PLACEHOLDER_PATTERN = '%.%.%'.freeze
+
+    # @param [String] file
+    # @param [String] pattern
+    # @param [Bump::VersionNumber] before_version
+    # @param [Bump::VersionNumber] after_version
+    def initialize(file, pattern, before_version, after_version)
+      @file = file
+      @pattern = pattern || PLACEHOLDER_PATTERN # default pattern is '%.%.%'
+      @before_version = before_version
+      @after_version = after_version
+      @before_pattern = @pattern.sub PLACEHOLDER_PATTERN, @before_version
+      @after_pattern = @pattern.sub PLACEHOLDER_PATTERN, @after_version
+    end
 
-    # The file update rule model
+    # Gets the contents of the file
     #
-    # is able to perform actual file update
-    class FileUpdateRule
-
-        # The placeholder pattern
-        PLACEHOLDER_PATTERN = '%.%.%'
-
-        # @param [String] file
-        # @param [String] pattern
-        # @param [Bump::VersionNumber] before_version
-        # @param [Bump::VersionNumber] after_version
-        def initialize(file, pattern, before_version, after_version)
-            @file = file
-            @pattern = pattern || PLACEHOLDER_PATTERN # default pattern is '%.%.%'
-            @before_version = before_version
-            @after_version = after_version
-            @before_pattern = @pattern.sub PLACEHOLDER_PATTERN, @before_version
-            @after_pattern = @pattern.sub PLACEHOLDER_PATTERN, @after_version
-        end
-
-        # Gets the file name
-        #
-        # @return [String]
-        def file
-            @file
-        end
-
-        # Gets the version string before bumping
-        #
-        # @return [String]
-        def beforePattern
-            @before_pattern
-        end
-
-        # Gets the version string after bumping
-        #
-        # @return [String]
-        def afterPattern
-            @after_pattern
-        end
-
-        # Gets the contents of the file
-        #
-        # @return [String]
-        def fileGetContents
-            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) != nil
-        end
+    # @return [String]
+    def file_get_contents
+      File.read @file, encoding: Encoding::UTF_8
+    end
 
-        # Performs file update
-        #
-        # @return [void]
-        def perform
-            File.write @file, fileGetContents.sub(@before_pattern, @after_pattern)
-        end
+    # Returns true if the file exists
+    # @return [Boolean]
+    def file_exists
+      File.exist? @file
+    end
 
+    # Checks if the pattern found in the file
+    # @return [Boolean]
+    def pattern_exists
+      !file_get_contents.index(@before_pattern).nil?
     end
 
+    # Performs file update
+    # @return [void]
+    def perform
+      File.write @file, file_get_contents.sub(@before_pattern, @after_pattern)
+    end
+  end
 end