New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

metanorma/metanorma-docker#55 make plantuml aware of imagesdir #204

Merged

ronaldtse merged 3 commits into master from bugfix/respect-imagesdir-for-plantuml

Feb 8, 2020

Contributor

CAMOBAP commented Feb 7, 2020

(URGENT) Failure when building document inside container metanorma-docker#55


          metanorma/metanorma-docker#55 make plantuml aware of imagesdir

08c0c9a

CAMOBAP requested review from ronaldtse and opoudjis

February 7, 2020 22:45

CAMOBAP self-assigned this

hound bot reviewed

View reviewed changes

spec/asciidoctor-standoc/macros_spec.rb

@@ @@ -305,7 +305,7 @@ @@
                 end
                 it "processes the PlantUML macro with imagesdir" do
-                    expect(xmlpp(strip_guid(Asciidoctor.convert(<<~"INPUT", backend: :standoc, header_footer: true)).gsub(%r{spec/assets/[^.]+\.}, "spec/assets/_."))).to be_equivalent_to xmlpp(<<~"OUTPUT")
+                    expect(xmlpp(strip_guid(Asciidoctor.convert(<<~"INPUT", backend: :standoc, header_footer: true)).gsub(%r{spec/assets/[^./]+\.}, "spec/assets/_."))).to be_equivalent_to xmlpp(<<~"OUTPUT")

hound bot Feb 7, 2020

Metrics/LineLength: Line is too long. [192/80]
Style/StringLiterals: Prefer single-quoted strings when you don't need string interpolation or special symbols.

spec/asciidoctor-standoc/macros_spec.rb

@@ @@ -254,7 +254,7 @@ @@
                 end
                 it "processes the PlantUML macro" do
-                  expect(xmlpp(strip_guid(Asciidoctor.convert(<<~"INPUT", backend: :standoc, header_footer: true)).gsub(%r{plantuml/plantuml[^.]+\.}, "plantuml/_."))).to be_equivalent_to xmlpp(<<~"OUTPUT")
+                  expect(xmlpp(strip_guid(Asciidoctor.convert(<<~"INPUT", backend: :standoc, header_footer: true)).gsub(%r{plantuml/plantuml[^./]+\.}, "plantuml/_."))).to be_equivalent_to xmlpp(<<~"OUTPUT")

hound bot Feb 7, 2020

Metrics/LineLength: Line is too long. [192/80]
Style/StringLiterals: Prefer single-quoted strings when you don't need string interpolation or special symbols.

CAMOBAP mentioned this pull request

(URGENT) Failure when building document inside container metanorma/metanorma-docker#55

Closed


          Clean up plantuml generate_file code and mark TODOs

4f62b1e

hound bot reviewed

View reviewed changes

lib/asciidoctor/standoc/macros.rb


		FileUtils.mv outfile, path

		imagesdir ?

hound bot Feb 8, 2020

Style/MultilineTernaryOperator: Avoid multi-line ternary operators, use if or unless instead.

lib/asciidoctor/standoc/macros.rb

+                      File.exist?(path) or return
+                      # TODO: this should raise failure if the destination path is not writable!
+                      File.writable?(path) or return

hound bot Feb 8, 2020

Style/AndOr: Use || instead of or.

lib/asciidoctor/standoc/macros.rb

+                      # TODO: this should raise failure if the destination path already exists!
+                      File.exist?(path) or return
+                      # TODO: this should raise failure if the destination path is not writable!

hound bot Feb 8, 2020

Metrics/LineLength: Line is too long. [82/80]

lib/asciidoctor/standoc/macros.rb

+                      path.mkpath
+                      # TODO: this should raise failure if the destination path already exists!
+                      File.exist?(path) or return

hound bot Feb 8, 2020

Style/AndOr: Use || instead of or.

lib/asciidoctor/standoc/macros.rb

+                      path = Pathname.new(localdir) + (imagesdir || "plantuml")
+                      path.mkpath
+                      # TODO: this should raise failure if the destination path already exists!

hound bot Feb 8, 2020

Metrics/LineLength: Line is too long. [81/80]

lib/asciidoctor/standoc/macros.rb

                       umlfile.unlink
-                      File.join(path,File.basename(outfile))
+                      path = Pathname.new(localdir) + (imagesdir || "plantuml")

hound bot Feb 8, 2020

Style/StringLiterals: Prefer single-quoted strings when you don't need string interpolation or special symbols.


          Plantuml mark TODOs

4806ef0

ronaldtse assigned opoudjis

ronaldtse approved these changes

View reviewed changes

Contributor

ronaldtse left a comment

Thanks @CAMOBAP795 !

ronaldtse merged commit b76cf68 into master

ronaldtse deleted the bugfix/respect-imagesdir-for-plantuml branch

February 8, 2020 03:08

ronaldtse mentioned this pull request

Resolve PlantUML macro TODOs by raising proper errors #205

Closed

ronaldtse added a commit that referenced this pull request


          PlantUML macro should copy instead of move output, otherwise Windows …

ce1b605

…will crash. Remediation of changes in #204 (original bug #187)

ronaldtse mentioned this pull request

Address regression in #204 failing on Windows #208

Merged

ronaldtse added a commit that referenced this pull request


          PlantUML macro should copy instead of move output, otherwise Windows …

c653615

…will crash. Remediation of changes in #204 (original bug #187)

ronaldtse added a commit that referenced this pull request


          Merge branch 'master' into feature/datamodel

9dc930b

* master:
  Update GH workflows
  version bump
  PlantUML macro should copy instead of move output, otherwise Windows will crash. Remediation of changes in #204 (original bug #187)

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment