s3_website 2.1.12 → 2.1.13

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: a449c3c953cddea37d7efa16cae0007a968b6c6c
-  data.tar.gz: 070ec243442e743bb4a3435543c6035e2fa329b3
+  metadata.gz: 7f58dc2a4c31a05615ccfabc88ab06787fe6d9c2
+  data.tar.gz: 4848ab9653a8c796ee94fbd97ec59691d9b1e17b
 SHA512:
-  metadata.gz: e702135da6028c112ad3272e20dd26002ff8b7876c29c51b0be67e5f897f5bfe3fb12d4d33248c5814efb7040536b0eaff01a4effcce818489b64cd63a3a7e51
-  data.tar.gz: dd752d292566b6c9bb6c4ef026402b2cba9d92236187f9f54ba7b4585699823ccc4b8d54ee27e30de6eae40bc4dd01ad4551dda949dd7314c73989f17d9b5d94
+  metadata.gz: 33d258cac936218cd84292e0111dfa5edb4dcd792cf2a81693abcb446f161bb6bd33bb2a0cba3c6496df0d573307c1f0d34e735ce40d2c360483b58478ee75e5
+  data.tar.gz: af4dce07242118c7d680c252a10877347bca41ddba90a595c2bb4fd22bd5b4e93bd36a0e079e3a168e1d7c1c61f566d748220b352daba7992487546e7421cf2b

data/changelog.md

@@ -2,6 +2,12 @@
 
 This project uses [Semantic Versioning](http://semver.org).
 
+## 2.1.13
+
+* Print JVM stack trace on error and `--verbose`
+
+  This eases debugging
+
 ## 2.1.12
 
 * Exit with status 1 when encountering an unrecognised CLI option

data/lib/s3_website/version.rb

@@ -1,3 +1,3 @@
 module S3Website
-  VERSION = '2.1.12'
+  VERSION = '2.1.13'
 end

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

@@ -1,5 +1,6 @@
 package s3.website
 
+import s3.website.ErrorReport._
 import s3.website.model.{FileUpdate, Config}
 import com.amazonaws.services.cloudfront.{AmazonCloudFrontClient, AmazonCloudFront}
 import com.amazonaws.services.cloudfront.model.{TooManyInvalidationsInProgressException, Paths, InvalidationBatch, CreateInvalidationRequest}
@@ -60,8 +61,8 @@ object CloudFront {
     def reportMessage = s"${Invalidated.renderVerb} ${invalidatedItemsCount ofType "item"} on CloudFront"
   }
 
-  case class FailedInvalidation(error: Throwable) extends FailureReport {
-    def reportMessage = s"Failed to invalidate the CloudFront distribution (${error.getMessage})"
+  case class FailedInvalidation(error: Throwable)(implicit logger: Logger) extends ErrorReport {
+    def reportMessage = errorMessage(s"Failed to invalidate the CloudFront distribution", error)
   }
 
   def awsCloudFrontClient(config: Config) = new AmazonCloudFrontClient(awsCredentials(config))

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

@@ -8,7 +8,7 @@ class Logger(val verboseOutput: Boolean) {
   def fail(msg: String) = log(Failure, msg)
 
   def info(report: SuccessReport) = log(Success, report.reportMessage)
-  def info(report: FailureReport) = fail(report.reportMessage)
+  def info(report: ErrorReport) = fail(report.reportMessage)
 
   def pending(msg: String) = log(Wait, msg)
 

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

@@ -1,5 +1,6 @@
 package s3.website
 
+import s3.website.ErrorReport.errorMessage
 import s3.website.model._
 import com.amazonaws.services.s3.{AmazonS3, AmazonS3Client}
 import com.amazonaws.services.s3.model._
@@ -140,7 +141,7 @@ object S3 {
   type UpdateFutures = Seq[Either[ErrorReport, Future[PushErrorOrSuccess]]]
   type ErrorOrS3Files = Either[ErrorReport, Seq[S3File]]
 
-  sealed trait PushFailureReport extends FailureReport
+  sealed trait PushFailureReport extends ErrorReport
   sealed trait PushSuccessReport extends SuccessReport {
     def s3Key: String
   }
@@ -208,12 +209,12 @@ object S3 {
     def reportMessage = s"${Deleted.renderVerb} $s3Key"
   }
 
-  case class FailedUpload(s3Key: String, error: Throwable) extends PushFailureReport {
-    def reportMessage = s"Failed to upload $s3Key (${error.getMessage})"
+  case class FailedUpload(s3Key: String, error: Throwable)(implicit logger: Logger) extends PushFailureReport {
+    def reportMessage = errorMessage(s"Failed to upload $s3Key", error)
   }
 
-  case class FailedDelete(s3Key: String, error: Throwable) extends PushFailureReport {
-    def reportMessage = s"Failed to delete $s3Key (${error.getMessage})"
+  case class FailedDelete(s3Key: String, error: Throwable)(implicit logger: Logger) extends PushFailureReport {
+    def reportMessage = errorMessage(s"Failed to delete $s3Key", error)
   }
 
   type S3ClientProvider = (Config) => AmazonS3

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

@@ -13,25 +13,27 @@ package object website {
   }
   trait SuccessReport extends Report
 
-  trait FailureReport extends Report
-
   trait ErrorReport extends Report
 
   object ErrorReport {
     def apply(t: Throwable)(implicit logger: Logger) = new ErrorReport {
-      override def reportMessage = {
-        val extendedReport =
-          if (logger.verboseOutput)
-            Some(t.getStackTrace take 5)
-          else
-            None
-        s"${t.getMessage}${extendedReport.fold("")(stackTraceElems => "\n" + stackTraceElems.mkString("\n"))}"
-      }
+      override def reportMessage = errorMessage(t)
     }
 
     def apply(msg: String) = new ErrorReport {
       override def reportMessage = msg
     }
+
+    def errorMessage(msg: String, t: Throwable)(implicit logger: Logger): String = s"$msg (${errorMessage(t)})"
+
+    def errorMessage(t: Throwable)(implicit logger: Logger): String =  {
+      val extendedReport =
+        if (logger.verboseOutput)
+          Some(t.getStackTrace)
+        else
+          None
+      s"${t.getMessage}${extendedReport.fold("")(stackTraceElems => "\n" + stackTraceElems.mkString("\n"))}"
+    }
   }
 
   trait RetrySetting {

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: s3_website
 version: !ruby/object:Gem::Version
-  version: 2.1.12
+  version: 2.1.13
 platform: ruby
 authors:
 - Lauri Lehmijoki
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-06-27 00:00:00.000000000 Z
+date: 2014-06-28 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: thor