From a5ccd660a21beae8fe46c579819bae0cac03d439 Mon Sep 17 00:00:00 2001 From: "M@Campbell" Date: Thu, 31 Mar 2016 15:23:53 -0400 Subject: [PATCH 1/5] fixes issue: fs cannot properly delete a directory that is created by meteor --- lib/tools/meteor.js | 5 ++++- package.json | 9 +++++---- 2 files changed, 9 insertions(+), 5 deletions(-) diff --git a/lib/tools/meteor.js b/lib/tools/meteor.js index 1e05255..9655db2 100644 --- a/lib/tools/meteor.js +++ b/lib/tools/meteor.js @@ -4,6 +4,7 @@ var Future = require('fibers/future'); var path = require('path'); var fs = require('fs'); var _ = require('underscore'); +var del = require('delete'); module.exports = {}; @@ -32,7 +33,9 @@ module.exports.createEmptyMeteorProject = function createEmptyMeteorProject(name _.each(fs.readdirSync(appDirectory), function (entryPath) { if (entryPath === '.git') return; if (entryPath === '.meteor') return; - fs.unlinkSync(path.join(appDirectory, entryPath)); + // depreciate fs and use del instead. + //fs.unlinkSync(path.join(appDirectory, entryPath)); + del(path.join(appDirectory, entryPath)); }); } finally { // stop the spinny thing diff --git a/package.json b/package.json index 784382f..f66fb93 100644 --- a/package.json +++ b/package.json @@ -1,8 +1,8 @@ { - "name": "iron-meteor", - "version": "1.5.2", + "name": "rps-iron-meteor", + "version": "1.5.8", "description": "A command line tool for scaffolding Meteor applications.", - "homepage": "https://github.com/iron-meteor/iron-cli", + "homepage": "https://github.com/FBRTMaka/iron-cli", "bugs": { "url": "https://github.com/iron-meteor/iron-cli/issues", "email": "chris@eventedmind.com" @@ -21,7 +21,8 @@ "fibers": "1.0.8", "single-line-log": "0.4.1", "shell-source": "1.1.0", - "xtend": "^4.0.0" + "xtend": "^4.0.0", + "delete": "^0.3.0" }, "bin": { "iron": "./bin/iron" From dc093582f2c2e1d20246304e5df0cc8c10d9ac65 Mon Sep 17 00:00:00 2001 From: "M@Campbell" Date: Thu, 31 Mar 2016 15:25:58 -0400 Subject: [PATCH 2/5] keep package info --- package.json | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/package.json b/package.json index f66fb93..c23170f 100644 --- a/package.json +++ b/package.json @@ -1,8 +1,8 @@ { - "name": "rps-iron-meteor", - "version": "1.5.8", + "name": "iron-meteor", + "version": "1.5.2", "description": "A command line tool for scaffolding Meteor applications.", - "homepage": "https://github.com/FBRTMaka/iron-cli", + "homepage": "https://github.com/iron-meteor/iron-cli", "bugs": { "url": "https://github.com/iron-meteor/iron-cli/issues", "email": "chris@eventedmind.com" From 3f493542da4402559bdcb2c20eeaccf35a9ddd8d Mon Sep 17 00:00:00 2001 From: "M@Campbell" Date: Sun, 10 Apr 2016 08:16:05 -0400 Subject: [PATCH 3/5] this needs to be sync --- lib/tools/meteor.js | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/lib/tools/meteor.js b/lib/tools/meteor.js index 9655db2..11d0cbe 100644 --- a/lib/tools/meteor.js +++ b/lib/tools/meteor.js @@ -35,8 +35,10 @@ module.exports.createEmptyMeteorProject = function createEmptyMeteorProject(name if (entryPath === '.meteor') return; // depreciate fs and use del instead. //fs.unlinkSync(path.join(appDirectory, entryPath)); - del(path.join(appDirectory, entryPath)); + del.sync(path.join(appDirectory, entryPath)); }); + } catch(error) { + throw error; } finally { // stop the spinny thing spinHandle.stop(); From 23f0c73ac91e78ebab4b5acd3ec079f96ae99fef Mon Sep 17 00:00:00 2001 From: Matt Campbell Date: Sun, 10 Apr 2016 16:49:58 -0400 Subject: [PATCH 4/5] Update meteor.js --- lib/tools/meteor.js | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/lib/tools/meteor.js b/lib/tools/meteor.js index 11d0cbe..0e41d88 100644 --- a/lib/tools/meteor.js +++ b/lib/tools/meteor.js @@ -37,9 +37,7 @@ module.exports.createEmptyMeteorProject = function createEmptyMeteorProject(name //fs.unlinkSync(path.join(appDirectory, entryPath)); del.sync(path.join(appDirectory, entryPath)); }); - } catch(error) { - throw error; - } finally { + } finally { // stop the spinny thing spinHandle.stop(); } From 880fcbd0dc0020b791a8022a0f63920c67a45dd0 Mon Sep 17 00:00:00 2001 From: FBRTMaka Date: Sun, 10 Apr 2016 16:52:52 -0400 Subject: [PATCH 5/5] trying to get the delete requirement to work on windows --- package.json | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/package.json b/package.json index c23170f..f336e1f 100644 --- a/package.json +++ b/package.json @@ -14,15 +14,15 @@ "license": "MIT", "dependencies": { "cli-color": "0.2.3", - "minimist": "0.0.8", - "underscore": "1.8.3", "cli-table": "0.3.0", + "delete": "^0.3.0", "ejs": "0.8.5", "fibers": "1.0.8", - "single-line-log": "0.4.1", + "minimist": "0.0.8", "shell-source": "1.1.0", - "xtend": "^4.0.0", - "delete": "^0.3.0" + "single-line-log": "0.4.1", + "underscore": "1.8.3", + "xtend": "^4.0.0" }, "bin": { "iron": "./bin/iron"