less 0.8.8 → 1.2.21

data/CHANGELOG

@@ -0,0 +1,62 @@
+1.1.6
+	- hsl() fix
+1.1.5
+	- rgb() fix
+1.1.4
+	- support for uppercase ids and classes
+	- `ex` support
+	- fixed ruby 1.8 from outputting ascii numbers in the CLI
+1.1.3
+	- fix to Growl messages
+	- better benchmark task output
+1.1.2
+	- full parens support
+	- don't raise an exception if growlnotify wasn't found
+1.1.1
+	- added title to Growl notifications
+1.1.0
+	- added color to command line output
+	- added Growl support
+1.0.16
+	- basic support for parens
+	- support for operations in shorthand properties
+1.0.15
+	- moved to treetop 1.3.0
+	- fixed benchmark task
+1.0.14
+	- support for `*property:` hack
+1.0.13
+	- importing .css files now works
+1.0.12
+	- basic selector grouping for better output
+	- evaluate variables lazily
+	- support for values starting with `-`
+1.0.11
+	- ruby 1.8 compatibility fix
+1.0.10
+	- additional support for css 3
+1.0.9
+	- overhauled color support & operations
+	- better handling of css 3 selectors
+1.0.8
+	- support for rgba
+	- fixed color expansion
+	- fixed new-line error in declarations
+	- fixed attriute selector without element name error
+1.0.6
+	- fixed grammar for .class#id
+	- fixed color padding issue
+1.0.5
+	- added attribute selectors (accessors)
+	- semi-column at end of ruleset now works
+1.0.4
+	- removed dependency on polyglot gem
+	- fixed a moz hack not compiling
+1.0.3
+	- fixed problem with floats repeating unit twice
+1.0.2
+	- added support for url() without quotes
+1.0.1
+	- pulled some patches from jgarber's treetop
+1.0.0
+	- initial release

data/README.md

@@ -2,6 +2,16 @@ LESS
 ====
 It's time CSS was done right – LESS is _leaner_ css.
 
+Setup
+------
+to get the latest development version:
+    
+    sudo gem install less -s http://gemcutter.org
+
+to get the latest stable version:
+
+    sudo gem install less
+
 Explained
 ---------
 LESS allows you to write CSS the way (I think) it was meant to, that is: with *variables*, *nested rules* and *mixins*!
@@ -9,22 +19,30 @@ LESS allows you to write CSS the way (I think) it was meant to, that is: with *v
 ### Here's some example LESS code:
 	
 	@dark: #110011;
-	.outline { border: 1px solid black }
+	.outline (@width: 1) { border: (@width * 10px) solid black }
 	
 	.article {
 		a { text-decoration: none }
 		p { color: @dark }
-		.outline;
+		.outline(3);
 	}
 	
 ### And the CSS output it produces:
 	
-	.outline { border: 1px solid black }
 	.article a { text-decoration: none }
 	.article p { color: #110011 }
-	.article { border: 1px solid black }
+	.article { border: 30px solid black }
 	
-If you have CSS nightmares, just 
+If you have CSS nightmares, just
 	$ lessc style.less
 
-For more information, see you at http://lesscss.org
+For more information, see you at <http://lesscss.org>
+
+People without whom this wouldn't have happened a.k.a *Credits*
+---------------------------------------------------------------
+
+- **Dmitry Fadeyev**, for pushing me to do this, and designing our awesome website
+- **August Lilleaas**, for initiating the work on the treetop grammar, as well as writing the rails plugin
+- **Nathan Sobo**, for creating treetop
+- **Jason Garber**, for his magical performance optimizations on treetop
+- And finally, the people of #ruby-lang for answering all my ruby questions. **apeiros**, **manveru** and **rue** come to mind

data/Rakefile

@@ -3,59 +3,50 @@ begin
   Jeweler::Tasks.new do |s|
     s.name        = "less"
     s.authors     = ["cloudhead"]
-    s.email       = "alexis@cloudhead.net"
+    s.email       = "self@cloudhead.net"
     s.summary     = "LESS compiler"
     s.homepage    = "http://www.lesscss.org"
     s.description = "LESS is leaner CSS"
     s.rubyforge_project = 'less'
+    s.add_dependency('treetop', '>= 1.4.2')
+    s.add_dependency('mutter', '>= 0.4.2')
   end
+  Jeweler::GemcutterTasks.new
 rescue LoadError
   puts "Jeweler not available. Install it with: sudo gem install technicalpickles-jeweler -s http://gems.github.com"
 end
 
-# rubyforge
-begin
-  require 'rake/contrib/sshpublisher'
-  namespace :rubyforge do
-
-    desc "Release gem and RDoc documentation to RubyForge"
-    task :release => ["rubyforge:release:gem", "rubyforge:release:docs"]
+require 'spec/rake/spectask'
 
-    namespace :release do
-      desc "Publish RDoc to RubyForge."
-      task :docs => [:rdoc] do
-        config = YAML.load(
-            File.read(File.expand_path('~/.rubyforge/user-config.yml'))
-        )
-        options << '--line-numbers' << '--inline-source'
-        host = "#{config['username']}@rubyforge.org"
-        remote_dir = "/var/www/gforge-projects/the-perfect-gem/"
-        local_dir = 'rdoc'
+Spec::Rake::SpecTask.new("spec") do |t|
+  t.libs << 'lib' << 'spec'
+  t.spec_files = FileList['spec/**/*_spec.rb']
+  t.spec_opts = ['--color', '--format=specdoc']
+end
 
-        Rake::SshDirPublisher.new(host, remote_dir, local_dir).upload
-      end
-    end
-  end
-rescue LoadError
-  puts "Rake SshDirPublisher is unavailable or your rubyforge environment is not configured."
+task :test do
+  Rake::Task['spec'].invoke
 end
 
 begin
-  require 'spec/rake/spectask'
+  require 'lib/less'
+  require 'benchmark'
 
-  Spec::Rake::SpecTask.new("spec") do |t|
-    t.spec_files = FileList['spec/**/*_spec.rb']
-    t.spec_opts = ['--color', '--format=specdoc']
+  task :compile do
+    abort "compiling isn't necessary anymore."
+    puts "compiling #{LESS_GRAMMAR.split('/').last}..."
+    File.open(LESS_PARSER, 'w') {|f| f.write Treetop::Compiler::GrammarCompiler.new.ruby_source(LESS_GRAMMAR) }
   end
 
-  task :test do
-    Rake::Task['spec'].invoke
+  task :benchmark do
+    less = File.read("spec/less/big.less")
+    result = nil
+    Benchmark.bmbm do |b|
+      b.report("parse:  ") { result = Less::Engine.new(less).parse(false) }
+      b.report("build:  ") { result = result.build(Less::Node::Element.new) }
+      b.report("compile:") { result.to_css }
+    end
   end
+end
 
-  Spec::Rake::SpecTask.new("rcov_spec") do |t|
-    t.spec_files = FileList['spec/**/*_spec.rb']
-    t.spec_opts = ['--color']
-    t.rcov = true
-    t.rcov_opts = ['--exclude', '^spec,/gems/']
-  end
-end
+task :default => :spec

data/VERSION

@@ -1 +1 @@
-0.8.8
+1.2.21

data/bin/lessc

@@ -3,39 +3,69 @@
 $:.unshift File.dirname(__FILE__) + "/../lib"
 
 require 'optparse'
+require 'rubygems'
 require 'less'
 
-CSS = '.css'
+begin
+  require 'growl'
+rescue LoadError
+  Less::GROWL = false
+else
+  Less::GROWL = true
+end
 
 # Argument defaults
 options = {
   :watch => false,
   :compress => false,
   :debug => false,
-  :inheritance => :desc
+  :growl => false,
+  :timestamps => false,
+  :color => $stdout.tty?
 }
 
 # Get arguments
 opts = OptionParser.new do |o|
   o.banner = "usage: lessc source [destination] [--watch]"
   o.separator ""
-  
+
   # Watch mode
   o.on("-w", "--watch", "watch for changes") do
     options[:watch] = true
   end
-  
-  # Child-type inheritance
-  o.on("-c", "--child", "nesting uses child-type inheritance") do
-    options[:chain] = :child
+
+  # Growl
+  o.on("-g", "--growl", "growl notifications") do
+    if Less::GROWL && (Growl.installed? rescue false)
+      options[:growl] = true
+    elsif Less::GROWL
+      abort "Growl or 'growlnotify' wasn't found on your system."
+    else
+      abort "Growl gem not found, please install with: " +
+            "`sudo gem install visionmedia-growl -s http://gems.github.com`"
+    end
+  end
+
+  # Timestamps
+  o.on("-t", "--timestamps", "show timestamps in watch mode") do
+    options[:timestamps] = true
+  end
+
+  # No color in output
+  o.on("--no-color", "suppress color in output") do
+    options[:color] = false
+  end
+
+  o.on('--verbose', 'show success messages when using growl') do
+    options[:verbose] = true
   end
-  
+
   # Compression needs a proper algorithm
   #
   #  o.on("-x", "--compress", "compress css file") do
   #    options[:compress] = true
   #  end
-  
+
   o.separator ""
 
   # Help
@@ -43,7 +73,7 @@ opts = OptionParser.new do |o|
     puts opts
     exit
   end
-  
+
   o.on_tail("-d", "--debug", "show full error messages") do
     options[:debug] = true
   end
@@ -69,4 +99,4 @@ case ARGV.size
     exit
 end
 
-Less::Command.new( options ).run!
+Less::Command.new( options ).run! ? exit(0) : exit(1)

data/less.gemspec

@@ -1,15 +1,18 @@
+# Generated by jeweler
+# DO NOT EDIT THIS FILE DIRECTLY
+# Instead, edit Jeweler::Tasks in Rakefile, and run the gemspec command
 # -*- encoding: utf-8 -*-
 
 Gem::Specification.new do |s|
   s.name = %q{less}
-  s.version = "0.8.8"
+  s.version = "1.2.21"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["cloudhead"]
-  s.date = %q{2009-06-17}
+  s.date = %q{2010-01-13}
   s.default_executable = %q{lessc}
   s.description = %q{LESS is leaner CSS}
-  s.email = %q{alexis@cloudhead.net}
+  s.email = %q{self@cloudhead.net}
   s.executables = ["lessc"]
   s.extra_rdoc_files = [
     "LICENSE",
@@ -17,6 +20,7 @@ Gem::Specification.new do |s|
   ]
   s.files = [
     ".gitignore",
+     "CHANGELOG",
      "LICENSE",
      "README.md",
      "Rakefile",
@@ -26,39 +30,104 @@ Gem::Specification.new do |s|
      "lib/less.rb",
      "lib/less/command.rb",
      "lib/less/engine.rb",
-     "lib/less/tree.rb",
+     "lib/less/engine/grammar/common.tt",
+     "lib/less/engine/grammar/entity.tt",
+     "lib/less/engine/grammar/less.tt",
+     "lib/less/engine/nodes.rb",
+     "lib/less/engine/nodes/element.rb",
+     "lib/less/engine/nodes/entity.rb",
+     "lib/less/engine/nodes/function.rb",
+     "lib/less/engine/nodes/literal.rb",
+     "lib/less/engine/nodes/property.rb",
+     "lib/less/engine/nodes/ruleset.rb",
+     "lib/less/engine/nodes/selector.rb",
+     "lib/less/ext.rb",
      "spec/command_spec.rb",
-     "spec/css/less-0.8.5.css",
-     "spec/css/less-0.8.6.css",
-     "spec/css/less-0.8.7.css",
-     "spec/css/less-0.8.8.css",
+     "spec/css/accessors.css",
+     "spec/css/big.css",
+     "spec/css/colors.css",
+     "spec/css/comments.css",
+     "spec/css/css-3.css",
+     "spec/css/css.css",
+     "spec/css/dash-prefix.css",
+     "spec/css/functions.css",
+     "spec/css/import-with-extra-paths.css",
+     "spec/css/import-with-partial-in-extra-path.css",
+     "spec/css/import.css",
+     "spec/css/lazy-eval.css",
+     "spec/css/mixins-args.css",
+     "spec/css/mixins.css",
+     "spec/css/operations.css",
+     "spec/css/parens.css",
+     "spec/css/rulesets.css",
+     "spec/css/scope.css",
+     "spec/css/selectors.css",
+     "spec/css/strings.css",
+     "spec/css/variables.css",
+     "spec/css/whitespace.css",
      "spec/engine_spec.rb",
+     "spec/less/accessors.less",
+     "spec/less/big.less",
+     "spec/less/colors.less",
+     "spec/less/comments.less",
+     "spec/less/css-3.less",
+     "spec/less/css.less",
+     "spec/less/dash-prefix.less",
+     "spec/less/exceptions/mixed-units-error.less",
+     "spec/less/exceptions/name-error-1.0.less",
+     "spec/less/exceptions/syntax-error-1.0.less",
+     "spec/less/extra_import_path/extra.less",
+     "spec/less/extra_import_path/import/import-test-a.css",
+     "spec/less/extra_import_path/import/import-test-a.less",
+     "spec/less/functions.less",
+     "spec/less/hidden.less",
+     "spec/less/import-with-extra-paths.less",
+     "spec/less/import.less",
+     "spec/less/import/import-test-a.less",
+     "spec/less/import/import-test-b.less",
+     "spec/less/import/import-test-c.less",
+     "spec/less/import/import-test-d.css",
+     "spec/less/lazy-eval.less",
+     "spec/less/literal-css.less",
+     "spec/less/mixins-args.less",
+     "spec/less/mixins.less",
+     "spec/less/operations.less",
+     "spec/less/parens.less",
+     "spec/less/rulesets.less",
+     "spec/less/scope.less",
+     "spec/less/selectors.less",
+     "spec/less/strings.less",
+     "spec/less/variables.less",
+     "spec/less/whitespace.less",
      "spec/spec.css",
-     "spec/spec.less",
-     "spec/spec_helper.rb",
-     "spec/tree_spec.rb"
+     "spec/spec_helper.rb"
   ]
-  s.has_rdoc = true
   s.homepage = %q{http://www.lesscss.org}
   s.rdoc_options = ["--charset=UTF-8"]
   s.require_paths = ["lib"]
   s.rubyforge_project = %q{less}
-  s.rubygems_version = %q{1.3.1}
+  s.rubygems_version = %q{1.3.5}
   s.summary = %q{LESS compiler}
   s.test_files = [
     "spec/command_spec.rb",
      "spec/engine_spec.rb",
-     "spec/spec_helper.rb",
-     "spec/tree_spec.rb"
+     "spec/spec_helper.rb"
   ]
 
   if s.respond_to? :specification_version then
     current_version = Gem::Specification::CURRENT_SPECIFICATION_VERSION
-    s.specification_version = 2
+    s.specification_version = 3
 
     if Gem::Version.new(Gem::RubyGemsVersion) >= Gem::Version.new('1.2.0') then
+      s.add_runtime_dependency(%q<treetop>, [">= 1.4.2"])
+      s.add_runtime_dependency(%q<mutter>, [">= 0.4.2"])
     else
+      s.add_dependency(%q<treetop>, [">= 1.4.2"])
+      s.add_dependency(%q<mutter>, [">= 0.4.2"])
     end
   else
+    s.add_dependency(%q<treetop>, [">= 1.4.2"])
+    s.add_dependency(%q<mutter>, [">= 0.4.2"])
   end
 end
+

data/lib/less/command.rb

@@ -1,13 +1,13 @@
 module Less
   class Command
-    CSS = '.css'
-
     attr_accessor :source, :destination, :options
 
     def initialize options
+      $verbose = options[:debug]
       @source = options[:source]
-      @destination = (options[:destination] || options[:source]).gsub /\.(less|lss)/, CSS
+      @destination = (options[:destination] || options[:source]).gsub /\.(less|lss)/, '.css'
       @options = options
+      @mutter = Mutter.new.clear
     end
 
     def watch?()    @options[:watch]    end
@@ -16,9 +16,9 @@ module Less
 
     # little function which allows us to
     # Ctrl-C exit inside the passed block
-    def watch &block
+    def watch
       begin
-        block.call
+        yield
       rescue Interrupt
         puts
         exit 0
@@ -26,10 +26,10 @@ module Less
     end
 
     def run!
-      compile(true) unless File.exist? @destination
-
       if watch?
-        log "Watching for changes in #@source ...Ctrl-C to abort.\n"
+        parse(true) unless File.exist? @destination
+
+        log "Watching for changes in #@source... Ctrl-C to abort.\n: "
 
         # Main watch loop
         loop do
@@ -37,55 +37,74 @@ module Less
 
           # File has changed
           if File.stat( @source ).mtime > File.stat( @destination ).mtime
-            log "Change detected... "
+            print Time.now.strftime("%H:%M:%S -- ") if @options[:timestamps]
+            print "Change detected... "
 
             # Loop until error is fixed
-            until compile
-              log "Press [enter] to continue..."
+            until parse
+              log "Press [return] to continue..."
               watch { $stdin.gets }
             end
           end
         end
       else
-        compile
+        parse
       end
     end
 
-    def compile new = false
+    def parse new = false
       begin
         # Create a new Less object with the contents of a file
-        css = Less::Engine.new( File.read( @source ) ).to_css @options[:inheritance]
+        css = Less::Engine.new(File.new(@source), @options).to_css
         css = css.delete " \n" if compress?
 
         File.open( @destination, "w" ) do |file|
           file.write css
         end
-        puts "#{new ? '* [Created]' : ' [Updated]'} #{@destination.split('/').last}" if watch?
+
+        act, file = (new ? 'Created' : 'Updated'), @destination.split('/').last
+        print "#{o("* #{act}", :green)} #{file}\n: " if watch?
+        Growl.notify "#{act} #{file}", :title => 'LESS' if @options[:growl] && @options[:verbose]
       rescue Errno::ENOENT => e
         abort "#{e}"
-      rescue SyntaxError
-        error = debug?? $! : $!.message.split("\n")[1..-1].collect {|e|
-          e.gsub(/\(eval\)\:(\d+)\:\s/, 'line \1: ')
-        } * "\n"
-        err "errors were found in the .less file! \n#{error}\n"
+      rescue SyntaxError => e
+        err "#{e}\n", "Syntax"
+      rescue CompileError => e
+        err "#{e}\n", "Compile"
       rescue MixedUnitsError => e
-        err "`#{e}` you're  mixing units together! What do you expect?\n"
-      rescue CompoundOperationError => e
-        err "`#{e}` operations in compound declarations aren't allowed, sorry!\n"
+        err "`#{e}` you're  mixing units together! What do you expect?\n", "Mixed Units"
       rescue PathError => e
-        err "`#{e}` was not found.\n"
+        err "`#{e}` was not found.\n", "Path"
+      rescue VariableNameError => e
+        err "#{o(e, :yellow)} is undefined.\n", "Variable Name"
+      rescue MixinNameError => e
+        err "#{o(e, :yellow)} is undefined.\n", "Mixin Name"
       else
         true
       end
     end
 
-    # Just a logging function to avoid typing '}'
+    # Just a logging function to avoid typing '*'
     def log s = ''
       print '* ' + s.to_s
     end
 
-    def err s = ''
-      print "!! #{s}"
+    def err s = '', type = ''
+      type = type.strip + ' ' unless type.empty?
+      $stderr.print "#{o("! #{type}Error", :red)}: #{s}"
+      if @options[:growl]
+        growl = Growl.new
+        growl.title = "LESS"
+        growl.message = "#{type}Error in #@source!"
+        growl.run
+        false
+      end
+    end
+
+  private
+
+    def o ex, *styles
+      @mutter.process(ex.to_s, *(@options[:color] ? styles : []))
     end
   end
-end
+end

data/lib/less/engine/grammar/common.tt

@@ -0,0 +1,29 @@
+module Less
+  module StyleSheet
+    grammar Common
+      #
+      # Whitespace
+      #
+      rule s
+        [ ]*
+      end
+
+      rule S
+        [ ]+
+      end
+
+      rule ws
+        [\n ]*
+      end
+
+      rule WS
+        [\n ]+
+      end
+
+      # Non-space char
+      rule ns
+        ![ ;,!})\n] .
+      end
+    end
+  end
+end