references #254, adding bower.json, removing old artifacts

dbashford · Aug 14, 2013 · 3375b1c · 3375b1c
1 parent 0a4ea42
commit 3375b1c
Show file tree

Hide file tree

Showing 5 changed files with 29 additions and 44 deletions.
diff --git a/lib/command/new.js b/lib/command/new.js
@@ -70,6 +70,7 @@ NewCommand = (function() {
     this.program = program;
     this._done = __bind(this._done, this);
     this.removeFromPackageDeps = __bind(this.removeFromPackageDeps, this);
+    this._modifyBowerJSONName = __bind(this._modifyBowerJSONName, this);
     this._create = __bind(this._create, this);
     this._createWithDefaults = __bind(this._createWithDefaults, this);
     this._prompting = __bind(this._prompting, this);
@@ -169,11 +170,22 @@ NewCommand = (function() {
     } else {
       this._usingOwnServer(name, chosen);
     }
+    this._modifyBowerJSONName(name);
     this._moveViews(chosen);
     logger.debug("Renaming .gitignore");
     return fs.renameSync(path.join(this.skeletonOutPath, ".ignore"), path.join(this.skeletonOutPath, ".gitignore"));
   };
 
+  NewCommand.prototype._modifyBowerJSONName = function(name) {
+    var bowerJson, bowerPath;
+    if (name) {
+      bowerPath = path.join(this.skeletonOutPath, "bower.json");
+      bowerJson = require(bowerPath);
+      bowerJson.name = name;
+      return fs.writeFileSync(bowerPath, JSON.stringify(bowerJson, null, 2));
+    }
+  };
+
   NewCommand.prototype._moveDirectoryContents = function(sourcePath, outPath) {
     var fileContents, fileStats, fullOutPath, fullSourcePath, item, _i, _len, _ref, _results;
     if (!fs.existsSync(outPath)) {
@@ -240,8 +252,6 @@ NewCommand = (function() {
     safePaths = _.flatten([comps.javascript.defaultExtensions, comps.css.defaultExtensions, comps.template.defaultExtensions]).map(function(path) {
       return "\\." + path + "$";
     });
-    safePaths.push("jquery\.js");
-    safePaths.push("require\.js");
     assetsPath = path.join(this.skeletonOutPath, 'assets');
     allItems = wrench.readdirSyncRecursive(assetsPath);
     files = allItems.filter(function(i) {

diff --git a/skeletons/project/assets/javascripts/vendor/jquery.js b/skeletons/project/assets/javascripts/vendor/jquery.js
diff --git a/skeletons/project/assets/javascripts/vendor/require.js b/skeletons/project/assets/javascripts/vendor/require.js
diff --git a/skeletons/project/bower.json b/skeletons/project/bower.json
@@ -0,0 +1,8 @@
+{
+  "name": "appname",
+  "version": "0.1.0",
+  "dependencies": {
+    "jquery":"2.0.3",
+    "requirejs":"2.1.8"
+  }
+}
diff --git a/src/command/new.coffee b/src/command/new.coffee
@@ -146,11 +146,20 @@ class NewCommand
     else
       @_usingOwnServer name, chosen
 
+    @_modifyBowerJSONName name
+
     @_moveViews chosen
 
     logger.debug "Renaming .gitignore"
     fs.renameSync (path.join @skeletonOutPath, ".ignore"), (path.join @skeletonOutPath, ".gitignore")
 
+  _modifyBowerJSONName: (name) =>
+    if name
+      bowerPath = path.join @skeletonOutPath, "bower.json"
+      bowerJson = require(bowerPath)
+      bowerJson.name = name
+      fs.writeFileSync bowerPath, JSON.stringify(bowerJson, null, 2)
+
   _moveDirectoryContents: (sourcePath, outPath) ->
     unless fs.existsSync outPath
       fs.mkdirSync outPath
@@ -199,8 +208,6 @@ class NewCommand
   _copyCompilerSpecificExampleFiles: (comps) ->
     safePaths = _.flatten([comps.javascript.defaultExtensions, comps.css.defaultExtensions, comps.template.defaultExtensions]).map (path) ->
       "\\.#{path}$"
-    safePaths.push "jquery\.js"
-    safePaths.push "require\.js"
 
     assetsPath = path.join @skeletonOutPath,  'assets'
     allItems = wrench.readdirSyncRecursive(assetsPath)