RubyGems - jekyll-s3 - Versions diffs - 0.0.6 → 0.0.7 - Mend

jekyll-s3 0.0.6 → 0.0.7

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 (15) hide show

data/README.md +24 -3
data/bin/jekyll-s3 +3 -1
data/features/cassettes/cucumber_tags/one-file-to-delete.yml +341 -0
data/features/jekyll-s3-delete.feature +12 -0
data/features/{jekyll-s3.feature → jekyll-s3-upload.feature} +1 -1
data/features/step_definitions/steps.rb +7 -2
data/features/support/test_site_dirs/unpublish-a-post.com/_jekyll_s3.yml +3 -0
data/features/support/test_site_dirs/unpublish-a-post.com/_site/css/styles.css +3 -0
data/features/support/vcr.rb +1 -0
data/lib/cloudfront/invalidator.rb +5 -2
data/lib/jekyll-s3/cli.rb +12 -15
data/lib/jekyll-s3/config_loader.rb +10 -8
data/lib/jekyll-s3/uploader.rb +27 -15
data/lib/jekyll-s3/version.rb +1 -1
metadata +14 -6

data/README.md CHANGED Viewed

@@ -54,18 +54,39 @@ It is easy to deliver your S3-based web site via Cloudfront, the CDN of Amazon.
   * Run `jekyll-s3` to deploy your site to S3 and invalidate the Cloudfront
     distribution
+## The headless mode
+Jekyll-s3 has a headless mode, in which the interactions with a user are
+disabled.
+In the headless mode, Jekyll-s3 will automatically delete the files on the S3
+bucket that are not on your local computer. (You can use the delete feature to
+unpublish blog posts.)
+Enable the headless mode by adding the `--headless` or `-h` argument after
+`jekyll-s3`.
 ## Changelog
+### 0.0.7
+* Headless mode
+### 0.0.6
+* Upload only new or changed files
+* Support ERB syntax in `_jekyll_s3.yml`
 ### 0.0.5
-Invalidate the Cloudfront distribution of the Jekyll S3 bucket.
+* Invalidate the Cloudfront distribution of the Jekyll S3 bucket.
 ## Known issues
 ### Only S3 buckets in the US Standard region work
-Jekyll-s3 supports only S3 buckets that are in the US Standard region. If your
-bucket is currently on some other region, you can set a non-existing
+Jekyll-s3 supports only S3 buckets that are in the US Standard region. If your
+bucket is currently on some other region, you can set a non-existing
 bucket in *_jekyll_s3.yml* and then run `jekyll-s3`. Jekyll-s3 will then create
 the bucket in the US Standard region.

data/bin/jekyll-s3 CHANGED Viewed

@@ -2,4 +2,6 @@
 require File.dirname(__FILE__) + '/../lib/jekyll-s3'
-Jekyll::S3::CLI.run
+is_headless = ARGV.length == 1 and ARGV[0] == '--headless' or ARGV[0] == '-h'
+Jekyll::S3::CLI.run is_headless

data/features/cassettes/cucumber_tags/one-file-to-delete.yml ADDED Viewed

@@ -0,0 +1,341 @@
+---
+http_interactions:
+- request:
+    method: get
+    uri: https://s3.amazonaws.com/
+    body:
+      encoding: US-ASCII
+      string: ''
+    headers:
+      Content-Type:
+      - ''
+      User-Agent:
+      - aws-sdk-ruby/1.5.8 ruby/1.9.3 x86_64-darwin11.4.0
+      Date:
+      - Mon, 12 Nov 2012 18:04:05 +0200
+      Authorization:
+      - AWS foo
+      Accept:
+      - ! '*/*'
+  response:
+    status:
+      code: 200
+      message: OK
+    headers:
+      X-Amz-Id-2:
+      - UtUBSslAwcVq5q0QwmXNFmbWhUMJTO6RzFFpVqdplXFMUAB/EV1i8y8Nl6wWB9mK
+      X-Amz-Request-Id:
+      - C418CD7D3B1A94A0
+      Date:
+      - Mon, 12 Nov 2012 16:04:06 GMT
+      Content-Type:
+      - application/xml
+      Transfer-Encoding:
+      - chunked
+      Server:
+      - AmazonS3
+    body:
+      encoding: US-ASCII
+      string: ! '<?xml version="1.0" encoding="UTF-8"?>
+        <ListAllMyBucketsResult xmlns="http://s3.amazonaws.com/doc/2006-03-01/"><Owner><ID>3855ebae0f370c3dd0c8d8031863792112bd2a2cb18fa310d3f463ae0dea62f1</ID><DisplayName>foo</DisplayName></Owner><Buckets><Bucket><Name>jekyll-s3-test.net</Name><CreationDate>2012-10-14T12:58:37.000Z</CreationDate></Bucket></Buckets></ListAllMyBucketsResult>'
+    http_version:
+  recorded_at: Mon, 12 Nov 2012 16:04:06 GMT
+- request:
+    method: get
+    uri: https://s3.amazonaws.com/jekyll-s3-test.net?max-keys=1000
+    body:
+      encoding: US-ASCII
+      string: ''
+    headers:
+      Content-Type:
+      - ''
+      User-Agent:
+      - aws-sdk-ruby/1.5.8 ruby/1.9.3 x86_64-darwin11.4.0
+      Date:
+      - Mon, 12 Nov 2012 18:04:06 +0200
+      Authorization:
+      - AWS
+      Accept:
+      - ! '*/*'
+  response:
+    status:
+      code: 200
+      message: OK
+    headers:
+      X-Amz-Id-2:
+      - fdsRJtd8iQjs86DoPoDH7oN4DatGZD68MeX2z3DK9js8zFODEewFsBsPc0Qk9ahv
+      X-Amz-Request-Id:
+      - 41A328772547F5CE
+      Date:
+      - Mon, 12 Nov 2012 16:04:07 GMT
+      Content-Type:
+      - application/xml
+      Transfer-Encoding:
+      - chunked
+      Server:
+      - AmazonS3
+    body:
+      encoding: US-ASCII
+      string: ! '<?xml version="1.0" encoding="UTF-8"?>
+        <ListBucketResult xmlns="http://s3.amazonaws.com/doc/2006-03-01/"><Name>jekyll-s3-test.net</Name><Prefix></Prefix><Marker></Marker><MaxKeys>1000</MaxKeys><IsTruncated>false</IsTruncated><Contents><Key>css/styles.css</Key><LastModified>2012-10-14T14:20:04.000Z</LastModified><ETag>&quot;8fcf43a38cbf0c502f029a50645f2374&quot;</ETag><Size>10</Size><Owner><ID>3855ebae0f370c3dd0c8d8031863792112bd2a2cb18fa310d3f463ae0dea62f1</ID><DisplayName>fluid83</DisplayName></Owner><StorageClass>STANDARD</StorageClass></Contents><Contents><Key>index.html</Key><LastModified>2012-11-12T16:03:45.000Z</LastModified><ETag>&quot;8a8892a2b0fad281f26c0dedbff7011a&quot;</ETag><Size>60</Size><Owner><ID>3855ebae0f370c3dd0c8d8031863792112bd2a2cb18fa310d3f463ae0dea62f1</ID><DisplayName>fluid83</DisplayName></Owner><StorageClass>STANDARD</StorageClass></Contents></ListBucketResult>'
+    http_version:
+  recorded_at: Mon, 12 Nov 2012 16:04:06 GMT
+- request:
+    method: head
+    uri: https://s3.amazonaws.com/jekyll-s3-test.net/css/styles.css
+    body:
+      encoding: US-ASCII
+      string: ''
+    headers:
+      Content-Type:
+      - ''
+      User-Agent:
+      - aws-sdk-ruby/1.5.8 ruby/1.9.3 x86_64-darwin11.4.0
+      Date:
+      - Mon, 12 Nov 2012 18:04:06 +0200
+      Authorization:
+      - AWS
+      Accept:
+      - ! '*/*'
+  response:
+    status:
+      code: 200
+      message: OK
+    headers:
+      X-Amz-Id-2:
+      - VVKukQx/SJjzviiFnW+vR+AY6hPDh0UcGZ4vTgxUu5xuzTo/sfLZ3fv/i2uMTt8y
+      X-Amz-Request-Id:
+      - C6FD6AB27A3AB708
+      Date:
+      - Mon, 12 Nov 2012 16:04:07 GMT
+      Last-Modified:
+      - Sun, 14 Oct 2012 14:20:04 GMT
+      Etag:
+      - ! '"8fcf43a38cbf0c502f029a50645f2374"'
+      Accept-Ranges:
+      - bytes
+      Content-Type:
+      - ''
+      Content-Length:
+      - '10'
+      Server:
+      - AmazonS3
+    body:
+      encoding: US-ASCII
+      string: ''
+    http_version:
+  recorded_at: Mon, 12 Nov 2012 16:04:07 GMT
+- request:
+    method: head
+    uri: https://s3.amazonaws.com/jekyll-s3-test.net/css/styles.css
+    body:
+      encoding: US-ASCII
+      string: ''
+    headers:
+      Content-Type:
+      - ''
+      User-Agent:
+      - aws-sdk-ruby/1.5.8 ruby/1.9.3 x86_64-darwin11.4.0
+      Date:
+      - Mon, 12 Nov 2012 18:04:07 +0200
+      Authorization:
+      - AWS
+      Accept:
+      - ! '*/*'
+  response:
+    status:
+      code: 200
+      message: OK
+    headers:
+      X-Amz-Id-2:
+      - lJ05yU2+Hpmjr75Ailh685mfkhRivsIrH0eRjfUN25lfg0kEOETv85tUNcjuAM/g
+      X-Amz-Request-Id:
+      - 93363578095BC286
+      Date:
+      - Mon, 12 Nov 2012 16:04:08 GMT
+      Last-Modified:
+      - Sun, 14 Oct 2012 14:20:04 GMT
+      Etag:
+      - ! '"8fcf43a38cbf0c502f029a50645f2374"'
+      Accept-Ranges:
+      - bytes
+      Content-Type:
+      - ''
+      Content-Length:
+      - '10'
+      Server:
+      - AmazonS3
+    body:
+      encoding: US-ASCII
+      string: ''
+    http_version:
+  recorded_at: Mon, 12 Nov 2012 16:04:07 GMT
+- request:
+    method: head
+    uri: https://s3.amazonaws.com/jekyll-s3-test.net/index.html
+    body:
+      encoding: US-ASCII
+      string: ''
+    headers:
+      Content-Type:
+      - ''
+      User-Agent:
+      - aws-sdk-ruby/1.5.8 ruby/1.9.3 x86_64-darwin11.4.0
+      Date:
+      - Mon, 12 Nov 2012 18:04:07 +0200
+      Authorization:
+      - AWS
+      Accept:
+      - ! '*/*'
+  response:
+    status:
+      code: 200
+      message: OK
+    headers:
+      X-Amz-Id-2:
+      - xnoD03ghUvW6Lms7N0Pai0sEhh4ulWhuswYghePx/PU7ep9wr18nfS02oTyNJIic
+      X-Amz-Request-Id:
+      - 93C1F004A5E9FC7C
+      Date:
+      - Mon, 12 Nov 2012 16:04:09 GMT
+      Last-Modified:
+      - Mon, 12 Nov 2012 16:03:45 GMT
+      Etag:
+      - ! '"8a8892a2b0fad281f26c0dedbff7011a"'
+      Accept-Ranges:
+      - bytes
+      Content-Type:
+      - text/html
+      Content-Length:
+      - '60'
+      Server:
+      - AmazonS3
+    body:
+      encoding: US-ASCII
+      string: ''
+    http_version:
+  recorded_at: Mon, 12 Nov 2012 16:04:08 GMT
+- request:
+    method: head
+    uri: https://s3.amazonaws.com/jekyll-s3-test.net/index.html
+    body:
+      encoding: US-ASCII
+      string: ''
+    headers:
+      Content-Type:
+      - ''
+      User-Agent:
+      - aws-sdk-ruby/1.5.8 ruby/1.9.3 x86_64-darwin11.4.0
+      Date:
+      - Mon, 12 Nov 2012 18:04:08 +0200
+      Authorization:
+      - AWS
+      Accept:
+      - ! '*/*'
+  response:
+    status:
+      code: 200
+      message: OK
+    headers:
+      X-Amz-Id-2:
+      - YSTZ/ljVpRfsE8esm1vzqipkScBP40LUOwo1QU3/9Vx1YaR7suE0OY7mUfPuqVV2
+      X-Amz-Request-Id:
+      - FB412B911EB2705E
+      Date:
+      - Mon, 12 Nov 2012 16:04:09 GMT
+      Last-Modified:
+      - Mon, 12 Nov 2012 16:03:45 GMT
+      Etag:
+      - ! '"8a8892a2b0fad281f26c0dedbff7011a"'
+      Accept-Ranges:
+      - bytes
+      Content-Type:
+      - text/html
+      Content-Length:
+      - '60'
+      Server:
+      - AmazonS3
+    body:
+      encoding: US-ASCII
+      string: ''
+    http_version:
+  recorded_at: Mon, 12 Nov 2012 16:04:09 GMT
+- request:
+    method: get
+    uri: https://s3.amazonaws.com/jekyll-s3-test.net?max-keys=1000
+    body:
+      encoding: US-ASCII
+      string: ''
+    headers:
+      Content-Type:
+      - ''
+      User-Agent:
+      - aws-sdk-ruby/1.5.8 ruby/1.9.3 x86_64-darwin11.4.0
+      Date:
+      - Mon, 12 Nov 2012 18:04:09 +0200
+      Authorization:
+      - AWS
+      Accept:
+      - ! '*/*'
+  response:
+    status:
+      code: 200
+      message: OK
+    headers:
+      X-Amz-Id-2:
+      - W3AqIHSMcW0OZcNHeSvGh4WOjDv0TAmwI8zZlAgh0qhYeJ1cnDTuOBaEKlrKVF17
+      X-Amz-Request-Id:
+      - C5E23FFE6D568DFC
+      Date:
+      - Mon, 12 Nov 2012 16:04:10 GMT
+      Content-Type:
+      - application/xml
+      Transfer-Encoding:
+      - chunked
+      Server:
+      - AmazonS3
+    body:
+      encoding: US-ASCII
+      string: ! '<?xml version="1.0" encoding="UTF-8"?>
+        <ListBucketResult xmlns="http://s3.amazonaws.com/doc/2006-03-01/"><Name>jekyll-s3-test.net</Name><Prefix></Prefix><Marker></Marker><MaxKeys>1000</MaxKeys><IsTruncated>false</IsTruncated><Contents><Key>css/styles.css</Key><LastModified>2012-10-14T14:20:04.000Z</LastModified><ETag>&quot;8fcf43a38cbf0c502f029a50645f2374&quot;</ETag><Size>10</Size><Owner><ID>3855ebae0f370c3dd0c8d8031863792112bd2a2cb18fa310d3f463ae0dea62f1</ID><DisplayName>fluid83</DisplayName></Owner><StorageClass>STANDARD</StorageClass></Contents><Contents><Key>index.html</Key><LastModified>2012-11-12T16:03:45.000Z</LastModified><ETag>&quot;8a8892a2b0fad281f26c0dedbff7011a&quot;</ETag><Size>60</Size><Owner><ID>3855ebae0f370c3dd0c8d8031863792112bd2a2cb18fa310d3f463ae0dea62f1</ID><DisplayName>fluid83</DisplayName></Owner><StorageClass>STANDARD</StorageClass></Contents></ListBucketResult>'
+    http_version:
+  recorded_at: Mon, 12 Nov 2012 16:04:09 GMT
+- request:
+    method: delete
+    uri: https://s3.amazonaws.com/jekyll-s3-test.net/index.html
+    body:
+      encoding: US-ASCII
+      string: ''
+    headers:
+      Content-Type:
+      - ''
+      User-Agent:
+      - aws-sdk-ruby/1.5.8 ruby/1.9.3 x86_64-darwin11.4.0
+      Date:
+      - Mon, 12 Nov 2012 18:04:09 +0200
+      Authorization:
+      - AWS AKIAIFB7KCPAR6YNNZLA:ail6+cNPu7thlzkBPkMQsA9G8QA=
+      Accept:
+      - ! '*/*'
+  response:
+    status:
+      code: 204
+      message: No Content
+    headers:
+      X-Amz-Id-2:
+      - qHi5ypZ5LlelraO05VBE2I8lQtvPhyV4FdSZBWLyQ0xWwNq9eo1RKqrTyhoo3G5u
+      X-Amz-Request-Id:
+      - A25BE3288715EE97
+      Date:
+      - Mon, 12 Nov 2012 16:04:10 GMT
+      Server:
+      - AmazonS3
+    body:
+      encoding: US-ASCII
+      string: ''
+    http_version:
+  recorded_at: Mon, 12 Nov 2012 16:04:10 GMT
+recorded_with: VCR 2.2.4

data/features/jekyll-s3-delete.feature ADDED Viewed

@@ -0,0 +1,12 @@
+Feature: remove a Jekyll blog post from S3
+  In order to remove a blog post from S3
+  As a blogger
+  I want to run jekyll-s3 and see that my post was deleted from S3
+  @one-file-to-delete
+  Scenario: The user deletes a blog post
+    When my Jekyll site is in "features/support/test_site_dirs/unpublish-a-post.com"
+    Then jekyll-s3 will push my blog to S3
+    And report that it uploaded 0 new and 0 changed files into S3
+    And report that it deleted 1 file from S3

data/features/{jekyll-s3.feature → jekyll-s3-upload.feature} RENAMED Viewed

@@ -1,4 +1,4 @@
-Feature: jekyll-s3
+Feature: upload Jekyll site to S3
   In order to push my jekyll site to s3
   As a blogger

data/features/step_definitions/steps.rb CHANGED Viewed

@@ -21,7 +21,12 @@ Then /^report that it uploaded (\d+) new and (\d+) changed files into S3$/ do
   raise unless @amount_of_changed_files == changed_count.to_i
 end
+Then /^report that it deleted (\d+) file from S3$/ do |amount_of_deleted_files|
+  raise unless @amount_of_deleted_files == amount_of_deleted_files.to_i
+end
 def do_run
-  @amount_of_new_files, @amount_of_changed_files =
-    Jekyll::S3::CLI.new.run("#{@blog_dir}/_site")
+  in_headless_mode = true
+  @amount_of_new_files, @amount_of_changed_files, @amount_of_deleted_files =
+    Jekyll::S3::CLI.new.run("#{@blog_dir}/_site", in_headless_mode)
 end

data/features/support/test_site_dirs/unpublish-a-post.com/_jekyll_s3.yml ADDED Viewed

@@ -0,0 +1,3 @@
+s3_id: foo
+s3_secret: foo
+s3_bucket: jekyll-s3-test.net

data/features/support/test_site_dirs/unpublish-a-post.com/_site/css/styles.css ADDED Viewed

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

data/features/support/vcr.rb CHANGED Viewed

@@ -11,4 +11,5 @@ VCR.cucumber_tags do |t|
   t.tag '@only-changed-files'
   t.tag '@no-new-or-changed-files'
   t.tag '@s3-and-cloudfront'
+  t.tag '@one-file-to-delete'
 end

data/lib/cloudfront/invalidator.rb CHANGED Viewed

@@ -1,8 +1,11 @@
 module Jekyll
   module Cloudfront
     class Invalidator
-      def self.invalidate(
-        aws_key, aws_secret, s3_bucket_name, cloudfront_distribution_id)
+      def self.invalidate(config)
+        aws_key = config['s3_id']
+        aws_secret = config['s3_secret']
+        s3_bucket_name = config['s3_bucket']
+        cloudfront_distribution_id = config['cloudfront_distribution_id']
         s3 = AWS::S3.new(
           :access_key_id => aws_key,
           :secret_access_key => aws_secret)

data/lib/jekyll-s3/cli.rb CHANGED Viewed

@@ -3,18 +3,17 @@ module Jekyll
     class CLI
       SITE_DIR = '_site'
-      def self.run
-        CLI.new.run SITE_DIR
+      def self.run(in_headless_mode)
+        CLI.new.run SITE_DIR, in_headless_mode
       end
-      def run(site_dir)
+      def run(site_dir, in_headless_mode = false)
         CLI.check_configuration site_dir
-        s3_id, s3_secret, s3_bucket, cloudfront_distribution_id =
-          Jekyll::S3::ConfigLoader.load_configuration site_dir
-        amount_of_uploaded_files =
-          Uploader.run(site_dir, s3_id, s3_secret, s3_bucket)
-        CLI.invalidate_cf_dist_if_configured s3_id, s3_secret, s3_bucket, cloudfront_distribution_id
-        amount_of_uploaded_files
+        config = Jekyll::S3::ConfigLoader.load_configuration site_dir
+        new_files_count, changed_files_count, deleted_files_count =
+          Uploader.run(site_dir, config, in_headless_mode)
+        CLI.invalidate_cf_dist_if_configured config
+        [new_files_count, changed_files_count, deleted_files_count]
       rescue JekyllS3Error => e
         puts e.message
         exit 1
@@ -22,12 +21,10 @@ module Jekyll
       private
-      def self.invalidate_cf_dist_if_configured(s3_id, s3_secret, s3_bucket, cloudfront_distribution_id)
-        cloudfront_configured = cloudfront_distribution_id != nil &&
-          cloudfront_distribution_id != ''
-        Jekyll::Cloudfront::Invalidator.invalidate(
-          s3_id, s3_secret, s3_bucket, cloudfront_distribution_id
-        ) if cloudfront_configured
+      def self.invalidate_cf_dist_if_configured(config)
+        cloudfront_configured = config['cloudfront_distribution_id'] &&
+          (not config['cloudfront_distribution_id'].empty?)
+        Jekyll::Cloudfront::Invalidator.invalidate(config) if cloudfront_configured
       end
       def self.check_configuration(site_dir)

data/lib/jekyll-s3/config_loader.rb CHANGED Viewed

@@ -24,17 +24,12 @@ cloudfront_distribution_id: YOUR_CLOUDFRONT_DIST_ID (OPTIONAL)
       # Load configuration from _jekyll_s3.yml
       # Raise MalformedConfigurationFileError if the configuration file does not contain the keys we expect
       def self.load_configuration(site_dir)
-        config = load_yaml_file site_dir
-        raise MalformedConfigurationFileError unless config
+        config = load_yaml_file_and_validate site_dir
         s3_id = config['s3_id']
         s3_secret = config['s3_secret']
         s3_bucket = config['s3_bucket']
         cloudfront_distribution_id = config['cloudfront_distribution_id']
-        raise MalformedConfigurationFileError unless
-          [s3_id, s3_secret, s3_bucket].select { |k| k.nil? || k == '' }.empty?
-        return s3_id, s3_secret, s3_bucket, cloudfront_distribution_id
+        return config
       end
       def self.create_template_configuration_file(site_dir)
@@ -44,12 +39,19 @@ cloudfront_distribution_id: YOUR_CLOUDFRONT_DIST_ID (OPTIONAL)
         }
       end
-      def self.load_yaml_file(site_dir)
+      def self.load_yaml_file_and_validate(site_dir)
         begin
           config = YAML.load(Erubis::Eruby.new(File.read(get_configuration_file(site_dir))).result)
         rescue Exception
           raise MalformedConfigurationFileError
         end
+        raise MalformedConfigurationFileError unless config
+        raise MalformedConfigurationFileError if
+          ['s3_id', 's3_secret', 's3_bucket'].any? { |key|
+            mandatory_config_value = config[key]
+            mandatory_config_value.nil? || mandatory_config_value == ''
+          }
+        config
       end
       def self.get_configuration_file(site_dir)

data/lib/jekyll-s3/uploader.rb CHANGED Viewed

@@ -1,7 +1,10 @@
 module Jekyll
   module S3
     class Uploader
-      def self.run(site_dir, s3_id, s3_secret, s3_bucket_name)
+      def self.run(site_dir, config, in_headless_mode = false)
+        s3_id = config['s3_id']
+        s3_secret = config['s3_secret']
+        s3_bucket_name = config['s3_bucket']
         puts "Deploying _site/* to #{s3_bucket_name}"
         s3 = AWS::S3.new(:access_key_id => s3_id,
@@ -9,12 +12,13 @@ module Jekyll
         create_bucket_if_needed(s3, s3_bucket_name)
-        amount_of_uploaded_files = upload_files(s3, s3_bucket_name, site_dir)
+        new_files_count, changed_files_count = upload_files(s3, s3_bucket_name, site_dir)
-        remove_superfluous_files(s3, s3_bucket_name, site_dir)
+        deleted_files_count = remove_superfluous_files(
+          s3, s3_bucket_name, site_dir, in_headless_mode)
         puts "Done! Go visit: http://#{s3_bucket_name}.s3.amazonaws.com/index.html"
-        amount_of_uploaded_files
+        [new_files_count, changed_files_count, deleted_files_count]
       end
       private
@@ -57,21 +61,29 @@ module Jekyll
         end
       end
-      def self.remove_superfluous_files(s3, s3_bucket_name, site_dir)
+      def self.remove_superfluous_files(s3, s3_bucket_name, site_dir, in_headless_mode)
         remote_files = s3.buckets[s3_bucket_name].objects.map { |f| f.key }
         local_files = load_all_local_files(site_dir)
-        delete_remote_files_if_user_confirms(
-          remote_files - local_files, s3, s3_bucket_name)
+        files_to_delete = remote_files - local_files
+        deleted_files_count = 0
+        if in_headless_mode
+          files_to_delete.each { |s3_object_key|
+            delete_s3_object s3, s3_bucket_name, s3_object_key
+            deleted_files_count += 1
+          }
+        else
+          Keyboard.if_user_confirms_delete(files_to_delete) { |s3_object_key|
+            delete_s3_object s3, s3_bucket_name, s3_object_key
+            deleted_files_count += 1
+          }
+        end
+        deleted_files_count
       end
-      def self.delete_remote_files_if_user_confirms(to_delete, s3, s3_bucket_name)
-        unless to_delete.empty?
-          Keyboard.if_user_confirms_delete(to_delete) { |s3_object_key|
-            Retry.run_with_retry do
-              s3.buckets[s3_bucket_name].objects[s3_object_key].delete
-              puts("Delete #{s3_object_key}: Success!")
-            end
-          }
+      def self.delete_s3_object(s3, s3_bucket_name, s3_object_key)
+        Retry.run_with_retry do
+          s3.buckets[s3_bucket_name].objects[s3_object_key].delete
+          puts("Delete #{s3_object_key}: Success!")
         end
       end

data/lib/jekyll-s3/version.rb CHANGED Viewed

@@ -1,5 +1,5 @@
 module Jekyll
   module S3
-    VERSION = "0.0.6"
+    VERSION = "0.0.7"
   end
 end

metadata CHANGED Viewed

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: jekyll-s3
 version: !ruby/object:Gem::Version
-  version: 0.0.6
+  version: 0.0.7
   prerelease:
 platform: ruby
 authors:
@@ -10,7 +10,7 @@ authors:
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2012-10-20 00:00:00.000000000 Z
+date: 2012-11-12 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: aws-sdk
@@ -210,11 +210,13 @@ files:
 - features/cassettes/cucumber_tags/new-and-changed-files.yml
 - features/cassettes/cucumber_tags/new-files.yml
 - features/cassettes/cucumber_tags/no-new-or-changed-files.yml
+- features/cassettes/cucumber_tags/one-file-to-delete.yml
 - features/cassettes/cucumber_tags/only-changed-files.yml
 - features/cassettes/cucumber_tags/s3-and-cloudfront.yml
 - features/cli-output.feature
 - features/jekyll-s3-cloudfront.feature
-- features/jekyll-s3.feature
+- features/jekyll-s3-delete.feature
+- features/jekyll-s3-upload.feature
 - features/step_definitions/steps.rb
 - features/support/env.rb
 - features/support/test_site_dirs/cdn-powered.blog.fi/_jekyll_s3.yml
@@ -232,6 +234,8 @@ files:
 - features/support/test_site_dirs/only-changed-files.com/_jekyll_s3.yml
 - 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/unpublish-a-post.com/_jekyll_s3.yml
+- features/support/test_site_dirs/unpublish-a-post.com/_site/css/styles.css
 - features/support/vcr.rb
 - jekyll-s3.gemspec
 - lib/cloudfront/invalidator.rb
@@ -261,7 +265,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: 320836636455003738
+      hash: 2702422542857987753
 required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
   requirements:
@@ -270,7 +274,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: 320836636455003738
+      hash: 2702422542857987753
 requirements: []
 rubyforge_project:
 rubygems_version: 1.8.24
@@ -281,11 +285,13 @@ test_files:
 - features/cassettes/cucumber_tags/new-and-changed-files.yml
 - features/cassettes/cucumber_tags/new-files.yml
 - features/cassettes/cucumber_tags/no-new-or-changed-files.yml
+- features/cassettes/cucumber_tags/one-file-to-delete.yml
 - features/cassettes/cucumber_tags/only-changed-files.yml
 - features/cassettes/cucumber_tags/s3-and-cloudfront.yml
 - features/cli-output.feature
 - features/jekyll-s3-cloudfront.feature
-- features/jekyll-s3.feature
+- features/jekyll-s3-delete.feature
+- features/jekyll-s3-upload.feature
 - features/step_definitions/steps.rb
 - features/support/env.rb
 - features/support/test_site_dirs/cdn-powered.blog.fi/_jekyll_s3.yml
@@ -303,6 +309,8 @@ test_files:
 - features/support/test_site_dirs/only-changed-files.com/_jekyll_s3.yml
 - 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/unpublish-a-post.com/_jekyll_s3.yml
+- features/support/test_site_dirs/unpublish-a-post.com/_site/css/styles.css
 - features/support/vcr.rb
 - spec/lib/keyboard_spec.rb
 - spec/lib/retry_spec.rb