compile fixes

0.4.0

CHANGELOG.md

@@ -1,5 +1,47 @@
 # Changelog
 
+## 0.4.1
+
+* Versions:
+  * `Coroutines`: `1.4.1` -> `1.4.2`
+  * `Klock`: `2.0.0` -> `2.0.1`
+* `CronDateTimeScheduler` now is public
+* New functions for `CronDateTimeScheduler`
+* Add `CollectionKronScheduler`. It will give opportunity to unite several schedulers in one
+
+## 0.4.0
+
+**BREAKING CHANGES**
+Package of project has been changed. Migration:
+
+* Replace in your dependencies `com.insanusmokrassar:krontab` by `dev.inmo:krontab`
+* Replace in your project all imports `com.insanusmokrassar.krontab` by `dev.inmo.krontab`
+
+* Versions:
+    * `Kotlin`: `1.4.10` -> `1.4.20`
+    * `Klock`: `1.12.1` -> `2.0.0`
+
+## 0.3.3
+
+* Versions:
+    * `Coroutines`: `1.3.9` -> `1.4.1`
+
+## 0.3.2
+
+* Function `TimeBuilder#each` was added (works as `at`)
+* Add opportunity to use `first` shortcuts:
+    * Value property `TimeBuilder#first` for including via functions like `TimeBuilder#at`
+    * Shortcut for kron string format `f` or `F`
+* Add opportunity to use `last` shortcuts:
+    * Value property `TimeBuilder#last` for including via functions like `TimeBuilder#at`
+    * Shortcut for kron string format `l` or `L`
+
+## 0.3.1
+
+* Versions:
+    * `Kotlin`: `1.4.0` -> `1.4.10`
+    * `Klock`: `1.12.0` -> `1.12.1`
+
 ## 0.3.0
 
 * Versions:
@@ -9,19 +51,6 @@
 * Typealias `KrontabTemplate` was added
 * Extension `KrontabTemplate#toSchedule` was added
 
-### 0.3.1
-
-* Versions:
-    * `Kotlin`: `1.4.0` -> `1.4.10`
-    * `Klock`: `1.12.0` -> `1.12.1`
-
-## 0.2.0
-
-* Updated way of publishing (for more info look at the [git](https://git.insanusmokrassar.com/InsanusMokrassar/krontab))
-* Updates in libraries:
-    * Coroutines `1.3.2` -> `1.3.3`
-    * Klock `1.7.3` -> `1.8.6`
-
 ### 0.2.4
 
 * Updates in libraries:
@@ -29,7 +58,7 @@
     * Coroutines `1.3.7` -> `1.3.8`
 * Ranges support were included. Now it is possible to correctly use syntax `0-5` in strings schedules
 
-### 0.2.3
+## 0.2.3
 
 * Updates in libraries:
     * Kotlin `1.3.70` -> `1.3.72`
@@ -41,13 +70,20 @@
     * `KronScheduler#doWhile` was rewritten to use `KronScheduler#doOnce` for calculations of `block` result
 * New `buildSchedule(String)` function as a shortcut for `createSimpleScheduler(String)`
 
-### 0.2.2
+## 0.2.2
 
 * Updates in libraries:
     * Kotlin `1.3.61` -> `1.3.70`
     * Coroutines `1.3.3` -> `1.3.5`
     * Klock `1.8.6` -> `1.10.0`
 
-### 0.2.1
+## 0.2.1
 
 * Added support of flows: now any `KronScheduler` can be convert to `Flow<DateTime>` using `asFlow` extension
+
+## 0.2.0
+
+* Updated way of publishing (for more info look at the [git](https://git.insanusmokrassar.com/InsanusMokrassar/krontab))
+* Updates in libraries:
+    * Coroutines `1.3.2` -> `1.3.3`
+    * Klock `1.7.3` -> `1.8.6`

README.md

@@ -1,7 +1,7 @@
 # krontab
 
- [ ![Download](https://api.bintray.com/packages/insanusmokrassar/InsanusMokrassar/krontab/images/download.svg) ](https://bintray.com/insanusmokrassar/InsanusMokrassar/krontab/_latestVersion)
- [![Maven Central](https://maven-badges.herokuapp.com/maven-central/com.insanusmokrassar/krontab/badge.svg)](https://maven-badges.herokuapp.com/maven-central/com.insanusmokrassar/krontab)
+ [ ![Download](https://api.bintray.com/packages/insanusmokrassar/InsanusMokrassar/krontab-mpp/images/download.svg) ](https://bintray.com/insanusmokrassar/InsanusMokrassar/krontab-mpp/_latestVersion)
+ [![Maven Central](https://maven-badges.herokuapp.com/maven-central/dev.inmo/krontab/badge.svg)](https://maven-badges.herokuapp.com/maven-central/dev.inmo/krontab)
  [![Build Status](https://travis-ci.com/InsanusMokrassar/krontab.svg?branch=master)](https://travis-ci.com/InsanusMokrassar/krontab)
  
 Library was created to give oppotunity to launch some things from time to time according to some schedule in
@@ -39,12 +39,12 @@ If you want to include `krontab` in your project, just add next line to your
 dependencies part:
 
 ```groovy
-implementation "com.insanusmokrassar:krontab:$krontab_version"
+implementation "dev.inmo:krontab:$krontab_version"
 ```
 
 Next version is the latest currently for the library:
 
-[ ![Download](https://api.bintray.com/packages/insanusmokrassar/InsanusMokrassar/krontab/images/download.svg) ](https://bintray.com/insanusmokrassar/InsanusMokrassar/krontab/_latestVersion)
+[ ![Download](https://api.bintray.com/packages/insanusmokrassar/InsanusMokrassar/krontab-mpp/images/download.svg) ](https://bintray.com/insanusmokrassar/InsanusMokrassar/krontab-mpp/_latestVersion)
 
 For old version of Gradle, instead of `implementation` word developers must use `compile`.
 

build.gradle

@@ -7,7 +7,6 @@ buildscript {
 
     dependencies {
         classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:$kotlin_version"
-        classpath "com.jfrog.bintray.gradle:gradle-bintray-plugin:$gradle_bintray_plugin_version"
         classpath "com.github.breadmoirai:github-release:$github_release_plugin_version"
     }
 }
@@ -17,8 +16,8 @@ plugins {
     id "org.jetbrains.dokka" version "$dokka_version"
 }
 
-project.version = "0.3.1"
-project.group = "com.insanusmokrassar"
+project.version = "0.4.1"
+project.group = "dev.inmo"
 
 apply from: "publish.gradle"
 apply from: "github_release.gradle"
@@ -55,16 +54,12 @@ kotlin {
                 implementation kotlin('test-annotations-common')
             }
         }
-        jvmMain {
-            dependencies {
-            }
-        }
         jvmTest {
             dependencies {
                 implementation kotlin('test-junit')
             }
         }
-        jsMain {
+        jsTest {
             dependencies {
                 implementation kotlin('test-js')
             }

dokka.gradle

@@ -1,6 +1,4 @@
-dokka {
-    outputFormat = 'html'
-
+dokkaHtml {
     switch (true) {
         case project.hasProperty("DOKKA_PATH"):
             outputDirectory = project.property("DOKKA_PATH").toString()
@@ -10,33 +8,30 @@ dokka {
             break
     }
 
-    multiplatform {
-        global {
-            perPackageOption {
-                prefix = "com.insanusmokrassar"
-                skipDeprecated = true
-                includeNonPublic = true
-                reportUndocumented = true
-            }
+    dokkaSourceSets {
+        configureEach {
+            skipDeprecated.set(true)
+            includeNonPublic.set(true)
+            reportUndocumented.set(true)
 
             sourceLink {
-                path = "./"
-                url = "https://github.com/InsanusMokrassar/krontab/blob/master/"
-                lineSuffix = "#L"
+                localDirectory.set(file("./"))
+                remoteUrl.set(new URL("https://github.com/InsanusMokrassar/krontab/blob/master/"))
+                remoteLineSuffix.set("#L")
             }
         }
 
-        common {
-            targets = ["JVM", "JS"]
+        named("commonMain") {
             sourceRoot { path = "src/commonMain" }
         }
-        js {
-            targets = ["JS"]
-            sourceRoot { path = "src/jsMain" }
-        }
-        jvm {
-            targets = ["JVM"]
-            sourceRoot { path = "src/jvmMain" }
-        }
+
+//
+//        named("jsMain") {
+//            sourceRoot { path = "src/jsMain" }
+//        }
+//
+//        named("jvmMain") {
+//            sourceRoot { path = "src/jvmMain" }
+//        }
     }
 }

github_release.gradle

@@ -1,9 +1,11 @@
-private String getCurrentVersionChangelog() {
+private String getCurrentVersionChangelog(String version) {
     OutputStream changelogDataOS = new ByteArrayOutputStream()
     exec {
-        standardOutput = changelogDataOS
         commandLine 'chmod', "+x", './changelog_parser.sh'
-        commandLine './changelog_parser.sh', "$library_version", 'CHANGELOG.md'
+    }
+    exec {
+        standardOutput = changelogDataOS
+        commandLine './changelog_parser.sh', "$version", 'CHANGELOG.md'
     }
 
     return changelogDataOS.toString().trim()
@@ -23,6 +25,6 @@ if (new File(projectDir, "secret.gradle").exists()) {
         releaseName "${project.version}"
         targetCommitish "${project.version}"
 
-        body getCurrentVersionChangelog()
+        body getCurrentVersionChangelog("${project.version}")
     }
 }

gradle.properties

@@ -1,13 +1,17 @@
 kotlin.code.style=official
-kotlin_version=1.4.10
-kotlin_coroutines_version=1.3.9
+org.gradle.parallel=true
+kotlin.js.generate.externals=true
+kotlin.incremental=true
+kotlin.incremental.js=true
+kotlin.incremental.multiplatform=true
 
-dokka_version=0.10.1
 
-gradle_bintray_plugin_version=1.8.5
+kotlin_version=1.4.20
+kotlin_coroutines_version=1.4.2
 
-klockVersion=1.12.1
+dokka_version=1.4.20
+
+klockVersion=2.0.1
 
 github_release_plugin_version=2.2.12
 
-kotlin.incremental.multiplatform=true

gradle/wrapper/gradle-wrapper.properties

@@ -3,4 +3,4 @@ distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-6.5.1-bin.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-6.7.1-bin.zip

maven.publish.gradle

@@ -1,53 +0,0 @@
-apply plugin: 'maven-publish'
-
-task javadocsJar(type: Jar) {
-    classifier = 'javadoc'
-}
-
-afterEvaluate {
-    project.publishing.publications.all {
-        // rename artifacts
-        groupId "${project.group}"
-        if (it.name.contains('kotlinMultiplatform')) {
-            artifactId = "${project.name}"
-        } else {
-            artifactId = "${project.name}-$name"
-        }
-    }
-}
-
-publishing {
-    publications.all {
-        artifact javadocsJar
-
-        pom {
-            description = "It is an analog of crontab util for Kotlin Coroutines"
-            name = "Krontab"
-            url = "https://git.insanusmokrassar.com/InsanusMokrassar/krontab"
-
-            scm {
-                developerConnection = "scm:git:[fetch=]https://git.insanusmokrassar.com:8322/InsanusMokrassar/krontab.git[push=]https://git.insanusmokrassar.com:8322/InsanusMokrassar/krontab.git"
-                url = "https://git.insanusmokrassar.com:8322/InsanusMokrassar/krontab.git"
-            }
-
-            developers {
-                
-                    developer {
-                        id = "InsanusMokrassar"
-                        name = "Ovsiannikov Aleksei"
-                        email = "ovsyannikov.alexey95@gmail.com"
-                    }
-                
-            }
-
-            licenses {
-                
-                    license {
-                        name = "Apache Software License 2.0"
-                        url = "https://git.insanusmokrassar.com/InsanusMokrassar/krontab/src/master/LICENSE"
-                    }
-                
-            }
-        }
-    }
-}

mpp_config.kpsb

@@ -1 +1 @@
-{"bintrayConfig":{"repo":"InsanusMokrassar","packageName":"${project.name}-mpp","packageVcs":"https://git.insanusmokrassar.com/InsanusMokrassar/krontab","autoPublish":true,"overridePublish":true},"licenses":[{"id":"Apache-2.0","title":"Apache Software License 2.0","url":"https://git.insanusmokrassar.com/InsanusMokrassar/krontab/src/master/LICENSE"}],"mavenConfig":{"name":"Krontab","description":"It is an analog of crontab util for Kotlin Coroutines","url":"https://git.insanusmokrassar.com/InsanusMokrassar/krontab","vcsUrl":"https://git.insanusmokrassar.com:8322/InsanusMokrassar/krontab.git","developers":[{"id":"InsanusMokrassar","name":"Ovsiannikov Aleksei","eMail":"ovsyannikov.alexey95@gmail.com"}]},"type":"Multiplatform"}
+{"bintrayConfig":{"repo":"InsanusMokrassar","packageName":"${project.name}-mpp","packageVcs":"https://git.insanusmokrassar.com/InsanusMokrassar/krontab","autoPublish":true,"overridePublish":true},"licenses":[{"id":"Apache-2.0","title":"Apache Software License 2.0","url":"https://git.insanusmokrassar.com/InsanusMokrassar/krontab/src/master/LICENSE"}],"mavenConfig":{"name":"Krontab","description":"It is an analog of crontab util for Kotlin Coroutines","url":"https://git.insanusmokrassar.com/InsanusMokrassar/krontab","vcsUrl":"https://git.insanusmokrassar.com:8322/InsanusMokrassar/krontab.git","developers":[{"id":"InsanusMokrassar","name":"Ovsiannikov Aleksei","eMail":"ovsyannikov.alexey95@gmail.com"}]}}

publish.gradle

@@ -1,59 +1,65 @@
-apply plugin: 'com.jfrog.bintray'
+apply plugin: 'maven-publish'
 
-apply from: "maven.publish.gradle"
-
-bintray {
-    user = project.hasProperty('BINTRAY_USER') ? project.property('BINTRAY_USER') : System.getenv('BINTRAY_USER')
-    key = project.hasProperty('BINTRAY_KEY') ? project.property('BINTRAY_KEY') : System.getenv('BINTRAY_KEY')
-    filesSpec {
-        from "${buildDir}/publications/"
-        eachFile {
-            String directorySubname = it.getFile().parentFile.name
-            if (it.getName() == "module.json") {
-                if (directorySubname == "kotlinMultiplatform") {
-                    it.setPath("${project.name}/${project.version}/${project.name}-${project.version}.module")
-                } else {
-                    it.setPath("${project.name}-${directorySubname}/${project.version}/${project.name}-${directorySubname}-${project.version}.module")
-                }
-            } else {
-                if (directorySubname == "kotlinMultiplatform" && it.getName() == "pom-default.xml") {
-                    it.setPath("${project.name}/${project.version}/${project.name}-${project.version}.pom")
-                } else {
-                    it.exclude()
-                }
-            }
-        }
-        into "${project.group}".replace(".", "/")
-    }
-    
-    publish = true
-    override = true
-    
-    pkg {
-        repo = "InsanusMokrassar"
-        name = "${project.name}-mpp"
-        vcsUrl = "https://git.insanusmokrassar.com/InsanusMokrassar/krontab"
-        licenses = ["Apache-2.0"]
-        version {
-            name = "${project.version}"
-            released = new Date()
-            vcsTag = "${project.version}"
-            gpg {
-                sign = true
-                passphrase = project.hasProperty('signing.gnupg.passphrase') ? project.property('signing.gnupg.passphrase') : System.getenv('signing.gnupg.passphrase')
-            }
-        }
-    }
+task javadocsJar(type: Jar) {
+    classifier = 'javadoc'
 }
 
-bintrayUpload.doFirst {
-    publications = publishing.publications.collect {
+afterEvaluate {
+    project.publishing.publications.all {
+        // rename artifacts
+        groupId "${project.group}"
         if (it.name.contains('kotlinMultiplatform')) {
-            null
+            artifactId = "${project.name}"
         } else {
-            it.name
+            artifactId = "${project.name}-$name"
         }
-    } - null
+    }
 }
 
-bintrayUpload.dependsOn publishToMavenLocal
+publishing {
+    publications.all {
+        artifact javadocsJar
+
+        pom {
+            description = "It is an analog of crontab util for Kotlin Coroutines"
+            name = "Krontab"
+            url = "https://git.insanusmokrassar.com/InsanusMokrassar/krontab"
+
+            scm {
+                developerConnection = "scm:git:[fetch=]https://git.insanusmokrassar.com:8322/InsanusMokrassar/krontab.git[push=]https://git.insanusmokrassar.com:8322/InsanusMokrassar/krontab.git"
+                url = "https://git.insanusmokrassar.com:8322/InsanusMokrassar/krontab.git"
+            }
+
+            developers {
+                
+                    developer {
+                        id = "InsanusMokrassar"
+                        name = "Ovsiannikov Aleksei"
+                        email = "ovsyannikov.alexey95@gmail.com"
+                    }
+                
+            }
+
+            licenses {
+                
+                    license {
+                        name = "Apache Software License 2.0"
+                        url = "https://git.insanusmokrassar.com/InsanusMokrassar/krontab/src/master/LICENSE"
+                    }
+                
+            }
+        }
+        
+        repositories {
+            maven {
+                name = "bintray"
+                url = uri("https://api.bintray.com/maven/${project.hasProperty('BINTRAY_USER') ? project.property('BINTRAY_USER') : System.getenv('BINTRAY_USER')}/InsanusMokrassar/${project.name}-mpp/;publish=1;override=1")
+                credentials {
+                    username = project.hasProperty('BINTRAY_USER') ? project.property('BINTRAY_USER') : System.getenv('BINTRAY_USER')
+                    password = project.hasProperty('BINTRAY_KEY') ? project.property('BINTRAY_KEY') : System.getenv('BINTRAY_KEY')
+                }
+            }
+        }
+        
+    }
+}

src/commonMain/kotlin/com/insanusmokrassar/krontab/internal/CronDateTimeScheduler.kt

@@ -1,32 +0,0 @@
-package com.insanusmokrassar.krontab.internal
-
-import com.insanusmokrassar.krontab.KronScheduler
-import com.insanusmokrassar.krontab.anyCronDateTime
-import com.soywiz.klock.DateTime
-
-/**
- * Cron-oriented realisation of [KronScheduler]
- *
- * @see com.insanusmokrassar.krontab.AnyTimeScheduler
- * @see com.insanusmokrassar.krontab.EverySecondScheduler
- * @see com.insanusmokrassar.krontab.EveryMinuteScheduler
- * @see com.insanusmokrassar.krontab.EveryHourScheduler
- * @see com.insanusmokrassar.krontab.EveryDayOfMonthScheduler
- * @see com.insanusmokrassar.krontab.EveryMonthScheduler
- *
- * @see com.insanusmokrassar.krontab.builder.buildSchedule
- * @see com.insanusmokrassar.krontab.builder.SchedulerBuilder
- */
-internal data class CronDateTimeScheduler internal constructor(
-    internal val cronDateTimes: List<CronDateTime>
-) : KronScheduler {
-    /**
-     * @return Near date using [cronDateTimes] list and getting the [Iterable.min] one
-     *
-     * @see toNearDateTime
-     */
-    override suspend fun next(relatively: DateTime): DateTime {
-        return cronDateTimes.map { it.toNearDateTime(relatively) }.minOrNull() ?: anyCronDateTime.toNearDateTime(relatively)
-    }
-}
-

src/commonMain/kotlin/dev/inmo/krontab/Executes.kt

@@ -1,7 +1,6 @@
-package com.insanusmokrassar.krontab
+package dev.inmo.krontab
 
 import com.soywiz.klock.DateTime
-import kotlinx.coroutines.Deferred
 import kotlinx.coroutines.delay
 
 /**

src/commonMain/kotlin/dev/inmo/krontab/KronScheduler.kt

@@ -1,21 +1,21 @@
-package com.insanusmokrassar.krontab
+package dev.inmo.krontab
 
 import com.soywiz.klock.DateTime
 
 /**
  * This interface was created for abstraction of [next] operation. Currently, there is only
- * [com.insanusmokrassar.krontab.internal.CronDateTimeScheduler] realisation of this interface inside of this library,
+ * [dev.inmo.krontab.internal.CronDateTimeScheduler] realisation of this interface inside of this library,
  * but you it is possible to create your own realisation of this interface for scheduling, for example, depending of
  * users activity or something like this
  *
- * @see com.insanusmokrassar.krontab.internal.CronDateTimeScheduler
+ * @see dev.inmo.krontab.internal.CronDateTimeScheduler
  */
 interface KronScheduler {
 
     /**
      * @return Next [DateTime] when some action must be triggered according to settings of this instance
      *
-     * @see com.insanusmokrassar.krontab.internal.CronDateTimeScheduler.next
+     * @see dev.inmo.krontab.internal.CronDateTimeScheduler.next
      */
     suspend fun next(relatively: DateTime = DateTime.now()): DateTime
 }

src/commonMain/kotlin/dev/inmo/krontab/SchedulerShortcuts.kt

@@ -1,8 +1,8 @@
-package com.insanusmokrassar.krontab
+package dev.inmo.krontab
 
-import com.insanusmokrassar.krontab.builder.buildSchedule
-import com.insanusmokrassar.krontab.internal.CronDateTime
-import com.insanusmokrassar.krontab.internal.CronDateTimeScheduler
+import dev.inmo.krontab.builder.buildSchedule
+import dev.inmo.krontab.internal.CronDateTime
+import dev.inmo.krontab.internal.CronDateTimeScheduler
 
 internal val anyCronDateTime by lazy {
     CronDateTime()

src/commonMain/kotlin/dev/inmo/krontab/StringParser.kt

@@ -1,6 +1,6 @@
-package com.insanusmokrassar.krontab
+package dev.inmo.krontab
 
-import com.insanusmokrassar.krontab.internal.*
+import dev.inmo.krontab.internal.*
 
 /**
  * @see createSimpleScheduler
@@ -27,6 +27,8 @@ typealias KrontabTemplate = String
  * * {int}/{int}
  * * */{int}
  * * {int}
+ * * F
+ * * L
  *
  * Additional info about ranges can be found in follow accordance:
  *
@@ -39,10 +41,11 @@ typealias KrontabTemplate = String
  * Examples:
  *
  * * "0/5 * * * *" for every five seconds triggering
+ * * "0/5,L * * * *" for every five seconds triggering and on 59 second
  * * "0/15 30 * * *" for every 15th seconds in a half of each hour
- * * "1 2 3 4 5" for triggering in near first second of second minute of third hour of fourth day of may
+ * * "1 2 3 F,4,L 5" for triggering in near first second of second minute of third hour of fourth day of may
  *
- * @see com.insanusmokrassar.krontab.internal.createKronScheduler
+ * @see dev.inmo.krontab.internal.createKronScheduler
  */
 fun createSimpleScheduler(incoming: KrontabTemplate): KronScheduler {
     val (secondsSource, minutesSource, hoursSource, dayOfMonthSource, monthSource) = incoming.split(" ")

src/commonMain/kotlin/dev/inmo/krontab/builder/SchedulerBuilder.kt

@@ -1,15 +1,12 @@
-package com.insanusmokrassar.krontab.builder
+package dev.inmo.krontab.builder
 
-import com.insanusmokrassar.krontab.KronScheduler
-import com.insanusmokrassar.krontab.internal.*
-import com.insanusmokrassar.krontab.internal.CronDateTime
-import com.insanusmokrassar.krontab.internal.CronDateTimeScheduler
-import com.insanusmokrassar.krontab.internal.fillWith
+import dev.inmo.krontab.KronScheduler
+import dev.inmo.krontab.internal.createKronScheduler
 
 /**
  * Will help to create an instance of [KronScheduler]
  *
- * @see com.insanusmokrassar.krontab.createSimpleScheduler
+ * @see dev.inmo.krontab.createSimpleScheduler
  */
 fun buildSchedule(settingsBlock: SchedulerBuilder.() -> Unit): KronScheduler {
     val builder = SchedulerBuilder()
@@ -100,8 +97,8 @@ class SchedulerBuilder(
     /**
      * @return Completely built and independent [KronScheduler]
      *
-     * @see com.insanusmokrassar.krontab.createSimpleScheduler
-     * @see com.insanusmokrassar.krontab.internal.createKronScheduler
+     * @see dev.inmo.krontab.createSimpleScheduler
+     * @see dev.inmo.krontab.internal.createKronScheduler
      */
     fun build(): KronScheduler = createKronScheduler(seconds, minutes, hours, dayOfMonth, month)
 }

src/commonMain/kotlin/dev/inmo/krontab/builder/TimeBuilder.kt

@@ -1,7 +1,7 @@
-package com.insanusmokrassar.krontab.builder
+package dev.inmo.krontab.builder
 
-import com.insanusmokrassar.krontab.internal.*
-import com.insanusmokrassar.krontab.utils.clamp
+import dev.inmo.krontab.internal.*
+import dev.inmo.krontab.utils.clamp
 
 /**
  * This class was created for incapsulation of builder work with specified [restrictionsRange]. For example,
@@ -12,6 +12,17 @@ sealed class TimeBuilder (
 ) {
     private var result: Set<Int>? = null
 
+    /**
+     * The first possible value of builder
+     */
+    val first
+        get() = restrictionsRange.first
+    /**
+     * The last possible value of builder. Using of this variable equal to using "L" in strings
+     */
+    val last
+        get() = restrictionsRange.last
+
     /**
      * After calling of this function this builder will allow any value of current time
      */
@@ -37,6 +48,13 @@ sealed class TimeBuilder (
         result = (result ?: emptySet()) + value.clamp(restrictionsRange)
     }
 
+
+    /**
+     * Shortcut for [at]. In fact will
+     */
+    @Suppress("unused", "NOTHING_TO_INLINE")
+    inline infix fun each(value: Int) = at(value)
+
     /**
      * Just wrapper for more obvious writing something like "[from] 2 [every] 5". For example, for [SecondsBuilder] it
      * will mean "[from] second second [every] 5 seconds", or "2, 7, 13, ..."
@@ -92,6 +110,15 @@ sealed class TimeBuilder (
     @Suppress("MemberVisibilityCanBePrivate")
     infix operator fun rangeTo(endIncluding: Int) = (this from 0) rangeTo endIncluding
 
+    /**
+     * Will include the last possible value
+     */
+    fun includeLast() = at(restrictionsRange.last)
+    /**
+     * Will include the first possible value
+     */
+    fun includeFirst() = at(restrictionsRange.first)
+
     internal fun build() = result ?.map { it.toByte() } ?.toTypedArray()
 }
 

src/commonMain/kotlin/dev/inmo/krontab/collection/CollectionFunctions.kt

@@ -0,0 +1,25 @@
+package dev.inmo.krontab.collection
+
+import dev.inmo.krontab.KronScheduler
+
+@Suppress("NOTHING_TO_INLINE")
+inline fun CollectionKronScheduler.includeAll(kronSchedulers: List<KronScheduler>) {
+    kronSchedulers.forEach {
+        include(it)
+    }
+}
+
+@Suppress("NOTHING_TO_INLINE")
+inline fun CollectionKronScheduler.includeAll(vararg kronSchedulers: KronScheduler) {
+    includeAll(kronSchedulers.toList())
+}
+
+operator fun KronScheduler.plus(kronScheduler: KronScheduler): CollectionKronScheduler {
+    return CollectionKronScheduler().apply {
+        includeAll(this, kronScheduler)
+    }
+}
+
+operator fun CollectionKronScheduler.plusAssign(kronScheduler: KronScheduler) {
+    include(kronScheduler)
+}

src/commonMain/kotlin/dev/inmo/krontab/collection/CollectionKronScheduler.kt

@@ -0,0 +1,53 @@
+package dev.inmo.krontab.collection
+
+import com.soywiz.klock.DateTime
+import dev.inmo.krontab.KronScheduler
+import dev.inmo.krontab.anyCronDateTime
+import dev.inmo.krontab.internal.*
+import dev.inmo.krontab.internal.CronDateTimeScheduler
+import dev.inmo.krontab.internal.merge
+import dev.inmo.krontab.internal.toNearDateTime
+
+/**
+ * This scheduler will be useful in case you want to unite several different [KronScheduler]s
+ */
+data class CollectionKronScheduler internal constructor(
+    internal val schedulers: MutableList<KronScheduler>
+) : KronScheduler {
+    internal constructor() : this(mutableListOf())
+
+    /**
+     * Add [kronScheduler] into its [schedulers] list
+     *
+     * * When [kronScheduler] is [CronDateTimeScheduler] it will merge all [CronDateTimeScheduler]s from [schedulers] list
+     * and this [kronScheduler] using [merge] function
+     * * When [kronScheduler] is [CollectionKronScheduler] it this instance will include all [kronScheduler]
+     * [schedulers]
+     * * Otherwise [kronScheduler] will be added to [schedulers] list
+     */
+    fun include(kronScheduler: KronScheduler) {
+        when (kronScheduler) {
+            is CronDateTimeScheduler -> {
+                val resultCronDateTimes = mutableListOf(kronScheduler)
+                schedulers.removeAll {
+                    if (it is CronDateTimeScheduler) {
+                        resultCronDateTimes.add(it)
+                    } else {
+                        false
+                    }
+                }
+                schedulers.add(
+                    merge(resultCronDateTimes)
+                )
+            }
+            is CollectionKronScheduler -> kronScheduler.schedulers.forEach {
+                include(it)
+            }
+            else -> schedulers.add(kronScheduler)
+        }
+    }
+
+    override suspend fun next(relatively: DateTime): DateTime {
+        return schedulers.minOfOrNull { it.next(relatively) } ?: anyCronDateTime.toNearDateTime(relatively)
+    }
+}

src/commonMain/kotlin/dev/inmo/krontab/internal/CronDateTime.kt

@@ -1,9 +1,8 @@
-package com.insanusmokrassar.krontab.internal
+package dev.inmo.krontab.internal
 
-import com.insanusmokrassar.krontab.KronScheduler
-import com.insanusmokrassar.krontab.utils.clamp
 import com.soywiz.klock.DateTime
 import com.soywiz.klock.DateTimeSpan
+import dev.inmo.krontab.KronScheduler
 
 /**
  * @param month 0-11
@@ -52,7 +51,13 @@ internal fun CronDateTime.toNearDateTime(relativelyTo: DateTime = DateTime.now()
     }
 
     klockDayOfMonth ?.let {
-        val left = it - current.dayOfMonth
+        val left = (it - current.dayOfMonth).let { diff ->
+            if (diff > 0 && current.endOfMonth.run { it > dayOfMonth && current.dayOfMonth == dayOfMonth }) {
+                0
+            } else {
+                diff
+            }
+        }
         current += DateTimeSpan(months = if (left < 0) 1 else 0, days = left)
     }
 

src/commonMain/kotlin/dev/inmo/krontab/internal/CronDateTimeScheduler.kt

@@ -0,0 +1,51 @@
+package dev.inmo.krontab.internal
+
+import com.soywiz.klock.DateTime
+import dev.inmo.krontab.KronScheduler
+import dev.inmo.krontab.anyCronDateTime
+
+/**
+ * Cron-oriented realisation of [KronScheduler]
+ *
+ * @see dev.inmo.krontab.AnyTimeScheduler
+ * @see dev.inmo.krontab.EverySecondScheduler
+ * @see dev.inmo.krontab.EveryMinuteScheduler
+ * @see dev.inmo.krontab.EveryHourScheduler
+ * @see dev.inmo.krontab.EveryDayOfMonthScheduler
+ * @see dev.inmo.krontab.EveryMonthScheduler
+ *
+ * @see dev.inmo.krontab.builder.buildSchedule
+ * @see dev.inmo.krontab.builder.SchedulerBuilder
+ */
+data class CronDateTimeScheduler internal constructor(
+    internal val cronDateTimes: List<CronDateTime>
+) : KronScheduler {
+    /**
+     * @return Near date using [cronDateTimes] list and getting the [Iterable.min] one
+     *
+     * @see toNearDateTime
+     */
+    override suspend fun next(relatively: DateTime): DateTime {
+        return cronDateTimes.map { it.toNearDateTime(relatively) }.minOrNull() ?: anyCronDateTime.toNearDateTime(relatively)
+    }
+}
+
+/**
+ * @return New instance of [CronDateTimeScheduler] with all unique [CronDateTimeScheduler.cronDateTimes] of
+ * [kronDateTimeSchedulers] included
+ */
+@Suppress("NOTHING_TO_INLINE")
+fun merge(kronDateTimeSchedulers: List<CronDateTimeScheduler>) = CronDateTimeScheduler(
+    kronDateTimeSchedulers.flatMap { it.cronDateTimes }.distinct()
+)
+
+/**
+ * @return Vararg shortcyut for [merge]
+ */
+@Suppress("NOTHING_TO_INLINE")
+inline fun merge(vararg kronDateTimeSchedulers: CronDateTimeScheduler) = merge(kronDateTimeSchedulers.toList())
+/**
+ * Use [merge] operation to internalcreate new [CronDateTimeScheduler] with all [CronDateTimeScheduler.cronDateTimes]
+ */
+@Suppress("NOTHING_TO_INLINE")
+inline fun CronDateTimeScheduler.plus(other: CronDateTimeScheduler) = merge(this, other)

src/commonMain/kotlin/dev/inmo/krontab/internal/Parser.kt

@@ -1,18 +1,23 @@
-package com.insanusmokrassar.krontab.internal
+package dev.inmo.krontab.internal
 
-import com.insanusmokrassar.krontab.utils.clamp
+import dev.inmo.krontab.utils.clamp
 
 private fun createSimpleScheduler(from: String, dataRange: IntRange): Array<Byte>? {
     val things = from.split(",")
 
     val results = things.flatMap {
+        val currentToken = it.toLowerCase().replace(
+            "f", dataRange.first.toString()
+        ).replace(
+            "l", dataRange.last.toString()
+        )
         when {
-            it.contains("-") -> {
-                val splitted = it.split("-")
+            currentToken.contains("-") -> {
+                val splitted = currentToken.split("-")
                 (splitted.first().toInt().clamp(dataRange) .. splitted[1].toInt().clamp(dataRange)).toList()
             }
-            it.contains("/") -> {
-                val (start, step) = it.split("/")
+            currentToken.contains("/") -> {
+                val (start, step) = currentToken.split("/")
                 val startNum = (if (start.isEmpty() || start == "*") {
                     0
                 } else {
@@ -21,8 +26,8 @@ private fun createSimpleScheduler(from: String, dataRange: IntRange): Array<Byte
                 val stepNum = step.toInt().clamp(dataRange)
                 (startNum .. dataRange.last step stepNum).map { it }
             }
-            it == "*" -> return null
-            else -> listOf(it.toInt().clamp(dataRange))
+            currentToken == "*" -> return null
+            else -> listOf(currentToken.toInt().clamp(dataRange))
         }
     }
 

src/commonMain/kotlin/dev/inmo/krontab/internal/Ranges.kt

@@ -1,4 +1,4 @@
-package com.insanusmokrassar.krontab.internal
+package dev.inmo.krontab.internal
 
 internal val monthRange = 0 .. 11
 internal val dayOfMonthRange = 0 .. 30

src/commonMain/kotlin/dev/inmo/krontab/utils/Data.kt

@@ -1,4 +1,4 @@
-package com.insanusmokrassar.krontab.utils
+package dev.inmo.krontab.utils
 
 /**
  * @return [min] in case if [this] less than [min]. Otherwise will check that [max] grant than [this] and return [this]

src/commonMain/kotlin/dev/inmo/krontab/utils/SchedulerFlow.kt

@@ -1,7 +1,7 @@
-package com.insanusmokrassar.krontab.utils
+package dev.inmo.krontab.utils
 
-import com.insanusmokrassar.krontab.KronScheduler
 import com.soywiz.klock.DateTime
+import dev.inmo.krontab.KronScheduler
 import kotlinx.coroutines.FlowPreview
 import kotlinx.coroutines.delay
 import kotlinx.coroutines.flow.*

src/commonTest/kotlin/dev/inmo/krontab/utils/FailJob.kt

@@ -1,4 +1,4 @@
-package com.insanusmokrassar.krontab.utils
+package dev.inmo.krontab.utils
 
 import kotlinx.coroutines.*
 

src/commonTest/kotlin/dev/inmo/krontab/utils/RunTest.kt

@@ -1,4 +1,4 @@
-package com.insanusmokrassar.krontab.utils
+package dev.inmo.krontab.utils
 
 import kotlinx.coroutines.CoroutineScope
 

src/commonTest/kotlin/dev/inmo/krontab/utils/SchedulerFlow.kt

@@ -1,7 +1,6 @@
-package com.insanusmokrassar.krontab.utils
+package dev.inmo.krontab.utils
 
-import com.insanusmokrassar.krontab.builder.buildSchedule
-import com.soywiz.klock.DateTime
+import dev.inmo.krontab.builder.buildSchedule
 import kotlinx.coroutines.*
 import kotlinx.coroutines.flow.collect
 import kotlinx.coroutines.flow.takeWhile

src/commonTest/kotlin/dev/inmo/krontab/utils/StringParseTest.kt

@@ -1,12 +1,9 @@
-package com.insanusmokrassar.krontab.utils
+package dev.inmo.krontab.utils
 
-import com.insanusmokrassar.krontab.buildSchedule
-import com.soywiz.klock.DateTime
+import dev.inmo.krontab.buildSchedule
 import kotlinx.coroutines.*
 import kotlinx.coroutines.flow.collect
 import kotlinx.coroutines.flow.takeWhile
-import kotlin.math.max
-import kotlin.math.min
 import kotlin.test.Test
 import kotlin.test.assertEquals
 

src/jsTest/kotlin/dev/inmo/krontab/utils/RunTest.kt

@@ -1,4 +1,4 @@
-package com.insanusmokrassar.krontab.utils
+package dev.inmo.krontab.utils
 
 import kotlinx.coroutines.*
 

src/jvmTest/kotlin/dev/inmo/krontab/utils/RunTest.kt

@@ -1,4 +1,4 @@
-package com.insanusmokrassar.krontab.utils
+package dev.inmo.krontab.utils
 
 import kotlinx.coroutines.CoroutineScope
 import kotlinx.coroutines.runBlocking