nextver 0.1.1 → 0.3.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: c362a06dd22de7a07aa0828ce466ef992056a3d2805f3c55e64ef284f2a35262
-  data.tar.gz: 18b753dbf747914d374a9ee031654d00a231f734289067899a9457dbddf543c9
+  metadata.gz: 5bb8461f23e755657657651af9c58f17e7bd01079495fa04b2aae42c4634d688
+  data.tar.gz: 69b372968a5a0d00bd4c70568e130485d723a6d0ee6839e52240ff4df1d1443a
 SHA512:
-  metadata.gz: dacce37fd2e50624ae8cdadc34d86a3f20a3129746c58c4fae30c991f1846c789295384df591797664440d52bf817d6a1ddd1ad1f3a8043e6520d59dc5fcd6b5
-  data.tar.gz: 3ce8545521596259f898c595c3d416df5be8c8b61d68fc34a9754cfbbaf9bebfe3450f703110d4731415acbb78511b32d7c60af79d1dc714e5b9372c51713303
+  metadata.gz: 482823e6a7272e67576d043f275b66ff525ef4a6d825f58d66ccb4ac494b8cc2d4e70f09df200e97afe901a66ee1f7f9ff64d2ac9707ec7c345be57ca06a67aa
+  data.tar.gz: 57b139973304c592122e90d4e0dae5bdee939f393171ba11d44826b2ef8749fa2f88bb6057c1e38e4b1bb3a5b2b6d58203c88c02923dc447d948c92ca08ef261

data/README.md

@@ -11,13 +11,13 @@ gem "nextver", require: false, group: :development
 
 or `gem install nextver`.
 
-To get `bin/nextver` created on every `bundle install`, set this once in your app and commit `.bundle/config`:
+In a Rails app, create `bin/nextver` once and commit it:
 
 ```
-bundle config set --local bin bin
+bin/rails generate nextver:install
 ```
 
-Or run `bundle binstubs nextver` once and commit `bin/nextver`.
+Outside Rails, `bundle binstubs nextver` does the same.
 
 ## Usage
 
@@ -26,6 +26,7 @@ bin/nextver [options...] [dir]
 
   -d  Debug mode, print considering steps.
   -e  Suppress trailing new line. Print only version out.
+  -f  Force non-feat/fix commits to bump patch.
   -n  Version is not prefixed by v, for example, 1.0.0.
   -t  Show detected latest version.
   -v  Show version of nextver.

data/bin/nextver

@@ -6,6 +6,7 @@ opts = {}
 parser = OptionParser.new do |o|
   o.banner = "Usage of nextver:\n\n  nextver [options...] [dir]\n\nOptions:"
   o.on("-d", "Debug mode, print considering steps.") { opts[:debug] = true }
+  o.on("-f", "Force non-feat/fix commits to bump patch.") { opts[:force] = true }
   o.on("-e", "Suppress trailing new line. Print only version out.") { opts[:no_newline] = true }
   o.on("-n", "Version is not prefixed by v, for example, 1.0.0.") { opts[:no_prefix] = true }
   o.on("-t", "Show detected latest version.") { opts[:latest] = true }
@@ -16,7 +17,7 @@ end
 begin
   parser.parse!
   log = ->(msg) { puts msg if opts[:debug] }
-  repo = Nextver::Repo.new(ARGV[0] || ".", prefixed: !opts[:no_prefix], log: log)
+  repo = Nextver::Repo.new(ARGV[0] || ".", prefixed: !opts[:no_prefix], force: opts[:force], log: log)
   current = repo.current_version
 
   if opts[:latest]

data/lib/generators/nextver/install_generator.rb

@@ -0,0 +1,17 @@
+require "rails/generators"
+
+module Nextver
+  # rails generate nextver:install
+  class InstallGenerator < Rails::Generators::Base
+    desc "Creates bin/nextver binstub."
+
+    def create_binstub
+      create_file "bin/nextver", <<~RUBY
+        #!/usr/bin/env ruby
+        require "bundler/setup"
+        load Gem.bin_path("nextver", "nextver")
+      RUBY
+      chmod "bin/nextver", 0o755
+    end
+  end
+end

data/lib/nextver/version.rb

@@ -1,3 +1,3 @@
 module Nextver
-  VERSION = "0.1.1"
+  VERSION = "0.3.0"
 end

data/lib/nextver.rb

@@ -22,19 +22,20 @@ module Nextver
     parts[0, 3] + (parts[3] ? [0, parts[3]] : [1, ""])
   end
 
-  # :major, :minor, :patch or nil for a single commit message.
-  def bump(message)
+  # :major, :minor, :patch or nil for a single commit message. +force+ makes other conventional types :patch.
+  def bump(message, force: false)
     header = HEADER.match(message.strip) or return nil
     return :major if header[1] || message.lines.drop(1).any? { |l| l =~ BREAKING_FOOTER }
-    { "feat" => :minor, "fix" => :patch }[message[/\A\w+/]]
+    { "feat" => :minor, "fix" => :patch }.fetch(message[/\A\w+/], force ? :patch : nil)
   end
 
   class Repo
-    def initialize(dir = ".", prefixed: true, log: nil)
+    def initialize(dir = ".", prefixed: true, force: false, log: nil)
       raise Error, "target path is not git repo path" unless File.directory?(File.join(dir, ".git"))
       @dir = dir
       @prefix = prefixed ? "v" : ""
       @prefixed = prefixed
+      @force = force
       @log = log || ->(_) {}
     end
 
@@ -46,6 +47,7 @@ module Nextver
 
     def next_version(current = current_version)
       @log.call(@prefixed ? "Version is prefixed by v." : "Version is not prefixed by v.")
+      @log.call("Forcing non-feat/fix commits to bump patch.") if @force
       unless current
         @log.call("Current version is missing. Start a new one at v1.0.0.")
         return "#{@prefix}1.0.0"
@@ -56,7 +58,7 @@ module Nextver
       messages = git("log", "--format=%B%x00", "#{current}..HEAD").split("\0").map(&:strip).reject(&:empty?)
       @log.call("#{messages.size} commit(s) since latest tag")
 
-      counts = messages.map { |m| Nextver.bump(m) }.compact.group_by(&:itself).transform_values(&:size)
+      counts = messages.map { |m| Nextver.bump(m, force: @force) }.compact.group_by(&:itself).transform_values(&:size)
       @log.call("============\nCommit stats\n------------")
       @log.call("Major change(s) = #{counts.fetch(:major, 0)}")
       @log.call("Minor change(s) = #{counts.fetch(:minor, 0)}")

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: nextver
 version: !ruby/object:Gem::Version
-  version: 0.1.1
+  version: 0.3.0
 platform: ruby
 authors:
 - Chonlasith Jucksriporn
@@ -19,6 +19,7 @@ files:
 - LICENSE.txt
 - README.md
 - bin/nextver
+- lib/generators/nextver/install_generator.rb
 - lib/nextver.rb
 - lib/nextver/version.rb
 homepage: https://github.com/chonla/nextver-gem