Merge branch 'hotfix/1.1.1'

Module.coffee

@@ -46,9 +46,19 @@ class Module extends BuiltinModule
     self = @
     content = content.replace /^\#\!.*/, ''
 
+    require = (path) ->
+      self.require path
+
+    require.resolve = (request) ->
+      BuiltinModule._resolveFilename self, request
+    require.main = process.mainModule
+    require.extensions = BuiltinModule._extensions
+    require.cache = BuiltinModule._cache
+
     sandbox = new Sandbox({
       filename
       module: self
+      require
       imports: {gulp: wrapper}
       })
 

README.md

@@ -1,7 +1,7 @@
 gulp-loader
 ===========
 
-[![Build Status](https://travis-ci.org/call-a3/gulp-loader.svg?tag=1.1.0)](https://travis-ci.org/call-a3/gulp-loader)
+[![Build Status](https://travis-ci.org/call-a3/gulp-loader.svg?tag=1.1.1)](https://travis-ci.org/call-a3/gulp-loader)
 [![Dependency Status](https://david-dm.org/call-a3/gulp-loader.svg)](https://david-dm.org/call-a3/gulp-loader) [![devDependency Status](https://david-dm.org/call-a3/gulp-loader/dev-status.svg)](https://david-dm.org/call-a3/gulp-loader#info=devDependencies)
 
 Gulp plugin that wraps gulp and loads tasks from a specified folder. Task definitions are compatible with [gulp-task-loader](https://www.npmjs.org/package/gulp-task-loader).

Sandbox.coffee

@@ -1,7 +1,7 @@
 path = require 'path'
 
 module.exports = class Sandbox
-  constructor: ({filename, module, imports}) ->
+  constructor: ({filename, module, require, imports}) ->
     self = @
 
     # Include global as reference to self
@@ -23,9 +23,10 @@ module.exports = class Sandbox
       get: () -> exports
       set: (value) ->
         exports = value
+
+    # Set require
     Object.defineProperty @, 'require',
-      value: (id) ->
-        module.require.call module, id
+      value: require
 
     # Add imported globals if they don't override fixed globals
     for name, prop of imports

package.json

@@ -1,6 +1,6 @@
 {
   "name": "gulp-loader",
-  "version": "1.1.0",
+  "version": "1.1.1",
   "description": "Gulp plugin that wraps gulp and loads tasks as seperate files from a gulp folder",
   "main": "index.js",
   "scripts": {

test/gulp/check-module-shim.coffee

@@ -0,0 +1,18 @@
+check = (bool, message) ->
+  if bool
+    gulp.util.log 'yes ' + message
+  else
+    gulp.util.log 'no ' + message
+
+module.exports = (done) ->
+  check (typeof require is 'function'),
+    'require should be a function'
+  check (typeof require.resolve is 'function'),
+    'require.resolve should be a function'
+  check (require.main == process.mainModule),
+    'main should be a process.mainModule'
+  check (typeof require.extensions is 'object'),
+    'module.extensions should be an object map'
+  check (typeof require.cache is 'object'),
+    'module.cache should be an object map'
+  done()

test/spec.js

@@ -306,4 +306,28 @@ test('configurability test', function(t) {
     t.equal(dump.dirs.test, 'debug', 'gulp.dirs.test should match the setting in package.json');
     t.equal(dump.dirs.dist, 'production', 'gulp.dirs.dist should match the setting in package.json');
   });
+});
+
+test('module shim test', function (t) {
+  t.plan(6);
+
+  exec('gulp check-module-shim', function (error, stdout, stderr) {
+    t.error(error, 'gulp command should execute without errors');
+    var actualOutput = false;
+    stdout.split('\n').forEach(function(line) {
+      if (line.match(/\[(([0-1][0-9])|(2[0-3])):[0-5][0-9]:[0-5][0-9]\] Starting 'check-module-shim'.../)) {
+        actualOutput = true;
+      } else if (actualOutput) {
+        if (line.match(/\[(([0-1][0-9])|(2[0-3])):[0-5][0-9]:[0-5][0-9]\] Finished 'check-module-shim' after [^\n]*/)) {
+          actualOutput = false;
+        } else {
+          var m = line.match(/\[(([0-1][0-9])|(2[0-3])):[0-5][0-9]:[0-5][0-9]\] ((yes)|(no)) ([^\n]*)/);
+          if (m) {
+            t.equal(m[4], 'yes', m[7]);
+          }
+        }
+      }
+    });
+  });
+
 });