incr 0.3.0 → 0.4.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: ddf50651ee57b760d253bb3e7d275d8bd382636d
-  data.tar.gz: 4461847a7d0f909d2be997f825606211b7b5328b
+  metadata.gz: 990244b97a22582412b854aeef90bd9ec4098a79
+  data.tar.gz: 91f01973dac745680d3c2a482e47c4baf39fbf7c
 SHA512:
-  metadata.gz: cc0ad79e813e7fae4bb8e91f151bae7cf07187e533e3eb612c71ad5a258f59c067cd493f5eecac84153b52724a05ad9101cfd104229ac7010ae6e357f7064c27
-  data.tar.gz: 6a17f0eaba6a2233e182ed14412e628447aa19db2bffe268d3b2fcb876ba19d843458866aeb5e5366eff0afacc9b64d8e8ebd95842a26bb163ef6bad5b20d590
+  metadata.gz: acbd123ad551512a014ce37772d7da580212b1fba0e0e1e5dd6784f56bda7d8845d976cd86a3488093ae57e9b51343b1e95765e4e7138f3fa72e9f9fdbd24473
+  data.tar.gz: 973123c4bc4d3210f82d3d2bd8e5c57e342d2eb461e98e2d4d21faf7cc5b4ccad6cb74d148433d88482ea3991ff770f5246350f2525f8ef5213230375c6037a5

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    incr (0.3.0)
+    incr (0.4.0)
       git (= 1.3.0)
       gli (= 2.17.1)
       sem_version (= 2.0.1)

data/README.md

@@ -42,6 +42,21 @@ To increment the minor segment of your Mix package version number:
 ~> incr mix minor
 ```
 
+### Arguments
+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`)
+
+Example:
+```shell
+~> incr npm patch -d ./subprojects/web/ -t MyCustomTagPrefix/%s
+```
+
+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`
+
 ## Contributing
 
 Bug reports and pull requests are welcome on GitHub at https://github.com/jcouture/incr. This project is intended to be a safe, welcoming space for collaboration, and contributors are expected to adhere to the [Contributor Covenant](http://contributor-covenant.org) code of conduct.

data/bin/incr

@@ -10,6 +10,9 @@ 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'
+
 pre do |global, command, options, args|
   if args.length != 1 || !['major', 'minor', 'patch'].any? {|segment| args.include?(segment)}
     STDERR.puts('Expecting a single argument: major, minor or patch.')
@@ -22,7 +25,7 @@ end
 desc('Increment the version of your NPM package.')
 command :npm do |cmd|
   cmd.action do |global_options, options, args|
-    npm = Incr::Command::Npm.new(args)
+    npm = Incr::Command::Npm.new(args, global_options)
     npm.execute
   end
 end
@@ -31,7 +34,7 @@ end
 desc('Increment the version of your Mix package.')
 command :mix do |cmd|
   cmd.action do |global_options, options, args|
-    mix = Incr::Command::Mix.new(args)
+    mix = Incr::Command::Mix.new(args, global_options)
     mix.execute
   end
 end

data/lib/incr/command/mix.rb

@@ -1,14 +1,14 @@
 module Incr
   module Command
     class Mix
-      MIXFILE_FILENAME = 'mix.exs'.freeze
-
-      def initialize(args)
+      def initialize(args, global_options)
         @segment = args[0]
+        @mix_file_filename = File.join('.', global_options[:versionFileDirectory], 'mix.exs')
+        @tag_pattern = global_options[:tagNamePattern]
       end
 
       def execute
-        file_content = parse_content(MIXFILE_FILENAME)
+        file_content = parse_content(@mix_file_filename)
         if file_content == nil
           return
         end
@@ -16,14 +16,16 @@ module Incr
         file_version = file_content.match(/version:\W*\"(\d*.\d*.\d*)",/)[1]
         old_version = SemVersion.new(file_version)
         new_version = Incr::Service::Version.increment_segment(old_version, @segment)
-        Incr::Service::FileHelper.replace_once(MIXFILE_FILENAME, version_pattern(old_version.to_s), version_pattern(new_version.to_s))
+        Incr::Service::FileHelper.replace_once(@mix_file_filename, version_pattern(old_version.to_s), version_pattern(new_version.to_s))
+
+        new_tag = @tag_pattern % new_version.to_s
 
-        puts "v#{new_version.to_s}"
+        puts new_tag
 
         repository = Incr::Service::Repository.new('.')
-        repository.add(MIXFILE_FILENAME)
-        repository.commit(new_version.to_s)
-        repository.tag("v#{new_version.to_s}")
+        repository.add(@mix_file_filename)
+        repository.commit(new_tag)
+        repository.tag(new_tag)
       end
 
       private

data/lib/incr/command/npm.rb

@@ -4,15 +4,17 @@ require 'sem_version'
 module Incr
   module Command
     class Npm
-      PACKAGE_JSON_FILENAME = 'package.json'.freeze
-      PACKAGE_LOCK_JSON_FILENAME = 'package-lock.json'.freeze
 
-      def initialize(args)
+      def initialize(args, global_options)
         @segment = args[0]
+
+        @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]
       end
 
       def execute
-        package_json = parse_content(PACKAGE_JSON_FILENAME)
+        package_json = parse_content(@package_json_filename)
         if package_json == nil
           return
         end
@@ -21,16 +23,18 @@ 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_LOCK_JSON_FILENAME, version_pattern(old_version.to_s), version_pattern(new_version.to_s))
+        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))
+
+        new_tag = @tag_pattern % new_version.to_s
 
-        puts "v#{new_version.to_s}"
+        puts new_tag
 
         repository = Incr::Service::Repository.new('.')
-        repository.add(PACKAGE_JSON_FILENAME)
-        repository.add(PACKAGE_LOCK_JSON_FILENAME)
-        repository.commit(new_version.to_s)
-        repository.tag("v#{new_version.to_s}")
+        repository.add(@package_json_filename)
+        repository.add(@package_json_lock_filename)
+        repository.commit(new_tag)
+        repository.tag(new_tag)
       end
 
       private

data/lib/incr/version.rb

@@ -1,3 +1,3 @@
 module Incr
-  VERSION = '0.3.0'
+  VERSION = '0.4.0'
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: incr
 version: !ruby/object:Gem::Version
-  version: 0.3.0
+  version: 0.4.0
 platform: ruby
 authors:
 - Jean-Philippe Couture
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2018-03-09 00:00:00.000000000 Z
+date: 2018-07-26 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: gli
@@ -96,7 +96,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.6.14
+rubygems_version: 2.6.13
 signing_key: 
 specification_version: 4
 summary: Tasteful utility to increment the version number and create a corresponding