s3_website 2.11.1 → 2.11.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 5a112c263f78b49f6ef03c49c2bcbd1a87781153
-  data.tar.gz: 8358ef0acf575f7c06877725eabbc377673b3cc6
+  metadata.gz: 92d89f42b813e2ab6e76df4a90e610446855d04a
+  data.tar.gz: ccd002dff60a5e0fe3fe2f267e8f54dc097b70ca
 SHA512:
-  metadata.gz: 5efa714adc8a6f6432f8791224b336dc763d3526d566e678c6f8d36add56777f5f0df097bfbe38189a622e1f4a69a107899b45a6014dc525ceec243095e25f1c
-  data.tar.gz: 06307dd8c0ef1dd324ca207f4d22eba8452a1101ccb16349e0c672d4ae344aa96d314775c6985bd49217aab2eb2d7b74a2d344df434ffc13193e605d1b5f794d
+  metadata.gz: 805cf02a27b76ffcc325f042fa36a418517248283f65f4763a522736659c85cbf27ebf77de97248cc994ee2ff4c72eb7141187ff96c60145304e65727a2e660d
+  data.tar.gz: 269d27d08c42d22af52e521b35a9eb8f6189d01b5a662769d24748c4ebb79b7531b2cae29e14657872fe0e92545d946992e46079433ef133837ece79001b68d1

data/changelog.md

@@ -2,6 +2,11 @@
 
 This project uses [Semantic Versioning](http://semver.org).
 
+## 2.11.2
+
+* A new fix based on
+  <https://github.com/laurilehmijoki/s3_website/issues/181#issuecomment-141397992>
+
 ## 2.11.1
 
 * Prevent runaway recursion in file listing

data/lib/s3_website/version.rb

@@ -1,3 +1,3 @@
 module S3Website
-  VERSION = '2.11.1'
+  VERSION = '2.11.2'
 end

data/src/main/scala/s3/website/model/Site.scala

@@ -101,7 +101,7 @@ object Site {
         |   site: dist/website""".stripMargin
 
   def resolveSiteDir(implicit yamlConfig: S3_website_yml, config: Config, cliArgs: CliArgs, workingDirectory: File): Either[ErrorReport, File] = {
-    val siteFromAutoDetect = autodetectSiteDir(workingDirectory)
+    val siteFromAutoDetect = if (config.site.isEmpty) { autodetectSiteDir(workingDirectory) } else { None }
     val errOrSiteFromCliArgs: Either[ErrorReport, Option[File]] = Option(cliArgs.site) match {
       case Some(siteDirFromCliArgs) =>
         val f = new File(siteDirFromCliArgs)

data/src/main/scala/s3/website/model/push.scala

@@ -119,10 +119,10 @@ object Upload {
 }
 
 object Files {
-  def recursiveListFiles(maxDepth: Int = Integer.MAX_VALUE)(f: File): Seq[File] = {
+  def recursiveListFiles(f: File): Seq[File] = {
     val these = f.listFiles
     if (these != null)
-      these ++ these.filter(_.isDirectory).flatMap(recursiveListFiles(maxDepth - 1))
+      these ++ these.filter(_.isDirectory).flatMap(recursiveListFiles)
     else
       Nil
   }
@@ -137,7 +137,7 @@ object Files {
       if (doNotUpload) logger.debug(s"Excluded $s3Key from upload")
       doNotUpload
     }
-    recursiveListFiles()(site.rootDirectory)
+    recursiveListFiles(site.rootDirectory)
       .filterNot(_.isDirectory)
       .filterNot(f => excludeFromUpload(site.resolveS3Key(f)))
   }

data/src/main/scala/s3/website/model/ssg.scala

@@ -11,10 +11,8 @@ trait Ssg {
 object Ssg {
   val automaticallySupportedSiteGenerators = Jekyll :: Nanoc :: Nil
 
-  val maxAutodetectDepth = automaticallySupportedSiteGenerators.map(_.outputDirectory).map(_.split(File.separatorChar).length).max
-
   def autodetectSiteDir(workingDirectory: File): Option[File] =
-    recursiveListFiles(maxAutodetectDepth)(workingDirectory).find { file =>
+    recursiveListFiles(workingDirectory).find { file =>
       file.isDirectory && automaticallySupportedSiteGenerators.exists(ssg => file.getAbsolutePath.endsWith(ssg.outputDirectory))
     }
 }

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: s3_website
 version: !ruby/object:Gem::Version
-  version: 2.11.1
+  version: 2.11.2
 platform: ruby
 authors:
 - Lauri Lehmijoki