incr 0.5.0 → 0.7.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: c4896689095379204d0697a39423ce3c15b87f4920164314bc86c2121f22154b
-  data.tar.gz: 9f008d7fbf98ff81278ba1cb4851fee1cdea1327890428e234a85c3487c983c3
+  metadata.gz: beae18538716cd3443ecea4076ee9d05c0192c97cbbcf92e8c2b9e775b70bbf9
+  data.tar.gz: 8e02e3fe88c0b370bc48091efb75f15e0e288e8f11635bf7c036bc0d7b06ea81
 SHA512:
-  metadata.gz: 426b80a1277e931264e19c8305d92e6a04a2615ff5f20152a0ffac3ffe1ea67dbff34adabc05ff556bf07d73492e7ee6f1280e87dc09ca860be071989a0b8744
-  data.tar.gz: 397eef5e1e50727872a09a223d9487252f98e808eca019d8ba999006068b5323de33684cafbd713e1fc167ca5d4dd343876b83e6e51f5cb90a84730f0b3cc5b3
+  metadata.gz: 75ebb280db2da0b09bcbb9f0e73fb806f05386af61ac2d76b8c907a256576e024b99b97844ffbf5a5d42a68857f647f071a92b587bd8cc43815e86e461a53fd0
+  data.tar.gz: f1a1d70c6159aafbec950b02220a4af567675d8c270c7dfc973c2a1a6da498af6e2163ce40d1607452b2f712205b4eaa1bb058f893489b80821d8ff85d34a7b5

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    incr (0.4.0)
+    incr (0.7.1)
       git (= 1.3.0)
       gli (= 2.17.1)
       sem_version (= 2.0.1)
@@ -20,4 +20,4 @@ DEPENDENCIES
   incr!
 
 BUNDLED WITH
-   1.16.1
+   1.16.6

data/README.md

@@ -6,8 +6,7 @@
   Incr is a tool to help you easily increment the version number of your NPM or Mix packages.
   <br /><br />
   <a href="https://rubygems.org/gems/incr"><img src="http://img.shields.io/gem/v/incr.svg" /></a>
-  <a href="https://codeclimate.com/github/jcouture/incr"><img src="http://img.shields.io/codeclimate/github/jcouture/incr.svg" /></a>
-  <a href="https://gemnasium.com/jcouture/incr"><img src="http://img.shields.io/gemnasium/jcouture/incr.svg" /></a>
+
   <a href="https://travis-ci.org/jcouture/incr"><img src="http://img.shields.io/travis/jcouture/incr.svg" /></a>
 </p>
 
@@ -51,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

@@ -1,6 +1,12 @@
 module Incr
   module Command
     class Mix
+      VERSION_REGEX = /@?version:?\W*\"(\d*.\d*.\d*)"/
+      VERSION_REPLACEMENT_PATTERNS = [
+        "version: \"%s\"",
+        "@version \"%s\""
+      ]
+
       def initialize(args, global_options)
         @segment = args[0]
         @mix_file_filename = File.join('.', global_options[:versionFileDirectory], 'mix.exs')
@@ -15,10 +21,10 @@ module Incr
           return
         end
 
-        file_version = file_content.match(/version:\W*\"(\d*.\d*.\d*)",/)[1]
+        file_version = file_content.match(VERSION_REGEX)[1]
         old_version = SemVersion.new(file_version)
         new_version = Incr::Service::Version.increment_segment(old_version, @segment)
-        Incr::Service::FileHelper.replace_once(@mix_file_filename, version_pattern(old_version.to_s), version_pattern(new_version.to_s))
+        replace_file_version(old_version, new_version)
 
         new_tag = @tag_pattern % new_version.to_s
 
@@ -41,8 +47,13 @@ module Incr
         IO.read(filename)
       end
 
-      def version_pattern(version)
-        "version: \"#{version}\""
+      def replace_file_version(old_version, new_version)
+        VERSION_REPLACEMENT_PATTERNS.each do |pattern|
+          old_version_pattern = format(pattern, old_version.to_s)
+          new_version_pattern = format(pattern, new_version.to_s)
+
+          Incr::Service::FileHelper.replace_string_once(@mix_file_filename, old_version_pattern, new_version_pattern)
+        end
       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(filename, /#{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.5.0'
+  VERSION = '0.7.1'
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: incr
 version: !ruby/object:Gem::Version
-  version: 0.5.0
+  version: 0.7.1
 platform: ruby
 authors:
 - Jean-Philippe Couture
-autorequire: 
+autorequire:
 bindir: bin
 cert_chain: []
-date: 2018-11-29 00:00:00.000000000 Z
+date: 2022-03-16 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,9 +95,8 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubyforge_project: 
-rubygems_version: 2.7.6
-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.