node-compiler 0.9.0 → 0.9.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: ba7237399914c484e9ad83b77881357e88bce4b9
-  data.tar.gz: cf0362eb82e828e0d6e28324cddc812fa0338292
+  metadata.gz: '0448142c436bce1aa6fe2f6cae84516e1f902f24'
+  data.tar.gz: d93fbc33a3f1ca6c7ec0be6b7b16bf864b760143
 SHA512:
-  metadata.gz: 2ec3eb4014f60a14eb1f5ba33ed15c6deffc13dec4d036990de49660a273bf8d7afa614bbb45708086265d03416ce8f66e07e4ac3825b14c4f61206d08e954e9
-  data.tar.gz: 8cdcca45087752c5ba9ee6ca1b62daf523ce3268b5e5c6dd121065870ebaf193c6cefb6d9df86e4d6e4299a40143eb64877f0dd33d70b9233d475d390b5e816c
+  metadata.gz: b0982b49648f1a1e3abf42807964132a08be86a2a9d42640746364846423a915ffa03328cffb935c43141e6a07b853fde9057ac9d6b0ba6fb9d5854674881089
+  data.tar.gz: b7678b959d132e6ba5038613260775578d26bf2fcde7f0cfca8b788c1982870b1c08661a37e5f5260a8987b6d71004ecec08b199e0032e15d042a10d76dbeb66

data/.gitignore

@@ -5,4 +5,4 @@ enclose_io_entrance.js
 __enclose_io_memfs__/
 enclose_io_manifest.txt
 /coverage/
-
+/a.out

data/.travis.yml

@@ -8,10 +8,6 @@ os:
   - linux
   - osx
 
-env:
-  global:
-    - ENCLOSE_IO_MAKE_ARGS="-j4 V="
-
 compiler:
   - gcc
   - clang
@@ -19,4 +15,4 @@ compiler:
 script:
   - gem install bundler --no-ri --no-rdoc
   - bundle
-  - ENCLOSE_IO_MAKE_ARGS="-j4 V=" bundle exec rake
+  - bundle exec rake

data/CHANGELOG.md

@@ -1,15 +1,22 @@
 # Node.js Compiler Changelog
 
+## v0.9.1
+
+* add support to pack an entire Node.js project (e.g. nodeclub)
+* change the usage of the `nodec` command
+* stop polluting the vendor directory of nodec itself
+* upgrade to node-v7.3.0
+
 ## v0.9.0
 
 * let `enclose_io_memfs_exist_dir` and `enclose_io_memfs_readdir` fail fast
-* upgrade to node-v7.2.1
+* upgrade the runtime to node-v7.2.1
 * make `ENCLOSE_IO_USE_ORIGINAL_NODE` non-contagious
 
 ## v0.8.0
 
-* upgrade to node-v7.2.0: https://github.com/enclose-io/node-compiler/pull/12
-* remove node_version: https://github.com/enclose-io/node-compiler/pull/13
+* upgrade the runtime to node-v7.2.0: https://github.com/pmq20/node-compiler/pull/12
+* remove node_version: https://github.com/pmq20/node-compiler/pull/13
 
 ## v0.7.0
 
@@ -18,15 +25,15 @@
 
 ## v0.6.0
 
-* hack spawn and spawnSync: https://github.com/enclose-io/compiler/pull/10
-* hack fs.stat, fs.watch, fs.watchFile: https://github.com/enclose-io/compiler/pull/11
+* hack spawn and spawnSync: https://github.com/pmq20/compiler/pull/10
+* hack fs.stat, fs.watch, fs.watchFile: https://github.com/pmq20/compiler/pull/11
 
 ## v0.5.0
 
-* Use node_javascript.cc and js2c.py from v6: https://github.com/enclose-io/compiler/commit/48428dd8e3ce12f6f001c5190c00965a5c696290
-* resume using `__enclose_io_fork__`: https://github.com/enclose-io/compiler/commit/80e963f56e6688621d8e129761d4dd3dd52c5707
-* Upgrade node v7.0.0 to node v7.1.0: https://github.com/enclose-io/compiler/pull/9
-* unshift slash into MEMFS: https://github.com/enclose-io/compiler/pull/8
-* Hack fs.readdir and fs.readdirSync: https://github.com/enclose-io/compiler/pull/7
-* Hack fs.readFile: https://github.com/enclose-io/compiler/pull/4
-* Prefer ENCLOSE_IO_USE_ORIGINAL_NODE to `__enclose_io_fork__`: https://github.com/enclose-io/compiler/pull/3
+* use node_javascript.cc and js2c.py from v6: https://github.com/pmq20/compiler/commit/48428dd8e3ce12f6f001c5190c00965a5c696290
+* resume using `__enclose_io_fork__`: https://github.com/pmq20/compiler/commit/80e963f56e6688621d8e129761d4dd3dd52c5707
+* upgrade the runtime to node v7.0.0 to node v7.1.0: https://github.com/pmq20/compiler/pull/9
+* unshift slash into MEMFS: https://github.com/pmq20/compiler/pull/8
+* hack fs.readdir and fs.readdirSync: https://github.com/pmq20/compiler/pull/7
+* hack fs.readFile: https://github.com/pmq20/compiler/pull/4
+* prefer ENCLOSE_IO_USE_ORIGINAL_NODE to `__enclose_io_fork__`: https://github.com/pmq20/compiler/pull/3

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    node-compiler (0.9.0)
+    node-compiler (0.9.1)
 
 GEM
   remote: https://rubygems.org/
@@ -13,7 +13,7 @@ GEM
       coderay (~> 1.1.0)
       method_source (~> 0.8.1)
       slop (~> 3.4)
-    rake (11.3.0)
+    rake (12.0.0)
     rspec (3.5.0)
       rspec-core (~> 3.5.0)
       rspec-expectations (~> 3.5.0)

data/LICENSE

@@ -1,6 +1,6 @@
 MIT License
 
-Copyright (c) 2016 Node.js Compiler contributors
+Copyright (c) 2016-2017 Minqi Pan
 
 Permission is hereby granted, free of charge, to any person obtaining a copy
 of this software and associated documentation files (the "Software"), to deal

data/README.md

@@ -1,49 +1,49 @@
 # Node.js Compiler
 
-Compiler for Node.js which compiles your app into a single executable.
+Compiler for Node.js which compiles your project into a single executable.
 
-http://nodec.enclose.io
-
-[![Linux and Mac OS X Build Status](https://travis-ci.org/enclose-io/node-compiler.svg?branch=master)](https://travis-ci.org/enclose-io/node-compiler)
-[![Windows Build status](https://ci.appveyor.com/api/projects/status/f4x3bq5hub3uu3ys/branch/master?svg=true)](https://ci.appveyor.com/project/pmq20/node-compiler/branch/master)
-[![Gem Version](https://badge.fury.io/rb/node-compiler.svg)](https://badge.fury.io/rb/node-compiler)
+[![Linux and Mac OS X Build Status](https://travis-ci.org/pmq20/node-compiler.svg?branch=master)](https://travis-ci.org/pmq20/node-compiler)
+[![Windows Build status](https://ci.appveyor.com/api/projects/status/gap9xne0rayjtynp/branch/master?svg=true)](https://ci.appveyor.com/project/pmq20/node-compiler/branch/master)
 
 ## Installation
 
-Add this line to your application's Gemfile:
-
-```ruby
-gem 'node-compiler'
-```
-
-And then execute:
-
-    $ bundle
+    gem install node-compiler
 
-Or install it yourself as:
+You might need to `sudo` if prompted with no-permission errors.
 
-    $ gem install node-compiler
+## Usage
 
+    nodec [OPTION]... [ENTRANCE]
+        -p, --project-root=DIR           Speicifies the path to the root of the project
+        -o, --output=FILE                Speicifies the path of the output file (default: ./a.out or ./a.exe)
+        -d, --tmpdir=DIR                 Speicifies the directory for temporary files
+            --make-args=ARGS             Passes extra arguments to make
+            --vcbuild-args=ARGS          Passes extra arguments to vcbuild.bat
+            --npm-package=NAME           Compiles the specified npm package
+            --npm-package-version=VER    Compiles the specified version of the npm package
+        -v, --version                    Prints the version of nodec and exit
+            --node-version               Prints the version of the Node.js runtime and exit
+        -h, --help                       Prints this help and exit
 
-## Usage
+## Examples
 
-    nodec [module_name] [module_version] [bin_name] [output_path]
+### Compiling a CLI project
 
-## Example
+    git clone https://github.com/jashkenas/coffeescript.git
+    cd coffeescript
+    npm install
+    nodec bin/coffee
 
-    nodec coffee-script 1.11.1 coffee coffee-1.11.1-darwin-x64
+### Compiling a web application
 
-Then the compiled product will be located at `./coffee-1.11.1-darwin-x64`, ready to be distributed.
+    git clone https://github.com/cnodejs/nodeclub.git
+    cd nodeclub
+    npm install
+    nodec app.js
 
-## Optional Environment Variables
+### Compiling a npm package
 
-* `ENCLOSE_IO_KEEP_WORK_DIR`
-* `ENCLOSE_IO_CONFIGURE_ARGS`
-* `ENCLOSE_IO_MAKE_ARGS`
-* `ENCLOSE_IO_VCBUILD_ARGS`
-* `ENCLOSE_IO_NPM`
-* `ENCLOSE_IO_NPM_INSTALL_ARGS`
-* `npm_config_registry`
+    nodec --npm-package=coffee-script coffee
 
 ## Development
 
@@ -55,13 +55,8 @@ To release a new version, update the version number in `version.rb`, and then ru
 
 ## Contributing
 
-Bug reports and pull requests are welcome on GitHub at https://github.com/enclose-io/node-compiler.
-
-## Contributors
-
-* [pmq20](https://github.com/pmq20) - **Minqi Pan** <pmq2001@gmail.com>
-* [ibigbug](https://github.com/ibigbug) - **Yuwei Ba** <akabyw@gmail.com>
+Bug reports and pull requests are welcome on GitHub at https://github.com/pmq20/node-compiler.
 
 ## License
 
-Copyright (c) 2016 Node.js Compiler contributors, under terms of the [MIT License](http://opensource.org/licenses/MIT).
+Copyright (c) 2016-2017 Minqi Pan, under terms of the [MIT License](http://opensource.org/licenses/MIT).

data/appveyor.yml

@@ -1,11 +1,8 @@
 version: '{build}'
-environment:
-  ENCLOSE_IO_VCBUILD_ARGS: nosign
 build_script:
 - cmd: >-
     set PATH=C:\Ruby23\bin;%PATH%
 
-
     ruby -v
 
     gem update --system
@@ -27,5 +24,4 @@ test_script:
 - cmd: >-
     set PATH=C:\Ruby23\bin;%PATH%
 
-
     bundle exec rake

data/bin/console

@@ -1,5 +1,10 @@
 #!/usr/bin/env ruby
 
+# Copyright (c) 2016-2017 Minqi Pan
+# 
+# This file is part of Node.js Compiler, distributed under the MIT License
+# For full terms see the included LICENSE file
+
 require "bundler/setup"
 require "node/compiler"
 

data/bin/setup

@@ -1,4 +1,10 @@
 #!/usr/bin/env bash
+
+# Copyright (c) 2016-2017 Minqi Pan
+# 
+# This file is part of Node.js Compiler, distributed under the MIT License
+# For full terms see the included LICENSE file
+
 set -euo pipefail
 IFS=$'\n\t'
 set -vx

data/exe/nodec

@@ -1,28 +1,110 @@
 #!/usr/bin/env ruby
 
+# Copyright (c) 2016-2017 Minqi Pan
+# 
+# This file is part of Node.js Compiler, distributed under the MIT License
+# For full terms see the included LICENSE file
+
 require "node/compiler"
+require 'optparse'
+
+USAGE = %Q{
+
+Node.js Compiler (nodec) v#{::Node::Compiler::VERSION} (runtime #{::Node::Compiler.node_version})
+Compiler for Node.js which compiles your project into a single executable.
+
+Usage: nodec [OPTION]... [ENTRANCE]
+
+}.strip
 
-USAGE = %Q{nodec v#{::Node::Compiler::VERSION} (#{::Node::Compiler.node_version})
+EXAMPLES = %Q{
+
+Example 1: Compiling a CLI project
+    git clone https://github.com/jashkenas/coffeescript.git
+    cd coffeescript
+    npm install
+    nodec bin/coffee
+
+Example 2: Compiling a web application
+    git clone https://github.com/cnodejs/nodeclub.git
+    cd nodeclub
+    npm install
+    nodec app.js
+
+Example 3: Compiling a npm package
+    nodec --npm-package=coffee-script coffee
 
-usage: nodec [module_name] [module_version] [bin_name] [output_path]
 }.strip
 
-if 2 == ARGV.size && 'test' == ARGV[1]
-  instance = ::Node::Compiler.new ARGV[0]
-  instance.test!
-  exit 0
+options = {}
+
+outer_opts = nil
+
+usage = lambda do |out|
+  out.puts outer_opts
+  out.puts
+  out.puts EXAMPLES
 end
 
-unless 4 == ARGV.size
-  STDERR.puts USAGE
+OptionParser.new do |opts|
+  opts.banner = USAGE
+
+  opts.on("-pDIR", "--project-root=DIR", "Speicifies the path to the root of the project") do |dir|
+    options[:project_root] = dir
+  end
+
+  opts.on("-oFILE", "--output=FILE", "Speicifies the path of the output file (default: ./a.out or ./a.exe)") do |file|
+    options[:output] = file
+  end
+
+  opts.on("-dDIR", "--tmpdir=DIR", "Speicifies the directory for temporary files") do |dir|
+    options[:tmpdir] = dir
+  end
+
+  opts.on("--make-args=ARGS", "Passes extra arguments to make") do |args|
+    options[:make_args] = args
+  end
+
+  opts.on("--vcbuild-args=ARGS", "Passes extra arguments to vcbuild.bat") do |args|
+    options[:vcbuild_args] = args
+  end
+
+  opts.on("--npm-package=NAME", "Compiles the specified npm package") do |name|
+    options[:npm_package] = name
+  end
+
+  opts.on("--npm-package-version=VER", "Compiles the specified version of the npm package") do |ver|
+    options[:npm_package_version] = ver
+  end
+
+  opts.on("-v", "--version", "Prints the version of nodec and exit") do
+    puts ::Node::Compiler::VERSION
+    exit 0
+  end
+
+  opts.on("--node-version", "Prints the version of the Node.js runtime and exit") do
+    puts ::Node::Compiler.node_version
+    exit 0
+  end
+
+  opts.on("-h", "--help", "Prints this help and exit") do
+    usage.call(STDOUT)
+    exit 0
+  end
+
+  outer_opts = opts
+end.parse!
+
+entrance = ARGV[-1]
+unless entrance.kind_of?(String) && entrance.length > 0
+  usage.call(STDERR)
   exit 1
 end
 
 begin
-  instance = ::Node::Compiler.new *ARGV
+  instance = ::Node::Compiler.new entrance, options
   instance.run!
-  instance.clean_work_dir unless ENV['ENCLOSE_IO_KEEP_WORK_DIR']
 rescue ::Node::Compiler::Error => e
   STDERR.puts e.message
-  exit 2
+  exit 1
 end

data/lib/node/compiler.rb

@@ -1,5 +1,13 @@
-require "node/compiler/version"
+# Copyright (c) 2016-2017 Minqi Pan
+# 
+# This file is part of Node.js Compiler, distributed under the MIT License
+# For full terms see the included LICENSE file
+
+require "node/compiler/constants"
 require "node/compiler/error"
+require "node/compiler/utils"
+require "node/compiler/test"
+require "node/compiler/npm"
 require 'shellwords'
 require 'tmpdir'
 require 'fileutils'
@@ -8,168 +16,131 @@ require 'open3'
 
 module Node
   class Compiler
-    VENDOR_DIR = File.expand_path('../../../vendor', __FILE__)
-    MEMFS = '/__enclose_io_memfs__'
-
     def self.node_version
-      Dir[VENDOR_DIR+'/node-*'].map {|x| x.gsub(VENDOR_DIR+'/', '')}.first
+      @node_version ||= peek_node_version
     end
-
-    def initialize(module_name = nil,
-                   module_version = nil,
-                   bin_name = nil,
-                   output_path = nil)
-      @node_version = self.class.node_version
-      @module_name = module_name
-      @module_version = module_version
-      @bin_name = bin_name
-      @output_path = output_path
-
-      @vendor_dir = File.expand_path("./#{@node_version}", VENDOR_DIR)
-      unless File.exist?(@vendor_dir)
-        msg = "Does not support #{@node_version}, supported: #{::Node::Compiler.node_version}"
-        raise Error, msg
+    
+    def self.peek_node_version
+      version_info = File.read(File.join(VENDOR_DIR, 'node/src/node_version.h'))
+      versions = []
+      if version_info =~ /NODE_MAJOR_VERSION\s+(\d+)/
+        versions << $1.dup
+      else
+        raise 'Cannot peek NODE_MAJOR_VERSION'
       end
+      if version_info =~ /NODE_MINOR_VERSION\s+(\d+)/
+        versions << $1.dup
+      else
+        raise 'Cannot peek NODE_MINOR_VERSION'
+      end
+      if version_info =~ /NODE_PATCH_VERSION\s+(\d+)/
+        versions << $1.dup
+      else
+        raise 'Cannot peek NODE_PATCH_VERSION'
+      end
+      versions.join('.')
     end
-
-    def run!
-      prepare_vars
-      npm_install
-      parse_binaries
-      inject_entrance
-      inject_memfs(@work_dir)
-      Gem.win_platform? ? compile_win : compile
-    end
-
-    def prepare_vars
-      @work_dir = File.expand_path("./enclose-io/nodec/#{@module_name}-#{@module_version}", Dir.tmpdir)
-      FileUtils.mkdir_p(@work_dir)
-      @package_path = File.join(@work_dir, "node_modules/#{@module_name}/package.json")
+    
+    def initialize(entrance, options = {})
+      @options = options
+      @entrance = entrance
+
+      init_options
+      init_entrance
+      init_tmpdir
     end
 
-    def npm_install
-      chdir(@work_dir) do
-        File.open("package.json", "w") do |f|
-          package = %Q({"dependencies": {"#{@module_name}": "#{@module_version}"}})
-          f.puts package
+    def init_entrance
+      # Important to expand_path; otherwiser the while would not be right
+      @entrance = File.expand_path(@entrance)
+      raise Error, "Cannot find entrance #{@entrance}." unless File.exist?(@entrance)
+      if @options[:project_root]
+        @project_root = File.expand_path(@options[:project_root])
+      else
+        @project_root = File.dirname(@entrance)
+        # this while has to correspond with the expand_path above
+        while !File.exist?(File.expand_path('./package.json', @project_root))
+          break if '/' == @project_root
+          @project_root = File.expand_path('..', @project_root)
         end
-        npm = ENV['ENCLOSE_IO_NPM'] || 'npm'
-        run("#{npm} -v")
-        run("#{npm} install #{ENV['ENCLOSE_IO_NPM_INSTALL_ARGS']}")
+      end
+      unless File.exist?(File.expand_path('./package.json', @project_root))
+        raise Error, "Cannot find a package.json at the project root #{@project_root}"
       end
     end
 
-    def parse_binaries
-      unless File.exist?(@package_path)
-        raise Error, "No package.json exist at #{@package_path}."
-      end
-      @package_json = JSON.parse File.read @package_path
-      @binaries = @package_json['bin']
-      if @binaries
-        STDERR.puts "Detected binaries: #{@binaries}"
+    def init_options
+      if Gem.win_platform?
+        @options[:output] ||= 'a.exe'
       else
-        raise Error, "No binaries detected inside #{@package_path}."
+        @options[:output] ||= 'a.out'
       end
-      if @binaries[@bin_name]
-        STDERR.puts "Using #{@bin_name} at #{@binaries[@bin_name]}"
-      else
-        raise Error, "No such binary: #{@bin_name}"
+      @options[:output] = File.expand_path(@options[:output])
+
+      @options[:tmpdir] ||= File.expand_path("nodec", Dir.tmpdir)
+      @options[:tmpdir] = File.expand_path(@options[:tmpdir])
+      
+      if @options[:npm_package]
+        @options[:npm_package_version] ||= 'latest'
+        npm = ::Node::Compiler::Npm.new(@options[:npm_package], @options[:npm_package_version], @options[:tmpdir])
+        @entrance = npm.get_entrance(@entrance)
       end
     end
 
+    def init_tmpdir
+      if @options[:tmpdir].include? @project_root
+        raise Error, "tmpdir #{@options[:tmpdir]} cannot reside inside the project root #{@project_root}."
+      end
+
+      Utils.prepare_tmpdir(@options[:tmpdir])
+      @vendor_node = File.join(@options[:tmpdir], 'node')
+    end
+
+    def run!
+      @copy_dir = Utils.inject_memfs(@project_root, @vendor_node)
+      inject_entrance
+      Gem.win_platform? ? compile_win : compile
+    end
+
     def inject_entrance
-      target = File.expand_path('./lib/enclose_io_entrance.js', @vendor_dir)
-      prj_home = File.expand_path("node_modules/#{@module_name}", @work_dir)
-      bin = File.expand_path(@binaries[@bin_name], prj_home)
-      path = mempath bin
+      target = File.expand_path('./lib/enclose_io_entrance.js', @vendor_node)
+      path = mempath @entrance
       File.open(target, "w") { |f| f.puts %Q`module.exports = "#{path}";` }
       # remove shebang
-      lines = File.read(bin).lines
+      lines = File.read(@entrance).lines
       lines[0] = "// #{lines[0]}" if '#!' == lines[0][0..1]
-      File.open(bin, "w") { |f| f.print lines.join }
-    end
-
-    def inject_memfs(source)
-      target = File.expand_path("./lib#{MEMFS}", @vendor_dir)
-      FileUtils.remove_entry_secure(target) if File.exist?(target)
-      FileUtils.cp_r(source, target)
-      manifest = File.expand_path('./enclose_io_manifest.txt', @vendor_dir)
-      File.open(manifest, "w") do |f|
-        Dir["#{target}/**/*"].each do |fullpath|
-          next unless File.file?(fullpath)
-          if 0 == File.size(fullpath) && Gem.win_platform?
-            # Fix VC++ Error C2466
-            # TODO: what about empty file semantics?
-            File.open(fullpath, 'w') { |f| f.puts ' ' }
-          end
-          entry = "lib#{fullpath[(fullpath.index MEMFS)..-1]}"
-          f.puts entry
-        end
-      end
+      File.open(copypath(@entrance), "w") { |f| f.print lines.join }
     end
 
     def compile_win
-      chdir(@vendor_dir) do
-        run("call vcbuild.bat #{ENV['ENCLOSE_IO_VCBUILD_ARGS']}")
+      Utils.chdir(@vendor_node) do
+        Utils.run("call vcbuild.bat #{@options[:vcbuild_args]}")
       end
-      FileUtils.cp(File.join(@vendor_dir, 'Release\\node.exe'), @output_path)
+      STDERR.puts "-> FileUtils.cp(#{File.join(@vendor_node, 'Release\\node.exe')}, #{@options[:output]})"
+      FileUtils.cp(File.join(@vendor_node, 'Release\\node.exe'), @options[:output])
     end
 
     def compile
-      chdir(@vendor_dir) do
-        run("./configure #{ENV['ENCLOSE_IO_CONFIGURE_ARGS']}")
-        run("make #{ENV['ENCLOSE_IO_MAKE_ARGS']}")
-      end
-      FileUtils.cp(File.join(@vendor_dir, 'out/Release/node'), @output_path)
-    end
-
-    def test!
-      chdir(@vendor_dir) do
-        inject_memfs(File.expand_path('./test/fixtures', @vendor_dir))
-        FileUtils.rm_f(Gem.win_platform? ? 'Release\\node.exe' : 'out/Release/node')
-        File.open(File.expand_path('./lib/enclose_io_entrance.js', @vendor_dir), "w") { |f| f.puts 'module.exports = false;' }
-        test_env = {
-                     'FLAKY_TESTS_MODE' => 'dontcare',
-                     'FLAKY_TESTS' => 'dontcare',
-                     'ENCLOSE_IO_USE_ORIGINAL_NODE' => '1',
-                     'ENCLOSE_IO_ALWAYS_USE_ORIGINAL_NODE' => '1',
-                   }
-        if Gem.win_platform?
-          run(test_env, 'call vcbuild.bat nosign test-ci ignore-flaky')
-        else
-          run("./configure #{ENV['ENCLOSE_IO_CONFIGURE_ARGS']}")
-          run("make #{ENV['ENCLOSE_IO_MAKE_ARGS']}")
-          run(test_env, "make test-ci")
-        end
+      Utils.chdir(@vendor_node) do
+        Utils.run("./configure")
+        Utils.run("make #{@options[:make_args]}")
       end
+      STDERR.puts "-> FileUtils.cp(#{File.join(@vendor_node, 'out/Release/node')}, #{@options[:output]})"
+      FileUtils.cp(File.join(@vendor_node, 'out/Release/node'), @options[:output])
     end
 
-    def clean_work_dir
-      FileUtils.remove_entry_secure @work_dir
-    end
-
-    private
-
-    def run(*args)
-      STDERR.puts "-> Running #{args}"
-      pid = spawn(*args)
-      pid, status = Process.wait2(pid)
-      raise Error, "Failed running #{args}" unless status.success?
+    def mempath(path)
+      path = File.expand_path(path)
+      raise 'Logic error in mempath' unless @project_root == path[0...(@project_root.size)]
+      "#{MEMFS}#{path[(@project_root.size)..-1]}"
     end
 
-    def chdir(path)
-      STDERR.puts "-> cd #{path}"
-      Dir.chdir(path) { yield }
-      STDERR.puts "-> cd #{Dir.pwd}"
-    end
-  
-    def mempath(path)
+    def copypath(path)
       path = File.expand_path(path)
-      if @work_dir == path[0...(@work_dir.size)]
-        return "#{MEMFS}#{path[(@work_dir.size)..-1]}"
-      else
-        raise Error, 'Logic error in mempath'
-      end
+      raise 'Logic error 1 in copypath' unless @project_root == path[0...(@project_root.size)]
+      ret = File.join(@copy_dir, path[(@project_root.size)..-1])
+      raise 'Logic error 2 in copypath' unless File.exist?(ret)
+      ret
     end
   end
 end