Merge pull request #5 from sorrycc/glob-support-for-output

add glob support for pkg.output

.gitignore

@@ -1,2 +1,4 @@
 node_modules
 coverage
+.idea
+tmp

lib/package.js

@@ -6,6 +6,7 @@ var join = path.join;
 var dirname = path.dirname;
 var extname = path.extname;
 var relative = path.relative;
+var glob = require('glob');
 var requires = require('requires');
 var imports = require('css-imports');
 var Class = require('arale').Class;
@@ -276,7 +277,17 @@ function getEntry(pkg, options) {
 
     // base on pkg.output
     if (Array.isArray(pkg.output) && pkg.output.length) {
-      entry = entry.concat(pkg.output);
+      pkg.output.forEach(function(outputGlob) {
+        // glob support
+        var items = glob.sync(outputGlob, {cwd:pkg.dest});
+
+        // handle ./index.js
+        items = items.map(function(item) {
+          return item.replace(/^\.\//, '');
+        });
+
+        entry = entry.concat(items);
+      });
     }
   }
 

package.json

@@ -6,7 +6,8 @@
   "dependencies": {
     "arale": "~0.2.0",
     "css-imports": "~0.2.0",
-    "debug": "^0.7.4",
+    "debug": "~0.7.4",
+    "glob": "~4.0.2",
     "requires": "~1.0.0",
     "semver": "~2.3.0"
   },
@@ -26,4 +27,4 @@
   "scripts": {
     "test": "make test"
   }
-}
+}

test/fixtures/spm/output-glob-duplicate/a.js

@@ -0,0 +1 @@
+console.log('a');

test/fixtures/spm/output-glob-duplicate/package.json

@@ -0,0 +1,7 @@
+{
+  "name": "a",
+  "version": "1.0.0",
+  "spm": {
+    "output": ["a.js", "./*.js"]
+  }
+}

test/fixtures/spm/output/c1.js

@@ -0,0 +1 @@
+console.log('c1');

test/fixtures/spm/output/glob/c.js

@@ -0,0 +1 @@
+require('../c1.js');

test/fixtures/spm/output/package.json

@@ -2,6 +2,6 @@
   "name": "a",
   "version": "1.0.0",
   "spm": {
-    "output": ["a.js", "b.js"]
+    "output": ["a.js", "b.js", "./glob/*.js"]
   }
 }

test/spm.js

@@ -67,8 +67,14 @@ describe('Father.SpmPackage', function() {
 
   it('output', function() {
     var pkg = getPackage('output');
-    pkg.output.should.eql(['a.js', 'b.js']);
-    Object.keys(pkg.files).should.eql(['index.js','a.js', 'a1.js', 'b.js', 'b1.js']);
+    pkg.output.should.eql(['a.js', 'b.js', './glob/*.js']);
+    Object.keys(pkg.files).should.eql(['index.js','a.js', 'a1.js', 'b.js', 'b1.js', 'glob/c.js', 'c1.js']);
+  });
+
+  it('output glob duplicate', function() {
+    var pkg = getPackage('output-glob-duplicate');
+    pkg.output.should.eql(['a.js', './*.js']);
+    Object.keys(pkg.files).should.eql(['a.js']);
   });
 
   it('resolve deps', function() {