s3_website_monadic 0.0.2 → 0.0.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 1b39d4d1d20defd7527cb94c4e9422d7a7c3f98a
-  data.tar.gz: 721a74c7dc1cb81cf811bac6b67334e75b6f1bf6
+  metadata.gz: 9f36d81a978b21bdb205386ffe7b805d2ac3c0ae
+  data.tar.gz: 022c4ed32cbe3a433d32e43a5b1c71344885aad7
 SHA512:
-  metadata.gz: 6ffac27b46bb71d1b31734ea1026f8b9d0f3350d705d5a1d4c2e58b490924fd55c87b2e42eaa0c556d1b76010cbabcc36ef49d175c1f7984cf8981a57df2a1fb
-  data.tar.gz: afaafd4eeb5bb52de7b81b8ccb5122ddad8f941e79926187328d6f9865e80e810f04cc2366465fb381f4bef8293c5477ff1bc2c0538ce18e761cfeeab3dcd022
+  metadata.gz: 32c75ffe6fc5976b59b437a8c65eac3a9be89ffb8f59f1f0c19bb599087eac5674ddbe81e651eb71c4aa1cd2807ac78fb47da1089b1a4dc5b07623fb245d30e4
+  data.tar.gz: 2ac550438e430c5361ddf005dda7a07d4d099d4fb6bada1dafc88e8cf51252d1cbe8910458d86acbf0dcd650b0efefe05e7415312f335a852a04c128ff2f2952

data/README.md

@@ -17,8 +17,9 @@
 
     gem install s3_website
 
-`s3_website` requires Ruby. Here is documentation on installing Ruby:
-<http://www.ruby-lang.org/en/downloads/>.
+`s3_website` requires Ruby and Java. Here is documentation on installing Ruby:
+<http://www.ruby-lang.org/en/downloads/>. and here is documentation for Java:
+<http://www.oracle.com/technetwork/java/javase/downloads/index.html>.
 
 ## Usage
 

data/s3_website.gemspec

@@ -3,7 +3,7 @@ $:.push File.expand_path("../lib", __FILE__)
 
 Gem::Specification.new do |s|
   s.name        = "s3_website_monadic"
-  s.version     = "0.0.2"
+  s.version     = "0.0.3"
   s.platform    = Gem::Platform::RUBY
   s.authors     = ["Lauri Lehmijoki"]
   s.email       = ["lauri.lehmijoki@iki.fi"]

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

@@ -2,8 +2,6 @@ package s3.website
 
 import s3.website.model.Site._
 import scala.concurrent.{ExecutionContextExecutor, Future, Await}
-import scala.collection.parallel.ForkJoinTaskSupport
-import scala.concurrent.forkjoin.ForkJoinPool
 import scala.concurrent.duration._
 import com.lexicalscope.jewel.cli.CliFactory
 import scala.language.postfixOps
@@ -20,7 +18,7 @@ import s3.website.model.Update
 import s3.website.model.NewFile
 import s3.website.S3.PushSuccessReport
 import scala.collection.mutable.ArrayBuffer
-import s3.website.CloudFront.{SuccessfulInvalidation, FailedInvalidation, CloudFrontClientProvider, toInvalidationBatches}
+import s3.website.CloudFront.{CloudFrontClientProvider, toInvalidationBatches}
 import s3.website.S3.SuccessfulDelete
 import s3.website.CloudFront.SuccessfulInvalidation
 import s3.website.S3.SuccessfulUpload
@@ -36,21 +34,18 @@ object Push {
                 cloudFrontSleepTimeUnit: TimeUnit = MINUTES
                 ): ExitCode = {
     println(s"Deploying ${site.rootDirectory}/* to ${site.config.s3_bucket}")
+    val utils: Utils = new Utils
 
     val errorsOrReports = for {
       s3Files    <- resolveS3Files.right
       localFiles <- resolveLocalFiles.right
     } yield {
       val redirects = Redirect.resolveRedirects
-      val deleteReports: PushReports = resolveDeletes(localFiles, s3Files, redirects)
+      val deleteReports: PushReports = utils toParSeq resolveDeletes(localFiles, s3Files, redirects)
         .map { s3File => new S3() delete s3File.s3Key }
-        .map { Right(_) /* To make delete reports type-compatible with upload reports */ }
-        .par
-      deleteReports.tasksupport_=(new ForkJoinTaskSupport(new ForkJoinPool(site.config.concurrency_level)))
-      val uploadReports: PushReports = (redirects.toStream.map(Right(_)) ++ resolveUploads(localFiles, s3Files))
+        .map { Right(_) } // To make delete reports type-compatible with upload reports
+      val uploadReports: PushReports = utils toParSeq (redirects.toStream.map(Right(_)) ++ resolveUploads(localFiles, s3Files))
         .map { errorOrUpload => errorOrUpload.right.map(new S3() upload ) }
-        .par
-      uploadReports.tasksupport_=(new ForkJoinTaskSupport(new ForkJoinPool(site.config.concurrency_level)))
       uploadReports ++ deleteReports
     }
     val errorsOrFinishedPushOps: Either[Error, FinishedPushOperations] = errorsOrReports.right map {

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

@@ -26,11 +26,8 @@ class S3(implicit s3Client: S3ClientProvider) {
       val report = SuccessfulUpload(upload)
       println(report.reportMessage)
       Right(report)
-    } recover {
-      case error =>
-        val report = FailedUpload(upload.s3Key, error)
-        println(report.reportMessage)
-        Left(report)
+    } recover usingErrorHandler { error =>
+      FailedUpload(upload.s3Key, error)
     }
 
   def delete(s3Key: String)(implicit config: Config, executor: ExecutionContextExecutor): Future[Either[FailedDelete, SuccessfulDelete]] =
@@ -39,13 +36,17 @@ class S3(implicit s3Client: S3ClientProvider) {
       val report = SuccessfulDelete(s3Key)
       println(report.reportMessage)
       Right(report)
-    } recover {
-      case error =>
-        val report = FailedDelete(s3Key, error)
-        println(report.reportMessage)
-        Left(report)
+    } recover usingErrorHandler { error =>
+      FailedDelete(s3Key, error)
     }
 
+  def usingErrorHandler[T <: PushFailureReport, F <: PushFailureReport](f: (Throwable) => T): PartialFunction[Throwable, Either[T, F]] = {
+    case error =>
+      val report = f(error)
+      println(report.reportMessage)
+      Left(report)
+  }
+
   def toPutObjectRequest(upload: Upload)(implicit config: Config) =
     upload.essence.fold(
       redirect => {

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

@@ -0,0 +1,13 @@
+package s3.website
+
+import s3.website.model.Config
+import scala.collection.parallel.{ForkJoinTaskSupport, ParSeq}
+import scala.concurrent.forkjoin.ForkJoinPool
+
+class Utils(implicit config: Config) {
+  def toParSeq[T](seq: Seq[T]): ParSeq[T] = {
+    val parallelSeq: ParSeq[T] = seq.par
+    parallelSeq.tasksupport_=(new ForkJoinTaskSupport(new ForkJoinPool(config.concurrency_level)))
+    parallelSeq
+  }
+}

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: s3_website_monadic
 version: !ruby/object:Gem::Version
-  version: 0.0.2
+  version: 0.0.3
 platform: ruby
 authors:
 - Lauri Lehmijoki
@@ -372,6 +372,7 @@ files:
 - src/main/scala/s3/website/Push.scala
 - src/main/scala/s3/website/Ruby.scala
 - src/main/scala/s3/website/S3.scala
+- src/main/scala/s3/website/Utils.scala
 - src/main/scala/s3/website/model/Config.scala
 - src/main/scala/s3/website/model/S3Endpoint.scala
 - src/main/scala/s3/website/model/Site.scala