Merge pull request asciidoctor#1149 from abelsromero/issue-246-extrac…

…t-cli-into-submodule

CHANGELOG.adoc

@@ -28,6 +28,7 @@ Improvement::
 * Expose `source` and `source_lines` use of deprecated 'numbered' in Document interface (#1145) (@abelsromero)
 * Accept 'null' as valid input (same as empty string) for load and convert String methods (#1148) (@abelsromero)
 * Set Java 11 as the minimal version (#1151) (@abelsromero)
+* Create `asciidoctorj-cli` module to prevent unnecessary dependencies to asciidoctorj jar consumers (#1149)
 
 Bug Fixes::
 

README.adoc

@@ -284,8 +284,13 @@ asciidoctorj::
   Also bundles optional RubyGems needed at runtime, such as coderay, tilt, haml and slim.
   Produces the asciidoctorj jar.
 
+asciidoctorj-cli::
+  `asciidoctorj` command Java components.
+  Produces the asciidoctorj-cli.
+
 asciidoctorj-distribution::
-  Produces the distribution zip that provides the standalone `asciidoctorj` command.
+  Produces the distribution zip that provides the standalone `asciidoctorj` command including Java components,
+  launch scripts and required libraries.
 
 asciidoctorj-arquillian-extension::
   Bundles an Arquillian extension that allows to inject an Asciidoctor instance or other instances commonly used by Asciidoctor tests into a test case.
@@ -310,6 +315,8 @@ asciidoctorj-arquillian-extension/
   build.gradle
 asciidoctorj-api/
   build.gradle
+asciidoctorj-cli/
+  build.gradle
 asciidoctorj-core/
   build.gradle
 asciidoctorj-distribution/

asciidoctorj-cli/build.gradle

@@ -0,0 +1,25 @@
+apply plugin: 'java-library'
+apply plugin: 'biz.aQute.bnd.builder'
+
+dependencies {
+  api project(':asciidoctorj-api')
+  api project(':asciidoctorj')
+  implementation "com.beust:jcommander:$jcommanderVersion"
+
+  testImplementation project(':asciidoctorj-arquillian-extension')
+  testImplementation "org.jsoup:jsoup:$jsoupVersion"
+}
+
+project.ext.publicationName = "mavenAsciidoctorJCli"
+
+apply from: rootProject.file('gradle/publish.gradle')
+apply from: rootProject.file('gradle/signing.gradle')
+
+jar {
+  bnd(
+    ('Bundle-Name'): 'asciidoctorj-cli',
+    ('Bundle-SymbolicName'): 'org.asciidoctor.asciidoctorj-cli',
+    ('Import-Package'): 'com.beust.jcommander;resolution:=optional, *'
+  )
+  metaInf { from "$buildDir/version-info/" }
+}

asciidoctorj-cli/gradle.properties

@@ -0,0 +1,2 @@
+properName=AsciidoctorJ CLI
+description=AsciidoctorJ Command Line Interface

asciidoctorj-core/src/main/java/org/asciidoctor/jruby/cli/AsciidoctorCliOptions.java → asciidoctorj-cli/src/main/java/org/asciidoctor/cli/AsciidoctorCliOptions.java

@@ -1,4 +1,4 @@
-package org.asciidoctor.jruby.cli;
+package org.asciidoctor.cli;
 
 import com.beust.jcommander.Parameter;
 import org.asciidoctor.*;
@@ -116,7 +116,9 @@ public boolean isQuiet() {
         return quiet;
     }
 
-    public Severity getFailureLevel() { return failureLevel; }
+    public Severity getFailureLevel() {
+        return failureLevel;
+    }
 
     public boolean isRequire() {
         return this.require != null && this.require.size() > 0;

asciidoctorj-cli/src/main/java/org/asciidoctor/cli/DocTypeEnum.java

@@ -0,0 +1,7 @@
+package org.asciidoctor.cli;
+
+public enum DocTypeEnum {
+
+    article, book, inline
+
+}

asciidoctorj-core/src/main/java/org/asciidoctor/jruby/cli/MaxSeverityLogHandler.java → asciidoctorj-cli/src/main/java/org/asciidoctor/cli/MaxSeverityLogHandler.java

@@ -1,10 +1,11 @@
-package org.asciidoctor.jruby.cli;
+package org.asciidoctor.cli;
 
 import org.asciidoctor.log.LogHandler;
 import org.asciidoctor.log.LogRecord;
 import org.asciidoctor.log.Severity;
 
 public class MaxSeverityLogHandler implements LogHandler {
+
     private Severity maxSeverity = Severity.DEBUG;
 
     @Override

asciidoctorj-core/src/main/java/org/asciidoctor/jruby/cli/SafeModeConverter.java → asciidoctorj-cli/src/main/java/org/asciidoctor/cli/SafeModeConverter.java

@@ -1,8 +1,7 @@
-package org.asciidoctor.jruby.cli;
-
-import org.asciidoctor.SafeMode;
+package org.asciidoctor.cli;
 
 import com.beust.jcommander.IStringConverter;
+import org.asciidoctor.SafeMode;
 
 public class SafeModeConverter implements IStringConverter<SafeMode> {
 

asciidoctorj-core/src/main/java/org/asciidoctor/jruby/cli/SeverityConverter.java → asciidoctorj-cli/src/main/java/org/asciidoctor/cli/SeverityConverter.java

@@ -1,4 +1,4 @@
-package org.asciidoctor.jruby.cli;
+package org.asciidoctor.cli;
 
 import com.beust.jcommander.converters.EnumConverter;
 import org.asciidoctor.log.Severity;

asciidoctorj-core/src/main/java/org/asciidoctor/jruby/cli/AsciidoctorInvoker.java → asciidoctorj-cli/src/main/java/org/asciidoctor/cli/jruby/AsciidoctorInvoker.java

@@ -1,8 +1,10 @@
-package org.asciidoctor.jruby.cli;
+package org.asciidoctor.cli.jruby;
 
 import com.beust.jcommander.JCommander;
 import org.asciidoctor.Asciidoctor;
 import org.asciidoctor.Options;
+import org.asciidoctor.cli.AsciidoctorCliOptions;
+import org.asciidoctor.cli.MaxSeverityLogHandler;
 import org.asciidoctor.jruby.DirectoryWalker;
 import org.asciidoctor.jruby.GlobDirectoryWalker;
 import org.asciidoctor.jruby.internal.IOUtils;
@@ -20,7 +22,7 @@
 import java.util.*;
 import java.util.stream.Collectors;
 
-import static org.asciidoctor.jruby.cli.AsciidoctorCliOptions.TIMINGS_OPTION_NAME;
+import static org.asciidoctor.cli.AsciidoctorCliOptions.TIMINGS_OPTION_NAME;
 
 public class AsciidoctorInvoker {
 

asciidoctorj-core/src/test/java/org/asciidoctor/jruby/cli/WhenAsciidoctorAPICallIsCalled.java → asciidoctorj-cli/src/test/java/org/asciidoctor/cli/WhenAsciidoctorAPICallIsCalled.java

@@ -1,7 +1,10 @@
-package org.asciidoctor.jruby.cli;
+package org.asciidoctor.cli;
 
 import com.beust.jcommander.JCommander;
-import org.asciidoctor.*;
+import org.asciidoctor.Attributes;
+import org.asciidoctor.Options;
+import org.asciidoctor.OptionsBuilder;
+import org.asciidoctor.SafeMode;
 import org.asciidoctor.jruby.internal.AsciidoctorUtils;
 import org.junit.Test;
 
@@ -50,7 +53,6 @@ public void api_parameters_should_be_transformed_to_cli_command() {
         assertThat(asciidoctorCliOptions.getAttributes(), hasEntry("myAtribute", "myValue"));
         assertThat(asciidoctorCliOptions.getAttributes(), hasKey("sectnums"));
         assertThat(asciidoctorCliOptions.getAttributes(), hasKey("copycss!"));
-
     }
 
 }