s3deploy 0.1.0 → 0.1.1

data/README.md

@@ -45,7 +45,7 @@ If you want to test-drive your configuration you can simulate a deploy
 
 ## Whats next?
 
-1. Create method for creating a bucket from the settings in the configuration and settings it up as a website.
+1. Create method for creating a bucket from the settings in the configuration and setting it up as a website.
 
 ## Contributing
 

data/bin/s3deploy

@@ -13,7 +13,14 @@ begin
     S3deploy.install_config(ARGV.include? "--default")
   elsif ARGV.first == "simulate"
     s3deploy = S3deploy.new
-    s3deploy.deploy(true)
+    if ARGV[1] && ARGV[1] == "empty"
+      s3deploy.empty(true)
+    else
+      s3deploy.deploy(true)
+    end
+  elsif ARGV.first == "empty"
+    s3deploy = S3deploy.new
+    s3deploy.empty(false)
   else
     puts <<-eos
   S3deploy usage.
@@ -26,6 +33,10 @@ begin
   
   Folder configurations takes precedence over default configurations.
   I put my aws key, secret and region in default and the rest in folder.
+
+  s3deploy empty (deletes all files in bucket)
+  s3deploy simulate empty (simulates deletion of files)
+
             eos
   end
 rescue Exception => e

data/lib/.s3deploy.yml

@@ -1,21 +1,23 @@
 ---
-aws_key:      # your amazon key                   *required*
-aws_secret:   # your amazon secret                *required*
-aws_bucket:   # the bucket you want to deploy to  *required*
-#aws_region:  # the region where your bucket is located
-              # region names are: (blank for US Standard)
-              #     us-west-2         US West (Oregon)
-              #     us-west-1         US West (Northern California)
-              #     eu-west-1         EU (Ireland)
-              #     ap-southeast-1    Singapore ( Asia Pacific )
-              #     ap-northeast-1    Tokyo ( Asia Pacific )
-              #     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.
+aws_key:        # your amazon key                   *required*
+aws_secret:     # your amazon secret                *required*
+aws_bucket:     # the bucket you want to deploy to  *required*
+#aws_region:    # the region where your bucket is located
+                # region names are: (blank for US Standard)
+                #     us-west-2         US West (Oregon)
+                #     us-west-1         US West (Northern California)
+                #     eu-west-1         EU (Ireland)
+                #     ap-southeast-1    Singapore ( Asia Pacific )
+                #     ap-northeast-1    Tokyo ( Asia Pacific )
+                #     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.
+#html_charset:  utf-8
+                # Sets the charset header on html files
 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.rb

@@ -27,12 +27,12 @@ class S3deploy
       :access_key_id     => @options["aws_key"],
       :secret_access_key => @options["aws_secret"]
     )
-  end
-
-  def deploy(simulate = false)
 
     raise "No bucket selected." unless @options["aws_bucket"]
     @bucket = AWS::S3::Bucket.find @options["aws_bucket"]
+  end
+
+  def deploy(simulate = false)
 
     path = File.expand_path(@options["path"])
     raise "#{@options["path"]} is not a path." unless File.directory? path
@@ -54,9 +54,9 @@ class S3deploy
       full_remote_path = (@options["remote_path"] + "/" + file).gsub( /\/\//, "/").gsub( /(^\/)|(\/$)/, "")
 
       if @options["extras"].include?("replace_with_gzip") && has_gzip_version?(file, files)
-        full_path.gsub!(/.gz$/, "")
-        file.gsub!(/.gz$/, "")
-        full_remote_path.gsub!(/.gz$/, "")
+        full_path.gsub!(/.gz$/i, "")
+        file.gsub!(/.gz$/i, "")
+        full_remote_path.gsub!(/.gz$/i, "")
         skip_files << file << file + ".gz"
         if is_gzip_smaller?(full_path)
           file = file + ".gz"
@@ -79,7 +79,7 @@ class S3deploy
   end
 
   def has_gzip_version?(file, files)
-    (file !~ /.+.gz$/ && files.include?("#{file}.gz")) || ( file =~ /.+.gz$/ && files.include?( file.gsub(/.gz$/, "") ) )
+    (file !~ /.+.gz$/i && files.include?("#{file}.gz")) || ( file =~ /.+.gz$/i && files.include?( file.gsub(/.gz$/i, "") ) )
   end
 
   def is_gzip_smaller?(full_path)
@@ -95,6 +95,14 @@ class S3deploy
     end
   end
 
+  def empty(simulate)
+    puts "Emptying #{@options["aws_bucket"]} #{"(Simulating)" if simulate}"
+    @bucket.each do |o|
+      AWS::S3::S3Object.delete(o.key, @options["aws_bucket"]) unless simulate
+      puts "Deleted\t\t#{o.key}"
+    end
+  end
+
   def s3_file_exists?(local, remote)
     md5 = Digest::MD5.hexdigest(open(local).read)
     !@bucket.objects.select{|o| o.key == remote && o.etag == md5 }.empty?
@@ -107,9 +115,19 @@ class S3deploy
       options[:"Cache-Control"] = "public, max-age=31557600" 
     end
 
-    options[:"Content-Encoding"] = "gzip" if local =~ /.+.gz$/
+    options[:content_type] = "text/html; charset=#{@options["html_charset"]}" if @options["html_charset"] && remote =~ /.+\.(html|htm)(\.gz)?$/i
+    options[:"Content-Encoding"] = "gzip" if local =~ /.+.gz$/i
+
+    extra_info = []
+    extra_info << "cache-headers" if options[:"Cache-Control"]
+    extra_info << "gzip" if options[:"Content-Encoding"]
+    extra_info << "charset=#{@options["html_charset"]}" if options[:content_type]
+
     AWS::S3::S3Object.store(remote, open(local), @options["aws_bucket"], options) unless simulate
-    puts "Uploaded\t#{remote}"
+
+    message = "Uploaded\t#{remote}"
+    message += " (#{extra_info.join(", ")})" unless extra_info.empty?
+    puts message
   end
 
   def self.install_config(default = false)

data/lib/s3deploy/version.rb

@@ -1,3 +1,3 @@
 class S3deploy
-  VERSION = "0.1.0"
+  VERSION = "0.1.1"
 end

metadata

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