s3_website 2.15.1 → 2.16.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 74e389d709a1b22628c825ed08d0b10ed70a3203
-  data.tar.gz: 36fe9d03a05edd81fe46d640a658adab56190d82
+  metadata.gz: dbdc951c8ea3b23bf048f87a0933c7b9d628051d
+  data.tar.gz: 421087147bcdc04094e45bb5b1b30e88e151f86e
 SHA512:
-  metadata.gz: f7e14464bf2b8a3b3ea49f475dce49fc8642f5710a6c9e2b6bd07c4d7b2522854fd6e603c0c913fd2ad899804d11d638949fc2e56eb16556e88c80828bd69df7
-  data.tar.gz: 7b30125db36d4bbbca1443c2455e2f71a1d38205a7e1622963a334ca634d314212c41f9e072dd5a6e51677844385f5a3e6f0cd7714bc286c406d1b735d78c712
+  metadata.gz: a3a4f0b01963fead41546f12aaebe02569b5f801fc8824ea946094172079da18e3655c0121f671e1eb2fcf0503a84159125da68817e07d398784e529a7b49bdf
+  data.tar.gz: 2b833de71c10e473b022e40c119d18c0cc74d3159ddaecd9fff51ba67bd7bb948f65a7f5afdeea4c5e49294454a34006b4d38ca279bde688832a9fabd0df6d26

data/README.md

@@ -25,7 +25,7 @@ and [Java](http://java.com) to run. (S3_website is partly written in Scala, henc
 Here's how you can get started:
 
 * Create API credentials that have sufficient permissions to S3. More info
-  [here](additional-docs/setting-up-aws-credentials.md).
+  [here](https://github.com/laurilehmijoki/s3_website/tree/master/additional-docs/setting-up-aws-credentials.md).
 * Go to your website directory
 * Run `s3_website cfg create`. This generates a configuration file called `s3_website.yml`.
 * Put your AWS credentials and the S3 bucket name into the file
@@ -525,6 +525,8 @@ See the [Contributors](https://github.com/laurilehmijoki/s3_website/graphs/contr
 ## Community articles
 
 * [Deploying websites to FTP or Amazon S3 with BitBucket Pipelines](https://www.savjee.be/2016/06/Deploying-website-to-ftp-or-amazon-s3-with-BitBucket-Pipelines/)
+* [How To: Hosting on Amazon S3 with CloudFront](https://paulstamatiou.com/hosting-on-amazon-s3-with-cloudfront/)
+* [PageSpeed 100 with Jekyll, S3 and CloudFront](https://habd.as/pagespeed-100-with-jekyll-s3-and-cloudfront/)
 
 ## Donations
 

data/bin/s3_website

@@ -124,6 +124,17 @@ class Cli < Thor
     end
   end
 
+  desc 'install', 'Download s3_website.jar'
+  long_desc <<-LONGDESC
+    Use `s3_website install` to download the s3_website.jar dependency
+    before you run `s3_website push` (good for CI dependency caching).
+  LONGDESC
+  def install
+    project_root = File.expand_path(File.dirname(__FILE__)+ '/..')
+    logger = Logger.new(options[:verbose])
+    resolve_jar(project_root, logger)
+  end
+
   desc 'cfg SUBCOMMAND ...ARGS', 'Operate on the config file'
   subcommand 'cfg', Cfg
 end

data/changelog.md

@@ -2,6 +2,10 @@
 
 This project uses [Semantic Versioning](http://semver.org).
 
+## 2.16.0
+
+* Add command `s3_website install`
+
 ## 2.15.1
 
 * Support all AWS regions

data/lib/s3_website/version.rb

@@ -1,3 +1,3 @@
 module S3Website
-  VERSION = '2.15.1'
+  VERSION = '2.16.0'
 end

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

@@ -132,7 +132,7 @@ object Config {
 
   def loadEndpoint(implicit unsafeYaml: UnsafeYaml): Either[ErrorReport, Option[S3Endpoint]] =
     loadOptionalString("s3_endpoint").right map { endpointString =>
-      endpointString.map(S3Endpoint(_))
+      endpointString.map(S3Endpoint.fromString)
     }
 
   def loadRedirects(s3_key_prefix: Option[String])(implicit unsafeYaml: UnsafeYaml): Either[ErrorReport, Option[Map[S3Key, String]]] = {

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

@@ -1,12 +1,11 @@
 package s3.website.model
 
 case class S3Endpoint(
-  s3WebsiteHostname: String,
-  s3Hostname: String
+  s3WebsiteHostname: String
 )
 
 object S3Endpoint {
-  def defaultEndpoint = S3Endpoint("us-east-1")
+  def defaultEndpoint = S3Endpoint.fromString("us-east-1")
 
   val oldRegions = Seq(
     "us-east-1",
@@ -19,9 +18,9 @@ object S3Endpoint {
     "sa-east-1"
   )
 
-  def apply(region: String): S3Endpoint = {
+  def fromString(region: String): S3Endpoint = {
     if (region == "EU") {
-      return S3Endpoint("eu-west-1")
+      return S3Endpoint.fromString("eu-west-1")
     }
 
     val isOldRegion = oldRegions.contains(region)
@@ -30,14 +29,7 @@ object S3Endpoint {
         s"s3-website-$region.amazonaws.com"
       else
         s"s3-website.$region.amazonaws.com"
-    val s3Hostname =
-      if (region == "us-east-1")
-        "s3.amazonaws.com"
-      else if (isOldRegion)
-        s"s3-$region.amazonaws.com"
-      else
-        s"s3.$region.amazonaws.com"
 
-    S3Endpoint(s3WebsiteHostname = s3WebsiteHostname, s3Hostname = s3Hostname)
+    S3Endpoint(s3WebsiteHostname = s3WebsiteHostname)
   }
 }

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

@@ -1,20 +1,16 @@
 package s3.website.model
 
-import com.amazonaws.services.s3.model.S3ObjectSummary
+import java.io.File.createTempFile
 import java.io._
-
-import org.apache.commons.codec.digest.DigestUtils
 import java.util.zip.{GZIPInputStream, GZIPOutputStream}
 
+import com.amazonaws.services.s3.model.S3ObjectSummary
+import org.apache.commons.codec.digest.DigestUtils
+import org.apache.commons.io.IOUtils
 import org.apache.tika.Tika
-import s3.website.Ruby._
 import s3.website._
+import s3.website.model.Encoding.{Gzip, Zopfli}
 import s3.website.model.Upload.{amountOfMagicGzipBytes, tika}
-import s3.website.model.Encoding.{Gzip, Zopfli, encodingOnS3}
-import java.io.File.createTempFile
-
-import org.apache.commons.io.{FileUtils, IOUtils}
-import org.apache.commons.io.IOUtils._
 
 import scala.concurrent.{ExecutionContextExecutor, Future}
 import scala.util.Try
@@ -25,20 +21,6 @@ object Encoding {
 
   case class Gzip()
   case class Zopfli()
-
-  def encodingOnS3(s3Key: S3Key)(implicit config: Config): Option[Either[Gzip, Zopfli]] =
-    config.gzip.flatMap { (gzipSetting: Either[Boolean, Seq[String]]) =>
-      val shouldZipThisFile = gzipSetting.fold(
-        shouldGzip => defaultGzipExtensions exists s3Key.key.endsWith,
-        fileExtensions => fileExtensions exists s3Key.key.endsWith
-      )
-      if (shouldZipThisFile && config.gzip_zopfli.isDefined)
-        Some(Right(Zopfli()))
-      else if (shouldZipThisFile)
-        Some(Left(Gzip()))
-      else
-        None
-    }
 }
 
 sealed trait UploadType {
@@ -59,7 +41,20 @@ case object RedirectFile extends UploadType {
 case class Upload(originalFile: File, uploadType: UploadType)(implicit site: Site, logger: Logger) {
   lazy val s3Key = site.resolveS3Key(originalFile)
 
-  lazy val encodingOnS3 = Encoding.encodingOnS3(s3Key)
+  lazy val encodingOnS3: Option[Either[Gzip, Zopfli]] =
+    site.config.gzip.flatMap { (gzipSetting: Either[Boolean, Seq[String]]) =>
+      val shouldZipThisFile = gzipSetting.fold(
+        shouldGzip => Encoding.defaultGzipExtensions exists s3Key.key.endsWith,
+        fileExtensions => fileExtensions exists s3Key.key.endsWith
+      )
+      if (shouldZipThisFile && site.config.gzip_zopfli.isDefined)
+        Some(Right(Zopfli()))
+      else if (shouldZipThisFile)
+        Some(Left(Gzip()))
+      else
+        None
+    }
+
   lazy val gzipEnabledByConfig: Boolean = encodingOnS3.fold(false)((algorithm: Either[Gzip, Zopfli]) => true)
 
   lazy val contentType: Try[String] = tika map { tika =>

data/src/test/scala/s3/website/S3EndpointSpec.scala

@@ -0,0 +1,15 @@
+package s3.website
+
+import org.specs2.mutable.Specification
+import s3.website.model.S3Endpoint
+
+class S3EndpointSpec extends Specification {
+
+  "S3Endpoint" should {
+    "map EU to eu-west-1" in {
+      S3Endpoint.fromString("EU").s3WebsiteHostname must equalTo("s3-website-eu-west-1.amazonaws.com")
+    }
+  }
+
+}
+

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: s3_website
 version: !ruby/object:Gem::Version
-  version: 2.15.1
+  version: 2.16.0
 platform: ruby
 authors:
 - Lauri Lehmijoki
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-09-07 00:00:00.000000000 Z
+date: 2016-10-25 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: thor
@@ -142,6 +142,7 @@ files:
 - src/main/scala/s3/website/model/ssg.scala
 - src/main/scala/s3/website/package.scala
 - src/test/scala/s3/website/AwsSdkSpec.scala
+- src/test/scala/s3/website/S3EndpointSpec.scala
 - src/test/scala/s3/website/S3WebsiteSpec.scala
 - src/test/scala/s3/website/UnitTest.scala
 - vagrant/Vagrantfile
@@ -171,5 +172,6 @@ specification_version: 4
 summary: Manage your S3 website
 test_files:
 - src/test/scala/s3/website/AwsSdkSpec.scala
+- src/test/scala/s3/website/S3EndpointSpec.scala
 - src/test/scala/s3/website/S3WebsiteSpec.scala
 - src/test/scala/s3/website/UnitTest.scala