s3_website 2.11.2 → 2.12.1

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
checksums.yaml CHANGED
@@ -1,7 +1,7 @@
1
1
  ---
2
2
  SHA1:
3
- metadata.gz: 92d89f42b813e2ab6e76df4a90e610446855d04a
4
- data.tar.gz: ccd002dff60a5e0fe3fe2f267e8f54dc097b70ca
3
+ metadata.gz: 0d072fe5e94c54fb0e8ebdd9bb02687a35de0f16
4
+ data.tar.gz: 0ec1b0c48ca905e36ddb7b93cc8055f0e046b6b5
5
5
  SHA512:
6
- metadata.gz: 805cf02a27b76ffcc325f042fa36a418517248283f65f4763a522736659c85cbf27ebf77de97248cc994ee2ff4c72eb7141187ff96c60145304e65727a2e660d
7
- data.tar.gz: 269d27d08c42d22af52e521b35a9eb8f6189d01b5a662769d24748c4ebb79b7531b2cae29e14657872fe0e92545d946992e46079433ef133837ece79001b68d1
6
+ metadata.gz: 226adb0f1d89d4be427dd9565450681762fcb6a5b12d770d53cc1cd383dc7573dd7fa79625853f2353eaf00e4fd32b5b22c7035db768b0ba64cd7aff3f04a55b
7
+ data.tar.gz: 5ec5fcd77f1b2d6c47049ea20f9886bbb5137216c234b5ea5ce912b55427f7d416b628cefff71f97242bb39470357c41f1e64780bdb14cfea11b0e8e71b2096f
data/README.md CHANGED
@@ -7,7 +7,7 @@
7
7
 
8
8
  * Create and configure an S3 website for you
9
9
  * Upload your static website to AWS S3
10
- * Jekyll and Nanoc are automatically supported
10
+ * [Jekyll](http://jekyllrb.com/), [Nanoc](http://nanoc.ws/), and [Middleman](https://middlemanapp.com/) are automatically supported
11
11
  * Help you use AWS Cloudfront to distribute your website
12
12
  * Improve page speed with HTTP cache control and gzipping
13
13
  * Set HTTP redirects for your website
@@ -74,8 +74,7 @@ syntax information.
74
74
  * Let the user have all the S3 website configurations in a file
75
75
  * Minimise or remove the need to use the AWS Console
76
76
  * Allow the user to deliver the website via CloudFront
77
- * Automatically detect the most common static website tools, such as Jekyll or
78
- Nanoc
77
+ * Automatically detect the most common static website tools, such as [Jekyll](http://jekyllrb.com/), [Nanoc](http://nanoc.ws/), and [Middleman](https://middlemanapp.com/).
79
78
  * Be simple to use: require only the S3 credentials and the name of the S3
80
79
  bucket
81
80
  * Let the power users benefit from advanced S3 website features such as
@@ -504,6 +503,7 @@ Contributors (in alphabetical order)
504
503
  * Philip I. Thomas
505
504
  * Philippe Creux
506
505
  * Piotr Janik
506
+ * PJ Kelly
507
507
  * Rodrigo Reis
508
508
  * Ross Hunter
509
509
  * Shigeaki Matsumura
data/changelog.md CHANGED
@@ -2,6 +2,14 @@
2
2
 
3
3
  This project uses [Semantic Versioning](http://semver.org).
4
4
 
5
+ ## 2.12.1
6
+
7
+ * Fix broken build
8
+
9
+ ## 2.12.0
10
+
11
+ * Automatically detect Middleman generated websites
12
+
5
13
  ## 2.11.2
6
14
 
7
15
  * A new fix based on
@@ -1,3 +1,3 @@
1
1
  module S3Website
2
- VERSION = '2.11.2'
2
+ VERSION = '2.12.1'
3
3
  end
@@ -1 +1 @@
1
- 3febc8bbb17976f9ea6555a11f1e513a
1
+ aafb2620c497bbcdaa0346efb4cc3c4b
@@ -9,7 +9,7 @@ trait Ssg {
9
9
  }
10
10
 
11
11
  object Ssg {
12
- val automaticallySupportedSiteGenerators = Jekyll :: Nanoc :: Nil
12
+ val automaticallySupportedSiteGenerators = Jekyll :: Nanoc :: Middleman :: Nil
13
13
 
14
14
  def autodetectSiteDir(workingDirectory: File): Option[File] =
15
15
  recursiveListFiles(workingDirectory).find { file =>
@@ -23,4 +23,8 @@ case object Jekyll extends Ssg {
23
23
 
24
24
  case object Nanoc extends Ssg {
25
25
  def outputDirectory = s"public${File.separatorChar}output"
26
- }
26
+ }
27
+
28
+ case object Middleman extends Ssg {
29
+ def outputDirectory = "build"
30
+ }
@@ -1058,6 +1058,14 @@ class S3WebsiteSpec extends Specification {
1058
1058
  }
1059
1059
  }
1060
1060
 
1061
+ "Middleman site" should {
1062
+ "be detected automatically" in new MiddlemanSite with EmptySite with MockAWS with DefaultRunMode {
1063
+ setLocalFile("index.html")
1064
+ push()
1065
+ sentPutObjectRequests.length must equalTo(1)
1066
+ }
1067
+ }
1068
+
1061
1069
  "the setting treat_zero_length_objects_as_redirects" should {
1062
1070
  "skip application of redirect on a zero-length S3 object" in new BasicSetup {
1063
1071
  config =
@@ -1106,11 +1114,11 @@ class S3WebsiteSpec extends Specification {
1106
1114
  sentPutObjectRequest.getRedirectLocation must equalTo("/index.html")
1107
1115
  }
1108
1116
  }
1109
-
1117
+
1110
1118
  trait BasicSetup extends SiteLocationFromCliArg with EmptySite with MockAWS with DefaultRunMode
1111
1119
 
1112
1120
  trait ForcePush extends SiteLocationFromCliArg with EmptySite with MockAWS with ForcePushMode
1113
-
1121
+
1114
1122
  trait DryRun extends SiteLocationFromCliArg with EmptySite with MockAWS with DryRunMode
1115
1123
 
1116
1124
  trait DefaultRunMode {
@@ -1311,6 +1319,11 @@ class S3WebsiteSpec extends Specification {
1311
1319
  val siteDirFromCLIArg = false
1312
1320
  }
1313
1321
 
1322
+ trait MiddlemanSite extends Directories {
1323
+ val siteDirectory = new File(workingDirectory, "build")
1324
+ val siteDirFromCLIArg = false
1325
+ }
1326
+
1314
1327
  trait CustomSiteDirectory extends Directories {
1315
1328
  val siteDirectory = randomDir()
1316
1329
  val siteDirFromCLIArg = false
metadata CHANGED
@@ -1,14 +1,14 @@
1
1
  --- !ruby/object:Gem::Specification
2
2
  name: s3_website
3
3
  version: !ruby/object:Gem::Version
4
- version: 2.11.2
4
+ version: 2.12.1
5
5
  platform: ruby
6
6
  authors:
7
7
  - Lauri Lehmijoki
8
8
  autorequire:
9
9
  bindir: bin
10
10
  cert_chain: []
11
- date: 2015-09-18 00:00:00.000000000 Z
11
+ date: 2015-09-21 00:00:00.000000000 Z
12
12
  dependencies:
13
13
  - !ruby/object:Gem::Dependency
14
14
  name: thor