frizz 1.7.0 → 2.0.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: be17060c59c45506180818f61b31a226dbcb873a
-  data.tar.gz: 1e41ab2d804d3fce8de5bd8f3b3f770dfaada643
+  metadata.gz: ac81e9f8422a598be934dfc3408700e10c06e24e
+  data.tar.gz: 8bff2ca30a6e00e36c4a0e32132faf230a4f27a6
 SHA512:
-  metadata.gz: ca669561edc55c8220f1cbf28f8590b1337c27169a20aa979db29082b1640ebb7bd08c8c692dfc228538c306f6731d4d8a422e7cb1d98bf6986a2806bf78ce7b
-  data.tar.gz: d0be606d9c5f2e1ee7db3daf3fd8c1f01c4be6fd696d73831b27548c0c59c56c679807d49269c68ace40617881a5ca36735a9d6493050d171466d20b6673b664
+  metadata.gz: 5b6e88ad4ff8577b2b27774308d68e79e7c211d6ce03e94fc14667c1857740c5fdadf339f57e3fa797281b826ed45ff3440c3b95f791f23dcd7623dafd6847fe
+  data.tar.gz: 0b1c66cd3b000bd6ebe6473fc95571c6478363859f0760c71025cf0c9db44f8b2c1a735792c23ec2a622e9fb4504d045f8ca0182c11c3e3ec345811f8c7f79f2

data/README.md

@@ -9,6 +9,7 @@ some nifty Middleman integrations for managing environments.
 * Only uploads files that have changed
 * Removes files that have been deleted locally
 * Invalidate changed files on CloudFront
+* Supports S3 redirects
 
 ### Middleman Features
 
@@ -62,14 +63,14 @@ end
 Deploy the contents of `build/` to your bucket named "my-static-site.com":
 
 ```ruby
-site = Frizz::Site.new("my-static-site.com")
+site = Frizz::Site.new("my-static-site.com", region: "us-west-2")
 site.deploy!
 ```
 
 Specify a different local build dir:
 
 ```ruby
-site = Frizz::Site.new("my-static-site.com", from: "build/public")
+site = Frizz::Site.new("my-static-site.com", region: "us-west-2", from: "build/public")
 ```
 
 ### Deploy with CloudFront invalidation
@@ -79,7 +80,7 @@ the cache for any files that changed or were removed in the deploy. Note:
 invalidating a CloudFront cache can take some time.
 
 ```ruby
-site = Frizz::Site.new("my-bucket", distribution: "DISTRIBUTION_ID")
+site = Frizz::Site.new("my-bucket", region: "us-west-2", distribution: "DISTRIBUTION_ID")
 site.deploy!
 ```
 
@@ -96,6 +97,19 @@ environments:
       - "logs/*"
 ```
 
+### Redirects
+
+You can setup [S3 redirects](http://docs.aws.amazon.com/AmazonS3/latest/dev/how-to-page-redirect.html)
+in `frizz.yml`:
+
+```yaml
+environments:
+  production:
+    redirect_rules:
+      - from: "old/page.html"
+        to: "/new/page.html"
+```
+
 ## Usage With Middleman
 
 Managing more than the basic two environments (dev and build) in a Middleman app
@@ -129,8 +143,10 @@ With the following `frizz.yml`:
 environments:
   staging:
     host: "staging.example.com"
+    region: "us-west-2"
   production:
     host: "example.com"
+    region: "us-west-2"
     distribution "CLOUDFRONT_DISTRIBUTION_ID"
 ```
 
@@ -176,10 +192,12 @@ With the following `frizz.yml`:
 environments:
   staging:
     host: "staging.example.com"
+    region: "us-west-2"
     api_root: http://api.staging.example.com/v0
     welcome_message: I'm A Staging Server
   production:
     host: "example.com"
+    region: "us-west-2"
     api_root: http://api.example.com/v0
     welcome_message: I'm A Production Server
   development:

data/frizz.gemspec

@@ -21,9 +21,9 @@ Gem::Specification.new do |spec|
   spec.add_development_dependency "bundler", "~> 1.3"
   spec.add_development_dependency "rake"
 
-  spec.add_dependency "s3", "~> 0.3.13"
   spec.add_dependency "colorize", "~> 0.6.0"
   spec.add_dependency "mime-types", "~> 1.25"
-  spec.add_dependency "listen", "~> 2.0"
+  spec.add_dependency "listen", "> 2.0", "< 4.0"
   spec.add_dependency "cloudfront-invalidator", "~> 0.2.0"
+  spec.add_dependency 'aws-sdk', '~> 2.2', '>= 2.2.35'
 end

data/lib/frizz/environment.rb

@@ -21,4 +21,4 @@ module Frizz
     # attributes.
     def method_missing(meth, *args, &block); end
   end
-end
+end

data/lib/frizz/local.rb

@@ -1,8 +1,9 @@
 module Frizz
   class Local
-    def initialize(root_path, ignorance)
+    def initialize(root_path, ignorance, options = {})
       @root_path = root_path
       @ignorance = ignorance
+      @options = options
     end
 
     def files
@@ -12,16 +13,20 @@ module Frizz
             File.new(expand_path(local_path), local_path) unless ignore?(local_path)
           end.compact
         end
-      end
+      end.concat(redirect_files)
     end
 
     def file_for(local_path)
-      ::File.read expand_path(local_path)
+      if is_redirect?(local_path)
+        Tempfile.new(local_path.gsub(/\.|\//, '-'))
+      else
+        ::File.read expand_path(local_path)
+      end
     end
 
     private
 
-    attr_reader :root_path, :ignorance
+    attr_reader :root_path, :ignorance, :options
 
     def expand_path(local_path)
       ::File.join root_path, local_path
@@ -31,17 +36,45 @@ module Frizz
       ::File.directory?(path) || ignorance.ignore?(path)
     end
 
+    def is_redirect?(path)
+      redirect_files.any? { |r| r.key == path }
+    end
+
+    def redirect_files
+      @redirect_files ||= if options[:redirect_rules]
+        options[:redirect_rules].map do |redirect_rule|
+          File.new(
+            expand_path(redirect_rule['from']),
+            redirect_rule['from'],
+            redirect_to: redirect_rule['to']
+          )
+        end
+      else
+        []
+      end
+    end
+
     class File
       attr_reader :path, :key
 
-      def initialize(path, key)
+      def initialize(path, key, options = {})
         @path = path
         @key = key
+        @options = options
       end
 
       def checksum
+        return nil if options[:redirect_to]
         Digest::MD5.file(path)
       end
+
+      def upload_options
+        options
+      end
+
+      private
+
+      attr_reader :options
     end
   end
 end

data/lib/frizz/middleman/tasks.rb

@@ -35,7 +35,13 @@ module Frizz
             relevant_environments.each do |name, env|
               desc "Deploy build dir to #{env.name}: #{env.bucket}"
               task env.name do
-                Frizz::Site.new(env.bucket, distribution: env.distribution, ignore: env.ignore).deploy!
+                Frizz::Site.new(
+                  env.bucket,
+                  distribution: env.distribution,
+                  ignore: env.ignore,
+                  redirect_rules: env.redirect_rules,
+                  region: env.region
+                ).deploy!
               end
             end
           end

data/lib/frizz/remote.rb

@@ -1,41 +1,58 @@
-require "s3"
+require 'aws-sdk'
 require "mime-types"
 
 module Frizz
   class Remote
-    def initialize(bucket_name, ignorance)
+    def initialize(bucket_name, ignorance, options = {})
+      @options = options
       @bucket_name = bucket_name
       @ignorance = ignorance
     end
 
     def files
-      @files ||= bucket.objects.reject { |o| ignore?(o) }
+      @files ||= objects.reject { |o| ignore?(o) }
     end
 
-    def upload(file, key)
-      bucket.objects.build(key).tap do |obj|
-        obj.acl = :public_read
-        obj.content = file
-        obj.content_type = MIME::Types.type_for(key).first.content_type
-      end.save
+    def upload(file, key, options = {})
+      object_options = {
+        bucket: bucket_name,
+        body: file,
+        acl: 'public-read',
+        content_type: MIME::Types.type_for(key).first.content_type,
+        key: key
+      }
+
+      object_options[:website_redirect_location] = options[:redirect_to] if options[:redirect_to]
+
+      client.put_object object_options
+    end
+
+    def delete(remote_file)
+      client.delete_object(
+        bucket: bucket_name,
+        key: remote_file.key
+      )
     end
 
     private
 
-    attr_reader :bucket_name, :ignorance
+    attr_reader :bucket_name, :ignorance, :options
 
     def ignore?(object)
       ignorance.ignore?(object.key)
     end
 
-    def bucket
-      @bucket ||= service.buckets.find(bucket_name)
+    def objects
+      client.list_objects(bucket: bucket_name).contents
     end
 
-    def service
-      @service ||= S3::Service.new(
-        access_key_id: Frizz.configuration.access_key_id,
-        secret_access_key: Frizz.configuration.secret_access_key,
+    def client
+      @client ||= Aws::S3::Client.new(
+        region: options[:region],
+        credentials: Aws::Credentials.new(
+          Frizz.configuration.access_key_id,
+          Frizz.configuration.secret_access_key
+        )
       )
     end
   end

data/lib/frizz/site.rb

@@ -9,8 +9,11 @@ module Frizz
         @distribution = Distribution.new(@options[:distribution])
       end
 
-      @local = Local.new(path_to_deploy, ignorance)
-      @remote = Remote.new(host, ignorance)
+      local_options = options.select { |k, v| k == :redirect_rules }
+      @local = Local.new(path_to_deploy, ignorance, local_options)
+
+      remote_options = options.select { |k, v| k == :region }
+      @remote = Remote.new(host, ignorance, remote_options)
     end
 
     def deploy!

data/lib/frizz/sync.rb

@@ -11,31 +11,32 @@ module Frizz
       # Sync existing files
       remote.files.each do |remote_file|
         local_path = remote_file.key
-        local_file_md5 = local_index[local_path]
+        local_file = local_index[local_path]
+        local_file_md5 = local_file && local_file.checksum
 
         if local_file_md5.nil?
           puts "#{local_path}: deleted".red
 
-          remote_file.destroy
+          remote.delete(remote_file)
           changes << remote_file.key
-        elsif local_file_md5 == remote_file.etag
+        elsif local_file_md5 == remote_file.etag.gsub('"', '')
           puts "#{local_path}: unchanged"
 
           local_index.delete(local_path)
         else
           puts "#{local_path}: updated".green
 
-          remote.upload local.file_for(local_path), local_path
+          upload(local_path, local_file)
           local_index.delete(local_path)
           changes << local_path
         end
       end
 
       # Upload new files
-      local_index.each do |local_path, md5|
+      local_index.each do |local_path, local_file|
         puts "#{local_path}: new".green
 
-        remote.upload local.file_for(local_path), local_path
+        upload(local_path, local_file)
         changes << local_path
       end
 
@@ -48,8 +49,12 @@ module Frizz
 
     def local_index
       @local_index ||= local.files.each_with_object({}) do |file, obj|
-        obj[file.key] = file.checksum
+        obj[file.key] = file
       end
     end
+
+    def upload(local_path, local_file)
+      remote.upload local.file_for(local_path), local_path, local_file.upload_options
+    end
   end
-end
+end

data/lib/frizz/version.rb

@@ -1,3 +1,3 @@
 module Frizz
-  VERSION = "1.7.0"
+  VERSION = "2.0.0"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: frizz
 version: !ruby/object:Gem::Version
-  version: 1.7.0
+  version: 2.0.0
 platform: ruby
 authors:
 - patbenatar
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-09-21 00:00:00.000000000 Z
+date: 2016-04-20 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -38,20 +38,6 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: '0'
-- !ruby/object:Gem::Dependency
-  name: s3
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: 0.3.13
-  type: :runtime
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: 0.3.13
 - !ruby/object:Gem::Dependency
   name: colorize
   requirement: !ruby/object:Gem::Requirement
@@ -84,16 +70,22 @@ dependencies:
   name: listen
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">"
       - !ruby/object:Gem::Version
         version: '2.0'
+    - - "<"
+      - !ruby/object:Gem::Version
+        version: '4.0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">"
       - !ruby/object:Gem::Version
         version: '2.0'
+    - - "<"
+      - !ruby/object:Gem::Version
+        version: '4.0'
 - !ruby/object:Gem::Dependency
   name: cloudfront-invalidator
   requirement: !ruby/object:Gem::Requirement
@@ -108,6 +100,26 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: 0.2.0
+- !ruby/object:Gem::Dependency
+  name: aws-sdk
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '2.2'
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: 2.2.35
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '2.2'
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: 2.2.35
 description: Utility for deploying static sites to S3
 email:
 - nick@gophilosophie.com
@@ -155,7 +167,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.2.2
+rubygems_version: 2.5.1
 signing_key: 
 specification_version: 4
 summary: Utility for deploying static sites to S3