front-end-blender 0.5.2 → 0.6.0

data/README

@@ -3,6 +3,29 @@
 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.
 
+== Blendfile
+
+The Blendfile, named blender.yaml by default, is the configuration file that
+tells Blender which input files are combined into which output files. The
+file uses the YAML format. The output file is listed as hash key and input
+files are the hash values as an array. Here is a sample Blendfile:
+
+# blender.yaml for boldpx.com
+_behavior/_global-min.js:
+  - _vendor/jquery/jquery.js
+  - _vendor/shadowbox/src/js/adapter/shadowbox-jquery.js
+  - _vendor/shadowbox/src/js/shadowbox.js
+  - _behavior/_global.js
+
+_style/_global-min.css:
+  - _vendor/shadowbox/src/css/shadowbox.css
+  - _style/_global/typography.css
+  - _style/_global/typography-print.css
+  - _style/_global/colors.css
+  - _style/_global/colors-print.css
+  - _style/_global/layout-screen.css
+  - _style/_global/layout-print.css
+
 == Examples
 
 In your site directory run 'blend' to minify CSS and JavaScript.
@@ -32,7 +55,9 @@ For help use: blend -h
 == Installation
 
 To install the beta gem, run the following at the command line:
-  sudo gem install front-end-blender --source=http://gems.github.com
+  sudo gem install frontendblender
+
+Java, v1.4 or greater is required
 
 == License
 

data/bin/blend

@@ -11,11 +11,13 @@ require 'optparse'
 require 'rdoc/usage'
 require 'ostruct'
 require 'base64'
+require 'benchmark'
 require 'mime/types'
+require 'find'
 
 # TODO Move class to lib so other tools could potentially reuse it
 class Blender
-  VERSION = '0.5.2'
+  VERSION = '0.5.3'
   
   attr_reader :options
   
@@ -33,41 +35,45 @@ class Blender
   
   def blend
     if parsed_options?
-      unless File.exists? @options.blendfile
-        puts "Couldn't find '#{@options.blendfile}'"
-        exit 1
-      end
-      
-      blender = YAML::load_file @options.blendfile
-      
-      Dir.chdir(File.dirname(@options.blendfile))
-      
-      blender.each do |output_name, inputs|
-        output_new = false
+      elapsed = Benchmark.realtime do
+        unless File.exists? @options.blendfile
+          puts "Couldn't find '#{@options.blendfile}'"
+          exit 1
+        end
+        
+        blender = YAML::load_file @options.blendfile
+        
+        Dir.chdir(File.dirname(@options.blendfile))
         
-        # Checks the type flag and if the current file meets the type requirements continues
-        if output_name.match "." + @options.file_type.to_s
-          file_type = output_name.match(/\.css/) ? "css" : "js"
+        blender.each do |output_name, inputs|
+          output_new = false
           
-          # Checks if output file exists and checks the mtimes of the source files to the output file if new creates a new file
-          if File.exists? output_name
-            inputs.each do |i|
-              if File.mtime(i) > File.mtime(output_name)
-                output_new = true
-                break
-              end
-            end
+          # Checks the type flag and if the current file meets the type requirements continues
+          if output_name.match "." + @options.file_type.to_s
+            file_type = output_name.match(/\.css/) ? "css" : "js"
             
-            if output_new || @options.force
-              create_output(output_name, inputs, file_type)
+            # Checks if output file exists and checks the mtimes of the source files to the output file if new creates a new file
+            if File.exists? output_name
+              inputs.each do |i|
+                if File.mtime(i) > File.mtime(output_name)
+                  output_new = true
+                  break
+                end
+              end
+              
+              if output_new || @options.force
+                create_output(output_name, inputs, file_type)
+              else
+                puts "Skipping: #{output_name}"
+              end
             else
-              puts "Skipping: #{output_name}"
+              create_output(output_name, inputs, file_type)
             end
-          else
-            create_output(output_name, inputs, file_type)
           end
         end
       end
+      
+      puts sprintf("%.5f", elapsed) + " seconds"
     end
   end
   
@@ -89,57 +95,85 @@ class Blender
     
     opts.on("-d", "--data", String, "Change url(image.ext) to url(data:) in css files") { @options.data = true }
     opts.on("-F", "--force", String, "Force minification when source files aren't newer than min files") { @options.force = true }
-    
+    opts.on("--generate", String, "Generate a blendfile") { create_blendfile() }
     opts.parse!(@arguments) rescue return false
     
     true
   end
   
-  # TODO Change to work with directory hashes (css/: [ colors.css, layout.css ])
-  def create_output(output_name, inputs, type)
-    File.open(output_name, 'w') do |output_file|
-      inputs.each do |i|
-        output_file << IO.read(i)
+  def create_blendfile()
+    blend_files = Hash.new
+    Find.find(Dir.getwd) do |f|
+      if f.match /\.css$/
+        key = File.dirname(f) + "-min.css"
+        if blend_files.has_key? key
+          blend_files[key] << f
+        else
+          blend_files[key] = [f]
+        end
       end
-    end
-    
-    # Compress
-    IO.popen("java -jar #{File.dirname(__FILE__)}/../lib/yuicompressor.jar #{@passthrough} --type #{type}", mode="r+") do |io|
-      io.write IO.read(output_name)
-      io.close_write
       
-      File.open(output_name, 'w') do |output_file|
-        output_file << io.read
+      if f.match /\.js$/
+        key = File.dirname(f) + "-min.js"
+        if blend_files.has_key? key
+          blend_files[key] << f
+        else
+          blend_files[key] = [f]
+        end
       end
+      
+      Find.prune if f=~ /.svn/
+    end
+
+    if !File.exists? 'blender.yaml' || @options.force
+      File.open('blender.yaml', 'w') {|f| YAML.dump(blend_files, f)}
     end
     
-    # TODO Move this to before the file gets written
-    # Workaround for YUI Compressor Bug #1938329 & Bug #1961175
-    if output_name.match /\.css$/
-      output = IO.read(output_name)
-      
-      output.gsub! ' and(', ' and ('
-      output.gsub! '/**/;}', '/**/}'
-      
-      if @options.data
-        output = output.gsub(/url\(['"]?([^?']+)['"]+\)/im) do
-          uri = $1
-          mime_type = ''
-          
-          # Make the URI absolute instead of relative. TODO Seems kinda hacky is there a better way?
-          uri.gsub! "../", ""
-          
-          # Figure out the mime type.
-          mime_type = MIME::Types.type_for(uri)
-          
-          url_contents = make_data_uri(IO.read(uri), mime_type)
-          
-          %Q!url("#{url_contents}")!
-        end
+    exit 0
+  end
+  
+  # TODO Change to work with directory hashes (css/: [ colors.css, layout.css ])
+  def create_output(output_name, inputs, type)
+    File.open(output_name, 'w') do |output_file|
+      output = ''
+      inputs.each do |i|
+        output += IO.read(i)
       end
-      
-      File.open(output_name, 'w') do |output_file|
-        output_file << output
+
+      # Compress
+      real_file = File.symlink?(__FILE__) ? File.readlink(__FILE__) : __FILE__
+
+      IO.popen("java -jar #{File.dirname(real_file)}/../lib/yuicompressor.jar #{@passthrough} --type #{type}", mode="r+") do |io|
+        io.write output
+        io.close_write
+
+        output = io.read
+        # TODO Move this to before the file gets written
+        # Workaround for YUI Compressor Bug #1938329 & Bug #1961175
+        if output_name.match /\.css$/
+
+          output.gsub! ' and(', ' and ('
+          output.gsub! '/**/;}', '/**/}'
+
+          if @options.data
+            output = output.gsub(/url\(['"]?([^?']+)['"]+\)/im) do
+              uri = $1
+              mime_type = ''
+
+              # Make the URI absolute instead of relative. TODO Seems kinda hacky is there a better way?
+              uri.gsub! "../", ""
+
+              # Figure out the mime type.
+              mime_type = MIME::Types.type_for(uri)
+              
+              url_contents = make_data_uri(IO.read(uri), mime_type[0])
+
+              %Q!url("#{url_contents}")!
+            end
+          end
+
+          output_file << output
+        end
       end
     end
     

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: front-end-blender
 version: !ruby/object:Gem::Version 
-  version: 0.5.2
+  version: 0.6.0
 platform: ruby
 authors: 
 - Blake Elshire & Chris Griego
@@ -9,7 +9,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2008-05-17 00:00:00 -07:00
+date: 2008-05-21 00:00:00 -07:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency