s3_website_monadic 0.0.3 → 0.0.4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 9f36d81a978b21bdb205386ffe7b805d2ac3c0ae
-  data.tar.gz: 022c4ed32cbe3a433d32e43a5b1c71344885aad7
+  metadata.gz: 001860d8f4b29eae3c6d2f4e71d4e815a09bd068
+  data.tar.gz: 2c39928790f622d404855dc548858bd06960c46a
 SHA512:
-  metadata.gz: 32c75ffe6fc5976b59b437a8c65eac3a9be89ffb8f59f1f0c19bb599087eac5674ddbe81e651eb71c4aa1cd2807ac78fb47da1089b1a4dc5b07623fb245d30e4
-  data.tar.gz: 2ac550438e430c5361ddf005dda7a07d4d099d4fb6bada1dafc88e8cf51252d1cbe8910458d86acbf0dcd650b0efefe05e7415312f335a852a04c128ff2f2952
+  metadata.gz: 1c33fa0f3299e3852a67bc2267f9afc8b6895833f9ce5007f5615aca50080f443fbe4f1ef84b92a36d062790179e3819686f1e797b4c8851b9e8340f5dd6d0d1
+  data.tar.gz: 620e2e04c5d145b2e86be58662c5669223f446ab480d8dd5259209c8b6ed2c0ea476d058160a0c545bee0677c766b608dfe5f997033c06e85446af2c0a99de0a

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.3"
+  s.version     = "0.0.4"
   s.platform    = Gem::Platform::RUBY
   s.authors     = ["Lauri Lehmijoki"]
   s.email       = ["lauri.lehmijoki@iki.fi"]

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

@@ -9,6 +9,12 @@ import scala.collection.JavaConversions._
 import scala.concurrent.duration._
 import s3.website.S3.{SuccessfulUpload, PushSuccessReport}
 import com.amazonaws.auth.BasicAWSCredentials
+import s3.website.Logger._
+import s3.website.S3.SuccessfulUpload
+import scala.util.Failure
+import s3.website.CloudFront.SuccessfulInvalidation
+import scala.util.Success
+import s3.website.CloudFront.FailedInvalidation
 
 class CloudFront(implicit cfClient: CloudFrontClientProvider, sleepUnit: TimeUnit) {
 
@@ -18,7 +24,7 @@ class CloudFront(implicit cfClient: CloudFrontClientProvider, sleepUnit: TimeUni
         val invalidationReq = new CreateInvalidationRequest(distributionId, invalidationBatch)
         cfClient(config).createInvalidation(invalidationReq)
         val result = SuccessfulInvalidation(invalidationBatch.getPaths.getItems.size())
-        println(s"Invalidated ${result.invalidatedItemsCount} item(s) on the CloudFront distribution $distributionId.")
+        info(result)
         result
       } recoverWith {
         case e: TooManyInvalidationsInProgressException =>
@@ -26,7 +32,7 @@ class CloudFront(implicit cfClient: CloudFrontClientProvider, sleepUnit: TimeUni
             (fibs drop attempt).head min 15, /* AWS docs way that invalidations complete in 15 minutes */
             sleepUnit
           )
-          println(maxInvalidationsExceededInfo)
+          pending(maxInvalidationsExceededInfo)
           Thread.sleep(duration.toMillis)
           tryInvalidate(attempt + 1)
       }
@@ -35,8 +41,9 @@ class CloudFront(implicit cfClient: CloudFrontClientProvider, sleepUnit: TimeUni
       case Success(res) =>
         Right(res)
       case Failure(err) =>
-        println(s"Failed to invalidate the CloudFront distribution $distributionId (${err.getMessage})")
-        Left(FailedInvalidation())
+        val report = FailedInvalidation(err)
+        info(report)
+        Left(report)
     }
   }
 
@@ -61,9 +68,13 @@ object CloudFront {
 
   type CloudFrontClientProvider = (Config) => AmazonCloudFront
 
-  case class SuccessfulInvalidation(invalidatedItemsCount: Int)
+  case class SuccessfulInvalidation(invalidatedItemsCount: Int) extends SuccessReport {
+    def reportMessage = s"Invalidated $invalidatedItemsCount item(s) on CloudFront"
+  }
 
-  case class FailedInvalidation()
+  case class FailedInvalidation(error: Throwable) extends FailureReport{
+    def reportMessage = s"Failed to invalidate the CloudFront distribution (${error.getMessage})"
+  }
 
   def awsCloudFrontClient(config: Config) =
     new AmazonCloudFrontClient(new BasicAWSCredentials(config.s3_id, config.s3_secret))

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

@@ -23,6 +23,15 @@ import s3.website.S3.SuccessfulDelete
 import s3.website.CloudFront.SuccessfulInvalidation
 import s3.website.S3.SuccessfulUpload
 import s3.website.CloudFront.FailedInvalidation
+import s3.website.Logger._
+import s3.website.S3.SuccessfulDelete
+import s3.website.CloudFront.SuccessfulInvalidation
+import s3.website.S3.SuccessfulUpload
+import s3.website.CloudFront.FailedInvalidation
+import s3.website.S3.SuccessfulDelete
+import s3.website.CloudFront.SuccessfulInvalidation
+import s3.website.S3.SuccessfulUpload
+import s3.website.CloudFront.FailedInvalidation
 
 object Push {
 
@@ -33,7 +42,7 @@ object Push {
                 cloudFrontClientProvider: CloudFrontClientProvider = CloudFront.awsCloudFrontClient,
                 cloudFrontSleepTimeUnit: TimeUnit = MINUTES
                 ): ExitCode = {
-    println(s"Deploying ${site.rootDirectory}/* to ${site.config.s3_bucket}")
+    info(s"Deploying ${site.rootDirectory}/* to ${site.config.s3_bucket}")
     val utils: Utils = new Utils
 
     val errorsOrReports = for {
@@ -93,11 +102,10 @@ object Push {
   def afterPushFinished(errorsOrFinishedUploads: Either[Error, FinishedPushOperations], invalidationSucceeded: Option[Boolean])(implicit config: Config): ExitCode = {
     errorsOrFinishedUploads.right.foreach { finishedUploads =>
       val pushCounts = pushCountsToString(resolvePushCounts(finishedUploads))
-      println(s"$pushCounts")
-      println(s"Go visit: http://${config.s3_bucket}.${config.s3_endpoint.s3WebsiteHostname}")
+      info(s"Summary: $pushCounts")
     }
-    errorsOrFinishedUploads.left foreach (err => println(s"Failed to push the site: ${err.message}"))
-    errorsOrFinishedUploads.fold(
+    errorsOrFinishedUploads.left foreach (err => fail(s"Encountered error: ${err.message}"))
+    val exitCode = errorsOrFinishedUploads.fold(
       _ => 1,
       finishedUploads => finishedUploads.foldLeft(0) { (memo, finishedUpload) =>
         memo + finishedUpload.fold(
@@ -109,6 +117,12 @@ object Push {
     ) max invalidationSucceeded.fold(0)(allInvalidationsSucceeded =>
       if (allInvalidationsSucceeded) 0 else 1
     )
+
+    if (exitCode == 0)
+      info(s"Successfully pushed the website to http://${config.s3_bucket}.${config.s3_endpoint.s3WebsiteHostname}")
+    else
+      fail(s"Failed to push the website to http://${config.s3_bucket}.${config.s3_endpoint.s3WebsiteHostname}")
+    exitCode
   }
 
   def awaitForUploads(uploadReports: PushReports)(implicit executor: ExecutionContextExecutor): FinishedPushOperations =
@@ -180,7 +194,7 @@ object Push {
         threadPool.shutdownNow()
         pushStatus
     }
-    errorOrPushStatus.left foreach (err => println(s"Could not load the site: ${err.message}"))
+    errorOrPushStatus.left foreach (err => fail(s"Could not load the site: ${err.message}"))
     System.exit(errorOrPushStatus.fold(_ => 1, pushStatus => pushStatus))
   }
 }

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

@@ -17,6 +17,16 @@ import scala.Some
 import s3.website.model.IOError
 import scala.util.Success
 import s3.website.model.UserError
+import s3.website.Logger._
+import s3.website.S3.SuccessfulUpload
+import s3.website.S3.SuccessfulDelete
+import s3.website.S3.FailedUpload
+import scala.util.Failure
+import scala.Some
+import s3.website.S3.FailedDelete
+import s3.website.model.IOError
+import scala.util.Success
+import s3.website.model.UserError
 
 class S3(implicit s3Client: S3ClientProvider) {
 
@@ -24,7 +34,7 @@ class S3(implicit s3Client: S3ClientProvider) {
     Future {
       s3Client(config) putObject toPutObjectRequest(upload)
       val report = SuccessfulUpload(upload)
-      println(report.reportMessage)
+      info(report)
       Right(report)
     } recover usingErrorHandler { error =>
       FailedUpload(upload.s3Key, error)
@@ -34,7 +44,7 @@ class S3(implicit s3Client: S3ClientProvider) {
     Future {
       s3Client(config) deleteObject(config.s3_bucket, s3Key)
       val report = SuccessfulDelete(s3Key)
-      println(report.reportMessage)
+      info(report)
       Right(report)
     } recover usingErrorHandler { error =>
       FailedDelete(s3Key, error)
@@ -43,7 +53,7 @@ class S3(implicit s3Client: S3ClientProvider) {
   def usingErrorHandler[T <: PushFailureReport, F <: PushFailureReport](f: (Throwable) => T): PartialFunction[Throwable, Either[T, F]] = {
     case error =>
       val report = f(error)
-      println(report.reportMessage)
+      info(report)
       Left(report)
   }
 
@@ -104,12 +114,8 @@ object S3 {
       summaries
   }
 
-  sealed trait PushItemReport {
-    def reportMessage: String
-  }
-
-  sealed trait PushFailureReport extends PushItemReport
-  sealed trait PushSuccessReport extends PushItemReport {
+  sealed trait PushFailureReport extends FailureReport
+  sealed trait PushSuccessReport extends SuccessReport {
     def s3Key: String
   }
 

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

@@ -11,3 +11,68 @@ class Utils(implicit config: Config) {
     parallelSeq
   }
 }
+
+object Logger {
+  import Rainbow._
+  def info(msg: String) = println(s"[${"info".blue}] $msg")
+  def fail(msg: String) = println(s"[${"fail".red}] $msg")
+
+  def info(report: SuccessReport) = println(s"[${"succ".green}] ${report.reportMessage}")
+  def info(report: FailureReport) = fail(report.reportMessage)
+
+  def pending(msg: String) = println(s"[${"wait".yellow}] $msg")
+}
+
+/**
+ * Idea copied from https://github.com/ktoso/scala-rainbow.
+ */
+object Rainbow {
+  implicit class RainbowString(val s: String) extends AnyVal {
+    import Console._
+
+    /** Colorize the given string foreground to ANSI black */
+    def black = BLACK + s + RESET
+    /** Colorize the given string foreground to ANSI red */
+    def red = RED + s + RESET
+    /** Colorize the given string foreground to ANSI red */
+    def green = GREEN + s + RESET
+    /** Colorize the given string foreground to ANSI red */
+    def yellow = YELLOW + s + RESET
+    /** Colorize the given string foreground to ANSI red */
+    def blue = BLUE + s + RESET
+    /** Colorize the given string foreground to ANSI red */
+    def magenta = MAGENTA + s + RESET
+    /** Colorize the given string foreground to ANSI red */
+    def cyan = CYAN + s + RESET
+    /** Colorize the given string foreground to ANSI red */
+    def white = WHITE + s + RESET
+
+    /** Colorize the given string background to ANSI red */
+    def onBlack = BLACK_B + s + RESET
+    /** Colorize the given string background to ANSI red */
+    def onRed = RED_B+ s + RESET
+    /** Colorize the given string background to ANSI red */
+    def onGreen = GREEN_B+ s + RESET
+    /** Colorize the given string background to ANSI red */
+    def onYellow = YELLOW_B + s + RESET
+    /** Colorize the given string background to ANSI red */
+    def onBlue = BLUE_B+ s + RESET
+    /** Colorize the given string background to ANSI red */
+    def onMagenta = MAGENTA_B + s + RESET
+    /** Colorize the given string background to ANSI red */
+    def onCyan = CYAN_B+ s + RESET
+    /** Colorize the given string background to ANSI red */
+    def onWhite = WHITE_B+ s + RESET
+
+    /** Make the given string bold */
+    def bold = BOLD + s + RESET
+    /** Underline the given string */
+    def underlined = UNDERLINED + s + RESET
+    /** Make the given string blink (some terminals may turn this off) */
+    def blink = BLINK + s + RESET
+    /** Reverse the ANSI colors of the given string */
+    def reversed = REVERSED + s + RESET
+    /** Make the given string invisible using ANSI color codes */
+    def invisible = INVISIBLE + s + RESET
+  }
+}

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

@@ -1,11 +1,15 @@
 package s3.website.model
 
 import java.io.File
-import scala.util.{Failure, Success, Try}
+import scala.util.Try
 import org.yaml.snakeyaml.Yaml
 import s3.website.model.Config._
 import scala.io.Source.fromFile
 import scala.language.postfixOps
+import s3.website.Logger._
+import scala.util.Failure
+import s3.website.model.Config.UnsafeYaml
+import scala.util.Success
 
 case class Site(rootDirectory: String, config: Config) {
   def resolveS3Key(file: File) = file.getAbsolutePath.replace(rootDirectory, "").replaceFirst("^/", "")
@@ -38,8 +42,8 @@ object Site {
           concurrency_level <- loadOptionalInt("concurrency_level").right
           redirects <- loadRedirects.right
         } yield {
-          gzip_zopfli.foreach(_ => println("zopfli is not currently supported"))
-          extensionless_mime_type.foreach(_ => println(
+          gzip_zopfli.foreach(_ => info("zopfli is not currently supported"))
+          extensionless_mime_type.foreach(_ => info(
             s"Ignoring the extensionless_mime_type setting in $yamlConfigPath. Counting on Apache Tika to infer correct mime types.")
           )
           Config(

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

@@ -0,0 +1,10 @@
+package s3
+
+package object website {
+  trait Report {
+    def reportMessage: String
+  }
+  trait SuccessReport extends Report
+
+  trait FailureReport extends Report
+}

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: s3_website_monadic
 version: !ruby/object:Gem::Version
-  version: 0.0.3
+  version: 0.0.4
 platform: ruby
 authors:
 - Lauri Lehmijoki
@@ -378,6 +378,7 @@ files:
 - src/main/scala/s3/website/model/Site.scala
 - src/main/scala/s3/website/model/errors.scala
 - src/main/scala/s3/website/model/push.scala
+- src/main/scala/s3/website/package.scala
 - src/test/scala/s3/website/S3WebsiteSpec.scala
 homepage: https://github.com/laurilehmijoki/s3_website
 licenses: