Testing Gradle build (may migrate from Maven)

Author: adarro

.codecov.yml

@@ -0,0 +1,19 @@
+coverage:
+  precision: 2
+  round: down
+  range: "70...100"
+
+  status:
+    project:
+      default: on
+    patch:
+      default: on
+    changes:
+      default: off
+
+comment:
+  layout: "header, reach, diff, flags, files, footer"
+  behavior: default
+  require_changes: no
+  require_base: no
+  require_head: yes

.travis.yml

@@ -1,16 +1,11 @@
 language: scala
 scala:
-- 2.11.8
+- 2.12.3
 jdk:
 - oraclejdk8
 install: true
-before_script:
-- mvn install -Dmaven.skip.tests -f qa-tools
-script:
-- mvn install -Dmaven.skip.tests
-- mvn org.scoverage:scoverage-maven-plugin:1.3.0:report
 after_success:
-- mvn com.versioneye:versioneye-maven-plugin:3.11.1:update
+- gradlew versioneye-update
 - bash <(curl -s https://codecov.io/bash)
 addons:
   code_climate:

build.gradle

@@ -0,0 +1,45 @@
+plugins {
+    id "org.standardout.versioneye" version "1.5.0"
+}
+
+buildscript {
+  repositories {
+    jcenter()
+  }
+}
+
+
+
+
+allprojects  {
+  apply plugin: 'maven'
+
+  group = 'ddo-calc'
+version = '0.1.0-alpha'
+  repositories {
+    jcenter()
+  }
+}
+
+
+subprojects {
+  apply plugin: 'java'
+  sourceCompatibility = 1.8
+  targetCompatibility = 1.8
+  tasks.withType(JavaCompile) {
+  	options.encoding = 'UTF-8'
+  }
+
+  
+  repositories {
+    mavenLocal()
+    
+    maven { url "http://repo.spring.io/libs-release-remote" }
+    maven { url "https://oss.sonatype.org/content/repositories/releases" }
+    maven { url "http://repo1.maven.org/maven2/" }
+  }
+}
+
+versioneye {
+    includeSubProjects = true
+}

ddo-core/build.gradle

@@ -0,0 +1,92 @@
+plugins {
+
+    id "scala"
+    id "com.diffplug.gradle.spotless" version "3.10.0"
+    id "com.github.maiflai.scalatest" version "0.19"
+    id "org.scoverage" version "2.1.0"
+
+}
+
+sourceSets {
+    test {
+        scala {
+            srcDirs('src/test/scala')
+            exclude '**/*Spec.scala'
+            exclude '**/*Helper*'
+            exclude '**/*Builder*'
+            include '**/*Test.scala'
+
+        }
+    }
+    acceptanceTest {
+        scala {
+                srcDir 'src/specs/scala'
+        }
+        resources {
+            srcDirs( 'src/specs/resources','src/test/specs')
+        }
+        compileClasspath += sourceSets.main.runtimeClasspath
+        compileClasspath += sourceSets.test.runtimeClasspath
+    }
+}
+
+
+
+task acceptanceTest(type: Test) {
+    description = "Runs Acceptance Tests"
+    testClassesDirs = sourceSets.acceptanceTest.output.classesDirs
+    classpath += sourceSets.acceptanceTest.runtimeClasspath
+
+}
+
+acceptanceTest.mustRunAfter(test)
+acceptanceTest.testLogging.showStandardStreams = true   // display test output on console
+acceptanceTest.systemProperties['concordion.output.dir'] = "$reporting.baseDir/spec"  // write output to build/reports/spec
+
+task allTests {
+    dependsOn tasks.withType(Test)
+}
+
+configure(acceptanceTest) {
+    group = 'verification'
+    description = 'Runs Acceptance Testing'
+}
+
+
+description = 'Core DDO Objects'
+dependencies {
+    compile group: 'org.scala-lang', name: 'scala-library', version:'2.12.3'
+    compile group: 'com.beachape', name: 'enumeratum_2.12', version:'1.5.10'
+    compile group: 'com.typesafe', name: 'config', version:'1.3.2'
+    compile group: 'com.github.kxbmap', name: 'configs_2.12', version:'0.4.4'
+    compile group: 'com.wix', name: 'accord-core_2.12', version:'0.7.1'
+    compile group: 'com.typesafe.scala-logging', name: 'scala-logging_2.12', version:'3.7.2'
+    compile group: 'ch.qos.logback', name: 'logback-classic', version:'1.2.3'
+    compile group: 'org.jetbrains', name: 'annotations', version:'15.0'
+    testCompile group: 'org.scalatest', name: 'scalatest_2.12', version:'3.0.0'
+    testRuntime 'org.pegdown:pegdown:1.4.2'
+    testCompile group: 'org.mockito', name: 'mockito-all', version:'2.0.2-beta'
+    testCompile group: 'junit', name: 'junit', version:'4.12'
+    testCompile group: 'org.concordion', name: 'concordion', version:'2.1.1'
+    testCompile group: 'org.concordion', name: 'concordion-embed-extension', version:'1.1.2'
+    testCompile group: 'org.concordion', name: 'concordion-collapse-output-extension', version:'1.0.0'
+    testCompile group: 'com.wix', name: 'accord-scalatest_2.12', version:'0.7.1'
+    testCompile group: 'de.neuland-bfi', name: 'jade4j', version:'1.2.7'
+    testCompile group: 'net.ruippeixotog', name: 'scala-scraper_2.12', version:'1.2.0'
+    // https://mvnrepository.com/artifact/org.scoverage/scalac-scoverage-plugin
+  //  provided group: 'org.scoverage', name: 'scalac-scoverage-plugin_2.12', version: '1.4.0-M2'
+
+    scoverage 'org.scoverage:scalac-scoverage-plugin_2.12:1.4.0-M2', 'org.scoverage:scalac-scoverage-runtime_2.12:1.4.0-M2'
+    compile  group: 'com.geirsson', name: 'scalafmt-core_2.11', version: '1.1.0'
+
+}
+
+spotless {
+    scala {
+        target  '**/scala/*.scala'
+       // exclude '**/.worksheet/*'
+        scalafmt()
+        // optional: you can specify a specific version or config file
+      //  scalafmt('0.5.1').configFile('scalafmt.conf')
+    }
+}

ddo-core/pom.xml

@@ -18,9 +18,7 @@
   <name>Core DDO Objects</name>
   <description>Basic traits and classes</description>
   <properties>
-    <specs.code.dir>src/specs/scala</specs.code.dir>
-    <specs.resource.dir>src/specs/resources</specs.resource.dir>
-    <specs.dir>src/test/specs</specs.dir>
+
   </properties>
   <dependencies>
     <!-- Scala -->

ddo-core/src/main/scala/org/aos/ddo/model/attribute/Attribute.scala

@@ -49,7 +49,7 @@ object Attribute extends Enum[Attribute] with SearchPrefix {
   override def searchPrefixSource: String = "Attribute"
 }
 
-trait Strength extends Attribute {
+protected trait Strength extends Attribute {
   override val abbr: String = "STR"
 
   def toFullWord: String = "Strength"

ddo-core/src/main/scala/org/aos/ddo/support/package.scala

@@ -17,10 +17,8 @@ package org.aos.ddo
 
 import com.typesafe.config.ConfigFactory
 import com.typesafe.scalalogging.LazyLogging
-import com.wix.accord.Descriptions.Description
 import com.wix.accord.Violation
 
-import scala.collection.immutable
 import scala.language.postfixOps
 import scala.util.Random
 import scala.util.control.Exception.catching
@@ -59,7 +57,7 @@ package object support extends LazyLogging {
     */
   object StringUtils {
 
-    def path = "org.aos.ddo.support"
+    private val path = "org.aos.ddo.support"
 
     implicit lazy val config: com.typesafe.config.Config = {
       val cfg = ConfigFactory.load
@@ -88,10 +86,19 @@ package object support extends LazyLogging {
     }
 
     implicit class StringImprovements(val s: String) {
+      /**
+        * Converts a String to an Optional Int.
+        * @return Some(Int) upon successful conversion or None for a failed attempt.
+        */
       def toIntOpt: Option[Int] =
         catching(classOf[NumberFormatException]) opt s.toInt
     }
 
+    /**
+      * Mostly String manipulation utility methods.
+      * Most methods are fluent if possible.
+      * @param s source string
+      */
     implicit class Extensions(val s: String) {
       def lowerCaseNoise: String = {
         val noise = config.getStringList("org.aos.ddo.support.noiseWords")
@@ -145,11 +152,19 @@ package object support extends LazyLogging {
         s.trim.filterAlphaNumeric
       }
 
+      /**
+        * Filters out non alphanumeric values.
+        * @return alphanumeric values.
+        */
       def filterAlphaNumeric: String =
         s.toCharArray.filter { x =>
           x.isLetterOrDigit
         }.mkString
 
+      /**
+        * Randomizes the case of the source string.
+        * @return source string with randomized upper and lower case characters.
+        */
       def randomCase: String = {
         val r = new Random
         s.toCharArray
@@ -208,7 +223,7 @@ package object support extends LazyLogging {
         .mkString
 
     /**
-      * Generate a random alphabnumeric string of length n
+      * Generate a random alphanumeric string of length n
       */
     def randomAlphanumericString(n: Int): String =
       randomString({
@@ -224,13 +239,11 @@ package object support extends LazyLogging {
     */
   object Validation {
 
-    import StringUtils.LineSep
-
     // scalastyle:off import.group
     /**
       * Extracts violation description and message text
       *
-      * @param v Volations
+      * @param v Violations
       * @return Printable list of violations.
       * @deprecated
       */

ddo-core/src/main/scala/org/aos/ddo/support/requisite/Requirement.scala

@@ -51,7 +51,7 @@ object Requirement extends Enum[Requirement] {
   /** @param id    the required race
     * @param level the minimum character level.
     * @example
-    * ReqRace("Drow",6) would represent a level 6 or greater player of the drow race.
+    * ReqRace("Drow",6) would represent a level 6 or greater player of the Drow race.
     */
   case class ReqRace(id: String, level: Int) extends Requirement {
     override def prefix: Option[String] = Some(Race.searchPrefixSource)