Pull server files from http-{mock,proxy} into their own blueprint

CHANGELOG.md

@@ -11,6 +11,7 @@
     * `{{content-for 'test-body-footer'}}`
 
 * Update to Ember Data v1.0.0-beta.12
+* [BUGFIX] Create separate server blueprint to stop http-{mock,proxy} removing files [#2610](https://github.com/stefanpenner/ember-cli/pull/2610)
 
 ### 0.1.3
 

blueprints/http-mock/index.js

@@ -1,4 +1,4 @@
-var EOL = require('os').EOL;
+var Blueprint = require('../../lib/models/blueprint');
 
 module.exports = {
   description: 'Generates a mock api endpoint in /api prefix.',
@@ -12,9 +12,19 @@ module.exports = {
       path: '/' + options.entity.name.replace(/^\//, '')
     };
   },
+
+  beforeInstall: function(options) {
+    var serverBlueprint = Blueprint.lookup('server', {
+      ui: this.ui,
+      analytics: this.analytics,
+      project: this.project
+    });
+
+    return serverBlueprint.install(options);
+  },
+
   afterInstall: function() {
     return this.addPackagesToProject([
-      { name: 'morgan', target: '^1.3.2' },
       { name: 'connect-restreamer', target: '^1.0.0' }
     ]);
   }

blueprints/http-proxy/index.js

@@ -1,4 +1,4 @@
-var Promise   = require('../../lib/ext/promise');
+var Blueprint = require('../../lib/models/blueprint');
 
 module.exports = {
   description: 'Generates a relative proxy to another server.',
@@ -16,10 +16,19 @@ module.exports = {
     };
   },
 
+  beforeInstall: function(options) {
+    var serverBlueprint = Blueprint.lookup('server', {
+      ui: this.ui,
+      analytics: this.analytics,
+      project: this.project
+    });
+
+    return serverBlueprint.install(options);
+  },
+
   afterInstall: function() {
     return this.addPackagesToProject([
-      { name: 'http-proxy', target: '^1.1.6' },
-      { name: 'morgan', target: '^1.3.2' }
+      { name: 'http-proxy', target: '^1.1.6' }
     ]);
   }
 };

blueprints/server/index.js

@@ -0,0 +1,11 @@
+module.exports = {
+  description: 'Generates a server directory for mocks and proxies.',
+
+  normalizeEntityName: function() {},
+
+  afterInstall: function() {
+    return this.addPackagesToProject([
+      { name: 'morgan', target: '^1.3.2' }
+    ]);
+  }
+};

tests/acceptance/destroy-test.js

@@ -437,22 +437,14 @@ describe('Acceptance: ember destroy', function() {
 
   it('http-mock foo', function() {
     var commandArgs = ['http-mock', 'foo'];
-    var files       = [
-      'server/index.js',
-      'server/mocks/foo.js',
-      'server/.jshintrc'
-    ];
+    var files       = ['server/mocks/foo.js'];
 
     return assertDestroyAfterGenerate(commandArgs, files);
   });
 
   it('http-proxy foo', function() {
     var commandArgs = ['http-proxy', 'foo'];
-    var files       = [
-      'server/index.js',
-      'server/proxies/foo.js',
-      'server/.jshintrc'
-    ];
+    var files       = ['server/proxies/foo.js'];
 
     return assertDestroyAfterGenerate(commandArgs, files);
   });
@@ -521,4 +513,15 @@ describe('Acceptance: ember destroy', function() {
       });
   });
 
+  it('http-mock <name> does not remove server/', function() {
+    return initApp()
+      .then(function() { return generate(['http-mock', 'foo']); })
+      .then(function() { return generate(['http-mock', 'bar']); })
+      .then(function() { return destroy(['http-mock', 'foo']); })
+      .then(function() {
+        assertFile('server/index.js');
+        assertFile('server/.jshintrc');
+      });
+  });
+
 });

tests/acceptance/generate-test.js

@@ -1100,4 +1100,11 @@ describe('Acceptance: ember generate', function() {
       });
     });
   });
+
+  it('server', function() {
+    return generate(['server']).then(function() {
+      assertFile('server/index.js');
+      assertFile('server/.jshintrc');
+    });
+  });
 });

tests/acceptance/pods-destroy-test.js

@@ -439,22 +439,14 @@ describe('Acceptance: ember destroy pod', function() {
 
   it('http-mock foo --pod', function() {
     var commandArgs = ['http-mock', 'foo', '--pod'];
-    var files       = [
-      'server/index.js',
-      'server/mocks/foo.js',
-      'server/.jshintrc'
-    ];
+    var files       = ['server/mocks/foo.js'];
 
     return assertDestroyAfterGenerate(commandArgs, files);
   });
 
   it('http-proxy foo --pod', function() {
     var commandArgs = ['http-proxy', 'foo', '--pod'];
-    var files       = [
-      'server/index.js',
-      'server/proxies/foo.js',
-      'server/.jshintrc'
-    ];
+    var files       = ['server/proxies/foo.js'];
 
     return assertDestroyAfterGenerate(commandArgs, files);
   });