defmastership 1.0.4 → 1.0.5

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 83b29fc13933c5a5030df105c476b86b0db8217d693c56786a1a8c5eec494a97
-  data.tar.gz: 686431e77ee50fc891ca72b1d1a569620cfff7591e30c279044ed49c02926281
+  metadata.gz: 1a306f9f76179edc5687278ed6a5c1c1c2b3943ad01cd3925cdcb7d7e1466ac2
+  data.tar.gz: dc3afb4b34d6e64e41ff0207242518317e3fe7615474ec17ca87f378436014df
 SHA512:
-  metadata.gz: d87ef7737bbc86a2ad638ac473c2663a710a26d225e17fe1a00cfdea9facb27f01eb810863c03088296bd63d6f665c486d81fc06358cb3f01fcc11da6aef03ba
-  data.tar.gz: 76d543d058079e17bf95c1c495e74d3ccd6f410e07bfbe61f376d058272a08ba52e3c45b4bbc4f73d1838885d657cfe7ecb12ecf7a33eb8caa62e7e4e88afd51
+  metadata.gz: 6434c67db6ccf69c1f837b0ac664512d06563ded9d22faf9a890585ae3e2c3b072d10740fbaba91a23075244a21101801e1366e41ef2fe348c070dfb3467f92f
+  data.tar.gz: 6c511e6138122b454a69a0a2ba27c51abb28b55d09ce0b0a39652a91927f4cd29f2ea015407ff7f4d9f9c9e9eee297e5f43955528fccd1a07fc7caaee48c2a0e

data/.gitignore

@@ -2,3 +2,5 @@
 /tmp
 /coverage
 defmastership-0.0.1.gem
+/Gemfile.lock
+/pkg/

data/.gitlab-ci.yml

@@ -4,7 +4,6 @@ default:
     - apt-get update
     - ruby -v
     - which ruby
-    - rm Gemfile.lock
     - gem install bundler --no-document
     - bundle install --jobs $(nproc) "${FLAGS[@]}"
 

data/Rakefile

@@ -16,8 +16,7 @@ end
 
 spec = eval(::File.read('defmastership.gemspec'))
 
-Gem::PackageTask.new(spec) do |pkg|
-end
+Gem::PackageTask.new(spec)
 CUKE_RESULTS = 'features_results.html'
 CLEAN << CUKE_RESULTS
 

data/bin/defmastership

@@ -51,7 +51,8 @@ module DefMastership
     desc 'Export the definition database in CSV'
     arg_name 'asciidoctor_files'
     command :export do |c|
-      c.action do |_global_options, _options, args|
+      c.flag(%i[separator sep s], default_value: ',', desc: 'CSV separator')
+      c.action do |_global_options, options, args|
         doc = Asciidoctor.load_file(args[0], safe: :unsafe, parse: false)
         # FIXME: also escape ifdef, ifndef, ifeval and endif directives
         # FIXME: do this more carefully by reading line by line; if input
@@ -62,7 +63,7 @@ module DefMastership
 
         output_file = args[0].sub(/\.adoc$/, '.csv')
 
-        DefMastership::CSVFormatter.new(my_doc).export_to(output_file)
+        DefMastership::CSVFormatter.new(my_doc, options['separator']).export_to(output_file)
       end
     end
 

data/cucumber.yml

@@ -0,0 +1,2 @@
+---
+default: --publish

data/defmastership.gemspec

@@ -29,8 +29,8 @@ Gem::Specification.new do |s|
   s.add_development_dependency('rake', '~> 13')
   s.add_development_dependency('rdoc', '~> 6')
   s.add_development_dependency('rspec', '~> 3')
-  s.add_development_dependency('rubocop', '0.91')
-  s.add_development_dependency('rubocop-rspec', '~> 1')
+  s.add_development_dependency('rubocop', '~> 1.3')
+  s.add_development_dependency('rubocop-rspec', '~> 2.0')
   s.add_development_dependency('simplecov', '~> 0')
   s.add_runtime_dependency('aasm', '~> 5')
   s.add_runtime_dependency('asciidoctor', '~> 2')

data/features/export.feature

@@ -22,6 +22,23 @@ Feature: The extract command
     And the stdout should not contain anything
     And the stderr should not contain anything
 
+  Scenario: Extract to CSV with alternative CSV separator
+    Given a file named "toto.adoc" with:
+    """
+    [define, requirement, TOTO-0001]
+    --
+    Exemple of multiline requirement.
+    Second line.
+    --
+    """
+    When I run `defmastership export --separator=';' toto.adoc`
+    Then the file "toto.csv" should contain:
+    """
+    Type;Reference;Value
+    requirement;TOTO-0001;"Exemple of multiline requirement.
+    Second line."
+    """
+
   Scenario: Extract one definition with variable to CSV 
     Given a file named "toto.adoc" with:
     """

data/lib/defmastership/csv_formatter.rb

@@ -11,14 +11,15 @@ module DefMastership
     COLUMN_LIST = %w[fixed labels eref iref attributes].freeze
     private_constant :COLUMN_LIST
 
-    def initialize(doc)
+    def initialize(doc, sep = ',')
       @doc = doc
+      @sep = sep
       @header_formatter = CSVFormatterHeader.new(@doc)
       @body_formatter = CSVFormatterBody.new(@doc)
     end
 
     def export_to(output_file)
-      CSV.open(output_file, 'w:ISO-8859-1') do |csv|
+      CSV.open(output_file, 'w:ISO-8859-1', { col_sep: @sep }) do |csv|
         csv << header
         @doc.definitions.each { |definition| csv << body(definition) }
       end

data/lib/defmastership/version.rb

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

data/spec/unit/defmastership/csv_formatter_spec.rb

@@ -5,7 +5,7 @@ require('defmastership')
 require('ostruct')
 
 RSpec.describe(DefMastership::CSVFormatter) do
-  subject(:formatter) { described_class.new(document) }
+  subject(:formatter) { described_class.new(document, ';') }
 
   let(:document) { instance_double(DefMastership::Document, 'document') }
 
@@ -162,9 +162,9 @@ RSpec.describe(DefMastership::CSVFormatter) do
 
       it do
         expect(target_file).to(have_file_content(<<~CSV_FILE))
-          Type,Reference,Value
-          a,b,c
-          d,e,f
+          Type;Reference;Value
+          a;b;c
+          d;e;f
         CSV_FILE
       end
     end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: defmastership
 version: !ruby/object:Gem::Version
-  version: 1.0.4
+  version: 1.0.5
 platform: ruby
 authors:
 - Jérôme Arbez-Gindre
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2020-09-17 00:00:00.000000000 Z
+date: 2020-11-12 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: aruba
@@ -70,30 +70,30 @@ dependencies:
   name: rubocop
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - '='
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '0.91'
+        version: '1.3'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - '='
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '0.91'
+        version: '1.3'
 - !ruby/object:Gem::Dependency
   name: rubocop-rspec
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '1'
+        version: '2.0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '1'
+        version: '2.0'
 - !ruby/object:Gem::Dependency
   name: simplecov
   requirement: !ruby/object:Gem::Requirement
@@ -164,7 +164,6 @@ files:
 - ".rspec"
 - ".rubocop.yml"
 - Gemfile
-- Gemfile.lock
 - LICENSE
 - README.rdoc
 - Rakefile
@@ -176,6 +175,7 @@ files:
 - config/reek.yml
 - config/rubocop.yml
 - config/yardstick.yml
+- cucumber.yml
 - defmastership.gemspec
 - defmastership.rdoc
 - features/changeref.feature
@@ -229,7 +229,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.1.2
+rubygems_version: 3.2.0.rc.1
 signing_key: 
 specification_version: 4
 summary: Handling of references and definitions with asciidoctor

data/Gemfile.lock

@@ -1,140 +0,0 @@
-PATH
-  remote: .
-  specs:
-    defmastership (1.0.4)
-      aasm (~> 5)
-      asciidoctor (~> 2)
-      gli (~> 2)
-
-GEM
-  remote: https://rubygems.org/
-  specs:
-    aasm (5.1.1)
-      concurrent-ruby (~> 1.0)
-    activesupport (6.0.3.3)
-      concurrent-ruby (~> 1.0, >= 1.0.2)
-      i18n (>= 0.7, < 2)
-      minitest (~> 5.1)
-      tzinfo (~> 1.1)
-      zeitwerk (~> 2.2, >= 2.2.2)
-    aruba (1.0.3)
-      childprocess (>= 2.0, < 5.0)
-      contracts (~> 0.16.0)
-      cucumber (>= 2.4, < 6.0)
-      ffi (~> 1.9)
-      rspec-expectations (~> 3.4)
-      thor (~> 1.0)
-    asciidoctor (2.0.10)
-    ast (2.4.1)
-    builder (3.2.4)
-    childprocess (4.0.0)
-    concurrent-ruby (1.1.7)
-    contracts (0.16.0)
-    cucumber (5.1.1)
-      builder (~> 3.2, >= 3.2.4)
-      cucumber-core (~> 8.0, >= 8.0.1)
-      cucumber-create-meta (~> 2.0, >= 2.0.2)
-      cucumber-cucumber-expressions (~> 10.3, >= 10.3.0)
-      cucumber-gherkin (~> 15.0, >= 15.0.2)
-      cucumber-html-formatter (~> 9.0, >= 9.0.0)
-      cucumber-messages (~> 13.0, >= 13.0.1)
-      cucumber-wire (~> 4.0, >= 4.0.1)
-      diff-lcs (~> 1.4, >= 1.4.4)
-      multi_test (~> 0.1, >= 0.1.2)
-      sys-uname (~> 1.2, >= 1.2.1)
-    cucumber-core (8.0.1)
-      cucumber-gherkin (~> 15.0, >= 15.0.2)
-      cucumber-messages (~> 13.0, >= 13.0.1)
-      cucumber-tag-expressions (~> 2.0, >= 2.0.4)
-    cucumber-create-meta (2.0.2)
-      cucumber-messages (~> 13.0, >= 13.0.1)
-      sys-uname (~> 1.2, >= 1.2.1)
-    cucumber-cucumber-expressions (10.3.0)
-    cucumber-gherkin (15.0.2)
-      cucumber-messages (~> 13.0, >= 13.0.1)
-    cucumber-html-formatter (9.0.0)
-      cucumber-messages (~> 13.0, >= 13.0.1)
-    cucumber-messages (13.1.0)
-      protobuf-cucumber (~> 3.10, >= 3.10.8)
-    cucumber-tag-expressions (2.0.4)
-    cucumber-wire (4.0.1)
-      cucumber-core (~> 8.0, >= 8.0.1)
-      cucumber-cucumber-expressions (~> 10.3, >= 10.3.0)
-      cucumber-messages (~> 13.0, >= 13.0.1)
-    diff-lcs (1.4.4)
-    docile (1.3.2)
-    ffi (1.13.1)
-    gli (2.19.2)
-    i18n (1.8.5)
-      concurrent-ruby (~> 1.0)
-    middleware (0.1.0)
-    minitest (5.14.2)
-    multi_test (0.1.2)
-    parallel (1.19.2)
-    parser (2.7.1.4)
-      ast (~> 2.4.1)
-    protobuf-cucumber (3.10.8)
-      activesupport (>= 3.2)
-      middleware
-      thor
-      thread_safe
-    rainbow (3.0.0)
-    rake (13.0.1)
-    rdoc (6.2.1)
-    regexp_parser (1.7.1)
-    rexml (3.2.4)
-    rspec (3.9.0)
-      rspec-core (~> 3.9.0)
-      rspec-expectations (~> 3.9.0)
-      rspec-mocks (~> 3.9.0)
-    rspec-core (3.9.2)
-      rspec-support (~> 3.9.3)
-    rspec-expectations (3.9.2)
-      diff-lcs (>= 1.2.0, < 2.0)
-      rspec-support (~> 3.9.0)
-    rspec-mocks (3.9.1)
-      diff-lcs (>= 1.2.0, < 2.0)
-      rspec-support (~> 3.9.0)
-    rspec-support (3.9.3)
-    rubocop (0.91.0)
-      parallel (~> 1.10)
-      parser (>= 2.7.1.1)
-      rainbow (>= 2.2.2, < 4.0)
-      regexp_parser (>= 1.7)
-      rexml
-      rubocop-ast (>= 0.4.0, < 1.0)
-      ruby-progressbar (~> 1.7)
-      unicode-display_width (>= 1.4.0, < 2.0)
-    rubocop-ast (0.4.1)
-      parser (>= 2.7.1.4)
-    rubocop-rspec (1.43.2)
-      rubocop (~> 0.87)
-    ruby-progressbar (1.10.1)
-    simplecov (0.19.0)
-      docile (~> 1.1)
-      simplecov-html (~> 0.11)
-    simplecov-html (0.12.2)
-    sys-uname (1.2.1)
-      ffi (>= 1.0.0)
-    thor (1.0.1)
-    thread_safe (0.3.6)
-    tzinfo (1.2.7)
-      thread_safe (~> 0.1)
-    unicode-display_width (1.7.0)
-    zeitwerk (2.4.0)
-
-PLATFORMS
-  ruby
-
-DEPENDENCIES
-  aruba (~> 1)
-  defmastership!
-  rake (~> 13)
-  rdoc (~> 6)
-  rspec (~> 3)
-  rubocop (= 0.91)
-  rubocop-rspec (~> 1)
-  simplecov (~> 0)
-
-BUNDLED WITH
-   2.1.4