asciidoctor-diagram 2.2.4 → 2.2.5

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 0c7b68569773e4811496a15d962840a88567ec7e7890d91d38a38c742477c24b
-  data.tar.gz: 7f7f72e9433adbbc0ee21537db7d96b5469b22979b9f82930d97d4a70614e6a4
+  metadata.gz: 980b6fb443595ac5fa50769efd9c56585825cad5f05eae4d3b19540f317f8d0d
+  data.tar.gz: 5c52555bd202fd535319ae5b2b2e9a2381ab13dd9f13f7ae76cdb5f97062ecf1
 SHA512:
-  metadata.gz: b9b65b14640274daf2a670f44330d261a2712df4d3ee696cd4a0fe8df395258716d2213d9d8de143117e67b1d66750b8bb5c8c892888e6477c1171a81ac53904
-  data.tar.gz: 96cc74fbfa0649906618089719b3d204f6d6127b0b81c648b6ae7f86279df54a0cdd23533a74bc898ea84ecb2653a626d58a0b82078f39710d47108c3f2a0d0c
+  metadata.gz: 9ba75fc18d1a7f0367763f47cfd5fefc7280cc0a4d54ca4a782ddae7699cdd3ec9b7bcfdc113c79e85bdf5ce0e438225e6246a0d454bd3c16b0099812a0485f5
+  data.tar.gz: 184c202daec74ca42c450735e66de0b6de854d34671e009e5aaaf7e9a47b1d8207ca4d9b6bdbdd93596bbd7476c86a1efd4ffa8018a2c901c61263998ece0a89

data/CHANGELOG.adoc

@@ -1,6 +1,14 @@
 = Asciidoctor-diagram Changelog
 
-== 2.2.3
+== 2.2.5
+
+Enhancements::
+
+* Issue #401: Add passthrough `txt` output format support for A2S, Ditaa, and Svgbob
+* Issue #402: Add https://github.com/kaishuu0123/erd-go[erd-go] support
+* Issue #404: Add https://github.com/mscgenjs[mscgenjs] support
+
+== 2.2.4
 
 Enhancements::
 

data/docs/modules/ROOT/partials/advanced.adoc

@@ -76,12 +76,12 @@ The following table lists the tools that are required for each diagram type, the
    |diagrams     |{uri-python}[Python]                                                  |`diagrams-python`
    |ditaa        |{uri-java}[Java]                                                      |`java`
    |dpic         |{uri-dpic}[dpic]                                                      |`dpic`
-   |erd          |{uri-erd}[Erd]                                                        |`erd`
+   |erd          |{uri-erd}[Erd] or {uri-erd-go}[Erd Go]                                |`erd`
    |gnuplot      |{uri-gnuplot}[Gnuplot]                                                |`gnuplot`
    |graphviz     |{uri-graphviz}[GraphViz]                                              |`dot` or `graphvizdot`
    |meme         |{uri-imagemagick}[ImageMagick]                                        |`convert` and `identify`
    |mermaid      |{uri-mermaid}[Mermaid.cli]                                            |`mmdc`
-   |msc          |{uri-mscgen}[Mscgen]                                                  |`mscgen`
+   |msc          |{uri-mscgen}[Mscgen] or {uri-mscgen-js}[mscgen.js]                    |`mscgen`
    |nomnoml      |{uri-nomnoml}[Nomnoml]                                                |`nomnoml`
    |nwdiag       |{uri-nwdiag}[NwDiag]                                                  |`nwdiag`
    |packetdiag   |{uri-nwdiag}[NwDiag]                                                  |`packetdiag`

data/docs/modules/ROOT/partials/create_diagram.adoc

@@ -21,14 +21,14 @@ The following diagram types and output formats are available:
 [cols=">,5*^",options="header"]
 |===
 |Diagram Type                      |gif    |pdf    |png    |svg    |txt
-|{uri-a2s}[a2s]                    |       |       |       |{check}|
+|{uri-a2s}[a2s]                    |       |       |       |{check}|{check}
 |{uri-actdiag}[actdiag]            |       |{check}|{check}|{check}|
 |<<barcode,barcode>>               |       |       |{check}|       |{check}
 |{uri-blockdiag}[blockdiag]        |       |{check}|{check}|{check}|
 |{uri-bpmn}[bpmn]                  |       |{check}|{check}|{check}|
 |{uri-bytefield}[bytefield]        |       |       |       |{check}|
 |{uri-diagrams}[diagrams]          |       |{check}|{check}|{check}|
-|{uri-ditaa}[ditaa]                |       |       |{check}|{check}|
+|{uri-ditaa}[ditaa]                |       |       |{check}|{check}|{check}
 |{uri-dpic}[dpic]                  |       |       |       |{check}|
 |{uri-erd}[erd]                    |       |       |{check}|{check}|
 |{uri-gnuplot}[gnuplot]            |{check}|       |{check}|{check}|{check}
@@ -45,7 +45,7 @@ The following diagram types and output formats are available:
 |{uri-seqdiag}[seqdiag]            |       |{check}|{check}|{check}|
 |{uri-shaape}[shaape]              |       |       |{check}|{check}|
 |{uri-smcat}[smcat]                |       |       |       |{check}|
-|{uri-svgbob}[svgbob]              |       |       |       |{check}|
+|{uri-svgbob}[svgbob]              |       |       |       |{check}|{check}
 |{uri-symbolator}[symbolator]      |       |{check}|{check}|{check}|
 |{uri-syntrax}[syntrax] (Syntrax)  |       |{check}|{check}|{check}|
 |{uri-jsyntrax}[syntrax] (JSyntrax)|       |       |{check}|{check}|

data/docs/modules/ROOT/partials/uris.adoc

@@ -10,12 +10,14 @@
 :uri-dpic: https://gitlab.com/aplevich/dpic
 :uri-dot: https://graphviz.gitlab.io/_pages/doc/info/lang.html
 :uri-erd: https://github.com/BurntSushi/erd
+:uri-erd-go: https://github.com/kaishuu0123/erd-go
 :uri-gnuplot: http://gnuplot.info
 :uri-graphviz: https://graphviz.gitlab.io
 :uri-imagemagick: http://www.imagemagick.org
 :uri-java: http://java.sun.com
 :uri-mermaid: https://github.com/mermaid-js/mermaid-cli
 :uri-mscgen: http://www.mcternan.me.uk/mscgen/
+:uri-mscgen-js: https://github.com/mscgenjs/mscgenjs-cli
 :uri-nomnoml: http://nomnoml.com
 :uri-nwdiag: http://blockdiag.com/en/nwdiag/index.html
 :uri-packetdiag: http://blockdiag.com/en/nwdiag/index.html

data/lib/asciidoctor-diagram/a2s/converter.rb

@@ -10,7 +10,7 @@ module Asciidoctor
       include CliGenerator
 
       def supported_formats
-        [:svg]
+        [:svg, :txt]
       end
 
       def collect_options(source)
@@ -24,6 +24,8 @@ module Asciidoctor
       end
 
       def convert(source, format, options)
+        return source.to_s if format == :txt
+
         sx = options[:sx]
         sy = options[:sy]
         scale = options[:scale]

data/lib/asciidoctor-diagram/ditaa/converter.rb

@@ -40,7 +40,7 @@ module Asciidoctor
       Java.classpath.concat DITAA_JARS
 
       def supported_formats
-        [:png, :svg]
+        [:png, :svg, :txt]
       end
 
       def collect_options(source)
@@ -59,6 +59,8 @@ module Asciidoctor
       end
 
       def convert(source, format, options)
+        return source.to_s if format == :txt
+
         Java.load
 
         flags = []

data/lib/asciidoctor-diagram/erd/converter.rb

@@ -15,7 +15,7 @@ module Asciidoctor
       end
 
       def convert(source, format, options)
-        erd_path = source.find_command('erd')
+        erd_path = source.find_command('erd', :alt_cmds => ['erd-go'])
         dot_path = source.find_command('dot', :alt_attrs => ['graphvizdot'])
 
         dot_code = generate_stdin(erd_path, format.to_s, source.to_s) do |tool_path, output_path|

data/lib/asciidoctor-diagram/msc/converter.rb

@@ -21,7 +21,7 @@ module Asciidoctor
       def convert(source, format, options)
         font = options[:font]
 
-        generate_stdin(source.find_command('mscgen'), format.to_s, source.to_s) do |tool_path, output_path|
+        generate_stdin(source.find_command('mscgen', :alt_cmds => ['mscgen_js']), format.to_s, source.to_s) do |tool_path, output_path|
           args = [tool_path, '-o', Platform.native_path(output_path), '-T', format.to_s]
           if font
             args << '-F' << font

data/lib/asciidoctor-diagram/svgbob/converter.rb

@@ -11,7 +11,7 @@ module Asciidoctor
 
 
       def supported_formats
-        [:svg]
+        [:svg, :txt]
       end
 
       def native_scaling?
@@ -38,6 +38,7 @@ module Asciidoctor
 
 
       def convert(source, format, options)
+        return source.to_s if format == :txt
 
         flags = []
         options.each do |option, value|

data/lib/asciidoctor-diagram/version.rb

@@ -1,5 +1,5 @@
 module Asciidoctor
   module Diagram
-    VERSION = "2.2.4"
+    VERSION = "2.2.5"
   end
 end

data/spec/a2s_spec.rb

@@ -25,9 +25,9 @@ describe Asciidoctor::Diagram::AsciiToSvgInlineMacroProcessor do
 end
 
 describe Asciidoctor::Diagram::AsciiToSvgBlockMacroProcessor do
-  include_examples "block_macro", :a2s, A2S_CODE, [:svg]
+  include_examples "block_macro", :a2s, A2S_CODE, [:svg, :txt]
 end
 
 describe Asciidoctor::Diagram::AsciiToSvgBlockProcessor do
-  include_examples "block", :svgbob, A2S_CODE, [:svg]
+  include_examples "block", :svgbob, A2S_CODE, [:svg, :txt]
 end

data/spec/ditaa_spec.rb

@@ -17,11 +17,11 @@ describe Asciidoctor::Diagram::DitaaInlineMacroProcessor do
 end
 
 describe Asciidoctor::Diagram::DitaaBlockMacroProcessor do
-  include_examples "block_macro", :ditaa, DITAA_CODE, [:png, :svg]
+  include_examples "block_macro", :ditaa, DITAA_CODE, [:png, :svg, :txt]
 end
 
 describe Asciidoctor::Diagram::DitaaBlockProcessor do
-  include_examples "block", :ditaa, DITAA_CODE, [:png, :svg]
+  include_examples "block", :ditaa, DITAA_CODE, [:png, :svg, :txt]
 
   it "should support ditaa options as attributes" do
     doc = <<-eos

data/spec/svgbob_spec.rb

@@ -25,9 +25,9 @@ describe Asciidoctor::Diagram::SvgBobInlineMacroProcessor do
 end
 
 describe Asciidoctor::Diagram::SvgBobBlockMacroProcessor do
-  include_examples "block_macro", :svgbob, SVGBOB_CODE, [:svg]
+  include_examples "block_macro", :svgbob, SVGBOB_CODE, [:svg, :txt]
 end
 
 describe Asciidoctor::Diagram::SvgBobBlockProcessor do
-  include_examples "block", :svgbob, SVGBOB_CODE, [:svg]
+  include_examples "block", :svgbob, SVGBOB_CODE, [:svg, :txt]
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: asciidoctor-diagram
 version: !ruby/object:Gem::Version
-  version: 2.2.4
+  version: 2.2.5
 platform: ruby
 authors:
 - Pepijn Van Eeckhoudt
-autorequire: 
+autorequire:
 bindir: bin
 cert_chain: []
-date: 2023-01-21 00:00:00.000000000 Z
+date: 2023-03-23 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -282,7 +282,7 @@ homepage: https://github.com/asciidoctor/asciidoctor-diagram
 licenses:
 - MIT
 metadata: {}
-post_install_message: 
+post_install_message:
 rdoc_options: []
 require_paths:
 - lib
@@ -297,8 +297,8 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.0.3.1
-signing_key: 
+rubygems_version: 3.2.22
+signing_key:
 specification_version: 4
 summary: A family of Asciidoctor extensions that generate images from a broad range
   of embedded plain text diagram descriptions, including PlantUML, ditaa, Kroki, and