less 2.0.4 → 2.1.0

data/.gitmodules

@@ -1,6 +1,3 @@
-[submodule "deps/less.js"]
-	path = deps/less.js
-	url = http://github.com/cloudhead/less.js.git
 [submodule "lib/less/js"]
 	path = lib/less/js
 	url = https://github.com/cloudhead/less.js.git

data/.travis.yml

@@ -0,0 +1,10 @@
+rvm:
+  - 1.8.7
+  - 1.9.2
+  - 1.9.3
+  - ree
+notifications:
+  recipients:
+    - cowboyd@thefrontside.net
+
+before_script: git submodule update --init

data/README.md

@@ -38,4 +38,4 @@ less.rb is licensed under the same terms as less.js
 See `lib/js/LICENSE` file.
 
 
-> copyright 2011 Charles Lowell
+> copyright 2011,2012 Charles Lowell

data/Rakefile

@@ -5,3 +5,5 @@ require "rspec/core/rake_task"
 Bundler::GemHelper.install_tasks
 RSpec::Core::RakeTask.new(:spec)
 
+task :default => :spec
+

data/bin/lessc

@@ -1,5 +1,24 @@
 #!/usr/bin/env ruby
 
+require 'less'
 
-puts "#{File.basename($0)}: command line invocation is not currently supported"
-puts "  Pull requests welcome! https://github.com/cowboyd/less.rb"
+# This file is inspired by / based off of http://ozmm.org/posts/argf.html
+
+def help
+  puts <<-help
+Usage:
+  $ lessc < style.less
+  $ lessc file1.less file2.less
+help
+end
+
+# First off, let's show help some help if no arguments and tty
+if ($stdin.tty? && ARGV.empty?) || ARGV.delete('-h') || ARGV.delete('--help')
+  help
+else
+  # Well, lets read those files
+  doc = ARGF.read
+  parser = Less::Parser.new
+  tree = parser.parse(doc)
+  puts tree.to_css(:compress => true)
+end

data/less.gemspec

@@ -21,9 +21,11 @@ Gem::Specification.new do |s|
   s.test_files    = `git ls-files -- {test,spec,features}/*`.split("\n")
   s.executables   = `git ls-files -- bin/*`.split("\n").map{ |f| File.basename(f) }
   s.require_paths = ["lib"]
-  
-  s.add_dependency "therubyracer", "~> 0.9.1"
-  s.add_development_dependency "rake", "~> 0.9.1"
+
+  s.add_dependency "therubyracer", "~> 0.10.0"
+  s.add_dependency "commonjs", "~> 0.2.0"
+
+  s.add_development_dependency "rake"
   s.add_development_dependency "rspec", "~> 2.0"
 end
 

data/lib/less/defaults.rb

@@ -0,0 +1,13 @@
+
+module Less
+  module Defaults
+
+    def defaults
+      @defaults ||= {:paths => []}
+    end
+
+    def paths
+      defaults[:paths]
+    end
+  end
+end

data/lib/less/js/CHANGELOG

@@ -0,0 +1,41 @@
+1.3.0
+
+@media bubbling
+Support arbitrary entities as selectors
+Variadic argument support, see: https://gist.github.com/1933613
+Behaviour of zero-arity mixins has changed, see link above.
+Allow '@import' directives in any selector
+Media-query features can now be a variable
+Automatic merging of media-query conditions
+Fix global variable leaks
+Fix error message on wrong-arity call
+Fix an '@arguments' behaviour bug
+Fix '::' selector output
+Fix a bug when using @media with mixins
+
+1.2.1
+
+Fix imports on browser
+Improve error reporting on browser
+Fix Runtime error reports from imported files
+Fix 'File not found' import error reporting
+
+1.2.0
+
+Mixin guards
+New function `percentage`
+New `color` function to parse hex color strings
+New type-checking stylesheet functions
+Fix Rhino support
+Fix bug in string arguments to mixin call
+Fix error reporting when index is 0
+Fix browser support in webkit and IE
+Fix string interpolation bug when var is empty
+Support '!important' after mixin calls
+Support vanilla @keyframes directive
+Support variables in certain css selectors, like 'nth-child'
+Support @media and @import features properly
+Improve @import support with media features
+Improve error reports from imported files
+Improve function call error reporting
+Improve error-reporting

data/lib/less/js/Makefile

@@ -18,6 +18,7 @@ HEADER = build/header.js
 VERSION = `cat package.json | grep version \
 														| grep -o '[0-9]\.[0-9]\.[0-9]\+'`
 DIST = dist/less-${VERSION}.js
+RHINO = dist/less-rhino-${VERSION}.js
 DIST_MIN = dist/less-${VERSION}.min.js
 
 less:
@@ -26,19 +27,37 @@ less:
 	@@cat ${HEADER} | sed s/@VERSION/${VERSION}/ > ${DIST}
 	@@echo "(function (window, undefined) {" >> ${DIST}
 	@@cat build/require.js\
+	      build/amd.js\
 	      build/ecma-5.js\
 	      ${SRC}/parser.js\
 	      ${SRC}/functions.js\
+	      ${SRC}/colors.js\
 	      ${SRC}/tree/*.js\
 	      ${SRC}/tree.js\
 	      ${SRC}/browser.js >> ${DIST}
 	@@echo "})(window);" >> ${DIST}
 	@@echo ${DIST} built.
 
+rhino:
+	@@mkdir -p dist
+	@@touch ${RHINO}
+	@@cat build/require-rhino.js\
+	      build/ecma-5.js\
+	      ${SRC}/parser.js\
+	      ${SRC}/functions.js\
+	      ${SRC}/tree/*.js\
+	      ${SRC}/tree.js\
+	      ${SRC}/rhino.js > ${RHINO}
+	@@echo ${RHINO} built.
+
 min: less
 	@@echo minifying...
-	@@cat ${HEADER} | sed s/@VERSION/${VERSION}/ > ${DIST_MIN}
-	@@uglifyjs ${DIST} >> ${DIST_MIN}
+	@@uglifyjs ${DIST} > ${DIST_MIN}
+	@@echo ${DIST_MIN} built.
+
+server: less
+	cp dist/less-${VERSION}.js test/html/
+	cd test/html && python -m SimpleHTTPServer
 
 clean:
 	git rm dist/*

data/lib/less/js/benchmark/benchmark.less

@@ -11,27 +11,27 @@
 @colour_positive: #ff0000;
 @colour_negative: #ff0000;
 
-.box_shadow () {
+.box_shadow (...) {
 }
-.text_shadow () {
+.text_shadow (...) {
 }
-.border_radius () {
+.border_radius (...) {
 }
-.border_radius_top_left () {
+.border_radius_top_left (...) {
 }
-.border_radius_top_right () {
+.border_radius_top_right (...) {
 }
-.border_radius_bottom_right () {
+.border_radius_bottom_right (...) {
 }
-.border_radius_bottom_left () {
+.border_radius_bottom_left (...) {
 }
-.border_radius_top () {
+.border_radius_top (...) {
 }
-.border_radius_right () {
+.border_radius_right (...) {
 }
-.border_radius_bottom () {
+.border_radius_bottom (...) {
 }
-.border_radius_left () {
+.border_radius_left (...) {
 }
 div.browse {
   margin: 0 0 20px;

data/lib/less/js/benchmark/less-benchmark.js

@@ -1,10 +1,8 @@
 var path = require('path'),
     fs = require('fs'),
-    sys = require('sys');
+    sys = require('util');
 
-require.paths.unshift(__dirname, path.join(__dirname, '..'));
-
-var less = require('lib/less');
+var less = require('../lib/less');
 var file = path.join(__dirname, 'benchmark.less');
 
 if (process.argv[2]) { file = path.join(process.cwd(), process.argv[2]) }
@@ -12,7 +10,7 @@ if (process.argv[2]) { file = path.join(process.cwd(), process.argv[2]) }
 fs.readFile(file, 'utf8', function (e, data) {
     var tree, css, start, end, total;
 
-    sys.puts("Bechmarking...\n", path.basename(file) + " (" +
+    sys.puts("Benchmarking...\n", path.basename(file) + " (" +
              parseInt(data.length / 1024) + " KB)", "");
 
     start = new(Date);

data/lib/less/js/bin/lessc

@@ -2,22 +2,29 @@
 
 var path = require('path'),
     fs = require('fs'),
-    sys = require('sys');
+    sys = require('util'),
+    os = require('os');
 
-require.paths.unshift(path.join(__dirname, '..', 'lib'));
-
-var less = require('less');
+var less = require('../lib/less');
 var args = process.argv.slice(1);
 var options = {
     compress: false,
+    yuicompress: false,
     optimization: 1,
     silent: false,
-    paths: []
+    paths: [],
+    color: true,
+    strictImports: false
 };
 
 args = args.filter(function (arg) {
     var match;
 
+    if (match = arg.match(/^-I(.+)$/)) {
+        options.paths.push(match[1]);
+        return false;
+    }
+
     if (match = arg.match(/^--?([a-z][0-9a-z-]*)(?:=([^\s]+))?$/i)) { arg = match[1] }
     else { return arg }
 
@@ -33,6 +40,9 @@ args = args.filter(function (arg) {
         case 'silent':
             options.silent = true;
             break;
+        case 'strict-imports':
+            options.strictImports = true;
+            break;
         case 'h':
         case 'help':
             sys.puts("usage: lessc source [destination]");
@@ -41,13 +51,17 @@ args = args.filter(function (arg) {
         case 'compress':
             options.compress = true;
             break;
+        case 'yui-compress':
+            options.yuicompress = true;
+            break;
+        case 'no-color':
+            options.color = false;
+            break;
         case 'include-path':
-            options.paths = match[2].split(':')
+            options.paths = match[2].split(os.type().match(/Windows/) ? ';' : ':')
                 .map(function(p) {
-                    if (p && p[0] == '/') {
-                        return path.join(path.dirname(input), p);
-                    } else if (p) {
-                        return path.join(process.cwd(), p);
+                    if (p) {
+                      return path.resolve(process.cwd(), p);
                     }
                 });
             break;
@@ -58,12 +72,12 @@ args = args.filter(function (arg) {
 });
 
 var input = args[1];
-if (input && input[0] != '/') {
-    input = path.join(process.cwd(), input);
+if (input && input != '-') {
+    input = path.resolve(process.cwd(), input);
 }
 var output = args[2];
-if (output && output[0] != '/') {
-    output = path.join(process.cwd(), output);
+if (output) {
+    output = path.resolve(process.cwd(), output);
 }
 
 var css, fd, tree;
@@ -73,7 +87,7 @@ if (! input) {
     process.exit(1);
 }
 
-fs.readFile(input, 'utf-8', function (e, data) {
+var parseLessFile = function (e, data) {
     if (e) {
         sys.puts("lessc: " + e.message);
         process.exit(1);
@@ -82,14 +96,18 @@ fs.readFile(input, 'utf-8', function (e, data) {
     new(less.Parser)({
         paths: [path.dirname(input)].concat(options.paths),
         optimization: options.optimization,
-        filename: input
+        filename: input,
+        strictImports: options.strictImports
     }).parse(data, function (err, tree) {
         if (err) {
             less.writeError(err, options);
             process.exit(1);
         } else {
             try {
-                css = tree.toCSS({ compress: options.compress });
+                css = tree.toCSS({
+                    compress: options.compress,
+                    yuicompress: options.yuicompress
+                });
                 if (output) {
                     fd = fs.openSync(output, "w");
                     fs.writeSync(fd, css, 0, "utf8");
@@ -102,4 +120,20 @@ fs.readFile(input, 'utf-8', function (e, data) {
             }
         }
     });
-});
+};
+
+if (input != '-') {
+    fs.readFile(input, 'utf-8', parseLessFile);
+} else {
+    process.stdin.resume();
+    process.stdin.setEncoding('utf8');
+
+    var buffer = '';
+    process.stdin.on('data', function(data) {
+        buffer += data;
+    });
+
+    process.stdin.on('end', function() {
+        parseLessFile(false, buffer);
+    });
+}

data/lib/less/js/build/amd.js

@@ -0,0 +1,6 @@
+// amd.js
+//
+// Define Less as an AMD module.
+if (typeof define === "function" && define.amd) {
+    define("less", [], function () { return less; } );
+}

data/lib/less/js/build/require-rhino.js

@@ -0,0 +1,7 @@
+//
+// Stub out `require` in rhino
+//
+function require(arg) {
+    return less[arg.split('/')[1]];
+};
+