incr 0.6.0 → 0.7.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 9afe3ededb1966abd48644e8c02606dadf1a0a29af74b0287deab7079f034cd8
-  data.tar.gz: eb60c16aae7d930ef2ceec4e957bf91f61d722b12f7fc5ea6aa76ed93fca514c
+  metadata.gz: 637f1247da8e04e0718b52ef9e2a10998615107658b6cc81b1229b9ed2d03e59
+  data.tar.gz: b79e61194d1eca2a6ee102c0a85fd9a0c2be352c041994a129e68b20932a811c
 SHA512:
-  metadata.gz: 309db6be2b962833f4302e09ac0c2aca0d38e44937f035044d131a89d0ebfa8599ded9e00b2360acd509ba40b92d01fb123fc27fe375940b70db051cd09769c6
-  data.tar.gz: 0be89efa75da4fc94e76d1ab6a6accff6eff3b5d3e39e11b86b10b9b7969f0595458c48c9702a3b8d4761a2fc848a90e9ebc75c2ea605e3f1f04982bbf698ca1
+  metadata.gz: 357ac98e744072a23294c56b527c4393efa9c73fb78dfee45b735c22e0f787475479099eb9dfaa35fd3d945b31fb7fdc522e55fabe98b98c8c2fc5f76c12549b
+  data.tar.gz: 0c829902f6251d72b5ef17ceeb49a831a2a7503916fc954ff0eb70ef139e2cbd1248ef33e6ffec467f5139c31f83200bf34c9bc4fd45c87d78aaf83ee2c1b4e4

data/README.md

@@ -50,7 +50,7 @@ Here are some arguments that can be used with `incr`:
 
 Example:
 ```shell
-~> incr --no-tag npm patch -d ./subprojects/web/ -t MyCustomTagPrefix/%s
+~> incr --no-tag -d ./subprojects/web/ -t MyCustomTagPrefix/%s npm patch
 ```
 
 This will :

data/lib/incr/command/mix.rb

@@ -52,7 +52,7 @@ module Incr
           old_version_pattern = format(pattern, old_version.to_s)
           new_version_pattern = format(pattern, new_version.to_s)
 
-          Incr::Service::FileHelper.replace_once(@mix_file_filename, old_version_pattern, new_version_pattern)
+          Incr::Service::FileHelper.replace_string_once(@mix_file_filename, old_version_pattern, new_version_pattern)
         end
       end
     end

data/lib/incr/command/npm.rb

@@ -4,6 +4,14 @@ require 'sem_version'
 module Incr
   module Command
     class Npm
+      # pattern for any semver version, including pre-release label (ie. 1.0.0-alpha)
+      VERSION_PATTERN = "[\\w\\.\\-]*"
+
+      # pattern preceding the version in package.json and package-lock.json (v1 and v2)
+      LOOKBEHIND_PATTERNS = [
+        "\\A{[^{}]*\"version\": \"\\K",
+        "\"\": {[^{}]*\"version\": \"\\K"
+      ]
 
       def initialize(args, global_options)
         @segment = args[0]
@@ -25,8 +33,8 @@ module Incr
         old_version = SemVersion.new(file_version)
         new_version = Incr::Service::Version.increment_segment(old_version, @segment)
 
-        Incr::Service::FileHelper.replace_once(@package_json_filename, version_pattern(old_version.to_s), version_pattern(new_version.to_s))
-        Incr::Service::FileHelper.replace_once(@package_json_lock_filename, version_pattern(old_version.to_s), version_pattern(new_version.to_s))
+        replace_file_version(@package_json_filename, new_version.to_s)
+        replace_file_version(@package_json_lock_filename, new_version.to_s)
 
         new_tag = @tag_pattern % new_version.to_s
 
@@ -50,8 +58,11 @@ module Incr
         JSON.parse(IO.read(filename))
       end
 
-      def version_pattern(version)
-        "\"version\": \"#{version}\""
+      def replace_file_version(filename, new_version)
+        LOOKBEHIND_PATTERNS.each do |lookbehind_pattern|
+          pattern = /#{lookbehind_pattern}#{VERSION_PATTERN}/
+          Incr::Service::FileHelper.replace_regexp_once(filename, pattern, new_version)
+        end
       end
     end
   end

data/lib/incr/service/file_helper.rb

@@ -1,9 +1,13 @@
 module Incr
   module Service
     class FileHelper
-      def self.replace_once(filename, old_text, new_text)
+      def self.replace_string_once(filename, old_text, new_text)
+        replace_regexp_once(/#{Regexp.escape(old_text)}/, new_text)
+      end
+
+      def self.replace_regexp_once(filename, pattern, replacement_text)
         old_content = File.read(filename)
-        new_content = old_content.sub(/#{Regexp.escape(old_text)}/, new_text)
+        new_content = old_content.sub(pattern, replacement_text)
         File.open(filename, 'w') { |file| file << new_content }
       end
     end

data/lib/incr/version.rb

@@ -1,3 +1,3 @@
 module Incr
-  VERSION = '0.6.0'
+  VERSION = '0.7.0'
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: incr
 version: !ruby/object:Gem::Version
-  version: 0.6.0
+  version: 0.7.0
 platform: ruby
 authors:
 - Jean-Philippe Couture
-autorequire: 
+autorequire:
 bindir: bin
 cert_chain: []
-date: 2019-04-06 00:00:00.000000000 Z
+date: 2022-03-14 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: gli
@@ -52,7 +52,7 @@ dependencies:
     - - '='
       - !ruby/object:Gem::Version
         version: 1.3.0
-description: 
+description:
 email:
 - jcouture@gmail.com
 executables:
@@ -79,7 +79,7 @@ homepage: https://github.com/jcouture/incr
 licenses:
 - MIT
 metadata: {}
-post_install_message: 
+post_install_message:
 rdoc_options: []
 require_paths:
 - lib
@@ -95,8 +95,8 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.0.3
-signing_key: 
+rubygems_version: 3.3.3
+signing_key:
 specification_version: 4
 summary: Tasteful utility to increment the version number and create a corresponding
   git tag.