Upgrades sbt-org-policies and uses new method signature for fetching files (#173)

* Upgrades sbt-org-policies and uses new method signature for fetching files
* Uses orgScriptCI for Travis

Author: Fede Fernández

.travis.yml

@@ -16,10 +16,7 @@ install:
 - gem install sass
 - gem install jekyll -v 3.2.1
 script:
-- sbt compile publishLocal
-- sbt test scripted
-- sbt kazari/fullOptGenerate
-- sbt docs/tut
+- sbt orgScriptCI
 after_success:
 - if [ "$TRAVIS_BRANCH" = "master" -a "$TRAVIS_PULL_REQUEST" = "false" ]; then bash
   scripts/kazariBuild.sh; bash scripts/publishMicrosite.sh; fi

project/ProjectPlugin.scala

@@ -7,6 +7,10 @@ import sbt._
 import sbtbuildinfo.BuildInfoPlugin.autoImport._
 import sbtorgpolicies.OrgPoliciesPlugin
 import sbtorgpolicies.OrgPoliciesPlugin.autoImport._
+import sbtorgpolicies.runnable.syntax._
+import sbtorgpolicies.templates.badges._
+import tut.Plugin.tut
+import KazariBuild._
 
 object ProjectPlugin extends AutoPlugin {
 
@@ -26,7 +30,7 @@ object ProjectPlugin extends AutoPlugin {
       addSbtPlugin("org.tpolecat"     % "tut-plugin"  % "0.4.8"),
       libraryDependencies ++= Seq(
         %%("moultingyaml"),
-        "com.47deg"             %% "org-policies-core" % "0.4.13",
+        "com.47deg"             %% "org-policies-core" % "0.4.15",
         "com.lihaoyi"           %% "scalatags" % "0.6.0",
         "org.scalactic"         %% "scalactic" % "3.0.0",
         "com.sksamuel.scrimage" %% "scrimage-core" % "2.1.7",
@@ -64,7 +68,9 @@ object ProjectPlugin extends AutoPlugin {
       micrositeDocumentationUrl := "/sbt-microsites/docs/",
       micrositeGithubOwner := "47deg",
       micrositeGithubRepo := "sbt-microsites",
+      micrositeGithubToken := sys.env.get(orgGithubTokenSetting.value),
       micrositeHighlightTheme := "color-brewer",
+      micrositePushSiteWith := GitHub4s,
       includeFilter in makeSite := "*.html" | "*.css" | "*.png" | "*.jpg" | "*.gif" | "*.js" | "*.swf" | "*.md"
     )
 
@@ -114,6 +120,15 @@ object ProjectPlugin extends AutoPlugin {
       scalaVersion := "2.10.6",
       crossScalaVersions := Seq("2.10.6"),
       scalaOrganization := "org.scala-lang",
-      orgGithubTokenSetting := "GITHUB_TOKEN"
+      orgGithubTokenSetting := "GITHUB_TOKEN",
+      orgScriptTaskListSetting := List(
+        orgValidateFiles.asRunnableItem,
+        (clean in Global).asRunnableItemFull,
+        (compile in Compile).asRunnableItemFull,
+        (test in Test).asRunnableItemFull,
+        (publishLocal in Global).asRunnableItemFull,
+        (jsFullOptGenerateTask in ProjectRef(file("."), "kazari")).asRunnableItem,
+        (tut in ProjectRef(file("."), "docs")).asRunnableItem
+      )
     ) ++ shellPromptSettings
 }

project/build.properties

@@ -1 +1 @@
-sbt.version = 0.13.13
+sbt.version = 0.13.15

project/plugins.sbt

@@ -1,2 +1,2 @@
 libraryDependencies += "org.scala-sbt" % "scripted-plugin" % sbtVersion.value
-addSbtPlugin("com.47deg" % "sbt-org-policies" % "0.4.13")
+addSbtPlugin("com.47deg" % "sbt-org-policies" % "0.4.15")

src/main/scala/microsites/layouts/Layout.scala

@@ -16,6 +16,8 @@
 
 package microsites.layouts
 
+import java.io.File
+
 import microsites.MicrositeSettings
 import microsites.util.MicrositeHelper
 import sbtorgpolicies.io.FileReader
@@ -102,7 +104,7 @@ abstract class Layout(config: MicrositeSettings) {
   def styles: List[TypedTag[String]] = {
 
     val customCssList =
-      fr.fetchFilesRecursively(config.fileLocations.micrositeCssDirectory, List("css")) match {
+      fr.fetchFilesRecursively(List(config.fileLocations.micrositeCssDirectory), validFile("css")) match {
         case Right(cssList) =>
           cssList.map(css =>
             link(rel := "stylesheet", href := s"{{site.baseurl}}/css/${css.getName}"))
@@ -136,7 +138,7 @@ abstract class Layout(config: MicrositeSettings) {
   def scripts: List[TypedTag[String]] = {
 
     val customJsList =
-      fr.fetchFilesRecursively(config.fileLocations.micrositeJsDirectory, List("js")) match {
+      fr.fetchFilesRecursively(List(config.fileLocations.micrositeJsDirectory), validFile("js")) match {
         case Right(jsList) =>
           jsList.map(js => script(src := s"{{site.url}}{{site.baseurl}}/js/${js.getName}"))
         case _ => Nil
@@ -235,4 +237,7 @@ abstract class Layout(config: MicrositeSettings) {
         else ()
       )
     )
+
+  private[this] def validFile(extension: String)(file: File): Boolean =
+    file.getName.endsWith(s".$extension")
 }

version.sbt

@@ -1 +1 @@
-version in ThisBuild := "0.5.5-SNAPSHOT"
+version in ThisBuild := "0.5.5"