kettle-family 0.1.11 → 0.1.12

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: ce5e205f14b0d680ee20770b52bbe6567440d355f192b60df5ea5432539301df
-  data.tar.gz: a4b1746b3d74bd7a7ed27f08489476fb29edc9f54d118e213c5ca825f1fd3adc
+  metadata.gz: f65c88cd11fde014afd2cf4e90a46734d3bc4cad6941604809541404e1e4f8f0
+  data.tar.gz: 6f41492fbda81d8106de2e18c88ea34db50ac1e3910a10872d6dc804a6151f4b
 SHA512:
-  metadata.gz: 82ec83f5b90a6a18db54ff704a8e1387a19d674db03a6087e08afeedeab1dbf071788a6d4182a262377bd60df38f93c936ead0b3cf23efc1c0645981a956277b
-  data.tar.gz: c65192a2a1461b648a02dd67fbb2eacba8e01425e92c5cdbfe1b28e3a49af671a9d5a8498de7903ea4cb199ed9be8e29dcc54d5b50af9f226336a9c4a60cc25b
+  metadata.gz: 2fbd369fd177a00aae8db444e577c0c87ac9e5d5197301d3338172691ae8793326221453c33ad2a4780616668b0b73a3e3f28c25940bd25815d7ae6feb79bb63
+  data.tar.gz: 5dce9c3e088160948803fdf898a1bf913b7c9641a53babaa526fc7be855d3120fe02d4fab0a0e12cf8112b0780109cd9471a9e3eee462a7dc7b5d3e4d93824bf

data/CHANGELOG.md

@@ -20,6 +20,10 @@ Please file a bug if you notice a violation of semantic versioning.
 
 ### Added
 
+- `kettle-family bump-version` now accepts the same relative bump targets as
+  `kettle-bump` (`major`, `minor`, `patch`, and `pre`) and applies them per
+  member from each member's current version.
+
 ### Changed
 
 ### Deprecated

data/lib/kettle/family/cli.rb

@@ -26,7 +26,7 @@ module Kettle
         raise Error, "unknown command #{command.inspect}" unless COMMANDS.include?(command)
 
         target_version = argv.shift if command == "bump-version"
-        raise Error, "bump-version requires VERSION" if command == "bump-version" && !target_version
+        raise Error, "bump-version requires VERSION, major, minor, patch, or pre" if command == "bump-version" && !target_version
 
         options = parse_options
         options[:target_version] = target_version
@@ -48,6 +48,7 @@ module Kettle
       def help
         out.puts(<<~HELP)
           Usage: kettle-family COMMAND [options]
+                 kettle-family bump-version VERSION|major|minor|patch|pre [options]
 
           Commands:
               discover        Discover family members and print selected order

data/lib/kettle/family/version.rb

@@ -3,7 +3,7 @@
 module Kettle
   module Family
     module Version
-      VERSION = "0.1.11"
+      VERSION = "0.1.12"
     end
     VERSION = Version::VERSION # Traditional Constant Location
   end

data/lib/kettle/family/version_bump.rb

@@ -3,14 +3,19 @@
 module Kettle
   module Family
     class VersionBump
+      BUMP_TYPES = %w[major minor patch pre].freeze
       DEPENDENCY_METHODS = %i[add_dependency add_runtime_dependency].freeze
 
       def initialize(members:, target_version:, from_version: nil, mode: :dry_run)
         @members = members
-        @target_version = validate_version(target_version)
+        @target_version = target_version.to_s
+        @explicit_target_version = validate_version(target_version) unless BUMP_TYPES.include?(@target_version)
         @from_version = validate_version(from_version) if from_version
         @mode = mode
         @member_names = members.map(&:name)
+        @member_target_versions = members.each_with_object({}) do |member, memo|
+          memo[member.name] = resolve_target_version(member)
+        end
       end
 
       def results
@@ -19,7 +24,7 @@ module Kettle
 
       private
 
-      attr_reader :members, :target_version, :from_version, :mode, :member_names
+      attr_reader :members, :target_version, :explicit_target_version, :from_version, :mode, :member_names, :member_target_versions
 
       def validate_version(version)
         Gem::Version.new(version).to_s
@@ -30,12 +35,13 @@ module Kettle
       def result_for(member)
         raise Error, "#{member.name} is #{member.version}, not --from #{from_version}" if from_version && member.version != from_version
 
-        edits = collect_edits(member)
+        member_target_version = target_version_for(member)
+        edits = collect_edits(member, member_target_version)
         write_edits(edits) if mode == :execute
         CommandResult.new(
           member_name: member.name,
           phase: "bump-version",
-          command: ["internal", "bump-version", target_version],
+          command: ["internal", "bump-version", member_target_version],
           workdir: member.root,
           status: check_failed?(edits) ? 1 : 0,
           success: !check_failed?(edits),
@@ -59,20 +65,20 @@ module Kettle
         nil
       end
 
-      def collect_edits(member)
+      def collect_edits(member, member_target_version)
         edits = []
-        edits << version_file_edit(member) if member.version_file
+        edits << version_file_edit(member, member_target_version) if member.version_file
         edits.concat(gemspec_dependency_edits(member))
         edits.compact
       end
 
-      def version_file_edit(member)
+      def version_file_edit(member, member_target_version)
         source = File.read(member.version_file)
         node = version_string_node(source, member.version_file)
         current = node.unescaped
-        return nil if current == target_version
+        return nil if current == member_target_version
 
-        replacement = quote_like(node.location.slice, target_version)
+        replacement = quote_like(node.location.slice, member_target_version)
         file_edit(member.version_file, source, node.location.start_offset, node.location.end_offset, replacement)
       end
 
@@ -131,14 +137,70 @@ module Kettle
         raise Error, "ambiguous family dependency #{name_node.unescaped.inspect} in #{path}" unless requirement_node.is_a?(Prism::StringNode)
 
         current = requirement_node.unescaped
+        dependency_target_version = member_target_versions.fetch(name_node.unescaped)
         exact_prefix = "= "
         raise Error, "ambiguous family dependency #{name_node.unescaped.inspect} requirement #{current.inspect} in #{path}" unless current.start_with?(exact_prefix)
-        return if current == "#{exact_prefix}#{target_version}"
+        return if current == "#{exact_prefix}#{dependency_target_version}"
 
-        replacement = quote_like(requirement_node.location.slice, "#{exact_prefix}#{target_version}")
+        replacement = quote_like(requirement_node.location.slice, "#{exact_prefix}#{dependency_target_version}")
         file_edit(path, source, requirement_node.location.start_offset, requirement_node.location.end_offset, replacement)
       end
 
+      def target_version_for(member)
+        member_target_versions.fetch(member.name)
+      end
+
+      def resolve_target_version(member)
+        return explicit_target_version unless BUMP_TYPES.include?(target_version)
+
+        bumped_version(target_version, member.version)
+      end
+
+      def bumped_version(type, current_version)
+        return bumped_prerelease_version(current_version) if type == "pre"
+
+        version = Gem::Version.new(current_version)
+        segments = version.segments
+        unless segments.all? { |segment| segment.is_a?(Integer) }
+          raise Error, "cannot #{type}-bump non-numeric version #{current_version.inspect}"
+        end
+
+        major, minor, patch = (segments + [0, 0, 0])[0, 3]
+        case type
+        when "major"
+          "#{major + 1}.0.0"
+        when "minor"
+          "#{major}.#{minor + 1}.0"
+        when "patch"
+          "#{major}.#{minor}.#{patch + 1}"
+        end
+      end
+
+      def bumped_prerelease_version(current_version)
+        version = Gem::Version.new(current_version)
+        segments = version.segments
+        prerelease_index = segments.index { |segment| !segment.is_a?(Integer) }
+        raise Error, "cannot pre-bump version without prerelease segment #{current_version.inspect}" unless prerelease_index
+
+        release_core = segments[0...prerelease_index].join(".")
+        prerelease_suffix = prerelease_suffix_for(current_version, release_core)
+        "#{release_core}.#{prerelease_suffix.next}"
+      end
+
+      def prerelease_suffix_for(current_version, release_core)
+        prefix = "#{release_core}."
+        return string_tail(current_version, prefix.length) if current_version.start_with?(prefix)
+
+        canonical_version = Gem::Version.new(current_version).to_s
+        return string_tail(canonical_version, prefix.length) if canonical_version.start_with?(prefix)
+
+        raise Error, "cannot find prerelease segment in version #{current_version.inspect}"
+      end
+
+      def string_tail(value, offset)
+        value[offset, value.length - offset]
+      end
+
       def file_edit(path, source, start_offset, end_offset, replacement)
         {path: path, source: source, start_offset: start_offset, end_offset: end_offset, replacement: replacement}
       end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: kettle-family
 version: !ruby/object:Gem::Version
-  version: 0.1.11
+  version: 0.1.12
 platform: ruby
 authors:
 - Peter H. Boling
@@ -309,10 +309,10 @@ licenses:
 - AGPL-3.0-only
 metadata:
   homepage_uri: https://kettle-family.galtzo.com
-  source_code_uri: https://github.com/kettle-dev/kettle-family/tree/v0.1.11
-  changelog_uri: https://github.com/kettle-dev/kettle-family/blob/v0.1.11/CHANGELOG.md
+  source_code_uri: https://github.com/kettle-dev/kettle-family/tree/v0.1.12
+  changelog_uri: https://github.com/kettle-dev/kettle-family/blob/v0.1.12/CHANGELOG.md
   bug_tracker_uri: https://github.com/kettle-dev/kettle-family/issues
-  documentation_uri: https://www.rubydoc.info/gems/kettle-family/0.1.11
+  documentation_uri: https://www.rubydoc.info/gems/kettle-family/0.1.12
   funding_uri: https://github.com/sponsors/pboling
   wiki_uri: https://github.com/kettle-dev/kettle-family/wiki
   news_uri: https://www.railsbling.com/tags/kettle-family