raketeer 0.2.4 → 0.2.5

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 3e6ed3bd0408cc6af232b21a069ea2515d63ea1db1fc40b6d0a1c2e29fa61838
-  data.tar.gz: 46809d4b3d4d65b62a3f4f72fc136b2393727ca871aa0321fefc64cf8cfa62c6
+  metadata.gz: 6ea4a060cb8e00095e9df956fa2ee5f82b62f54062a5e9a304902a82e8aed1eb
+  data.tar.gz: cf7681b3872489a4f6a2c7b7faad9103613c6966ddc978e3e4d151da33ee1e0b
 SHA512:
-  metadata.gz: ffdf10d2f65ca8e0e6d9b8866c1a807749da9aa151c92d44b9f0588478f30b94008f9b100ce709b10f6ef07c1a3fbba43bc74178f0ebcf1c3d46ff8cd157e038
-  data.tar.gz: 4052757cc76e4826759e0f1fc09b664d02ea44b63d00856f9f914ba099c97d5be1eb497e2101ebcb054d71452e31975ed36ef6f4c089b3b640c0cb62ee89ca5b
+  metadata.gz: 3c59023bccceb084fc6ee5aeee2de32482c5ba77c8bb7995371161dabff2e0755a572b0b676e6b4b6a1bb690d3ddb90047b79a9701712492bdbc20009dc1e629
+  data.tar.gz: 735a8192cdc76bb8bc9dfa9b019980a789f45bb365800725b5a482e4b212e6c5d8d5080b526c6f1969c7fc8100c6a044ad43b120a6b3b1e8d82d0b9187c75db7

data/CHANGELOG.md

@@ -2,7 +2,14 @@
 
 Format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/).
 
-## [[Unreleased]](https://github.com/esotericpig/raketeer/compare/v0.2.4...master)
+## [[Unreleased]](https://github.com/esotericpig/raketeer/compare/v0.2.5...master)
+
+## [v0.2.5] - 2019-08-02
+### Added
+- Added a strict mode (regex) to BumpTask, BumpVer, FilesBumper, & SemVer
+
+### Fixed
+- Fixed the 'Nothing written (up-to-date)' feature in BumpTask (minor)
 
 ## [v0.2.4] - 2019-08-02
 ### Added

data/lib/raketeer/bump_task.rb

@@ -46,9 +46,11 @@ module Raketeer
     attr_accessor :name
     attr_accessor :ruby_files # Looks for {ruby_var}
     attr_accessor :ruby_var
+    attr_accessor :strict
     
     alias_method :bump_bundle?,:bump_bundle
     alias_method :dry_run?,:dry_run
+    alias_method :strict?,:strict
     
     def initialize(name=:bump)
       super()
@@ -62,6 +64,7 @@ module Raketeer
       @name = name
       @ruby_files = Rake::FileList[File.join('lib','**','version.rb')]
       @ruby_var = 'VERSION'
+      @strict = false
       
       yield self if block_given?()
       define()
@@ -165,12 +168,15 @@ module Raketeer
     end
     
     def bump_bump_files(bump_ver)
-      bumper = FilesBumper.new(@bump_files,bump_ver,@dry_run)
+      return nil if @bump_files.empty?()
+      
+      bumper = FilesBumper.new(@bump_files,bump_ver,@dry_run,@strict)
       
       bumper.bump_files() do
-        next if bumper.changes > 0 || bumper.line !~ SemVer::REGEX
+        next if bumper.changes > 0 || !bumper.sem_ver.nil?()
+        next if bumper.line !~ SemVer.regex(@strict)
         
-        break if bumper.bump_line!() && bumper.bump_ver_empty?()
+        break if bumper.bump_line!() != :no_ver && bumper.bump_ver_empty?()
       end
       
       return bumper.version
@@ -192,28 +198,27 @@ module Raketeer
     
     # @see https://keepachangelog.com/en/1.0.0/
     def bump_changelogs(bump_ver)
-      bumper = FilesBumper.new(@changelogs,bump_ver,@dry_run) do
+      return nil if @changelogs.empty?()
+      
+      bumper = FilesBumper.new(@changelogs,bump_ver,@dry_run,@strict) do
         @header_bumped = false
         @unreleased_bumped = false
       end
       
-      header_regex = /\A(\s*##\s*\[+\D*)(#{SemVer::REGEX.to_s()})(.*)\z/m
+      header_regex = /\A(\s*##\s*\[+\D*)(#{SemVer.regex(@strict)})(.*)\z/m
       unreleased_regex = /\A.*Unreleased.*http.*\.{3}/
       
       bumper.bump_files() do
         if @header_bumped && @unreleased_bumped
-          if bumper.bump_ver_empty?()
-            break
-          else
-            next
-          end
+          break if bumper.bump_ver_empty?()
+          next
         end
         
         if bumper.line =~ unreleased_regex
           next if @unreleased_bumped
           
           # Match from the end, in case the URL has a number (like '%20')
-          match = bumper.line.match(/(#{SemVer::REGEX.to_s()})(\.{3}.*)\z/m)
+          match = bumper.line.match(/(#{SemVer.regex(@strict)})(\.{3}.*)\z/m)
           
           next if match.nil?() || match.length < 3 || (i = match.begin(0)) < 1
           
@@ -224,12 +229,18 @@ module Raketeer
           orig_line = bumper.line.dup()
           bumper.line = match[1]
           
-          if bumper.bump_line!(add_change: false)
+          if (result = bumper.bump_line!(add_change: false)) != :no_ver
+            @unreleased_bumped = true
+            
+            if result == :same_ver
+              bumper.line = orig_line
+              
+              next
+            end
+            
             bumper.line = match[0] << bumper.line << match[2]
             
             bumper.add_change(bumper.line,push: false)
-            
-            @unreleased_bumped = true
           else
             bumper.line = orig_line
           end
@@ -243,7 +254,15 @@ module Raketeer
           orig_line = bumper.line.dup()
           bumper.line = match[1]
           
-          if bumper.bump_line!(add_change: false)
+          if (result = bumper.bump_line!(add_change: false)) != :no_ver
+            @header_bumped = true
+            
+            if result == :same_ver
+              bumper.line = orig_line
+              
+              next
+            end
+            
             bumper.line = match[0] << bumper.line
             
             # Replace the date with today's date for the new Markdown header, if it exists
@@ -252,8 +271,6 @@ module Raketeer
             
             bumper.add_change(bumper.line,push: true)
             bumper.line << "\n" # Don't print this newline to the console
-            
-            @header_bumped = true
           end
           
           # We are adding a new Markdown header, so always set the line back to its original value
@@ -265,11 +282,13 @@ module Raketeer
     end
     
     def bump_ruby_files(bump_ver)
-      bumper = FilesBumper.new(@ruby_files,bump_ver,@dry_run)
-      version_var_regex = /\A(\s*#{Regexp.quote(@ruby_var)}\s*=\D*)(#{SemVer::REGEX.to_s()})(.*)\z/m
+      return nil if @ruby_files.empty?()
+      
+      bumper = FilesBumper.new(@ruby_files,bump_ver,@dry_run,@strict)
+      version_var_regex = /\A(\s*#{Regexp.quote(@ruby_var)}\s*=\D*)(#{SemVer.regex(@strict)})(.*)\z/m
       
       bumper.bump_files() do
-        next if bumper.changes > 0
+        next if bumper.changes > 0 || !bumper.sem_ver.nil?()
         next if (match = bumper.line.match(version_var_regex)).nil?()
         next if match.length < 4
         next if match[1..2].any?() {|m| m.nil?() || m.strip().empty?()}
@@ -277,13 +296,18 @@ module Raketeer
         orig_line = bumper.line.dup()
         bumper.line = match[2]
         
-        if bumper.bump_line!(add_change: false)
+        if (result = bumper.bump_line!(add_change: false)) != :no_ver
+          if result == :same_ver
+            bumper.line = orig_line
+            
+            break if bumper.bump_ver_empty?()
+            next
+          end
+          
           bumper.line = match[1] << bumper.line
           bumper.line << match[-1] unless match[-1].nil?()
           
           bumper.add_change(bumper.line,push: false)
-          
-          break if bumper.bump_ver_empty?()
         else
           bumper.line = orig_line
         end

data/lib/raketeer/bump_ver.rb

@@ -111,8 +111,8 @@ module Raketeer
       return sem_ver
     end
     
-    def bump_line!(line,sem_ver)
-      line.sub!(REGEX,bump!(sem_ver).to_s())
+    def bump_line!(line,sem_ver,strict: false)
+      line.sub!(self.class.regex(strict),bump!(sem_ver).to_s())
       
       return line
     end

data/lib/raketeer/files_bumper.rb

@@ -39,20 +39,23 @@ module Raketeer
     attr_accessor :line
     attr_accessor :lines
     attr_accessor :sem_ver
+    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,&init_per_file)
+    def initialize(files,bump_ver,dry_run,strict,&init_per_file)
       @bump_ver = bump_ver
       @bump_ver_empty = bump_ver.empty?()
       @dry_run = dry_run
       @files = files.to_a()
       @init_per_file = init_per_file
       @sem_ver = nil
+      @strict = strict
       @version = nil
       @version_bumped = false
     end
@@ -108,22 +111,25 @@ module Raketeer
       end
     end
     
+    # @return [:no_ver,:same_ver,:bumped_ver]
     def bump_line!(add_change: true)
-      @sem_ver = SemVer.parse_line(@line)
+      @sem_ver = SemVer.parse_line(@line,strict: @strict)
       
-      return false if @sem_ver.nil?()
+      return :no_ver if @sem_ver.nil?()
       
       @version = @sem_ver if @version.nil?()
       
       if bump_ver_empty?()
         puts "= #{@sem_ver}"
         
-        return true
+        return :same_ver
       else
         orig_line = @line.dup()
-        @bump_ver.bump_line!(@line,@sem_ver)
+        orig_sem_ver = @sem_ver.dup()
         
-        if @line != orig_line
+        @bump_ver.bump_line!(@line,@sem_ver,strict: @strict)
+        
+        if @sem_ver.to_s() != orig_sem_ver.to_s()
           if !@version_bumped
             @version = @sem_ver
             @version_bumped = true
@@ -131,11 +137,15 @@ module Raketeer
           
           self.add_change(@line,push: false) if add_change
           
-          return true
+          return :bumped_ver
+        else
+          @line = orig_line
+          
+          return :same_ver
         end
       end
       
-      return false
+      return :no_ver
     end
   end
 end

data/lib/raketeer/sem_ver.rb

@@ -33,6 +33,7 @@ module Raketeer
   ###
   class SemVer
     REGEX = /\d+(\.\d+)?(\.\d+)?(\-[0-9A-Za-z\-\.]+)?(\+[0-9A-Za-z\-\.]+)?/
+    STRICT_REGEX = /\d+\.\d+\.\d+(\-[0-9A-Za-z\-\.]+)?(\+[0-9A-Za-z\-\.]+)?/
     
     attr_accessor :build_meta
     attr_accessor :major
@@ -95,8 +96,8 @@ module Raketeer
       return sem_ver
     end
     
-    def self.parse_line(line)
-      str = line[REGEX]
+    def self.parse_line(line,strict: false)
+      str = line[regex(strict)]
       
       return nil if str.nil?() || (str = str.strip()).empty?()
       return parse(str)
@@ -111,6 +112,10 @@ module Raketeer
              @version.nil?()
     end
     
+    def self.regex(strict=false)
+      return strict ? STRICT_REGEX : REGEX
+    end
+    
     def to_s()
       s = ''.dup()
       

data/lib/raketeer/version.rb

@@ -22,7 +22,7 @@
 
 
 module Raketeer
-  VERSION = '0.2.4'
+  VERSION = '0.2.5'
   
   # @since 0.2.4
   DEP_VERSIONS = {

data/raketeer.gemspec

@@ -33,7 +33,7 @@ Gem::Specification.new() do |spec|
   spec.licenses    = ['LGPL-3.0-or-later']
   spec.homepage    = 'https://github.com/esotericpig/raketeer'
   spec.summary     = 'Extra Ruby Rake Tasks.'
-  spec.description = 'Extra Ruby Rake Tasks for IRB, Nokogiri, running, etc.'
+  spec.description = 'Extra Ruby Rake Tasks for IRB, Nokogiri, running, bumping the version, etc.'
   
   spec.metadata = {
     'bug_tracker_uri' => 'https://github.com/esotericpig/raketeer/issues',

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: raketeer
 version: !ruby/object:Gem::Version
-  version: 0.2.4
+  version: 0.2.5
 platform: ruby
 authors:
 - Jonathan Bradley Whited (@esotericpig)
@@ -66,7 +66,8 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: '0.9'
-description: Extra Ruby Rake Tasks for IRB, Nokogiri, running, etc.
+description: Extra Ruby Rake Tasks for IRB, Nokogiri, running, bumping the version,
+  etc.
 email:
 - bradley@esotericpig.com
 executables: []