defmastership 1.0.10 → 1.0.11

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: '0498ff0b39ccfc024d4988c4c1137726e827e841a1750b921bc4c8d3be06db62'
-  data.tar.gz: af1b86530d440a08417bac712f15e30db40aa01b07ea312b1d7d4f125dccef5c
+  metadata.gz: a3085b336c6d1b3854964192456e63b586bb0841ca62be7a4e33b7a3f7e2b5e9
+  data.tar.gz: 190eb91c0e040f064044a9b720eeb737cf3a0064eb88c718f1f2f387d0edf47f
 SHA512:
-  metadata.gz: ec47e5182f9586be6102eed5be90c459db84e54e334cbe867bee2be4bf34645f8a91d7e08aea0b89a4733e3ca6089c90f96e1a6969d8f6b329034cc4486bd8b2
-  data.tar.gz: 625fb3fb76aaac4189ce12cd2f9af3bfa83491a2ecbbe5192bb35ffe43e121e54a27a318afb60ad938a8e58818bccef38896b919d5b9678ea0af4565c09aab66
+  metadata.gz: f8c55be957d580ad9ab71f15f58be76a43fc3e2b169d7b8397383a1a6a128c93aac5c33eab85cdf3da584d005eb92699730f2ae3560947ad25f13e478f5bff1d
+  data.tar.gz: 8d7b95ad1db59a90e96f0caacc8040307366ae7be67baab172fe57f64c9101a065fef8718d8c2f123d03c808b1669aa406c05712872c05424b6de22150db6acf

data/features/changeref.feature

@@ -36,6 +36,39 @@ Feature: The changeref command
     [define, requirement, TOTO-0123]
     """
 
+  Scenario: Change a definition with explicit checksum and version
+    Given a file named "modifications.yml" with:
+    """
+    ---
+    :toto:
+      :type: change_ref
+      :config:
+        :from_regexp: TOTO-TEMP-[X\d]{4}
+        :to_template: TOTO-%<next_ref>04d
+        :next_ref: 123
+    """
+    And a file named "thedoc.adoc" with:
+    """
+    [define, requirement, TOTO-TEMP-XXX1(a~12345678)]
+    """
+    When I successfully run `defmastership modify --modifications toto thedoc.adoc`
+    Then the stdout should not contain anything
+    And the stderr should not contain anything
+    And the file "modifications.yml" should contain:
+    """
+    ---
+    :toto:
+      :type: change_ref
+      :config:
+        :from_regexp: TOTO-TEMP-[X\d]{4}
+        :to_template: TOTO-%<next_ref>04d
+        :next_ref: 124
+    """
+    And the file "thedoc.adoc" should contain:
+    """
+    [define, requirement, TOTO-0123(a~12345678)]
+    """
+
   Scenario: Change two definitions
     Given a file named "modifications.yml" with:
     """

data/lib/defmastership/change_ref_line_modifier.rb

@@ -66,12 +66,13 @@ module DefMastership
       regexp_str =
         "(?<before>#{REGEXP_FROM[const][:before]})" \
         "(?<from>#{from})" \
+        "#{DMRegexp::DEF_VERSION_AND_CHECKSUM}" \
         "(?<after>#{REGEXP_FROM[const][:after]})"
       Regexp.new(regexp_str, Regexp::EXTENDED)
     end
 
     def text_with(match, replacement)
-      match[:before] + replacement + match[:after]
+      match[:before] + replacement + (match[:version_and_checksum] || '') + match[:after]
     end
 
     def hmerge(match)

data/lib/defmastership/constants.rb

@@ -20,7 +20,9 @@ module DefMastership
       (,\s*\[\s*(?<labels>.*?)\s*\])?\s*\]
     AFT
 
-    DEF_VERSION_AND_CHECKSUM = '(\((?<explicit_version>[^~]+)?(?<explicit_checksum>~[[:alnum:]]+)?\))?'
+    DEF_VERSION_AND_CHECKSUM = '(?<version_and_checksum>' \
+                               '\((?<explicit_version>[^~]+)?(?<explicit_checksum>~[[:alnum:]]+)?\)' \
+                               ')?'
 
     DEFINITION = Regexp.new(
       "#{DEF_BEFORE_REF}(?<reference>[\\w:_-]+)#{DEF_VERSION_AND_CHECKSUM}#{DEF_AFTER_REF}",

data/lib/defmastership/version.rb

@@ -2,6 +2,6 @@
 # frozen_string_literal: true
 
 module DefMastership
-  VERSION = '1.0.10'
+  VERSION = '1.0.11'
   public_constant :VERSION
 end

data/spec/unit/defmastership/change_ref_line_modifier_spec.rb

@@ -217,6 +217,21 @@ RSpec.describe(DefMastership::ChangeRefLineModifier) do
         .to(eq('[define, whatever, TUTU]'))
     end
 
+    it do
+      expect(refchanger.replace(:refdef, '[define, whatever, TEMP(a~12345678)]'))
+        .to(eq('[define, whatever, TUTU(a~12345678)]'))
+    end
+
+    it do
+      expect(refchanger.replace(:refdef, '[define, whatever, TEMP(~12345678)]'))
+        .to(eq('[define, whatever, TUTU(~12345678)]'))
+    end
+
+    it do
+      expect(refchanger.replace(:refdef, '[define, whatever, TEMP(a)]'))
+        .to(eq('[define, whatever, TUTU(a)]'))
+    end
+
     it do
       refchanger.replace(:refdef, '[define, whatever, TEMP]')
       expect(refchanger.replace(:irefs, 'defs:iref[TEMP]'))

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: defmastership
 version: !ruby/object:Gem::Version
-  version: 1.0.10
+  version: 1.0.11
 platform: ruby
 authors:
 - Jérôme Arbez-Gindre
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2021-03-24 00:00:00.000000000 Z
+date: 2021-04-01 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: aruba