release 0.0.4 (#20)

* introduce JacocoCoverageRule (#6)

* introduce JacocoCoverageRule

* add JacocoCoverageRuleTest

* support all nested objects

* improve test coverage

* add more tests

* make issue levels take text (#8)

* config bintray

* convert the Rule to abstract class (#7)

* convert the Rule to abstract class

* fix push.gradle

* auto release (#9)

* auto release

* add release task to circle ci

* add ci and pullRequest to Rule (#10)

* add ci and pullRequest to Rule

* fix test

* exclude some authors from protected files rule (#11)

* jacoco total coverage (#12)

* introduce Github-enterprise (#15)

* Unify dependencies versions by applying buildSrc (#14)

* Making unify dependencies versions feature by applying buildSrc mechanism and Gradle DSL then change all the build.gradle.kts files of all the modules we have to be use the new kotlin class that I made.
Since four classes are made :
1. Dependencies : that contains all the dependencies we will use.
2. MainApp : that contains the common things of the whole app.
3. MainClass : that contains the main classes of each module.
4. Projects : that contains the name of projects/modules we have tell now.
5. Versions : that contains the versions that we will use in Dependencies class.

* Modify Naming of buildSrc files
- Projects file renamed to Modules to be more meaningful.
- MainApp file renamed to Project to be more specific.

* fix file url for enterprise (#18)

* fix file url for enterprise

* fix file path by using filePath instead of class path

* add UTs

* update comment (#19)

* update comment

* fix parsing

* make use of another github token

* release 0.0.4

Author: tarek360

.circleci/config.yml

@@ -33,6 +33,10 @@ jobs:
         name: Run tests
         command: gradle test --stacktrace
 
+    - run:
+        name: Run JaCoCo
+        command: gradle  jacocoFullReport
+
     - run:
         name: DistZip
         command: gradle distZip
@@ -45,3 +49,6 @@ jobs:
         name: Run Koshry
         command: app/build/distributions/app/bin/app
 
+    - run:
+        name: Release only from master Koshry
+        command: gradle release

.gitignore

@@ -157,10 +157,6 @@ crashlytics.properties
 crashlytics-build.properties
 fabric.properties
 
-### AndroidStudio Patch ###
-
-!/gradle/wrapper/gradle-wrapper.jar
-
 ### Firebase ###
 .idea
 **/node_modules/*
@@ -302,6 +298,3 @@ $RECYCLE.BIN/
 
 ### Firebase Google Services file ###
 google-services.json
-
-# git_diff
-.git_diff

app/build.gradle.kts

@@ -1,3 +1,6 @@
+import io.github.tarek360.dependencies.Dependencies
+import io.github.tarek360.dependencies.Modules
+import io.github.tarek360.dependencies.MainClasses
 import org.jetbrains.kotlin.config.KotlinCompilerVersion
 
 plugins {
@@ -6,13 +9,14 @@ plugins {
 }
 
 application {
-  mainClassName = "io.github.tarek360.app.AppKt"
+  mainClassName = MainClasses.appKit
 }
 
 dependencies {
-  implementation(kotlin("stdlib-jdk8"))
-  implementation(project(":koshry"))
-  implementation(project(":rules"))
+  implementation(kotlin(Dependencies.kotlinJDK))
+  implementation(project(Modules.koshry))
+  implementation(project(Modules.rules))
+  implementation(project(Modules.testCoverageRule))
 }
 
 java {

app/gradle.properties

@@ -1,3 +0,0 @@
-pom_name=Koshry GitDiff Library
-pom_artifact_id=gitdiff
-pom_packaging=jar

app/src/main/java/io/github/tarek360/app/App.kt

@@ -2,29 +2,35 @@ package io.github.tarek360.app
 
 import io.github.tarek360.koshry.Koshry
 import io.github.tarek360.koshry.koshry
+import io.github.tarek360.rules.coverage.jacocoCoverageRule
 import io.github.tarek360.rules.lineRule
 import io.github.tarek360.rules.fileRule
 import io.github.tarek360.rules.protectedFileRule
-import io.github.tarek360.rules.report.Level.ERROR
+import io.github.tarek360.rules.core.Level.ERROR
 
 fun main(_args: Array<String>) {
 
     val configuration = koshry {
 
+        baseSha = ""
+
         rules {
             rule = protectedFileRule {
                 reportTitle = "Files are protected and can't be modified, ask @tarek360 to modify"
-                issueLevel = ERROR
+                issueLevel = ERROR()
                 files {
                     filePath = ".circleci/config.yml"
                     filePath = ".travis.yml"
                 }
+                excludeAuthors {
+                    author = "tarek360"
+                }
             }
 
             rule = lineRule {
                 condition = { file , line -> line.text.contains("System.getenv") }
                 reportTitle = "Don't use System.getenv directly, use Environment.getVariable instead."
-                issueLevel = ERROR
+                issueLevel = ERROR()
             }
 
             // Rule to prevent anyone from adding new java code.
@@ -33,7 +39,14 @@ fun main(_args: Array<String>) {
                     file.isAdded && file.name.endsWith(".java")
                 }
                 reportTitle = "Don't add new Java files, use Kotlin instead."
-                issueLevel = ERROR
+                issueLevel = ERROR()
+            }
+
+            // JaCoCo Test Coverage Rule
+            rule = jacocoCoverageRule {
+                classCoverageThreshold = 79 //79%
+                csvFilePath = "build/reports/jacoco/jacoco.csv"
+//                htmlFilePath = "https://tarek360.github.io/koshry/build/reports/"
             }
         }
     }

auto_release.gradle.kts

@@ -0,0 +1,36 @@
+import java.io.BufferedReader
+
+tasks.create<DefaultTask>("release") {
+
+    val releaseBranch = "master"
+    val currentBranch = executeCommand("git rev-parse --abbrev-ref HEAD")[0]
+
+    val bintrayUploadTasks = subprojects.mapNotNull {
+        val tasks = it.getTasksByName("bintrayUpload", false)
+        if (tasks.isNotEmpty()) {
+            tasks
+        } else {
+            null
+        }
+    }
+
+    if (currentBranch == releaseBranch) {
+        finalizedBy(bintrayUploadTasks)
+    }
+
+    doFirst {
+        if (currentBranch == releaseBranch) {
+            println("Releasing from master branch!")
+        } else {
+            println("No master! No release!")
+        }
+    }
+}
+
+
+fun executeCommand(command: String): List<String> {
+    val proc = Runtime.getRuntime().exec(command)
+    val lines = proc.inputStream.bufferedReader().use(BufferedReader::readLines)
+    proc.waitFor()
+    return lines
+}

build.gradle.kts

@@ -1,12 +1,18 @@
+import org.jetbrains.kotlin.gradle.tasks.KotlinCompile
+
+plugins {
+    kotlin("jvm") version "1.2.71"
+}
+
 buildscript {
-    val kotlinVersion = "1.2.60"
     repositories {
         mavenLocal()
         google()
         jcenter()
     }
     dependencies {
-        classpath(kotlin("gradle-plugin", version = kotlinVersion))
+        classpath(kotlin("gradle-plugin", version = "1.2.71"))
+        classpath("com.jfrog.bintray.gradle:gradle-bintray-plugin:1.8.1")
     }
 }
 
@@ -17,3 +23,24 @@ allprojects {
         jcenter()
     }
 }
+
+apply { from("jacoco/jacocoFullReport.gradle") }
+apply { from("auto_release.gradle.kts") }
+
+dependencies {
+    compile(kotlin("stdlib-jdk8"))
+}
+
+repositories {
+    mavenCentral()
+}
+
+val compileKotlin: KotlinCompile by tasks
+compileKotlin.kotlinOptions {
+    jvmTarget = "1.8"
+}
+
+val compileTestKotlin: KotlinCompile by tasks
+compileTestKotlin.kotlinOptions {
+    jvmTarget = "1.8"
+}

buildSrc/build.gradle.kts

@@ -0,0 +1,12 @@
+plugins {
+    kotlin("jvm") version "1.2.71"
+}
+
+repositories {
+    mavenCentral()
+}
+
+dependencies {
+    compile(kotlin("stdlib-jdk8"))
+}
+

buildSrc/src/main/java/io/github/tarek360/dependencies/Dependencies.kt

@@ -0,0 +1,21 @@
+package io.github.tarek360.dependencies
+
+object Dependencies {
+
+    var kotlinJDK       = "stdlib-jdk8"
+
+    var json            = "org.json:json:${Versions.json}"
+
+    val junit           = "junit:junit:${Versions.junit}"
+
+    val mockitoCore     = "org.mockito:mockito-core:${Versions.mockitoCore}"
+
+    val mockitoKotlin   = "com.nhaarman.mockitokotlin2:mockito-kotlin:${Versions.mockitoKotlin}"
+
+    val okHttp3Mock     = "com.squareup.okhttp3:mockwebserver:${Versions.okHttp3}"
+
+    val okHttp3         = arrayOf(
+            "com.squareup.okhttp3:logging-interceptor:${Versions.okHttp3}",
+            "com.squareup.okhttp3:okhttp:${Versions.okHttp3}")
+
+}

buildSrc/src/main/java/io/github/tarek360/dependencies/MainClasses.kt

@@ -0,0 +1,7 @@
+package io.github.tarek360.dependencies
+
+object MainClasses {
+
+    val appKit          = "io.github.tarek360.app.AppKt"
+
+}

buildSrc/src/main/java/io/github/tarek360/dependencies/Modules.kt

@@ -0,0 +1,25 @@
+package io.github.tarek360.dependencies
+
+object Modules {
+
+    val ciDetector              = ":ci-detector"
+
+    val core                    = ":core"
+
+    val gitDiffParser           = ":gitdiff-parser"
+
+    val gitDiffProvider         = ":gitdiff-provider"
+
+    val gitHost                 = ":githost"
+
+    val koshry                  = ":koshry"
+
+    val rules                   = ":rules"
+
+    val rulesCore               = ":rules-core"
+
+    val rulesTest               = ":rules-test"
+
+    val testCoverageRule        = ":test-coverage-rule"
+
+}

buildSrc/src/main/java/io/github/tarek360/dependencies/Project.kt

@@ -0,0 +1,9 @@
+package io.github.tarek360.dependencies
+
+object Project {
+
+    val group           = "io.github.tarek360"
+
+    val version         = "0.0.1"
+
+}

buildSrc/src/main/java/io/github/tarek360/dependencies/Versions.kt

@@ -0,0 +1,19 @@
+package io.github.tarek360.dependencies
+
+object Versions {
+
+    val kotlin              = "1.2.71"
+
+    val jvmTarget           = "1.8"
+
+    val json                = "20160810"
+
+    val okHttp3             = "3.11.0"
+
+    val junit               = "4.12"
+
+    val mockitoCore         = "2.22.0"
+
+    val mockitoKotlin       = "2.0.0-RC1"
+
+}

ci-detector/build.gradle.kts

@@ -1,26 +1,27 @@
+import io.github.tarek360.dependencies.Dependencies
+import io.github.tarek360.dependencies.Project
 import org.jetbrains.kotlin.config.KotlinCompilerVersion
 
 plugins {
   kotlin("jvm")
   id("java-library")
   id("maven-publish")
+  jacoco
 }
 
-apply { from("../mvn-push.gradle") }
+apply { from("../push.gradle") }
 
 repositories {
   mavenLocal()
   jcenter()
   mavenCentral()
 }
 
-group = "io.github.tarek360"
-version = "0.0.1"
-
-val okHttpVersion = "3.8.1"
+group = Project.group
+version = Project.version
 
 dependencies {
-  implementation(kotlin("stdlib-jdk8"))
+  implementation(kotlin(Dependencies.kotlinJDK))
 }
 
 java {

ci-detector/gradle.properties

@@ -1,3 +1 @@
-pom_name=Koshry GitDiff Library
-pom_artifact_id=gitdiff
-pom_packaging=jar
+ARTIFACT_ID=ci-detector

ci-detector/src/main/java/io/github/tarek360/ci/Ci.kt

@@ -2,13 +2,18 @@ package io.github.tarek360.ci
 
 abstract class Ci {
 
-  val gitHostToken: String? by lazy {
-    Environment.getVariable("KOSHRY_GIT_HOST_TOKEN")
-  }
+    open val gitHostToken: String? by lazy {
+        val token = Environment.getVariable("KOSHRY_GIT_HOST_TOKEN")
+        if (token.isNullOrBlank()) {
+            Environment.getVariable("DANGER_GITHUB_API_TOKEN")
+        } else {
+            token
+        }
+    }
 
-  abstract val buildId: Int?
+    abstract val buildId: Int?
 
-  abstract val projectOwnerNameRepoName: String?
+    abstract val projectOwnerNameRepoName: String?
 
-  abstract val pullRequestId: Int?
+    abstract val pullRequestId: Int?
 }