* updated 'service' hook to adapt to new file structure

* version pump to 0.1.7
DURAARK · Feb 22, 2015 · a8f6da5 · a8f6da5
1 parent 23b7170
commit a8f6da5
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 32 deletions.
diff --git a/package.json b/package.json
@@ -1,14 +1,14 @@
 {
   "name": "generator-duraark",
-  "version": "0.1.6",
-  "description": "CLI for developing duraark services and UIs",
+  "version": "0.1.7",
+  "description": "CLI for scaffolding develop- and deployment environments for docker-enabled REST microservices.",
   "license": "MIT",
   "main": "app/index.js",
   "repository": "duraark/generator-duraark",
   "author": {
     "name": "Martin Hecher",
     "email": "martin.hecher@fraunhofer.at",
-    "url": "https://github.com/duraark"
+    "url": "https://github.com/DURAARK"
   },
   "engines": {
     "node": ">=0.10.0"
@@ -27,7 +27,7 @@
     "yeoman-generator": "^0.18.0",
     "chalk": "^0.5.0",
     "yosay": "^0.3.0",
-    "duraark-microservice-base": "0.2.3"
+    "duraark-microservice-base": "0.2.5"
   },
   "devDependencies": {
     "mocha": "*"

diff --git a/service/index.js b/service/index.js
@@ -17,7 +17,7 @@ module.exports = yeoman.generators.NamedBase.extend({
 
     writing: {
         copyTemplateFiles: function() {
-            var templateRoot = path.join(__dirname, '..', 'node_modules', 'duraark-microservice-base', 'src') + '/**';
+            var templateRoot = path.join(__dirname, '..', 'node_modules', 'duraark-microservice-base') + '/**';
 
             console.log('Copying template files from "' + templateRoot + '" to "' + this.bootstrapRoot + '"');
 
@@ -32,38 +32,11 @@ module.exports = yeoman.generators.NamedBase.extend({
                 serviceBaseRoot = path.join(__dirname, '..', 'node_modules', 'duraark-microservice-base'),
                 deploymentScriptsRoot = path.join(__dirname, '..', 'node_modules', 'duraark-microservice-base', 'deployment') + '/**';
 
-            console.log('Copying deployment scripts from "' + deploymentScriptsRoot + '" to "' + deploymentTarget + '"');
-
-            this.fs.copy(
-                deploymentScriptsRoot,
-                deploymentTarget
-            );
-
             var serviceInfoPath = path.join(deploymentTarget, 'service-info.txt');
 
             console.log('Configuring deployment scripts ...');
 
             this.write(serviceInfoPath, this.name);
-
-            console.log('Copying Dockerfile ...');
-
-            console.log('serviceBaseRoot: ' + path.join(serviceBaseRoot, 'Dockerfile'));
-            console.log('this.bootstrapRoot: ' + this.bootstrapRoot);
-
-            this.fs.copy(
-                path.join(serviceBaseRoot, 'Dockerfile'),
-                path.join(this.bootstrapRoot, 'Dockerfile')
-            );
-        },
-
-        setupDevelopment: function() {
-            var developmentTarget = this.bootstrapRoot + '/scripts';
-
-            console.log('Configuring development scripts ...');
-
-            var serviceInfoPath = path.join(developmentTarget, 'service-info.txt');
-
-            this.write(serviceInfoPath, this.name);
         }
     },