front-end-blender 0.6.1 → 0.8

data/README

@@ -35,7 +35,7 @@ Other examples:
   blend -f site/blender.yaml
   blend -t css
   blend -t css -d
-  blend -F -- --preserve-semi
+  blend --yui='--preserve-semi'
 
 == Usage
 
@@ -45,12 +45,14 @@ For help use: blend -h
 
 == Options
 
--h, --help                     Displays help message
--v, --version                  Display the version, then exit
--f <file>, --file <file>       Use given Blendfile
--t <css|js>, --type <css|js>   Compress CSS or JavaScript only
--d, --data                     Convert CSS url(image.ext) to url(data:) EXPERIMENTAL
---force                        Force file minification when there are no new updates
+-h, --help                    Displays help message
+-v, --version                 Display the version
+-f <file>, --file <file>      Use given Blendfile
+-t <css|js>, --type <css|js>  Select file type to blend (css, js)
+-d, --data                    Convert url(image.ext) to url(data:) in CSS files EXPERIMENTAL
+--force                       Force blending when source files aren't newer than output files
+--yui=                        Pass arguments to YUI Compressor
+-g, --generate                Generate a stub Blendfile
 
 == Installation
 

data/bin/blend

@@ -17,24 +17,27 @@ require 'find'
 
 # TODO Move class to lib so other tools could potentially reuse it
 class Blender
-  VERSION = '0.6.1'
+  VERSION = '0.8'
   
   attr_reader :options
   
   def initialize(arguments, stdin)
-    @arguments   = !arguments.include?('--') ? arguments : arguments[0...arguments.index('--')]
-    @passthrough = !arguments.include?('--') ? ''        : arguments[arguments.index('--')+1..-1]
+    @arguments = arguments
     
     # Set defaults
     @options = OpenStruct.new
     @options.blendfile = 'blender.yaml'
-    @options.png       = false
     @options.data      = false
     @options.force     = false
+    @options.generate  = false
   end
   
   def blend
     if parsed_options?
+      if @options.generate
+        create_blendfile
+      end
+      
       elapsed = Benchmark.realtime do
         unless File.exists? @options.blendfile
           puts "Couldn't find '#{@options.blendfile}'"
@@ -82,33 +85,28 @@ class Blender
   def parsed_options?
     opts = OptionParser.new
     
-    opts.on('-v', '--version') { output_version ; exit 0 }
-    opts.on('-h', '--help')    { output_help }
-    
-    opts.on('-f FILE', '--file FILE', String, "Use given Blendfile") do |blendfile|
-      @options.blendfile = blendfile
-    end
-    
-    opts.on("-t [TYPE]", "--type [TYPE]", [:css, :js], "Select file type to minify (css, js)") do |t|
-      @options.file_type = t
-    end
+    opts.on('-h',      '--help')                                                                                        {    output_help               }
+    opts.on('-v',      '--version')                                                                                     {    output_version; exit 0    }
+    opts.on('-f FILE', '--file FILE',   String,      "Use given Blendfile")                                             {|f| @options.blendfile = f    }
+    opts.on('-t TYPE', '--type TYPE',   [:css, :js], "Select file type to blend (css, js)")                             {|t| @options.file_type = t    }
+    opts.on('-d',      '--data',        String,      "Convert url(image.ext) to url(data:) in CSS files EXPERIMENTAL")  {    @options.data      = true }
+    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('-g',      '--generate',    String,      "Generate a stub Blendfile")                                       {    @options.generate  = true }
     
-    opts.on("-d", "--data", String, "Change url(image.ext) to url(data:) in css files") { @options.data = true }
-    opts.on("--force", String, "Force minification when source files aren't newer than output files") { @options.force = true }
-    opts.on("--generate", String, "Generate a blendfile") { create_blendfile() }
     opts.parse!(@arguments) rescue return false
     
     true
   end
   
-  def create_blendfile()
+  def create_blendfile
     if File.exists?(@options.blendfile) && !@options.force
       puts "'#{@options.blendfile}' already exists"
       exit 1
     end
-
+    
     blend_files = Hash.new
-
+    
     Find.find(Dir.getwd) do |f|
       if f.match /\.css$/
         key = File.dirname(f) + "-min.css"
@@ -118,7 +116,7 @@ class Blender
           blend_files[key] = [f]
         end
       end
-
+      
       if f.match /\.js$/
         key = File.dirname(f) + "-min.js"
         if blend_files.has_key? key
@@ -127,8 +125,8 @@ class Blender
           blend_files[key] = [f]
         end
       end
-
-      Find.prune if File.basename(f).index('.') == 0 # TODO Ignore all files in any dot folder
+      
+      Find.prune if File.basename(f).index('.') == 0
     end
     
     File.open(@options.blendfile, 'w') { |f| YAML.dump(blend_files, f) }
@@ -140,24 +138,23 @@ class Blender
   def create_output(output_name, inputs, type)
     File.open(output_name, 'w') do |output_file|
       output = ''
+      
       inputs.each do |i|
-        output += IO.read(i)
+        output << IO.read(i)
       end
       
       # 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.popen("java -jar #{File.dirname(real_file)}/../lib/yui/yuicompressor.jar #{@options.yuiopts} --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! '/**/;}', '/**/}'
+          output.gsub! ' and(', ' and (' # Workaround for YUI Compressor Bug #1938329
+          output.gsub! '/**/;}', '/**/}' # Workaround for YUI Compressor Bug #1961175
           
           if @options.data
             output = output.gsub(/url\(['"]?([^?']+)['"]+\)/im) do
@@ -175,9 +172,9 @@ class Blender
               %Q!url("#{url_contents}")!
             end
           end
-          
-          output_file << output
         end
+        
+        output_file << output
       end
     end
     
@@ -193,7 +190,7 @@ class Blender
   end
   
   def output_version
-    puts "#{File.basename(__FILE__)} version #{VERSION}"
+    puts "Blender v#{VERSION}"
   end
   
   def output_help

data/lib/yui/LICENSE

@@ -0,0 +1,30 @@
+Software License Agreement (BSD License)
+
+Copyright (c) 2008, Yahoo! Inc.
+All rights reserved.
+
+Redistribution and use of this software in source and binary forms, with or without modification, are
+permitted provided that the following conditions are met:
+
+* Redistributions of source code must retain the above
+  copyright notice, this list of conditions and the
+  following disclaimer.
+
+* Redistributions in binary form must reproduce the above
+  copyright notice, this list of conditions and the
+  following disclaimer in the documentation and/or other
+  materials provided with the distribution.
+
+* Neither the name of Yahoo! Inc. nor the names of its
+  contributors may be used to endorse or promote products
+  derived from this software without specific prior
+  written permission of Yahoo! Inc.
+
+THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND ANY EXPRESS OR IMPLIED
+WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A
+PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR
+ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
+LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
+INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR
+TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF
+ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: front-end-blender
 version: !ruby/object:Gem::Version 
-  version: 0.6.1
+  version: "0.8"
 platform: ruby
 authors: 
 - Blake Elshire & Chris Griego
@@ -33,7 +33,8 @@ files:
 - README
 - MIT-LICENSE
 - bin/blend
-- lib/yuicompressor.jar
+- lib/yui/yuicompressor.jar
+- lib/yui/LICENSE
 has_rdoc: false
 homepage: http://github.com/front-end/front-end-blender/tree/master
 post_install_message: