tefla
diff --git a/‎lib/coffee-script/command.js‎
Lines changed: 20 additions & 2 deletions b/‎lib/coffee-script/command.js‎
Lines changed: 20 additions & 2 deletions
diff --git a/‎lib/coffee-script/repl.js‎
Lines changed: 14 additions & 4 deletions b/‎lib/coffee-script/repl.js‎
Lines changed: 14 additions & 4 deletions
diff --git a/‎src/command.coffee‎
Lines changed: 11 additions & 0 deletions b/‎src/command.coffee‎
Lines changed: 11 additions & 0 deletions
diff --git a/‎src/repl.coffee‎
Lines changed: 8 additions & 5 deletions b/‎src/repl.coffee‎
Lines changed: 8 additions & 5 deletions
@@ -44,6 +44,7 @@ SWITCHES = [
   [      '--no-header',       'suppress the "Generated by" header']
   ['-o', '--output [DIR]',    'set the output directory for compiled JavaScript']
   ['-p', '--print',           'print out the compiled JavaScript']
+  ['-r', '--require [MODULE*]', 'require the given module before eval or REPL']
   ['-s', '--stdio',           'listen for and compile scripts over stdio']
   ['-l', '--literate',        'treat stdio as literate style coffee-script']
   ['-t', '--tokens',          'print out the tokens that the lexer/rewriter produce']
@@ -69,6 +70,8 @@ exports.run = ->
   # `node` REPL CLI and, therefore, (b) make packages that modify native prototypes
   # (such as 'colors' and 'sugar') work as expected.
   replCliOpts = useGlobal: yes
+  opts.prelude = makePrelude opts.require       if opts.require
+  replCliOpts.prelude = opts.prelude
   return forkNode()                             if opts.nodejs
   return usage()                                if opts.help
   return version()                              if opts.version
@@ -101,6 +104,13 @@ exports.run = ->
     source = path.resolve source
     compilePath source, yes, source
 
+makePrelude = (requires) ->
+  requires.map (module) ->
+    [_, name, module] = match if match = module.match(/^(.*)=(.*)$/)
+    name ||= helpers.baseFileName module, yes, useWinPathSep
+    "#{name} = require('#{module}')"
+  .join ';'
+
 # Compile a path, which could be a script or a directory. If a directory
 # is passed, recursively compile all '.coffee', '.litcoffee', and '.coffee.md'
 # extension source files in it and all subdirectories.
@@ -167,6 +177,7 @@ compileScript = (file, input, base = null) ->
       printLine CoffeeScript.nodes(t.input, t.options).toString().trim()
     else if o.run
       CoffeeScript.register()
+      CoffeeScript.eval opts.prelude, t.options if opts.prelude
       CoffeeScript.run t.input, t.options
     else if o.join and t.file isnt o.join
       t.input = helpers.invertLiterate t.input if helpers.isLiterate file
 
@@ -33,16 +33,18 @@ replDefaults =
         new Assign (new Value new Literal '_'), ast, '='
       ]
       js = ast.compile {bare: yes, locals: Object.keys(context), referencedVars}
-      result = if context is global
-        vm.runInThisContext js, filename
-      else
-        vm.runInContext js, context, filename
-      cb null, result
+      cb null, runInContext js, context, filename
     catch err
       # AST's `compile` does not add source code information to syntax errors.
       updateSyntaxError err, input
       cb err
 
+runInContext = (js, context, filename) ->
+  if context is global
+    vm.runInThisContext js, filename
+  else
+    vm.runInContext js, context, filename
+
 addMultilineHandler = (repl) ->
   {rli, inputStream, outputStream} = repl
   # Node 0.11.12 changed API, prompt is now _prompt.
@@ -149,6 +151,7 @@ module.exports =
     process.argv = ['coffee'].concat process.argv[2..]
     opts = merge replDefaults, opts
     repl = nodeREPL.start opts
+    runInContext opts.prelude, repl.context, 'prelude' if opts.prelude
     repl.on 'exit', -> repl.outputStream.write '\n'
     addMultilineHandler repl
     addHistory repl, opts.historyFile, opts.historyMaxInputSize if opts.historyFile