jekyll-s3 0.0.7 → 1.0.0

data/README.md

@@ -68,6 +68,11 @@ Enable the headless mode by adding the `--headless` or `-h` argument after
 
 ## Changelog
 
+### 1.0.0
+
+* CloudFront invalidation on changed files only
+* Start using [Semantic versioning](http://semver.org/)
+
 ### 0.0.7
 
 * Headless mode
@@ -107,4 +112,5 @@ Copyright (c) 2011 VersaPay, Philippe Creux.
 Contributors (in alphabetical order)
 * Cory Kaufman-Schofield
 * Chris Kelly
+* Chris Moos
 * Lauri Lehmijoki

data/jekyll-s3.gemspec

@@ -1,10 +1,9 @@
 # -*- encoding: utf-8 -*-
 $:.push File.expand_path("../lib", __FILE__)
-require "jekyll-s3/version"
 
 Gem::Specification.new do |s|
   s.name        = "jekyll-s3"
-  s.version     = Jekyll::S3::VERSION
+  s.version     = "1.0.0"
   s.platform    = Gem::Platform::RUBY
   s.authors     = ["Philippe Creux", "Lauri Lehmijoki"]
   s.email       = ["pcreux@gmail.com", "lauri.lehmijoki@iki.fi"]

data/lib/cloudfront/invalidator.rb

@@ -1,7 +1,7 @@
 module Jekyll
   module Cloudfront
     class Invalidator
-      def self.invalidate(config)
+      def self.invalidate(config, changed_files)
         aws_key = config['s3_id']
         aws_secret = config['s3_secret']
         s3_bucket_name = config['s3_bucket']
@@ -9,7 +9,8 @@ module Jekyll
         s3 = AWS::S3.new(
           :access_key_id => aws_key,
           :secret_access_key => aws_secret)
-        s3_object_keys = s3.buckets[s3_bucket_name].objects.map { |f| f.key }
+        s3_object_keys = changed_files
+        s3_object_keys << ""
         report = SimpleCloudfrontInvalidator::CloudfrontClient.new(
           aws_key, aws_secret, cloudfront_distribution_id).invalidate(
             s3_object_keys)

data/lib/jekyll-s3/cli.rb

@@ -10,9 +10,9 @@ module Jekyll
       def run(site_dir, in_headless_mode = false)
         CLI.check_configuration site_dir
         config = Jekyll::S3::ConfigLoader.load_configuration site_dir
-        new_files_count, changed_files_count, deleted_files_count = 
+        new_files_count, changed_files_count, deleted_files_count, changed_files = 
           Uploader.run(site_dir, config, in_headless_mode)
-        CLI.invalidate_cf_dist_if_configured config
+        CLI.invalidate_cf_dist_if_configured(config, changed_files)
         [new_files_count, changed_files_count, deleted_files_count]
       rescue JekyllS3Error => e
         puts e.message
@@ -21,10 +21,10 @@ module Jekyll
 
       private
 
-      def self.invalidate_cf_dist_if_configured(config)
+      def self.invalidate_cf_dist_if_configured(config, changed_files)
         cloudfront_configured = config['cloudfront_distribution_id'] &&
           (not config['cloudfront_distribution_id'].empty?)
-        Jekyll::Cloudfront::Invalidator.invalidate(config) if cloudfront_configured
+        Jekyll::Cloudfront::Invalidator.invalidate(config, changed_files) if cloudfront_configured
       end
 
       def self.check_configuration(site_dir)

data/lib/jekyll-s3/uploader.rb

@@ -12,13 +12,13 @@ module Jekyll
 
         create_bucket_if_needed(s3, s3_bucket_name)
 
-        new_files_count, changed_files_count = upload_files(s3, s3_bucket_name, site_dir)
+        new_files_count, changed_files_count, changed_files = upload_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"
-        [new_files_count, changed_files_count, deleted_files_count]
+        [new_files_count, changed_files_count, deleted_files_count, changed_files]
       end
 
       private
@@ -48,7 +48,7 @@ module Jekyll
             upload_file(f, s3, s3_bucket_name, site_dir)
           end
         end
-        [new_files.length, changed_files.length]
+        [new_files.length, changed_files.length, changed_files]
       end
 
       def self.upload_file(file, s3, s3_bucket_name, site_dir)

metadata

@@ -1,206 +1,201 @@
---- !ruby/object:Gem::Specification
+--- !ruby/object:Gem::Specification 
 name: jekyll-s3
-version: !ruby/object:Gem::Version
-  version: 0.0.7
+version: !ruby/object:Gem::Version 
+  hash: 23
   prerelease: 
+  segments: 
+  - 1
+  - 0
+  - 0
+  version: 1.0.0
 platform: ruby
-authors:
+authors: 
 - Philippe Creux
 - Lauri Lehmijoki
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-11-12 00:00:00.000000000 Z
-dependencies:
-- !ruby/object:Gem::Dependency
-  name: aws-sdk
-  requirement: !ruby/object:Gem::Requirement
+
+date: 2012-12-04 00:00:00 Z
+dependencies: 
+- !ruby/object:Gem::Dependency 
+  version_requirements: &id001 !ruby/object:Gem::Requirement 
     none: false
-    requirements:
+    requirements: 
     - - ~>
-      - !ruby/object:Gem::Version
+      - !ruby/object:Gem::Version 
+        hash: 15
+        segments: 
+        - 1
+        - 5
+        - 6
         version: 1.5.6
-  type: :runtime
   prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    none: false
-    requirements:
-    - - ~>
-      - !ruby/object:Gem::Version
-        version: 1.5.6
-- !ruby/object:Gem::Dependency
-  name: filey-diff
-  requirement: !ruby/object:Gem::Requirement
-    none: false
-    requirements:
-    - - ~>
-      - !ruby/object:Gem::Version
-        version: 0.0.2
   type: :runtime
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
+  name: aws-sdk
+  requirement: *id001
+- !ruby/object:Gem::Dependency 
+  version_requirements: &id002 !ruby/object:Gem::Requirement 
     none: false
-    requirements:
+    requirements: 
     - - ~>
-      - !ruby/object:Gem::Version
+      - !ruby/object:Gem::Version 
+        hash: 27
+        segments: 
+        - 0
+        - 0
+        - 2
         version: 0.0.2
-- !ruby/object:Gem::Dependency
-  name: simple-cloudfront-invalidator
-  requirement: !ruby/object:Gem::Requirement
-    none: false
-    requirements:
-    - - ~>
-      - !ruby/object:Gem::Version
-        version: 0.0.1
-  type: :runtime
   prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
+  type: :runtime
+  name: filey-diff
+  requirement: *id002
+- !ruby/object:Gem::Dependency 
+  version_requirements: &id003 !ruby/object:Gem::Requirement 
     none: false
-    requirements:
+    requirements: 
     - - ~>
-      - !ruby/object:Gem::Version
+      - !ruby/object:Gem::Version 
+        hash: 29
+        segments: 
+        - 0
+        - 0
+        - 1
         version: 0.0.1
-- !ruby/object:Gem::Dependency
-  name: erubis
-  requirement: !ruby/object:Gem::Requirement
+  prerelease: false
+  type: :runtime
+  name: simple-cloudfront-invalidator
+  requirement: *id003
+- !ruby/object:Gem::Dependency 
+  version_requirements: &id004 !ruby/object:Gem::Requirement 
     none: false
-    requirements:
+    requirements: 
     - - ~>
-      - !ruby/object:Gem::Version
+      - !ruby/object:Gem::Version 
+        hash: 19
+        segments: 
+        - 2
+        - 7
+        - 0
         version: 2.7.0
-  type: :runtime
   prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
+  type: :runtime
+  name: erubis
+  requirement: *id004
+- !ruby/object:Gem::Dependency 
+  version_requirements: &id005 !ruby/object:Gem::Requirement 
     none: false
-    requirements:
-    - - ~>
-      - !ruby/object:Gem::Version
-        version: 2.7.0
-- !ruby/object:Gem::Dependency
+    requirements: 
+    - - ">="
+      - !ruby/object:Gem::Version 
+        hash: 3
+        segments: 
+        - 0
+        version: "0"
+  prerelease: false
+  type: :development
   name: rspec
-  requirement: !ruby/object:Gem::Requirement
+  requirement: *id005
+- !ruby/object:Gem::Dependency 
+  version_requirements: &id006 !ruby/object:Gem::Requirement 
     none: false
-    requirements:
-    - - ! '>='
-      - !ruby/object:Gem::Version
-        version: '0'
-  type: :development
+    requirements: 
+    - - ">="
+      - !ruby/object:Gem::Version 
+        hash: 3
+        segments: 
+        - 0
+        version: "0"
   prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    none: false
-    requirements:
-    - - ! '>='
-      - !ruby/object:Gem::Version
-        version: '0'
-- !ruby/object:Gem::Dependency
+  type: :development
   name: rspec-expectations
-  requirement: !ruby/object:Gem::Requirement
+  requirement: *id006
+- !ruby/object:Gem::Dependency 
+  version_requirements: &id007 !ruby/object:Gem::Requirement 
     none: false
-    requirements:
-    - - ! '>='
-      - !ruby/object:Gem::Version
-        version: '0'
-  type: :development
+    requirements: 
+    - - ">="
+      - !ruby/object:Gem::Version 
+        hash: 3
+        segments: 
+        - 0
+        version: "0"
   prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    none: false
-    requirements:
-    - - ! '>='
-      - !ruby/object:Gem::Version
-        version: '0'
-- !ruby/object:Gem::Dependency
+  type: :development
   name: cucumber
-  requirement: !ruby/object:Gem::Requirement
+  requirement: *id007
+- !ruby/object:Gem::Dependency 
+  version_requirements: &id008 !ruby/object:Gem::Requirement 
     none: false
-    requirements:
-    - - ! '>='
-      - !ruby/object:Gem::Version
-        version: '0'
-  type: :development
+    requirements: 
+    - - ">="
+      - !ruby/object:Gem::Version 
+        hash: 1
+        segments: 
+        - 0
+        - 4
+        - 7
+        version: 0.4.7
   prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    none: false
-    requirements:
-    - - ! '>='
-      - !ruby/object:Gem::Version
-        version: '0'
-- !ruby/object:Gem::Dependency
+  type: :development
   name: aruba
-  requirement: !ruby/object:Gem::Requirement
+  requirement: *id008
+- !ruby/object:Gem::Dependency 
+  version_requirements: &id009 !ruby/object:Gem::Requirement 
     none: false
-    requirements:
-    - - ! '>='
-      - !ruby/object:Gem::Version
-        version: 0.4.7
-  type: :development
+    requirements: 
+    - - ">="
+      - !ruby/object:Gem::Version 
+        hash: 3
+        segments: 
+        - 0
+        version: "0"
   prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    none: false
-    requirements:
-    - - ! '>='
-      - !ruby/object:Gem::Version
-        version: 0.4.7
-- !ruby/object:Gem::Dependency
+  type: :development
   name: rake
-  requirement: !ruby/object:Gem::Requirement
+  requirement: *id009
+- !ruby/object:Gem::Dependency 
+  version_requirements: &id010 !ruby/object:Gem::Requirement 
     none: false
-    requirements:
-    - - ! '>='
-      - !ruby/object:Gem::Version
-        version: '0'
-  type: :development
+    requirements: 
+    - - ">="
+      - !ruby/object:Gem::Version 
+        hash: 3
+        segments: 
+        - 0
+        version: "0"
   prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    none: false
-    requirements:
-    - - ! '>='
-      - !ruby/object:Gem::Version
-        version: '0'
-- !ruby/object:Gem::Dependency
+  type: :development
   name: vcr
-  requirement: !ruby/object:Gem::Requirement
+  requirement: *id010
+- !ruby/object:Gem::Dependency 
+  version_requirements: &id011 !ruby/object:Gem::Requirement 
     none: false
-    requirements:
-    - - ! '>='
-      - !ruby/object:Gem::Version
-        version: '0'
-  type: :development
+    requirements: 
+    - - ">="
+      - !ruby/object:Gem::Version 
+        hash: 3
+        segments: 
+        - 0
+        version: "0"
   prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    none: false
-    requirements:
-    - - ! '>='
-      - !ruby/object:Gem::Version
-        version: '0'
-- !ruby/object:Gem::Dependency
-  name: webmock
-  requirement: !ruby/object:Gem::Requirement
-    none: false
-    requirements:
-    - - ! '>='
-      - !ruby/object:Gem::Version
-        version: '0'
   type: :development
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    none: false
-    requirements:
-    - - ! '>='
-      - !ruby/object:Gem::Version
-        version: '0'
-description: ! 'This Gem allows you to push your Jekyll blog to AWS S3.
-
+  name: webmock
+  requirement: *id011
+description: |-
+  This Gem allows you to push your Jekyll blog to AWS S3.
   In addition, you can use this Gem to invalidate the related Cloudfront
-
-  distribution, making it easy to deliver your blog via the CDN.'
-email:
+  distribution, making it easy to deliver your blog via the CDN.
+email: 
 - pcreux@gmail.com
 - lauri.lehmijoki@iki.fi
-executables:
+executables: 
 - jekyll-s3
 extensions: []
+
 extra_rdoc_files: []
-files:
+
+files: 
 - .gitignore
 - .travis.yml
 - Gemfile
@@ -247,41 +242,43 @@ files:
 - lib/jekyll-s3/keyboard.rb
 - lib/jekyll-s3/retry.rb
 - lib/jekyll-s3/uploader.rb
-- lib/jekyll-s3/version.rb
 - spec/lib/keyboard_spec.rb
 - spec/lib/retry_spec.rb
 - spec/spec_helper.rb
 homepage: https://github.com/laurilehmijoki/jekyll-s3
 licenses: []
+
 post_install_message: 
 rdoc_options: []
-require_paths:
+
+require_paths: 
 - lib
-required_ruby_version: !ruby/object:Gem::Requirement
+required_ruby_version: !ruby/object:Gem::Requirement 
   none: false
-  requirements:
-  - - ! '>='
-    - !ruby/object:Gem::Version
-      version: '0'
-      segments:
+  requirements: 
+  - - ">="
+    - !ruby/object:Gem::Version 
+      hash: 3
+      segments: 
       - 0
-      hash: 2702422542857987753
-required_rubygems_version: !ruby/object:Gem::Requirement
+      version: "0"
+required_rubygems_version: !ruby/object:Gem::Requirement 
   none: false
-  requirements:
-  - - ! '>='
-    - !ruby/object:Gem::Version
-      version: '0'
-      segments:
+  requirements: 
+  - - ">="
+    - !ruby/object:Gem::Version 
+      hash: 3
+      segments: 
       - 0
-      hash: 2702422542857987753
+      version: "0"
 requirements: []
+
 rubyforge_project: 
 rubygems_version: 1.8.24
 signing_key: 
 specification_version: 3
 summary: Push your Jekyll blog to S3
-test_files:
+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

data/lib/jekyll-s3/version.rb

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