cdn_fu 0.6 → 0.6.1

data/.gitignore

@@ -0,0 +1,2 @@
+*.gem
+test/tmp/*

data/Gemfile

@@ -0,0 +1,4 @@
+source "http://rubygems.org"
+
+# Specify your gem's dependencies in cdn_fu.gemspec
+gemspec

data/Gemfile.lock

@@ -0,0 +1,26 @@
+PATH
+  remote: .
+  specs:
+    cdn_fu (0.6.1)
+      aws-s3 (>= 0.6.2)
+      rake (>= 0.8)
+
+GEM
+  remote: http://rubygems.org/
+  specs:
+    aws-s3 (0.6.2)
+      builder
+      mime-types
+      xml-simple
+    builder (3.0.0)
+    mime-types (1.16)
+    rake (0.9.0)
+    xml-simple (1.0.15)
+
+PLATFORMS
+  ruby
+
+DEPENDENCIES
+  aws-s3 (>= 0.6.2)
+  cdn_fu!
+  rake (>= 0.8)

data/Rakefile

@@ -0,0 +1,9 @@
+require 'bundler'
+require 'rake/testtask'
+Bundler::GemHelper.install_tasks
+
+Rake::TestTask.new(:test) do |t|
+  t.test_files = FileList['test/*_test.rb']
+  t.ruby_opts = ['-rubygems'] if defined? Gem
+  t.ruby_opts << '-I.'
+end

data/cdn_fu.gemspec

@@ -0,0 +1,26 @@
+$:.push File.expand_path("../lib", __FILE__)
+require "cdn_fu/version"
+Gem::Specification.new do |s|
+  s.name = %q{cdn_fu}
+  s.version = CdnFu::VERSION
+  s.authors = ["Curtis Spencer"]
+  s.email       = ["curtis@sevenforge.com"]
+  s.summary = %q{CDN Fu is a framework for making minification and deployment of static assets easy}
+  s.description = <<-EOF
+CDN Fu is a framework for making listing, minification and deployment of static
+assets easy.  It allows you to use it standalone on the command line for non
+Rails project and it can be used as a Rails plugin to add useful rake tasks and
+sensible defaults.
+EOF
+
+  s.rubyforge_project = %q{cdn_fu}
+
+  s.add_dependency('rake', '>=0.8')
+  s.add_dependency('aws-s3', '>=0.6.2')
+
+  s.files         = `git ls-files`.split("\n")
+  s.test_files    = `git ls-files -- {test,spec,features}/*`.split("\n")
+  s.executables   = `git ls-files -- bin/*`.split("\n").map{ |f| File.basename(f) }
+  s.require_paths = ["lib"]
+end
+

data/lib/cdn_fu/minifiers/yui_minifier.rb

@@ -12,7 +12,7 @@ class YuiMinifier < CdnFu::Minifier
   def validate
     if @yui_jar_path
       if File.exists?(@yui_jar_path)
-        output = `java -jar #{@yui_jar_path}`
+        output = `java -jar #{@yui_jar_path} 2>&1`
         if output !~ /java -jar yuicompressor-x\.y\.z\.jar/
           raise CdnFu::ConfigError,"Invalid YUI Compressor jar specified in cdn_fu.rb"
         end

data/lib/cdn_fu/uploaders/cloudfront_uploader.rb

@@ -1,6 +1,7 @@
 # This uploader using aws:s3 gem to upload everything to the specified bucket
 require 'zlib'
 require 'aws/s3'
+require 'time'
 class CloudfrontUploader < CdnFu::Uploader
   include AWS::S3
   required_attribute :s3_bucket
@@ -58,7 +59,7 @@ class CloudfrontUploader < CdnFu::Uploader
   end
 
   def upload_single_file(cf_file)
-    versioned_filename = CdnFu::Config.config.asset_id + cf_file.remote_path
+    versioned_filename = CdnFu::Config.config.asset_id.to_s + cf_file.remote_path
     options = {}
     options[:access] = :public_read
     path_to_upload = cf_file.minified_path
@@ -69,6 +70,8 @@ class CloudfrontUploader < CdnFu::Uploader
       if remote_sha1 != sha1sum
         puts "Your assets are different from the ones in s3 with this asset_id.  Please increment your asset_id in cdn_fu.rb"
         exit
+      else
+        puts "Skipping #{versioned_filename}" if CdnFu::Config.config.verbose
       end
     else
       options[:access] = :public_read
@@ -77,6 +80,7 @@ class CloudfrontUploader < CdnFu::Uploader
       options["x-amz-meta-size"] = fstat.size
       file_content =open(path_to_upload).read 
       if cf_file.gzip? 
+        puts "Gzipping"
         options["Content-Encoding"] = 'gzip'
         strio = StringIO.open('', 'w')
         gz = Zlib::GzipWriter.new(strio)
@@ -85,8 +89,10 @@ class CloudfrontUploader < CdnFu::Uploader
         file_content = strio.string
       end
 
-      options[:cache_control] = "max-age=#{8.years.to_i}"
-      options[:expires] = 8.years.from_now.httpdate
+      eight_years = 8 * 60 * 60 * 24 * 365
+      eight_years_from_now = Time.now + eight_years
+      options[:cache_control] = "max-age=#{eight_years}"
+      options[:expires] = eight_years_from_now.httpdate
       S3Object.store(versioned_filename,file_content,s3_bucket, options)
       puts "[upload] #{s3_bucket} #{versioned_filename}" if CdnFu::Config.config.verbose
     end

data/lib/cdn_fu/version.rb

@@ -0,0 +1,3 @@
+module CdnFu 
+  VERSION = "0.6.1"
+end

data/lib/cdn_fu.rb

@@ -1,8 +1,9 @@
 dir = File.dirname(__FILE__)
 $LOAD_PATH.unshift dir unless $LOAD_PATH.include?(dir)
 
+require 'cdn_fu/version'
+
 module CdnFu
-  VERSION = 0.6
   # Do some sensible defaults for rails
   def self.init_rails(binding)
     cfg = CdnFu::Config.config

data/test/asset_root/js/another.js

@@ -0,0 +1,4 @@
+function minify_me() {
+  var hello = "world";
+  alert('This is a function' + hello);
+}

data/test/asset_root/js/unminified.js

@@ -0,0 +1,4 @@
+function minify_me() {
+  var hello = "world";
+  alert('This is a function' + hello);
+}

data/test/basic_test.rb

@@ -0,0 +1,40 @@
+dir = File.dirname(__FILE__)
+$LOAD_PATH.unshift dir unless $LOAD_PATH.include?(dir)
+
+require 'test_helper'
+
+class BasicTest < Test::Unit::TestCase
+  def setup
+    CdnFu::Config.clear
+  end
+
+  def test_basic
+    config = eval(File.open(File.join(TEST_ROOT,'configs/basic_cdn_fu_config.rb')).read)
+    assert_equal('1',config.asset_id)
+    assert_equal('/tmp',config.tmp_dir)
+    assert_nil(config.uploader)
+  end
+
+  def test_file_lister
+    config = eval(File.open(File.join(TEST_ROOT,'configs/file_lister.rb')).read)
+    assert_equal('1',config.asset_id)
+    assert_equal(File.join(TEST_ROOT,'asset_root'),config.asset_root_dir)
+    assert_equal(YuiMinifier,config.minifier.class)
+
+    config.prepare_and_upload
+    file_list = config.files
+    assert_equal(8,file_list.size)
+    assert_equal('/js/another.js',file_list[0].remote_path)
+    assert(file_list[0].gzip?)
+    assert(file_list[0].minify?)
+  end
+
+  def test_different_remote_paths
+    config = eval(File.open(File.join(TEST_ROOT,'configs/diff_remote_paths.rb')).read)
+    config.prepare_and_upload
+    file_list = config.files
+    assert_equal(6,file_list.size)
+    assert_equal('/javascripts/another.js',file_list[0].remote_path)
+    assert_equal('/img/fun/fun.png',file_list[4].remote_path)
+  end
+end

data/test/configs/basic_cdn_fu_config.rb

@@ -0,0 +1,4 @@
+CdnFu::Config.configure do
+  asset_id '1'
+  tmp_dir '/tmp'
+end

data/test/configs/diff_remote_paths.rb

@@ -0,0 +1,9 @@
+CdnFu::Config.configure do |cfg|
+  asset_id '1'
+  asset_root_dir File.join(TEST_ROOT,'asset_root')
+
+  files do 
+    glob "js/*.js", :minify => true, :gzip => true, :path => '/javascripts'
+    glob "images/**/*.png", :path => '/img'
+  end
+end

data/test/configs/file_lister.rb

@@ -0,0 +1,19 @@
+CdnFu::Config.configure do |cfg|
+  asset_id '1'
+  asset_root_dir File.join(TEST_ROOT,'asset_root')
+  verbose false
+
+  files do 
+    glob "js/*.js", :minify => true, :gzip => true
+    glob "css/*.css", :minify => true, :gzip => true
+    glob "images/**/*.png"
+    file 'single/single.png', :path => '/s/s.png'
+  end
+
+  minifier YuiMinifier do
+    yui_jar_path "/usr/bin/yuicompressor-2.4.2.jar"
+  end
+
+  upload do |file_list|
+  end
+end

data/test/configs/local_upload_config.rb

@@ -0,0 +1,15 @@
+CdnFu::Config.configure do
+  tmp_dir File.join(TEST_ROOT,'/tmp/minified')
+  asset_root_dir File.join(TEST_ROOT,'asset_root')
+
+  files do 
+    glob "js/*.js", :minify => true, :gzip => true
+    glob "css/*.css", :minify => true, :gzip => true
+    glob "images/**/*.png"
+    file 'single/single.png', :path => '/s/s.png'
+  end
+
+  uploader LocalUploader do
+    path File.join(TEST_ROOT, '/tmp/local_path')
+  end
+end

data/test/local_uploader_test.rb

@@ -0,0 +1,19 @@
+dir = File.dirname(__FILE__)
+$LOAD_PATH.unshift dir unless $LOAD_PATH.include?(dir)
+
+require 'test_helper'
+
+class LocalUploaderTest < Test::Unit::TestCase
+  def setup
+    CdnFu::Config.clear
+  end
+
+  def teardown
+    TEST_ROOT
+  end
+
+  def test_local
+    config = eval(File.open(File.join(TEST_ROOT,'configs/local_upload_config.rb')).read)
+    config.prepare_and_upload
+  end
+end

data/test/test_helper.rb

@@ -0,0 +1,8 @@
+require File.dirname(__FILE__) + '/../lib/cdn_fu'
+require 'fileutils'
+require 'test/unit'
+
+TEST_ROOT = File.dirname(File.expand_path(__FILE__))
+
+# Change dir to this directory to ensure the test configs can be found
+#Dir.chdir(TEST_ROOT)

metadata

@@ -1,7 +1,12 @@
 --- !ruby/object:Gem::Specification 
 name: cdn_fu
 version: !ruby/object:Gem::Version 
-  version: "0.6"
+  prerelease: false
+  segments: 
+  - 0
+  - 6
+  - 1
+  version: 0.6.1
 platform: ruby
 authors: 
 - Curtis Spencer
@@ -9,36 +14,46 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2009-11-04 00:00:00 -08:00
+date: 2011-05-23 00:00:00 -07:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
   name: rake
-  type: :runtime
-  version_requirement: 
-  version_requirements: !ruby/object:Gem::Requirement 
+  prerelease: false
+  requirement: &id001 !ruby/object:Gem::Requirement 
+    none: false
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
+        segments: 
+        - 0
+        - 8
         version: "0.8"
-    version: 
+  type: :runtime
+  version_requirements: *id001
 - !ruby/object:Gem::Dependency 
   name: aws-s3
-  type: :runtime
-  version_requirement: 
-  version_requirements: !ruby/object:Gem::Requirement 
+  prerelease: false
+  requirement: &id002 !ruby/object:Gem::Requirement 
+    none: false
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
+        segments: 
+        - 0
+        - 6
+        - 2
         version: 0.6.2
-    version: 
+  type: :runtime
+  version_requirements: *id002
 description: |
   CDN Fu is a framework for making listing, minification and deployment of static
   assets easy.  It allows you to use it standalone on the command line for non
   Rails project and it can be used as a Rails plugin to add useful rake tasks and
   sensible defaults.
 
-email: curtis@sevenforge.com
+email: 
+- curtis@sevenforge.com
 executables: 
 - cdnfu
 extensions: []
@@ -46,9 +61,15 @@ extensions: []
 extra_rdoc_files: []
 
 files: 
-- README.md
+- .gitignore
+- Gemfile
+- Gemfile.lock
 - MIT-LICENSE
+- README.md
+- Rakefile
 - bin/cdnfu
+- cdn_fu.gemspec
+- lib/cdn_fu.rb
 - lib/cdn_fu/config.rb
 - lib/cdn_fu/config_error.rb
 - lib/cdn_fu/executor.rb
@@ -56,41 +77,73 @@ files:
 - lib/cdn_fu/lister.rb
 - lib/cdn_fu/minifier.rb
 - lib/cdn_fu/minifiers/yui_minifier.rb
-- lib/cdn_fu/tasks/cdn_fu.rake
 - lib/cdn_fu/tasks.rb
+- lib/cdn_fu/tasks/cdn_fu.rake
 - lib/cdn_fu/uploader.rb
 - lib/cdn_fu/uploaders/cloudfront_uploader.rb
 - lib/cdn_fu/uploaders/local_uploader.rb
-- lib/cdn_fu.rb
+- lib/cdn_fu/version.rb
 - rails/init.rb
+- test/asset_root/css/style.css
+- test/asset_root/images/1.png
+- test/asset_root/images/2.png
+- test/asset_root/images/fun/fun.png
+- test/asset_root/images/image.png
+- test/asset_root/js/another.js
+- test/asset_root/js/unminified.js
+- test/asset_root/single/single.png
+- test/basic_test.rb
+- test/configs/basic_cdn_fu_config.rb
+- test/configs/diff_remote_paths.rb
+- test/configs/file_lister.rb
+- test/configs/local_upload_config.rb
+- test/local_uploader_test.rb
+- test/test_helper.rb
 has_rdoc: true
-homepage: http://www.sevenforge.com/cdn_fu
+homepage: 
 licenses: []
 
 post_install_message: 
-rdoc_options: 
-- --inline-source
-- --charset=UTF-8
+rdoc_options: []
+
 require_paths: 
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement 
+  none: false
   requirements: 
   - - ">="
     - !ruby/object:Gem::Version 
+      segments: 
+      - 0
       version: "0"
-  version: 
 required_rubygems_version: !ruby/object:Gem::Requirement 
+  none: false
   requirements: 
   - - ">="
     - !ruby/object:Gem::Version 
+      segments: 
+      - 0
       version: "0"
-  version: 
 requirements: []
 
 rubyforge_project: cdn_fu
-rubygems_version: 1.3.5
+rubygems_version: 1.3.7
 signing_key: 
 specification_version: 3
 summary: CDN Fu is a framework for making minification and deployment of static assets easy
-test_files: []
-
+test_files: 
+- test/asset_root/css/style.css
+- test/asset_root/images/1.png
+- test/asset_root/images/2.png
+- test/asset_root/images/fun/fun.png
+- test/asset_root/images/image.png
+- test/asset_root/js/another.js
+- test/asset_root/js/unminified.js
+- test/asset_root/single/single.png
+- test/basic_test.rb
+- test/configs/basic_cdn_fu_config.rb
+- test/configs/diff_remote_paths.rb
+- test/configs/file_lister.rb
+- test/configs/local_upload_config.rb
+- test/local_uploader_test.rb
+- test/test_helper.rb