s3deploy 0.0.3 → 0.0.4

data/README.md

@@ -44,9 +44,7 @@ If you want to test-drive your configuration you can simulate a deploy
     $ s3deploy simulate
 
 ## Whats in the pipe-line
-1. Setting caching-headers by regex
-2. Skipping files by regex
-3. Putting it on github for others to contribute
+1. Putting it on github for others to contribute
 
 ## Contributing
 (you cant do this riktigt now, but it will be on the githubz soon)

data/lib/.s3deploy.yml

@@ -12,6 +12,10 @@ aws_bucket:   # the bucket you want to deploy to  *required*
               #     sa-east-1         South America (Sao Paulo)
 #path:        # the relative path to the files you want to deploy, leave it blank for current directory.
 #remote_path: # the path within the bucket to where you want to deploy, leave it blank for bucket root.
+#cache_regex: ^(images|javascripts|stylesheets)\/.+\.(png|jpg|js|css)(\.gz)?$
+              # Adds headers for browser cache for files matching regex.
+#skip_regex:  \.DS_Store$
+              # Skips files that match this regex.
 extras:
   #- delete_old_files    # deletes files that were in the bucket but not in the latest deploy
   #- replace_with_gzip   # replaces files with gz versions if they exist

data/lib/s3deploy/version.rb

@@ -1,3 +1,3 @@
 class S3deploy
-  VERSION = "0.0.3"
+  VERSION = "0.0.4"
 end

data/lib/s3deploy.rb

@@ -37,9 +37,14 @@ class S3deploy
     path = File.expand_path(@options["path"])
     raise "#{@options["path"]} is not a path." unless File.directory? path
 
-    puts "Deploying to #{@options["aws_bucket"]}"
+    puts simulate ? "Deploying to #{@options["aws_bucket"]}" : "Simulating deployment to #{@options["aws_bucket"]}"
 
     files = all_files(path).map { |f| f.gsub(/^#{path}\//, "")}
+
+    if @options["skip_regex"]
+      files.delete_if { |f| f =~ Regexp.new(@options["skip_regex"]) }
+    end
+
     skip_files = []
     active_files = []
     files.each do |file|
@@ -97,6 +102,11 @@ class S3deploy
 
   def upload_file(local, remote, simulate, options = {})
     options[:access] = :public_read
+
+    if @options["cache_regex"] && remote =~ Regexp.new(@options["cache_regex"])
+      options[:"Cache-Control"] = "public, max-age=31557600" 
+    end
+
     options[:"Content-Encoding"] = "gzip" if local =~ /.+.gz$/
     AWS::S3::S3Object.store(remote, open(local), @options["aws_bucket"], options) unless simulate
     puts "Uploaded\t#{remote}"

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: s3deploy
 version: !ruby/object:Gem::Version
-  version: 0.0.3
+  version: 0.0.4
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-08-22 00:00:00.000000000 Z
+date: 2012-08-23 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: aws-s3