From ab17f4165230eb33d6d75c9ddcae82450b87b934 Mon Sep 17 00:00:00 2001 From: gfxmonk Date: Tue, 5 Jul 2011 21:58:04 +1000 Subject: [PATCH] Moved src/*.coffee under src/coffee-script/ so that lib can be added to $NODE_PATH and only expose the top-level coffee-script namespace. Fixes #1246 --- Cakefile | 22 ++++++++++---------- bin/cake | 2 +- bin/coffee | 2 +- lib/{ => coffee-script}/browser.js | 0 lib/{ => coffee-script}/cake.js | 0 lib/{ => coffee-script}/coffee-script.js | 0 lib/{ => coffee-script}/command.js | 0 lib/{ => coffee-script}/grammar.js | 0 lib/{ => coffee-script}/helpers.js | 0 lib/{ => coffee-script}/index.js | 0 lib/{ => coffee-script}/lexer.js | 0 lib/{ => coffee-script}/nodes.js | 0 lib/{ => coffee-script}/optparse.js | 0 lib/{ => coffee-script}/parser.js | 0 lib/{ => coffee-script}/repl.js | 0 lib/{ => coffee-script}/rewriter.js | 0 lib/{ => coffee-script}/scope.js | 0 package.json | 4 ++-- src/{ => coffee-script}/browser.coffee | 0 src/{ => coffee-script}/cake.coffee | 0 src/{ => coffee-script}/coffee-script.coffee | 0 src/{ => coffee-script}/command.coffee | 0 src/{ => coffee-script}/grammar.coffee | 0 src/{ => coffee-script}/helpers.coffee | 0 src/{ => coffee-script}/index.coffee | 0 src/{ => coffee-script}/lexer.coffee | 0 src/{ => coffee-script}/nodes.coffee | 0 src/{ => coffee-script}/optparse.coffee | 0 src/{ => coffee-script}/repl.coffee | 0 src/{ => coffee-script}/rewriter.coffee | 0 src/{ => coffee-script}/scope.coffee | 0 test/option_parser.coffee | 2 +- 32 files changed, 16 insertions(+), 16 deletions(-) rename lib/{ => coffee-script}/browser.js (100%) rename lib/{ => coffee-script}/cake.js (100%) mode change 100755 => 100644 rename lib/{ => coffee-script}/coffee-script.js (100%) mode change 100755 => 100644 rename lib/{ => coffee-script}/command.js (100%) rename lib/{ => coffee-script}/grammar.js (100%) rename lib/{ => coffee-script}/helpers.js (100%) rename lib/{ => coffee-script}/index.js (100%) rename lib/{ => coffee-script}/lexer.js (100%) rename lib/{ => coffee-script}/nodes.js (100%) rename lib/{ => coffee-script}/optparse.js (100%) mode change 100755 => 100644 rename lib/{ => coffee-script}/parser.js (100%) rename lib/{ => coffee-script}/repl.js (100%) rename lib/{ => coffee-script}/rewriter.js (100%) rename lib/{ => coffee-script}/scope.js (100%) rename src/{ => coffee-script}/browser.coffee (100%) rename src/{ => coffee-script}/cake.coffee (100%) rename src/{ => coffee-script}/coffee-script.coffee (100%) rename src/{ => coffee-script}/command.coffee (100%) rename src/{ => coffee-script}/grammar.coffee (100%) rename src/{ => coffee-script}/helpers.coffee (100%) rename src/{ => coffee-script}/index.coffee (100%) rename src/{ => coffee-script}/lexer.coffee (100%) rename src/{ => coffee-script}/nodes.coffee (100%) rename src/{ => coffee-script}/optparse.coffee (100%) rename src/{ => coffee-script}/repl.coffee (100%) rename src/{ => coffee-script}/rewriter.coffee (100%) rename src/{ => coffee-script}/scope.coffee (100%) diff --git a/Cakefile b/Cakefile index 72842703..3b9de2f6 100644 --- a/Cakefile +++ b/Cakefile @@ -1,6 +1,6 @@ fs = require 'fs' path = require 'path' -{extend} = require './lib/helpers' +{extend} = require './lib/coffee-script/helpers' CoffeeScript = require './lib/coffee-script' {spawn, exec} = require 'child_process' @@ -22,10 +22,11 @@ header = """ """ sources = [ - 'src/coffee-script.coffee', 'src/grammar.coffee' - 'src/helpers.coffee', 'src/lexer.coffee', 'src/nodes.coffee' - 'src/rewriter.coffee', 'src/scope.coffee' -] + 'coffee-script.coffee', 'grammar.coffee' + 'helpers.coffee', 'lexer.coffee', 'nodes.coffee' + 'rewriter.coffee', 'scope.coffee' +].map (filename) -> + 'src/coffee-script/' + filename # Run a CoffeeScript through our node/coffee interpreter. run = (args) -> @@ -53,7 +54,7 @@ task 'install', 'install CoffeeScript into /usr/local (or --prefix)', (options) "ln -sfn #{lib}/bin/coffee #{bin}/coffee" "ln -sfn #{lib}/bin/cake #{bin}/cake" "mkdir -p ~/.node_libraries" - "ln -sfn #{lib}/lib #{node}" + "ln -sfn #{lib}/lib/coffee-script #{node}" ].join(' && '), (err, stdout, stderr) -> if err then console.log stderr.trim() else log 'done', green ) @@ -61,8 +62,7 @@ task 'install', 'install CoffeeScript into /usr/local (or --prefix)', (options) task 'build', 'build the CoffeeScript language from source', -> files = fs.readdirSync 'src' - files = ('src/' + file for file in files when file.match(/\.coffee$/)) - run ['-c', '-o', 'lib'].concat(files) + run ['-c', '-o', 'lib', 'src'] task 'build:full', 'rebuild the source twice, and run the tests', -> @@ -91,7 +91,7 @@ task 'build:browser', 'rebuild the merged script for inclusion in the browser', code += """ require['./#{name}'] = new function() { var exports = this; - #{fs.readFileSync "lib/#{name}.js"} + #{fs.readFileSync "lib/coffee-script/#{name}.js"} }; """ code = """ @@ -115,7 +115,7 @@ task 'doc:site', 'watch and continually rebuild the documentation for the websit task 'doc:source', 'rebuild the internal documentation', -> - exec 'docco src/*.coffee && cp -rf docs documentation && rm -r docs', (err) -> + exec 'docco src/coffee-script/*.coffee && cp -rf docs documentation && rm -r docs', (err) -> throw err if err @@ -124,7 +124,7 @@ task 'doc:underscore', 'rebuild the Underscore.coffee documentation page', -> throw err if err task 'bench', 'quick benchmark of compilation time', -> - {Rewriter} = require './lib/rewriter' + {Rewriter} = require './lib/coffee-script/rewriter' co = sources.map((name) -> fs.readFileSync name).join '\n' fmt = (ms) -> " #{bold}#{ " #{ms}".slice -4 }#{reset} ms" total = 0 diff --git a/bin/cake b/bin/cake index e92e7523..5965f4ee 100755 --- a/bin/cake +++ b/bin/cake @@ -4,4 +4,4 @@ var path = require('path'); var fs = require('fs'); var lib = path.join(path.dirname(fs.realpathSync(__filename)), '../lib'); -require(lib + '/cake').run(); +require(lib + '/coffee-script/cake').run(); diff --git a/bin/coffee b/bin/coffee index 4dc0a5ec..3d1d71c8 100755 --- a/bin/coffee +++ b/bin/coffee @@ -4,4 +4,4 @@ var path = require('path'); var fs = require('fs'); var lib = path.join(path.dirname(fs.realpathSync(__filename)), '../lib'); -require(lib + '/command').run(); +require(lib + '/coffee-script/command').run(); diff --git a/lib/browser.js b/lib/coffee-script/browser.js similarity index 100% rename from lib/browser.js rename to lib/coffee-script/browser.js diff --git a/lib/cake.js b/lib/coffee-script/cake.js old mode 100755 new mode 100644 similarity index 100% rename from lib/cake.js rename to lib/coffee-script/cake.js diff --git a/lib/coffee-script.js b/lib/coffee-script/coffee-script.js old mode 100755 new mode 100644 similarity index 100% rename from lib/coffee-script.js rename to lib/coffee-script/coffee-script.js diff --git a/lib/command.js b/lib/coffee-script/command.js similarity index 100% rename from lib/command.js rename to lib/coffee-script/command.js diff --git a/lib/grammar.js b/lib/coffee-script/grammar.js similarity index 100% rename from lib/grammar.js rename to lib/coffee-script/grammar.js diff --git a/lib/helpers.js b/lib/coffee-script/helpers.js similarity index 100% rename from lib/helpers.js rename to lib/coffee-script/helpers.js diff --git a/lib/index.js b/lib/coffee-script/index.js similarity index 100% rename from lib/index.js rename to lib/coffee-script/index.js diff --git a/lib/lexer.js b/lib/coffee-script/lexer.js similarity index 100% rename from lib/lexer.js rename to lib/coffee-script/lexer.js diff --git a/lib/nodes.js b/lib/coffee-script/nodes.js similarity index 100% rename from lib/nodes.js rename to lib/coffee-script/nodes.js diff --git a/lib/optparse.js b/lib/coffee-script/optparse.js old mode 100755 new mode 100644 similarity index 100% rename from lib/optparse.js rename to lib/coffee-script/optparse.js diff --git a/lib/parser.js b/lib/coffee-script/parser.js similarity index 100% rename from lib/parser.js rename to lib/coffee-script/parser.js diff --git a/lib/repl.js b/lib/coffee-script/repl.js similarity index 100% rename from lib/repl.js rename to lib/coffee-script/repl.js diff --git a/lib/rewriter.js b/lib/coffee-script/rewriter.js similarity index 100% rename from lib/rewriter.js rename to lib/coffee-script/rewriter.js diff --git a/lib/scope.js b/lib/coffee-script/scope.js similarity index 100% rename from lib/scope.js rename to lib/coffee-script/scope.js diff --git a/package.json b/package.json index c292fc7d..8ebe8642 100644 --- a/package.json +++ b/package.json @@ -12,9 +12,9 @@ "node": ">=0.2.5" }, "directories" : { - "lib" : "./lib" + "lib" : "./lib/coffee-script" }, - "main" : "./lib/coffee-script", + "main" : "./lib/coffee-script/coffee-script", "bin": { "coffee": "./bin/coffee", "cake": "./bin/cake" diff --git a/src/browser.coffee b/src/coffee-script/browser.coffee similarity index 100% rename from src/browser.coffee rename to src/coffee-script/browser.coffee diff --git a/src/cake.coffee b/src/coffee-script/cake.coffee similarity index 100% rename from src/cake.coffee rename to src/coffee-script/cake.coffee diff --git a/src/coffee-script.coffee b/src/coffee-script/coffee-script.coffee similarity index 100% rename from src/coffee-script.coffee rename to src/coffee-script/coffee-script.coffee diff --git a/src/command.coffee b/src/coffee-script/command.coffee similarity index 100% rename from src/command.coffee rename to src/coffee-script/command.coffee diff --git a/src/grammar.coffee b/src/coffee-script/grammar.coffee similarity index 100% rename from src/grammar.coffee rename to src/coffee-script/grammar.coffee diff --git a/src/helpers.coffee b/src/coffee-script/helpers.coffee similarity index 100% rename from src/helpers.coffee rename to src/coffee-script/helpers.coffee diff --git a/src/index.coffee b/src/coffee-script/index.coffee similarity index 100% rename from src/index.coffee rename to src/coffee-script/index.coffee diff --git a/src/lexer.coffee b/src/coffee-script/lexer.coffee similarity index 100% rename from src/lexer.coffee rename to src/coffee-script/lexer.coffee diff --git a/src/nodes.coffee b/src/coffee-script/nodes.coffee similarity index 100% rename from src/nodes.coffee rename to src/coffee-script/nodes.coffee diff --git a/src/optparse.coffee b/src/coffee-script/optparse.coffee similarity index 100% rename from src/optparse.coffee rename to src/coffee-script/optparse.coffee diff --git a/src/repl.coffee b/src/coffee-script/repl.coffee similarity index 100% rename from src/repl.coffee rename to src/coffee-script/repl.coffee diff --git a/src/rewriter.coffee b/src/coffee-script/rewriter.coffee similarity index 100% rename from src/rewriter.coffee rename to src/coffee-script/rewriter.coffee diff --git a/src/scope.coffee b/src/coffee-script/scope.coffee similarity index 100% rename from src/scope.coffee rename to src/coffee-script/scope.coffee diff --git a/test/option_parser.coffee b/test/option_parser.coffee index 07c74323..eef1fd08 100644 --- a/test/option_parser.coffee +++ b/test/option_parser.coffee @@ -5,7 +5,7 @@ # Ensure that the OptionParser handles arguments correctly. return unless require? -{OptionParser} = require './../lib/optparse' +{OptionParser} = require './../lib/coffee-script/optparse' opt = new OptionParser [ ['-r', '--required [DIR]', 'desc required']