s3_website 1.3.1 → 1.3.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 3fc17c496fe930a8b5bb5a1dd189d10adf1d4b6d
-  data.tar.gz: 845c03741c5c2aa939e28d57c1d1ddced4513d0b
+  metadata.gz: 75048b9591b2516d217424c859f4154ea117cf57
+  data.tar.gz: ace75278f0925aa842b0e6a27d8c69a3a10b1fa3
 SHA512:
-  metadata.gz: a0c673a7b2852d160411c20068b2f0b2ddf555c499c8fdc78faef134820dfa9d9792a978819cf8e362d1f1997ca08ff44fdbd38ac8d489eb619d9b3011f3bfab
-  data.tar.gz: 28fd1356f98ea93e5ecdddbb14c27c84c4996ee34b98031bc51481584d8b3c77e7f65cbd3599eaf2b09cd81523dd6294b44e736470721ddcb8021aec2cf31594
+  metadata.gz: 493f9be03d3fdbc1253590cfb2762082a0928fc10b9dbcc176300d810cede4aa9af2e1b02ce36394ddbd4c9da79fd832999188add3b2014610c7901a5e11cb6f
+  data.tar.gz: 1a043fb4b2d95c2b2ab5839b8cc35289cfd389eefc2670d4c13b635b62afbd22ea9c2e366f45283e87dff6c8610269404291b31e4af2a3e102f062994575b576

data/README.md

@@ -17,6 +17,9 @@
 
     gem install s3_website
 
+`s3_website` requires Ruby. Here is documentation on installing Ruby:
+<http://www.ruby-lang.org/en/downloads/>.
+
 ## Usage
 
 Here's how you can get started:
@@ -69,8 +72,6 @@ you can omit the `s3_id` and `s3_secret` keys in the config file.)
 ## Project goals
 
 * Provide a command-line interface tool for deploying and managing S3 websites
- * Create commands such as `s3_website push`, `s3_website cfg create` and
-   `s3_website cfg apply`
 * 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
@@ -177,7 +178,7 @@ It is easy to deliver your S3-based web site via Cloudfront, the CDN of Amazon.
 #### Creating a new CloudFront distribution
 
 When you run the command `s3_website cfg apply`, it will ask you whether you
-want to deliver your website via CloudFront. If you answer yes, command will
+want to deliver your website via CloudFront. If you answer yes, the command will
 create a CloudFront distribution for you.
 
 #### Using your existing CloudFront distribution

data/changelog.md

@@ -2,6 +2,10 @@
 
 This project uses [Semantic Versioning](http://semver.org).
 
+## 1.3.2
+
+* Move blacklist filtering into a better place
+
 ## 1.3.1
 
 * Print to stdout the initial state of the diff progress indicator

data/lib/s3_website/diff_helper.rb

@@ -16,12 +16,19 @@ module S3Website
           fs_data_source,
           s3_data_source
         )
-        [ normalise(changed_local_files), normalise(new_local_files) ]
+        [
+          reject_blacklisted(normalise changed_local_files),
+          reject_blacklisted(normalise new_local_files)
+        ]
       }
     end
 
     private
 
+    def self.reject_blacklisted(file_paths)
+      file_paths.reject { |f| Upload.is_blacklisted f }
+    end
+
     def self.with_progress_indicator(diff_msg)
       progress_indicator = DiffProgressIndicator.new(diff_msg, "... done\n")
       result = yield progress_indicator

data/lib/s3_website/uploader.rb

@@ -51,7 +51,7 @@ module S3Website
         site_dir,
         config
       )
-      to_upload = (changed_files + new_files).reject { |f| Upload.is_blacklisted f }
+      to_upload = changed_files + new_files
       if to_upload.empty?
         puts "No new or changed files to upload"
       else

data/s3_website.gemspec

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

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: s3_website
 version: !ruby/object:Gem::Version
-  version: 1.3.1
+  version: 1.3.2
 platform: ruby
 authors:
 - Lauri Lehmijoki
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-07-27 00:00:00.000000000 Z
+date: 2013-07-29 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: aws-sdk