raketeer 0.2.8 → 0.2.13

data/lib/raketeer/bump_ver.rb

@@ -1,23 +1,11 @@
-#!/usr/bin/env ruby
 # encoding: UTF-8
 # frozen_string_literal: true
 
 #--
 # This file is part of Raketeer.
-# Copyright (c) 2019 Jonathan Bradley Whited (@esotericpig)
-# 
-# Raketeer is free software: you can redistribute it and/or modify
-# it under the terms of the GNU Lesser General Public License as published by
-# the Free Software Foundation, either version 3 of the License, or
-# (at your option) any later version.
-# 
-# Raketeer is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-# GNU Lesser General Public License for more details.
-# 
-# You should have received a copy of the GNU Lesser General Public License
-# along with Raketeer.  If not, see <https://www.gnu.org/licenses/>.
+# Copyright (c) 2019-2021 Jonathan Bradley Whited
+#
+# SPDX-License-Identifier: LGPL-3.0-or-later
 #++
 
 
@@ -26,12 +14,14 @@ require 'raketeer/sem_ver'
 module Raketeer
   ###
   # Bump Version
-  # 
-  # @author Jonathan Bradley Whited (@esotericpig)
+  #
+  # @author Jonathan Bradley Whited
   # @since  0.2.4
   ###
   class BumpVer < SemVer
     def initialize(version: nil,major: nil,minor: nil,patch: nil,prerelease: nil,build_meta: nil)
+      super()
+
       self.build_meta = build_meta
       self.major = major
       self.minor = minor
@@ -39,104 +29,127 @@ module Raketeer
       self.prerelease = prerelease
       self.version = version
     end
-    
+
     def init_int_or_str(obj)
-      return nil if obj.nil?()
+      return nil if obj.nil?
       return obj if obj.is_a?(Integer)
-      
-      obj = obj.to_s().strip()
-      
-      return obj if obj.empty?() || obj[0] == '+'
-      return obj.to_i()
+
+      obj = obj.to_s.strip
+
+      return obj if obj.empty? || obj[0] == '+'
+      return obj.to_i
     end
-    
+
     def init_str(obj)
-      return obj.nil?() ? nil : obj.to_s().strip()
+      return obj.nil? ? nil : obj.to_s.strip
     end
-    
+
     def bump!(sem_ver)
-      if !@version.nil?()
+      if !@version.nil?
         sem_ver.version = @version
       else
-        if !@major.nil?()
+        if !@major.nil?
           if @major.is_a?(Integer)
             sem_ver.major = @major
-          elsif @major.empty?()
+          elsif @major.empty?
             sem_ver.major = 0 # There must always be a major version
           else
-            sem_ver.major = 0 if sem_ver.major.nil?()
-            sem_ver.major += @major.to_i()
+            sem_ver.major = 0 if sem_ver.major.nil?
+
+            old_major = sem_ver.major
+            sem_ver.major += @major.to_i
+
+            if sem_ver.major != old_major
+              # Reset minor & patch so that 1.1.1 => 2.0.0.
+              # If the user wishes, minor & patch will continue
+              #   to be affected after ('+1.+1.+1').
+              sem_ver.minor = 0
+              sem_ver.patch = 0
+
+              # It's difficult to decide whether to set
+              #   pre-release and build-metadata to nil,
+              #   so just leave them.
+            end
           end
         end
-        
-        if !@minor.nil?()
+
+        if !@minor.nil?
           if @minor.is_a?(Integer)
             sem_ver.minor = @minor
-          elsif @minor.empty?()
+          elsif @minor.empty?
             sem_ver.minor = nil
           else
-            sem_ver.minor = 0 if sem_ver.minor.nil?()
-            sem_ver.minor += @minor.to_i()
+            sem_ver.minor = 0 if sem_ver.minor.nil?
+
+            old_minor = sem_ver.minor
+            sem_ver.minor += @minor.to_i
+
+            if sem_ver.minor != old_minor
+              # Reset patch so that 1.1.1 => 1.2.0.
+              # If the user wishes, patch will continue
+              #   to be affected after ('X.+1.+1').
+              sem_ver.patch = 0
+            end
           end
         end
-        
-        if !@patch.nil?()
+
+        if !@patch.nil?
           if @patch.is_a?(Integer)
             sem_ver.patch = @patch
-          elsif @patch.empty?()
+          elsif @patch.empty?
             sem_ver.patch = nil
           else
-            sem_ver.patch = 0 if sem_ver.patch.nil?()
-            sem_ver.patch += @patch.to_i()
+            sem_ver.patch = 0 if sem_ver.patch.nil?
+            sem_ver.patch += @patch.to_i
           end
         end
-        
-        if !@prerelease.nil?()
-          if @prerelease.empty?()
+
+        if !@prerelease.nil?
+          if @prerelease.empty?
             sem_ver.prerelease = nil
           else
             sem_ver.prerelease = @prerelease
           end
         end
-        
-        if !@build_meta.nil?()
-          if @build_meta.empty?()
+
+        if !@build_meta.nil?
+          if @build_meta.empty?
             sem_ver.build_meta = nil
           else
             sem_ver.build_meta = @build_meta
           end
         end
       end
-      
+
       return sem_ver
     end
-    
+
     def bump_line!(line,sem_ver,strict: false)
-      line.sub!(self.class.regex(strict),bump!(sem_ver).to_s())
-      
+      line.sub!(self.class.regex(strict),bump!(sem_ver).to_s)
+
       return line
     end
-    
+
     def build_meta=(build_meta)
       super(init_str(build_meta))
     end
-    
+
     def major=(major)
       super(init_int_or_str(major))
     end
-    
+
     def minor=(minor)
       super(init_int_or_str(minor))
     end
-    
+
     def patch=(patch)
       super(init_int_or_str(patch))
     end
-    
+
     def prerelease=(prerelease)
       super(init_str(prerelease))
     end
-    
+
     def version=(version)
       super(init_str(version))
     end

data/lib/raketeer/files_bumper.rb

@@ -1,23 +1,11 @@
-#!/usr/bin/env ruby
 # encoding: UTF-8
 # frozen_string_literal: true
 
 #--
 # This file is part of Raketeer.
-# Copyright (c) 2019 Jonathan Bradley Whited (@esotericpig)
-# 
-# Raketeer is free software: you can redistribute it and/or modify
-# it under the terms of the GNU Lesser General Public License as published by
-# the Free Software Foundation, either version 3 of the License, or
-# (at your option) any later version.
-# 
-# Raketeer is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-# GNU Lesser General Public License for more details.
-# 
-# You should have received a copy of the GNU Lesser General Public License
-# along with Raketeer.  If not, see <https://www.gnu.org/licenses/>.
+# Copyright (c) 2019-2021 Jonathan Bradley Whited
+#
+# SPDX-License-Identifier: LGPL-3.0-or-later
 #++
 
 
@@ -26,7 +14,7 @@ require 'raketeer/sem_ver'
 
 module Raketeer
   ###
-  # @author Jonathan Bradley Whited (@esotericpig)
+  # @author Jonathan Bradley Whited
   # @since  0.2.4
   ###
   class FilesBumper
@@ -42,67 +30,67 @@ module Raketeer
     attr_accessor :strict
     attr_accessor :version
     attr_accessor :version_bumped # Was the version actually bumped?
-    
+
     alias_method :bump_ver_empty?,:bump_ver_empty
     alias_method :dry_run?,:dry_run
     alias_method :strict?,:strict
     alias_method :version_bumped?,:version_bumped
-    
+
     def initialize(files,bump_ver,dry_run,strict,&init_per_file)
       @bump_ver = bump_ver
-      @bump_ver_empty = bump_ver.empty?()
+      @bump_ver_empty = bump_ver.empty?
       @dry_run = dry_run
-      @files = files.to_a()
+      @files = files.to_a
       @init_per_file = init_per_file
       @sem_ver = nil
       @strict = strict
       @version = nil
       @version_bumped = false
     end
-    
+
     def add_change(line,push: true)
       puts "+ #{line}"
-      
+
       @changes += 1
       @lines << line if push
     end
-    
+
     def bump_files(&block)
       @files.each do |filename|
         puts "[#{filename}]:"
-        
+
         if !File.exist?(filename)
           puts '! File does not exist'
-          
+
           next
         end
-        
+
         @changes = 0 # For possible future use
         @lines = []
         @sem_ver = nil
-        
-        @init_per_file.call(self) unless @init_per_file.nil?()
-        
+
+        @init_per_file&.call(self)
+
         File.foreach(filename) do |line|
           @line = line
-          
-          block.call(self) if !@line.strip().empty?()
-          
+
+          block.call(self) if !@line.strip.empty?
+
           @lines << @line
         end
-        
-        next if bump_ver_empty?()
-        
+
+        next if bump_ver_empty?
+
         print '= '
-        
+
         if @changes > 0
-          if dry_run?()
+          if dry_run?
             puts "Nothing written (dry run): #{@sem_ver}"
           else
             File.open(filename,'w') do |file|
               file.puts @lines
             end
-            
+
             puts "#{@changes} change#{@changes == 1 ? '' : 's'} written"
           end
         else
@@ -110,42 +98,40 @@ module Raketeer
         end
       end
     end
-    
+
     # @return [:no_ver,:same_ver,:bumped_ver]
     def bump_line!(add_change: true)
       @sem_ver = SemVer.parse_line(@line,strict: @strict)
-      
-      return :no_ver if @sem_ver.nil?()
-      
-      @version = @sem_ver if @version.nil?()
-      
-      if bump_ver_empty?()
+
+      return :no_ver if @sem_ver.nil?
+
+      @version = @sem_ver if @version.nil?
+
+      if bump_ver_empty?
         puts "= #{@sem_ver}"
-        
+
         return :same_ver
       else
-        orig_line = @line.dup()
-        orig_sem_ver_s = @sem_ver.to_s()
-        
+        orig_line = @line.dup
+        orig_sem_ver_s = @sem_ver.to_s
+
         @bump_ver.bump_line!(@line,@sem_ver,strict: @strict)
-        
-        if @sem_ver.to_s() != orig_sem_ver_s
+
+        if @sem_ver.to_s != orig_sem_ver_s
           if !@version_bumped
             @version = @sem_ver
             @version_bumped = true
           end
-          
+
           self.add_change(@line,push: false) if add_change
-          
+
           return :bumped_ver
         else
           @line = orig_line
-          
+
           return :same_ver
         end
       end
-      
-      return :no_ver
     end
   end
 end

data/lib/raketeer/github_pkg.rb

@@ -1,23 +1,11 @@
-#!/usr/bin/env ruby
 # encoding: UTF-8
 # frozen_string_literal: true
 
 #--
 # This file is part of Raketeer.
-# Copyright (c) 2020 Jonathan Bradley Whited (@esotericpig)
-# 
-# Raketeer is free software: you can redistribute it and/or modify
-# it under the terms of the GNU Lesser General Public License as published by
-# the Free Software Foundation, either version 3 of the License, or
-# (at your option) any later version.
-# 
-# Raketeer is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-# GNU Lesser General Public License for more details.
-# 
-# You should have received a copy of the GNU Lesser General Public License
-# along with Raketeer.  If not, see <https://www.gnu.org/licenses/>.
+# Copyright (c) 2019-2021 Jonathan Bradley Whited
+#
+# SPDX-License-Identifier: LGPL-3.0-or-later
 #++
 
 
@@ -26,11 +14,11 @@ require 'raketeer/github_pkg_task'
 
 module Raketeer
   ###
-  # @author Jonathan Bradley Whited (@esotericpig)
+  # @author Jonathan Bradley Whited
   # @since  0.2.8
   ###
   module GitHubPkg
   end
 end
 
-Raketeer::GitHubPkgTask.new() # @since 0.2.8
+Raketeer::GitHubPkgTask.new # @since 0.2.8

data/lib/raketeer/github_pkg_task.rb

@@ -1,23 +1,11 @@
-#!/usr/bin/env ruby
 # encoding: UTF-8
 # frozen_string_literal: true
 
 #--
 # This file is part of Raketeer.
-# Copyright (c) 2020 Jonathan Bradley Whited (@esotericpig)
-# 
-# Raketeer is free software: you can redistribute it and/or modify
-# it under the terms of the GNU Lesser General Public License as published by
-# the Free Software Foundation, either version 3 of the License, or
-# (at your option) any later version.
-# 
-# Raketeer is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-# GNU Lesser General Public License for more details.
-# 
-# You should have received a copy of the GNU Lesser General Public License
-# along with Raketeer.  If not, see <https://www.gnu.org/licenses/>.
+# Copyright (c) 2019-2021 Jonathan Bradley Whited
+#
+# SPDX-License-Identifier: LGPL-3.0-or-later
 #++
 
 
@@ -28,7 +16,7 @@ require 'raketeer/util'
 
 module Raketeer
   ###
-  # @author Jonathan Bradley Whited (@esotericpig)
+  # @author Jonathan Bradley Whited
   # @since  0.2.8
   ###
   class GitHubPkgTask < Rake::TaskLib
@@ -36,34 +24,34 @@ module Raketeer
     attr_accessor :description
     attr_accessor :name
     attr_accessor :username
-    
+
     def initialize(name=:github_pkg)
       super()
-      
+
       @deps = [:build]
-      @description = %Q(Publish this project's gem(s) to GitHub Packages)
+      @description = "Publish this project's gem(s) to GitHub Packages"
       @name = name
       @username = nil
-      
-      yield self if block_given?()
-      
-      @username = Util.find_github_username() if @username.nil?()
-      
-      raise "#{self.class.name}.username is nil" if @username.nil?()
-      
-      define()
+
+      yield self if block_given?
+
+      @username = Util.find_github_username if @username.nil?
+
+      raise "#{self.class.name}.username is nil" if @username.nil?
+
+      define
     end
-    
-    def define()
+
+    def define
       desc @description
       task @name => Array(@deps) do |task,args|
         sh_cmd = ['gem']
-        
+
         sh_cmd.push('push')
         sh_cmd.push('--key','github')
         sh_cmd.push('--host',"https://rubygems.pkg.github.com/#{username}")
         sh_cmd.push(*Dir.glob(File.join('pkg','*.gem'))) # Is this okay for multiple gems?
-        
+
         sh(*sh_cmd)
       end
     end