Add application plugin for distribution

build.gradle

@@ -1,3 +1,6 @@
+apply plugin: 'application'
+mainClassName = "nk.patchsets.git.general.Bunch"
+
 buildscript {
     ext.kotlin_version = '1.2.30'
     ext.kotlin_target = '1.8'
@@ -13,7 +16,7 @@ buildscript {
 
 allprojects {
     group 'nk'
-    version '0.1-SNAPSHOT'
+    version '0.0.1'
 
     ext.applyKotlin = {
         apply plugin: 'kotlin'

settings.gradle

@@ -1,2 +1,2 @@
-rootProject.name = 'patchsets'
+rootProject.name = 'bunch'
 

src/main/kotlin/nk/patchsets/git/general.kt

@@ -0,0 +1,35 @@
+@file:Suppress("PackageDirectoryMismatch")
+@file:JvmName("Bunch")
+
+package nk.patchsets.git.general
+
+import nk.patchsets.git.cp.cherryPick
+import nk.patchsets.git.restore.restore
+
+fun main(args: Array<String>) {
+    if (args.isEmpty()) {
+        System.err.println("""
+            Usage: cp|restore <args>
+
+            cp - for commits cherry pick
+            restore - for restore branch state
+
+            Example:
+            <program> restore C:/Projects/kotlin 173->172->171->as30
+            """.trimIndent())
+
+        return
+    }
+
+    val command = args[0]
+    val commandArgs = args.sliceArray(1..args.size)
+
+    when (command) {
+        "cp" -> cherryPick(commandArgs)
+        "restore" -> restore(commandArgs)
+        else -> {
+            System.err.println("Unknown command: $command")
+            return
+        }
+    }
+}

src/main/kotlin/nk/patchsets/git/patch-cherry-pick.kt

@@ -1,5 +1,5 @@
 @file:Suppress("PackageDirectoryMismatch")
-@file:JvmName("PatchCherryPick")
+@file:JvmName("BunchCherryPick")
 
 package nk.patchsets.git.cp
 
@@ -28,6 +28,10 @@ private val kotlinSettings = Settings(
 )
 
 fun main(args: Array<String>) {
+    cherryPick(args)
+}
+
+fun cherryPick(args: Array<String>) {
     if (args.size != 4) {
         System.err.println("""
             Usage: <git-path> <since-ref> <until-ref> <suffix>
@@ -45,7 +49,7 @@ fun main(args: Array<String>) {
     }
 
     val settings = Settings(args[0], args[1], args[2], args[3])
-    with (settings) {
+    with(settings) {
         val commits = readCommits(gitPath, branch, untilHash)
 
         for (commit in commits.reversed()) {

src/main/kotlin/nk/patchsets/git/restore-branch.kt

@@ -1,5 +1,5 @@
 @file:Suppress("PackageDirectoryMismatch")
-@file:JvmName("PatchRestore")
+@file:JvmName("BunchRestore")
 
 package nk.patchsets.git.restore
 
@@ -21,6 +21,10 @@ val kotlinSettings = Settings(
 )
 
 fun main(args: Array<String>) {
+    restore(args)
+}
+
+fun restore(args: Array<String>) {
     if (args.size != 3 && args.size != 2) {
         System.err.println("""
             Usage: <git-path> <branches-rule> <commit-title>?
@@ -39,7 +43,7 @@ fun main(args: Array<String>) {
 
     val settings = Settings(
             repoPath = args[0],
-            rule = args[2],
+            rule = args[1],
             commitTitle = args.getOrElse(2, { "==== switch ====" })
     )
 
@@ -59,7 +63,7 @@ fun main(args: Array<String>) {
     val affectedOriginFiles: Set<File> = root
             .walkTopDown()
             .filter { child -> child.extension in donorExtensionsPrioritized }
-            .mapTo(HashSet(), { child -> File(child.parentFile, child.nameWithoutExtension)})
+            .mapTo(HashSet(), { child -> File(child.parentFile, child.nameWithoutExtension) })
 
     for (originFile in affectedOriginFiles) {
         val originFileModificationType: ChangeType