aws-s3-deploy 0.0.2 → 0.1.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: bb0958ebf6cad60b0ba102a5de763182c0e44f59
-  data.tar.gz: 8329447265d80c86c7e61e326c46a53fa50f3cc6
+  metadata.gz: e07bc8ffc204fcfb661585fa8226194ae9db74a4
+  data.tar.gz: ccee4626042dc56fbc73be6e9e6fde6d1c8db2dc
 SHA512:
-  metadata.gz: 5540891c568af1bfb10bbb5cb0eb9230fccb1139c7c87603381118b95c9177c3dbbe8072388acd0ec6114372942dab001a83d0a2869955a1f1c032c839bdc4b8
-  data.tar.gz: 4d9104656411af88f389202685c689e723d21191cffe0ae941852833329fa8bd0065ab5488c753a76db97c368a2282680e4f49022374c89074d6032b89d7ca94
+  metadata.gz: fe578e93388df318b87076730f73bfdd41f5c759cd5657b24abf06b56f08f6eecc601a4fefe8e20975fb0914225fc22ca37d885d20fc3462ed0f1de7340eff63
+  data.tar.gz: 6f2c3c576b3c3758157b51d1fbc6076b266b976c8744d3b1f92607764044bd6aa433a68f99896f89391fdeb9ee90ea8480ba061b9d3ea1e01dd2b1ec8c561617

data/.ruby-version

@@ -0,0 +1 @@
+2.0.0

data/aws-s3-deploy.gemspec

@@ -21,4 +21,5 @@ Gem::Specification.new do |spec|
   spec.add_development_dependency "bundler", "~> 1.3"
   spec.add_development_dependency "rake"
   spec.add_dependency "aws-sdk", "~> 1.26.0"
+  spec.add_dependency "closure-compiler", "1.1.10"
 end

data/bin/deploy

@@ -8,10 +8,12 @@ if File.exist?( '.deploy')
 else
   config = {}
   puts "No Config file for this folder found... let's create one"
-  puts "Your Amazon AWS Key:"
+  
+  # We need to accept empty string, as wel for KEY and SECRET
+  puts "Your Amazon AWS Key(Leave Empty to use AWS_KEY enviornment variable):"
   config['aws_key'] = gets.strip 
   
-  puts "Your Amazon AWS Secret:"
+  puts "Your Amazon AWS Secret (Leave Empty to use AWS_SECRET enviornment variable):"
   config['aws_secret'] = gets.strip 
 
   puts "The Bucket you'd like to deploy to:"

data/lib/deploy.rb

@@ -1,4 +1,5 @@
 require "deploy/version"
+require 'closure-compiler'
 require 'aws-sdk'
 require 'yaml'
 
@@ -6,7 +7,10 @@ require 'yaml'
 module Deploy
   
   def self.load_config
-    defaults = {'aws_region' => 'us-west-2'}
+    
+    # We need to account for AWS Keys stored in 
+    # ENV Variables here.
+    defaults = {'aws_region' => 'us-west-2', 'compress' => true}
     @config = YAML.load_file("#{Dir.pwd}/.deploy")
     @config = defaults.merge(@config)
   end
@@ -16,8 +20,11 @@ module Deploy
       'aws_key' =>  nil,
       'aws_secret' =>  nil, 
       'aws_bucket' => nil, 
-      'deploy_folder' =>  nil
+      'deploy_folder' =>  nil,
+      'compress' => true
     }.merge(config)
+    config['aws_key'] = ENV['AWS_KEY'] if config['aws_key'].empty?
+    config['aws_secret'] = ENV['AWS_SECRET'] if config['aws_secret'].empty?
     File.open("#{Dir.pwd}/.deploy", 'w+') { |file| file.write(config.to_yaml) }
   end
   
@@ -33,26 +40,61 @@ module Deploy
 
       if File.file?(file)
         remote_file = file.sub("#{@config['deploy_folder']}/", "")
-          puts "+ #{file}"
+          
           remote = bucket.objects[remote_file]
           
           content_type = case file.split('.').last
           when 'css'
+            Deploy::Compress.compress(file)
             'text/css'
           when 'js'
-             'application/javascript'
+            Deploy::Compress.compile(file)
+            'application/javascript'
           when 'otf'
             'font/opentype'
           when 'svg'
             'image/svg+xml'
+          when 'xml'
+            'text/xml'
+          when 'html', 'htm'
+            'text/html'
+          when 'gz'
+            'skip'
           end 
-          if File.exist?("#{file}.gz")
-            remote.write(file: "#{file}.gz", content_encoding: 'gzip',  content_type: content_type)
-          else
-            remote.write(file: file,  content_type: content_type)
+          
+          unless content_type == 'skip'
+            if File.exist?("#{file}.gz")
+              puts "+ #{file} (compressed)"
+              remote.write(file: "#{file}.gz", content_encoding: 'gzip',  content_type: content_type)
+            else
+              puts "+ #{file}"
+              remote.write(file: file,  content_type: content_type)
+            end
+            remote.acl = :public_read 
           end
-          remote.acl = :public_read 
       end
     end
   end
 end
+
+
+module Deploy::Compress
+  def self.compress(file)
+    content = File.read(file).encode!('UTF-8', 'UTF-8', :invalid => :replace) 
+    gzip(content, file)
+  end
+  
+  def self.compile(file)
+    content = File.read(file).encode!('UTF-8', 'UTF-8', :invalid => :replace) 
+    content = closure(content, file)
+    gzip(content, file)
+  end
+  
+  def self.gzip(content, file)
+    Zlib::GzipWriter.open("#{file}.gz") {|f| f.write(content) }
+  end
+  
+  def self.closure(content, file)
+    Closure::Compiler.new.compile(content)
+  end
+end

data/lib/deploy/version.rb

@@ -1,7 +1,7 @@
 module Aws
   module S3
     module Deploy
-      VERSION = "0.0.2"
+      VERSION = "0.1.0"
     end
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: aws-s3-deploy
 version: !ruby/object:Gem::Version
-  version: 0.0.2
+  version: 0.1.0
 platform: ruby
 authors:
 - Bill Centinaro
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-11-15 00:00:00.000000000 Z
+date: 2014-01-30 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -52,6 +52,20 @@ dependencies:
     - - ~>
       - !ruby/object:Gem::Version
         version: 1.26.0
+- !ruby/object:Gem::Dependency
+  name: closure-compiler
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - '='
+      - !ruby/object:Gem::Version
+        version: 1.1.10
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - '='
+      - !ruby/object:Gem::Version
+        version: 1.1.10
 description: Deploy static files to AWS S3.
 email:
 - bill@theresnobox.net
@@ -61,6 +75,7 @@ extensions: []
 extra_rdoc_files: []
 files:
 - .gitignore
+- .ruby-version
 - Gemfile
 - LICENSE.txt
 - README.md
@@ -94,3 +109,4 @@ signing_key:
 specification_version: 4
 summary: Deploys static assets to AWS S3.
 test_files: []
+has_rdoc: