s3_website 2.11.2 → 2.12.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 92d89f42b813e2ab6e76df4a90e610446855d04a
-  data.tar.gz: ccd002dff60a5e0fe3fe2f267e8f54dc097b70ca
+  metadata.gz: 0d072fe5e94c54fb0e8ebdd9bb02687a35de0f16
+  data.tar.gz: 0ec1b0c48ca905e36ddb7b93cc8055f0e046b6b5
 SHA512:
-  metadata.gz: 805cf02a27b76ffcc325f042fa36a418517248283f65f4763a522736659c85cbf27ebf77de97248cc994ee2ff4c72eb7141187ff96c60145304e65727a2e660d
-  data.tar.gz: 269d27d08c42d22af52e521b35a9eb8f6189d01b5a662769d24748c4ebb79b7531b2cae29e14657872fe0e92545d946992e46079433ef133837ece79001b68d1
+  metadata.gz: 226adb0f1d89d4be427dd9565450681762fcb6a5b12d770d53cc1cd383dc7573dd7fa79625853f2353eaf00e4fd32b5b22c7035db768b0ba64cd7aff3f04a55b
+  data.tar.gz: 5ec5fcd77f1b2d6c47049ea20f9886bbb5137216c234b5ea5ce912b55427f7d416b628cefff71f97242bb39470357c41f1e64780bdb14cfea11b0e8e71b2096f

data/README.md

@@ -7,7 +7,7 @@
 
 * Create and configure an S3 website for you
 * Upload your static website to AWS S3
- * Jekyll and Nanoc are automatically supported
+* [Jekyll](http://jekyllrb.com/), [Nanoc](http://nanoc.ws/), and [Middleman](https://middlemanapp.com/) are automatically supported
 * Help you use AWS Cloudfront to distribute your website
 * Improve page speed with HTTP cache control and gzipping
 * Set HTTP redirects for your website
@@ -74,8 +74,7 @@ syntax information.
 * Let the user have all the S3 website configurations in a file
 * Minimise or remove the need to use the AWS Console
 * Allow the user to deliver the website via CloudFront
-* Automatically detect the most common static website tools, such as Jekyll or
-  Nanoc
+* Automatically detect the most common static website tools, such as [Jekyll](http://jekyllrb.com/), [Nanoc](http://nanoc.ws/), and [Middleman](https://middlemanapp.com/).
 * Be simple to use: require only the S3 credentials and the name of the S3
   bucket
 * Let the power users benefit from advanced S3 website features such as
@@ -504,6 +503,7 @@ Contributors (in alphabetical order)
 * Philip I. Thomas
 * Philippe Creux
 * Piotr Janik
+* PJ Kelly
 * Rodrigo Reis
 * Ross Hunter
 * Shigeaki Matsumura

data/changelog.md

@@ -2,6 +2,14 @@
 
 This project uses [Semantic Versioning](http://semver.org).
 
+## 2.12.1
+
+* Fix broken build
+
+## 2.12.0
+
+* Automatically detect Middleman generated websites
+
 ## 2.11.2
 
 * A new fix based on

data/lib/s3_website/version.rb

@@ -1,3 +1,3 @@
 module S3Website
-  VERSION = '2.11.2'
+  VERSION = '2.12.1'
 end

data/resources/s3_website.jar.md5

@@ -1 +1 @@
-3febc8bbb17976f9ea6555a11f1e513a
+aafb2620c497bbcdaa0346efb4cc3c4b

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

@@ -9,7 +9,7 @@ trait Ssg {
 }
 
 object Ssg {
-  val automaticallySupportedSiteGenerators = Jekyll :: Nanoc :: Nil
+  val automaticallySupportedSiteGenerators = Jekyll :: Nanoc :: Middleman :: Nil
 
   def autodetectSiteDir(workingDirectory: File): Option[File] =
     recursiveListFiles(workingDirectory).find { file =>
@@ -23,4 +23,8 @@ case object Jekyll extends Ssg {
 
 case object Nanoc extends Ssg {
   def outputDirectory = s"public${File.separatorChar}output"
-}
+}
+
+case object Middleman extends Ssg {
+  def outputDirectory = "build"
+}

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

@@ -1058,6 +1058,14 @@ class S3WebsiteSpec extends Specification {
     }
   }
 
+  "Middleman site" should {
+    "be detected automatically" in new MiddlemanSite with EmptySite with MockAWS with DefaultRunMode {
+      setLocalFile("index.html")
+      push()
+      sentPutObjectRequests.length must equalTo(1)
+    }
+  }
+
   "the setting treat_zero_length_objects_as_redirects" should {
     "skip application of redirect on a zero-length S3 object" in new BasicSetup {
       config =
@@ -1106,11 +1114,11 @@ class S3WebsiteSpec extends Specification {
       sentPutObjectRequest.getRedirectLocation must equalTo("/index.html")
     }
   }
-  
+
   trait BasicSetup extends SiteLocationFromCliArg with EmptySite with MockAWS with DefaultRunMode
 
   trait ForcePush extends SiteLocationFromCliArg with EmptySite with MockAWS with ForcePushMode
-  
+
   trait DryRun extends SiteLocationFromCliArg with EmptySite with MockAWS with DryRunMode
 
   trait DefaultRunMode {
@@ -1311,6 +1319,11 @@ class S3WebsiteSpec extends Specification {
     val siteDirFromCLIArg = false
   }
 
+  trait MiddlemanSite extends Directories {
+    val siteDirectory = new File(workingDirectory, "build")
+    val siteDirFromCLIArg = false
+  }
+
   trait CustomSiteDirectory extends Directories {
     val siteDirectory = randomDir()
     val siteDirFromCLIArg = false

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: s3_website
 version: !ruby/object:Gem::Version
-  version: 2.11.2
+  version: 2.12.1
 platform: ruby
 authors:
 - Lauri Lehmijoki
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-09-18 00:00:00.000000000 Z
+date: 2015-09-21 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: thor