middleman-s3_sync 3.3.10 → 4.0.1.rc.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 3fa260b9d0904d1fb4364054ab031d07957ff26c
-  data.tar.gz: bc608f97febf62c912181e804aa9d5f00f0a1ce0
+  metadata.gz: 5aa620355fa36d4086923227d59faf63c45d32d1
+  data.tar.gz: 0eba8d4e743a9d1b73a7a6ee5ef5fcf28447cdf1
 SHA512:
-  metadata.gz: d556aa9c2c4fbf3e4bbee584e245924058a4b77c7dcb713e308c60542aa36336ad7926250eba75b722f10462c8754041e5026e7361434bcab8ce4c1c6d5711d0
-  data.tar.gz: db92d5c13b3734a5ab698b16f47e4593fe62df3dd3e61934972ed0f64700a3aaa926355ec72953035091a1a00da644a545c499552c3996a1208128d49d601425
+  metadata.gz: 19f333be406383826315d40513bc14ab10cce8dfb9cc68767078caab99ed27b095336599d10f9370c5c7d8d12bd83bb2ef7d90478dbbbc339c84ff534748ab48
+  data.tar.gz: b9606e5f31b4537dcac23e603d75e9a532d49675348733225ee6d1d5325f9ba9a78bcfd7c61de8fdea60a8767e540a3f4869e0c8f4cb3b4d5e3124b38e25e2ef

data/Changelog.md

@@ -2,6 +2,22 @@
 
 The gem that tries really hard not to push files to S3.
 
+## v4.0.1
+
+* Fix order of manipulator chain so that S3 Sync is always the last action
+* Add --aws_access_key_id / --aws_secret_access_key as command line switches
+* Add --build command line switch, which triggers a build before syncing
+* Bump dependency version of middleman-core to 4.0.0.rc.1
+
+## v4.0.0
+
+* Initial support for Middleman v4
+* Fix errors related to ANSI format on Windows
+* Fix null reference errors in resource class
+* Add --environment and --instrument command line switches
+* Remove duplicate extension registration
+* Remove after_s3_sync hook as hooks are no longer supported in Middleman v4
+
 ## v3.0.22
 
 * Fixes a bug where files were not closed, leading to an exhaustion of 

data/README.md

@@ -6,7 +6,7 @@ This gem determines which files need to be added, updated and optionally deleted
 and only transfer these files up. This reduces the impact of an update
 on a web site hosted on S3.
 
-## Why not Middleman Sync?
+#### Why not Middleman Sync?
 
 [Middleman Sync](https://github.com/karlfreeman/middleman-sync) does a
 great job to push [Middleman](http://middlemanapp.com)  generated
@@ -14,6 +14,11 @@ websites to S3. The only issue I have with it is that it pushes
 every files under build to S3 and doesn't seem to properly delete files
 that are no longer needed.
 
+#### Version Support
+
+* Use middleman-s3_sync version 4.x for Middleman 4.x
+* Use middleman-s3_sync version 3.x for Middleman 3.x
+
 ## Installation
 
 Add this line to your application's Gemfile:
@@ -47,22 +52,20 @@ activate :s3_sync do |s3_sync|
   s3_sync.encryption                 = false
   s3_sync.prefix                     = ''
   s3_sync.version_bucket             = false
-  s3_sync.index_document             = 'index.html'
-  s3_sync.error_document             = '404.html'
 end
 ```
 
 You can then start synchronizing files with S3 through ```middleman s3_sync```.
 
-### Configuration Defaults
+#### Configuration Defaults
 
 The following defaults apply to the configuration items:
 
 | Setting                    | Default                            |
 | -----------------          | ----------------------------       |
-| aws_access_key_id          | ```ENV['AWS_ACCESS_KEY_ID']```     |
-| aws_secret_access_key      | ```ENV['AWS_SECRET_ACCESS_KEY']``` |
-| bucket                     | ```ENV['AWS_BUCKET']```            |
+| aws_access_key_id          | -                                  |
+| aws_secret_access_key      | -                                  |
+| bucket                     | -                                  |
 | delete                     | ```true```                         |
 | after_build                | ```false```                        |
 | prefer_gzip                | ```true```                         |
@@ -72,20 +75,11 @@ The following defaults apply to the configuration items:
 | acl                        | ```'public-read'```                |
 | version_bucket             | ```false```                        |
 
-You do not need to specify the settings that match the defaults. This
-simplify the configuration of the extension:
-
-```ruby
-activate :s3_sync do |s3_sync|
-  s3_sync.bucket = 'my.bucket.com'
-end
-```
-
-### Providing AWS Credentials
+## Setting AWS Credentials
 
-There are a few ways to provide the AWS credentials for s3_sync:
+There are several ways to provide the AWS credentials for s3_sync:
 
-#### Through ```config.rb```
+#### Through `config.rb`
 
 You can set the aws_access_key_id and aws_secret_access_key in the block
 that is passed to the activate method.
@@ -93,20 +87,26 @@ that is passed to the activate method.
 > I strongly discourage using this method. This will lead you to add and commit these changes
 > to your SCM and potentially expose sensitive information to the world.
 
-#### Through ```.s3_sync``` File
+#### Through `.s3_sync` File
 
-You can create a ```.s3_sync``` at the root of your middleman project.
+You can create a `.s3_sync` at the root of your middleman project.
 The credentials are passed in the YAML format. The keys match the
 options keys.
 
 The .s3_sync file takes precedence to the configuration passed in the
 activate method.
 
-A sample ```.s3_sync``` file is included at the root of this repo.
+A sample `.s3_sync` file is included at the root of this repo.
 
 > Make sure to add .s3_sync to your ignore list if you choose this approach. Not doing so may expose
 > credentials to the world.
 
+#### Through the Command Line
+
+The aws credentials can also be passed via a command line options
+`--aws_access_key_id` (`-k`) and `--aws_secret_access_key` (`-s`). They should override
+any other settings if specified.
+
 #### Through Environment
 
 You can also pass the credentials through environment variables. They
@@ -123,9 +123,9 @@ method or passed through the ```.s3_sync``` configuration file.
 
 #### Through IAM role
 
-Alternatively, if you are running builds on EC2 instance which has approrpiate IAM role, then you don't need to think about specifying credentials at all – they will be pulled from AWS metadata server.
+Alternatively, if you are running builds on EC2 instance which has approrpiate IAM role, then you don't need to think about specifying credentials at all – they will be pulled from AWS metadata service.
 
-### IAM Policy
+#### IAM Policy
 
 Here's a sample IAM policy that will allow a user to update the site
 contained in a bucket named "mysite.com":
@@ -150,28 +150,56 @@ contained in a bucket named "mysite.com":
 
 This will give full access to both the bucket and it's contents.
 
-## Push All Content to S3
+## Command Line Usage
+
+#### Push All Content to S3
 
 There are situations where you might need to push the files to S3. In
-such case, you can pass the ```--force``` option:
+such case, you can pass the `--force` (`-f`) option:
 
     $ middleman s3_sync --force
 
-## Overriding the destination bucket
+#### Overriding the destination bucket
 
-You can override the destination bucket using the --bucket switch.
+You can override the destination bucket using the `--bucket` (`-b`) switch.
 The command is:
 
     $ middleman s3_sync --bucket=my.new.bucket
 
-## Overriding the destination prefix
+#### Overriding the destination prefix
 
-You can override the destination prefix using the `--prefix` switch. The
+You can override the destination prefix using the `--prefix` (`-p`) switch. The
 command is:
 
     $ middleman s3_sync --prefix=my/new/prefix
 
-## Pushing to a folder within a bucket
+#### Specify a Middleman environment
+
+You can specify which environment to run Middleman under using the
+`--environment` (`-e`) option:
+
+    $ middleman s3_sync --environment=production
+
+#### Dry Run
+
+You can perform a dry run to see what would be the result of a sync
+operation using the `--dry_run` (`-d`) option:
+
+    $ middleman s3_sync --dry_run
+
+#### Print instrument messages
+
+The `--instrument` (`-i`) option will output more information about Middleman
+and s3_sync.
+
+#### Run build before synchronizing
+
+The `--build` (`-B`) option will ensure that Middleman build is run before the
+synchronization with the S3 bucket.
+
+## AWS Configuration
+
+#### Pushing to a folder within a bucket
 
 You can push to a folder within an S3 bucket by adding using the prefix
 option in the config block:
@@ -183,24 +211,24 @@ activate :s3_sync do |s3_sync|
 end
 ```
 
-## Bucket Versioning
+#### Bucket Versioning
 
-You can enable bucket versioning by setting the ```version_bucket```
+You can enable bucket versioning by setting the `version_bucket`
 setting to true within the bucket configuration.
 
 Versioning is enabled at the bucket level, not at the object level.
 
 You can [find out more about versioning here](https://aws.amazon.com/about-aws/whats-new/2010/02/08/versioning-feature-for-amazon-s3-now-available/).
 
-## HTTP Caching
+#### HTTP Caching
 
-By default, ```middleman-s3_sync``` does not set caching headers. In
+By default, `middleman-s3_sync` does not set caching headers. In
 general, the default settings are sufficient. However, there are
 situations where you might want to set a different HTTP caching policy.
-This may be very helpful if you are using the ```asset_hash```
+This may be very helpful if you are using the `asset_hash`
 extension.
 
-### Setting a policy based on the mime-type of a file
+#### Setting a policy based on the mime-type of a file
 
 You can set a caching policy for every files that match a certain
 mime-type. For example, setting max-age to 0 and kindly asking the
@@ -213,7 +241,7 @@ caching_policy 'text/html', max_age: 0, must_revalidate: true
 
 As a result, the following ```Cache-Control``` header would be set to ```max-age:0, must-revalidate```
 
-### Setting a Default Policy
+#### Setting a Default Policy
 
 You can set the default policy by passing an options hash to ```default_caching_policy``` in your ```config.rb``` file after the ```activate :s3_sync ... end``` block:
 
@@ -224,7 +252,7 @@ default_caching_policy max_age:(60 * 60 * 24 * 365)
 This will apply the policy to any file that do not have a mime-type
 specific policy.
 
-### Caching Policies
+#### Caching Policies
 
 The [Caching Tutorial](http://www.mnot.net/cache_docs/) is a great
 introduction to HTTP caching. The caching policy code in this gem is
@@ -243,7 +271,7 @@ The following keys can be set:
 | `must_revalidate`  | boolean | `must-revalidate`  | Tells the caches that they must obey any freshness information you give them about a representation.                                   |
 | `proxy_revalidate` | boolean | `proxy-revalidate` | Similar as `must-revalidate`, but only for proxies.                                                                                    |
 
-### Setting `Expires` Header
+#### Setting `Expires` Header
 
 You can pass the `expires` key to the `caching_policy` and
 `default_caching_policy` methods if you insist on setting the expires
@@ -253,7 +281,7 @@ when the resourse is set to expire.
 > Note that the `Cache-Control` header will take precedence over the
 > `Expires` header if both are present.
 
-### A Note About Browser Caching
+#### A Note About Browser Caching
 
 Browser caching is well specified. It hasn't always been the case.
 Still, even modern browsers have different behaviors if it suits it's
@@ -263,7 +291,7 @@ are (I'm looking at you Chrome!). Setting the `Cache-Control` or
 that stand between them and your content will behave the way you want
 them to. YMMV.
 
-### Path Specific Content Type
+#### Path Specific Content Type
 
 You can now set the content type of a path through the
 ```s3_sync.content_types``` hash. This hasi will take precendence over
@@ -271,7 +299,7 @@ the content type discovered by the mime_types gem. The [associated pull
 request](https://github.com/fredjean/middleman-s3_sync/pull/87) has a
 few good examples on how to use this feature.
 
-### ACLs
+#### ACLs
 
 ```middleman-s3_sync``` will set the resources's ACL to ```public-read``` by default. You
 can specificy a different ACL via the ```acl``` configuration option.
@@ -288,7 +316,7 @@ The full values and their semantics are [documented on AWS's
 documentation
 site](http://docs.aws.amazon.com/AmazonS3/latest/dev/ACLOverview.html#CannedACL).
 
-### Encryption
+#### Encryption
 
 You can ask Amazon to encrypt your files at rest by setting the
 ```encryption``` option to true. [Server side encryption is documented
@@ -296,7 +324,7 @@ on the AWS documentation
 site](http://docs.aws.amazon.com/AmazonS3/latest/dev/UsingServerSideEncryption.html)
 .
 
-### GZipped Content Encoding
+#### GZipped Content Encoding
 
 You can set the ```prefer_gzip``` option to look for a gzipped version
 of a resource. The gzipped version of the resource will be pushed to S3
@@ -305,15 +333,6 @@ headers will be set correctly. This will cause Amazon to serve the
 compressed version of the resource. In order for this to work, you need to
 have the `:gzip` extension activated in your `config.rb`.
 
-#### Custom S3 Index and Error Documents
-
-You can enable a custom [index document](http://docs.aws.amazon.com/AmazonS3/latest/dev/IndexDocumentSupport.html)
-and [error document](http://docs.aws.amazon.com/AmazonS3/latest/dev/CustomErrorDocSupport.html)
-settings. The ```index_document``` option tells which file name gets used as
-the index document of a directory (typically, ```index.html```), while
-```error_document``` specifies the document to display for 4xx errors (ie,
-the 404 page).
-
 ## A Debt of Gratitude
 
 I used Middleman Sync as a template for building a Middleman extension.

data/lib/middleman-s3_sync/commands.rb

@@ -1,10 +1,9 @@
-require 'middleman-core/cli'
+require 'middleman-cli'
 
 module Middleman
   module Cli
-    Base.map("sync" => "s3_sync")
 
-    class S3Sync < Thor
+    class S3Sync < Thor::Group
       include Thor::Actions
 
       check_unknown_options!
@@ -15,49 +14,104 @@ module Middleman
         true
       end
 
-      desc "s3_sync [options]", "Synchronizes a middleman site to an AWS S3 bucket"
-      class_option :force, type: :boolean,
-        desc: "Push all local files to the server",
-        aliases: '-f'
-      class_option :bucket, type: :string,
-        desc: "Specify which bucket to use, overrides the configured bucket.",
-        aliases: '-b'
-      method_option :prefix, type: :string,
-        desc: "Specify which prefix to use, overrides the configured prefix.",
-        aliases: '-p'
-      method_option :verbose, type: :boolean,
-        desc: "Adds more verbosity...",
-        aliases: '-v'
-      class_option :dry_run, type: :boolean,
-        desc: "Performs a dry run of the sync",
-        aliases: '-n'
+      class_option :environment,
+                   aliases: '-e',
+                   type: :string,
+                   default: ENV['MM_ENV'] || ENV['RACK_ENV'] || 'production',
+                   desc: 'The environment to deploy.'
+
+      class_option :build,
+                   type: :boolean,
+                   aliases: '-B',
+                   desc: 'Run `middleman build` before the sync step'
+
+      class_option :force,
+                   aliases: '-f',
+                   type: :boolean,
+                   desc: 'Push all local files to the server.'
+
+      class_option :aws_access_key_id,
+                   aliases: '-k',
+                   type: :string,
+                   desc: 'Specify aws_access_key_id, and overrides the configured value.'
+
+      class_option :aws_secret_access_key,
+                   aliases: '-s',
+                   type: :string,
+                   desc: 'Specify aws_secret_access_key, and overrides the configured value.'
+
+      class_option :bucket,
+                   aliases: '-b',
+                   type: :string,
+                   desc: 'Specify which bucket to use, overrides the configured bucket.'
+
+      class_option :prefix,
+                   aliases: '-p',
+                   type: :string,
+                   desc: 'Specify which prefix to use, overrides the configured prefix.'
+
+      class_option :verbose,
+                   aliases: '-v',
+                   type: :boolean,
+                   desc: 'Enables verbose log output.'
+
+      class_option :dry_run,
+                   aliases: '-n',
+                   type: :boolean,
+                   desc: 'Performs a dry run of the sync.'
+
+      class_option :instrument,
+                   aliases: '-i',
+                   type: :string,
+                   desc: 'Print instrument messages.'
 
       def s3_sync
-        ::Middleman::S3Sync.app = ::Middleman::Application.server.inst do
-          config[:environment] = :build
+        env = options[:environment].to_s.to_sym
+        verbose = options[:verbose] ? 0 : 1
+        instrument = options[:instrument]
+
+        ::Middleman::S3Sync.app = ::Middleman::Application.new do
+          config[:mode] = :build
+          config[:environment] = env
+          ::Middleman::Logger.singleton(verbose, instrument)
         end
 
+        build(options)
+
         s3_sync_options = ::Middleman::S3Sync.s3_sync_options
 
         bucket = s3_sync_options.bucket rescue nil
 
         unless bucket
-          raise Thor::Error.new "You need to activate the s3_sync extension and at least provide the bucket name."
+          raise Thor::Error.new 'You must provide the bucket name.'
         end
 
-
         # Override options based on what was passed on the command line...
         s3_sync_options.force = options[:force] if options[:force]
+        s3_sync_options.aws_access_key_id = options[:aws_access_key_id] if options[:aws_access_key_id]
+        s3_sync_options.aws_secret_access_key = options[:aws_secret_access_key] if options[:aws_secret_access_key]
         s3_sync_options.bucket = options[:bucket] if options[:bucket]
         s3_sync_options.verbose = options[:verbose] if options[:verbose]
         if options[:prefix]
           s3_sync_options.prefix  = options[:prefix] if options[:prefix]
-          s3_sync_options.prefix = s3_sync_options.prefix.end_with?("/") ? s3_sync_options.prefix : s3_sync_options.prefix + "/"
+          s3_sync_options.prefix = s3_sync_options.prefix.end_with?('/') ? s3_sync_options.prefix : s3_sync_options.prefix + '/'
         end
         s3_sync_options.dry_run = options[:dry_run] if options[:dry_run]
 
         ::Middleman::S3Sync.sync()
       end
+
+      def build(options = {})
+        if options[:build]
+          run("middleman build -e #{options[:environment]}") || exit(1)
+        end
+      end
     end
+
+    # Add to CLI
+    Base.register(Middleman::Cli::S3Sync, 's3_sync', 's3_sync [options]', 'Synchronizes a middleman site to an AWS S3 bucket')
+
+    # Alias "sync" to "s3_sync"
+    Base.map('sync' => 's3_sync')
   end
 end

data/lib/middleman-s3_sync/extension.rb

@@ -3,7 +3,7 @@ require 'middleman/s3_sync'
 require 'map'
 
 module Middleman
-  class S3SyncExtension < Extension
+  class S3SyncExtension < ::Middleman::Extension
     # Options supported by the extension...
     option :prefix, nil, 'Path prefix of the resource we are looking for on the server.'
     option :http_prefix, nil, 'Path prefix of the resources'
@@ -23,15 +23,12 @@ module Middleman
     option :version_bucket, false, 'Whether to enable versionning on the S3 bucket content'
     option :verbose, false, 'Whether to provide more verbose output'
     option :dry_run, false, 'Whether to perform a dry-run'
-    option :index_document, nil, 'S3 custom index document path'
-    option :error_document, nil, 'S3 custom error document path'
-    option :content_types, {}, 'Custom content types'
+
+    # S3Sync must be the last action in the manipulator chain
+    self.resource_list_manipulator_priority = 9999
 
     def initialize(app, options_hash = {}, &block)
       super
-      app.define_hook :after_s3_sync
-      # Temporary workaround for 3.3 and 3.4.
-      app.send :include, ClassMethods
     end
 
     def after_configuration
@@ -43,7 +40,6 @@ module Middleman
       options.build_dir ||= app.build_dir if app.respond_to? :build_dir
       if options.prefix
         options.prefix = options.prefix.end_with?("/") ? options.prefix : options.prefix + "/"
-        options.prefix = "" if options.prefix == "/"
       end
       ::Middleman::S3Sync.s3_sync_options = s3_sync_options
     end
@@ -89,10 +85,6 @@ module Middleman
         ::Middleman::S3SyncExtension.s3_sync_options
       end
 
-      def content_types
-        ::Middleman::S3Sync.content_types
-      end
-
       def default_caching_policy(policy = {})
         ::Middleman::S3Sync.add_caching_policy(:default, policy)
       end
@@ -102,7 +94,4 @@ module Middleman
       end
     end
   end
-
-  ::Middleman::Extensions.register(:s3_sync, S3SyncExtension)
 end
-

data/lib/middleman/s3_sync.rb

@@ -25,6 +25,8 @@ module Middleman
       attr_reader   :app
 
       def sync()
+        @app ||= ::Middleman::Application.new
+
         say_status "Let's see if there's work to be done..."
         unless work_to_be_done?
           say_status "All S3 files are up to date."
@@ -35,17 +37,10 @@ module Middleman
 
         update_bucket_versioning
 
-        update_bucket_website
-
         ignore_resources
         create_resources
         update_resources
         delete_resources
-
-        app.run_hook :after_s3_sync, ignored: files_to_ignore.map(&:path),
-                                      created: files_to_create.map(&:path),
-                                      updated: files_to_update.map(&:path),
-                                      deleted: files_to_delete.map(&:path)
       end
 
       def bucket
@@ -80,21 +75,6 @@ module Middleman
         connection.put_bucket_versioning(s3_sync_options.bucket, "Enabled") if s3_sync_options.version_bucket
       end
 
-      def update_bucket_website
-        opts = {}
-        opts[:IndexDocument] = s3_sync_options.index_document if s3_sync_options.index_document
-        opts[:ErrorDocument] = s3_sync_options.error_document if s3_sync_options.error_document
-
-        if opts[:ErrorDocument] && !opts[:IndexDocument]
-          raise 'S3 requires `index_document` if `error_document` is specified'
-        end
-
-        unless opts.empty?
-          say_status "Putting bucket website: #{opts.to_json}"
-          connection.put_bucket_website(s3_sync_options.bucket, opts)
-        end
-      end
-
       def connection
         connection_options = {
           :region => s3_sync_options.region,
@@ -205,3 +185,4 @@ module Middleman
     end
   end
 end
+

data/lib/middleman/s3_sync/caching_policy.rb

@@ -8,8 +8,7 @@ module Middleman
       end
 
       def caching_policy_for(content_type)
-        return default_caching_policy if content_type.nil? || content_type.empty?
-        caching_policies.fetch(content_type.to_s.split(';').first.strip, caching_policies[:default])
+        caching_policies.fetch(content_type.to_s, caching_policies[:default])
       end
 
       def default_caching_policy

data/lib/middleman/s3_sync/options.rb

@@ -21,9 +21,7 @@ module Middleman
         :version_bucket,
         :dry_run,
         :verbose,
-        :content_types,
-        :index_document,
-        :error_document
+        :content_types
       ]
       attr_accessor *OPTIONS
 

data/lib/middleman/s3_sync/resource.rb

@@ -58,7 +58,7 @@ module Middleman
 
       def update!
         local_content { |body|
-          say_status ANSI.blue{"Updating"} + " #{remote_path}#{ gzipped ? ANSI.white {' (gzipped)'} : ''}"
+          say_status "#{ANSI.blue{"Updating"}} #{remote_path}#{ gzipped ? ANSI.white {' (gzipped)'} : ''}"
           s3_resource.merge_attributes(to_h)
           s3_resource.body = body
 
@@ -76,12 +76,12 @@ module Middleman
       end
 
       def destroy!
-        say_status ANSI.red { "Deleting" } + " " + remote_path
+        say_status "#{ANSI.red{"Deleting"}} #{remote_path}"
         bucket.files.destroy remote_path unless options.dry_run
       end
 
       def create!
-        say_status ANSI.green { "Creating" } + " #{remote_path}#{ gzipped ? ANSI.white {' (gzipped)'} : ''}"
+        say_status "#{ANSI.green{"Creating"}} #{remote_path}#{ gzipped ? ANSI.white {' (gzipped)'} : ''}"
         local_content { |body|
           bucket.files.create(to_h.merge(body: body)) unless options.dry_run
         }
@@ -94,7 +94,7 @@ module Middleman
                    elsif directory?
                      :directory
                    end
-          say_status ANSI.yellow {"Ignoring"} + " #{remote_path} #{ reason ? ANSI.white {"(#{reason})" } : "" }"
+          say_status "#{ANSI.yellow{"Ignoring"}} #{remote_path} #{ reason ? ANSI.white {"(#{reason})" } : "" }"
         end
       end
 
@@ -174,7 +174,7 @@ module Middleman
       end
 
       def redirect?
-        full_s3_resource.metadata.has_key?('x-amz-website-redirect-location')
+        full_s3_resource && full_s3_resource.metadata.has_key?('x-amz-website-redirect-location')
       end
 
       def directory?
@@ -232,7 +232,7 @@ module Middleman
       end
 
       def build_dir
-        options.build_dir
+        options.build_dir || 'build'
       end
 
       def options

data/lib/middleman/s3_sync/status.rb

@@ -4,7 +4,7 @@ module Middleman
   module S3Sync
     module Status
       def say_status(status)
-        puts ANSI.green{:s3_sync.to_s.rjust(12)} + "  #{status}"
+        puts "#{ANSI.green{:s3_sync.to_s.rjust(12)}}  #{status}"
       end
     end
   end

data/lib/middleman/s3_sync/version.rb

@@ -1,5 +1,5 @@
 module Middleman
   module S3Sync
-    VERSION = "3.3.10"
+    VERSION = "4.0.1.rc.1"
   end
 end

data/middleman-s3_sync.gemspec

@@ -18,10 +18,10 @@ Gem::Specification.new do |gem|
   gem.test_files    = gem.files.grep(%r{^(test|spec|features)/})
   gem.require_paths = ["lib"]
 
-  gem.add_runtime_dependency 'middleman-core', '~> 3.3'
+  gem.add_runtime_dependency 'middleman-core', '>= 4.0.0.rc.1'
+  gem.add_runtime_dependency 'middleman-cli'
   gem.add_runtime_dependency 'unf'
-  gem.add_runtime_dependency 'mime-types', '>= 3.0'
-  gem.add_runtime_dependency 'fog-aws', '>= 0.7.0'
+  gem.add_runtime_dependency 'fog-aws', '>= 0.1.1'
   gem.add_runtime_dependency 'map'
   gem.add_runtime_dependency 'parallel'
   gem.add_runtime_dependency 'ruby-progressbar'

data/spec/caching_policy_spec.rb

@@ -2,119 +2,79 @@ require 'spec_helper'
 require 'middleman/s3_sync/caching_policy'
 
 describe Middleman::S3Sync::BrowserCachePolicy do
-  context "building the policy" do
-    let(:options) { Hash.new }
-    subject(:policy) { Middleman::S3Sync::BrowserCachePolicy.new(options) }
-
-    it "should be blank" do
-      policy.should_not be_nil
-
-      policy.to_s.should_not =~ /max-age=/
-      policy.to_s.should_not =~ /s-maxage=/
-      policy.to_s.should_not =~ /public/
-      policy.to_s.should_not =~ /private/
-      policy.to_s.should_not =~ /no-cache/
-      policy.to_s.should_not =~ /no-store/
-      policy.to_s.should_not =~ /must-revalidate/
-      policy.to_s.should_not =~ /proxy-revalidate/
-      policy.expires.should be_nil
-    end
-
-    context "setting max-age" do
-      let(:options) { { max_age: 300 } }
-
-      its(:to_s) { should =~ /max-age=300/ }
-    end
-
-    context "setting s-maxage" do
-      let(:options) { { s_maxage: 300 } }
-
-      its(:to_s) { should =~ /s-maxage=300/ }
-    end
-
-    context "set public flag" do
-      let(:options) { { public: true } }
-      its(:to_s) { should =~ /public/ }
-    end
-
-    context "it should set the private flag if it is set to true" do
-      let(:options) { { private: true } }
-      its(:to_s) { should =~ /private/ }
-    end
-
-    context "it should set the no-cache flag when set property" do
-      let(:options) { { no_cache: true }}
-      its(:to_s) { should =~ /no-cache/ }
-    end
-
-    context "setting the no-store flag" do
-      let(:options) { { no_store: true } }
-      its(:to_s) { should =~ /no-store/ }
-    end
-
-    context "setting the must-revalidate policy" do
-      let(:options) { { must_revalidate: true } }
-      its(:to_s) { should =~ /must-revalidate/ }
-    end
-
-    context "setting the proxy-revalidate policy" do
-      let(:options) { { proxy_revalidate: true } }
-      its(:to_s) { should =~ /proxy-revalidate/ }
-    end
+  let(:options) { Hash.new }
+  subject(:policy) { Middleman::S3Sync::BrowserCachePolicy.new(options) }
+
+  it "should be blank" do
+    policy.should_not be_nil
+
+    policy.to_s.should_not =~ /max-age=/
+    policy.to_s.should_not =~ /s-maxage=/
+    policy.to_s.should_not =~ /public/
+    policy.to_s.should_not =~ /private/
+    policy.to_s.should_not =~ /no-cache/
+    policy.to_s.should_not =~ /no-store/
+    policy.to_s.should_not =~ /must-revalidate/
+    policy.to_s.should_not =~ /proxy-revalidate/
+    policy.expires.should be_nil
+  end
 
-    context "divide caching policiies with a comma and a space" do
-      let(:options) { { :max_age => 300, :public => true } }
+  context "setting max-age" do
+    let(:options) { { max_age: 300 } }
 
-      it "splits policies eith commans and spaces" do
-        policies = policy.to_s.split(/, /)
-        policies.length.should == 2
-        policies.first.should == 'max-age=300'
-        policies.last.should == 'public'
-      end
-    end
+    its(:to_s) { should =~ /max-age=300/ }
+  end
 
-    context "set the expiration date" do
-      let(:options) { { expires: 1.years.from_now } }
+  context "setting s-maxage" do
+    let(:options) { { s_maxage: 300 } }
 
-      its(:expires) { should == CGI.rfc1123_date(1.year.from_now )}
-    end
+    its(:to_s) { should =~ /s-maxage=300/ }
   end
-end
 
-describe "Storing and retrieving policies" do
-  class CachingPolicy
-    include Middleman::S3Sync::CachingPolicy
+  context "set public flag" do
+    let(:options) { { public: true } }
+    its(:to_s) { should =~ /public/ }
   end
 
-  let(:caching_policy) { CachingPolicy.new }
-  let(:policy) { caching_policy.caching_policy_for("text/html; charset=utf-8") }
+  context "it should set the private flag if it is set to true" do
+    let(:options) { { private: true } }
+    its(:to_s) { should =~ /private/ }
+  end
 
-  it "finds the policies by the mime-type excluding the parameters" do
-    caching_policy.add_caching_policy("text/html", max_age: 300)
+  context "it should set the no-cache flag when set property" do
+    let(:options) { { no_cache: true }}
+    its(:to_s) { should =~ /no-cache/ }
+  end
 
-    expect(policy).to_not be_nil
-    expect(policy.policies.max_age).to eq(300)
+  context "setting the no-store flag" do
+    let(:options) { { no_store: true } }
+    its(:to_s) { should =~ /no-store/ }
   end
-end
 
-describe "Handling situations where the content type is nil" do
-  class CachingPolicy
-    include Middleman::S3Sync::CachingPolicy
+  context "setting the must-revalidate policy" do
+    let(:options) { { must_revalidate: true } }
+    its(:to_s) { should =~ /must-revalidate/ }
   end
 
-  let(:caching_policy) { CachingPolicy.new }
+  context "setting the proxy-revalidate policy" do
+    let(:options) { { proxy_revalidate: true } }
+    its(:to_s) { should =~ /proxy-revalidate/ }
+  end
 
-  it "returns the default caching policy when the content type is nil" do
-    caching_policy.add_caching_policy(:default, max_age:(60 * 60 * 24 * 365))
+  context "divide caching policiies with a comma and a space" do
+    let(:options) { { :max_age => 300, :public => true } }
 
-    expect(caching_policy.caching_policy_for(nil)).to_not be_nil
-    expect(caching_policy.caching_policy_for(nil).policies[:max_age]).to eq(60 * 60 * 24 * 365)
+    it "splits policies eith commans and spaces" do
+      policies = policy.to_s.split(/, /)
+      policies.length.should == 2
+      policies.first.should == 'max-age=300'
+      policies.last.should == 'public'
+    end
   end
 
-  it "returns the default caching policy when the content type is blank" do
-    caching_policy.add_caching_policy(:default, max_age:(60 * 60 * 24 * 365))
+  context "set the expiration date" do
+    let(:options) { { expires: 1.years.from_now } }
 
-    expect(caching_policy.caching_policy_for("")).to_not be_nil
-    expect(caching_policy.caching_policy_for("").policies[:max_age]).to eq(60 * 60 * 24 * 365)
+    its(:expires) { should == CGI.rfc1123_date(1.year.from_now )}
   end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: middleman-s3_sync
 version: !ruby/object:Gem::Version
-  version: 3.3.10
+  version: 4.0.1.rc.1
 platform: ruby
 authors:
 - Frederic Jean
@@ -9,24 +9,24 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-05-10 00:00:00.000000000 Z
+date: 2015-10-30 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: middleman-core
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: '3.3'
+        version: 4.0.0.rc.1
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: '3.3'
+        version: 4.0.0.rc.1
 - !ruby/object:Gem::Dependency
-  name: unf
+  name: middleman-cli
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
@@ -40,33 +40,33 @@ dependencies:
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
-  name: mime-types
+  name: unf
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: '3.0'
+        version: '0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: '3.0'
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: fog-aws
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: 0.7.0
+        version: 0.1.1
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: 0.7.0
+        version: 0.1.1
 - !ruby/object:Gem::Dependency
   name: map
   requirement: !ruby/object:Gem::Requirement
@@ -294,12 +294,12 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '0'
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
-  - - ">="
+  - - ">"
     - !ruby/object:Gem::Version
-      version: '0'
+      version: 1.3.1
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.5.1
+rubygems_version: 2.4.5
 signing_key: 
 specification_version: 4
 summary: Tries really, really hard not to push files to S3.