defmastership 1.3.5 → 1.3.6

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: a331a25b15fb26d3d242bc037b8c084de0edacd13fac0a6bacb9b9a7e078dd1b
-  data.tar.gz: f166d30d3272ec3709c754978e1078bd4f67492dd697eb188e35c92317893578
+  metadata.gz: b282623e3f26fd7e1b8f88df3605ffb8a536c5d7a71e3f8f6b41d937d740c77c
+  data.tar.gz: af43d982dc66141dced00cf731300759631b5730fda62b250c43bde1d026d844
 SHA512:
-  metadata.gz: beab382363108e87a92a566f8b84bc291053cd58161debbe35606abdf98eae2e3c1d1ab5e979d7f646f841219f6ea3ff8c3c7a4a288c02aea62641d7d439aaff
-  data.tar.gz: 5cad56201f0bc16c7b51d70466ae519090dad20d79401cb67ff017f6c0cb8e8d4bdb6000fcfcb21b2036e8877b7de77afbc785fcf684575b9b3e09a63cb27b89
+  metadata.gz: dbcdd3fc1b665dd867760123c43927f6f27b83726000a8e567f20fc716269ae073ca4c70f3362c029ff4347d6f0371068b6e15ab893e74fef89cf6419cbd9487
+  data.tar.gz: 67e21c19f23d236f53bda017cfd5fdf1ce7700490b8e68c805c042f3f902123c7d1f275b06046a2c3ecc6614e5bf527dc3db0d5fb6addbc24c0a002337ae06bd

data/Gemfile

@@ -11,7 +11,7 @@ group :development do
   # cucumber steps for command line tests
   gem 'aruba',                 '~> 2.3'
   # bdd
-  gem 'cucumber',              '10.1'
+  gem 'cucumber',              '~> 10.2'
   # code duplication
   gem 'flay',                  '~> 2.14'
   # automatic test run

data/config/rubocop.yml

@@ -33,6 +33,10 @@ Lint/ConstantResolution:
 Style/DocumentationMethod:
   Enabled: true
 
+Style/OneClassPerFile:
+  Enabled: true
+  AllowedClasses: ['DummyClass']
+
 Style/StringHashKeys :
   Enabled: true
   Exclude:

data/features/export.feature

@@ -9,6 +9,7 @@ Feature: The export command
     [define, requirement, TOTO-0001]
     --
     Exemple of multiline requirement.
+
     Second line.
     --
     """
@@ -17,7 +18,8 @@ Feature: The export command
     """
     Type,Reference,Value,Checksum
     requirement,TOTO-0001,"Exemple of multiline requirement.
-    Second line.",~b86dcbde
+
+    Second line.",~78e36874
     """
     And the stdout should not contain anything
 
@@ -51,6 +53,7 @@ Feature: The export command
     [define, requirement, TOTO-0001]
     --
     Exemple of multiline requirement.
+
     Second line.
     --
     """
@@ -59,7 +62,8 @@ Feature: The export command
     """
     Type;Reference;Value;Checksum
     requirement;TOTO-0001;"Exemple of multiline requirement.
-    Second line.";~b86dcbde
+
+    Second line.";~78e36874
     """
 
   Scenario: Export one definition with variable to CSV
@@ -91,6 +95,7 @@ Feature: The export command
     [define, requirement, TOTO-0001]
     --
     Exemple of multiline requirement.
+
     Second line.
     --
     [define, something_else, TOTO-0003]
@@ -98,6 +103,7 @@ Feature: The export command
     with two sentences.
     --
     ignored multiline.
+
     Second line.
     --
     """
@@ -106,7 +112,8 @@ Feature: The export command
     """
     Type,Reference,Value,Checksum
     requirement,TOTO-0001,"Exemple of multiline requirement.
-    Second line.",~b86dcbde
+
+    Second line.",~78e36874
     something_else,TOTO-0003,"only one paragraphe.
     with two sentences.",~4761e172
     """
@@ -122,7 +129,9 @@ Feature: The export command
     [define, requirement, TOTO-0001]
     --
     Exemple of multiline requirement.
+
     Second line.
+
     --
     ....
     [define, something_else, TOTO-0003]
@@ -142,7 +151,9 @@ Feature: The export command
     [define, requirement, TOTO-0001]
     --
     Exemple of multiline requirement.
+
     Second line.
+
     --
     ----
     [define, something_else, TOTO-0003]
@@ -162,7 +173,9 @@ Feature: The export command
     [define, requirement, TOTO-0001]
     --
     Exemple of multiline requirement.
+
     Second line.
+
     --
     ////
     [define, something_else, TOTO-0003]
@@ -182,7 +195,9 @@ Feature: The export command
     [define, requirement, TOTO-0001]
     --
     Exemple of multiline requirement.
+
     Second line.
+
     --
     ////
     [define, whatever, TOTO-0003]
@@ -204,6 +219,7 @@ Feature: The export command
     [define, requirement, TOTO-0001, A nice summary]
     --
     Exemple of multiline requirement.
+
     Second line.
     --
     """
@@ -212,7 +228,8 @@ Feature: The export command
     """
     Type,Reference,Summary,Value,Checksum
     requirement,TOTO-0001,A nice summary,"Exemple of multiline requirement.
-    Second line.",~f8092f4e
+
+    Second line.",~98dc7abd
     """
     And the stdout should not contain anything
 
@@ -223,6 +240,7 @@ Feature: The export command
     [define, requirement, TOTO-0001, A nice {a_variable}]
     --
     Exemple of multiline requirement.
+
     Second line.
     --
     """
@@ -231,7 +249,8 @@ Feature: The export command
     """
     Type,Reference,Summary,Value,Checksum
     requirement,TOTO-0001,A nice summary,"Exemple of multiline requirement.
-    Second line.",~f8092f4e
+
+    Second line.",~98dc7abd
     """
     And the stdout should not contain anything
 
@@ -241,6 +260,7 @@ Feature: The export command
     [define, requirement, TOTO-0001, " A nice, summary " ]
     --
     Exemple of multiline requirement.
+
     Second line.
     --
     """
@@ -249,7 +269,8 @@ Feature: The export command
     """
     Type,Reference,Summary,Value,Checksum
     requirement,TOTO-0001,"A nice, summary","Exemple of multiline requirement.
-    Second line.",~77a203d4
+
+    Second line.",~350d850e
     """
     And the stdout should not contain anything
 
@@ -259,6 +280,7 @@ Feature: The export command
     [define, requirement, TOTO-0001, [label1, label2]]
     --
     Exemple of multiline requirement.
+
     Second line.
     --
     """
@@ -267,7 +289,8 @@ Feature: The export command
     """
     Type,Reference,Value,Checksum,Labels
     requirement,TOTO-0001,"Exemple of multiline requirement.
-    Second line.",~b86dcbde,"label1
+
+    Second line.",~78e36874,"label1
     label2"
     """
     And the stdout should not contain anything
@@ -280,6 +303,7 @@ Feature: The export command
     [define, requirement, TOTO-0001]
     --
     Exemple of multiline requirement.
+
     Second line.
     --
     defs:eref[implements, [SYSTEM-0012, SYSTEM-0014]]
@@ -289,7 +313,8 @@ Feature: The export command
     """
     Type,Reference,Value,Checksum,Participate to:
     requirement,TOTO-0001,"Exemple of multiline requirement.
-    Second line.",~b86dcbde,"SYSTEM-0012
+
+    Second line.",~78e36874,"SYSTEM-0012
     SYSTEM-0014"
     """
     And the stdout should not contain anything
@@ -302,6 +327,7 @@ Feature: The export command
     [define, requirement, TOTO-0001]
     --
     Exemple of multiline requirement.
+
     Second line.
     --
     defs:eref[implements, [SYSTEM-0012(a), SYSTEM-0014, SYSTEM-0015(b~1223abcd)]]
@@ -311,7 +337,8 @@ Feature: The export command
     """
     Type,Reference,Value,Checksum,Participate to:
     requirement,TOTO-0001,"Exemple of multiline requirement.
-    Second line.",~b86dcbde,"SYSTEM-0012(a)
+
+    Second line.",~78e36874,"SYSTEM-0012(a)
     SYSTEM-0014
     SYSTEM-0015(b~1223abcd)"
     """
@@ -325,6 +352,7 @@ Feature: The export command
     [define, requirement, TOTO-0001]
     --
     Exemple of multiline requirement.
+
     Second line.
     --
     """
@@ -333,7 +361,8 @@ Feature: The export command
     """
     Type,Reference,Value,Checksum,Participate to:
     requirement,TOTO-0001,"Exemple of multiline requirement.
-    Second line.",~b86dcbde,
+
+    Second line.",~78e36874,
     """
     And the stdout should not contain anything
 
@@ -345,6 +374,7 @@ Feature: The export command
     [define, requirement, TOTO-0001]
     --
     Exemple of multiline requirement.
+
     Second line.
     --
     defs:eref[implements, [SYSTEM-0012, SYSTEM-0014]]
@@ -354,7 +384,8 @@ Feature: The export command
     """
     Type,Reference,Value,Checksum,Participate to:
     requirement,TOTO-0001,"Exemple of multiline requirement.
-    Second line.",~b86dcbde,"SYSTEM-0012
+
+    Second line.",~78e36874,"SYSTEM-0012
     SYSTEM-0014"
     """
     And the stdout should not contain anything
@@ -366,6 +397,7 @@ Feature: The export command
     [define, requirement, TOTO-0001]
     --
     Exemple of multiline requirement.
+
     Second line.
     --
     defs:eref[implements, [SYSTEM-0012, SYSTEM-0014]]
@@ -376,10 +408,12 @@ Feature: The export command
     """
     Type,Reference,Value,Checksum,Participate to:
     requirement,TOTO-0001,"Exemple of multiline requirement.
-    Second line.",~b86dcbde,"SYSTEM-0012
+
+    Second line.",~78e36874,"SYSTEM-0012
     SYSTEM-0014"
     """
 
+
   Scenario: Export one definition with internal ref to CSV
     Given a file named "toto.adoc" with:
     """
@@ -535,6 +569,7 @@ Feature: The export command
     [define, requirement, TOTO-0001]
     --
     Exemple of multiline requirement.
+
     Second line.
     --
     """
@@ -547,6 +582,7 @@ Feature: The export command
     [define, requirement, TOTO-0001]
     --
     Exemple of multiline requirement.
+
     Second line.
     --
     """
@@ -557,8 +593,8 @@ Feature: The export command
       {
         "Type": "requirement",
         "Reference": "TOTO-0001",
-        "Value": "Exemple of multiline requirement.\nSecond line.",
-        "Checksum": "~b86dcbde"
+        "Value": "Exemple of multiline requirement.\n\nSecond line.",
+        "Checksum": "~78e36874"
       }
     ]
     """
@@ -569,6 +605,7 @@ Feature: The export command
     [define, requirement, TOTO-0001]
     --
     Exemple of multiline requirement.
+
     Second line.
     --
     """
@@ -580,6 +617,7 @@ Feature: The export command
       :Reference: TOTO-0001
       :Value: |-
         Exemple of multiline requirement.
+
         Second line.
-      :Checksum: "~b86dcbde"
+      :Checksum: "~78e36874"
     """

data/features/support/env.rb

@@ -3,17 +3,18 @@
 
 require('aruba/cucumber')
 
-# ENV['PATH'] = "#{File.expand_path(File.dirname(__FILE__) + '/../../bin')}"\
-#               "#{File::PATH_SEPARATOR}#{ENV['PATH']}"
-# LIB_DIR = File.join(__dir__, '..', '..', 'lib')
+require 'cucumber/formatter/message_builder'
 
-# Before do
-#   # Using "announce" causes massive warnings on 1.9.2
-#   @puts = true
-#   @original_rubylib = ENV['RUBYLIB']
-#   ENV['RUBYLIB'] = LIB_DIR + File::PATH_SEPARATOR + ENV['RUBYLIB'].to_s
-# end
-
-# After do
-#   ENV['RUBYLIB'] = @original_rubylib
-# end
+module Cucumber
+  module Formatter
+    # Temporary fix for Cucumber 10.2.0 + Ruby 4.0.2 NoMethodError
+    class MessageBuilder
+      # Temporary fix for Cucumber 10.2.0 + Ruby 4.0.2 NoMethodError
+      def argument_group_to_message(argument_group)
+        # On s'assure que children n'est pas nil avant d'appeler map
+        argument_group.children || []
+        # ... (le reste de la logique originale avec le garde-fou)
+      end
+    end
+  end
+end

data/lib/defmastership/config_preserver.rb

@@ -31,7 +31,7 @@ module Defmastership
       new_config_content = config.merge_no_new(new_config).to_yaml.split("\n")
 
       # Put in there place the emty lines and comments
-      File.open(@filename, 'r').each_line(chomp: true).with_index do |line, line_num|
+      File.foreach(@filename, chomp: true).with_index do |line, line_num|
         if /\A\s*(\#.*)?\z/.match?(line)
           new_config_content.insert(line_num, line)
         elsif line =~ /\A\s*[^\s].+?(\s*\#.*)\z/

data/lib/defmastership/document.rb

@@ -166,6 +166,7 @@ module Defmastership
         public_send(event, matching_line)
       else
         @definition_parser.public_send(event, matching_line)
+        ''
       end
     end
 

data/lib/defmastership/modifier/modifier_common.rb

@@ -64,7 +64,7 @@ module Defmastership
 
       def apply_to_one(filename, text, method)
         text.lines.map { |line| public_send(method, filename, line) }
-            .join
+                  .join
       end
     end
   end

data/lib/defmastership/version.rb

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

data/spec/unit/defmastership/config_preserver_spec.rb

@@ -62,8 +62,12 @@ RSpec.describe(Defmastership::ConfigPreserver) do
 
       before do
         allow(YAML).to(receive(:load_file).with('configuration.yml').and_return(original_config))
-        allow(File).to(receive(:open).with('configuration.yml', 'r').and_return(file))
-        allow(file).to(receive(:each_line).with(chomp: true).and_return(original_file_content.each_line(chomp: true)))
+        allow(File).to(
+          receive(:foreach).with(
+            'configuration.yml',
+            chomp: true
+          ).and_return(original_file_content.each_line(chomp: true))
+        )
         allow(File).to(receive(:write))
       end
 
@@ -113,8 +117,12 @@ RSpec.describe(Defmastership::ConfigPreserver) do
 
       before do
         allow(YAML).to(receive(:load_file).with('configuration.yml').and_return(original_config))
-        allow(File).to(receive(:open).with('configuration.yml', 'r').and_return(file))
-        allow(file).to(receive(:each_line).with(chomp: true).and_return(original_file_content.each_line(chomp: true)))
+        allow(File).to(
+          receive(:foreach).with(
+            'configuration.yml',
+            chomp: true
+          ).and_return(original_file_content.each_line(chomp: true))
+        )
         allow(File).to(receive(:write))
       end
 

data/spec/unit/defmastership/document_spec.rb

@@ -131,6 +131,30 @@ RSpec.describe(Defmastership::Document) do
         it { expect(definition).to(have_received(:<<).with('b')) }
       end
 
+      context 'when complete definition with content including empty line' do
+        let(:input_lines) do
+          [
+            '[define, requirement, TOTO-0001]',
+            '--',
+            'a',
+            '',
+            'b',
+            '--',
+            'not included'
+          ]
+        end
+
+        before do
+          allow(definition).to(receive(:<<).and_return(definition))
+          document.__send__(:do_parse, input_lines)
+        end
+
+        it { expect(definition).to(have_received(:<<).with('a')) }
+        it { expect(definition).to(have_received(:<<).with('')) }
+        it { expect(definition).to(have_received(:<<).with('b')) }
+        it { expect(definition).not_to(have_received(:<<).with(true)) }
+      end
+
       context 'when complete definition with content including ----' do
         let(:input_lines) do
           [

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: defmastership
 version: !ruby/object:Gem::Version
-  version: 1.3.5
+  version: 1.3.6
 platform: ruby
 authors:
 - Jérôme Arbez-Gindre
@@ -272,7 +272,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 4.0.5
+rubygems_version: 4.0.9
 specification_version: 4
 summary: Handling of references and definitions with asciidoctor
 test_files: []