CLI wasn't wired up correctly

bin/ark

@@ -1,3 +1,3 @@
 #!/usr/bin/env node
 
-require("../js/cli")
+require("../lib/cli")

package.json

@@ -1,6 +1,6 @@
 {
   "name": "ark",
-  "version": "0.3.0",
+  "version": "0.3.1",
   "description": "Packages code for the browser as Node modules.",
   "main": "lib/ark.js",
   "bin": {

src/ark.coffee

@@ -363,9 +363,4 @@ Ark =
     else
       beautify code index options.manifest
 
-# We wrap the subcommand functions in fibers so we can use fibers within the
-# implementation.
-Ark.manifest = run_as_fiber Ark.manifest
-Ark.package = run_as_fiber Ark.package
-
 module.exports = Ark

src/cli.coffee

@@ -26,6 +26,18 @@ usage = read("#{__dirname}/../doc/USAGE")
 # Optimist gives us a simple interface for handling CLI arguments.
 Optimist = require "optimist"
 
+# We use fibers to make `glob` synchronous - see below.
+Fibers = require "fibers"
+Future = require "fibers/future"
+
+# Take any function and run it as a fiber. 
+run_as_fiber = (fn) ->
+  ->
+    _arguments = arguments
+    Fiber( -> fn(_arguments...) ).run()
+
+
+
 # ## Local Modules
 
 # The subcommands are actually implemented in the [ark][] source file.
@@ -80,17 +92,21 @@ options =
   minify: argv.m or argv.minify
   extensions: argv.x or argv.extensions
 
-# Ff a source directory is specified, use that; otherwise assume we'll read
-# the manifest from stdin.
-options.manifest = (JSON.parse readStream process.stdin) unless options.source?
 
-# By default, we handle JavaScript, JSON, and CoffeeScript files. Presently,
-# this only affects the `manifest` subcommand when you're not using the
-# `--static` option.
-options.extensions ?= "js,json,coffee"
+(Fiber ->
+
+  # Ff a source directory is specified, use that; otherwise assume we'll read
+  # the manifest from stdin.
+  options.manifest = (JSON.parse readStream process.stdin) unless options.source?
+
+  # By default, we handle JavaScript, JSON, and CoffeeScript files. Presently,
+  # this only affects the `manifest` subcommand when you're not using the
+  # `--static` option.
+  options.extensions ?= "js,json,coffee"
 
-# Run the subcommand using the options given.
-try 
-  print Ark[command](options)
-catch e
-  error(e.message)
+  # Run the subcommand using the options given.
+  try 
+    print Ark[command](options)
+  catch e
+    error(e.message)
+).run()