s3_website 2.7.5 → 2.7.6

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: dc5f81b27a2eac7ab3ec3ad55e12c58535f27528
-  data.tar.gz: 887d9569fed07a82ce91d5c4b8489a2b09ff0ef4
+  metadata.gz: d299d7f67b1761c67dec45101228c871af587630
+  data.tar.gz: f422c6066800271303d189d4a205744508ca1a63
 SHA512:
-  metadata.gz: 7637867a9333db997119d2ef0fa61338aacd7914c27f3f6dd9b67cbaa606215427f498ad09da64ed2dcb0341d1d889a0413f7429a39cdd3524df9f5be5ba8d3d
-  data.tar.gz: 84adfe0f24852748e94c6c50d56522c06bb09e7fd3c9ae7a9d026ebe864e6bbbceec1cd7f9c4d1ad17e2c6b00ab921b1496f6cb9817f83564ae00241357511f9
+  metadata.gz: df7b35cc68abd07816902aa2b1753436b617fc46123d56fab1bf4f023416505f839b35fb21384de059c8ff82f9e6fd9b0283750615b15f1ed2295ac1295217f3
+  data.tar.gz: 6686e17eaa28e15c98eb7d8528ab993fb8a545faf9440fe1e0879c5c0c7caf9063e76442cfa46488787da6d680ae7d5773e355dfff42f1ff78f7d1b9391774e8

data/changelog.md

@@ -2,6 +2,12 @@
 
 This project uses [Semantic Versioning](http://semver.org).
 
+## 2.7.6
+
+* Null-check the result of File.listFiles
+
+  See <https://github.com/laurilehmijoki/s3_website/issues/145> for discussion.
+
 ## 2.7.5
 
 * Remove superfluous dot from error message

data/lib/s3_website/version.rb

@@ -1,3 +1,3 @@
 module S3Website
-  VERSION = '2.7.5'
+  VERSION = '2.7.6'
 end

data/src/main/scala/s3/website/Push.scala

@@ -83,30 +83,24 @@ object Push {
                 ): ExitCode = {
     logger.info(s"${Deploy.renderVerb} ${site.rootDirectory}/* to ${site.config.s3_bucket}")
     val s3FilesFuture = resolveS3Files()
-    val redirectsFuture: Redirects = resolveRedirects(s3FilesFuture)
-    val redirectReports: Future[Either[ErrorReport, Seq[Future[PushErrorOrSuccess]]]] =
-      redirectsFuture.map { (errOrRedirects: Either[ErrorReport, Seq[Redirect]]) =>
-        errOrRedirects.right.map(_.filter(_.needsUpload).map(S3 uploadRedirect _))
-      }
+    val redirectsFuture = resolveRedirects(s3FilesFuture)
+    val redirectReports = redirectsFuture.map { errOrRedirects =>
+      errOrRedirects.right.map(_.filter(_.needsUpload).map(S3 uploadRedirect _))
+    }
 
-    val uploadFutures: FutureUploads = resolveUploads(s3FilesFuture)
-    val uploadReports: Future[Either[ErrorReport, Seq[Future[PushErrorOrSuccess]]]] = for {
-      errorOrUploads: Either[ErrorReport, Seq[Upload]] <- uploadFutures
+    val uploadReports = for {
+      errorOrUploads <- resolveUploads(s3FilesFuture)
     } yield errorOrUploads.right.map(_.map(S3 uploadFile _))
 
-    val deleteReports: Future[Either[ErrorReport, Seq[Future[PushErrorOrSuccess]]]] = for {
-      errorOrUploads: Either[ErrorReport, Seq[Upload]] <- uploadFutures
-    } yield {
-      val errorsOrDeleteReports = redirectsFuture.flatMap { (errOrRedirects: Either[ErrorReport, Seq[Redirect]]) =>
-        errOrRedirects.fold(
-          err => Future(Left(err)),
-          redirects => resolveDeletes(s3FilesFuture, redirects)
-        )
-      }.map { (deletes: Either[ErrorReport, Seq[S3Key]]) =>
-        deletes.right.map(keysToDelete => keysToDelete.map(S3 delete _))
-      }
-      Await.result(errorsOrDeleteReports, 1 day)
+    val deleteReports = redirectsFuture flatMap { errOrRedirects =>
+      errOrRedirects.fold(
+        err => Future(Left(err)),
+        redirects => resolveDeletes(s3FilesFuture, redirects)
+      )
+    } map { deletes =>
+      deletes.right.map(keysToDelete => keysToDelete.map(S3 delete _))
     }
+
     val allReports = Future.sequence(redirectReports :: uploadReports :: deleteReports :: Nil) map { reports =>
       reports.foldLeft(Nil: PushReports) { (memo, report: Either[ErrorReport, Seq[Future[PushErrorOrSuccess]]]) =>
         report match {
@@ -120,7 +114,7 @@ object Push {
     val finishedPushOps = awaitForResults(Await.result(allReports, 1 day))
     val invalidationSucceeded = invalidateCloudFrontItems(finishedPushOps)
     
-    afterPushFinished(finishedPushOps, invalidationSucceeded)
+    report(finishedPushOps, invalidationSucceeded)
   }
   
   def invalidateCloudFrontItems
@@ -157,7 +151,7 @@ object Push {
 
   type InvalidationSucceeded = Boolean
 
-  def afterPushFinished(finishedPushOps: FinishedPushOperations, invalidationSucceeded: Option[Boolean])
+  def report(finishedPushOps: FinishedPushOperations, invalidationSucceeded: Option[Boolean])
                        (implicit config: Config, logger: Logger, pushOptions: PushOptions): ExitCode = {
     val pushCounts = resolvePushCounts(finishedPushOps)
     logger.info(s"Summary: ${pushCountsToString(pushCounts)}")

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

@@ -128,7 +128,10 @@ object Upload {
 object Files {
   def recursiveListFiles(f: File): Seq[File] = {
     val these = f.listFiles
-    these ++ these.filter(_.isDirectory).flatMap(recursiveListFiles)
+    if (these != null)
+      these ++ these.filter(_.isDirectory).flatMap(recursiveListFiles)
+    else
+      Nil
   }
 
   def listSiteFiles(implicit site: Site, logger: Logger) = {

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: s3_website
 version: !ruby/object:Gem::Version
-  version: 2.7.5
+  version: 2.7.6
 platform: ruby
 authors:
 - Lauri Lehmijoki
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-01-21 00:00:00.000000000 Z
+date: 2015-02-03 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: thor