Merge branch 'master' of github.com:component/component

componentjs · Jan 17, 2013 · aa7c059 · aa7c059
2 parents 991568e + c86f69a
commit aa7c059
Show file tree

Hide file tree

Showing 2 changed files with 17 additions and 8 deletions.
diff --git a/bin/component-install b/bin/component-install
@@ -94,7 +94,8 @@ if (local) {
 if (!local) {
   conf.dependencies = conf.dependencies || {};
   pkgs.forEach(function(pkg){
-    conf.dependencies[pkg] = '*';
+    pkg = parsePackage(pkg);
+    conf.dependencies[pkg.name] = pkg.version || '*';
   });
   saveConfig();
 }
@@ -108,12 +109,20 @@ conf.remotes.push('https://raw.github.com');
 
 console.log();
 pkgs.forEach(function(pkg){
-  var parts = pkg.split('@');
+  pkg = parsePackage(pkg);
-  var name = parts.shift();
+  install(pkg.name, pkg.version || 'master');
-  var version = parts.shift() || 'master';
-  install(name, version);
 });
 
+// parse package identifier
+
+function parsePackage(pkg) {
+  var parts = pkg.split('@');
+  return {
+    name: parts.shift(),
+    version: parts.shift()
+  };
+}
+
 // map deps to args
 
 function normalize(deps) {

diff --git a/test/install.js b/test/install.js
@@ -40,10 +40,10 @@ describe('component install', function(){
     })
 
     it('should add the component to ./component.json', function(done){
-      exec('bin/component install component/emitter', function(err, stdout){
+      exec('bin/component install component/emitter@0.0.4', function(err, stdout){
         if (err) return done(err);
         var json = require(path.resolve('component.json'));
-        json.dependencies.should.have.property('component/emitter', '*');
+        json.dependencies.should.have.property('component/emitter', '0.0.4');
         done();
       })
     })
@@ -126,4 +126,4 @@ describe('component install', function(){
       done();
     })
   })
-})
+})