s3_website 2.11.0 → 2.11.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 7df2add8f3589b718b7f8f1eca3cde4b7d03112b
-  data.tar.gz: eba43c04b20fc754a8cfe7c69b2a4cc596c03acd
+  metadata.gz: 5a112c263f78b49f6ef03c49c2bcbd1a87781153
+  data.tar.gz: 8358ef0acf575f7c06877725eabbc377673b3cc6
 SHA512:
-  metadata.gz: 26d815278b9d10e2238f52445436d8fd740d1415244c95c16dc3bf9563697ca68a1a82b943810ddf895389bd3d045cbdd27e72bc15503c970f564bd031b1bb14
-  data.tar.gz: 96f3b42495fc67196253d39d2614f9a3154b508962adf9b692141fed8152f03298cf9495482a0ea383d5ea382a2364a683e335191934c4cf0d1b0646b42513a0
+  metadata.gz: 5efa714adc8a6f6432f8791224b336dc763d3526d566e678c6f8d36add56777f5f0df097bfbe38189a622e1f4a69a107899b45a6014dc525ceec243095e25f1c
+  data.tar.gz: 06307dd8c0ef1dd324ca207f4d22eba8452a1101ccb16349e0c672d4ae344aa96d314775c6985bd49217aab2eb2d7b74a2d344df434ffc13193e605d1b5f794d

data/changelog.md

@@ -2,6 +2,12 @@
 
 This project uses [Semantic Versioning](http://semver.org).
 
+## 2.11.1
+
+* Prevent runaway recursion in file listing
+
+  See <https://github.com/laurilehmijoki/s3_website/issues/181> for discussion
+
 ## 2.11.0
 
 * Add the `s3_key_prefix` setting

data/lib/s3_website/version.rb

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

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

@@ -119,10 +119,10 @@ object Upload {
 }
 
 object Files {
-  def recursiveListFiles(f: File): Seq[File] = {
+  def recursiveListFiles(maxDepth: Int = Integer.MAX_VALUE)(f: File): Seq[File] = {
     val these = f.listFiles
     if (these != null)
-      these ++ these.filter(_.isDirectory).flatMap(recursiveListFiles)
+      these ++ these.filter(_.isDirectory).flatMap(recursiveListFiles(maxDepth - 1))
     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,8 +11,10 @@ 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(workingDirectory).find { file =>
+    recursiveListFiles(maxAutodetectDepth)(workingDirectory).find { file =>
       file.isDirectory && automaticallySupportedSiteGenerators.exists(ssg => file.getAbsolutePath.endsWith(ssg.outputDirectory))
     }
 }
@@ -22,5 +24,5 @@ case object Jekyll extends Ssg {
 }
 
 case object Nanoc extends Ssg {
-  def outputDirectory = "public/output"
+  def outputDirectory = s"public${File.separatorChar}output"
 }

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: s3_website
 version: !ruby/object:Gem::Version
-  version: 2.11.0
+  version: 2.11.1
 platform: ruby
 authors:
 - Lauri Lehmijoki
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-07-27 00:00:00.000000000 Z
+date: 2015-09-18 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: thor