Merge pull request #967 from spmjs/parse-file-in-package

sorrycc · sorrycc · commit c0203aaee418 · 2014-08-24T17:41:37.000+08:00
add testcase for `Parse file in package`
diff --git a/Makefile b/Makefile
@@ -8,7 +8,7 @@ specs := $(shell find ./tests -name '*.js' ! -path "*node_modules/*" ! -path "*s
 reporter = spec
 test:
 	./node_modules/.bin/istanbul cover \
-		./node_modules/.bin/_mocha -- -R ${reporter} -t 20000 ${specs}
+		./node_modules/.bin/_mocha -- -R ${reporter} -t 20000 ${specs} --inline-diffs
 
 debug:
 	./node_modules/.bin/_mocha -R ${reporter} ${specs}
diff --git a/lib/build.js b/lib/build.js
@@ -235,10 +235,10 @@ function checkDuplicate(files, pkg) {
       var versions = Object.keys(dup[k]);
       if (versions.length > 1) {
         log.warn('dulplicate',
-          'version %s of package %s have been required while building %s'.to.yellow.color,
-          versions.join(', '),
+          '%s (%s) while building %s'.to.yellow.color,
           k,
-          file.filepath
+          versions.join(', '),
+          file.path
         );
       }
     }
diff --git a/package.json b/package.json
@@ -38,13 +38,13 @@
     "gulp-jsbeautify": "~0.1.1",
     "gulp-load-plugins": "~0.5.3",
     "gulp-mirror": "~0.2.0",
-    "gulp-size2": "^0.4.0",
-    "gulp-template": "^1.0.0",
-    "gulp-transport": "~0.6.0",
+    "gulp-size2": "~0.4.0",
+    "gulp-template": "~1.0.0",
+    "gulp-transport": "~0.7.0",
     "gulp-uglify": "~0.2.1",
     "gulp-zip": "~0.3.4",
     "inherits": "~1.0.0",
-    "inquirer": "^0.6.0",
+    "inquirer": "~0.6.0",
     "jscoverage": "~0.3.8",
     "lodash": "~2.4.1",
     "mocha-browser2": "~0.3.0",
@@ -55,9 +55,9 @@
     "semver": "~2.2.1",
     "serve-spm": "~0.5.0",
     "spm-client": "~0.2.0",
-    "spmrc": "^1.2.0",
+    "spmrc": "~1.2.0",
     "tar": "~0.1.19",
-    "umi": "~0.5.0",
+    "umi": "~0.6.0",
     "whoami": "~0.0.3",
     "win-spawn": "~2.0.0"
   },
@@ -68,7 +68,7 @@
     "should": "*",
     "ls-archive": "~1.0.0",
     "istanbul": "*",
-    "muk": "^0.3.1",
+    "muk": "~0.3.1",
     "gulp-unzip": "~0.1.1"
   },
   "bin": {
diff --git a/tests/build.js b/tests/build.js
@@ -127,7 +127,7 @@ describe('build', function() {
     var opt = {
       cwd: join(base, 'build-js'),
       dest: dest,
-      zip: true,
+      zip: true
     };
     build(opt, function(err) {
       should.not.exist(err);
diff --git a/tests/build/build-css/a.css b/tests/build/build-css/a.css
@@ -1,5 +1,6 @@
 @import url("./b.css");
 @import url("b");
+@import url("b/extra.css");
 
 body {
   background: none;
diff --git a/tests/build/build-css/spm_modules/b/1.1.0/extra.css b/tests/build/build-css/spm_modules/b/1.1.0/extra.css
@@ -0,0 +1 @@
+.extra {color:red;}
diff --git a/tests/build/build-js/relative.js b/tests/build/build-js/relative.js
@@ -1,2 +1,3 @@
 console.log('relative');
 require('b');
+require('b/src/extra');
diff --git a/tests/build/build-js/spm_modules/b/1.1.0/src/extra.js b/tests/build/build-js/spm_modules/b/1.1.0/src/extra.js
@@ -0,0 +1 @@
+console.log('b-extra');
diff --git a/tests/build/expect/build-css-all/a/1.0.0/a-debug.css b/tests/build/expect/build-css-all/a/1.0.0/a-debug.css
@@ -10,6 +10,8 @@ li {
   color: red;
 }
 
+.extra {color:red;}
+
 body {
   background: none;
 }
diff --git a/tests/build/expect/build-css-all/a/1.0.0/a.css b/tests/build/expect/build-css-all/a/1.0.0/a.css
@@ -1 +1 @@
-ul{margin:0}li{color:red}body{background:0 0}
+ul{margin:0}.extra,li{color:red}body{background:0 0}
diff --git a/tests/build/expect/build-css-all/a/1.0.0/index-debug.js b/tests/build/expect/build-css-all/a/1.0.0/index-debug.js
@@ -2,7 +2,7 @@ define("a/1.0.0/index-debug", [], function(require, exports, module) {
   require("a/1.0.0/a-debug.css.js");
 });
 define("a/1.0.0/a-debug.css.js", [], function(require, exports, module) {
-  require("import-style/1.0.0/index-debug")('ul{margin:0;}li{color:blue;}li{color:red;}body{background:none;}');
+  require("import-style/1.0.0/index-debug")('ul{margin:0;}li{color:blue;}li{color:red;}.extra{color:red;}body{background:none;}');
 });
 define("import-style/1.0.0/index-debug", [], function(require, exports, module) {
   /**
@@ -47,4 +47,4 @@ define("import-style/1.0.0/index-debug", [], function(require, exports, module)
       styleNode = element;
     }
   }
-});
+});
diff --git a/tests/build/expect/build-css-all/a/1.0.0/index.js b/tests/build/expect/build-css-all/a/1.0.0/index.js
diff --git a/tests/build/expect/build-css/a/1.0.0/a-debug.css b/tests/build/expect/build-css/a/1.0.0/a-debug.css
@@ -10,6 +10,8 @@ li {
   color: red;
 }
 
+.extra {color:red;}
+
 body {
   background: none;
 }
diff --git a/tests/build/expect/build-css/a/1.0.0/a.css b/tests/build/expect/build-css/a/1.0.0/a.css
@@ -1 +1 @@
-ul{margin:0}li{color:red}body{background:0 0}
+ul{margin:0}.extra,li{color:red}body{background:0 0}
diff --git a/tests/build/expect/build-css/a/1.0.0/index-debug.js b/tests/build/expect/build-css/a/1.0.0/index-debug.js
@@ -2,5 +2,5 @@ define("a/1.0.0/index-debug", ["import-style/1.0.0/index-debug"], function(requi
   require("a/1.0.0/a-debug.css.js");
 });
 define("a/1.0.0/a-debug.css.js", ["import-style/1.0.0/index-debug"], function(require, exports, module) {
-  require("import-style/1.0.0/index-debug")('ul{margin:0;}li{color:blue;}li{color:red;}body{background:none;}');
-});
+  require("import-style/1.0.0/index-debug")('ul{margin:0;}li{color:blue;}li{color:red;}.extra{color:red;}body{background:none;}');
+});
diff --git a/tests/build/expect/build-css/a/1.0.0/index.js b/tests/build/expect/build-css/a/1.0.0/index.js
diff --git a/tests/build/expect/build-js-all-ignore/a/1.0.0/index-debug.js b/tests/build/expect/build-js-all-ignore/a/1.0.0/index-debug.js
@@ -5,6 +5,7 @@ define("a/1.0.0/index-debug", ["b", "c", "d"], function(require, exports, module
 define("a/1.0.0/relative-debug", ["b", "c", "d"], function(require, exports, module) {
   console.log('relative');
   require('b');
+  require("b/src/extra.js");
 });
 define("d/0.1.1/index-debug", [], function(require, exports, module) {
   exports.d = function() {
diff --git a/tests/build/expect/build-js-all-ignore/a/1.0.0/index.js b/tests/build/expect/build-js-all-ignore/a/1.0.0/index.js
diff --git a/tests/build/expect/build-js-all/a/1.0.0/index-debug.js b/tests/build/expect/build-js-all/a/1.0.0/index-debug.js
@@ -5,6 +5,7 @@ define("a/1.0.0/index-debug", [], function(require, exports, module) {
 define("a/1.0.0/relative-debug", [], function(require, exports, module) {
   console.log('relative');
   require("b/1.1.0/src/b-debug");
+  require("b/1.1.0/src/extra-debug");
 });
 define("b/1.1.0/src/b-debug", [], function(require, exports, module) {
   require("c/1.1.1/index-debug");
@@ -21,8 +22,11 @@ define("d/0.1.0/index-debug", [], function(require, exports, module) {
 define("b/1.1.0/src/b-debug.tpl", [], function(require, exports, module) {
   module.exports = '<div></div>';
 });
+define("b/1.1.0/src/extra-debug", [], function(require, exports, module) {
+  console.log('b-extra');
+});
 define("d/0.1.1/index-debug", [], function(require, exports, module) {
   exports.d = function() {
     console.log('0.1.1');
   };
-});
+});
diff --git a/tests/build/expect/build-js-all/a/1.0.0/index.js b/tests/build/expect/build-js-all/a/1.0.0/index.js
diff --git a/tests/build/expect/build-js-standalone/a/1.0.0/index-debug.js b/tests/build/expect/build-js-standalone/a/1.0.0/index-debug.js
@@ -81,6 +81,7 @@
   define("a/1.0.0/relative-debug", [], function(require, exports, module) {
     console.log('relative');
     require("b/1.1.0/src/b-debug");
+    require("b/1.1.0/src/extra-debug");
   });
   define("b/1.1.0/src/b-debug", [], function(require, exports, module) {
     require("c/1.1.1/index-debug");
@@ -97,10 +98,13 @@
   define("b/1.1.0/src/b-debug.tpl", [], function(require, exports, module) {
     module.exports = '<div></div>';
   });
+  define("b/1.1.0/src/extra-debug", [], function(require, exports, module) {
+    console.log('b-extra');
+  });
   define("d/0.1.1/index-debug", [], function(require, exports, module) {
     exports.d = function() {
       console.log('0.1.1');
     };
   });
   require("a/1.0.0/index-debug");
-})();
+})();
diff --git a/tests/build/expect/build-js-standalone/a/1.0.0/index.js b/tests/build/expect/build-js-standalone/a/1.0.0/index.js
diff --git a/tests/build/expect/build-js-with-deps-ignore/a/1.0.0/index-debug.js b/tests/build/expect/build-js-with-deps-ignore/a/1.0.0/index-debug.js
@@ -1,8 +1,9 @@
-define("a/1.0.0/index-debug", ["b/1.1.0/src/b-debug", "c", "d", "d/0.1.1/index-debug"], function(require, exports, module) {
+define("a/1.0.0/index-debug", ["b/1.1.0/src/b-debug", "c", "d", "b/1.1.0/src/extra-debug", "d/0.1.1/index-debug"], function(require, exports, module) {
   require("a/1.0.0/relative-debug");
   require("d/0.1.1/index-debug");
 });
-define("a/1.0.0/relative-debug", ["b/1.1.0/src/b-debug", "c", "d"], function(require, exports, module) {
+define("a/1.0.0/relative-debug", ["b/1.1.0/src/b-debug", "c", "d", "b/1.1.0/src/extra-debug"], function(require, exports, module) {
   console.log('relative');
   require("b/1.1.0/src/b-debug");
+  require("b/1.1.0/src/extra-debug");
 });
diff --git a/tests/build/expect/build-js-with-deps-ignore/a/1.0.0/index.js b/tests/build/expect/build-js-with-deps-ignore/a/1.0.0/index.js
diff --git a/tests/build/expect/build-js-with-deps/a/1.0.0/index-debug.js b/tests/build/expect/build-js-with-deps/a/1.0.0/index-debug.js
@@ -1,8 +1,9 @@
-define("a/1.0.0/index-debug", ["b/1.1.0/src/b-debug", "c/1.1.1/index-debug", "d/0.1.0/index-debug", "d/0.1.1/index-debug"], function(require, exports, module) {
+define("a/1.0.0/index-debug", ["b/1.1.0/src/b-debug", "c/1.1.1/index-debug", "d/0.1.0/index-debug", "b/1.1.0/src/extra-debug", "d/0.1.1/index-debug"], function(require, exports, module) {
   require("a/1.0.0/relative-debug");
   require("d/0.1.1/index-debug");
 });
-define("a/1.0.0/relative-debug", ["b/1.1.0/src/b-debug", "c/1.1.1/index-debug", "d/0.1.0/index-debug"], function(require, exports, module) {
+define("a/1.0.0/relative-debug", ["b/1.1.0/src/b-debug", "c/1.1.1/index-debug", "d/0.1.0/index-debug", "b/1.1.0/src/extra-debug"], function(require, exports, module) {
   console.log('relative');
   require("b/1.1.0/src/b-debug");
+  require("b/1.1.0/src/extra-debug");
 });
diff --git a/tests/build/expect/build-js-with-deps/a/1.0.0/index.js b/tests/build/expect/build-js-with-deps/a/1.0.0/index.js
diff --git a/tests/build/expect/build-js/a/1.0.0/index-debug.js b/tests/build/expect/build-js/a/1.0.0/index-debug.js
@@ -1,8 +1,9 @@
-define("a/1.0.0/index-debug", ["b/1.1.0/src/b-debug", "c/1.1.1/index-debug", "d/0.1.0/index-debug", "d/0.1.1/index-debug"], function(require, exports, module) {
+define("a/1.0.0/index-debug", ["b/1.1.0/src/b-debug", "c/1.1.1/index-debug", "d/0.1.0/index-debug", "b/1.1.0/src/extra-debug", "d/0.1.1/index-debug"], function(require, exports, module) {
   require("a/1.0.0/relative-debug");
   require("d/0.1.1/index-debug");
 });
-define("a/1.0.0/relative-debug", ["b/1.1.0/src/b-debug", "c/1.1.1/index-debug", "d/0.1.0/index-debug"], function(require, exports, module) {
+define("a/1.0.0/relative-debug", ["b/1.1.0/src/b-debug", "c/1.1.1/index-debug", "d/0.1.0/index-debug", "b/1.1.0/src/extra-debug"], function(require, exports, module) {
   console.log('relative');
   require("b/1.1.0/src/b-debug");
-});
+  require("b/1.1.0/src/extra-debug");
+});
diff --git a/tests/build/expect/build-js/a/1.0.0/index.js b/tests/build/expect/build-js/a/1.0.0/index.js

Original file line number	Diff line number	Diff line change
`@@ -235,10 +235,10 @@ function checkDuplicate(files, pkg) {`
`235`	`235`	`var versions = Object.keys(dup[k]);`
`236`	`236`	`if (versions.length > 1) {`
`237`	`237`	`log.warn('dulplicate',`
`238`		`- 'version %s of package %s have been required while building %s'.to.yellow.color,`
`239`		`- versions.join(', '),`
	`238`	`+ '%s (%s) while building %s'.to.yellow.color,`
`240`	`239`	`k,`
`241`		`- file.filepath`
	`240`	`+ versions.join(', '),`
	`241`	`+ file.path`
`242`	`242`	`);`
`243`	`243`	`}`
`244`	`244`	`}`
Original file line number	Diff line number	Diff line change
`@@ -1,2 +1,3 @@`
`1`	`1`	`console.log('relative');`
`2`	`2`	`require('b');`
	`3`	`+require('b/src/extra');`
Original file line number	Diff line number	Diff line change
`@@ -10,6 +10,8 @@ li {`
`10`	`10`	`color: red;`
`11`	`11`	`}`
`12`	`12`
	`13`	`+.extra {color:red;}`
	`14`	`+`
`13`	`15`	`body {`
`14`	`16`	`background: none;`
`15`	`17`	`}`
Original file line number	Diff line number	Diff line change
`@@ -1 +1 @@`
`1`		`-ul{margin:0}li{color:red}body{background:0 0}`
	`1`	`+ul{margin:0}.extra,li{color:red}body{background:0 0}`