@@ -13,17 +13,18 @@ require 'front_end_architect/blender' options = {} opts = OptionParser.new do |opts| - opts.on('-h', '--help', "Show this message") { puts opts; exit 0 } - opts.on('-V', '--version', "Show the version number") { puts "Front-End Blender v#{Blender::VERSION}"; exit 0 } - opts.on('-g', '--generate', String, "Generate a stub Blendfile") { options[:generate] = true } - opts.on('-f FILE', '--file FILE', String, "Use given Blendfile") {|f| options[:blendfile] = f } - opts.on('-r ROOT', '--root ROOT', String, "Set the path to the web root directory") {|r| options[:root] = r } - opts.on('-t TYPE', '--type TYPE', [:css, :js], "Select file type to blend (css, js)") {|t| options[:file_type] = t } - opts.on('-c [BUSTER]', '--cache-buster [BUSTER]', String, "Append cache busters to URLs in CSS, defaults to timestamps") {|b| options[:cache_buster] = b.nil? ? :mtime : b } - opts.on( '--force', String, "Force blending when source files aren't newer than output files") { options[:force] = true } - opts.on( '--yui=YUIOPTS', String, "Pass arguments to YUI Compressor") {|o| options[:yuiopts] = o } - opts.on('-d', '--data', String, "EXPERIMENTAL Convert url(file.ext) to url(data:) in CSS files") { options[:data] = true } - opts.on('-z', '--gzip', String, "EXPERIMENTAL Also create gzip output files") { options[:gzip] = true } + opts.on('-h', '--help', "Show this message") { puts opts; exit 0 } + opts.on('-V', '--version', "Show the version number") { puts "Front-End Blender v#{Blender::VERSION}"; exit 0 } + opts.on('-g', '--generate', String, "Generate a stub Blendfile") { options[:generate] = true } + opts.on('-f FILE', '--file FILE', String, "Use given Blendfile") {|f| options[:blendfile] = f } + opts.on('-r ROOT', '--root ROOT', String, "Set the path to the web root directory") {|r| options[:root] = r } + opts.on('-t TYPE', '--type TYPE', [:css, :js], "Select file type to blend (css, js)") {|t| options[:file_type] = t } + opts.on('-m MINIFIER', '--min MINIFIER', [:yui, :none], "Select minifier to use (yui, none), default is YUI") {|m| options[:min] = m.to_sym } + opts.on('-c [BUSTER]', '--cache-buster [BUSTER]', String, "Append cache busters to URLs in CSS, defaults to timestamps") {|b| options[:cache_buster] = b.nil? ? :mtime : b } + opts.on( '--force', String, "Force blending when source files aren't newer than output files") { options[:force] = true } + opts.on( '--yui=YUIOPTS', String, "Pass arguments to YUI Compressor") {|o| options[:yuiopts] = o } + opts.on('-d', '--data', String, "EXPERIMENTAL Convert url(file.ext) to url(data:) in CSS files") { options[:data] = true } + opts.on('-z', '--gzip', String, "EXPERIMENTAL Also create gzip output files") { options[:gzip] = true } opts.parse!(ARGV) rescue return false end bin/blend @@ -1,5 +1,5 @@ Gem::Specification.new do |s| - s.version = '0.14' + s.version = '0.15' s.date = Time.now s.name = 'blender' blender.gemspec @@ -20,7 +20,7 @@ require 'front_end_architect/hash' module FrontEndArchitect class Blender - VERSION = '0.14' + VERSION = '0.15' FILTER_REGEX = /filter: ?[^?]+\(src=(['"])([^\?'"]+)(\?(?:[^'"]+)?)?\1,[^?]+\1\);/im IMPORT_REGEX = /@import(?: url\(| )(['"]?)([^\?'"\)\s]+)(\?(?:[^'"\)]+)?)?\1\)?(?:[^?;]+)?;/im @@ -31,6 +31,7 @@ module FrontEndArchitect :data => false, :force => false, :root => File.dirname(:blendfile.to_s), + :min => :yui, } def initialize(opts) @@ -179,37 +180,42 @@ module FrontEndArchitect end # Compress - libdir = File.join(File.dirname(File.symlink?(__FILE__) ? File.readlink(__FILE__) : __FILE__), *%w[.. .. lib]) - - IO.popen("java -jar #{libdir}/yui/yuicompressor.jar #{@options[:yuiopts]} --type #{type}", 'r+') do |io| - io.write output - io.close_write - - output = io.read + if @options[:min] == :yui + libdir = File.join(File.dirname(File.symlink?(__FILE__) ? File.readlink(__FILE__) : __FILE__), *%w[.. .. lib]) - if File.extname(output_name) == '.css' - output.gsub! ' and(', ' and (' # Workaround for YUI Compressor Bug #1938329 - output.gsub! '*/;}', '*/}' # Workaround for YUI Compressor Bug #1961175 + IO.popen("java -jar #{libdir}/yui/yuicompressor.jar #{@options[:yuiopts]} --type #{type}", 'r+') do |io| + io.write output + io.close_write - if @options[:data] - output = output.gsub(URL_REGEX) do - unless $2.include?('.css') - mime_type = MIME::Types.type_for($2) - url_contents = make_data_uri(IO.read($2), mime_type[0]) - else - url_contents = $2 - end - %Q!url(#{url_contents})! - end + output = io.read + + if File.extname(output_name) == '.css' + output.gsub! ' and(', ' and (' # Workaround for YUI Compressor Bug #1938329 + output.gsub! '*/;}', '*/}' # Workaround for YUI Compressor Bug #1961175 end end - output_file << output + if $? == 32512 # command not found + raise "\nBlender requires Java, v1.4 or greater, to be installed for YUI Compressor" + end end - if $? == 32512 # command not found - raise "\nBlender requires Java, v1.4 or greater, to be installed for YUI Compressor" + # Data + if @options[:data] + if File.extname(output_name) == '.css' + output = output.gsub(URL_REGEX) do + unless $2.include?('.css') + mime_type = MIME::Types.type_for($2) + url_contents = make_data_uri(IO.read($2), mime_type[0]) + else + url_contents = $2 + end + %Q!url(#{url_contents})! + end + end end + + output_file << output end puts output_name lib/front_end_architect/blender.rb cdc10f2fdca1516f878cce895558d672f46060c4 Chris Griego cgriego@gmail.com http://github.com/front-end/front-end-blender/commit/12f37aa13d44deebe84fe4b3fac75780023f2931 12f37aa13d44deebe84fe4b3fac75780023f2931 2008-08-11T09:15:29-07:00 2008-08-11T09:15:29-07:00 Added minifier argument, current valid options are 'yui' and 'none'. [#28 responsible:"Chris Griego" milestone:"1.1" state:resolved] 640305b19e35dbad0dc4b16188271ef5b5abd6c7 Chris Griego cgriego@gmail.com