s3_website_monadic 0.0.13 → 0.0.14

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: f86d4b06157085efd1c389f9a8ec15bdd019aa66
-  data.tar.gz: b4b461eb8fd319a95b87231430831ca5fc56e288
+  metadata.gz: 1e02998ffcdd53134cc43365b7d958d6e5ac84d8
+  data.tar.gz: 06f5c5be34c990d4d8cef7fc03ed6993680a833c
 SHA512:
-  metadata.gz: 65805273617dcf99e2dedd7e32a7640fdc85fd40c055ecbe282be74bb050ab70d101cdbf5bb9c20cc703f6a1425f996c5d1a7ce972be8d203454c22682de9daf
-  data.tar.gz: 3f369bb8674f34540bdf5d39cff572542f93e9dced36a1aeab402213ebe1860e77f38ff058ad562a64f50fa1864718a2f90c19dd9a20a91fdf7d8108c0796ed3
+  metadata.gz: 8fd0bfa68863f8c6ac38bf2292deed7e6096e92625905dbf03e92af8c377e120d434e17c657361215ca692b6ba7c67d8efdf4a140b31ce8ba483916cfb5f00d0
+  data.tar.gz: 0df2a5712cf8fcbb144f586158fe7a6560566907b1864fe6d604c4de2775c43215eb460702bcebffbcc579d283187d450e3c55c317d73472924fb6afcc6f9a4e

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

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

@@ -61,7 +61,7 @@ object CloudFront {
   type CloudFrontClientProvider = (Config) => AmazonCloudFront
 
   case class SuccessfulInvalidation(invalidatedItemsCount: Int) extends SuccessReport {
-    def reportMessage = s"Invalidated $invalidatedItemsCount item(s) on CloudFront"
+    def reportMessage = s"Invalidated ${countToString(invalidatedItemsCount, "item")} on CloudFront"
   }
 
   case class FailedInvalidation(error: Throwable) extends FailureReport {

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

@@ -156,11 +156,11 @@ object Push {
           "There was nothing to push."
       case PushCounts(updates, newFiles, failures, redirects, deletes) =>
         val reportClauses: scala.collection.mutable.ArrayBuffer[String] = ArrayBuffer()
-        if (updates > 0)   reportClauses += s"Updated $updates file(s)."
-        if (newFiles > 0)  reportClauses += s"Created $newFiles file(s)."
-        if (failures > 0)  reportClauses += s"$failures operation(s) failed." // This includes both failed uploads and deletes.
-        if (redirects > 0) reportClauses += s"Applied $redirects redirect(s)."
-        if (deletes > 0)   reportClauses += s"Deleted $deletes files(s)."
+        if (updates > 0)   reportClauses += s"Updated ${countToString(updates, "file")}."
+        if (newFiles > 0)  reportClauses += s"Created ${countToString(newFiles, "file")}."
+        if (failures > 0)  reportClauses += s"${countToString(failures, "operation")} failed." // This includes both failed uploads and deletes.
+        if (redirects > 0) reportClauses += s"Applied ${countToString(redirects, "redirect")}."
+        if (deletes > 0)   reportClauses += s"Deleted ${countToString(deletes, "file")}."
         reportClauses.mkString(" ")
     }
 

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

@@ -150,7 +150,7 @@ object S3 {
       upload.uploadType match {
         case NewFile  => s"Created ${upload.s3Key} ($metadataReport)"
         case Update   => s"Updated ${upload.s3Key} ($metadataReport)"
-        case Redirect => s"Redirecting ${upload.essence.left.get.key} to ${upload.essence.left.get.redirectTarget}"
+        case Redirect => s"Redirected ${upload.essence.left.get.key} to ${upload.essence.left.get.redirectTarget}"
       }
 
     def s3Key = upload.s3Key

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

@@ -50,4 +50,9 @@ package object website {
       }
     httpStatusCode.exists(c => c >= 400 && c < 500)
   }
+  
+  def countToString(count: Int, singular: String) = {
+    def plural = s"${singular}s"
+    s"$count ${if (count > 1) plural else singular}"
+  }
 }

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: s3_website_monadic
 version: !ruby/object:Gem::Version
-  version: 0.0.13
+  version: 0.0.14
 platform: ruby
 authors:
 - Lauri Lehmijoki