defmastership-core 1.3.0 → 1.4.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: '034357962fd2a1625b213b5ed29b83bd7cc9a659c24b1b0a8f5b202dea47113a'
-  data.tar.gz: d32796f5f8cb5eef96568e35011a09033badccb5d7708c3077ccd9519df71228
+  metadata.gz: 07bc53590b73e2833caaecb1bae8cfecd87a1ecef94fbe7ecb9b5eb6ea89d828
+  data.tar.gz: adf941d0a7655906428a6b0841780bae626e222284a192cae4e2c7af6dd25dec
 SHA512:
-  metadata.gz: 04b9343450b59869b5100144cbf1ec8388ff72cfba713be83be2292b81a6f55e20e087fec8b91f3b49a63df88a2312cc9bdffca4f415c401581167021b60738a
-  data.tar.gz: 979b8eed01f02b85ff4d2b314779c4210cd8372e6f901335662163d72c2135d480e3af501702de4a5ed88ab29410e3aa7cc58598133cdd2204e61ad83fc41c71
+  metadata.gz: 21867b6159f14e934248174adff6d253b36f55d19f50528e3ccd0fda55afa2bb391a27a339d0b3b9d9e92b0c4fe427e512a0cc666e895e1089e289678f8b52cb
+  data.tar.gz: a5efb633dd49c4cc0593cb9a1e8e1d2177b45680e78c89f457f55efd62b0156de913db8ff7bd07e710a35dc41226ac9604584008f113224cc68d0051285dee35

data/.gitlab-ci.yml

@@ -1,5 +1,5 @@
 default:
-  image: ruby:3.3
+  image: ruby:3.4
   before_script:
     - apt-get update
     - ruby -v
@@ -54,6 +54,11 @@ unit tests ruby3.2:
   script:
     - bundle exec rake test:spec
 
+unit tests ruby3.3:
+  image: ruby:3.3
+  script:
+    - bundle exec rake test:spec
+
 pages:
   stage: deploy
   script:

data/Gemfile

@@ -10,27 +10,27 @@ ruby RUBY_VERSION
 # rubocop:disable Metrics/BlockLength
 group :development do
   # needed by yard to render documentation
-  gem 'asciidoctor',           '~> 2'
+  gem 'asciidoctor',           '~> 2.0'
   # cucumber steps for command line tests
-  gem 'aruba',                 '~> 2'
+  gem 'aruba',                 '~> 2.2'
   # bdd
-  gem 'cucumber',              '~> 9'
+  gem 'cucumber',              '~> 9.2'
 
   # code duplication
-  gem 'flay',                  '~> 2'
+  gem 'flay',                  '~> 2.13'
 
   # automatic test run
-  gem 'guard',                 '~> 2'
+  gem 'guard',                 '~> 2.19'
   # automatic update invocation
-  gem 'guard-bundler',         '~> 3'
+  gem 'guard-bundler',         '~> 3.0'
   if RUBY_VERSION >= '3.0'
     # automatic style check
     gem 'guard-reek', '~> 1.2'
   end
   # automatic tdd
-  gem 'guard-rspec',           '~> 4'
+  gem 'guard-rspec',           '~> 4.7'
   # automatic style check
-  gem 'guard-rubocop',         '~> 1'
+  gem 'guard-rubocop',         '~> 1.5'
 
   # if RUBY_VERSION >= '3.0'
   #   # mutation testing
@@ -44,45 +44,45 @@ group :development do
   #   gem 'mutant-rspec', '~> 0'
   # end
   # to parse and execute Rakefile
-  gem 'rake', '~> 13'
+  gem 'rake', '~> 13.2'
 
   if RUBY_VERSION >= '3.0'
     # needed by yard to render documentation
-    gem 'rdoc', '~> 6'
+    gem 'rdoc', '~> 6.1O'
   end
   # tdd
-  gem 'rspec',                 '~> 3'
+  gem 'rspec',                 '~> 3.13'
   # # to test performances
   # gem 'rspec-benchmark',       '~> 0'
   # code needs to be clean
-  gem 'rubocop',               '1.68'
+  gem 'rubocop',               '1.69'
   # code needs to be clean
-  gem 'rubocop-performance',   '~> 1'
+  gem 'rubocop-performance',   '~> 1.23'
   # test code needs to be clean
-  gem 'rubocop-rspec',         '~> 3'
+  gem 'rubocop-rspec',         '~> 3.3'
   # Rakefiles need to be clean
-  gem 'rubocop-rake',          '~> 0'
+  gem 'rubocop-rake',          '~> 0.6'
 
   if RUBY_VERSION >= '3.0'
     # detect selling code
-    gem 'reek', '~> 6'
+    gem 'reek', '~> 6.3'
     # my code needs to be critiqued
-    gem 'rubycritic', '~> 4'
+    gem 'rubycritic', '~> 4.9'
     # Doc need to be clean
-    gem 'rubocop-yard', '~> 0'
+    gem 'rubocop-yard', '~> 0.10'
   end
 
   # What is tdd without code coverage ?
-  gem 'simplecov', '~> 0'
+  gem 'simplecov', '~> 0.22'
 
   if RUBY_VERSION >= '3.0'
     # to document code
-    gem 'yard', '~> 0'
+    gem 'yard', '~> 0.9'
   end
 end
 # rubocop:enable Metrics/BlockLength
 
 group :debugging do
   # Sometimes, we need to debug
-  gem 'pry', '~> 0'
+  gem 'pry', '~> 0.15'
 end

data/lib/defmastership/core/constants.rb

@@ -49,7 +49,12 @@ module Defmastership
       public_constant :REFERENCE
 
       # [Regexp] match defintion summary
-      DEF_SUMMARY = '\s*(,\s*(?<summary>[^\s,\[\]][^,\[\]]*?)\s*)?'
+      DEF_SUMMARY = <<~'SUM'
+        \s*
+        (,\s*
+        ((?<summary>[^\s,\[\]][^,\[\]]*?)|("\s*(?<summary>[^""]*?)\s*"))
+        \s*)?
+      SUM
       public_constant :DEF_SUMMARY
 
       # [Regexp] match definition labels
@@ -83,6 +88,7 @@ module Defmastership
         \\s*
         \\]
       DEF
+      # [Regexp] match a definition line
       DEFINITION = Regexp.new(definition_re_string, Regexp::EXTENDED)
       public_constant :DEFINITION
 

data/lib/defmastership/core/version.rb

@@ -5,7 +5,7 @@ module Defmastership
   # Common to defmastership and asciidoctor-defmastership
   module Core
     # [String] Gem version
-    VERSION = '1.3.0'
+    VERSION = '1.4.1'
     public_constant :VERSION
   end
 end

data/spec/unit/defmastership/core/dm_regexp_spec.rb

@@ -131,7 +131,8 @@ RSpec.describe(Defmastership::Core::DMRegexp) do
         ']',
         ',[label1]]',
         ', a nice summary,[label1]]',
-        ', a nice summary]'
+        ', a nice summary]',
+        ', "a nice summary, with comma"]'
       ].each do |def_end|
         it { is_expected.to(match(def_end)) }
       end
@@ -140,6 +141,7 @@ RSpec.describe(Defmastership::Core::DMRegexp) do
       it { expect(regexp.match('   ,[   label1    ,    label2    ]     ]')[:summary]).to(be_nil) }
       it { expect(regexp.match(', a summary ]')[:summary]).to(eq('a summary')) }
       it { expect(regexp.match(', a summary ]')[:labels]).to(be_nil) }
+      it { expect(regexp.match(', " a, comma " ]')[:summary]).to(eq('a, comma')) }
     end
 
     context 'when invalid definitions end' do
@@ -221,19 +223,26 @@ RSpec.describe(Defmastership::Core::DMRegexp) do
         '',
         ', bla bla bli',
         ', bla bla bli   ',
-        '   , bla bla bli   '
+        '   , bla bla bli   ',
+        ', bla: bla bli',
+        ', "bla bla, bli"',
+        ', "  bla bla  , bli   "'
       ].each do |line|
         it { is_expected.to(match(line)) }
       end
 
       it { expect(regexp.match('')[:summary]).to(be_nil) }
-      it { expect(regexp.match(', bla bla bli   ')[:summary]).to(eq('bla bla bli')) }
+      it { expect(regexp.match(', bla: bla bli   ')[:summary]).to(eq('bla: bla bli')) }
+      it { expect(regexp.match(', " bla bla , bli "')[:summary]).to(eq('bla bla , bli')) }
     end
 
     context 'with invalid definition summary' do
       it { is_expected.not_to(match('blabla without coma')) }
       it { is_expected.not_to(match(', [bla bla bli')) }
       it { is_expected.not_to(match(', bla bla bli]')) }
+      it { is_expected.not_to(match(', "bla bla bli]')) }
+      it { is_expected.not_to(match(', bla bla bli"]')) }
+      it { is_expected.not_to(match(', ""bla bla bli]')) }
       it { is_expected.not_to(match(',')) }
       it { is_expected.not_to(match(',   ')) }
       it { is_expected.not_to(match(',,')) }
@@ -274,7 +283,8 @@ RSpec.describe(Defmastership::Core::DMRegexp) do
         '[define , definition_type, REFERENCE-0001]',
         '[ define,def-type , 001-REFERENCE, [ label1, label2 ] ]   ',
         '[ define, def-type , REFERENCE-001 ,    [ label1, label2 ] ]',
-        '[ define, def-type , REFERENCE-001 , a summary, [ label1, label2 ] ]'
+        '[ define, def-type , REFERENCE-001 , a summary, [ label1, label2 ] ]',
+        '[ define, def-type , REFERENCE-001 , "a, summary, comma", [ label1, label2 ] ]'
       ].each do |line|
         it { is_expected.to(match(line)) }
       end
@@ -287,6 +297,8 @@ RSpec.describe(Defmastership::Core::DMRegexp) do
       it { expect(one_match[:explicit_checksum]).to(eq('~1234')) }
       it { expect(one_match[:summary]).to(eq('a summary')) }
       it { expect(one_match[:labels]).to(eq('a,b')) }
+
+      it { expect(regexp.match('[define,t,R," a , comma "]')[:summary]).to(eq('a , comma')) }
     end
 
     context 'with invalid definition lines' do
@@ -342,7 +354,8 @@ RSpec.describe(Defmastership::Core::DMRegexp) do
       [
         '{my_var}',
         '    {my_var}   ',
-        '{var-with_dash}'
+        '{var-with_dash}',
+        '[define, requirement, TOTO-0001, A nice {a_variable}]'
       ].each do |line|
         it { is_expected.to(match(line)) }
       end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: defmastership-core
 version: !ruby/object:Gem::Version
-  version: 1.3.0
+  version: 1.4.1
 platform: ruby
 authors:
 - Jérôme Arbez-Gindre
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2024-12-22 00:00:00.000000000 Z
+date: 2025-01-04 00:00:00.000000000 Z
 dependencies: []
 description:
 email: jeromearbezgindre@gmail.com
@@ -61,7 +61,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.5.23
+rubygems_version: 3.5.22
 signing_key:
 specification_version: 4
 summary: Handling of references and definitions with asciidoctor - common code