From 6e1e4831c42ad8bd21977fdef5c097b359392340 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jo=CC=88rg=20Prante?= Date: Sun, 19 Dec 2021 00:47:12 +0100 Subject: [PATCH] add gradle-plugin-asciidoctor, update gradle to 7.3.2 --- gradle-plugin-asciidoctor/LICENSE.txt | 202 +++ gradle-plugin-asciidoctor/build.gradle | 47 + gradle-plugin-asciidoctor/gradle.properties | 1 + .../asciidoctor/AsciidoctorBackend.groovy | 32 + .../asciidoctor/AsciidoctorExtension.groovy | 16 + .../asciidoctor/AsciidoctorPlugin.groovy | 50 + .../asciidoctor/AsciidoctorProxy.groovy | 8 + .../asciidoctor/AsciidoctorProxyImpl.groovy | 16 + .../plugin/asciidoctor/AsciidoctorTask.groovy | 863 +++++++++++++ .../asciidoctor/AsciidoctorUtils.groovy | 33 + .../asciidoctor/ResourceCopyProxy.groovy | 10 + .../asciidoctor/ResourceCopyProxyImpl.groovy | 20 + .../AsciidoctorExtensionException.groovy | 19 + .../AsciidoctorExtensionHandler.groovy | 87 ++ .../groovydsl/AsciidoctorExtensions.groovy | 178 +++ .../groovydsl/GroovyExtensionRegistry.groovy | 17 + .../DelegatingBlockMacroProcessor.groovy | 20 + .../DelegatingBlockProcessor.groovy | 22 + .../DelegatingDocinfoProcessor.groovy | 20 + .../DelegatingIncludeProcessor.groovy | 31 + .../DelegatingInlineMacroProcessor.groovy | 20 + .../extensions/DelegatingPostprocessor.groovy | 20 + .../extensions/DelegatingPreprocessor.groovy | 21 + .../extensions/DelegatingTreeprocessor.groovy | 28 + ...ctor.jruby.extension.spi.ExtensionRegistry | 1 + .../asciidoctor/AsciidoctorPluginSpec.groovy | 64 + ...AsciidoctorTaskInlineExtensionsSpec.groovy | 190 +++ .../asciidoctor/AsciidoctorTaskSpec.groovy | 1113 +++++++++++++++++ .../asciidoctor/AsciidoctorUtilsSpec.groovy | 27 + .../groovydsl/AsciidoctorGroovyDSLSpec.groovy | 288 +++++ .../src/test/resources/error.groovy | 10 + .../resources/src/asciidoc/docinfo-footer.xml | 17 + .../test/resources/src/asciidoc/docinfo.xml | 17 + .../resources/src/asciidoc/images/fake.txt | 4 + .../src/asciidoc/sample-docinfo-footer.xml | 17 + .../resources/src/asciidoc/sample-docinfo.xml | 17 + .../resources/src/asciidoc/sample.asciidoc | 26 + .../src/asciidoc/subdir/_include.adoc | 1 + .../resources/src/asciidoc/subdir/sample2.ad | 26 + .../src/asciidocextensions/blockMacro.groovy | 16 + .../inlineextensions.asciidoc | 23 + .../sample-with-terminal-command.ad | 4 + .../test/resources/testblockextensions.groovy | 16 + .../resources/testblockmacroextension.groovy | 7 + .../testincludeprocessorextension.groovy | 6 + .../testinlinemacroprocessorextension.groovy | 4 + .../testpostprocessorextension.groovy | 16 + .../testpreprocessorextension.groovy | 5 + .../testtreeprocessorextension.groovy | 15 + gradle-plugin-docker/gradle.properties | 2 +- gradle-plugin-git/build.gradle | 2 +- gradle-plugin-git/gradle.properties | 2 +- gradle-plugin-rpm/build.gradle | 4 +- gradle-plugin-rpm/gradle.properties | 2 +- gradle.properties | 7 +- gradle/compile/groovy.gradle | 10 +- gradle/compile/java.gradle | 7 +- gradle/wrapper/gradle-wrapper.jar | Bin 59203 -> 59536 bytes gradle/wrapper/gradle-wrapper.properties | 2 +- gradlew | 269 ++-- settings.gradle | 1 + 61 files changed, 3897 insertions(+), 122 deletions(-) create mode 100644 gradle-plugin-asciidoctor/LICENSE.txt create mode 100644 gradle-plugin-asciidoctor/build.gradle create mode 100644 gradle-plugin-asciidoctor/gradle.properties create mode 100755 gradle-plugin-asciidoctor/src/main/groovy/org/xbib/gradle/plugin/asciidoctor/AsciidoctorBackend.groovy create mode 100644 gradle-plugin-asciidoctor/src/main/groovy/org/xbib/gradle/plugin/asciidoctor/AsciidoctorExtension.groovy create mode 100755 gradle-plugin-asciidoctor/src/main/groovy/org/xbib/gradle/plugin/asciidoctor/AsciidoctorPlugin.groovy create mode 100644 gradle-plugin-asciidoctor/src/main/groovy/org/xbib/gradle/plugin/asciidoctor/AsciidoctorProxy.groovy create mode 100644 gradle-plugin-asciidoctor/src/main/groovy/org/xbib/gradle/plugin/asciidoctor/AsciidoctorProxyImpl.groovy create mode 100755 gradle-plugin-asciidoctor/src/main/groovy/org/xbib/gradle/plugin/asciidoctor/AsciidoctorTask.groovy create mode 100644 gradle-plugin-asciidoctor/src/main/groovy/org/xbib/gradle/plugin/asciidoctor/AsciidoctorUtils.groovy create mode 100644 gradle-plugin-asciidoctor/src/main/groovy/org/xbib/gradle/plugin/asciidoctor/ResourceCopyProxy.groovy create mode 100644 gradle-plugin-asciidoctor/src/main/groovy/org/xbib/gradle/plugin/asciidoctor/ResourceCopyProxyImpl.groovy create mode 100755 gradle-plugin-asciidoctor/src/main/groovy/org/xbib/gradle/plugin/asciidoctor/groovydsl/AsciidoctorExtensionException.groovy create mode 100755 gradle-plugin-asciidoctor/src/main/groovy/org/xbib/gradle/plugin/asciidoctor/groovydsl/AsciidoctorExtensionHandler.groovy create mode 100755 gradle-plugin-asciidoctor/src/main/groovy/org/xbib/gradle/plugin/asciidoctor/groovydsl/AsciidoctorExtensions.groovy create mode 100755 gradle-plugin-asciidoctor/src/main/groovy/org/xbib/gradle/plugin/asciidoctor/groovydsl/GroovyExtensionRegistry.groovy create mode 100755 gradle-plugin-asciidoctor/src/main/groovy/org/xbib/gradle/plugin/asciidoctor/groovydsl/extensions/DelegatingBlockMacroProcessor.groovy create mode 100755 gradle-plugin-asciidoctor/src/main/groovy/org/xbib/gradle/plugin/asciidoctor/groovydsl/extensions/DelegatingBlockProcessor.groovy create mode 100755 gradle-plugin-asciidoctor/src/main/groovy/org/xbib/gradle/plugin/asciidoctor/groovydsl/extensions/DelegatingDocinfoProcessor.groovy create mode 100755 gradle-plugin-asciidoctor/src/main/groovy/org/xbib/gradle/plugin/asciidoctor/groovydsl/extensions/DelegatingIncludeProcessor.groovy create mode 100755 gradle-plugin-asciidoctor/src/main/groovy/org/xbib/gradle/plugin/asciidoctor/groovydsl/extensions/DelegatingInlineMacroProcessor.groovy create mode 100755 gradle-plugin-asciidoctor/src/main/groovy/org/xbib/gradle/plugin/asciidoctor/groovydsl/extensions/DelegatingPostprocessor.groovy create mode 100755 gradle-plugin-asciidoctor/src/main/groovy/org/xbib/gradle/plugin/asciidoctor/groovydsl/extensions/DelegatingPreprocessor.groovy create mode 100755 gradle-plugin-asciidoctor/src/main/groovy/org/xbib/gradle/plugin/asciidoctor/groovydsl/extensions/DelegatingTreeprocessor.groovy create mode 100755 gradle-plugin-asciidoctor/src/main/resources/META-INF/services/org.asciidoctor.jruby.extension.spi.ExtensionRegistry create mode 100755 gradle-plugin-asciidoctor/src/test/groovy/org/xbib/gradle/plugin/asciidoctor/AsciidoctorPluginSpec.groovy create mode 100644 gradle-plugin-asciidoctor/src/test/groovy/org/xbib/gradle/plugin/asciidoctor/AsciidoctorTaskInlineExtensionsSpec.groovy create mode 100755 gradle-plugin-asciidoctor/src/test/groovy/org/xbib/gradle/plugin/asciidoctor/AsciidoctorTaskSpec.groovy create mode 100755 gradle-plugin-asciidoctor/src/test/groovy/org/xbib/gradle/plugin/asciidoctor/AsciidoctorUtilsSpec.groovy create mode 100755 gradle-plugin-asciidoctor/src/test/groovy/org/xbib/gradle/plugin/asciidoctor/groovydsl/AsciidoctorGroovyDSLSpec.groovy create mode 100755 gradle-plugin-asciidoctor/src/test/resources/error.groovy create mode 100644 gradle-plugin-asciidoctor/src/test/resources/src/asciidoc/docinfo-footer.xml create mode 100644 gradle-plugin-asciidoctor/src/test/resources/src/asciidoc/docinfo.xml create mode 100644 gradle-plugin-asciidoctor/src/test/resources/src/asciidoc/images/fake.txt create mode 100644 gradle-plugin-asciidoctor/src/test/resources/src/asciidoc/sample-docinfo-footer.xml create mode 100644 gradle-plugin-asciidoctor/src/test/resources/src/asciidoc/sample-docinfo.xml create mode 100644 gradle-plugin-asciidoctor/src/test/resources/src/asciidoc/sample.asciidoc create mode 100644 gradle-plugin-asciidoctor/src/test/resources/src/asciidoc/subdir/_include.adoc create mode 100644 gradle-plugin-asciidoctor/src/test/resources/src/asciidoc/subdir/sample2.ad create mode 100644 gradle-plugin-asciidoctor/src/test/resources/src/asciidocextensions/blockMacro.groovy create mode 100644 gradle-plugin-asciidoctor/src/test/resources/src/asciidocextensions/inlineextensions.asciidoc create mode 100644 gradle-plugin-asciidoctor/src/test/resources/src/asciidocextensions/sample-with-terminal-command.ad create mode 100755 gradle-plugin-asciidoctor/src/test/resources/testblockextensions.groovy create mode 100755 gradle-plugin-asciidoctor/src/test/resources/testblockmacroextension.groovy create mode 100755 gradle-plugin-asciidoctor/src/test/resources/testincludeprocessorextension.groovy create mode 100755 gradle-plugin-asciidoctor/src/test/resources/testinlinemacroprocessorextension.groovy create mode 100755 gradle-plugin-asciidoctor/src/test/resources/testpostprocessorextension.groovy create mode 100755 gradle-plugin-asciidoctor/src/test/resources/testpreprocessorextension.groovy create mode 100755 gradle-plugin-asciidoctor/src/test/resources/testtreeprocessorextension.groovy diff --git a/gradle-plugin-asciidoctor/LICENSE.txt b/gradle-plugin-asciidoctor/LICENSE.txt new file mode 100644 index 0000000..7a4a3ea --- /dev/null +++ b/gradle-plugin-asciidoctor/LICENSE.txt @@ -0,0 +1,202 @@ + + Apache License + Version 2.0, January 2004 + http://www.apache.org/licenses/ + + TERMS AND CONDITIONS FOR USE, REPRODUCTION, AND DISTRIBUTION + + 1. Definitions. + + "License" shall mean the terms and conditions for use, reproduction, + and distribution as defined by Sections 1 through 9 of this document. + + "Licensor" shall mean the copyright owner or entity authorized by + the copyright owner that is granting the License. + + "Legal Entity" shall mean the union of the acting entity and all + other entities that control, are controlled by, or are under common + control with that entity. For the purposes of this definition, + "control" means (i) the power, direct or indirect, to cause the + direction or management of such entity, whether by contract or + otherwise, or (ii) ownership of fifty percent (50%) or more of the + outstanding shares, or (iii) beneficial ownership of such entity. + + "You" (or "Your") shall mean an individual or Legal Entity + exercising permissions granted by this License. + + "Source" form shall mean the preferred form for making modifications, + including but not limited to software source code, documentation + source, and configuration files. + + "Object" form shall mean any form resulting from mechanical + transformation or translation of a Source form, including but + not limited to compiled object code, generated documentation, + and conversions to other media types. + + "Work" shall mean the work of authorship, whether in Source or + Object form, made available under the License, as indicated by a + copyright notice that is included in or attached to the work + (an example is provided in the Appendix below). + + "Derivative Works" shall mean any work, whether in Source or Object + form, that is based on (or derived from) the Work and for which the + editorial revisions, annotations, elaborations, or other modifications + represent, as a whole, an original work of authorship. For the purposes + of this License, Derivative Works shall not include works that remain + separable from, or merely link (or bind by name) to the interfaces of, + the Work and Derivative Works thereof. + + "Contribution" shall mean any work of authorship, including + the original version of the Work and any modifications or additions + to that Work or Derivative Works thereof, that is intentionally + submitted to Licensor for inclusion in the Work by the copyright owner + or by an individual or Legal Entity authorized to submit on behalf of + the copyright owner. For the purposes of this definition, "submitted" + means any form of electronic, verbal, or written communication sent + to the Licensor or its representatives, including but not limited to + communication on electronic mailing lists, source code control systems, + and issue tracking systems that are managed by, or on behalf of, the + Licensor for the purpose of discussing and improving the Work, but + excluding communication that is conspicuously marked or otherwise + designated in writing by the copyright owner as "Not a Contribution." + + "Contributor" shall mean Licensor and any individual or Legal Entity + on behalf of whom a Contribution has been received by Licensor and + subsequently incorporated within the Work. + + 2. Grant of Copyright License. Subject to the terms and conditions of + this License, each Contributor hereby grants to You a perpetual, + worldwide, non-exclusive, no-charge, royalty-free, irrevocable + copyright license to reproduce, prepare Derivative Works of, + publicly display, publicly perform, sublicense, and distribute the + Work and such Derivative Works in Source or Object form. + + 3. Grant of Patent License. Subject to the terms and conditions of + this License, each Contributor hereby grants to You a perpetual, + worldwide, non-exclusive, no-charge, royalty-free, irrevocable + (except as stated in this section) patent license to make, have made, + use, offer to sell, sell, import, and otherwise transfer the Work, + where such license applies only to those patent claims licensable + by such Contributor that are necessarily infringed by their + Contribution(s) alone or by combination of their Contribution(s) + with the Work to which such Contribution(s) was submitted. If You + institute patent litigation against any entity (including a + cross-claim or counterclaim in a lawsuit) alleging that the Work + or a Contribution incorporated within the Work constitutes direct + or contributory patent infringement, then any patent licenses + granted to You under this License for that Work shall terminate + as of the date such litigation is filed. + + 4. Redistribution. You may reproduce and distribute copies of the + Work or Derivative Works thereof in any medium, with or without + modifications, and in Source or Object form, provided that You + meet the following conditions: + + (a) You must give any other recipients of the Work or + Derivative Works a copy of this License; and + + (b) You must cause any modified files to carry prominent notices + stating that You changed the files; and + + (c) You must retain, in the Source form of any Derivative Works + that You distribute, all copyright, patent, trademark, and + attribution notices from the Source form of the Work, + excluding those notices that do not pertain to any part of + the Derivative Works; and + + (d) If the Work includes a "NOTICE" text file as part of its + distribution, then any Derivative Works that You distribute must + include a readable copy of the attribution notices contained + within such NOTICE file, excluding those notices that do not + pertain to any part of the Derivative Works, in at least one + of the following places: within a NOTICE text file distributed + as part of the Derivative Works; within the Source form or + documentation, if provided along with the Derivative Works; or, + within a display generated by the Derivative Works, if and + wherever such third-party notices normally appear. The contents + of the NOTICE file are for informational purposes only and + do not modify the License. You may add Your own attribution + notices within Derivative Works that You distribute, alongside + or as an addendum to the NOTICE text from the Work, provided + that such additional attribution notices cannot be construed + as modifying the License. + + You may add Your own copyright statement to Your modifications and + may provide additional or different license terms and conditions + for use, reproduction, or distribution of Your modifications, or + for any such Derivative Works as a whole, provided Your use, + reproduction, and distribution of the Work otherwise complies with + the conditions stated in this License. + + 5. Submission of Contributions. Unless You explicitly state otherwise, + any Contribution intentionally submitted for inclusion in the Work + by You to the Licensor shall be under the terms and conditions of + this License, without any additional terms or conditions. + Notwithstanding the above, nothing herein shall supersede or modify + the terms of any separate license agreement you may have executed + with Licensor regarding such Contributions. + + 6. Trademarks. This License does not grant permission to use the trade + names, trademarks, service marks, or product names of the Licensor, + except as required for reasonable and customary use in describing the + origin of the Work and reproducing the content of the NOTICE file. + + 7. Disclaimer of Warranty. Unless required by applicable law or + agreed to in writing, Licensor provides the Work (and each + Contributor provides its Contributions) on an "AS IS" BASIS, + WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or + implied, including, without limitation, any warranties or conditions + of TITLE, NON-INFRINGEMENT, MERCHANTABILITY, or FITNESS FOR A + PARTICULAR PURPOSE. You are solely responsible for determining the + appropriateness of using or redistributing the Work and assume any + risks associated with Your exercise of permissions under this License. + + 8. Limitation of Liability. In no event and under no legal theory, + whether in tort (including negligence), contract, or otherwise, + unless required by applicable law (such as deliberate and grossly + negligent acts) or agreed to in writing, shall any Contributor be + liable to You for damages, including any direct, indirect, special, + incidental, or consequential damages of any character arising as a + result of this License or out of the use or inability to use the + Work (including but not limited to damages for loss of goodwill, + work stoppage, computer failure or malfunction, or any and all + other commercial damages or losses), even if such Contributor + has been advised of the possibility of such damages. + + 9. Accepting Warranty or Additional Liability. While redistributing + the Work or Derivative Works thereof, You may choose to offer, + and charge a fee for, acceptance of support, warranty, indemnity, + or other liability obligations and/or rights consistent with this + License. However, in accepting such obligations, You may act only + on Your own behalf and on Your sole responsibility, not on behalf + of any other Contributor, and only if You agree to indemnify, + defend, and hold each Contributor harmless for any liability + incurred by, or claims asserted against, such Contributor by reason + of your accepting any such warranty or additional liability. + + END OF TERMS AND CONDITIONS + + APPENDIX: How to apply the Apache License to your work. + + To apply the Apache License to your work, attach the following + boilerplate notice, with the fields enclosed by brackets "[]" + replaced with your own identifying information. (Don't include + the brackets!) The text should be enclosed in the appropriate + comment syntax for the file format. We also recommend that a + file or class name and description of purpose be included on the + same "printed page" as the copyright notice for easier + identification within third-party archives. + + Copyright [yyyy] [name of copyright owner] + + Licensed under the Apache License, Version 2.0 (the "License"); + you may not use this file except in compliance with the License. + You may obtain a copy of the License at + + http://www.apache.org/licenses/LICENSE-2.0 + + Unless required by applicable law or agreed to in writing, software + distributed under the License is distributed on an "AS IS" BASIS, + WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + See the License for the specific language governing permissions and + limitations under the License. \ No newline at end of file diff --git a/gradle-plugin-asciidoctor/build.gradle b/gradle-plugin-asciidoctor/build.gradle new file mode 100644 index 0000000..2eb724b --- /dev/null +++ b/gradle-plugin-asciidoctor/build.gradle @@ -0,0 +1,47 @@ +plugins { + id 'java-gradle-plugin' + id 'com.gradle.plugin-publish' version '0.18.0' +} + +apply plugin: 'java-gradle-plugin' +apply plugin: 'com.gradle.plugin-publish' + +apply from: rootProject.file('gradle/compile/groovy.gradle') + +dependencies { + api gradleApi() + implementation "org.asciidoctor:asciidoctorj:${project.property('asciidoctorj.version')}" + implementation "org.jruby:jruby:${project.property('jruby.version')}" + testImplementation "org.spockframework:spock-core:${project.property('spock.version')}" + testImplementation "org.jsoup:jsoup:${project.property('jsoup.version')}" +} + +gradlePlugin { + plugins { + asciidoctorPlugin { + id = 'org.xbib.gradle.plugin.asciidoctor' + implementationClass = 'org.xbib.gradle.plugin.asciidoctor.AsciidoctorPlugin' + } + } +} + +if (project.hasProperty('gradle.publish.key')) { + pluginBundle { + mavenCoordinates { + groupId = "org.xbib.gradle.plugin" + artifactId = "gradle-plugin-asciidoctor" + version = project.version + } + website = 'https://github.com/jprante/gradle-plugins' + vcsUrl = 'https://github.com/jprante/gradle-plugins' + plugins { + asciidoctorPlugin { + id = 'org.xbib.gradle.plugin.asciidoctor' + version = project.version + description = 'Asciidoctor plugin for building documentations' + displayName = 'Asciidoctor plugin for building documentations' + tags = ['asciidoctor'] + } + } + } +} diff --git a/gradle-plugin-asciidoctor/gradle.properties b/gradle-plugin-asciidoctor/gradle.properties new file mode 100644 index 0000000..b2cd265 --- /dev/null +++ b/gradle-plugin-asciidoctor/gradle.properties @@ -0,0 +1 @@ +version = 2.5.2.0 diff --git a/gradle-plugin-asciidoctor/src/main/groovy/org/xbib/gradle/plugin/asciidoctor/AsciidoctorBackend.groovy b/gradle-plugin-asciidoctor/src/main/groovy/org/xbib/gradle/plugin/asciidoctor/AsciidoctorBackend.groovy new file mode 100755 index 0000000..846dad3 --- /dev/null +++ b/gradle-plugin-asciidoctor/src/main/groovy/org/xbib/gradle/plugin/asciidoctor/AsciidoctorBackend.groovy @@ -0,0 +1,32 @@ +package org.xbib.gradle.plugin.asciidoctor + +enum AsciidoctorBackend { + HTML('html'), + DOCBOOK('docbook'), + HTML5('html5'), + DOCBOOK45('docbook45'), + DOCBOOK5('docbook5'), + EPUB3('epub3'), + PDF('pdf'), + XHTML('xhtml'), + XHTML5('xhtml5'), + + private final static Map ALL_BACKENDS + private final String id + + static { + ALL_BACKENDS = values().collectEntries{ [it.id, it] }.asImmutable() + } + + private AsciidoctorBackend(String id) { + this.id = id + } + + String getId() { + id + } + + static boolean isBuiltIn(String name) { + ALL_BACKENDS.containsKey(name) + } +} diff --git a/gradle-plugin-asciidoctor/src/main/groovy/org/xbib/gradle/plugin/asciidoctor/AsciidoctorExtension.groovy b/gradle-plugin-asciidoctor/src/main/groovy/org/xbib/gradle/plugin/asciidoctor/AsciidoctorExtension.groovy new file mode 100644 index 0000000..190dd6b --- /dev/null +++ b/gradle-plugin-asciidoctor/src/main/groovy/org/xbib/gradle/plugin/asciidoctor/AsciidoctorExtension.groovy @@ -0,0 +1,16 @@ +package org.xbib.gradle.plugin.asciidoctor + +import org.gradle.api.Project + +class AsciidoctorExtension { + + String version = '2.5.3' + + boolean addDefaultRepositories = true + + final Project project + + AsciidoctorExtension(Project project) { + this.project = project + } +} diff --git a/gradle-plugin-asciidoctor/src/main/groovy/org/xbib/gradle/plugin/asciidoctor/AsciidoctorPlugin.groovy b/gradle-plugin-asciidoctor/src/main/groovy/org/xbib/gradle/plugin/asciidoctor/AsciidoctorPlugin.groovy new file mode 100755 index 0000000..6605cde --- /dev/null +++ b/gradle-plugin-asciidoctor/src/main/groovy/org/xbib/gradle/plugin/asciidoctor/AsciidoctorPlugin.groovy @@ -0,0 +1,50 @@ +package org.xbib.gradle.plugin.asciidoctor + +import org.gradle.api.Action +import org.gradle.api.Plugin +import org.gradle.api.Project +import org.gradle.api.artifacts.Configuration +import org.gradle.api.artifacts.ResolvableDependencies +import org.gradle.api.artifacts.dsl.DependencyHandler + +class AsciidoctorPlugin implements Plugin { + + static final String ASCIIDOCTOR = 'asciidoctor' + + static final String ASCIIDOCTORJ = 'asciidoctorj' + + static final String ASCIIDOCTORJ_CORE_DEPENDENCY = 'org.asciidoctor:asciidoctorj:' + + void apply(Project project) { + project.apply(plugin: 'base') + + AsciidoctorExtension extension = project.extensions.create(ASCIIDOCTORJ, AsciidoctorExtension, project) + + project.afterEvaluate { + if(project.extensions.asciidoctorj.addDefaultRepositories) { + project.repositories { + mavenCentral() + } + } + } + + Configuration configuration = project.configurations.maybeCreate(ASCIIDOCTOR) + project.logger.info("[Asciidoctor] asciidoctorj: ${extension.version}") + + configuration.incoming.beforeResolve(new Action() { + @SuppressWarnings('UnusedMethodParameter') + void execute(ResolvableDependencies resolvableDependencies) { + DependencyHandler dependencyHandler = project.dependencies + def dependencies = configuration.dependencies + dependencies.add(dependencyHandler.create(ASCIIDOCTORJ_CORE_DEPENDENCY + extension.version)) + } + }) + + project.task(ASCIIDOCTOR, + type: AsciidoctorTask, + group: 'Documentation', + description: 'Converts AsciiDoc files and copies the output files and related resources to the build directory.') { + classpath = configuration + } + } +} diff --git a/gradle-plugin-asciidoctor/src/main/groovy/org/xbib/gradle/plugin/asciidoctor/AsciidoctorProxy.groovy b/gradle-plugin-asciidoctor/src/main/groovy/org/xbib/gradle/plugin/asciidoctor/AsciidoctorProxy.groovy new file mode 100644 index 0000000..ba068a2 --- /dev/null +++ b/gradle-plugin-asciidoctor/src/main/groovy/org/xbib/gradle/plugin/asciidoctor/AsciidoctorProxy.groovy @@ -0,0 +1,8 @@ +package org.xbib.gradle.plugin.asciidoctor + +interface AsciidoctorProxy { + + String convertFile(File filename, Map options) + + void requireLibrary(String... requiredLibraries) +} diff --git a/gradle-plugin-asciidoctor/src/main/groovy/org/xbib/gradle/plugin/asciidoctor/AsciidoctorProxyImpl.groovy b/gradle-plugin-asciidoctor/src/main/groovy/org/xbib/gradle/plugin/asciidoctor/AsciidoctorProxyImpl.groovy new file mode 100644 index 0000000..4d3c6b3 --- /dev/null +++ b/gradle-plugin-asciidoctor/src/main/groovy/org/xbib/gradle/plugin/asciidoctor/AsciidoctorProxyImpl.groovy @@ -0,0 +1,16 @@ +package org.xbib.gradle.plugin.asciidoctor + +class AsciidoctorProxyImpl implements AsciidoctorProxy { + + def delegate + + @Override + String convertFile(File filename, Map options) { + delegate.convertFile(filename, options) + } + + @Override + void requireLibrary(String... requiredLibraries) { + delegate.requireLibrary(requiredLibraries) + } +} diff --git a/gradle-plugin-asciidoctor/src/main/groovy/org/xbib/gradle/plugin/asciidoctor/AsciidoctorTask.groovy b/gradle-plugin-asciidoctor/src/main/groovy/org/xbib/gradle/plugin/asciidoctor/AsciidoctorTask.groovy new file mode 100755 index 0000000..8825a04 --- /dev/null +++ b/gradle-plugin-asciidoctor/src/main/groovy/org/xbib/gradle/plugin/asciidoctor/AsciidoctorTask.groovy @@ -0,0 +1,863 @@ +package org.xbib.gradle.plugin.asciidoctor + +import org.gradle.api.DefaultTask +import org.gradle.api.GradleException +import org.gradle.api.InvalidUserDataException +import org.gradle.api.artifacts.Configuration +import org.gradle.api.file.CopySpec +import org.gradle.api.file.FileCollection +import org.gradle.api.file.FileTree +import org.gradle.api.internal.file.copy.CopySpecInternal +import org.gradle.api.tasks.Input +import org.gradle.api.tasks.InputDirectory +import org.gradle.api.tasks.InputFile +import org.gradle.api.tasks.InputFiles +import org.gradle.api.tasks.Internal +import org.gradle.api.tasks.Optional +import org.gradle.api.tasks.OutputDirectories +import org.gradle.api.tasks.OutputDirectory +import org.gradle.api.tasks.SkipWhenEmpty +import org.gradle.api.tasks.TaskAction +import org.gradle.api.tasks.util.PatternSet +import org.gradle.internal.FileUtils +import org.gradle.util.CollectionUtils +import org.xbib.gradle.plugin.asciidoctor.groovydsl.AsciidoctorExtensions + +import java.nio.file.Path + +@SuppressWarnings(['MethodCount', 'Instanceof']) +class AsciidoctorTask extends DefaultTask { + + public static final String ASCIIDOCTOR_FACTORY_CLASSNAME = 'org.asciidoctor.Asciidoctor$Factory' + + private static final boolean IS_WINDOWS = System.getProperty('os.name').contains('Windows') + + private static final String PATH_SEPARATOR = System.getProperty('path.separator') + + private static final String DOUBLE_BACKLASH = '\\\\' + + private static final String BACKLASH = '\\' + + private static final String SAFE_MODE_CLASSNAME = 'org.asciidoctor.SafeMode' + + private static final String DEFAULT_BACKEND = AsciidoctorBackend.HTML5.id + + private boolean baseDirSetToNull + + private Object outDir + + private Object srcDir + + private final List gemPaths = [] + + private Set backends + + private Set requires + + private Map opts = [:] + + private Map attrs = [:] + + private PatternSet sourceDocumentPattern + + private CopySpec resourceCopy + + private static ClassLoader cl + + /** + * If set to true each backend will be output to a separate subfolder below {@code outputDir} + */ + @Input + boolean separateOutputDirs = true + + @Optional + @InputDirectory + File baseDir + + /** + * Logs documents as they are converted + */ + @Input + boolean logDocuments = false + + /** + * Old way to set only one source document + */ + @Optional + @InputFile + File sourceDocumentName + + /** + * Old way to define the backend to use + */ + @Optional + @Input + String backend + + @Internal + AsciidoctorProxy asciidoctor + + /** + * Stores the extensions defined in the configuration phase + * to register them in the execution phase. + */ + @Internal + List asciidoctorExtensions = [] + + @Internal + ResourceCopyProxy resourceCopyProxy + + @Internal + Configuration classpath + + AsciidoctorTask() { + srcDir = project.file('src/docs/asciidoc') + } + + /** + * Returns all of the Asciidoctor options + */ + @Optional + @Input + Map getOptions() { this.opts } + + /** Apply a new set of Asciidoctor options, clearing any options previously set. + * + * For backwards compatibility it is still possible to replace attributes via this call. However the + * use of {@link #setAttributes(java.util.Map)} and {@link #attributes(java.util.Map)} are the now + * correct way of working with attributes + * + * @param m Map with new options + */ + @SuppressWarnings('DuplicateStringLiteral') + void setOptions(Map m) { + if (!m) return // null check + if (m.containsKey('attributes')) { + logger.warn 'Attributes found in options. Existing attributes will be replaced due to assignment. ' + + 'Please use \'attributes\' method instead as current behaviour will be removed in future' + attrs = coerceLegacyAttributeFormats(m.attributes) + m.remove('attributes') + } + this.opts = m + } + + /** Appends a new set of Asciidoctor options. + * + * For backwards compatibility it is still possible to append attributes via this call. However the + * use of {@link #setAttributes(java.util.Map)} and {@link #attributes(java.util.Map)} are the now + * correct way of working with attributes + * + * @param m Map with new options + */ + @SuppressWarnings('DuplicateStringLiteral') + void options(Map m) { + if (!m) return // null check + if (m.containsKey('attributes')) { + logger.warn 'Attributes found in options. These will be added to existing attributes. ' + + 'Please use \'attributes\' method instead as current behaviour will be removed in future' + attributes coerceLegacyAttributeFormats(m.attributes) + m.remove('attributes') + } + this.opts += m + } + + /** + * Returns the current set of Asciidoctor attributes + */ + @Optional + @Input + Map getAttributes() { this.attrs } + + /** + * Applies a new set of Asciidoctor attributes, clearing any previously set + * + * @param m New map of attributes + */ + void setAttributes(Map m) { + if (m) { + this.attrs = m + } else { + this.attrs.clear() + } + } + + /** + * Appends a set of Asciidoctor attributes. + * + * @param o a Map, List or a literal (String) definition + */ + void attributes(Object... o) { + if (!o) { + this.attrs.clear() + return + } + for (input in o) { + this.attrs += coerceLegacyAttributeFormats(input) + } + } + + /** + * Returns the set of Ruby modules to be included. + */ + @Optional + @Input + Set getRequires() { this.requires } + + /** + * Applies a new set of Ruby modules to be included, clearing any previous set. + * + * @param b One or more ruby modules to be included + */ + void setRequires(Object... b) { + this.requires?.clear() + requires(b) + } + + /** + * Appends new set of Ruby modules to be included. + * + * @param b One or more ruby modules to be included + */ + @SuppressWarnings('ConfusingMethodName') + void requires(Object... b) { + if (this.requires == null) { + this.requires = [] + } + if (!b) { + return + } + this.requires.addAll(CollectionUtils.stringize(b as List)) + } + + /** + * Returns the current set of Asciidoctor backends that will be used for document generation + */ + @Optional + @Input + Set getBackends() { this.backends } + + void setBackend(String b) { + if (!b) { + return + } + deprecated 'setBackend', 'backends', 'Using `backend` and `backends` together will result in `backend` being ignored.' + backend = b + } + + /** + * Applies a new set of Asciidoctor backends that will be used for document generation clearing any + * previous backends + * + * @param b List of backends. Each item must be convertible to string. + */ + void setBackends(Object... b) { + this.backends?.clear() + backends(b) + } + + /** + * Appends additional Asciidoctor backends that will be used for document generation. + * + * @param b List of backends. Each item must be convertible to string. + */ + @SuppressWarnings('ConfusingMethodName') + void backends(Object... b) { + if (this.backends == null) { + this.backends = [] + } + if (!b) { + return + } + this.backends.addAll(CollectionUtils.stringize(b as List)) + } + + /** Defines extensions. The given parameters should + * either contain Asciidoctor Groovy DSL closures or files + * with content conforming to the Asciidoctor Groovy DSL. + */ + void extensions(Object... exts) { + if (!exts) return // null check + asciidoctorExtensions.addAll(exts as List) + } + + /** Sets a new gemPath to be used + * + * @param f A path object can be be converted with {@code project.file}. + */ + @SuppressWarnings('ConfusingMethodName') + void gemPath(Object... f) { + if (!f) { + return + } + this.gemPaths.addAll(f as List) + } + + /** + * Sets a new list of GEM paths to be used. + * + * @param f A {@code File} object pointing to list of installed GEMs + */ + void setGemPath(Object... f) { + this.gemPaths.clear() + if (!f) { + return + } + this.gemPaths.addAll(f as List) + } + + /** + * Assigns a single string to a GEM path, scanning it for concatenated GEM Paths, separated by the platform + * separator. This utility is only for backwards compatibility + * + * @param s + */ + void setGemPath(Object path) { + this.gemPaths.clear() + if (path instanceof CharSequence) { + setGemPath(path.tokenize(PATH_SEPARATOR)) + } else if (path instanceof List) { + this.gemPaths.addAll(path) + } else if (path instanceof File || path instanceof Path) { + this.gemPaths.add(path) + } else { + throw new IllegalArgumentException("unknown path class: " + path.getClass().getName()) + } + } + + /** + * Returns the list of paths to be used for {@code GEM_HOME} + */ + @Optional + @InputFiles + FileCollection getGemPath() { + project.files(this.gemPaths) + } + + /** + * Returns the list of paths to be used for GEM installations in a format that is suitable for assignment to {@code GEM_HOME} + * + * Calling this will cause gemPath to be resolved immediately. + */ + String asGemPath() { + gemPath.files*.toString().join(PATH_SEPARATOR) + } + + /** + * Sets the new Asciidoctor parent source directory. + * + * @param f An object convertible via {@code project.file} + */ + void sourceDir(Object f) { + this.srcDir = f + } + + /** + * Sets the new Asciidoctor parent source directory. + * + * @param f A {@code File} object pointing to the parent source directory + */ + void setSourceDir(File f) { + this.srcDir = f + } + + /** + * Returns the parent directory for Asciidoctor source. Default is {@code src/asciidoc}. + */ + @Optional + @InputDirectory + File getSourceDir() { + project.file(srcDir) + } + + /** + * Sets the new Asciidoctor parent output directory. + * + * @param f An object convertible via {@code project.file} + */ + void outputDir(Object f) { + this.outDir = f + } + + /** + * Sets the new Asciidoctor parent output directory. + * + * @param f A {@code File} object pointing to the parent output directory + */ + void setOutputDir(File f) { + this.outDir = f + } + + /** + * Returns the current toplevel output directory + */ + @OutputDirectory + File getOutputDir() { + if (this.outDir == null) { + this.outDir = new File(project.buildDir, 'asciidoc') + } + project.file(this.outDir) + } + + /** + * Returns the collection of source documents + * + * If sourceDocumentNames was not set or is empty, it will return all asciidoc files + * in {@code sourceDir}. Otherwise only the files provided earlier to sourceDocumentNames + * are returned if they are found below {@code sourceDir} + */ + @OutputDirectories + FileCollection getSourceDocumentNames() { + deprecated 'getSourceDocumentNames', 'getSourceFileTree' + sourceFileTree + } + + /** + * Sets a single file to the main source file + * + * @param f A file that is relative to {@code sourceDir} + */ + void setSourceDocumentName(File f) { + deprecated 'setSourceDocumentName', + 'setIncludes', 'File will be converted to a pattern.' + sources { + setIncludes([AsciidoctorUtils.getRelativePath(f.absoluteFile, sourceDir.absoluteFile)]) + } + } + + /** + * Replaces the current set of source documents with a new set + * + * @parm src List of source documents, which must be convertible using {@code project.files} + */ + @SuppressWarnings('DuplicateStringLiteral') + void setSourceDocumentNames(Object... src) { + deprecated 'setSourceDocumentNames', + 'setIncludes', + 'Files are converted to patterns. Some might not convert correctly. ' + + 'FileCollections will not convert' + File base = sourceDir.absoluteFile + def patterns = CollectionUtils.stringize(src as List).collect { String it -> + def tmpFile = new File(it) + String relPath + if (tmpFile.isAbsolute()) { + relPath = AsciidoctorUtils.getRelativePath(tmpFile.absoluteFile, base) + } else { + relPath = it + } + logger.debug "setSourceDocumentNames - Found ${it}, converted to ${relPath}" + relPath + } + sources { + setIncludes(patterns) + } + } + + void setBaseDir(File baseDir) { + this.baseDir = baseDir + baseDirSetToNull = baseDir == null + } + + /** + * Returns a list of all output directories. + */ + @OutputDirectories + Set getOutputDirectories() { + if (separateOutputDirs) { + backends.collect { new File(outputDir, it) } as Set + } else { + [outputDir] as Set + } + } + + /** + * Returns a FileTree containing all of the source documents + * + * @return If {@code sources} was never called then all asciidoc source files below {@code sourceDir} will + * be included + */ + @InputFiles + @SkipWhenEmpty + FileTree getSourceFileTree() { + project.fileTree(sourceDir). + matching(this.sourceDocumentPattern ?: defaultSourceDocumentPattern) + } + + /** + * Add patterns for source files or source files via a closure + * + * @param cfg PatternSet configuration closure + */ + void sources(Closure cfg) { + if (sourceDocumentPattern == null) { + sourceDocumentPattern = new PatternSet() + } + def configuration = cfg.clone() + configuration.delegate = sourceDocumentPattern + configuration() + } + + /** + * Add to the CopySpec for extra files. The destination of these files will always have a parent directory + * of {@code outputDir} or {@code outputDir + backend} + * + * @param cfg CopySpec configuration closure + */ + void resources(Closure cfg) { + if (this.resourceCopy == null) { + this.resourceCopy = project.copySpec(cfg) + } else { + def configuration = cfg.clone() + configuration.delegate = this.resourceCopy + configuration() + } + } + + /** + * The default PatternSet that will be used if {@code sources} was never called + * + * By default all *.adoc,*.ad,*.asc,*.asciidoc is included. Files beginning with underscore are excluded + * + */ + @Internal + PatternSet getDefaultSourceDocumentPattern() { + PatternSet ps = new PatternSet() + ps.include '**/*.adoc' + ps.include '**/*.ad' + ps.include '**/*.asc' + ps.include '**/*.asciidoc' + ps.exclude '**/_*' + } + + /** + * The default CopySpec that will be used if {@code resources} was never called + * + * By default anything below {@code $sourceDir/images} will be included. + * + * @return A {@code CopySpec}, never null + */ + @Internal + CopySpec getDefaultResourceCopySpec() { + project.copySpec { + from(sourceDir) { + include 'images/**' + } + } + } + + /** + * Gets the CopySpec for additional resources + * If {@code resources} was never called, it will return a default CopySpec otherwise it will return the + * one built up via successive calls to {@code resources} + * + * @return A {@code CopySpec}, never null + */ + @Internal + CopySpec getResourceCopySpec() { + this.resourceCopy ?: defaultResourceCopySpec + } + + /** + * Gets the additional resources as a FileCollection. + * If {@code resources} was never called, it will return the file collections as per default CopySpec otherwise it + * will return the collections as built up via successive calls to {@code resources} + * + * @return A {@code FileCollection}, never null + */ + @InputFiles + @SkipWhenEmpty + @Optional + FileCollection getResourceFileCollection() { + (resourceCopySpec as CopySpecInternal).buildRootResolver().allSource + } + + @TaskAction + void processAsciidocSources() { + if (sourceFileTree.files.size() == 0) { + logger.lifecycle 'Asciidoc source file tree is empty. Nothing will be processed.' + return + } + if (classpath == null) { + classpath = project.configurations.getByName(AsciidoctorPlugin.ASCIIDOCTOR) + } + setupClassLoader() + if (!asciidoctorExtensions?.empty) { + Class asciidoctorExtensionsDslRegistry = loadClass(AsciidoctorExtensions.class.getName()) + asciidoctorExtensions.each { asciidoctorExtensionsDslRegistry.extensions(it) } + } + if (!asciidoctor) { + instantiateAsciidoctor() + } + if (resourceCopyProxy == null) { + resourceCopyProxy = new ResourceCopyProxyImpl(project) + } + if (requires) { + for (require in requires) { + asciidoctor.requireLibrary(require) + } + } + for (activeBackend in activeBackends()) { + if (!AsciidoctorBackend.isBuiltIn(activeBackend)) { + logger.lifecycle("Passing through unknown backend: $activeBackend") + } + processDocumentsAndResources(activeBackend) + } + } + + @groovy.transform.PackageScope + File outputDirFor(final File source, final String basePath, final File outputDir, final String backend) { + String filePath = source.directory ? source.absolutePath : source.parentFile.absolutePath + String relativeFilePath = normalizePath(filePath) - normalizePath(basePath) + File baseOutputDir = outputBackendDir(outputDir, backend) + File destinationParentDir = new File(baseOutputDir, relativeFilePath) + if (!destinationParentDir.exists()) { + destinationParentDir.mkdirs() + } + destinationParentDir + } + + private File outputBackendDir(final File outputDir, final String backend) { + separateOutputDirs ? new File(outputDir, FileUtils.toSafeFileName(backend)) : outputDir + } + + private static String normalizePath(String path) { + if (IS_WINDOWS) { + path = path.replace(DOUBLE_BACKLASH, BACKLASH) + path = path.replace(BACKLASH, DOUBLE_BACKLASH) + } + path + } + + @SuppressWarnings('CatchException') + private void instantiateAsciidoctor() { + if (gemPaths.size()) { + asciidoctor = new AsciidoctorProxyImpl(delegate: loadClass(ASCIIDOCTOR_FACTORY_CLASSNAME).create(asGemPath())) + } else { + try { + asciidoctor = new AsciidoctorProxyImpl(delegate: loadClass(ASCIIDOCTOR_FACTORY_CLASSNAME).create(null as String)) + } catch (Exception e) { + asciidoctor = new AsciidoctorProxyImpl(delegate: loadClass(ASCIIDOCTOR_FACTORY_CLASSNAME).create()) + } + } + } + + private Set activeBackends() { + if (this.backends) { + return this.backends + } else if (backend) { + return [backend] + } + [DEFAULT_BACKEND] + } + + @SuppressWarnings('CatchException') + @SuppressWarnings('DuplicateStringLiteral') + private void processDocumentsAndResources(final String backend) { + try { + sourceFileTree.files.each { File file -> + if (file.name.startsWith('_')) { + throw new InvalidUserDataException('Source documents may not start with an underscore') + } + File destinationParentDir = owner.outputDirFor(file, sourceDir.absolutePath, outputDir, backend) + processSingleFile(backend, destinationParentDir, file) + } + + resourceCopyProxy.copy(outputBackendDir(outputDir, backend), resourceCopySpec) + + } catch (Exception e) { + throw new GradleException('Error running Asciidoctor', e) + } + } + + protected void processSingleFile(String backend, File destinationParentDir, File file) { + if (logDocuments) { + logger.lifecycle("Converting $file") + } + asciidoctor.convertFile(file, mergedOptions(file, + [ + project : project, + options : options, + attributes: attrs, + baseDir : !baseDir && !baseDirSetToNull ? file.parentFile : baseDir, + projectDir: project.projectDir, + rootDir : project.rootDir, + outputDir : destinationParentDir, + backend : backend])) + } + + @SuppressWarnings('AbcMetric') + private static Map mergedOptions(File file, Map params) { + Map mergedOptions = [:] + mergedOptions.putAll(params.options) + mergedOptions.backend = params.backend + mergedOptions.in_place = false + mergedOptions.safe = resolveSafeModeLevel(mergedOptions.safe, 0i) + mergedOptions.to_dir = params.outputDir + if (params.baseDir) { + mergedOptions.base_dir = params.baseDir + } + + if (mergedOptions.to_file) { + File toFile = new File(mergedOptions.to_file) + mergedOptions.to_file = new File(mergedOptions.remove('to_dir'), toFile.name) + } + + Map attributes = [:] + processMapAttributes(attributes, params.attributes) + + // Note: Directories passed as relative to work around issue #83 + // Asciidoctor cannot handle absolute paths in Windows properly + attributes.projectdir = AsciidoctorUtils.getRelativePath(params.projectDir, file.parentFile) + attributes.rootdir = AsciidoctorUtils.getRelativePath(params.rootDir, file.parentFile) + + // resolve these properties here as we want to catch both Map and String definitions parsed above + attributes.'project-name' = attributes.'project-name' ?: params.project.name + attributes.'project-group' = attributes.'project-group' ?: (params.project.group ?: '') + attributes.'project-version' = attributes.'project-version' ?: (params.project.version ?: '') + mergedOptions.attributes = attributes + + // Issue #14 force GString -> String as jruby will fail + // to find an exact match when invoking Asciidoctor + for (entry in mergedOptions) { + if (entry.value instanceof CharSequence) { + mergedOptions[entry.key] = entry.value.toString() + } else if (entry.value instanceof List) { + mergedOptions[entry.key] = stringifyList(entry.value) + } else if (entry.value instanceof Map) { + mergedOptions[entry.key] = stringifyMap(entry.value) + } else if (entry.value instanceof File) { + mergedOptions[entry.key] = entry.value.absolutePath + } + } + + mergedOptions + } + + private static List stringifyList(List input) { + input.collect { element -> + if (element instanceof CharSequence) { + element.toString() + } else if (element instanceof List) { + stringifyList(element) + } else if (element instanceof Map) { + stringifyMap(element) + } else if(element instanceof File) { + element.absolutePath + } else { + element + } + } + } + + private static Map stringifyMap(Map input) { + Map output = [:] + input.each { key, value -> + if (value instanceof CharSequence) { + output[key] = value.toString() + } else if (value instanceof List) { + output[key] = stringifyList(value) + } else if (value instanceof Map) { + output[key] = stringifyMap(value) + } else if(value instanceof File) { + output[key] = value.absolutePath + } else { + output[key] = value + } + } + output + } + + protected static void processMapAttributes(Map attributes, Map rawAttributes) { + // copy all attributes in order to prevent changes down + // the Asciidoctor chain that could cause serialization + // problems with Gradle -> all inputs/outputs get serialized + // for caching purposes; Ruby objects are non-serializable + // Issue #14 force GString -> String as jruby will fail + // to find an exact match when invoking Asciidoctor + for (entry in rawAttributes) { + if (entry.value == null || entry.value instanceof Boolean) { + attributes[entry.key] = entry.value + } else { + attributes[entry.key] = entry.value.toString() + } + } + } + + protected static void processCollectionAttributes(Map attributes, rawAttributes) { + for (attr in rawAttributes) { + if (attr instanceof CharSequence) { + def (k, v) = attr.toString().split('=', 2) as List + attributes.put(k, v != null ? v : '') + } else { + // QUESTION should we just coerce it to a String? + throw new InvalidUserDataException("Unsupported type for attribute ${attr}: ${attr.getClass()}") + } + } + } + + @SuppressWarnings('DuplicateStringLiteral') + @SuppressWarnings('DuplicateNumberLiteral') + private static Map coerceLegacyAttributeFormats(Object attributes) { + Map transformedMap = [:] + switch (attributes) { + case Map: + transformedMap = attributes + break + case CharSequence: + attributes.replaceAll('([^\\\\]) ', '$1\0').replaceAll('\\\\ ', ' ').split('\0').collect { + def split = it.split('=') + if (split.size() < 2) { + throw new InvalidUserDataException("Unsupported format for attributes: ${attributes}") + } + transformedMap[split[0]] = split.drop(1).join('=') + } + break + case Collection: + processCollectionAttributes(transformedMap, attributes) + break + default: + if (attributes.class.isArray()) { + processCollectionAttributes(transformedMap, attributes) + } else { + throw new InvalidUserDataException("Unsupported type for attributes: ${attributes.class}") + } + } + + transformedMap + } + + private static int resolveSafeModeLevel(Object safe, int defaultLevel) { + if (safe == null) { + defaultLevel + } else if (safe.class.name == SAFE_MODE_CLASSNAME) { + safe.level + } else if (safe instanceof CharSequence) { + try { + Enum.valueOf(loadClass(SAFE_MODE_CLASSNAME), safe.toString().toUpperCase()).level + } catch (IllegalArgumentException e) { + defaultLevel + } + } else { + safe.intValue() + } + } + + private static Class loadClass(String className) { + cl.loadClass(className) + } + + @SuppressWarnings('AssignmentToStaticFieldFromInstanceMethod') + private void setupClassLoader() { + if (classpath?.files) { + def urls = classpath.files.collect { it.toURI().toURL() } + cl = new URLClassLoader(urls as URL[], Thread.currentThread().contextClassLoader) + Thread.currentThread().contextClassLoader = cl + } else { + cl = Thread.currentThread().contextClassLoader + } + } + + private void deprecated(final String method, final String alternative, final String msg = '') { + logger.lifecycle "Asciidoctor: ${method} is deprecated and will be removed in a future version. " + + "Use ${alternative} instead. ${msg}" + } +} diff --git a/gradle-plugin-asciidoctor/src/main/groovy/org/xbib/gradle/plugin/asciidoctor/AsciidoctorUtils.groovy b/gradle-plugin-asciidoctor/src/main/groovy/org/xbib/gradle/plugin/asciidoctor/AsciidoctorUtils.groovy new file mode 100644 index 0000000..985426b --- /dev/null +++ b/gradle-plugin-asciidoctor/src/main/groovy/org/xbib/gradle/plugin/asciidoctor/AsciidoctorUtils.groovy @@ -0,0 +1,33 @@ +package org.xbib.gradle.plugin.asciidoctor + +import java.util.regex.Pattern + +class AsciidoctorUtils { + + static String getRelativePath(File target, File base) throws IOException { + String[] baseComponents = base.canonicalPath.split(Pattern.quote(File.separator)) + String[] targetComponents = target.canonicalPath.split(Pattern.quote(File.separator)) + int index = 0 + for (; index < targetComponents.length && index < baseComponents.length; ++index) { + if (!targetComponents[index].equals(baseComponents[index])) { + break + } + } + StringBuilder result = new StringBuilder() + if (index != baseComponents.length) { + for (int i = index; i < baseComponents.length; ++i) { + if (i != index) { + result.append(File.separator) + } + result.append('..') + } + } + for (int i = index; i < targetComponents.length; ++i) { + if (i != index) { + result.append(File.separator) + } + result.append(targetComponents[i]) + } + result.toString() + } +} diff --git a/gradle-plugin-asciidoctor/src/main/groovy/org/xbib/gradle/plugin/asciidoctor/ResourceCopyProxy.groovy b/gradle-plugin-asciidoctor/src/main/groovy/org/xbib/gradle/plugin/asciidoctor/ResourceCopyProxy.groovy new file mode 100644 index 0000000..9354342 --- /dev/null +++ b/gradle-plugin-asciidoctor/src/main/groovy/org/xbib/gradle/plugin/asciidoctor/ResourceCopyProxy.groovy @@ -0,0 +1,10 @@ +package org.xbib.gradle.plugin.asciidoctor + +import org.gradle.api.file.CopySpec +import org.gradle.api.tasks.WorkResult + +interface ResourceCopyProxy { + + WorkResult copy(File outputDir, CopySpec spec) + +} diff --git a/gradle-plugin-asciidoctor/src/main/groovy/org/xbib/gradle/plugin/asciidoctor/ResourceCopyProxyImpl.groovy b/gradle-plugin-asciidoctor/src/main/groovy/org/xbib/gradle/plugin/asciidoctor/ResourceCopyProxyImpl.groovy new file mode 100644 index 0000000..61960aa --- /dev/null +++ b/gradle-plugin-asciidoctor/src/main/groovy/org/xbib/gradle/plugin/asciidoctor/ResourceCopyProxyImpl.groovy @@ -0,0 +1,20 @@ +package org.xbib.gradle.plugin.asciidoctor + +import org.gradle.api.Project +import org.gradle.api.file.CopySpec +import org.gradle.api.tasks.WorkResult + +class ResourceCopyProxyImpl implements ResourceCopyProxy { + + Project project + + ResourceCopyProxyImpl(Project p) { project = p } + + @Override + WorkResult copy(File outputDir, CopySpec spec) { + project.copy { + into outputDir + with spec + } + } +} diff --git a/gradle-plugin-asciidoctor/src/main/groovy/org/xbib/gradle/plugin/asciidoctor/groovydsl/AsciidoctorExtensionException.groovy b/gradle-plugin-asciidoctor/src/main/groovy/org/xbib/gradle/plugin/asciidoctor/groovydsl/AsciidoctorExtensionException.groovy new file mode 100755 index 0000000..2ec0b99 --- /dev/null +++ b/gradle-plugin-asciidoctor/src/main/groovy/org/xbib/gradle/plugin/asciidoctor/groovydsl/AsciidoctorExtensionException.groovy @@ -0,0 +1,19 @@ +package org.xbib.gradle.plugin.asciidoctor.groovydsl + +class AsciidoctorExtensionException extends Exception { + + AsciidoctorExtensionException() { + } + + AsciidoctorExtensionException(String message) { + super(message) + } + + AsciidoctorExtensionException(String message, Throwable cause) { + super(message, cause) + } + + AsciidoctorExtensionException(Throwable cause) { + super(cause) + } +} diff --git a/gradle-plugin-asciidoctor/src/main/groovy/org/xbib/gradle/plugin/asciidoctor/groovydsl/AsciidoctorExtensionHandler.groovy b/gradle-plugin-asciidoctor/src/main/groovy/org/xbib/gradle/plugin/asciidoctor/groovydsl/AsciidoctorExtensionHandler.groovy new file mode 100755 index 0000000..5bfc7fb --- /dev/null +++ b/gradle-plugin-asciidoctor/src/main/groovy/org/xbib/gradle/plugin/asciidoctor/groovydsl/AsciidoctorExtensionHandler.groovy @@ -0,0 +1,87 @@ +package org.xbib.gradle.plugin.asciidoctor.groovydsl + +import org.asciidoctor.Asciidoctor +import org.asciidoctor.extension.BlockMacroProcessor +import org.asciidoctor.extension.BlockProcessor +import org.asciidoctor.extension.DocinfoProcessor +import org.asciidoctor.extension.IncludeProcessor +import org.asciidoctor.extension.InlineMacroProcessor +import org.asciidoctor.extension.Postprocessor +import org.asciidoctor.extension.Preprocessor +import org.asciidoctor.extension.Treeprocessor +import org.xbib.gradle.plugin.asciidoctor.groovydsl.extensions.DelegatingBlockMacroProcessor +import org.xbib.gradle.plugin.asciidoctor.groovydsl.extensions.DelegatingBlockProcessor +import org.xbib.gradle.plugin.asciidoctor.groovydsl.extensions.DelegatingDocinfoProcessor +import org.xbib.gradle.plugin.asciidoctor.groovydsl.extensions.DelegatingIncludeProcessor +import org.xbib.gradle.plugin.asciidoctor.groovydsl.extensions.DelegatingPostprocessor +import org.xbib.gradle.plugin.asciidoctor.groovydsl.extensions.DelegatingPreprocessor +import org.xbib.gradle.plugin.asciidoctor.groovydsl.extensions.DelegatingInlineMacroProcessor +import org.xbib.gradle.plugin.asciidoctor.groovydsl.extensions.DelegatingTreeprocessor + +class AsciidoctorExtensionHandler { + + static final String OPTION_NAME = 'name' + + static final String OPTION_FILTER = 'filter' + + static final String OPTION_CONTEXTS = 'contexts' + + private final Asciidoctor asciidoctor + + AsciidoctorExtensionHandler(Asciidoctor asciidoctor) { + this.asciidoctor = asciidoctor + } + + void block(String blockName, @DelegatesTo(BlockProcessor) Closure cl) { + block([(OPTION_NAME): blockName], cl) + } + + void block(Map options=[:], @DelegatesTo(BlockProcessor) Closure cl) { + if (!options.containsKey(OPTION_NAME)) { + throw new IllegalArgumentException('Block must define a name!') + } + if (!options.containsKey(OPTION_CONTEXTS)) { + //TODO: What are sensible defaults? + options[OPTION_CONTEXTS] = [':open', ':paragraph'] + } + asciidoctor.javaExtensionRegistry().block(new DelegatingBlockProcessor(options, cl)) + } + + void block_macro(Map options, @DelegatesTo(BlockMacroProcessor) Closure cl) { + asciidoctor.javaExtensionRegistry().blockMacro(new DelegatingBlockMacroProcessor(options[OPTION_NAME] as String, options, cl)) + } + + void block_macro(String name, @DelegatesTo(BlockMacroProcessor) Closure cl) { + block_macro([(OPTION_NAME): name], cl) + } + + void postprocessor(Map options=[:], @DelegatesTo(Postprocessor) Closure cl) { + asciidoctor.javaExtensionRegistry().postprocessor(new DelegatingPostprocessor(options, cl)) + } + + void preprocessor(Map options=[:], @DelegatesTo(Preprocessor) Closure cl) { + asciidoctor.javaExtensionRegistry().preprocessor(new DelegatingPreprocessor(options, cl)) + } + + void include_processor(Map options=[:], @DelegatesTo(IncludeProcessor) Closure cl) { + Closure filter = options[OPTION_FILTER] as Closure + Map optionsWithoutFilter = options - options.subMap([OPTION_FILTER]) + asciidoctor.javaExtensionRegistry().includeProcessor(new DelegatingIncludeProcessor(optionsWithoutFilter, filter, cl)) + } + + void inline_macro(Map options, @DelegatesTo(InlineMacroProcessor) Closure cl) { + asciidoctor.javaExtensionRegistry().inlineMacro(new DelegatingInlineMacroProcessor(options[OPTION_NAME] as String, options, cl)) + } + + void inline_macro(String macroName, @DelegatesTo(InlineMacroProcessor) Closure cl) { + inline_macro([(OPTION_NAME): macroName], cl) + } + + void treeprocessor(Map options=[:], @DelegatesTo(Treeprocessor) Closure cl) { + asciidoctor.javaExtensionRegistry().treeprocessor(new DelegatingTreeprocessor(options, cl)) + } + + void docinfo_processor(Map options=[:], @DelegatesTo(DocinfoProcessor) Closure cl) { + asciidoctor.javaExtensionRegistry().docinfoProcessor(new DelegatingDocinfoProcessor(options, cl)) + } +} diff --git a/gradle-plugin-asciidoctor/src/main/groovy/org/xbib/gradle/plugin/asciidoctor/groovydsl/AsciidoctorExtensions.groovy b/gradle-plugin-asciidoctor/src/main/groovy/org/xbib/gradle/plugin/asciidoctor/groovydsl/AsciidoctorExtensions.groovy new file mode 100755 index 0000000..44657f2 --- /dev/null +++ b/gradle-plugin-asciidoctor/src/main/groovy/org/xbib/gradle/plugin/asciidoctor/groovydsl/AsciidoctorExtensions.groovy @@ -0,0 +1,178 @@ +package org.xbib.gradle.plugin.asciidoctor.groovydsl + +import groovy.transform.CompileStatic +import org.asciidoctor.Asciidoctor +import org.codehaus.groovy.control.CompilerConfiguration +import org.codehaus.groovy.control.customizers.ImportCustomizer + +import java.nio.file.Files +import java.nio.file.Path + +/** + * An instance of this class holds all extension closure and scripts. + * It evaluates the blocks and scripts and forwards the extracted extensions + * to the GroovyExtensionRegistry which is service implementation + * of org.asciidoctor.extension.spi.wExtensionRegistry + */ +@CompileStatic +class AsciidoctorExtensions { + + private final List registeredExtensions = [] + + private static final AsciidoctorExtensions INSTANCE = new AsciidoctorExtensions() + + /** Add an extension from a closure + * + * @param cl Closure containing an extension + */ + void addExtension(@DelegatesTo(AsciidoctorExtensionHandler) Closure cl) { + registeredExtensions.add(cl) + } + + /** Add an extension via a string. + * + * @param groovyScript String containing extension. + */ + void addExtension(final String groovyScript) { + registeredExtensions.add(groovyScript) + } + + /** Add an extension via a file. + * + * @param groovyScript File containing extension + */ + void addExtension(final File groovyScript) { + registeredExtensions.add(groovyScript) + } + + /** Add an extension via a path instance + * + * @param groovyScript Path pointing to an extension + */ + void addExtension(final Path groovyScript) { + registeredExtensions.add(groovyScript) + } + + /** Remove all extensions. + * + */ + void clearExtensions() { + registeredExtensions.clear() + } + + /** Register all extension with an instance of Asciidoctor. + * + * @param asciidoctor Asciidoctor instance awaiting extensions. + * @throw AsciidoctorExtensionException + */ + @SuppressWarnings('UnnecessarySetter') + void registerExtensionsWith(Asciidoctor asciidoctor) { + AsciidoctorExtensionHandler extensionHandler = new AsciidoctorExtensionHandler(asciidoctor) + for (def it : registeredExtensions) { + switch (it) { + case Closure: + try { + ((Closure) it).delegate = extensionHandler + ((Closure) it).call() + } catch (e) { + throw new AsciidoctorExtensionException("Error registering extension from class in ${it.class.name}", e) + } + break + case String: + GroovyShell shell = makeGroovyShell() + DelegatingScript script = (DelegatingScript) shell.parse((String) it) + script.setDelegate(extensionHandler) + try { + script.run() + } catch (e) { + registeredExtensions.clear() + throw new AsciidoctorExtensionException('Error registering extension from string', e) + } + break + case File: + File file = (File) it + GroovyShell shell = makeGroovyShell() + file.withReader { reader -> + DelegatingScript script = (DelegatingScript) shell.parse(reader, file.name) + script.setDelegate(extensionHandler) + try { + script.run() + } catch (e) { + throw new AsciidoctorExtensionException("Error registering extension from file ${file.name}", e) + } + } + break + case Path: + Path path = (Path) it + GroovyShell shell = makeGroovyShell() + Files.newBufferedReader(path).withReader { reader -> + DelegatingScript script = (DelegatingScript) shell.parse(reader, path.toString()) + script.setDelegate(extensionHandler) + try { + script.run() + } catch (e) { + throw new AsciidoctorExtensionException("Error registering extension from file ${path}", e) + } + } + break + } + } + } + + /** Adds an extension to the AsciidoctorExtension singleton instance. + * + * @param cl Closure containing an instance + */ + static void extensions(@DelegatesTo(AsciidoctorExtensionHandler) Closure cl) { + INSTANCE.addExtension(cl) + } + + /** Adds an extension to the AsciidoctorExtension singleton instance. + * + * @param s String containing an instance + */ + static void extensions(String s) { + INSTANCE.addExtension(s) + } + + /** Adds an extension to the AsciidoctorExtension singleton instance. + * + * @param f File containing an instance + */ + static void extensions(File f) { + INSTANCE.addExtension(f) + } + + /** Attempt to register all exteniosn with ASciidoctor instance. + * + * This method has the side-effect of removing all extensions as well. + * + * @param asciidoctor + */ + static void registerTo(Asciidoctor asciidoctor) { + try { + INSTANCE.registerExtensionsWith(asciidoctor) + } finally { + INSTANCE.clearExtensions() + } + } + + private static GroovyShell makeGroovyShell() { + def config = new CompilerConfiguration() + + config.scriptBaseClass = DelegatingScript.name + + ImportCustomizer importCustomizer = new ImportCustomizer() + importCustomizer.addStarImports( + 'org.asciidoctor', + 'org.asciidoctor.ast', + 'org.asciidoctor.extension' + ) + + config.addCompilationCustomizers( + importCustomizer + ) + + new GroovyShell(new Binding(), config) + } +} \ No newline at end of file diff --git a/gradle-plugin-asciidoctor/src/main/groovy/org/xbib/gradle/plugin/asciidoctor/groovydsl/GroovyExtensionRegistry.groovy b/gradle-plugin-asciidoctor/src/main/groovy/org/xbib/gradle/plugin/asciidoctor/groovydsl/GroovyExtensionRegistry.groovy new file mode 100755 index 0000000..6e68374 --- /dev/null +++ b/gradle-plugin-asciidoctor/src/main/groovy/org/xbib/gradle/plugin/asciidoctor/groovydsl/GroovyExtensionRegistry.groovy @@ -0,0 +1,17 @@ +package org.xbib.gradle.plugin.asciidoctor.groovydsl + +import org.asciidoctor.Asciidoctor +import org.asciidoctor.jruby.extension.spi.ExtensionRegistry + +/** + * The service implementation for org.asciidoctor.extension.spi.ExtensionRegistry. + * It simply delegates the register() call to {@link AsciidoctorExtensions} + * that owns all configured extensions and registers it on the Asciidoctor instance. + */ +class GroovyExtensionRegistry implements ExtensionRegistry { + + @Override + void register(Asciidoctor asciidoctor) { + AsciidoctorExtensions.registerTo(asciidoctor) + } +} diff --git a/gradle-plugin-asciidoctor/src/main/groovy/org/xbib/gradle/plugin/asciidoctor/groovydsl/extensions/DelegatingBlockMacroProcessor.groovy b/gradle-plugin-asciidoctor/src/main/groovy/org/xbib/gradle/plugin/asciidoctor/groovydsl/extensions/DelegatingBlockMacroProcessor.groovy new file mode 100755 index 0000000..5e870ee --- /dev/null +++ b/gradle-plugin-asciidoctor/src/main/groovy/org/xbib/gradle/plugin/asciidoctor/groovydsl/extensions/DelegatingBlockMacroProcessor.groovy @@ -0,0 +1,20 @@ +package org.xbib.gradle.plugin.asciidoctor.groovydsl.extensions + +import org.asciidoctor.ast.StructuralNode +import org.asciidoctor.extension.BlockMacroProcessor + +class DelegatingBlockMacroProcessor extends BlockMacroProcessor { + + private final Closure cl + + DelegatingBlockMacroProcessor(String name, Map options, @DelegatesTo(BlockMacroProcessor) Closure cl) { + super(name, options) + this.cl = cl + cl.delegate = this + } + + @Override + Object process(StructuralNode parent, String target, Map attributes) { + cl.call(parent, target, attributes) + } +} diff --git a/gradle-plugin-asciidoctor/src/main/groovy/org/xbib/gradle/plugin/asciidoctor/groovydsl/extensions/DelegatingBlockProcessor.groovy b/gradle-plugin-asciidoctor/src/main/groovy/org/xbib/gradle/plugin/asciidoctor/groovydsl/extensions/DelegatingBlockProcessor.groovy new file mode 100755 index 0000000..e74e546 --- /dev/null +++ b/gradle-plugin-asciidoctor/src/main/groovy/org/xbib/gradle/plugin/asciidoctor/groovydsl/extensions/DelegatingBlockProcessor.groovy @@ -0,0 +1,22 @@ +package org.xbib.gradle.plugin.asciidoctor.groovydsl.extensions + +import org.asciidoctor.ast.StructuralNode +import org.asciidoctor.extension.BlockProcessor +import org.asciidoctor.extension.Reader +import org.xbib.gradle.plugin.asciidoctor.groovydsl.AsciidoctorExtensionHandler + +class DelegatingBlockProcessor extends BlockProcessor { + + private final Closure cl + + DelegatingBlockProcessor(Map attributes, @DelegatesTo(BlockProcessor) Closure cl) { + super(attributes[AsciidoctorExtensionHandler.OPTION_NAME] as String, attributes) + this.cl = cl + cl.delegate = this + } + + @Override + Object process(StructuralNode parent, Reader reader, Map attributes) { + cl.call(parent, reader, attributes) + } +} diff --git a/gradle-plugin-asciidoctor/src/main/groovy/org/xbib/gradle/plugin/asciidoctor/groovydsl/extensions/DelegatingDocinfoProcessor.groovy b/gradle-plugin-asciidoctor/src/main/groovy/org/xbib/gradle/plugin/asciidoctor/groovydsl/extensions/DelegatingDocinfoProcessor.groovy new file mode 100755 index 0000000..f74e5e9 --- /dev/null +++ b/gradle-plugin-asciidoctor/src/main/groovy/org/xbib/gradle/plugin/asciidoctor/groovydsl/extensions/DelegatingDocinfoProcessor.groovy @@ -0,0 +1,20 @@ +package org.xbib.gradle.plugin.asciidoctor.groovydsl.extensions + +import org.asciidoctor.ast.Document +import org.asciidoctor.extension.DocinfoProcessor + +class DelegatingDocinfoProcessor extends DocinfoProcessor { + + private final Closure cl + + DelegatingDocinfoProcessor(Map options, @DelegatesTo(DocinfoProcessor) Closure cl) { + super(options) + this.cl = cl + cl.delegate = this + } + + @Override + String process(Document document) { + cl.call(document) + } +} diff --git a/gradle-plugin-asciidoctor/src/main/groovy/org/xbib/gradle/plugin/asciidoctor/groovydsl/extensions/DelegatingIncludeProcessor.groovy b/gradle-plugin-asciidoctor/src/main/groovy/org/xbib/gradle/plugin/asciidoctor/groovydsl/extensions/DelegatingIncludeProcessor.groovy new file mode 100755 index 0000000..e04d483 --- /dev/null +++ b/gradle-plugin-asciidoctor/src/main/groovy/org/xbib/gradle/plugin/asciidoctor/groovydsl/extensions/DelegatingIncludeProcessor.groovy @@ -0,0 +1,31 @@ +package org.xbib.gradle.plugin.asciidoctor.groovydsl.extensions + +import org.asciidoctor.ast.Document + +import org.asciidoctor.extension.IncludeProcessor +import org.asciidoctor.extension.PreprocessorReader + +class DelegatingIncludeProcessor extends IncludeProcessor { + + private final Closure filter + + private final Closure cl + + DelegatingIncludeProcessor(Map options, Closure filter, @DelegatesTo(IncludeProcessor) Closure cl) { + super(options) + this.filter = filter + this.cl = cl + filter.delegate = this + cl.delegate = this + + } + @Override + boolean handles(String target) { + filter.call(target) + } + + @Override + void process(Document document, PreprocessorReader reader, String target, Map attributes) { + cl.call(document, reader, target, attributes) + } +} diff --git a/gradle-plugin-asciidoctor/src/main/groovy/org/xbib/gradle/plugin/asciidoctor/groovydsl/extensions/DelegatingInlineMacroProcessor.groovy b/gradle-plugin-asciidoctor/src/main/groovy/org/xbib/gradle/plugin/asciidoctor/groovydsl/extensions/DelegatingInlineMacroProcessor.groovy new file mode 100755 index 0000000..531e66e --- /dev/null +++ b/gradle-plugin-asciidoctor/src/main/groovy/org/xbib/gradle/plugin/asciidoctor/groovydsl/extensions/DelegatingInlineMacroProcessor.groovy @@ -0,0 +1,20 @@ +package org.xbib.gradle.plugin.asciidoctor.groovydsl.extensions + +import org.asciidoctor.ast.ContentNode +import org.asciidoctor.extension.InlineMacroProcessor + +class DelegatingInlineMacroProcessor extends InlineMacroProcessor { + + private final Closure cl + + DelegatingInlineMacroProcessor(String name, Map options, @DelegatesTo(InlineMacroProcessor) Closure cl) { + super(name, options) + this.cl = cl + cl.delegate = this + } + + @Override + Object process(ContentNode parent, String target, Map attributes) { + cl.call(parent, target, attributes) + } +} diff --git a/gradle-plugin-asciidoctor/src/main/groovy/org/xbib/gradle/plugin/asciidoctor/groovydsl/extensions/DelegatingPostprocessor.groovy b/gradle-plugin-asciidoctor/src/main/groovy/org/xbib/gradle/plugin/asciidoctor/groovydsl/extensions/DelegatingPostprocessor.groovy new file mode 100755 index 0000000..642b28e --- /dev/null +++ b/gradle-plugin-asciidoctor/src/main/groovy/org/xbib/gradle/plugin/asciidoctor/groovydsl/extensions/DelegatingPostprocessor.groovy @@ -0,0 +1,20 @@ +package org.xbib.gradle.plugin.asciidoctor.groovydsl.extensions + +import org.asciidoctor.ast.Document +import org.asciidoctor.extension.Postprocessor + +class DelegatingPostprocessor extends Postprocessor { + + private final Closure cl + + DelegatingPostprocessor(Map options, @DelegatesTo(Postprocessor) Closure cl) { + super(options) + this.cl = cl + cl.delegate = this + } + + @Override + String process(Document document, String output) { + cl.call(document, output) + } +} diff --git a/gradle-plugin-asciidoctor/src/main/groovy/org/xbib/gradle/plugin/asciidoctor/groovydsl/extensions/DelegatingPreprocessor.groovy b/gradle-plugin-asciidoctor/src/main/groovy/org/xbib/gradle/plugin/asciidoctor/groovydsl/extensions/DelegatingPreprocessor.groovy new file mode 100755 index 0000000..1abe151 --- /dev/null +++ b/gradle-plugin-asciidoctor/src/main/groovy/org/xbib/gradle/plugin/asciidoctor/groovydsl/extensions/DelegatingPreprocessor.groovy @@ -0,0 +1,21 @@ +package org.xbib.gradle.plugin.asciidoctor.groovydsl.extensions + +import org.asciidoctor.ast.Document +import org.asciidoctor.extension.Preprocessor +import org.asciidoctor.extension.PreprocessorReader + +class DelegatingPreprocessor extends Preprocessor { + + private final Closure cl + + DelegatingPreprocessor(Map options, @DelegatesTo(Preprocessor) Closure cl) { + super(options) + this.cl = cl + cl.delegate = this + } + + @Override + void process(Document document, PreprocessorReader reader) { + cl.call(document, reader) + } +} diff --git a/gradle-plugin-asciidoctor/src/main/groovy/org/xbib/gradle/plugin/asciidoctor/groovydsl/extensions/DelegatingTreeprocessor.groovy b/gradle-plugin-asciidoctor/src/main/groovy/org/xbib/gradle/plugin/asciidoctor/groovydsl/extensions/DelegatingTreeprocessor.groovy new file mode 100755 index 0000000..7aedba7 --- /dev/null +++ b/gradle-plugin-asciidoctor/src/main/groovy/org/xbib/gradle/plugin/asciidoctor/groovydsl/extensions/DelegatingTreeprocessor.groovy @@ -0,0 +1,28 @@ +package org.xbib.gradle.plugin.asciidoctor.groovydsl.extensions + +import org.asciidoctor.ast.Document +import org.asciidoctor.extension.Treeprocessor + +class DelegatingTreeprocessor extends Treeprocessor { + + private final Closure cl + + DelegatingTreeprocessor(Map options, @DelegatesTo(Treeprocessor) Closure cl) { + super(options) + this.cl = cl + cl.delegate = this + } + + @Override + Document process(Document document) { + def ret = cl.call(document) + if (!(ret in Document)) { + // Assume that the closure does something as last + // statement that was not intended to be the return value + // -> Return null + null + } else { + ret + } + } +} diff --git a/gradle-plugin-asciidoctor/src/main/resources/META-INF/services/org.asciidoctor.jruby.extension.spi.ExtensionRegistry b/gradle-plugin-asciidoctor/src/main/resources/META-INF/services/org.asciidoctor.jruby.extension.spi.ExtensionRegistry new file mode 100755 index 0000000..33be81e --- /dev/null +++ b/gradle-plugin-asciidoctor/src/main/resources/META-INF/services/org.asciidoctor.jruby.extension.spi.ExtensionRegistry @@ -0,0 +1 @@ +org.xbib.gradle.plugin.asciidoctor.groovydsl.GroovyExtensionRegistry diff --git a/gradle-plugin-asciidoctor/src/test/groovy/org/xbib/gradle/plugin/asciidoctor/AsciidoctorPluginSpec.groovy b/gradle-plugin-asciidoctor/src/test/groovy/org/xbib/gradle/plugin/asciidoctor/AsciidoctorPluginSpec.groovy new file mode 100755 index 0000000..04b4175 --- /dev/null +++ b/gradle-plugin-asciidoctor/src/test/groovy/org/xbib/gradle/plugin/asciidoctor/AsciidoctorPluginSpec.groovy @@ -0,0 +1,64 @@ +package org.xbib.gradle.plugin.asciidoctor + +import org.gradle.api.Project +import org.gradle.api.Task +import org.gradle.api.artifacts.DependencyResolutionListener +import org.gradle.api.artifacts.ResolvableDependencies +import org.gradle.testfixtures.ProjectBuilder +import spock.lang.Ignore +import spock.lang.Specification + +class AsciidoctorPluginSpec extends Specification { + + private static final String ASCIIDOCTOR = 'asciidoctor' + + Project project + + def setup() { + project = ProjectBuilder.builder().build() + } + + @SuppressWarnings('MethodName') + def "Applies plugin and checks default setup"() { + expect: + project.tasks.findByName(ASCIIDOCTOR) == null + when: + project.apply plugin: AsciidoctorPlugin + then: + Task asciidoctorTask = project.tasks.findByName(ASCIIDOCTOR) + asciidoctorTask != null + asciidoctorTask.group == 'Documentation' + asciidoctorTask.sourceDir == project.file('src/docs/asciidoc') + asciidoctorTask.outputDir == new File(project.buildDir, 'asciidoc') + + project.tasks.findByName('clean') != null + } + + @Ignore("Method 'getDependencyResolutionBroadcast' is unknown") + def "testPluginWithAlternativeAsciidoctorVersion"() { + expect: + project.tasks.findByName(ASCIIDOCTOR) == null + + when: + project.apply plugin: AsciidoctorPlugin + + def expectedVersion = 'my.expected.version-SNAPSHOT' + project.asciidoctorj.version = expectedVersion + + def expectedDslVersion = 'dsl.' + expectedVersion + project.asciidoctorj.groovyDslVersion = expectedDslVersion + + def config = project.project.configurations.getByName('asciidoctor') + def dependencies = config.dependencies + assert dependencies.isEmpty(); + + // mock-trigger beforeResolve() to avoid 'real' resolution of dependencies + DependencyResolutionListener broadcast = config.getDependencyResolutionBroadcast() + ResolvableDependencies incoming = config.getIncoming() + broadcast.beforeResolve(incoming) + def dependencyHandler = project.getDependencies(); + + then: + assert dependencies.contains(dependencyHandler.create(AsciidoctorPlugin.ASCIIDOCTORJ_CORE_DEPENDENCY + expectedVersion)) + } +} diff --git a/gradle-plugin-asciidoctor/src/test/groovy/org/xbib/gradle/plugin/asciidoctor/AsciidoctorTaskInlineExtensionsSpec.groovy b/gradle-plugin-asciidoctor/src/test/groovy/org/xbib/gradle/plugin/asciidoctor/AsciidoctorTaskInlineExtensionsSpec.groovy new file mode 100644 index 0000000..674913c --- /dev/null +++ b/gradle-plugin-asciidoctor/src/test/groovy/org/xbib/gradle/plugin/asciidoctor/AsciidoctorTaskInlineExtensionsSpec.groovy @@ -0,0 +1,190 @@ +package org.xbib.gradle.plugin.asciidoctor + +import org.gradle.api.GradleException +import org.gradle.api.Project +import org.gradle.api.Task +import org.gradle.testfixtures.ProjectBuilder +import org.jsoup.Jsoup +import org.jsoup.nodes.Document +import org.jsoup.nodes.Element +import spock.lang.Specification + +class AsciidoctorTaskInlineExtensionsSpec extends Specification { + + private static final String ASCIIDOCTOR = 'asciidoctor' + + private static final String ASCIIDOC_RESOURCES_DIR = 'build/resources/test/src/asciidocextensions' + + private static final String ASCIIDOC_BUILD_DIR = 'build/asciidocextensions' + + private static final String ASCIIDOC_MACRO_EXTENSION_SCRIPT = 'blockMacro.groovy' + + private static final String ASCIIDOC_INLINE_EXTENSIONS_FILE = 'inlineextensions.asciidoc' + + private static final String ASCIIDOC_INLINE_EXTENSIONS_RESULT_FILE = 'inlineextensions.html' + + Project project + File testRootDir + File srcDir + File outDir + + def setup() { + project = ProjectBuilder.builder().withName('test').build() + project.configurations.create(ASCIIDOCTOR) + testRootDir = new File('.') + srcDir = new File(testRootDir, ASCIIDOC_RESOURCES_DIR).absoluteFile + outDir = new File(project.projectDir, ASCIIDOC_BUILD_DIR) + } + + + def "Should apply inline BlockProcessor"() { + given: + Task task = project.tasks.create(name: ASCIIDOCTOR, type: AsciidoctorTask) { + sourceDir = srcDir + sourceDocumentNames = [ASCIIDOC_INLINE_EXTENSIONS_FILE] + outputDir = outDir + extensions { + block(name: "BIG", contexts: [":paragraph"]) { + parent, reader, attributes -> + def upperLines = reader.readLines() + .collect {it.toUpperCase()} + .inject("") {a, b -> a + '\n' + b} + + createBlock(parent, "paragraph", [upperLines], attributes, [:]) + } + block("small") { + parent, reader, attributes -> + def lowerLines = reader.readLines() + .collect {it.toLowerCase()} + .inject("") {a, b -> a + '\n' + b} + + createBlock(parent, "paragraph", [lowerLines], attributes, [:]) + } + + } + } + File resultFile = new File(outDir, 'html5' + File.separator + ASCIIDOC_INLINE_EXTENSIONS_RESULT_FILE) + when: + task.processAsciidocSources() + then: + resultFile.exists() + resultFile.getText().contains("WRITE THIS IN UPPERCASE") + resultFile.getText().contains("and write this in lowercase") + } + + def "Should apply BlockProcessor from file"() { + given: + print project.files('src/test/resources/src/asciidocextensions/blockMacro.groovy').each {println ">>> $it"} + Task task = project.tasks.create(name: ASCIIDOCTOR, type: AsciidoctorTask) { + sourceDir = srcDir + sourceDocumentNames = [ASCIIDOC_INLINE_EXTENSIONS_FILE] + outputDir = outDir + extensions new File(sourceDir, ASCIIDOC_MACRO_EXTENSION_SCRIPT) + } + File resultFile = new File(outDir, 'html5' + File.separator + ASCIIDOC_INLINE_EXTENSIONS_RESULT_FILE) + when: + task.processAsciidocSources() + then: + resultFile.exists() + resultFile.getText().contains("WRITE THIS IN UPPERCASE") + resultFile.getText().contains("and write this in lowercase") + } + + + def "Should apply inline Postprocessor"() { + given: + String copyright = "Copyright Acme, Inc." + System.currentTimeMillis() + Task task = project.tasks.create(name: ASCIIDOCTOR, type: AsciidoctorTask) { + sourceDir = srcDir + sourceDocumentNames = [ASCIIDOC_INLINE_EXTENSIONS_FILE] + outputDir = outDir + extensions { + postprocessor { + document, String output -> + if(document.basebackend("html")) { + Document doc = Jsoup.parse(output, "UTF-8") + + Element contentElement = doc.getElementById("footer-text") + contentElement.append(copyright) + + doc.html() + } else { + throw new IllegalArgumentException("Expected html!") + } + } + } + } + File resultFile = new File(outDir, 'html5' + File.separator + ASCIIDOC_INLINE_EXTENSIONS_RESULT_FILE) + when: + task.processAsciidocSources() + then: + resultFile.exists() + resultFile.getText().contains(copyright) + resultFile.getText().contains("Inline Extension Test document") + } + + def "Should fail if inline Postprocessor fails"() { + given: + Task task = project.tasks.create(name: ASCIIDOCTOR, type: AsciidoctorTask) { + sourceDir = srcDir + sourceDocumentNames = [ASCIIDOC_INLINE_EXTENSIONS_FILE] + outputDir = outDir + extensions { + postprocessor { + document, output -> + if (output.contains("blacklisted")) { + throw new IllegalArgumentException("Document contains a blacklisted word") + } + } + } + } + when: + task.processAsciidocSources() + then: + thrown(GradleException) + } + + def "Should apply inline Preprocessor"() { + given: + Task task = project.tasks.create(name: ASCIIDOCTOR, type: AsciidoctorTask) { + sourceDir = srcDir + sourceDocumentNames = [ASCIIDOC_INLINE_EXTENSIONS_FILE] + outputDir = outDir + extensions { + preprocessor { + document, reader -> + reader.advance() + reader + } + } + } + File resultFile = new File(outDir, 'html5' + File.separator + ASCIIDOC_INLINE_EXTENSIONS_RESULT_FILE) + when: + task.processAsciidocSources() + then: + resultFile.exists() + !resultFile.getText().contains("Inline Extension Test document") + } + + def "Should apply inline Includeprocessor"() { + given: + String content = "The content of the URL " + System.currentTimeMillis() + Task task = project.tasks.create(name: ASCIIDOCTOR, type: AsciidoctorTask) { + sourceDir = srcDir + sourceDocumentNames = [ASCIIDOC_INLINE_EXTENSIONS_FILE] + outputDir = outDir + extensions { + include_processor (filter: {it.startsWith('http')}) { + document, reader, target, attributes -> + reader.push_include(content, target, target, 1, attributes); + } + } + } + File resultFile = new File(outDir, 'html5' + File.separator + ASCIIDOC_INLINE_EXTENSIONS_RESULT_FILE) + when: + task.processAsciidocSources() + then: + resultFile.exists() + resultFile.getText().contains(content) + } +} diff --git a/gradle-plugin-asciidoctor/src/test/groovy/org/xbib/gradle/plugin/asciidoctor/AsciidoctorTaskSpec.groovy b/gradle-plugin-asciidoctor/src/test/groovy/org/xbib/gradle/plugin/asciidoctor/AsciidoctorTaskSpec.groovy new file mode 100755 index 0000000..4c938e8 --- /dev/null +++ b/gradle-plugin-asciidoctor/src/test/groovy/org/xbib/gradle/plugin/asciidoctor/AsciidoctorTaskSpec.groovy @@ -0,0 +1,1113 @@ +package org.xbib.gradle.plugin.asciidoctor + +import org.asciidoctor.SafeMode +import org.gradle.api.GradleException +import org.gradle.api.Project +import org.gradle.api.Task +import org.gradle.testfixtures.ProjectBuilder +import spock.lang.Ignore +import spock.lang.Specification + +class AsciidoctorTaskSpec extends Specification { + + private static final String ASCIIDOCTOR = 'asciidoctor' + + private static final String ASCIIDOC_RESOURCES_DIR = 'build/resources/test/src/asciidoc' + + private static final String ASCIIDOC_BUILD_DIR = 'build/asciidoc' + + private static final String ASCIIDOC_SAMPLE_FILE = 'sample.asciidoc' + + private static final String ASCIIDOC_SAMPLE2_FILE = 'subdir/sample2.ad' + + private static final String ASCIIDOC_INVALID_FILE = 'subdir/_include.adoc' + + private static final DOCINFO_FILE_PATTERN = ~/^(.+\-)?docinfo(-footer)?\.[^.]+$/ + + Project project + + AsciidoctorProxy mockAsciidoctor + + ResourceCopyProxy mockCopyProxy + + File testRootDir + + File srcDir + + File outDir + + ByteArrayOutputStream systemOut + + def setup() { + project = ProjectBuilder.builder().withName('test').build() + project.configurations.create(ASCIIDOCTOR) + mockAsciidoctor = Mock(AsciidoctorProxy) + mockCopyProxy = Mock(ResourceCopyProxy) + testRootDir = new File('.') + srcDir = new File(testRootDir, ASCIIDOC_RESOURCES_DIR).absoluteFile + outDir = new File(project.projectDir, ASCIIDOC_BUILD_DIR) + systemOut = new ByteArrayOutputStream() + System.out = new PrintStream(systemOut) + } + + @SuppressWarnings('MethodName') + def "Allow setting of options via method"() { + when: + Task task = project.tasks.create(name: ASCIIDOCTOR, type: AsciidoctorTask) { + options eruby : 'erb' + options eruby : 'erubis' + options doctype : 'book', toc : 'right' + } + + then: + ! systemOut.toString().contains('deprecated') + task.options['eruby'] == 'erubis' + task.options['doctype'] == 'book' + task.options['toc'] == 'right' + } + + @SuppressWarnings('MethodName') + def "Allow setting of options via assignment"() { + when: + Task task = project.tasks.create(name: ASCIIDOCTOR, type: AsciidoctorTask) { + options = [eruby : 'erb', toc : 'right'] + options = [eruby : 'erubis', doctype : 'book'] + } + + then: + ! systemOut.toString().contains('deprecated') + task.options['eruby'] == 'erubis' + task.options['doctype'] == 'book' + !task.options.containsKey('toc') + } + + @SuppressWarnings('MethodName') + def "Allow setting of attributes via method (Map variant)"() { + when: + Task task = project.tasks.create(name: ASCIIDOCTOR, type: AsciidoctorTask) { + attributes 'source-highlighter': 'foo' + attributes 'source-highlighter': 'coderay' + attributes idprefix : '$', idseparator : '-' + } + + then: + ! systemOut.toString().contains('deprecated') + task.attributes['source-highlighter'] == 'coderay' + task.attributes['idprefix'] == '$' + task.attributes['idseparator'] == '-' + } + + @SuppressWarnings('MethodName') + def "Allow setting of attributes via method (List variant)"() { + when: + Task task = project.tasks.create(name: ASCIIDOCTOR, type: AsciidoctorTask) { + attributes(['source-highlighter=foo', 'source-highlighter=coderay', 'idprefix=$', 'idseparator=-']) + } + + then: + ! systemOut.toString().contains('deprecated') + task.attributes['source-highlighter'] == 'coderay' + task.attributes['idprefix'] == '$' + task.attributes['idseparator'] == '-' + } + + @SuppressWarnings('MethodName') + def "Allow setting of attributes via method (String variant)"() { + when: + Task task = project.tasks.create(name: ASCIIDOCTOR, type: AsciidoctorTask) { + attributes 'source-highlighter=foo source-highlighter=coderay idprefix=$ idseparator=-' + } + + then: + ! systemOut.toString().contains('deprecated') + task.attributes['source-highlighter'] == 'coderay' + task.attributes['idprefix'] == '$' + task.attributes['idseparator'] == '-' + } + + @SuppressWarnings('MethodName') + def "Allow setting of attributes via assignment"() { + when: + Task task = project.tasks.create(name: ASCIIDOCTOR, type: AsciidoctorTask) { + attributes = ['source-highlighter': 'foo',idprefix : '$'] + attributes = ['source-highlighter': 'coderay', idseparator : '-'] + } + + then: + ! systemOut.toString().contains('deprecated') + task.attributes['source-highlighter'] == 'coderay' + task.attributes['idseparator'] == '-' + !task.attributes.containsKey('idprefix') + } + + @SuppressWarnings('MethodName') + def "Mixing attributes with options, should produce a warning, but updates should be appended"() { + when: + Task task = project.tasks.create(name: ASCIIDOCTOR, type: AsciidoctorTask) { + options eruby : 'erubis', attributes : ['source-highlighter': 'foo',idprefix : '$'] + options doctype: 'book', attributes : [idseparator : '-' ] + } + + then: + !task.attributes.containsKey('attributes') + task.attributes['source-highlighter'] == 'foo' + task.attributes['idseparator'] == '-' + task.attributes['idprefix'] == '$' + task.options['eruby'] == 'erubis' + task.options['doctype'] == 'book' + // @Ignore('Wrong sysout capture') + // systemOut.toString().contains('Attributes found in options.') + } + + @SuppressWarnings('MethodName') + def "Mixing attributes with options with assignment, should produce a warning, and attributes will be replaced"() { + when: + Map tmpStore = [ eruby : 'erubis', attributes : ['source-highlighter': 'foo',idprefix : '$'] ] + Task task = project.tasks.create(name: ASCIIDOCTOR, type: AsciidoctorTask) { + options = tmpStore + options = [ doctype: 'book', attributes : [idseparator : '-' ] ] + } + + then: + !task.attributes.containsKey('attributes') + task.attributes['idseparator'] == '-' + !task.attributes.containsKey('source-highlighter') + !task.attributes.containsKey('idprefix') + !task.options.containsKey('eruby') + task.options['doctype'] == 'book' + // @Ignore('Wrong sysout capture') + // systemOut.toString().contains('Attributes found in options.') + } + + @SuppressWarnings('MethodName') + def "Mixing string legacy form of attributes with options with assignment, should produce a warning, and attributes will be replaced"() { + when: + Task task = project.tasks.create(name: ASCIIDOCTOR, type: AsciidoctorTask) { + options = [ doctype: 'book', attributes : 'toc=right source-highlighter=coderay toc-title=Table\\ of\\ Contents' ] + } + + then: + task.options['doctype'] == 'book' + !task.attributes.containsKey('attributes') + task.attributes['toc'] == 'right' + task.attributes['source-highlighter'] == 'coderay' + task.attributes['toc-title'] == 'Table of Contents' + // @Ignore('Wrong sysout capture') + // systemOut.toString().contains('Attributes found in options.') + } + + @SuppressWarnings('MethodName') + def "Mixing list legacy form of attributes with options with assignment, should produce a warning, and attributes will be replaced"() { + when: + Task task = project.tasks.create(name: ASCIIDOCTOR, type: AsciidoctorTask) { + options = [ doctype: 'book', attributes : [ + 'toc=right', + 'source-highlighter=coderay', + 'toc-title=Table of Contents' + ]] + } + + then: + task.options['doctype'] == 'book' + !task.attributes.containsKey('attributes') + task.attributes['toc'] == 'right' + task.attributes['source-highlighter'] == 'coderay' + task.attributes['toc-title'] == 'Table of Contents' + // @Ignore('Wrong sysout capture') + // systemOut.toString().contains('Attributes found in options.') + } + + @SuppressWarnings('MethodName') + def "Allow setting of backends via method"() { + when: + Task task = project.tasks.create(name: ASCIIDOCTOR, type: AsciidoctorTask) { + backends 'foo','bar' + backends 'pdf' + } + + then: + ! systemOut.toString().contains('deprecated') + task.backends.contains('pdf') + task.backends.contains('foo') + task.backends.contains('bar') + } + + @SuppressWarnings('MethodName') + def "Allow setting of backends via assignment"() { + when: + Task task = project.tasks.create(name: ASCIIDOCTOR, type: AsciidoctorTask) { + backends = ['pdf'] + backends = ['foo','bar'] + } + + then: + ! systemOut.toString().contains('deprecated') + !task.backends.contains('pdf') + task.backends.contains('foo') + task.backends.contains('bar') + } + + @SuppressWarnings('MethodName') + def "Allow setting of requires via method"() { + when: + Task task = project.tasks.create(name: ASCIIDOCTOR, type: AsciidoctorTask) { + requires 'slim','tilt' + requires 'asciidoctor-pdf' + } + + then: + ! systemOut.toString().contains('deprecated') + task.requires.contains('asciidoctor-pdf') + task.requires.contains('tilt') + task.requires.contains('slim') + } + + @SuppressWarnings('MethodName') + def "Allow setting of requires via assignment"() { + when: + Task task = project.tasks.create(name: ASCIIDOCTOR, type: AsciidoctorTask) { + requires = ['asciidoctor-pdf'] + requires = ['slim','tilt'] + } + + then: + ! systemOut.toString().contains('deprecated') + !task.requires.contains('asciidoctor-pdf') + task.requires.contains('tilt') + task.requires.contains('slim') + } + + @SuppressWarnings('MethodName') + def "Allow setting of sourceDir via method"() { + when: + Task task = project.tasks.create(name: ASCIIDOCTOR, type: AsciidoctorTask) { + sourceDir project.projectDir + } + + then: + ! systemOut.toString().contains('deprecated') + task.getSourceDir().absolutePath == project.projectDir.absolutePath + task.sourceDir.absolutePath == project.projectDir.absolutePath + } + + + @SuppressWarnings('MethodName') + def "When setting sourceDir via assignment"() { + when: + Task task = project.tasks.create(name: ASCIIDOCTOR, type: AsciidoctorTask) { + sourceDir = project.projectDir + } + + then: + task.getSourceDir().absolutePath == project.projectDir.absolutePath + task.sourceDir.absolutePath == project.projectDir.absolutePath + + } + + @SuppressWarnings('MethodName') + def "When setting sourceDir via setSourceDir"() { + when: + Task task = project.tasks.create(name: ASCIIDOCTOR, type: AsciidoctorTask) { + setSourceDir project.projectDir + } + + then: + task.getSourceDir().absolutePath == project.projectDir.absolutePath + task.sourceDir.absolutePath == project.projectDir.absolutePath + !systemOut.toString().contains('deprecated') + } + + @SuppressWarnings('MethodName') + def "Allow setting of gemPath via method"() { + when: + Task task = project.tasks.create(name: ASCIIDOCTOR, type: AsciidoctorTask) { + gemPath project.projectDir + } + + then: + ! systemOut.toString().contains('deprecated') + task.asGemPath() == project.projectDir.absolutePath + } + + @SuppressWarnings('MethodName') + def "When setting gemPath via assignment"() { + when: + Task task = project.tasks.create(name: ASCIIDOCTOR, type: AsciidoctorTask) { + gemPath = project.projectDir + } + + then: + task.asGemPath() == project.projectDir.absolutePath + ! systemOut.toString().contains('deprecated') + } + + @SuppressWarnings('MethodName') + def "When setting gemPath via setGemPath"() { + when: + Task task = project.tasks.create(name: ASCIIDOCTOR, type: AsciidoctorTask) { + setGemPath project.projectDir + } + + then: + task.asGemPath() == project.projectDir.absolutePath + ! systemOut.toString().contains('deprecated') + } + + @SuppressWarnings('MethodName') + def "sourceDocumentNames should resolve descendant files of sourceDir if supplied as relatives"() { + when: "I specify two files relative to sourceDir,including one in a subfoler" + Task task = project.tasks.create(name: ASCIIDOCTOR, type: AsciidoctorTask) { + sourceDir srcDir + sourceDocumentNames = [ASCIIDOC_SAMPLE_FILE, ASCIIDOC_SAMPLE2_FILE] + } + def fileCollection = task.sourceDocumentNames + + then: "both files should be in collection, but any other files found in folder should be excluded" + fileCollection.contains(new File(srcDir,ASCIIDOC_SAMPLE_FILE).canonicalFile) + fileCollection.contains(new File(srcDir,ASCIIDOC_SAMPLE2_FILE).canonicalFile) + !fileCollection.contains(new File(srcDir,'sample-docinfo.xml').canonicalFile) + fileCollection.files.size() == 2 + } + + @SuppressWarnings('MethodName') + def "sourceDocumentNames should resolve descendant files of sourceDir even if given as absolute files"() { + given: + File sample1 = new File(srcDir,ASCIIDOC_SAMPLE_FILE).absoluteFile + File sample2 = new File(srcDir,ASCIIDOC_SAMPLE2_FILE).absoluteFile + + when: "I specify two absolute path files, that are descendents of sourceDit" + Task task = project.tasks.create(name: ASCIIDOCTOR, type: AsciidoctorTask) { + sourceDir srcDir + sourceDocumentNames = [sample1,sample2] + } + def fileCollection = task.sourceDocumentNames + + then: "both files should be in collection, but any other files found in folder should be excluded" + fileCollection.contains(new File(srcDir,ASCIIDOC_SAMPLE_FILE).canonicalFile) + fileCollection.contains(new File(srcDir,ASCIIDOC_SAMPLE2_FILE).canonicalFile) + !fileCollection.contains(new File(srcDir,'sample-docinfo.xml').canonicalFile) + fileCollection.files.size() == 2 + } + + @SuppressWarnings('MethodName') + def "sourceDocumentNames should not resolve files that are not descendants of sourceDir"() { + given: + File sample1 = new File(project.projectDir,ASCIIDOC_SAMPLE_FILE).absoluteFile + + when: + Task task = project.tasks.create(name: ASCIIDOCTOR, type: AsciidoctorTask) { + sourceDir srcDir + sourceDocumentNames = [sample1] + } + def fileCollection = task.sourceDocumentNames + + then: + fileCollection.files.size() == 0 + } + + @SuppressWarnings('MethodName') + @SuppressWarnings('DuplicateNumberLiteral') + def "Add asciidoctor task with multiple backends"() { + when: + Task task = project.tasks.create(name: ASCIIDOCTOR, type: AsciidoctorTask) { + asciidoctor = mockAsciidoctor + resourceCopyProxy = mockCopyProxy + sourceDir = srcDir + outputDir = outDir + backends AsciidoctorBackend.DOCBOOK.id, AsciidoctorBackend.HTML5.id + } + + task.processAsciidocSources() + then: + 2 * mockAsciidoctor.convertFile(_, { Map map -> map.backend == AsciidoctorBackend.DOCBOOK.id}) + 2 * mockAsciidoctor.convertFile(_, { Map map -> map.backend == AsciidoctorBackend.HTML5.id}) + } + + @SuppressWarnings('MethodName') + @SuppressWarnings('DuplicateNumberLiteral') + def "Adds asciidoctor task with multiple backends and single backend"() { + when: + Task task = project.tasks.create(name: ASCIIDOCTOR, type: AsciidoctorTask) { + asciidoctor = mockAsciidoctor + resourceCopyProxy = mockCopyProxy + sourceDir = srcDir + outputDir = outDir + backends = [AsciidoctorBackend.DOCBOOK.id, AsciidoctorBackend.HTML5.id] + backend = AsciidoctorBackend.DOCBOOK5.id + } + + task.processAsciidocSources() + then: + 2 * mockAsciidoctor.convertFile(_, { Map map -> map.backend == AsciidoctorBackend.DOCBOOK.id}) + 2 * mockAsciidoctor.convertFile(_, { Map map -> map.backend == AsciidoctorBackend.HTML5.id}) + // @Ignore('Wrong sysout capture') + // systemOut.toString().contains('Using `backend` and `backends` together will result in `backend` being ignored.') + } + + @SuppressWarnings('MethodName') + @SuppressWarnings('DuplicateNumberLiteral') + def "Adds asciidoctor task with supported backend"() { + expect: + project.tasks.findByName(ASCIIDOCTOR) == null + when: + Task task = project.tasks.create(name: ASCIIDOCTOR, type: AsciidoctorTask) { + asciidoctor = mockAsciidoctor + resourceCopyProxy = mockCopyProxy + sourceDir srcDir + outputDir = outDir + } + + task.processAsciidocSources() + then: + 2 * mockAsciidoctor.convertFile(_, { Map map -> map.backend == AsciidoctorBackend.HTML5.id}) + ! systemOut.toString().contains('deprecated') + } + + @SuppressWarnings('MethodName') + @SuppressWarnings('DuplicateNumberLiteral') + def "Using setBackend should output a warning"() { + expect: + project.tasks.findByName(ASCIIDOCTOR) == null + when: + Task task = project.tasks.create(name: ASCIIDOCTOR, type: AsciidoctorTask) { + asciidoctor = mockAsciidoctor + resourceCopyProxy = mockCopyProxy + sourceDir = srcDir + outputDir = outDir + backend = AsciidoctorBackend.DOCBOOK.id + } + + task.processAsciidocSources() + then: + 2 * mockAsciidoctor.convertFile(_, { Map map -> map.backend == AsciidoctorBackend.DOCBOOK.id}) + } + + @SuppressWarnings('MethodName') + def "Adds asciidoctor task throws exception"() { + expect: + project.tasks.findByName(ASCIIDOCTOR) == null + when: + Task task = project.tasks.create(name: ASCIIDOCTOR, type: AsciidoctorTask) { + asciidoctor = mockAsciidoctor + resourceCopyProxy = mockCopyProxy + sourceDir = srcDir + outputDir = outDir + } + + task.processAsciidocSources() + then: + mockAsciidoctor.convertFile(_, _) >> { throw new IllegalArgumentException() } + thrown(GradleException) + } + + @SuppressWarnings('MethodName') + def "Processes a single document given a value for sourceDocumentName"() { + expect: + project.tasks.findByName(ASCIIDOCTOR) == null + when: + Task task = project.tasks.create(name: ASCIIDOCTOR, type: AsciidoctorTask) { + asciidoctor = mockAsciidoctor + resourceCopyProxy = mockCopyProxy + sourceDir = srcDir + outputDir = outDir + sourceDocumentName = new File(srcDir, ASCIIDOC_SAMPLE_FILE) + } + + task.processAsciidocSources() + then: + 1 * mockAsciidoctor.convertFile(_, _) + } + + + @Ignore('Wrong sysout capture') + @SuppressWarnings('MethodName') + def "Output warning when a sourceDocumentName was given"() { + given: + Task task = project.tasks.create(name: ASCIIDOCTOR, type: AsciidoctorTask) { + asciidoctor = mockAsciidoctor + resourceCopyProxy = mockCopyProxy + sourceDir = srcDir + outputDir = outDir + sourceDocumentName = new File(srcDir, ASCIIDOC_SAMPLE_FILE) + } + when: + task.processAsciidocSources() + then: + systemOut.toString().contains('setSourceDocumentName is deprecated') + } + + @Ignore('Wrong sysout capture') + @SuppressWarnings('MethodName') + def "Output error when sourceDocumentName and sourceDocumentNames are given"() { + given: + Task task = project.tasks.create(name: ASCIIDOCTOR, type: AsciidoctorTask) { + asciidoctor = mockAsciidoctor + resourceCopyProxy = mockCopyProxy + sourceDir = srcDir + outputDir = outDir + sourceDocumentName = new File(srcDir, ASCIIDOC_SAMPLE_FILE) + sourceDocumentNames = new File(srcDir, ASCIIDOC_SAMPLE_FILE) + } + when: + task.processAsciidocSources() + then: + systemOut.toString().contains('setSourceDocumentNames is deprecated') + } + + @SuppressWarnings('MethodName') + def "Source documents in directories end up in the corresponding output directory"() { + given: + Task task = project.tasks.create(name: ASCIIDOCTOR, type: AsciidoctorTask) { + asciidoctor = mockAsciidoctor + resourceCopyProxy = mockCopyProxy + sourceDir = srcDir + outputDir = outDir + separateOutputDirs = false + } + when: + task.processAsciidocSources() + then: + 1 * mockAsciidoctor.convertFile(new File(task.sourceDir, ASCIIDOC_SAMPLE2_FILE), { it.to_dir == new File(task.outputDir, 'subdir').absolutePath }) + 1 * mockAsciidoctor.convertFile(new File(task.sourceDir, ASCIIDOC_SAMPLE_FILE), { it.to_dir == task.outputDir.absolutePath }) + and: + 0 * mockAsciidoctor.convertFile(_, _) + } + + @SuppressWarnings('MethodName') + def "Should support String value for attributes option"() { + given: + Task task = project.tasks.create(name: ASCIIDOCTOR, type: AsciidoctorTask) { + asciidoctor = mockAsciidoctor + resourceCopyProxy = mockCopyProxy + sourceDir = srcDir + outputDir = outDir + sourceDocumentName = new File(srcDir, ASCIIDOC_SAMPLE_FILE) + options = [ + attributes: 'toc=right source-highlighter=coderay' + ] + } + when: + task.processAsciidocSources() + then: + 1 * mockAsciidoctor.convertFile(_, _) + } + + @SuppressWarnings('MethodName') + @SuppressWarnings('DuplicateStringLiteral') + def "Should support GString value for attributes option"() { + given: + Task task = project.tasks.create(name: ASCIIDOCTOR, type: AsciidoctorTask) { + asciidoctor = mockAsciidoctor + resourceCopyProxy = mockCopyProxy + sourceDir = srcDir + outputDir = outDir + sourceDocumentName = new File(srcDir, ASCIIDOC_SAMPLE_FILE) + def attrs = 'toc=right source-highlighter=coderay' + options = [ + attributes: "$attrs" + ] + } + when: + task.processAsciidocSources() + then: + 1 * mockAsciidoctor.convertFile(_, _) + } + + @SuppressWarnings('MethodName') + @SuppressWarnings('DuplicateStringLiteral') + def "Should support List value for attributes option"() { + given: + Task task = project.tasks.create(name: ASCIIDOCTOR, type: AsciidoctorTask) { + asciidoctor = mockAsciidoctor + resourceCopyProxy = mockCopyProxy + sourceDir = srcDir + outputDir = outDir + sourceDocumentName = new File(srcDir, ASCIIDOC_SAMPLE_FILE) + def highlighter = 'coderay' + options = [ + attributes: ['toc=right', "source-highlighter=$highlighter"] + ] + } + when: + task.processAsciidocSources() + then: + 1 * mockAsciidoctor.convertFile(_, _) + } + + @SuppressWarnings('MethodName') + def "Throws exception when attributes embedded in options is an unsupported type"() { + when: + Task task = project.tasks.create(name: ASCIIDOCTOR, type: AsciidoctorTask) { + asciidoctor = mockAsciidoctor + resourceCopyProxy = mockCopyProxy + sourceDir = srcDir + outputDir = outDir + sourceDocumentName = new File(srcDir, ASCIIDOC_SAMPLE_FILE) + options = [ + attributes: 23 + ] + } + task.processAsciidocSources() + then: + thrown(org.gradle.api.internal.tasks.DefaultTaskContainer$TaskCreationException) + } + + @SuppressWarnings('MethodName') + def "Setting baseDir results in the correct value being sent to Asciidoctor"() { + given: + File basedir = new File(testRootDir, 'my_base_dir') + Task task = project.tasks.create(name: ASCIIDOCTOR, type: AsciidoctorTask) { + asciidoctor = mockAsciidoctor + resourceCopyProxy = mockCopyProxy + sourceDir = srcDir + outputDir = outDir + baseDir = basedir + } + when: + task.processAsciidocSources() + then: + 1 * mockAsciidoctor.convertFile(new File(task.sourceDir, ASCIIDOC_SAMPLE_FILE), { it.base_dir == basedir.absolutePath }) + } + + @SuppressWarnings('MethodName') + def "Omitting a value for baseDir results in sending the dir of the processed file"() { + given: + Task task = project.tasks.create(name: ASCIIDOCTOR, type: AsciidoctorTask) { + asciidoctor = mockAsciidoctor + resourceCopyProxy = mockCopyProxy + sourceDir = srcDir + outputDir = outDir + } + when: + task.processAsciidocSources() + then: + 1 * mockAsciidoctor.convertFile(new File(task.sourceDir, ASCIIDOC_SAMPLE_FILE), + { it.base_dir == new File(task.sourceDir, ASCIIDOC_SAMPLE_FILE).getParentFile().absolutePath }) + } + + @SuppressWarnings('MethodName') + def "Setting baseDir to null results in no value being sent to Asciidoctor"() { + given: + Task task = project.tasks.create(name: ASCIIDOCTOR, type: AsciidoctorTask) { + asciidoctor = mockAsciidoctor + resourceCopyProxy = mockCopyProxy + sourceDir = srcDir + outputDir = outDir + baseDir = null + } + when: + task.processAsciidocSources() + then: + 1 * mockAsciidoctor.convertFile(new File(task.sourceDir, ASCIIDOC_SAMPLE_FILE), { !it.base_dir }) + } + + @SuppressWarnings('MethodName') + def "Safe mode option is equal to level of SafeMode.UNSAFE by default"() { + given: + Task task = project.tasks.create(name: ASCIIDOCTOR, type: AsciidoctorTask) { + asciidoctor = mockAsciidoctor + resourceCopyProxy = mockCopyProxy + sourceDir = srcDir + outputDir = outDir + } + when: + task.processAsciidocSources() + then: + 1 * mockAsciidoctor.convertFile(new File(task.sourceDir, ASCIIDOC_SAMPLE_FILE), { + it.safe == SafeMode.UNSAFE.level + }) + } + + @SuppressWarnings('MethodName') + def "Safe mode configuration option as integer is honored"() { + given: + Task task = project.tasks.create(name: ASCIIDOCTOR, type: AsciidoctorTask) { + asciidoctor = mockAsciidoctor + resourceCopyProxy = mockCopyProxy + sourceDir = srcDir + outputDir = outDir + options = [ + safe: SafeMode.SERVER.level + ] + } + when: + task.processAsciidocSources() + then: + 1 * mockAsciidoctor.convertFile(new File(task.sourceDir, ASCIIDOC_SAMPLE_FILE), { + it.safe == SafeMode.SERVER.level + }) + } + + @SuppressWarnings('MethodName') + def "Safe mode configuration option as string is honored"() { + given: + Task task = project.tasks.create(name: ASCIIDOCTOR, type: AsciidoctorTask) { + asciidoctor = mockAsciidoctor + resourceCopyProxy = mockCopyProxy + sourceDir = srcDir + outputDir = outDir + options = [ + safe: 'server' + ] + } + when: + task.processAsciidocSources() + then: + 1 * mockAsciidoctor.convertFile(new File(task.sourceDir, ASCIIDOC_SAMPLE_FILE), { + it.safe == SafeMode.SERVER.level + }) + } + + @SuppressWarnings('MethodName') + def "Safe mode configuration option as enum is honored"() { + given: + Task task = project.tasks.create(name: ASCIIDOCTOR, type: AsciidoctorTask) { + asciidoctor = mockAsciidoctor + resourceCopyProxy = mockCopyProxy + sourceDir = srcDir + outputDir = outDir + options = [ + safe: SafeMode.SERVER + ] + } + when: + task.processAsciidocSources() + then: + 1 * mockAsciidoctor.convertFile(new File(task.sourceDir, ASCIIDOC_SAMPLE_FILE), { + it.safe == SafeMode.SERVER.level + }) + } + + @SuppressWarnings('MethodName') + def "Attributes projectdir and rootdir are always set to relative dirs of the processed file"() { + given: + Task task = project.tasks.create(name: ASCIIDOCTOR, type: AsciidoctorTask) { + asciidoctor = mockAsciidoctor + resourceCopyProxy = mockCopyProxy + sourceDir = srcDir + outputDir = outDir + } + when: + task.processAsciidocSources() + then: + 1 * mockAsciidoctor.convertFile(new File(task.sourceDir, ASCIIDOC_SAMPLE_FILE), { + it.attributes.projectdir == AsciidoctorUtils.getRelativePath(project.projectDir, new File(task.sourceDir, ASCIIDOC_SAMPLE_FILE).getParentFile()) + it.attributes.rootdir == AsciidoctorUtils.getRelativePath(project.rootDir, new File(task.sourceDir, ASCIIDOC_SAMPLE_FILE).getParentFile()) + }) + } + + @SuppressWarnings('MethodName') + def "Docinfo files are not copied to target directory"() { + given: + Task task = project.tasks.create(name: ASCIIDOCTOR, type: AsciidoctorTask) { + asciidoctor = mockAsciidoctor + resourceCopyProxy = mockCopyProxy + sourceDir = srcDir + outputDir = outDir + } + when: + task.processAsciidocSources() + then: + 1 * mockAsciidoctor.convertFile(new File(task.sourceDir, ASCIIDOC_SAMPLE_FILE), _) + !outDir.listFiles({ !it.directory && !(it.name =~ DOCINFO_FILE_PATTERN) } as FileFilter) + } + + @SuppressWarnings('MethodName') + def "Project coordinates are set automatically as attributes"() { + given: + project.version = '1.0.0-SNAPSHOT' + project.group = 'com.acme' + Task task = project.tasks.create(name: ASCIIDOCTOR, type: AsciidoctorTask) { + asciidoctor = mockAsciidoctor + resourceCopyProxy = mockCopyProxy + sourceDir = srcDir + outputDir = outDir + } + when: + task.processAsciidocSources() + then: + 1 * mockAsciidoctor.convertFile(new File(task.sourceDir, ASCIIDOC_SAMPLE_FILE), { + it.attributes.'project-name' == 'test' && + it.attributes.'project-group' == 'com.acme' && + it.attributes.'project-version' == '1.0.0-SNAPSHOT' + }) + } + + @SuppressWarnings('MethodName') + def "Override project coordinates with explicit attributes"() { + given: + project.version = '1.0.0-SNAPSHOT' + project.group = 'com.acme' + Task task = project.tasks.create(name: ASCIIDOCTOR, type: AsciidoctorTask) { + asciidoctor = mockAsciidoctor + resourceCopyProxy = mockCopyProxy + sourceDir = srcDir + outputDir = outDir + options = [ + attributes: [ + 'project-name': 'awesome', + 'project-group': 'unicorns', + 'project-version': '1.0.0.Final' + ] + ] + } + when: + task.processAsciidocSources() + then: + 1 * mockAsciidoctor.convertFile(new File(task.sourceDir, ASCIIDOC_SAMPLE_FILE), { + it.attributes.'project-name' == 'awesome' && + it.attributes.'project-group' == 'unicorns' && + it.attributes.'project-version' == '1.0.0.Final' + }) + } + + @SuppressWarnings('MethodName') + def "Should support a single source document if a name is given"() { + given: + Task task = project.tasks.create(name: ASCIIDOCTOR, type: AsciidoctorTask) { + asciidoctor = mockAsciidoctor + resourceCopyProxy = mockCopyProxy + sourceDir = srcDir + outputDir = outDir + sourceDocumentName = new File(ASCIIDOC_RESOURCES_DIR, ASCIIDOC_SAMPLE_FILE) + } + when: + task.processAsciidocSources() + then: + 1 * mockAsciidoctor.convertFile(new File(task.sourceDir, ASCIIDOC_SAMPLE_FILE),_ ) + } + + @SuppressWarnings('MethodName') + def "Should support multiple source documents if names are given"() { + given: + Task task = project.tasks.create(name: ASCIIDOCTOR, type: AsciidoctorTask) { + asciidoctor = mockAsciidoctor + resourceCopyProxy = mockCopyProxy + sourceDir = srcDir + outputDir = outDir + sources { + include ASCIIDOC_SAMPLE_FILE,ASCIIDOC_SAMPLE2_FILE + } + } + when: + task.processAsciidocSources() + then: + 1 * mockAsciidoctor.convertFile(new File(task.sourceDir, ASCIIDOC_SAMPLE_FILE),_ ) + 1 * mockAsciidoctor.convertFile(new File(task.sourceDir, ASCIIDOC_SAMPLE2_FILE),_ ) + } + + @SuppressWarnings('MethodName') + def "Should throw exception if the file sourceDocumentName starts with underscore"() { + given: + Task task = project.tasks.create(name: ASCIIDOCTOR, type: AsciidoctorTask) { + asciidoctor = mockAsciidoctor + resourceCopyProxy = mockCopyProxy + sourceDir = srcDir + outputDir = outDir + sourceDocumentName = new File(srcDir, ASCIIDOC_INVALID_FILE) + } + when: + task.processAsciidocSources() + then: + 0 * mockAsciidoctor.convertFile(_, _) + thrown(GradleException) + } + + @SuppressWarnings('MethodName') + def "Should throw exception if a file in sourceDocumentNames starts with underscore"() { + given: + Task task = project.tasks.create(name: ASCIIDOCTOR, type: AsciidoctorTask) { + asciidoctor = mockAsciidoctor + resourceCopyProxy = mockCopyProxy + sourceDir srcDir + outputDir outDir + setSourceDocumentNames ASCIIDOC_INVALID_FILE + } + when: + task.processAsciidocSources() + then: + 0 * mockAsciidoctor.convertFile(_, _) + thrown(GradleException) + } + + def "When 'resources' not specified, then copy all images to backend"() { + given: + Task task = project.tasks.create(name: ASCIIDOCTOR, type: AsciidoctorTask) { + asciidoctor = mockAsciidoctor + resourceCopyProxy = mockCopyProxy + + sourceDir srcDir + outputDir outDir + backends AsciidoctorBackend.HTML5.id + + sources { + include ASCIIDOC_SAMPLE_FILE + } + + } + when: + task.processAsciidocSources() + then: + 1 * mockCopyProxy.copy(_, _) + } + + def "When 'resources' not specified and more than one backend, then copy all images to every backend"() { + given: + Task task = project.tasks.create(name: ASCIIDOCTOR, type: AsciidoctorTask) { + asciidoctor = mockAsciidoctor + resourceCopyProxy = mockCopyProxy + + sourceDir srcDir + outputDir outDir + backends AsciidoctorBackend.HTML5.id,AsciidoctorBackend.DOCBOOK.id + + sources { + include ASCIIDOC_SAMPLE_FILE + } + + } + when: + task.processAsciidocSources() + then: + 1 * mockCopyProxy.copy( new File(outDir,AsciidoctorBackend.HTML5.id) , _) + 1 * mockCopyProxy.copy( new File(outDir,AsciidoctorBackend.DOCBOOK.id) , _) + } + + def "When 'resources' are specified, then copy according to all patterns"() { + given: + Task task = project.tasks.create(name: ASCIIDOCTOR, type: AsciidoctorTask) { + asciidoctor = mockAsciidoctor + resourceCopyProxy = mockCopyProxy + + sourceDir srcDir + outputDir outDir + backends AsciidoctorBackend.HTML5.id,AsciidoctorBackend.DOCBOOK.id + + sources { + include ASCIIDOC_SAMPLE_FILE + } + + resources { + from (sourceDir) { + include 'images/**' + } + } + } + + when: + task.processAsciidocSources() + then: + 1 * mockCopyProxy.copy( new File(outDir,AsciidoctorBackend.HTML5.id) , _) + 1 * mockCopyProxy.copy( new File(outDir,AsciidoctorBackend.DOCBOOK.id) , _) + } + + def "sanity test for default configuration" () { + when: + Task task = project.tasks.create(name: ASCIIDOCTOR, type: AsciidoctorTask) { + } + + then: + task.sourceDir.absolutePath.replace('\\', '/').endsWith('src/docs/asciidoc') + task.outputDir.absolutePath.replace('\\', '/').endsWith('build/asciidoc') + } + + def "set output dir to something else than the default" () { + given: + project.version = '1.0.0-SNAPSHOT' + project.group = 'com.acme' + + Task task = project.tasks.create(name: ASCIIDOCTOR, type: AsciidoctorTask) { + asciidoctor = mockAsciidoctor + resourceCopyProxy = mockCopyProxy + sourceDir = srcDir + } + project.buildDir = '/tmp/testbuild/asciidoctor' + + when: + task.processAsciidocSources() + + then: 'the html files must be in testbuild/asciidoctor ' + task.outputDir.absolutePath.replace('\\', '/').contains('testbuild/asciidoctor') + 2 * mockAsciidoctor.convertFile(_, { it.to_dir.startsWith(project.buildDir.absolutePath) }) + } + + def "Files in the resources copyspec should be recognised as input files" () { + given: + File imagesDir = new File(outDir,'images') + File imageFile = new File(imagesDir,'fake.txt') + imagesDir.mkdirs() + imageFile.text = 'foo' + + Task task = project.tasks.create(name: ASCIIDOCTOR, type: AsciidoctorTask) { + asciidoctor = mockAsciidoctor + resourceCopyProxy = mockCopyProxy + + sourceDir srcDir + outputDir "${outDir}/foo" + backends AsciidoctorBackend.HTML5.id + + sources { + include ASCIIDOC_SAMPLE_FILE + } + + resources { + from (outDir) { + include 'images/**' + } + } + } + + when: + project.evaluate() + + then: + task.inputs.files.contains(project.file("${srcDir}/sample.asciidoc")) + task.inputs.files.contains(project.file("${imagesDir}/fake.txt")) + } + + def "GroovyStrings in options and attributes are converted into Strings" () { + given: + String variable = 'bar' + Task task = project.tasks.create(name: ASCIIDOCTOR, type: AsciidoctorTask) { + options = [ + template_dirs: ["${project.projectDir}/templates/haml"] + ] + attributes = [ + foo: "${variable}" + ] + asciidoctor = mockAsciidoctor + resourceCopyProxy = mockCopyProxy + sourceDir srcDir + outputDir = outDir + } + + when: + task.processAsciidocSources() + + then: + 1 * mockAsciidoctor.convertFile(new File(task.sourceDir, ASCIIDOC_SAMPLE_FILE), { Map props -> + props.template_dirs*.class == [String] && + props.attributes.foo.class == String + }) + } + + @SuppressWarnings('MethodName') + def "Should require libraries"() { + expect: + project.tasks.findByName(ASCIIDOCTOR) == null + when: + Task task = project.tasks.create(name: ASCIIDOCTOR, type: AsciidoctorTask) { + asciidoctor = mockAsciidoctor + resourceCopyProxy = mockCopyProxy + sourceDir = srcDir + outputDir = outDir + sourceDocumentName = new File(srcDir, ASCIIDOC_SAMPLE_FILE) + requires 'asciidoctor-pdf' + } + + task.processAsciidocSources() + then: + 1 * mockAsciidoctor.requireLibrary("asciidoctor-pdf") + } + +} diff --git a/gradle-plugin-asciidoctor/src/test/groovy/org/xbib/gradle/plugin/asciidoctor/AsciidoctorUtilsSpec.groovy b/gradle-plugin-asciidoctor/src/test/groovy/org/xbib/gradle/plugin/asciidoctor/AsciidoctorUtilsSpec.groovy new file mode 100755 index 0000000..ddcefe3 --- /dev/null +++ b/gradle-plugin-asciidoctor/src/test/groovy/org/xbib/gradle/plugin/asciidoctor/AsciidoctorUtilsSpec.groovy @@ -0,0 +1,27 @@ +package org.xbib.gradle.plugin.asciidoctor + +import spock.lang.Specification + +class AsciidoctorUtilsSpec extends Specification { + + static s = File.separator + + def 'finds relative paths'(String target, String base, String relative) { + expect: + AsciidoctorUtils.getRelativePath(new File(target), new File(base)) == relative + where: + target | base | relative + 'src/test/groovy' | 'src' | "test${s}groovy" + 'src/test/groovy/' | 'src/' | "test${s}groovy" + 'src/test/groovy' | 'src/' | "test${s}groovy" + 'src/test/groovy/' | 'src' | "test${s}groovy" + 'src' | 'src/test/groovy' | "..${s}.." + 'src/' | 'src/test/groovy/' | "..${s}.." + 'src' | 'src/test/groovy/' | "..${s}.." + 'src/' | 'src/test/groovy' | "..${s}.." + 'src/test' | 'src/test' | '' + 'src/test/' | 'src/test/' | '' + 'src/test' | 'src/test/' | '' + 'src/test/' | 'src/test' | '' + } +} diff --git a/gradle-plugin-asciidoctor/src/test/groovy/org/xbib/gradle/plugin/asciidoctor/groovydsl/AsciidoctorGroovyDSLSpec.groovy b/gradle-plugin-asciidoctor/src/test/groovy/org/xbib/gradle/plugin/asciidoctor/groovydsl/AsciidoctorGroovyDSLSpec.groovy new file mode 100755 index 0000000..5915727 --- /dev/null +++ b/gradle-plugin-asciidoctor/src/test/groovy/org/xbib/gradle/plugin/asciidoctor/groovydsl/AsciidoctorGroovyDSLSpec.groovy @@ -0,0 +1,288 @@ +package org.xbib.gradle.plugin.asciidoctor.groovydsl + +import org.asciidoctor.Asciidoctor +import org.asciidoctor.SafeMode +import spock.lang.Specification + +import static org.asciidoctor.OptionsBuilder.options + +/** + * Asciidoctor task inline extensions specification + * + */ +class AsciidoctorGroovyDSLSpec extends Specification { + + private static final String TEST_DOC_BLOCK = '''Ignore this. + +[BIG] +But this should be uppercase + +[small] +And THIS should be lowercase\n\ + +capitalize::tHIS_sets_the_fIRST_letter_in_cApItAlS_and_REMOVES_underscores[] + +.Gemfile +[source,ruby] +---- +include::https://raw.github.com/asciidoctor/asciidoctor/master/Gemfile[] +---- + +.My Gist +gist::123456[] + +See man:gittutorial[7] to get started. + +blacklisted is a blacklisted word. + +''' + + File testRootDir + + def setup() { + testRootDir = new File('.') + } + + + def 'Should clear registry on exception when registering from a Closure'() { + given: + AsciidoctorExtensions.extensions { + throw new Exception('This error is on purpose') + } + + when: + Asciidoctor.Factory.create().convert(TEST_DOC_BLOCK, [:]) + + then: + def e = thrown(ServiceConfigurationError) + } + + def 'Should clear registry on exception when registering from a String'() { + + given: + AsciidoctorExtensions.extensions 'throw new Exception(\'This error is on purpose\')' + + when: + Asciidoctor.Factory.create().convert(TEST_DOC_BLOCK, [:]) + + then: + def e = thrown(ServiceConfigurationError) + } + + def 'Should clear registry on exception when registering from a File'() { + given: + AsciidoctorExtensions.extensions(new File('src/test/resources/error.groovy')) + + when: + Asciidoctor.Factory.create().convert(TEST_DOC_BLOCK, [:]) + + then: + def e = thrown(ServiceConfigurationError) + } + + + def 'Should apply BlockProcessor from Script as String'() { + given: + + AsciidoctorExtensions.extensions ''' + block(name: 'BIG', contexts: [':paragraph']) { + parent, reader, attributes -> + def upperLines = reader.readLines() + .collect {it.toUpperCase()} + .inject('') {a, b -> a + '\\n' + b} + + createBlock(parent, 'paragraph', [upperLines], attributes, [:]) + } + block('small') { + parent, reader, attributes -> + def lowerLines = reader.readLines() + .collect {it.toLowerCase()} + .inject('') {a, b -> a + '\\n' + b} + + createBlock(parent, 'paragraph', [lowerLines], attributes, [:]) + } + +''' + when: + String rendered = Asciidoctor.Factory.create().convert(TEST_DOC_BLOCK, [:]) + + then: + rendered.contains('BUT THIS SHOULD BE UPPERCASE') + rendered.contains('and this should be lowercase') + rendered.contains('Ignore this.') + } + + + def 'Should apply BlockProcessor from Closure'() { + given: + + AsciidoctorExtensions.extensions { + block(name: 'BIG', contexts: [':paragraph']) { + parent, reader, attributes -> + def upperLines = reader.readLines() + .collect { it.toUpperCase() } + .inject('') { a, b -> a + '\n' + b } + + createBlock(parent, 'paragraph', [upperLines], attributes, [:]) + } + block('small') { + parent, reader, attributes -> + def lowerLines = reader.readLines() + .collect { it.toLowerCase() } + .inject('') { a, b -> a + '\n' + b } + + createBlock(parent, 'paragraph', [lowerLines], attributes, [:]) + } + + } + + when: + String rendered = Asciidoctor.Factory.create().convert(TEST_DOC_BLOCK, [:]) + + then: + rendered.contains('BUT THIS SHOULD BE UPPERCASE') + rendered.contains('and this should be lowercase') + rendered.contains('Ignore this.') + } + + def 'Should apply BlockProcessor from Extension file'() { + given: + + AsciidoctorExtensions.extensions(new File('src/test/resources/testblockextensions.groovy')) + when: + String rendered = Asciidoctor.Factory.create().convert(TEST_DOC_BLOCK, [:]) + + then: + rendered.contains('BUT THIS SHOULD BE UPPERCASE') + rendered.contains('and this should be lowercase') + rendered.contains('Ignore this.') + } + + def 'Should apply Postprocessor from Extension file'() { + given: + AsciidoctorExtensions.extensions(new File('src/test/resources/testpostprocessorextension.groovy')) + + when: + String rendered = Asciidoctor.Factory.create().convert(TEST_DOC_BLOCK, [:]) + + then: + rendered.contains('Copyright Acme, Inc.') + } + + def 'Should apply Preprocessor from Extension file'() { + given: + AsciidoctorExtensions.extensions(new File('src/test/resources/testpreprocessorextension.groovy')) + + when: + String rendered = Asciidoctor.Factory.create().convert(TEST_DOC_BLOCK, [:]) + + then: + !rendered.contains('Ignore this.') + } + + def 'Should apply Includeprocessor from Extension file'() { + given: + AsciidoctorExtensions.extensions(new File('src/test/resources/testincludeprocessorextension.groovy')) + + when: + String rendered = Asciidoctor.Factory.create().convert(TEST_DOC_BLOCK, [:]) + + then: + rendered.contains('The content of the URL') + } + + def 'Should apply BlockMacroProcessor from Closure'() { + given: + AsciidoctorExtensions.extensions { + block_macro ("gist") { parent, target, attributes -> + String content = """
+ +
""" + createBlock(parent, "pass", [content], attributes); + } + } + + when: + String rendered = Asciidoctor.Factory.create().convert(TEST_DOC_BLOCK, [:]) + + then: + rendered.contains("https://gist.github.com/123456.js") + } + + def 'Should apply BlockMacroProcessor from Extension file'() { + given: + AsciidoctorExtensions.extensions(new File('src/test/resources/testblockmacroextension.groovy')) + + when: + String rendered = Asciidoctor.Factory.create().convert(TEST_DOC_BLOCK, [:]) + + then: + rendered.contains("https://gist.github.com/123456.js") + } + + def 'Should apply InlineMacroProcessor from Closure'() { + given: + + AsciidoctorExtensions.extensions { + inline_macro('man') { + parent, target, attributes -> + def options = ["type": ":link", "target": target + ".html"] + createPhraseNode(parent, "anchor", target, attributes, options).convert() + } + } + + when: + String rendered = Asciidoctor.Factory.create().convert(TEST_DOC_BLOCK, [:]) + + then: + rendered.contains('gittutorial') + } + + def 'Should apply InlineMacroProcessor from Extension file'() { + given: + AsciidoctorExtensions.extensions(new File('src/test/resources/testinlinemacroprocessorextension.groovy')) + + when: + String rendered = Asciidoctor.Factory.create().convert(TEST_DOC_BLOCK, [:]) + + then: + rendered.contains('gittutorial') + } + + def 'Should apply Treeprocessor from Extension file'() { + given: + AsciidoctorExtensions.extensions(new File('src/test/resources/testtreeprocessorextension.groovy')) + + when: + String rendered = Asciidoctor.Factory.create().convert(''' +$ echo "Hello, World!" + +$ gem install asciidoctor +''', [:]) + + then: + rendered.contains('gem install asciidoctor') + } + + def 'Should apply DocinfoProcessor from Closure'() { + given: + String metatag = '' + AsciidoctorExtensions.extensions { + docinfo_processor { + document -> metatag + } + } + + when: + String rendered = Asciidoctor.Factory.create().convert( + ''' += Hello + +World''', + options().headerFooter(true).safe(SafeMode.SERVER).toFile(false).get()); + + then: + // (?ms) Multiline regexp with dotall (= '.' matches newline as well) + rendered ==~ /(?ms).*.*.*<\/head>.*/ + } +} diff --git a/gradle-plugin-asciidoctor/src/test/resources/error.groovy b/gradle-plugin-asciidoctor/src/test/resources/error.groovy new file mode 100755 index 0000000..38bf749 --- /dev/null +++ b/gradle-plugin-asciidoctor/src/test/resources/error.groovy @@ -0,0 +1,10 @@ +throw new Exception('This error is on purpose') + +block (name: "BIG", contexts: [":paragraph"]) { + parent, reader, attributes -> + def upperLines = reader.readLines() + .collect {it.toUpperCase()} + .inject("") {a, b -> a + '\\n' + b} + + createBlock(parent, "paragraph", [upperLines], attributes, [:]) +} diff --git a/gradle-plugin-asciidoctor/src/test/resources/src/asciidoc/docinfo-footer.xml b/gradle-plugin-asciidoctor/src/test/resources/src/asciidoc/docinfo-footer.xml new file mode 100644 index 0000000..b4ed1b3 --- /dev/null +++ b/gradle-plugin-asciidoctor/src/test/resources/src/asciidoc/docinfo-footer.xml @@ -0,0 +1,17 @@ + diff --git a/gradle-plugin-asciidoctor/src/test/resources/src/asciidoc/docinfo.xml b/gradle-plugin-asciidoctor/src/test/resources/src/asciidoc/docinfo.xml new file mode 100644 index 0000000..b4ed1b3 --- /dev/null +++ b/gradle-plugin-asciidoctor/src/test/resources/src/asciidoc/docinfo.xml @@ -0,0 +1,17 @@ + diff --git a/gradle-plugin-asciidoctor/src/test/resources/src/asciidoc/images/fake.txt b/gradle-plugin-asciidoctor/src/test/resources/src/asciidoc/images/fake.txt new file mode 100644 index 0000000..a8cc3a9 --- /dev/null +++ b/gradle-plugin-asciidoctor/src/test/resources/src/asciidoc/images/fake.txt @@ -0,0 +1,4 @@ + +===================== +Not a real image file +===================== \ No newline at end of file diff --git a/gradle-plugin-asciidoctor/src/test/resources/src/asciidoc/sample-docinfo-footer.xml b/gradle-plugin-asciidoctor/src/test/resources/src/asciidoc/sample-docinfo-footer.xml new file mode 100644 index 0000000..b4ed1b3 --- /dev/null +++ b/gradle-plugin-asciidoctor/src/test/resources/src/asciidoc/sample-docinfo-footer.xml @@ -0,0 +1,17 @@ + diff --git a/gradle-plugin-asciidoctor/src/test/resources/src/asciidoc/sample-docinfo.xml b/gradle-plugin-asciidoctor/src/test/resources/src/asciidoc/sample-docinfo.xml new file mode 100644 index 0000000..b4ed1b3 --- /dev/null +++ b/gradle-plugin-asciidoctor/src/test/resources/src/asciidoc/sample-docinfo.xml @@ -0,0 +1,17 @@ + diff --git a/gradle-plugin-asciidoctor/src/test/resources/src/asciidoc/sample.asciidoc b/gradle-plugin-asciidoctor/src/test/resources/src/asciidoc/sample.asciidoc new file mode 100644 index 0000000..0b8061e --- /dev/null +++ b/gradle-plugin-asciidoctor/src/test/resources/src/asciidoc/sample.asciidoc @@ -0,0 +1,26 @@ +Document Title +============== +Doc Writer +:idprefix: id_ + +Preamble paragraph. + +NOTE: This is test, only a test. + +== Section A + +*Section A* paragraph. + +=== Section A Subsection + +*Section A* 'subsection' paragraph. + +== Section B + +*Section B* paragraph. + +.Section B list +* Item 1 +* Item 2 +* Item 3 + diff --git a/gradle-plugin-asciidoctor/src/test/resources/src/asciidoc/subdir/_include.adoc b/gradle-plugin-asciidoctor/src/test/resources/src/asciidoc/subdir/_include.adoc new file mode 100644 index 0000000..2257d91 --- /dev/null +++ b/gradle-plugin-asciidoctor/src/test/resources/src/asciidoc/subdir/_include.adoc @@ -0,0 +1 @@ +an include file diff --git a/gradle-plugin-asciidoctor/src/test/resources/src/asciidoc/subdir/sample2.ad b/gradle-plugin-asciidoctor/src/test/resources/src/asciidoc/subdir/sample2.ad new file mode 100644 index 0000000..0b8061e --- /dev/null +++ b/gradle-plugin-asciidoctor/src/test/resources/src/asciidoc/subdir/sample2.ad @@ -0,0 +1,26 @@ +Document Title +============== +Doc Writer +:idprefix: id_ + +Preamble paragraph. + +NOTE: This is test, only a test. + +== Section A + +*Section A* paragraph. + +=== Section A Subsection + +*Section A* 'subsection' paragraph. + +== Section B + +*Section B* paragraph. + +.Section B list +* Item 1 +* Item 2 +* Item 3 + diff --git a/gradle-plugin-asciidoctor/src/test/resources/src/asciidocextensions/blockMacro.groovy b/gradle-plugin-asciidoctor/src/test/resources/src/asciidocextensions/blockMacro.groovy new file mode 100644 index 0000000..75ef48b --- /dev/null +++ b/gradle-plugin-asciidoctor/src/test/resources/src/asciidocextensions/blockMacro.groovy @@ -0,0 +1,16 @@ +block(name: "BIG", contexts: [":paragraph"]) { + parent, reader, attributes -> + def upperLines = reader.readLines() + .collect {it.toUpperCase()} + .inject("") {a, b -> a + '\n' + b} + + createBlock(parent, "paragraph", [upperLines], attributes, [:]) +} +block("small") { + parent, reader, attributes -> + def lowerLines = reader.readLines() + .collect {it.toLowerCase()} + .inject("") {a, b -> a + '\n' + b} + + createBlock(parent, "paragraph", [lowerLines], attributes, [:]) +} diff --git a/gradle-plugin-asciidoctor/src/test/resources/src/asciidocextensions/inlineextensions.asciidoc b/gradle-plugin-asciidoctor/src/test/resources/src/asciidocextensions/inlineextensions.asciidoc new file mode 100644 index 0000000..0549d65 --- /dev/null +++ b/gradle-plugin-asciidoctor/src/test/resources/src/asciidocextensions/inlineextensions.asciidoc @@ -0,0 +1,23 @@ += Inline Extension Test document + +[BIG] +Write this in uppercase + +[small] +AND WRITE THIS IN LOWERCASE + + +.Gemfile +[source,ruby] +---- +include::https://raw.github.com/asciidoctor/asciidoctor/master/Gemfile[] +---- + + +.My Gist +gist::123456[] + +See man:gittutorial[7] to get started. + +blacklisted is a blacklisted word. + \ No newline at end of file diff --git a/gradle-plugin-asciidoctor/src/test/resources/src/asciidocextensions/sample-with-terminal-command.ad b/gradle-plugin-asciidoctor/src/test/resources/src/asciidocextensions/sample-with-terminal-command.ad new file mode 100644 index 0000000..d8f203f --- /dev/null +++ b/gradle-plugin-asciidoctor/src/test/resources/src/asciidocextensions/sample-with-terminal-command.ad @@ -0,0 +1,4 @@ +$ echo "Hello, World!" + +$ gem install asciidoctor + diff --git a/gradle-plugin-asciidoctor/src/test/resources/testblockextensions.groovy b/gradle-plugin-asciidoctor/src/test/resources/testblockextensions.groovy new file mode 100755 index 0000000..4d87cee --- /dev/null +++ b/gradle-plugin-asciidoctor/src/test/resources/testblockextensions.groovy @@ -0,0 +1,16 @@ +block (name: "BIG", contexts: [":paragraph"]) { + parent, reader, attributes -> + def upperLines = reader.readLines() + .collect {it.toUpperCase()} + .inject("") {a, b -> a + '\\n' + b} + + createBlock(parent, "paragraph", [upperLines], attributes, [:]) +} +block("small") { + parent, reader, attributes -> + def lowerLines = reader.readLines() + .collect {it.toLowerCase()} + .inject("") {a, b -> a + '\\n' + b} + + createBlock(parent, "paragraph", [lowerLines], attributes, [:]) +} diff --git a/gradle-plugin-asciidoctor/src/test/resources/testblockmacroextension.groovy b/gradle-plugin-asciidoctor/src/test/resources/testblockmacroextension.groovy new file mode 100755 index 0000000..2748262 --- /dev/null +++ b/gradle-plugin-asciidoctor/src/test/resources/testblockmacroextension.groovy @@ -0,0 +1,7 @@ +block_macro (name: "gist") { parent, target, attributes -> + String content = """
+ +
""" + createBlock(parent, "pass", [content], attributes) +} + diff --git a/gradle-plugin-asciidoctor/src/test/resources/testincludeprocessorextension.groovy b/gradle-plugin-asciidoctor/src/test/resources/testincludeprocessorextension.groovy new file mode 100755 index 0000000..0459919 --- /dev/null +++ b/gradle-plugin-asciidoctor/src/test/resources/testincludeprocessorextension.groovy @@ -0,0 +1,6 @@ +String content = "The content of the URL" + +include_processor (filter: {it.startsWith("http")}) { + document, reader, target, attributes -> + reader.push_include(content, target, target, 1, attributes); +} diff --git a/gradle-plugin-asciidoctor/src/test/resources/testinlinemacroprocessorextension.groovy b/gradle-plugin-asciidoctor/src/test/resources/testinlinemacroprocessorextension.groovy new file mode 100755 index 0000000..540fee3 --- /dev/null +++ b/gradle-plugin-asciidoctor/src/test/resources/testinlinemacroprocessorextension.groovy @@ -0,0 +1,4 @@ +inline_macro (name: "man") { parent, target, attributes -> + options=["type": ":link", "target": target + ".html"] + createPhraseNode(parent, "anchor", target, attributes, options).render() +} diff --git a/gradle-plugin-asciidoctor/src/test/resources/testpostprocessorextension.groovy b/gradle-plugin-asciidoctor/src/test/resources/testpostprocessorextension.groovy new file mode 100755 index 0000000..450ea5f --- /dev/null +++ b/gradle-plugin-asciidoctor/src/test/resources/testpostprocessorextension.groovy @@ -0,0 +1,16 @@ +import org.jsoup.* + +String copyright = "Copyright Acme, Inc." + +postprocessor { + document, output -> + if(document.basebackend("html")) { + org.jsoup.nodes.Document doc = Jsoup.parse(output, "UTF-8") + + def contentElement = doc.getElementsByTag("body") + contentElement.append(copyright) + doc.html() + } else { + throw new IllegalArgumentException("Expected html!") + } +} diff --git a/gradle-plugin-asciidoctor/src/test/resources/testpreprocessorextension.groovy b/gradle-plugin-asciidoctor/src/test/resources/testpreprocessorextension.groovy new file mode 100755 index 0000000..24d33fb --- /dev/null +++ b/gradle-plugin-asciidoctor/src/test/resources/testpreprocessorextension.groovy @@ -0,0 +1,5 @@ +preprocessor { + document, reader -> + reader.advance() + reader +} diff --git a/gradle-plugin-asciidoctor/src/test/resources/testtreeprocessorextension.groovy b/gradle-plugin-asciidoctor/src/test/resources/testtreeprocessorextension.groovy new file mode 100755 index 0000000..7d99f42 --- /dev/null +++ b/gradle-plugin-asciidoctor/src/test/resources/testtreeprocessorextension.groovy @@ -0,0 +1,15 @@ +treeprocessor { document -> + def blocks = document.blocks() + (0.. 0 && lines[0].startsWith('$')) { + Map attributes = block.attributes + attributes['role'] = 'terminal'; + def resultLines = lines.collect { + it.startsWith('$') ? "${it.substring(2)}".toString() : it + } + blocks[it] = createBlock(document, 'listing', resultLines, attributes, [:]) + } + } +} diff --git a/gradle-plugin-docker/gradle.properties b/gradle-plugin-docker/gradle.properties index b4a7849..f8f5a58 100644 --- a/gradle-plugin-docker/gradle.properties +++ b/gradle-plugin-docker/gradle.properties @@ -1 +1 @@ -version = 2.3.0 +version = 2.4.0 diff --git a/gradle-plugin-git/build.gradle b/gradle-plugin-git/build.gradle index d90f08f..43de1f4 100644 --- a/gradle-plugin-git/build.gradle +++ b/gradle-plugin-git/build.gradle @@ -10,7 +10,7 @@ apply plugin: 'com.gradle.plugin-publish' dependencies { api gradleApi() - api "org.xbib:groovy-git:${project.property('groovy-git.version')}" + api "org.xbib.groovy:groovy-git:${project.property('groovy-git.version')}" testImplementation gradleTestKit() testImplementation "org.spockframework:spock-core:${project.property('spock.version')}" testImplementation "junit:junit:${project.property('junit4.version')}" diff --git a/gradle-plugin-git/gradle.properties b/gradle-plugin-git/gradle.properties index b6262e3..d9455e2 100644 --- a/gradle-plugin-git/gradle.properties +++ b/gradle-plugin-git/gradle.properties @@ -1 +1 @@ -version = 2.1.0 \ No newline at end of file +version = 2.2.0 \ No newline at end of file diff --git a/gradle-plugin-rpm/build.gradle b/gradle-plugin-rpm/build.gradle index 50963d1..5801f91 100644 --- a/gradle-plugin-rpm/build.gradle +++ b/gradle-plugin-rpm/build.gradle @@ -1,13 +1,13 @@ plugins { id 'java-gradle-plugin' - id 'groovy' id 'com.gradle.plugin-publish' version '0.18.0' } -apply plugin: 'groovy' apply plugin: 'java-gradle-plugin' apply plugin: 'com.gradle.plugin-publish' +apply from: rootProject.file('gradle/compile/groovy.gradle') + dependencies { api gradleApi() api "org.xbib:rpm-core:${project.property('rpm.version')}" diff --git a/gradle-plugin-rpm/gradle.properties b/gradle-plugin-rpm/gradle.properties index 5364446..b4a7849 100644 --- a/gradle-plugin-rpm/gradle.properties +++ b/gradle-plugin-rpm/gradle.properties @@ -1 +1 @@ -version = 2.2.0 +version = 2.3.0 diff --git a/gradle.properties b/gradle.properties index 33015e2..bcf7e2b 100644 --- a/gradle.properties +++ b/gradle.properties @@ -3,8 +3,13 @@ name = 'gradle-plugins' version = 0.0.1 org.gradle.warning.mode = ALL -gradle.wrapper.version = 7.3 +gradle.wrapper.version = 7.3.2 +groovy.version = 3.0.9 groovy-git.version = 2.1.0 rpm.version = 2.1.0 spock.version = 2.0-groovy-3.0 +junit.version = 5.8.2 junit4.version = 4.13.2 +asciidoctorj.version = 2.5.2 +jruby.version = 9.3.2.0 +jsoup.version = 1.11.2 diff --git a/gradle/compile/groovy.gradle b/gradle/compile/groovy.gradle index c70f6b9..b48d5cc 100644 --- a/gradle/compile/groovy.gradle +++ b/gradle/compile/groovy.gradle @@ -21,7 +21,13 @@ tasks.withType(GroovyCompile) { } } -task groovydocJar(type: Jar, dependsOn: 'groovydoc') { +task groovydocJar(type: Jar) { + dependsOn groovydoc from groovydoc.destinationDir - archiveClassifier.set('javadoc') + archiveClassifier.set('groovydoc') +} +tasks.assemble.dependsOn(tasks.groovydocJar) + +artifacts { + archives groovydocJar } diff --git a/gradle/compile/java.gradle b/gradle/compile/java.gradle index c9bba7f..7c834af 100644 --- a/gradle/compile/java.gradle +++ b/gradle/compile/java.gradle @@ -21,13 +21,16 @@ jar { } } -task sourcesJar(type: Jar, dependsOn: classes) { +task sourcesJar(type: Jar) { + dependsOn classes classifier 'sources' from sourceSets.main.allSource } -task javadocJar(type: Jar, dependsOn: javadoc) { +task javadocJar(type: Jar) { + dependsOn javadoc classifier 'javadoc' + from javadoc.destinationDir } artifacts { diff --git a/gradle/wrapper/gradle-wrapper.jar b/gradle/wrapper/gradle-wrapper.jar index e708b1c023ec8b20f512888fe07c5bd3ff77bb8f..7454180f2ae8848c63b8b4dea2cb829da983f2fa 100644 GIT binary patch delta 18435 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 B8dv}T delta 17845 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 X49Luk)baa85H9$5YCsTPT`SVRWMtMW diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties index fbce071..ac0b842 100644 --- a/gradle/wrapper/gradle-wrapper.properties +++ b/gradle/wrapper/gradle-wrapper.properties @@ -1,5 +1,5 @@ distributionBase=GRADLE_USER_HOME distributionPath=wrapper/dists -distributionUrl=https\://services.gradle.org/distributions/gradle-7.3-all.zip +distributionUrl=https\://services.gradle.org/distributions/gradle-7.3.2-all.zip zipStoreBase=GRADLE_USER_HOME zipStorePath=wrapper/dists diff --git a/gradlew b/gradlew index 4f906e0..1b6c787 100755 --- a/gradlew +++ b/gradlew @@ -1,7 +1,7 @@ -#!/usr/bin/env sh +#!/bin/sh # -# Copyright 2015 the original author or authors. +# Copyright © 2015-2021 the original authors. # # Licensed under the Apache License, Version 2.0 (the "License"); # you may not use this file except in compliance with the License. @@ -17,67 +17,101 @@ # ############################################################################## -## -## Gradle start up script for UN*X -## +# +# Gradle start up script for POSIX generated by Gradle. +# +# Important for running: +# +# (1) You need a POSIX-compliant shell to run this script. If your /bin/sh is +# noncompliant, but you have some other compliant shell such as ksh or +# bash, then to run this script, type that shell name before the whole +# command line, like: +# +# ksh Gradle +# +# Busybox and similar reduced shells will NOT work, because this script +# requires all of these POSIX shell features: +# * functions; +# * expansions «$var», «${var}», «${var:-default}», «${var+SET}», +# «${var#prefix}», «${var%suffix}», and «$( cmd )»; +# * compound commands having a testable exit status, especially «case»; +# * various built-in commands including «command», «set», and «ulimit». +# +# Important for patching: +# +# (2) This script targets any POSIX shell, so it avoids extensions provided +# by Bash, Ksh, etc; in particular arrays are avoided. +# +# The "traditional" practice of packing multiple parameters into a +# space-separated string is a well documented source of bugs and security +# problems, so this is (mostly) avoided, by progressively accumulating +# options in "$@", and eventually passing that to Java. +# +# Where the inherited environment variables (DEFAULT_JVM_OPTS, JAVA_OPTS, +# and GRADLE_OPTS) rely on word-splitting, this is performed explicitly; +# see the in-line comments for details. +# +# There are tweaks for specific operating systems such as AIX, CygWin, +# Darwin, MinGW, and NonStop. +# +# (3) This script is generated from the Groovy template +# https://github.com/gradle/gradle/blob/master/subprojects/plugins/src/main/resources/org/gradle/api/internal/plugins/unixStartScript.txt +# within the Gradle project. +# +# You can find Gradle at https://github.com/gradle/gradle/. +# ############################################################################## # Attempt to set APP_HOME + # Resolve links: $0 may be a link -PRG="$0" -# Need this for relative symlinks. -while [ -h "$PRG" ] ; do - ls=`ls -ld "$PRG"` - link=`expr "$ls" : '.*-> \(.*\)$'` - if expr "$link" : '/.*' > /dev/null; then - PRG="$link" - else - PRG=`dirname "$PRG"`"/$link" - fi +app_path=$0 + +# Need this for daisy-chained symlinks. +while + APP_HOME=${app_path%"${app_path##*/}"} # leaves a trailing /; empty if no leading path + [ -h "$app_path" ] +do + ls=$( ls -ld "$app_path" ) + link=${ls#*' -> '} + case $link in #( + /*) app_path=$link ;; #( + *) app_path=$APP_HOME$link ;; + esac done -SAVED="`pwd`" -cd "`dirname \"$PRG\"`/" >/dev/null -APP_HOME="`pwd -P`" -cd "$SAVED" >/dev/null + +APP_HOME=$( cd "${APP_HOME:-./}" && pwd -P ) || exit APP_NAME="Gradle" -APP_BASE_NAME=`basename "$0"` +APP_BASE_NAME=${0##*/} # Add default JVM options here. You can also use JAVA_OPTS and GRADLE_OPTS to pass JVM options to this script. DEFAULT_JVM_OPTS='"-Xmx64m" "-Xms64m"' # Use the maximum available, or set MAX_FD != -1 to use that value. -MAX_FD="maximum" +MAX_FD=maximum warn () { echo "$*" -} +} >&2 die () { echo echo "$*" echo exit 1 -} +} >&2 # OS specific support (must be 'true' or 'false'). cygwin=false msys=false darwin=false nonstop=false -case "`uname`" in - CYGWIN* ) - cygwin=true - ;; - Darwin* ) - darwin=true - ;; - MINGW* ) - msys=true - ;; - NONSTOP* ) - nonstop=true - ;; +case "$( uname )" in #( + CYGWIN* ) cygwin=true ;; #( + Darwin* ) darwin=true ;; #( + MSYS* | MINGW* ) msys=true ;; #( + NONSTOP* ) nonstop=true ;; esac CLASSPATH=$APP_HOME/gradle/wrapper/gradle-wrapper.jar @@ -87,9 +121,9 @@ CLASSPATH=$APP_HOME/gradle/wrapper/gradle-wrapper.jar if [ -n "$JAVA_HOME" ] ; then if [ -x "$JAVA_HOME/jre/sh/java" ] ; then # IBM's JDK on AIX uses strange locations for the executables - JAVACMD="$JAVA_HOME/jre/sh/java" + JAVACMD=$JAVA_HOME/jre/sh/java else - JAVACMD="$JAVA_HOME/bin/java" + JAVACMD=$JAVA_HOME/bin/java fi if [ ! -x "$JAVACMD" ] ; then die "ERROR: JAVA_HOME is set to an invalid directory: $JAVA_HOME @@ -98,7 +132,7 @@ Please set the JAVA_HOME variable in your environment to match the location of your Java installation." fi else - JAVACMD="java" + JAVACMD=java which java >/dev/null 2>&1 || die "ERROR: JAVA_HOME is not set and no 'java' command could be found in your PATH. Please set the JAVA_HOME variable in your environment to match the @@ -106,80 +140,95 @@ location of your Java installation." fi # Increase the maximum file descriptors if we can. -if [ "$cygwin" = "false" -a "$darwin" = "false" -a "$nonstop" = "false" ] ; then - MAX_FD_LIMIT=`ulimit -H -n` - if [ $? -eq 0 ] ; then - if [ "$MAX_FD" = "maximum" -o "$MAX_FD" = "max" ] ; then - MAX_FD="$MAX_FD_LIMIT" - fi - ulimit -n $MAX_FD - if [ $? -ne 0 ] ; then - warn "Could not set maximum file descriptor limit: $MAX_FD" - fi - else - warn "Could not query maximum file descriptor limit: $MAX_FD_LIMIT" - fi -fi - -# For Darwin, add options to specify how the application appears in the dock -if $darwin; then - GRADLE_OPTS="$GRADLE_OPTS \"-Xdock:name=$APP_NAME\" \"-Xdock:icon=$APP_HOME/media/gradle.icns\"" -fi - -# For Cygwin or MSYS, switch paths to Windows format before running java -if [ "$cygwin" = "true" -o "$msys" = "true" ] ; then - APP_HOME=`cygpath --path --mixed "$APP_HOME"` - CLASSPATH=`cygpath --path --mixed "$CLASSPATH"` - - JAVACMD=`cygpath --unix "$JAVACMD"` - - # We build the pattern for arguments to be converted via cygpath - ROOTDIRSRAW=`find -L / -maxdepth 1 -mindepth 1 -type d 2>/dev/null` - SEP="" - for dir in $ROOTDIRSRAW ; do - ROOTDIRS="$ROOTDIRS$SEP$dir" - SEP="|" - done - OURCYGPATTERN="(^($ROOTDIRS))" - # Add a user-defined pattern to the cygpath arguments - if [ "$GRADLE_CYGPATTERN" != "" ] ; then - OURCYGPATTERN="$OURCYGPATTERN|($GRADLE_CYGPATTERN)" - fi - # Now convert the arguments - kludge to limit ourselves to /bin/sh - i=0 - for arg in "$@" ; do - CHECK=`echo "$arg"|egrep -c "$OURCYGPATTERN" -` - CHECK2=`echo "$arg"|egrep -c "^-"` ### Determine if an option - - if [ $CHECK -ne 0 ] && [ $CHECK2 -eq 0 ] ; then ### Added a condition - eval `echo args$i`=`cygpath --path --ignore --mixed "$arg"` - else - eval `echo args$i`="\"$arg\"" - fi - i=`expr $i + 1` - done - case $i in - 0) set -- ;; - 1) set -- "$args0" ;; - 2) set -- "$args0" "$args1" ;; - 3) set -- "$args0" "$args1" "$args2" ;; - 4) set -- "$args0" "$args1" "$args2" "$args3" ;; - 5) set -- "$args0" "$args1" "$args2" "$args3" "$args4" ;; - 6) set -- "$args0" "$args1" "$args2" "$args3" "$args4" "$args5" ;; - 7) set -- "$args0" "$args1" "$args2" "$args3" "$args4" "$args5" "$args6" ;; - 8) set -- "$args0" "$args1" "$args2" "$args3" "$args4" "$args5" "$args6" "$args7" ;; - 9) set -- "$args0" "$args1" "$args2" "$args3" "$args4" "$args5" "$args6" "$args7" "$args8" ;; +if ! "$cygwin" && ! "$darwin" && ! "$nonstop" ; then + case $MAX_FD in #( + max*) + MAX_FD=$( ulimit -H -n ) || + warn "Could not query maximum file descriptor limit" + esac + case $MAX_FD in #( + '' | soft) :;; #( + *) + ulimit -n "$MAX_FD" || + warn "Could not set maximum file descriptor limit to $MAX_FD" esac fi -# Escape application args -save () { - for i do printf %s\\n "$i" | sed "s/'/'\\\\''/g;1s/^/'/;\$s/\$/' \\\\/" ; done - echo " " -} -APP_ARGS=`save "$@"` +# Collect all arguments for the java command, stacking in reverse order: +# * args from the command line +# * the main class name +# * -classpath +# * -D...appname settings +# * --module-path (only if needed) +# * DEFAULT_JVM_OPTS, JAVA_OPTS, and GRADLE_OPTS environment variables. -# Collect all arguments for the java command, following the shell quoting and substitution rules -eval set -- $DEFAULT_JVM_OPTS $JAVA_OPTS $GRADLE_OPTS "\"-Dorg.gradle.appname=$APP_BASE_NAME\"" -classpath "\"$CLASSPATH\"" org.gradle.wrapper.GradleWrapperMain "$APP_ARGS" +# For Cygwin or MSYS, switch paths to Windows format before running java +if "$cygwin" || "$msys" ; then + APP_HOME=$( cygpath --path --mixed "$APP_HOME" ) + CLASSPATH=$( cygpath --path --mixed "$CLASSPATH" ) + + JAVACMD=$( cygpath --unix "$JAVACMD" ) + + # Now convert the arguments - kludge to limit ourselves to /bin/sh + for arg do + if + case $arg in #( + -*) false ;; # don't mess with options #( + /?*) t=${arg#/} t=/${t%%/*} # looks like a POSIX filepath + [ -e "$t" ] ;; #( + *) false ;; + esac + then + arg=$( cygpath --path --ignore --mixed "$arg" ) + fi + # Roll the args list around exactly as many times as the number of + # args, so each arg winds up back in the position where it started, but + # possibly modified. + # + # NB: a `for` loop captures its iteration list before it begins, so + # changing the positional parameters here affects neither the number of + # iterations, nor the values presented in `arg`. + shift # remove old arg + set -- "$@" "$arg" # push replacement arg + done +fi + +# Collect all arguments for the java command; +# * $DEFAULT_JVM_OPTS, $JAVA_OPTS, and $GRADLE_OPTS can contain fragments of +# shell script including quotes and variable substitutions, so put them in +# double quotes to make sure that they get re-expanded; and +# * put everything else in single quotes, so that it's not re-expanded. + +set -- \ + "-Dorg.gradle.appname=$APP_BASE_NAME" \ + -classpath "$CLASSPATH" \ + org.gradle.wrapper.GradleWrapperMain \ + "$@" + +# Use "xargs" to parse quoted args. +# +# With -n1 it outputs one arg per line, with the quotes and backslashes removed. +# +# In Bash we could simply go: +# +# readarray ARGS < <( xargs -n1 <<<"$var" ) && +# set -- "${ARGS[@]}" "$@" +# +# but POSIX shell has neither arrays nor command substitution, so instead we +# post-process each arg (as a line of input to sed) to backslash-escape any +# character that might be a shell metacharacter, then use eval to reverse +# that process (while maintaining the separation between arguments), and wrap +# the whole thing up as a single "set" statement. +# +# This will of course break if any of these variables contains a newline or +# an unmatched quote. +# + +eval "set -- $( + printf '%s\n' "$DEFAULT_JVM_OPTS $JAVA_OPTS $GRADLE_OPTS" | + xargs -n1 | + sed ' s~[^-[:alnum:]+,./:=@_]~\\&~g; ' | + tr '\n' ' ' + )" '"$@"' exec "$JAVACMD" "$@" diff --git a/settings.gradle b/settings.gradle index e4f5ffd..210eeaa 100644 --- a/settings.gradle +++ b/settings.gradle @@ -1,3 +1,4 @@ include 'gradle-plugin-git' include 'gradle-plugin-rpm' include 'gradle-plugin-docker' +include 'gradle-plugin-asciidoctor'