defmastership 1.3.4 → 1.3.5

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 7005c6bf64a1de44a7ac2f511070d4233ec8abde7816df47ceb1219c77500732
-  data.tar.gz: 219352e005a6e87d02258caacc30ad537e3d644da8dc008b1d4b958e70f33fcc
+  metadata.gz: a331a25b15fb26d3d242bc037b8c084de0edacd13fac0a6bacb9b9a7e078dd1b
+  data.tar.gz: f166d30d3272ec3709c754978e1078bd4f67492dd697eb188e35c92317893578
 SHA512:
-  metadata.gz: 5a80ed40ddcf6300da7287b30e5e5c10bb4789aca80ef2c927a85056987c6831022e18e2459ac72633b408f05d3ab564292d96611c282f19e73d173534eadf91
-  data.tar.gz: 218bad889104732f8ba69f00b0313b7a8327ddffb7ea5bfd2e2fac66b4dd38ae37efacf7f0033be576b32924bececafa4582c02a7cf458bc9c81ed2474cbacbd
+  metadata.gz: beab382363108e87a92a566f8b84bc291053cd58161debbe35606abdf98eae2e3c1d1ab5e979d7f646f841219f6ea3ff8c3c7a4a288c02aea62641d7d439aaff
+  data.tar.gz: 5cad56201f0bc16c7b51d70466ae519090dad20d79401cb67ff017f6c0cb8e8d4bdb6000fcfcb21b2036e8877b7de77afbc785fcf684575b9b3e09a63cb27b89

data/.gitlab-ci.yml

@@ -1,5 +1,5 @@
 default:
-  image: ruby:3.4
+  image: ruby:4.0
   before_script:
     - gem install bundler --no-document
     - bundle install --jobs $(nproc) "${FLAGS[@]}"
@@ -42,13 +42,23 @@ bdd ruby3.3:
   script:
     - bundle exec rake test:features
 
+bdd ruby3.4:
+  image: ruby:3.4
+  script:
+    - bundle exec rake test:features
+
 unit tests ruby3.2:
   image: ruby:3.2
   script:
     - bundle exec rake test:spec
 
 unit tests ruby3.3:
-  image: ruby:3.2
+  image: ruby:3.3
+  script:
+    - bundle exec rake test:spec
+
+unit tests ruby3.4:
+  image: ruby:3.4
   script:
     - bundle exec rake test:spec
 

data/Gemfile

@@ -11,11 +11,11 @@ group :development do
   # cucumber steps for command line tests
   gem 'aruba',                 '~> 2.3'
   # bdd
-  gem 'cucumber',              '~> 10.2'
+  gem 'cucumber',              '10.1'
   # code duplication
   gem 'flay',                  '~> 2.14'
   # automatic test run
-  gem 'guard',                 '~> 2.19'
+  gem 'guard',                 '~> 2.20'
   # automatic update invocation
   # gem 'guard-bundler',         '~> 3.0'
   # automatic style check
@@ -25,27 +25,27 @@ group :development do
   # automatic style check
   gem 'guard-rubocop',         '~> 1.5'
   # mutation testing
-  gem 'mutant-rspec',          '~> 0.13'
+  gem 'mutant-rspec',          '~> 0.14'
   # to parse and execute Rakefile
   gem 'rake',                  '~> 13.3'
   # detect selling code
   gem 'reek',                  '~> 6.5'
   # needed by yard to render documentation
-  gem 'rdoc',                  '~> 7.0'
+  gem 'rdoc',                  '~> 7.1'
   # tdd
   gem 'rspec',                 '~> 3.13'
   # code needs to be clean
-  gem 'rubocop',               '~> 1.82'
+  gem 'rubocop',               '~> 1.84'
   # code needs to be clean
   gem 'rubocop-performance',   '~> 1.26'
   # test code needs to be clean
-  gem 'rubocop-rspec',         '~> 3.8'
+  gem 'rubocop-rspec',         '~> 3.9'
   # Rakefiles need to be clean
   gem 'rubocop-rake',          '~> 0.7'
   # Doc need to be clean
-  gem 'rubocop-yard',          '~> 1.0'
+  gem 'rubocop-yard',          '~> 1.1'
   # my code needs to be critiqued
-  gem 'rubycritic',            '~> 4.11'
+  gem 'rubycritic',            '~> 5.0'
   # What is tdd without code coverage ?
   gem 'simplecov',             '~> 0.22'
   # to document code
@@ -54,5 +54,5 @@ end
 
 group :debugging do
   # Sometimes, we need to debug
-  gem 'pry',                   '~> 0.15'
+  gem 'pry',                   '~> 0.16'
 end

data/config/rubocop.yml

@@ -50,6 +50,9 @@ Style/StringHashKeys :
 Style/MissingElse:
   EnforcedStyle: case
 
+Style/HashLookupMethod:
+  Enabled: false
+
 Metrics/ModuleLength :
   Exclude:
     - 'spec/**/*'

data/defmastership.gemspec

@@ -25,7 +25,7 @@ Gem::Specification.new do |spec|
   spec.add_dependency('csv', '~> 3.3')
   spec.add_dependency('defmastership-core', '~> 1.5.5')
   spec.add_dependency('facets', '~> 3.1')
-  spec.add_dependency('git', '~> 4.0')
+  spec.add_dependency('git', '~> 4.3')
   spec.add_dependency('gli', '~> 2.22')
   spec.add_dependency('memoist', '~> 0.16')
   spec.add_dependency('ostruct', '~> 0.6')

data/features/changeref.feature

@@ -308,7 +308,7 @@ Feature: The changeref command
       | lines=1..7;9, tag=TOTO-TEMP-XXX1                    | lines=1..7;9, tag=TOTO-0123                    |
       | tag=!TOTO-TEMP-XXX2;TOTO-TEMP-XXX1                  | tag=!TOTO-TEMP-XXX2;TOTO-0123                  |
       
-  Scenario Outline: Change definitions, modify tags in included files
+  Scenario Outline: Change definitions, modify refs in included files
     Given a file named "modifications.yml" with:
     """
     ---
@@ -338,17 +338,17 @@ Feature: The changeref command
     """
 
     Examples:
-      | initial target comment             | modified target comment       |
-      | # tag::TOTO-TEMP-XXX1[]            | # tag::TOTO-0123[]            |
-      | # tags::TOTO-TEMP-XXX1[]           | # tags::TOTO-TEMP-XXX1[]      |
-      | # tag::TOTO-TEMP-XXX1              | # tag::TOTO-TEMP-XXX1         |
-      | # end::TOTO-TEMP-XXX1[]            | # end::TOTO-0123[]            |
-      | # tag::TOTO-TEMP-XXX2[]            | # tag::TOTO-TEMP-XXX2[]       |
-      | ; end::TOTO-TEMP-XXX1[]            | ; end::TOTO-0123[]            |
-      | // tag::TOTO-TEMP-XXX1[]  Whatever | // tag::TOTO-0123[]  Whatever |
-      | /* end::TOTO-TEMP-XXX1[] */        | /* end::TOTO-0123[] */        |
+      | initial target comment              | modified target comment |
+      | TOTO-TEMP-XXX1                      | TOTO-0123               |
+      | TOTO-TEMP-XXX1[]                    | TOTO-0123[]             |
+      | TOTOTO-TEMP-XXX1                    | TOTOTO-TEMP-XXX1        |
+      | TOTOTO-TEMP-XXX1[]                  | TOTOTO-TEMP-XXX1[]      |
+      | TOTO-TEMP-XXX123                    | TOTO-TEMP-XXX123        |
+      | TOTO-TEMP-XXX123[]                  | TOTO-TEMP-XXX123[]      |
+      | TOTO-TEMP-XXX1ABC                   | TOTO-TEMP-XXX1ABC       |
+      | TOTO-TEMP-XXX1ABC[]                 | TOTO-TEMP-XXX1ABC[]     |
 
-  Scenario: Change definitions in subfolders, modify tags in included files
+  Scenario: Change definitions in subfolders, modify refs in included files
     Given a file named "modifications.yml" with:
     """
     ---

data/lib/defmastership/modifier/change_ref.rb

@@ -172,11 +172,7 @@ module Defmastership
         # @return [String] the modified line with all changes
         def self.apply_changes_in_included_file_line(line, changes)
           changes.reduce(line) do |res_line, (from, to)|
-            if res_line.match?(/(tag|end)::#{from}\[\]/)
-              res_line.sub(from, to)
-            else
-              res_line
-            end
+            res_line.gsub(/\b#{from}\b/, to)
           end
         end
 

data/lib/defmastership/version.rb

@@ -3,6 +3,6 @@
 
 module Defmastership
   # [String] Gem version
-  VERSION = '1.3.4'
+  VERSION = '1.3.5'
   public_constant :VERSION
 end

data/spec/unit/defmastership/modifier/change_ref_spec.rb

@@ -217,35 +217,31 @@ RSpec.describe(Defmastership::Modifier::ChangeRef) do
     end
 
     let(:original_included_file) do
-      <<OIF
-      # tag::TOTO-TEMP123[]
-      # end::TOTO-TEMP123[]
-      /* tag::TOTO-TEMP123[] */
-      <!-- tag::TOTO-TEMP123[] -->
-      ; end::TOTO-TEMP123[]
-      # wrong tags
-      ; tags::TOTO-TEMP123[]
-      ; end::TOTO-TEMP123
-      ; ends::TOTO-TEMP123[]
-      ; tag:TOTO-TEMP123[]
-      ; end:TOTO-TEMP123[]
-OIF
+      <<~OIF
+        TOTO-TEMP123
+          TOTO-TEMP123
+        TOTO-TEMP123 TOTO-TEMP123
+        TOTO-TEMP123[]
+        TOTOTO-TEMP123
+        TOTOTO-TEMP123[]
+        TOTO-TEMP12323
+        TOTO-TEMP12323[]
+        TOTO-TEMP123ABC
+      OIF
     end
 
     let(:mofified_included_file) do
-      <<MIF
-      # tag::TOTO-0132[]
-      # end::TOTO-0132[]
-      /* tag::TOTO-0132[] */
-      <!-- tag::TOTO-0132[] -->
-      ; end::TOTO-0132[]
-      # wrong tags
-      ; tags::TOTO-TEMP123[]
-      ; end::TOTO-TEMP123
-      ; ends::TOTO-TEMP123[]
-      ; tag:TOTO-TEMP123[]
-      ; end:TOTO-TEMP123[]
-MIF
+      <<~MIF
+        TOTO-0132
+          TOTO-0132
+        TOTO-0132 TOTO-0132
+        TOTO-0132[]
+        TOTOTO-TEMP123
+        TOTOTO-TEMP123[]
+        TOTO-TEMP12323
+        TOTO-TEMP12323[]
+        TOTO-TEMP123ABC
+      MIF
     end
 
     before do
@@ -253,7 +249,7 @@ MIF
       refchanger.replace_refdef('', '[define, whatever, TITI-TEMP421]')
 
       allow(File).to(receive(:readlines)).with('sub/target').and_return(['whatever'])
-      allow(File).to(receive(:readlines)).with('sub/path/target').and_return(original_included_file.split)
+      allow(File).to(receive(:readlines)).with('sub/path/target').and_return(original_included_file.lines(chomp: true))
       allow(File).to(receive(:readlines)).with('./path/target').and_return(['whatever'])
       allow(File).to(receive(:readlines)).with('./target').and_return(['whatever'])
 
@@ -266,7 +262,7 @@ MIF
     it { expect(File).to(have_received(:readlines).with('sub/path/target')) }
 
     it do
-      expect(File).to(have_received(:writelines).with('sub/path/target', mofified_included_file.split))
+      expect(File).to(have_received(:writelines).with('sub/path/target', mofified_included_file.lines(chomp: true)))
     end
 
     it { expect(File).not_to(have_received(:readlines).with('otherpath/othertarget')) }

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: defmastership
 version: !ruby/object:Gem::Version
-  version: 1.3.4
+  version: 1.3.5
 platform: ruby
 authors:
 - Jérôme Arbez-Gindre
@@ -85,14 +85,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '4.0'
+        version: '4.3'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '4.0'
+        version: '4.3'
 - !ruby/object:Gem::Dependency
   name: gli
   requirement: !ruby/object:Gem::Requirement
@@ -272,7 +272,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 4.0.2
+rubygems_version: 4.0.5
 specification_version: 4
 summary: Handling of references and definitions with asciidoctor
 test_files: []