front-end-blender 0.14 → 0.16

data/README.rdoc

@@ -41,6 +41,7 @@ source files are the hash values as an array. Here is a sample Blendfile:
     -f, --file FILE                  Use given Blendfile
     -r, --root ROOT                  Specify the path to the web root directory
     -t, --type TYPE                  Select file type to blend (css, js)
+    -m, --min [MINIFIER]             Select minifier to use (yui, none)
     -c, --cache-buster [BUSTER]      Append cache busters to URLs in CSS, defaults to timestamps
         --force                      Force blending when source files aren't newer than output files
         --yui=YUIOPTS                Pass arguments to YUI Compressor

data/bin/blend

@@ -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)")                              {|m| options[:min]          = m.nil? ? :none : 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

data/lib/front_end_architect/blender.rb

@@ -12,6 +12,7 @@ require 'rubygems'
 require 'yaml'
 require 'base64'
 require 'benchmark'
+require 'colored'
 require 'mime/types'
 require 'find'
 require 'pathname'
@@ -20,7 +21,7 @@ require 'front_end_architect/hash'
 
 module FrontEndArchitect
   class Blender
-    VERSION      = '0.14'
+    VERSION      = '0.16'
     
     FILTER_REGEX = /filter: ?[^?]+\(src=(['"])([^\?'"]+)(\?(?:[^'"]+)?)?\1,[^?]+\1\);/im
     IMPORT_REGEX = /@import(?: url\(| )(['"]?)([^\?'"\)\s]+)(\?(?:[^'"\)]+)?)?\1\)?(?:[^?;]+)?;/im
@@ -31,6 +32,7 @@ module FrontEndArchitect
       :data      => false,
       :force     => false,
       :root      => File.dirname(:blendfile.to_s),
+      :min       => :yui,
     }
     
     def initialize(opts)
@@ -75,10 +77,15 @@ module FrontEndArchitect
               end
               
               if output_new || @options[:force]
-                create_output(output_name, sources, file_type)
+                if File.writable?(output_name) && !(@options[:gzip] && !File.writable?(gzip_output_name))
+                  create_output(output_name, sources, file_type)
+                else
+                  puts "Permission Denied:".white_on_red + " " + output_name.red
+                  puts "Permission Denied:".white_on_red + " " + gzip_output_name.red if @options[:gzip]
+                end
               else
-                puts "Skipping: #{output_name}"
-                puts "Skipping: #{gzip_output_name}" if @options[:gzip]
+                puts "Skipping: ".yellow + output_name.yellow
+                puts "Skipping: ".yellow + gzip_output_name.yellow if @options[:gzip]
               end
             else
               create_output(output_name, sources, file_type)
@@ -144,7 +151,11 @@ module FrontEndArchitect
         prefix += File::SEPARATOR unless context.empty?
         
         value.each_index do |i|
-          value[i] = prefix + value[i]
+          unless value[i].match(/^(\/[^\/]+.+)$/)
+            value[i] = prefix + value[i]
+          else
+            value[i] = @options[:root] + value[i]
+          end
         end
         
         return { (prefix + key) => value }
@@ -175,40 +186,45 @@ 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
+      puts output_name.green
       
       if @options[:gzip]
         output_gzip = output_name + '.gz'
@@ -217,7 +233,7 @@ module FrontEndArchitect
           gz.write(output)
         end
         
-        puts output_gzip
+        puts output_gzip.green
       end
     end
     
@@ -232,6 +248,7 @@ module FrontEndArchitect
       if @options[:cache_buster]
         input = input.gsub(FILTER_REGEX) do |filter|
           uri = $2
+          cbuster = $3
           unless uri.match(/^(https:\/\/|http:\/\/|\/\/)/)
             full_path = File.expand_path($2, File.dirname(input_file))
             buster    = make_cache_buster(full_path, $3)
@@ -239,7 +256,7 @@ module FrontEndArchitect
             
             %Q!filter='#{new_path}'!
           else
-            %Q!filter='#{$2}#{$3}'!
+            %Q!filter='#{uri}#{cbuster}'!
           end
         end
       end
@@ -281,6 +298,7 @@ module FrontEndArchitect
         if @options[:data]
           input = input.gsub(URL_REGEX) do
             uri = $2
+            cbuster = $3
             
             unless uri.match(/^(https:\/\/|http:\/\/|\/\/)/)
               new_path = File.expand_path($2, File.dirname(input_file))
@@ -290,13 +308,14 @@ module FrontEndArchitect
               
               %Q!url(#{new_path})!
             else
-              %Q!url(#{$2}#{$3})!
+              %Q!url(#{uri}#{cbuster})!
             end
           end
         elsif @options[:cache_buster]
           input = input.gsub(URL_REGEX) do
             unless uri.match(/^(https:\/\/|http:\/\/|\/\/)/)
               uri = $2
+              cbuster = $3
               
               if uri.match(/^(\/[^\/]+.+)$/)
                 uri = Pathname.new(File.join(File.expand_path(@options[:root]), uri))
@@ -309,7 +328,7 @@ module FrontEndArchitect
               
               %Q!url(#{new_path})!
             else
-              %Q!url(#{$2}#{$3})!
+              %Q!url(#{uri}#{cbuster})!
             end
           end
         end
@@ -319,7 +338,7 @@ module FrontEndArchitect
         # Find all url(.ext) in file and rewrite relative url from output directory.
         input = input.gsub(URL_REGEX) do
           uri = $2
-          
+          cbuster = $3
           unless uri.match(/^(https:\/\/|http:\/\/|\/\/)/)
             if @options[:data]
               # if doing data conversion rewrite url as an absolute path.
@@ -347,7 +366,7 @@ module FrontEndArchitect
             
             %Q!url(#{new_path})!
           else
-            %Q!url(#{$2}#{$3})!
+            %Q!url(#{uri}#{cbuster})!
           end
         end
         

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: front-end-blender
 version: !ruby/object:Gem::Version 
-  version: "0.14"
+  version: "0.16"
 platform: ruby
 authors: 
 - Blake Elshire & Chris Griego
@@ -9,7 +9,7 @@ autorequire: front_end_architect/blend
 bindir: bin
 cert_chain: []
 
-date: 2008-06-23 00:00:00 -07:00
+date: 2008-09-17 00:00:00 -07:00
 default_executable: blend
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -21,6 +21,15 @@ dependencies:
       - !ruby/object:Gem::Version 
         version: "1.15"
     version: 
+- !ruby/object:Gem::Dependency 
+  name: colored
+  version_requirement: 
+  version_requirements: !ruby/object:Gem::Requirement 
+    requirements: 
+    - - ">="
+      - !ruby/object:Gem::Version 
+        version: "1.1"
+    version: 
 description: Blender is like ant or make for the front-end. It aggregates and compresses CSS and/or JavaScript assets for a site into efficient, production-ready files.
 email: belshire@gmail.com
 executables: 
@@ -59,7 +68,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
 requirements: 
 - Java, v1.4 or greater
 rubyforge_project: frontendblender
-rubygems_version: 1.0.1
+rubygems_version: 1.2.0
 signing_key: 
 specification_version: 2
 summary: Blender gives you efficient, production-ready CSS and/or JavaScript assets.