RubyGems - s3_website - Versions diffs - 1.0.2 → 1.0.3 - Mend

s3_website 1.0.2 → 1.0.3

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.

Files changed (13) hide show

checksums.yaml CHANGED Viewed

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 9db72b2e594d4960fbf0dd0cc2302f380aa776e4
-  data.tar.gz: d7de0719b35ba9639dc145fec0f7202921d7f791
+  metadata.gz: a6d978b88e689f1a6f7463c39696829fbdbc3a0b
+  data.tar.gz: e43484971117687e58977914ceb57e0e0841158f
 SHA512:
-  metadata.gz: 4fb0c3f83704ac818ec1e602f2f0cb1d1ff2cda38cc5c3f677892df3d5db61860d353fedb755fafc074f5354b3aee93928d2932fc43cb90f15c59110c03a0208
-  data.tar.gz: 6bbf791ff5e4628eead0f6e07e2b427df07a1b2c86fc04efe217227705b384272b6155c6f967a9e27fe4434b7f70d37a0e5e91159b70bca5fad4cf4835953259
+  metadata.gz: b58f0a2ba92a4a4d082fa82aee0720f2003d3591cff245e523428de9c3d8ccd3ce14fbb3d399c95f13df37c4f3dad5211ab70bcd992b1624297c9dad051e979a
+  data.tar.gz: d818c530894bca0b630eb77b14a73a5e5addb5e7f8d724a9411b188427e716f47f94da395fdaffc64b62cf53654773abd8a2f08b1a242e454575bd5dea4f26ab

data/changelog.md CHANGED Viewed

@@ -2,6 +2,10 @@
 This project uses [Semantic Versioning](http://semver.org).
+## 1.0.3
+* Reject blacklisted files in a more appropriate place
 ## 1.0.2
 * Never upload the file *s3_website.yml*

data/features/cassettes/cucumber_tags/empty-bucket.yml ADDED Viewed

@@ -0,0 +1,89 @@
+---
+http_interactions:
+- request:
+    method: get
+    uri: https://s3.amazonaws.com/another-s3-website-test.net?max-keys=1000
+    body:
+      encoding: US-ASCII
+      string: ''
+    headers:
+      Content-Type:
+      - ''
+      User-Agent:
+      - aws-sdk-ruby/1.8.5 ruby/2.0.0 x86_64-darwin11.4.2
+      Date:
+      - Sat, 20 Jul 2013 15:03:03 GMT
+      Authorization:
+      - AWS
+      Accept-Encoding:
+      - gzip;q=1.0,deflate;q=0.6,identity;q=0.3
+      Accept:
+      - '*/*'
+  response:
+    status:
+      code: 200
+      message: OK
+    headers:
+      X-Amz-Id-2:
+      - V9qlQNTysnd4Os0AwfWKWGMZ5Ho8DlbYiQFmZcuTMjVpPGHgZfQYuhTtNv2PERoG
+      X-Amz-Request-Id:
+      - A2A5B618C76BDC46
+      Date:
+      - Sat, 20 Jul 2013 15:03:06 GMT
+      Content-Type:
+      - application/xml
+      Transfer-Encoding:
+      - chunked
+      Server:
+      - AmazonS3
+    body:
+      encoding: UTF-8
+      string: |-
+        <?xml version="1.0" encoding="UTF-8"?>
+        <ListBucketResult xmlns="http://s3.amazonaws.com/doc/2006-03-01/"><Name>another-s3-website-test.net</Name><Prefix></Prefix><Marker></Marker><MaxKeys>1000</MaxKeys><IsTruncated>false</IsTruncated></ListBucketResult>
+    http_version:
+  recorded_at: Sat, 20 Jul 2013 15:03:04 GMT
+- request:
+    method: get
+    uri: https://s3.amazonaws.com/another-s3-website-test.net?max-keys=1000
+    body:
+      encoding: US-ASCII
+      string: ''
+    headers:
+      Content-Type:
+      - ''
+      User-Agent:
+      - aws-sdk-ruby/1.8.5 ruby/2.0.0 x86_64-darwin11.4.2
+      Date:
+      - Sat, 20 Jul 2013 15:03:04 GMT
+      Authorization:
+      - AWS
+      Accept-Encoding:
+      - gzip;q=1.0,deflate;q=0.6,identity;q=0.3
+      Accept:
+      - '*/*'
+  response:
+    status:
+      code: 200
+      message: OK
+    headers:
+      X-Amz-Id-2:
+      - OhoqsN3CE+5FljCn0hTlhThb+nWYkBMKefzL9nU7Tbh/+zry/1gCEX7GWW8oGfIr
+      X-Amz-Request-Id:
+      - 30864A566FBD97FE
+      Date:
+      - Sat, 20 Jul 2013 15:03:06 GMT
+      Content-Type:
+      - application/xml
+      Transfer-Encoding:
+      - chunked
+      Server:
+      - AmazonS3
+    body:
+      encoding: UTF-8
+      string: |-
+        <?xml version="1.0" encoding="UTF-8"?>
+        <ListBucketResult xmlns="http://s3.amazonaws.com/doc/2006-03-01/"><Name>another-s3-website-test.net</Name><Prefix></Prefix><Marker></Marker><MaxKeys>1000</MaxKeys><IsTruncated>false</IsTruncated></ListBucketResult>
+    http_version:
+  recorded_at: Sat, 20 Jul 2013 15:03:05 GMT
+recorded_with: VCR 2.5.0

data/features/command-line-help.feature CHANGED Viewed

@@ -45,7 +45,6 @@ Feature: displaying help text in the command-line interface
       """
   @starts-new-os-process
-  @wip
   Scenario: User wants to know what the cfg create command does
     When I run `s3_website cfg help create`
     Then the output should contain:

data/features/security.feature CHANGED Viewed

@@ -1,8 +1,14 @@
 Feature: Security
-  @new-files
-  @wip
-  Scenario: The user does not want the s3_website.yml file to be uploaded
+  @empty-bucket
+  Scenario: The user does not want to upload the s3_website.yml file
     When my S3 website is in "features/support/test_site_dirs/site-that-contains-s3-website-file.com"
     Then s3_website will push my blog to S3
     And the output should not contain "s3_website.yml"
+    And the output should equal
+      """
+      Deploying features/support/test_site_dirs/site-that-contains-s3-website-file.com/_site/* to another-s3-website-test.net
+      No new or changed files to upload
+      Done! Go visit: http://another-s3-website-test.net.s3-website-us-east-1.amazonaws.com/index.html
+      """

data/features/support/test_site_dirs/site-that-contains-s3-website-file.com/_site/s3_website.yml CHANGED Viewed

@@ -1,3 +1,3 @@
 s3_id: key
 s3_secret: pass
-s3_bucket: s3-website-test.net
+s3_bucket: another-s3-website-test.net

data/features/support/test_site_dirs/site-that-contains-s3-website-file.com/s3_website.yml CHANGED Viewed

@@ -1,3 +1,3 @@
 s3_id: key
 s3_secret: pass
-s3_bucket: s3-website-test.net
+s3_bucket: another-s3-website-test.net

data/features/support/vcr.rb CHANGED Viewed

@@ -15,4 +15,5 @@ VCR.cucumber_tags do |t|
   t.tag '@s3-and-cloudfront-when-updating-a-file'
   t.tag '@one-file-to-delete'
   t.tag '@create-redirect'
+  t.tag '@empty-bucket'
 end

data/lib/s3_website/uploader.rb CHANGED Viewed

@@ -42,7 +42,7 @@ module S3Website
     def self.upload_files(s3, config, site_dir)
       changed_files, new_files = DiffHelper.resolve_files_to_upload(
         s3.buckets[config['s3_bucket']], site_dir)
-      to_upload = changed_files + new_files
+      to_upload = (changed_files + new_files).reject { |f| Upload.is_blacklisted f }
       if to_upload.empty?
         puts "No new or changed files to upload"
       else
@@ -60,7 +60,7 @@ module S3Website
     def self.upload_in_parallel_or_sequentially(files_to_upload, s3, config, site_dir)
       Parallelism.each_in_parallel_or_sequentially(files_to_upload) { |f|
-        upload_file(f, s3, config, site_dir) unless Upload.is_blacklisted f
+        upload_file(f, s3, config, site_dir)
       }
     end

data/s3_website.gemspec CHANGED Viewed

@@ -3,7 +3,7 @@ $:.push File.expand_path("../lib", __FILE__)
 Gem::Specification.new do |s|
   s.name        = "s3_website"
-  s.version     = "1.0.2"
+  s.version     = "1.0.3"
   s.platform    = Gem::Platform::RUBY
   s.authors     = ["Lauri Lehmijoki"]
   s.email       = ["lauri.lehmijoki@iki.fi"]

metadata CHANGED Viewed

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: s3_website
 version: !ruby/object:Gem::Version
-  version: 1.0.2
+  version: 1.0.3
 platform: ruby
 authors:
 - Lauri Lehmijoki
@@ -226,6 +226,7 @@ files:
 - example-configurations.md
 - features/as-library.feature
 - features/cassettes/cucumber_tags/create-redirect.yml
+- features/cassettes/cucumber_tags/empty-bucket.yml
 - features/cassettes/cucumber_tags/new-and-changed-files.yml
 - features/cassettes/cucumber_tags/new-files-for-sydney.yml
 - features/cassettes/cucumber_tags/new-files.yml
@@ -278,8 +279,6 @@ files:
 - features/support/test_site_dirs/only-changed-files.com/_site/css/styles.css
 - features/support/test_site_dirs/only-changed-files.com/_site/index.html
 - features/support/test_site_dirs/only-changed-files.com/s3_website.yml
-- features/support/test_site_dirs/site-that-contains-s3-website-file.com/_site/css/styles.css
-- features/support/test_site_dirs/site-that-contains-s3-website-file.com/_site/index.html
 - features/support/test_site_dirs/site-that-contains-s3-website-file.com/_site/s3_website.yml
 - features/support/test_site_dirs/site-that-contains-s3-website-file.com/s3_website.yml
 - features/support/test_site_dirs/site.with.css-maxage.com/_site/css/styles.css
@@ -358,6 +357,7 @@ summary: Manage your S3 website
 test_files:
 - features/as-library.feature
 - features/cassettes/cucumber_tags/create-redirect.yml
+- features/cassettes/cucumber_tags/empty-bucket.yml
 - features/cassettes/cucumber_tags/new-and-changed-files.yml
 - features/cassettes/cucumber_tags/new-files-for-sydney.yml
 - features/cassettes/cucumber_tags/new-files.yml
@@ -410,8 +410,6 @@ test_files:
 - features/support/test_site_dirs/only-changed-files.com/_site/css/styles.css
 - features/support/test_site_dirs/only-changed-files.com/_site/index.html
 - features/support/test_site_dirs/only-changed-files.com/s3_website.yml
-- features/support/test_site_dirs/site-that-contains-s3-website-file.com/_site/css/styles.css
-- features/support/test_site_dirs/site-that-contains-s3-website-file.com/_site/index.html
 - features/support/test_site_dirs/site-that-contains-s3-website-file.com/_site/s3_website.yml
 - features/support/test_site_dirs/site-that-contains-s3-website-file.com/s3_website.yml
 - features/support/test_site_dirs/site.with.css-maxage.com/_site/css/styles.css

data/features/support/test_site_dirs/site-that-contains-s3-website-file.com/_site/css/styles.css DELETED Viewed

@@ -1,3 +0,0 @@
-body {
-}

data/features/support/test_site_dirs/site-that-contains-s3-website-file.com/_site/index.html DELETED Viewed

@@ -1,5 +0,0 @@
-<html>
-  <head>
-    <title>hello!</title>
-  </head>
-</html>