incr 0.4.0 → 0.7.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
-SHA1:
-  metadata.gz: 990244b97a22582412b854aeef90bd9ec4098a79
-  data.tar.gz: 91f01973dac745680d3c2a482e47c4baf39fbf7c
+SHA256:
+  metadata.gz: 637f1247da8e04e0718b52ef9e2a10998615107658b6cc81b1229b9ed2d03e59
+  data.tar.gz: b79e61194d1eca2a6ee102c0a85fd9a0c2be352c041994a129e68b20932a811c
 SHA512:
-  metadata.gz: acbd123ad551512a014ce37772d7da580212b1fba0e0e1e5dd6784f56bda7d8845d976cd86a3488093ae57e9b51343b1e95765e4e7138f3fa72e9f9fdbd24473
-  data.tar.gz: 973123c4bc4d3210f82d3d2bd8e5c57e342d2eb461e98e2d4d21faf7cc5b4ccad6cb74d148433d88482ea3991ff770f5246350f2525f8ef5213230375c6037a5
+  metadata.gz: 357ac98e744072a23294c56b527c4393efa9c73fb78dfee45b735c22e0f787475479099eb9dfaa35fd3d945b31fb7fdc522e55fabe98b98c8c2fc5f76c12549b
+  data.tar.gz: 0c829902f6251d72b5ef17ceeb49a831a2a7503916fc954ff0eb70ef139e2cbd1248ef33e6ffec467f5139c31f83200bf34c9bc4fd45c87d78aaf83ee2c1b4e4

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    incr (0.4.0)
+    incr (0.5.0)
       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>
 
@@ -46,16 +45,18 @@ To increment the minor segment of your Mix package version number:
 Here are some arguments that can be used with `incr`:
 - `-d` : Directory where to search for the version files (default: `.`)
 - `-t` : Tag name pattern, where `%s` will be replaced with the new version (default: `v%s`)
+- `--[no-]commit` : Commit changes. (default: enabled)
+- `--[no-]tag` : Create a git tag. (default: enabled)
 
 Example:
 ```shell
-~> incr npm patch -d ./subprojects/web/ -t MyCustomTagPrefix/%s
+~> incr --no-tag -d ./subprojects/web/ -t MyCustomTagPrefix/%s npm patch
 ```
 
 This will :
 - Search for `package.json` and `package-lock.json` files inside `./subprojects/web/` and update the patch version
-- Create a tag named `MyCustomTagPrefix/2.3.4`
 - Commit the changes under the message `MyCustomTagPrefix/2.3.4`
+- Not create a tag with the new version
 
 ## Contributing
 

data/bin/incr

@@ -10,8 +10,11 @@ include GLI::App
 program_desc('Tasteful utility to increment the version number and create a corresponding git tag.')
 version(Incr::VERSION)
 
-flag [:d, :versionFileDirectory], :default_value => '.', :desc => 'Directory where to search for version file.'
-flag [:t, :tagNamePattern], :default_value => 'v%s'
+flag [:d, :versionFileDirectory], :default_value => '.', :desc => 'Directory where to search for version file'
+flag [:t, :tagNamePattern], :default_value => 'v%s', :desc => 'Pattern for the tag name'
+
+switch :commit, :default_value => true, :desc => 'Commit changes'
+switch :tag, :default_value => true, :desc => 'Create a git tag'
 
 pre do |global, command, options, args|
   if args.length != 1 || !['major', 'minor', 'patch'].any? {|segment| args.include?(segment)}

data/lib/incr/command/mix.rb

@@ -1,10 +1,18 @@
 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')
         @tag_pattern = global_options[:tagNamePattern]
+        @commit = global_options[:commit]
+        @tag = global_options[:tag]
       end
 
       def execute
@@ -13,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
 
@@ -24,8 +32,8 @@ module Incr
 
         repository = Incr::Service::Repository.new('.')
         repository.add(@mix_file_filename)
-        repository.commit(new_tag)
-        repository.tag(new_tag)
+        repository.commit(new_tag) if @commit
+        repository.tag(new_tag) if @tag
       end
 
       private
@@ -39,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]
@@ -11,6 +19,8 @@ module Incr
         @package_json_filename = File.join('.', global_options[:versionFileDirectory], 'package.json')
         @package_json_lock_filename = File.join('.', global_options[:versionFileDirectory], 'package-lock.json')
         @tag_pattern = global_options[:tagNamePattern]
+        @commit = global_options[:commit]
+        @tag = global_options[:tag]
       end
 
       def execute
@@ -23,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
 
@@ -33,8 +43,8 @@ module Incr
         repository = Incr::Service::Repository.new('.')
         repository.add(@package_json_filename)
         repository.add(@package_json_lock_filename)
-        repository.commit(new_tag)
-        repository.tag(new_tag)
+        repository.commit(new_tag) if @commit
+        repository.tag(new_tag) if @tag
       end
 
       private
@@ -48,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.4.0'
+  VERSION = '0.7.0'
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: incr
 version: !ruby/object:Gem::Version
-  version: 0.4.0
+  version: 0.7.0
 platform: ruby
 authors:
 - Jean-Philippe Couture
-autorequire: 
+autorequire:
 bindir: bin
 cert_chain: []
-date: 2018-07-26 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,9 +95,8 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubyforge_project: 
-rubygems_version: 2.6.13
-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.