Add main for diktat.jar

diktat-maven-plugin/src/main/kotlin/org/cqfn/diktat/plugin/maven/DiktatBaseMojo.kt

@@ -5,7 +5,6 @@
 package org.cqfn.diktat.plugin.maven
 
 import org.cqfn.diktat.DiktatProcessCommand
-import org.cqfn.diktat.api.DiktatLogLevel
 import org.cqfn.diktat.ktlint.unwrap
 
 import com.pinterest.ktlint.core.LintError
@@ -27,6 +26,7 @@ import org.apache.maven.plugin.MojoExecutionException
 import org.apache.maven.plugin.MojoFailureException
 import org.apache.maven.plugins.annotations.Parameter
 import org.apache.maven.project.MavenProject
+import org.slf4j.event.Level
 
 import java.io.File
 import java.io.FileOutputStream
@@ -250,7 +250,7 @@ abstract class DiktatBaseMojo : AbstractMojo() {
                 }
             }
             .logLevel(
-                if (debug) DiktatLogLevel.DEBUG else DiktatLogLevel.INFO
+                if (debug) Level.DEBUG else Level.INFO
             )
             .build()
         runAction(command)

diktat-rules/pom.xml

@@ -126,21 +126,36 @@
                 <groupId>org.codehaus.mojo</groupId>
                 <artifactId>exec-maven-plugin</artifactId>
                 <executions>
+                    <execution>
+                        <id>generate-constants</id>
+                        <phase>generate-sources</phase>
+                        <goals>
+                            <goal>java</goal>
+                        </goals>
+                        <configuration>
+                            <mainClass>org.cqfn.diktat.ruleset.generation.GenerationConstantsKt</mainClass>
+                            <arguments>
+                                <argument>${project.build.outputDirectory}</argument>
+                                <argument>${project.version}</argument>
+                                <argument>${project.basedir}/../LICENSE</argument>
+                            </arguments>
+                        </configuration>
+                    </execution>
                     <execution>
                         <id>generate-warnings</id>
                         <phase>generate-test-sources</phase>
                         <goals>
                             <goal>java</goal>
                         </goals>
+                        <configuration>
+                            <mainClass>org.cqfn.diktat.ruleset.generation.GenerationKt</mainClass>
+                            <arguments>
+                                <argument>${project.build.sourceDirectory}</argument>
+                                <argument>${project.basedir}/src/test/resources</argument>
+                            </arguments>
+                        </configuration>
                     </execution>
                 </executions>
-                <configuration>
-                    <mainClass>org.cqfn.diktat.ruleset.generation.GenerationKt</mainClass>
-                    <arguments>
-                        <argument>${project.build.sourceDirectory}</argument>
-                        <argument>${project.basedir}/src/test/resources</argument>
-                    </arguments>
-                </configuration>
             </plugin>
 
             <plugin>

diktat-rules/src/main/kotlin/generated/WarningNames.kt

@@ -1,5 +1,5 @@
-//  This document was auto generated, please don't modify it.
-//  This document contains all enum properties from Warnings.kt as Strings.
+// | This document was auto generated, please don't modify it.
+// | This document contains all enum properties from Warnings.kt as Strings.
 package generated
 
 import kotlin.String

diktat-rules/src/main/kotlin/org/cqfn/diktat/ruleset/generation/Generation.kt

@@ -25,15 +25,11 @@ import kotlin.io.path.writeLines
 /**
  * The comment that will be added to the generated sources file.
  */
-private val autoGenerationComment =
-    """
-        | This document was auto generated, please don't modify it.
-        | This document contains all enum properties from Warnings.kt as Strings.
-    """.trimMargin()
+internal const val autoGenerationComment = "This document was auto generated, please don't modify it."
 
 fun main(args: Array<String>) {
     require(args.size == 2) {
-        "Only two arguments are expected: <source root> <test resource root>"
+        "Only four arguments are expected: <source root> <test resource root>"
     }
     generateWarningNames(args[0])
     validateYear(args[1])
@@ -59,7 +55,10 @@ private fun generateWarningNames(sourceDirectory: String) {
         .builder("generated", "WarningNames")
         .addType(fileBody)
         .indent("    ")
-        .addFileComment(autoGenerationComment)
+        .addFileComment("""
+            | $autoGenerationComment
+            | This document contains all enum properties from Warnings.kt as Strings.
+        """.trimIndent())
         .build()
 
     kotlinFile.writeTo(Paths.get(sourceDirectory))

diktat-rules/src/main/kotlin/org/cqfn/diktat/ruleset/generation/GenerationConstants.kt

@@ -0,0 +1,51 @@
+/**
+ * This file contains code for codegen: generating a file with diktat constants
+ */
+
+package org.cqfn.diktat.ruleset.generation
+
+import com.squareup.kotlinpoet.FileSpec
+import com.squareup.kotlinpoet.KModifier
+import com.squareup.kotlinpoet.PropertySpec
+
+import java.nio.file.Paths
+
+import kotlin.io.path.readText
+
+
+fun main(args: Array<String>) {
+    require(args.size == 3) {
+        "Only four arguments are expected: <source root> <diktat version> <license file>"
+    }
+    generateDiktatConstants(args[0], args[1], args[2])
+}
+
+private fun generateDiktatConstants(
+    sourceDirectory: String,
+    version: String,
+    licenseFile: String,
+) {
+    FileSpec
+        .builder("generated", "DiktatConstants")
+        .addProperty(
+            PropertySpec.builder("DIKTAT_VERSION", String::class)
+                .addModifiers(KModifier.CONST)
+                .addModifiers(KModifier.INTERNAL)
+                .initializer("%S", version)
+                .build()
+        )
+        .addProperty(
+            PropertySpec.builder("LICENSE", String::class)
+                .addModifiers(KModifier.CONST)
+                .addModifiers(KModifier.INTERNAL)
+                .initializer("%S", Paths.get(licenseFile).readText())
+                .build()
+        )
+        .indent("    ")
+        .addFileComment("""
+            | $autoGenerationComment.
+            | This document contains diktat constants.
+        """.trimMargin())
+        .build()
+        .writeTo(Paths.get(sourceDirectory))
+}

diktat-ruleset/pom.xml → diktat/pom.xml

@@ -3,7 +3,7 @@
          xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 https://maven.apache.org/xsd/maven-4.0.0.xsd">
     <modelVersion>4.0.0</modelVersion>
     <artifactId>diktat</artifactId>
-    <description>This module builds jar that can be used to run diktat using ktlint -R via command line</description>
+    <description>This module builds jar that can be used to run diktat using java -jar via command line</description>
 
     <parent>
         <groupId>org.cqfn.diktat</groupId>
@@ -17,58 +17,48 @@
             <groupId>org.cqfn.diktat</groupId>
             <artifactId>diktat-rules</artifactId>
             <version>${project.version}</version>
-            <exclusions>
-                <!-- Kotlin runtime & libraries will be provided by ktlint executable -->
-                <!-- FIXME: should be removed after making diktat.jar as executable -->
-                <exclusion>
-                    <groupId>org.jetbrains.kotlin</groupId>
-                    <artifactId>kotlin-stdlib-common</artifactId>
-                </exclusion>
-                <exclusion>
-                    <groupId>org.jetbrains.kotlin</groupId>
-                    <artifactId>kotlin-stdlib-jdk8</artifactId>
-                </exclusion>
-                <exclusion>
-                    <groupId>org.jetbrains.kotlin</groupId>
-                    <artifactId>kotlin-stdlib</artifactId>
-                </exclusion>
-                <exclusion>
-                    <groupId>org.jetbrains.kotlin</groupId>
-                    <artifactId>kotlin-compiler-embeddable</artifactId>
-                </exclusion>
-            </exclusions>
         </dependency>
-
         <dependency>
-            <groupId>org.cqfn.diktat</groupId>
-            <artifactId>diktat-test-framework</artifactId>
-            <version>${project.version}</version>
-            <scope>test</scope>
+            <groupId>org.apache.logging.log4j</groupId>
+            <artifactId>log4j-slf4j-impl</artifactId>
+        </dependency>
+        <dependency>
+            <groupId>org.apache.logging.log4j</groupId>
+            <artifactId>log4j-core</artifactId>
+            <version>2.19.0</version>
+        </dependency>
+        <!-- start: reporters -->
+        <dependency>
+            <groupId>com.pinterest.ktlint</groupId>
+            <artifactId>ktlint-reporter-plain</artifactId>
+        </dependency>
+        <dependency>
+            <groupId>com.pinterest.ktlint</groupId>
+            <artifactId>ktlint-reporter-json</artifactId>
         </dependency>
         <dependency>
-            <groupId>org.jetbrains.kotlin</groupId>
-            <artifactId>kotlin-stdlib-common</artifactId>
-            <scope>provided</scope>
+            <groupId>com.pinterest.ktlint</groupId>
+            <artifactId>ktlint-reporter-sarif</artifactId>
         </dependency>
         <dependency>
-            <groupId>org.jetbrains.kotlin</groupId>
-            <artifactId>kotlin-stdlib-jdk7</artifactId>
-            <scope>provided</scope>
+            <groupId>com.pinterest.ktlint</groupId>
+            <artifactId>ktlint-reporter-checkstyle</artifactId>
         </dependency>
         <dependency>
-            <groupId>org.jetbrains.kotlin</groupId>
-            <artifactId>kotlin-stdlib-jdk8</artifactId>
-            <scope>provided</scope>
+            <groupId>com.pinterest.ktlint</groupId>
+            <artifactId>ktlint-reporter-html</artifactId>
         </dependency>
+        <!-- end: reporters -->
         <dependency>
-            <groupId>org.jetbrains.kotlin</groupId>
-            <artifactId>kotlin-stdlib</artifactId>
-            <scope>provided</scope>
+            <groupId>org.jetbrains.kotlinx</groupId>
+            <artifactId>kotlinx-cli-jvm</artifactId>
         </dependency>
+
         <dependency>
-            <groupId>org.jetbrains.kotlin</groupId>
-            <artifactId>kotlin-compiler-embeddable</artifactId>
-            <scope>provided</scope>
+            <groupId>org.cqfn.diktat</groupId>
+            <artifactId>diktat-test-framework</artifactId>
+            <version>${project.version}</version>
+            <scope>test</scope>
         </dependency>
         <dependency>
             <groupId>org.junit.jupiter</groupId>
@@ -93,44 +83,26 @@
     </dependencies>
 
     <build>
+        <sourceDirectory>${project.basedir}/src/main/kotlin</sourceDirectory>
         <testSourceDirectory>${project.basedir}/src/test/kotlin</testSourceDirectory>
+        <resources>
+            <resource>
+                <directory>src/main/resources/META-INF</directory>
+                <includes>
+                    <include>version</include>
+                </includes>
+                <targetPath>/META-INF/diktat</targetPath>
+                <filtering>true</filtering>
+            </resource>
+            <resource>
+                <directory>${project.basedir}/..</directory>
+                <includes>
+                    <include>LICENSE</include>
+                </includes>
+                <targetPath>/META-INF/diktat</targetPath>
+            </resource>
+        </resources>
         <plugins>
-            <plugin>
-                <groupId>org.jetbrains.kotlin</groupId>
-                <artifactId>kotlin-maven-plugin</artifactId>
-                <executions>
-                    <execution>
-                        <id>compile</id>
-                        <phase>process-sources</phase>
-                        <goals>
-                            <goal>compile</goal>
-                        </goals>
-                        <configuration>
-                            <sourceDirs>
-                                <source>src/main/java</source>
-                                <source>src/main/kotlin</source>
-                                <source>src/main/resources</source>
-                            </sourceDirs>
-                        </configuration>
-                    </execution>
-                    <execution>
-                        <id>test-compile</id>
-                        <phase>process-test-sources</phase>
-                        <goals>
-                            <goal>test-compile</goal>
-                        </goals>
-                        <configuration>
-                            <sourceDirs>
-                                <!-- For some weird reason if main sourceset is removed from here, syntax highlighting in idea an ability to launch tests is broken -->
-                                <source>src/main/kotlin</source>
-                                <source>src/test/kotlin</source>
-                                <source>${project.basedir}/src/main/kotlin</source>
-                                <source>${project.basedir}/src/test/kotlin</source>
-                            </sourceDirs>
-                        </configuration>
-                    </execution>
-                </executions>
-            </plugin>
             <plugin>
                 <!-- Build fat jar, overriding the primary jar -->
                 <groupId>org.apache.maven.plugins</groupId>
@@ -142,6 +114,9 @@
                     <finalName>diktat-${project.version}</finalName>
                     <appendAssemblyId>false</appendAssemblyId>
                     <archive>
+                        <manifest>
+                            <mainClass>org.cqfn.diktat.DiktatMainKt</mainClass>
+                        </manifest>
                         <manifestEntries>
                             <Multi-Release>true</Multi-Release>
                         </manifestEntries>

diktat/src/main/kotlin/org/cqfn/diktat/DiktatMain.kt

@@ -0,0 +1,52 @@
+package org.cqfn.diktat
+
+import org.cqfn.diktat.api.DiktatError
+import org.cqfn.diktat.api.DiktatMode
+import org.cqfn.diktat.cli.DiktatProperties
+import org.cqfn.diktat.ktlint.unwrap
+import java.nio.file.Files
+import java.nio.file.Paths
+import kotlin.io.path.absolutePathString
+import kotlin.io.path.extension
+
+fun main(args: Array<String>) {
+    val properties = DiktatProperties.parse(args)
+    properties.configureLogger()
+
+    val reporter = properties.reporter()
+    reporter.beforeAll()
+
+    val currentFolder = Paths.get(".")
+    properties.patterns
+        .asSequence()
+        .flatMap { pattern ->
+            Files.newDirectoryStream(currentFolder, pattern).asSequence()
+        }
+        .map { file ->
+            val result = mutableListOf<Pair<DiktatError, Boolean>>()
+            DiktatProcessCommand.Builder()
+                .file(file)
+                .config(properties.config)
+                .callback { error, isCorrected ->
+                    result.add(error to isCorrected)
+                }
+                .isScript(!file.extension.endsWith(".kt", ignoreCase = true))
+                .logLevel(properties.logLevel)
+                .build()
+                .let { command ->
+                    when (properties.mode) {
+                        DiktatMode.CHECK -> command.check()
+                        DiktatMode.FIX -> command.check()
+                    }
+                }
+            file to result
+        }
+        .forEach { (file, result) ->
+            reporter.before(file.absolutePathString())
+            result.forEach { (error, isCorrected) ->
+                reporter.onLintError(file.absolutePathString(), error.unwrap(), isCorrected)
+            }
+            reporter.after(file.absolutePathString())
+        }
+    reporter.afterAll()
+}