Remove hyphen in coffee-script

Author: GeoffreyBooth

CONTRIBUTING.md

@@ -4,6 +4,6 @@
 
 * Before sending a pull request for a feature, be sure to have [tests](https://github.com/jashkenas/coffeescript/tree/master/test).
 
-* Use the same coding style as the rest of the [codebase](https://github.com/jashkenas/coffeescript/tree/master/src). If you're just getting started with CoffeeScript, there's a nice [style guide](https://github.com/polarmobile/coffeescript-style-guide).
+* Use the same coding style as the rest of the [codebase](https://github.com/jashkenas/coffeescript/tree/master/src). If you’re just getting started with CoffeeScript, there’s a nice [style guide](https://github.com/polarmobile/coffeescript-style-guide).
 
-* In your pull request, do not add documentation to `index.html` or re-build the minified `coffee-script.js` file. We'll do those things before cutting a new release.
+* In your pull request, do not add documentation to `index.html` or re-build the minified `coffeescript.js` file. We’ll do those things before cutting a new release.

Cakefile

@@ -2,8 +2,8 @@ fs                        = require 'fs'
 path                      = require 'path'
 _                         = require 'underscore'
 { spawn, exec, execSync } = require 'child_process'
-CoffeeScript              = require './lib/coffee-script'
-helpers                   = require './lib/coffee-script/helpers'
+CoffeeScript              = require './lib/coffeescript'
+helpers                   = require './lib/coffeescript/helpers'
 
 # ANSI Terminal Colors.
 bold = red = green = reset = ''
@@ -31,7 +31,7 @@ majorVersion = parseInt CoffeeScript.VERSION.split('.')[0], 10
 build = (cb) ->
   files = fs.readdirSync 'src'
   files = ('src/' + file for file in files when file.match(/\.(lit)?coffee$/))
-  run ['-c', '-o', 'lib/coffee-script'].concat(files), cb
+  run ['-c', '-o', 'lib/coffeescript'].concat(files), cb
 
 # Run a CoffeeScript through our node/coffee interpreter.
 run = (args, cb) ->
@@ -49,9 +49,9 @@ option '-p', '--prefix [DIR]', 'set the installation prefix for `cake install`'
 
 task 'install', 'install CoffeeScript into /usr/local (or --prefix)', (options) ->
   base = options.prefix or '/usr/local'
-  lib  = "#{base}/lib/coffee-script"
+  lib  = "#{base}/lib/coffeescript"
   bin  = "#{base}/bin"
-  node = "~/.node_libraries/coffee-script"
+  node = "~/.node_libraries/coffeescript"
   console.log "Installing CoffeeScript to #{lib}"
   console.log "Linking to #{node}"
   console.log "Linking 'coffee' to #{bin}/coffee"
@@ -61,7 +61,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/coffee-script #{node}"
+    "ln -sfn #{lib}/lib/coffeescript #{node}"
   ].join(' && '), (err, stdout, stderr) ->
     if err then console.log stderr.trim() else log 'done', green
   )
@@ -72,7 +72,7 @@ task 'build', 'build the CoffeeScript language from source', build
 task 'build:full', 'rebuild the source twice, and run the tests', ->
   build ->
     build ->
-      csPath = './lib/coffee-script'
+      csPath = './lib/coffeescript'
       csDir  = path.dirname require.resolve csPath
 
       for mod of require.cache when csDir is mod[0 ... csDir.length]
@@ -85,15 +85,15 @@ task 'build:full', 'rebuild the source twice, and run the tests', ->
 task 'build:parser', 'rebuild the Jison parser (run build first)', ->
   helpers.extend global, require 'util'
   require 'jison'
-  parser = require('./lib/coffee-script/grammar').parser.generate()
+  parser = require('./lib/coffeescript/grammar').parser.generate()
   # Patch Jison’s output, until https://github.com/zaach/jison/pull/339 is accepted,
   # to ensure that require('fs') is only called where it exists.
   parser = parser.replace "var source = require('fs')", """
       var source = '';
           var fs = require('fs');
           if (typeof fs !== 'undefined' && fs !== null)
               source = fs"""
-  fs.writeFileSync 'lib/coffee-script/parser.js', parser
+  fs.writeFileSync 'lib/coffeescript/parser.js', parser
 
 
 task 'build:browser', 'rebuild the merged script for inclusion in the browser', ->
@@ -110,11 +110,11 @@ task 'build:browser', 'rebuild the merged script for inclusion in the browser',
         return module.exports;
       })();
     """
-  for name in ['helpers', 'rewriter', 'lexer', 'parser', 'scope', 'nodes', 'sourcemap', 'coffee-script', 'browser']
+  for name in ['helpers', 'rewriter', 'lexer', 'parser', 'scope', 'nodes', 'sourcemap', 'coffeescript', 'browser']
     code += """
       require['./#{name}'] = (function() {
         var exports = {}, module = {exports: exports};
-        #{fs.readFileSync "lib/coffee-script/#{name}.js"}
+        #{fs.readFileSync "lib/coffeescript/#{name}.js"}
         return module.exports;
       })();
     """
@@ -123,7 +123,7 @@ task 'build:browser', 'rebuild the merged script for inclusion in the browser',
       var CoffeeScript = function() {
         function require(path){ return require[path]; }
         #{code}
-        return require['./coffee-script'];
+        return require['./coffeescript'];
       }();
 
       if (typeof define === 'function' && define.amd) {
@@ -141,7 +141,7 @@ task 'build:browser', 'rebuild the merged script for inclusion in the browser',
       ]
   outputFolder = "docs/v#{majorVersion}/browser-compiler"
   fs.mkdirSync outputFolder unless fs.existsSync outputFolder
-  fs.writeFileSync "#{outputFolder}/coffee-script.js", header + '\n' + code
+  fs.writeFileSync "#{outputFolder}/coffeescript.js", header + '\n' + code
   console.log "built ... running browser tests:"
   invoke 'test:browser'
 
@@ -272,8 +272,8 @@ task 'doc:source', 'rebuild the annotated source documentation', ->
 
 
 task 'bench', 'quick benchmark of compilation time', ->
-  {Rewriter} = require './lib/coffee-script/rewriter'
-  sources = ['coffee-script', 'grammar', 'helpers', 'lexer', 'nodes', 'rewriter']
+  {Rewriter} = require './lib/coffeescript/rewriter'
+  sources = ['coffeescript', 'grammar', 'helpers', 'lexer', 'nodes', 'rewriter']
   coffee  = sources.map((name) -> fs.readFileSync "src/#{name}.coffee").join '\n'
   litcoffee = fs.readFileSync("src/scope.litcoffee").toString()
   fmt    = (ms) -> " #{bold}#{ "   #{ms}".slice -4 }#{reset} ms"
@@ -309,7 +309,7 @@ runTests = (CoffeeScript) ->
 
   # Convenience aliases.
   global.CoffeeScript = CoffeeScript
-  global.Repl = require './lib/coffee-script/repl'
+  global.Repl = require './lib/coffeescript/repl'
 
   # Our test helper function for delimiting different test cases.
   global.test = (description, fn) ->
@@ -365,7 +365,7 @@ task 'test', 'run the CoffeeScript language test suite', ->
 
 
 task 'test:browser', 'run the test suite against the merged browser script', ->
-  source = fs.readFileSync "docs/v#{majorVersion}/browser-compiler/coffee-script.js", 'utf-8'
+  source = fs.readFileSync "docs/v#{majorVersion}/browser-compiler/coffeescript.js", 'utf-8'
   result = {}
   global.testingBrowser = yes
   (-> eval source).call result

README.md

@@ -25,10 +25,10 @@ CoffeeScript is a little language that compiles into JavaScript.
 If you have the node package manager, npm, installed:
 
 ```shell
-npm install -g coffee-script
+npm install -g coffeescript
 ```
 
-Leave off the `-g` if you don't wish to install globally. If you don't wish to use npm:
+Leave off the `-g` if you don’t wish to install globally. If you don’t wish to use npm:
 
 ```shell
 git clone https://github.com/jashkenas/coffeescript.git
@@ -53,7 +53,7 @@ For documentation, usage, and examples, see: http://coffeescript.org/
 
 To suggest a feature or report a bug: http://github.com/jashkenas/coffeescript/issues
 
-If you'd like to chat, drop by #coffeescript on Freenode IRC.
+If you’d like to chat, drop by #coffeescript on Freenode IRC.
 
 The source repository: https://github.com/jashkenas/coffeescript.git
 

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 + '/coffee-script/cake').run();
+require(lib + '/coffeescript/cake').run();

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 + '/coffee-script/command').run();
+require(lib + '/coffeescript/command').run();

bower.json

@@ -1,7 +1,7 @@
 {
-  "name": "coffee-script",
+  "name": "coffeescript",
   "main": [
-    "lib/coffee-script/coffee-script.js"
+    "lib/coffeescript/coffeescript.js"
   ],
   "description": "Unfancy JavaScript",
   "keywords": [

docs/v2/annotated-source/browser.html

@@ -30,8 +30,8 @@
                 </a>
 
 
-                <a class="source" href="coffee-script.html">
-                  coffee-script.coffee
+                <a class="source" href="coffeescript.html">
+                  coffeescript.coffee
                 </a>
 
 
@@ -123,7 +123,7 @@ <h1>browser.coffee</h1>
             </div>
 
             <div class="content"><div class='highlight'><pre>
-CoffeeScript = <span class="hljs-built_in">require</span> <span class="hljs-string">'./coffee-script'</span>
+CoffeeScript = <span class="hljs-built_in">require</span> <span class="hljs-string">'./coffeescript'</span>
 CoffeeScript.<span class="hljs-built_in">require</span> = <span class="hljs-built_in">require</span>
 compile = CoffeeScript.compile</pre></div></div>
 

docs/v2/annotated-source/cake.html

@@ -30,8 +30,8 @@
                 </a>
 
 
-                <a class="source" href="coffee-script.html">
-                  coffee-script.coffee
+                <a class="source" href="coffeescript.html">
+                  coffeescript.coffee
                 </a>
 
 
@@ -141,7 +141,7 @@ <h1>cake.coffee</h1>
 path         = <span class="hljs-built_in">require</span> <span class="hljs-string">'path'</span>
 helpers      = <span class="hljs-built_in">require</span> <span class="hljs-string">'./helpers'</span>
 optparse     = <span class="hljs-built_in">require</span> <span class="hljs-string">'./optparse'</span>
-CoffeeScript = <span class="hljs-built_in">require</span> <span class="hljs-string">'./coffee-script'</span></pre></div></div>
+CoffeeScript = <span class="hljs-built_in">require</span> <span class="hljs-string">'./coffeescript'</span></pre></div></div>
 
         </li>
 

docs/v2/annotated-source/coffee-script.html docs/v2/annotated-source/coffeescript.html

@@ -2,7 +2,7 @@
 
 <html>
 <head>
-  <title>coffee-script.coffee</title>
+  <title>coffeescript.coffee</title>
   <meta http-equiv="content-type" content="text/html; charset=UTF-8">
   <meta name="viewport" content="width=device-width, target-densitydpi=160dpi, initial-scale=1.0; maximum-scale=1.0; user-scalable=0;">
   <link rel="stylesheet" media="all" href="docco.css" />
@@ -30,8 +30,8 @@
                 </a>
 
 
-                <a class="source" href="coffee-script.html">
-                  coffee-script.coffee
+                <a class="source" href="coffeescript.html">
+                  coffeescript.coffee
                 </a>
 
 
@@ -103,7 +103,7 @@
 
           <li id="title">
               <div class="annotation">
-                  <h1>coffee-script.coffee</h1>
+                  <h1>coffeescript.coffee</h1>
               </div>
           </li>
 
@@ -141,7 +141,7 @@ <h1>coffee-script.coffee</h1>
                 <a class="pilcrow" href="#section-2">&#182;</a>
               </div>
               <p>Require <code>package.json</code>, which is two levels above this file, as this file is
-evaluated from <code>lib/coffee-script</code>.</p>
+evaluated from <code>lib/coffeescript</code>.</p>
 
             </div>
 
@@ -668,7 +668,7 @@ <h1>coffee-script.coffee</h1>
   <span class="hljs-keyword">for</span> ext <span class="hljs-keyword">in</span> @FILE_EXTENSIONS <span class="hljs-keyword">then</span> <span class="hljs-keyword">do</span> (ext) -&gt;
     <span class="hljs-built_in">require</span>.extensions[ext] ?= <span class="hljs-function">-&gt;</span>
       <span class="hljs-keyword">throw</span> <span class="hljs-keyword">new</span> Error <span class="hljs-string">"""
-      Use CoffeeScript.register() or require the coffee-script/register module to require <span class="hljs-subst">#{ext}</span> files.
+      Use CoffeeScript.register() or require the coffeescript/register module to require <span class="hljs-subst">#{ext}</span> files.
       """</span>
 
 exports._compileFile = <span class="hljs-function"><span class="hljs-params">(filename, sourceMap = <span class="hljs-literal">no</span>, inlineMap = <span class="hljs-literal">no</span>)</span> -&gt;</span>

docs/v2/annotated-source/command.html

@@ -30,8 +30,8 @@
                 </a>
 
 
-                <a class="source" href="coffee-script.html">
-                  coffee-script.coffee
+                <a class="source" href="coffeescript.html">
+                  coffeescript.coffee
                 </a>
 
 
@@ -140,7 +140,7 @@ <h1>command.coffee</h1>
 path           = <span class="hljs-built_in">require</span> <span class="hljs-string">'path'</span>
 helpers        = <span class="hljs-built_in">require</span> <span class="hljs-string">'./helpers'</span>
 optparse       = <span class="hljs-built_in">require</span> <span class="hljs-string">'./optparse'</span>
-CoffeeScript   = <span class="hljs-built_in">require</span> <span class="hljs-string">'./coffee-script'</span>
+CoffeeScript   = <span class="hljs-built_in">require</span> <span class="hljs-string">'./coffeescript'</span>
 {spawn, exec}  = <span class="hljs-built_in">require</span> <span class="hljs-string">'child_process'</span>
 {EventEmitter} = <span class="hljs-built_in">require</span> <span class="hljs-string">'events'</span>
 
@@ -214,7 +214,7 @@ <h1>command.coffee</h1>
   [<span class="hljs-string">'-p'</span>, <span class="hljs-string">'--print'</span>,           <span class="hljs-string">'print out the compiled JavaScript'</span>]
   [<span class="hljs-string">'-r'</span>, <span class="hljs-string">'--require [MODULE*]'</span>, <span class="hljs-string">'require the given module before eval or REPL'</span>]
   [<span class="hljs-string">'-s'</span>, <span class="hljs-string">'--stdio'</span>,           <span class="hljs-string">'listen for and compile scripts over stdio'</span>]
-  [<span class="hljs-string">'-l'</span>, <span class="hljs-string">'--literate'</span>,        <span class="hljs-string">'treat stdio as literate style coffee-script'</span>]
+  [<span class="hljs-string">'-l'</span>, <span class="hljs-string">'--literate'</span>,        <span class="hljs-string">'treat stdio as literate style coffeescript'</span>]
   [<span class="hljs-string">'-t'</span>, <span class="hljs-string">'--tokens'</span>,          <span class="hljs-string">'print out the tokens that the lexer/rewriter produce'</span>]
   [<span class="hljs-string">'-v'</span>, <span class="hljs-string">'--version'</span>,         <span class="hljs-string">'display the version number'</span>]
   [<span class="hljs-string">'-w'</span>, <span class="hljs-string">'--watch'</span>,           <span class="hljs-string">'watch scripts for changes and rerun commands'</span>]

docs/v2/annotated-source/grammar.html

@@ -30,8 +30,8 @@
                 </a>
 
 
-                <a class="source" href="coffee-script.html">
-                  coffee-script.coffee
+                <a class="source" href="coffeescript.html">
+                  coffeescript.coffee
                 </a>
 
 

docs/v2/annotated-source/helpers.html

@@ -30,8 +30,8 @@
                 </a>
 
 
-                <a class="source" href="coffee-script.html">
-                  coffee-script.coffee
+                <a class="source" href="coffeescript.html">
+                  coffeescript.coffee
                 </a>
 
 

docs/v2/annotated-source/index.html

@@ -30,8 +30,8 @@
                 </a>
 
 
-                <a class="source" href="coffee-script.html">
-                  coffee-script.coffee
+                <a class="source" href="coffeescript.html">
+                  coffeescript.coffee
                 </a>
 
 
@@ -119,7 +119,7 @@ <h1>index.coffee</h1>
 
             </div>
 
-            <div class="content"><div class='highlight'><pre>exports[key] = val <span class="hljs-keyword">for</span> key, val <span class="hljs-keyword">of</span> <span class="hljs-built_in">require</span> <span class="hljs-string">'./coffee-script'</span></pre></div></div>
+            <div class="content"><div class='highlight'><pre>exports[key] = val <span class="hljs-keyword">for</span> key, val <span class="hljs-keyword">of</span> <span class="hljs-built_in">require</span> <span class="hljs-string">'./coffeescript'</span></pre></div></div>
 
         </li>
 

docs/v2/annotated-source/lexer.html

@@ -30,8 +30,8 @@
                 </a>
 
 
-                <a class="source" href="coffee-script.html">
-                  coffee-script.coffee
+                <a class="source" href="coffeescript.html">
+                  coffeescript.coffee
                 </a>
 
 
@@ -122,7 +122,7 @@ <h1>lexer.coffee</h1>
 <pre><code>[tag, value, locationData]
 </code></pre><p>where locationData is {first_line, first_column, last_line, last_column}, which is a
 format that can be fed directly into <a href="http://github.com/zaach/jison">Jison</a>.  These
-are read by jison in the <code>parser.lexer</code> function defined in coffee-script.coffee.</p>
+are read by jison in the <code>parser.lexer</code> function defined in coffeescript.coffee.</p>
 
             </div>
 

docs/v2/annotated-source/nodes.html

@@ -30,8 +30,8 @@
                 </a>
 
 
-                <a class="source" href="coffee-script.html">
-                  coffee-script.coffee
+                <a class="source" href="coffeescript.html">
+                  coffeescript.coffee
                 </a>
 
 

docs/v2/annotated-source/optparse.html

@@ -30,8 +30,8 @@
                 </a>
 
 
-                <a class="source" href="coffee-script.html">
-                  coffee-script.coffee
+                <a class="source" href="coffeescript.html">
+                  coffeescript.coffee
                 </a>