cwd fixes

Author: chris-steele

lib/commands/install.js

@@ -831,7 +831,7 @@ module.exports = function (dependencies) {
     }
 
     function createInstallationTask(plugin) {
-        return PackageMeta.getKeywords(plugin, { registry: Constants.getRegistry() }).then(doInstall).then(conclude);
+        return PackageMeta.getKeywords(plugin, { registry: Constants.getRegistry(), cwd: Constants.cwd }).then(doInstall).then(conclude);
 
         function doInstall(keywords) {
             var resolver = new PluginTypeResolver(),
@@ -841,8 +841,9 @@ module.exports = function (dependencies) {
             plugin._belongsTo = pluginType.belongsTo;
 
             return install(plugin, {
-                directory: path.join(Constants.cwd, 'src', pluginType.belongsTo),
-                registry: Constants.getRegistry()
+                directory: path.join('src', pluginType.belongsTo),
+                registry: Constants.getRegistry(),
+                cwd: Constants.cwd
             });
         }
 

lib/commands/install/InstallTarget.js

@@ -87,7 +87,7 @@ var InstallTarget = extend(Plugin, {
         try {
             var versionString = this._versions ? '#'+this._versions[this._versionIndex] : '';
             this._bowerCmdCount++;
-            bower.commands.info(this.packageName+versionString, null, {registry:Constants.getRegistry()}).on('end', _.bind(onSuccess, this)).on('error', _.bind(onFail, this));
+            bower.commands.info(this.packageName+versionString, null, {registry:Constants.getRegistry(), cwd: Constants.cwd}).on('end', _.bind(onSuccess, this)).on('error', _.bind(onFail, this));
         } catch(err) {
             onFail.call(this, err);
         }

lib/commands/uninstall.js

@@ -31,7 +31,8 @@ module.exports = {
                 pluginType = resolver.resolve(keywords);
 
             return uninstallPackage(plugin, {
-                directory: path.join(Constants.cwd, 'src', pluginType.belongsTo)
+                directory: path.join('src', pluginType.belongsTo),
+                cwd:Constants.cwd
             });
         })
         .then(function () {
@@ -93,7 +94,8 @@ module.exports = {
 
             renderer.log(chalk.cyan(plugin.packageName), 'found.', 'Uninstalling', pluginType.typename, '...');
             return uninstallPackage(plugin, {
-                directory: path.join(Constants.cwd, 'src', pluginType.belongsTo)
+                directory: path.join('src', pluginType.belongsTo),
+                cwd:Constants.cwd
             });
         })
         .then(function () {

lib/commands/update.js

@@ -376,7 +376,7 @@ module.exports = function() {
             //console.log('Querying registry for', plugin.packageName, '(' + plugin.version + ')');
             var versionString = plugin._versions ? '#'+plugin._versions[plugin._versionIndex] : '';
             plugin._bowerCmdCount++;
-            bower.commands.info(plugin.packageName+versionString, null, {registry:Constants.getRegistry()}).on('end', onSuccess).on('error', onFail);
+            bower.commands.info(plugin.packageName+versionString, null, {registry:Constants.getRegistry(), cwd:Constants.cwd}).on('end', onSuccess).on('error', onFail);
         } catch(err) {
             onFail();
         }
@@ -794,8 +794,8 @@ module.exports = function() {
     }
 
     function clean() {
-        if (fs.existsSync('bower.json')) {
-            fs.unlinkSync('bower.json');
+        if (fs.existsSync(path.join(Constants.cwd, 'bower.json'))) {
+            fs.unlinkSync(path.join(Constants.cwd, 'bower.json'));
         }
         return Q.resolve();
     }
@@ -812,11 +812,12 @@ module.exports = function() {
                 manifest = _.extend({}, bowerJson, {dependencies:deps});
 
                 //console.log('manifest\n', JSON.stringify(manifest, null, 4));
-                JsonWriter.writeJSONSync('bower.json', manifest);
+                JsonWriter.writeJSONSync(path.join(Constants.cwd, 'bower.json'), manifest);
                 //console.log(JSON.stringify(JsonLoader.readJSONSync('bower.json'), null, 4));
                 return update(plugin, null, {
-                    directory: path.join(Constants.cwd, 'src', plugin._belongsTo),
+                    directory: path.join('src', plugin._belongsTo),
                     registry: Constants.getRegistry(),
+                    cwd:Constants.cwd,
                     force:true
                 })
                 .then(function (result) {

lib/promise/install.js

@@ -8,7 +8,7 @@ module.exports = function install (plugin, config) {
     var deferred = Q.defer();
 
     // (reliably) remove the plugin first
-    rimraf(path.join(config.directory, plugin.packageName), {disableGlob:true}, doInstall);
+    rimraf(path.join(config.cwd || '.', config.directory, plugin.packageName), {disableGlob:true}, doInstall);
 
     function doInstall(err) {
         if (err) {