styling update

unknown · unknown · commit 246b50295586 · 2016-05-28T23:42:32.000-07:00
diff --git a/LICENSE b/LICENSE
@@ -0,0 +1,21 @@
+The MIT License (MIT)
+
+Copyright (c) 2016 Adam Stephenson
+
+Permission is hereby granted, free of charge, to any person obtaining a copy
+of this software and associated documentation files (the "Software"), to deal
+in the Software without restriction, including without limitation the rights
+to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+copies of the Software, and to permit persons to whom the Software is
+furnished to do so, subject to the following conditions:
+
+The above copyright notice and this permission notice shall be included in all
+copies or substantial portions of the Software.
+
+THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
+SOFTWARE.
diff --git a/generators/app/index.js b/generators/app/index.js
@@ -12,16 +12,16 @@ module.exports = yeoman.generators.Base.extend({
     this.argument('appname', {type: String, required: false});
 
     this.option('skip-install', {
-      desc: 'Whether dependencies should be installed',
-      defaults: false
+        desc: 'Whether dependencies should be installed',
+        defaults: false
     });
 
     this.sourceRoot(path.join(path.dirname(this.resolved), 'templates'));
   },
 
-  prompting: function () {
+  initialization: function () {
     this.log(yosay(
-        'Welcome to Tony Sneed\'s ' + chalk.yellow('Visual Studio Code TypeScript') + ' generator!'
+        'Welcome to Adam Stephenson\'s ' + chalk.yellow('Visual Studio Code Node-TypeScript') + ' generator!'
     ));
 
     var done = this.async();
@@ -44,51 +44,44 @@ module.exports = yeoman.generators.Base.extend({
   },
 
   writing: {
-    project: function () {
-      this.fs.copyTpl(
-        this.templatePath('_package.json'),
-        this.destinationPath('package.json'),
-        {
-          appname: this.appname
-        });
-      this.fs.copyTpl(
-        this.templatePath('_README.md'),
-        this.destinationPath('README.md'),
-        {
+        project: function () {
+        this.fs.copyTpl(
+            this.templatePath('_package.json'),
+            this.destinationPath('package.json'),
+            {
             appname: this.appname
-        });
-    },
-    files: function () {
-        this.copy('editorconfig', '.editorconfig');
-        this.copy('gitattributes', '.gitattributes');
-        this.copy('gitignore', '.gitignore');
-        this.copy('jscsrc', '.jscsrc');
-        this.copy('jshintrc', '.jshintrc');
-        this.copy('travis.yml', '.travis.yml');
-        this.copy('_gulp.config.js', 'gulp.config.js');
-        this.copy('_gulpfile.js', 'gulpfile.js');
-        this.copy('_karma.conf.js', 'karma.conf.js');
-        this.copy('_LICENSE', 'LICENSE');
-        this.copy('_SpecRunner.html', 'SpecRunner.html');
-        this.copy('_typings.json', 'typings.json');
-        this.copy('_tslint.json', 'tslint.json');
-        this.copy('_tsconfig.json', 'tsconfig.json');
+            });
+        this.fs.copyTpl(
+            this.templatePath('_README.md'),
+            this.destinationPath('README.md'),
+            {
+                appname: this.appname
+            });
+        },
+        files: function () {
+            this.copy('editorconfig', '.editorconfig');
+            this.copy('gitattributes', '.gitattributes');
+            this.copy('gitignore', '.gitignore');
+            this.copy('jscsrc', '.jscsrc');
+            this.copy('jshintrc', '.jshintrc');
+            this.copy('travis.yml', '.travis.yml');
+            this.copy('_gulp.config.js', 'gulp.config.js');
+            this.copy('_gulpfile.js', 'gulpfile.js');
+            this.copy('_karma.conf.js', 'karma.conf.js');
+            this.copy('_LICENSE', 'LICENSE');
+            this.copy('_SpecRunner.html', 'SpecRunner.html');
+            this.copy('_typings.json', 'typings.json');
+            this.copy('_tslint.json', 'tslint.json');
+            this.copy('_tsconfig.json', 'tsconfig.json');
+        },
+        directories: function () {
+            this.directory('vscode', '.vscode');
+            this.directory('_lib', 'lib');
+            this.directory('_src', 'src');
+            this.directory('_util', 'util');
+            this.directory('_typings', 'typings');
+        }
     },
-    directories: function () {
-        this.directory('vscode', '.vscode');
-        this.directory('_lib', 'lib');
-        this.directory('_src', 'src');
-        this.directory('_util', 'util');
-        this.directory('_typings', 'typings');
-    }
-  },
-
-//   install: function () {
-//     this.installDependencies({
-//       bower: false,
-//       skipInstall: this.options['skip-install']
-//     });
-//   },
 
     install: {
         npmInstall: function () {
@@ -99,7 +92,7 @@ module.exports = yeoman.generators.Base.extend({
         }
     },
 
-  end: function () {
-    this.log(chalk.yellow.bold('Installation successful!'));
-  }
+    end: function () {
+        this.log(chalk.yellow.bold('Installation successful!'));
+    }
 });
diff --git a/generators/app/templates/_LICENSE b/generators/app/templates/_LICENSE
@@ -1,6 +1,6 @@
 The MIT License (MIT)
 
-Copyright (c) 2016 Anthony Sneed
+Copyright (c) 2016 Adam Stephenson
 
 Permission is hereby granted, free of charge, to any person obtaining a copy
 of this software and associated documentation files (the "Software"), to deal
diff --git a/generators/app/templates/_SpecRunner.html b/generators/app/templates/_SpecRunner.html
@@ -12,43 +12,6 @@
     <script src="lib/jasmine-2.4.1/jasmine.js"></script>
     <script src="lib/jasmine-2.4.1/jasmine-html.js"></script>
     <script src="util/custom.boot.js"></script>
-    <!--<script>
-        /* global System */
-        // Configure systemjs to use the .js extension for imports from the src/js folder
-        System.config({
-            packages: {
-                'dist': {defaultExtension: 'js'}
-            }
-        });
-
-
-        Promise.all([
-            System.import('./dist/greeter/greeter.spec'),
-            System.import('./dist/italiangreeter/italiangreeter.spec')
-        ]).then(function() {
-            console.log('donezo');
-
-            var jasmineEnv = jasmine.getEnv();
-            jasmineEnv.execute();
-            // var htmlReporter = new jasmine.HtmlReporter({
-            //     env: env,
-            //     /*onRaiseExceptionsClick: function() { queryString.navigateWithNewParam("catch", !env.catchingExceptions()); },
-            //     onThrowExpectationsClick: function() { queryString.navigateWithNewParam("throwFailures", !env.throwingExpectationFailures()); },
-            //     onRandomClick: function() { queryString.navigateWithNewParam("random", !env.randomTests()); },
-            //     addToExistingQueryString: function(key, value) { return queryString.fullStringWithNewParam(key, value); },*/
-            //     getContainer: function() { return document.body; },
-            //     createElement: function() { return document.createElement.apply(document, arguments); },
-            //     createTextNode: function() { return document.createTextNode.apply(document, arguments); },
-            //     timer: new jasmine.Timer()
-            // });
-
-            // jasmineEnv.addReporter(reporter);
-            // setTimeout(function () {
-            //     jasmineEnv.execute();
-            // // Without this setTimeout, the specs don't always get execute in webKit browsers, I don't know why
-            // }, 10);
-        });
-    </script>-->
 
     <!-- inject:js -->
     <!-- endinject -->
diff --git a/generators/app/templates/_package.json b/generators/app/templates/_package.json
@@ -60,6 +60,7 @@
     "tslint-stylish": "^2.1.0-beta",
     "typescript": "^1.7.5",
     "typings": "^1.0.4",
+    "watchify": "^3.7.0",
     "yargs": "^3.31.0"
   }
 }
diff --git a/gulpfile.js b/gulpfile.js
@@ -2,18 +2,18 @@
 var path = require('path');
 var gulp = require('gulp');
 var eslint = require('gulp-eslint');
-var excludeGitignore = require('gulp-exclude-gitignore');
 var mocha = require('gulp-mocha');
 var istanbul = require('gulp-istanbul');
 var nsp = require('gulp-nsp');
 var plumber = require('gulp-plumber');
 
+var jsSrc = [
+  'generators/app/index.js',
+  'test/app.js'
+];
+
 gulp.task('static', function () {
-  return gulp.src([
-    'generators/app/index.js',
-    'test/app.js'
-  ])
-    .pipe(excludeGitignore())
+  return gulp.src(jsSrc)
     .pipe(eslint())
     .pipe(eslint.format())
     .pipe(eslint.failAfterError());
@@ -25,7 +25,6 @@ gulp.task('nsp', function (cb) {
 
 gulp.task('pre-test', function () {
   return gulp.src('generators/app/index.js')
-    .pipe(excludeGitignore())
     .pipe(istanbul({
       includeUntested: true
     }))
@@ -48,7 +47,7 @@ gulp.task('test', ['pre-test'], function (cb) {
 });
 
 gulp.task('watch', function () {
-  gulp.watch(['generators/**/*.js', 'test/**'], ['test']);
+  gulp.watch(jsSrc, ['test']);
 });
 
 gulp.task('prepublish', ['nsp']);
diff --git a/package.json b/package.json
@@ -1,7 +1,7 @@
 {
   "name": "generator-vscode-node-typescript",
   "version": "1.0.0",
-  "description": "",
+  "description": "Yeoman generator for Node-TypeScript projects using Visual Studio Code",
   "main": "index.js",
   "scripts": {
     "test": "echo \"Error: no test specified\" && exit 1"
@@ -10,8 +10,11 @@
     "type": "git",
     "url": "git+https://github.com/adstep/generator-vscode-node-typescript.git"
   },
-  "author": "",
-  "license": "ISC",
+  "author": {
+    "name": "Adam Stephenson",
+    "email": "stephensonadamj@gmail.com"
+  },
+  "license": "MIT",
   "bugs": {
     "url": "https://github.com/adstep/generator-vscode-node-typescript/issues"
   },
diff --git a/test/app.js b/test/app.js
@@ -6,14 +6,14 @@ var path = require('path');
 var assert = require('yeoman-assert');
 var helpers = require('yeoman-test');
 
-describe('generator-tonysneed-vscode-typescript:app', function () {
+describe('generator-vscode-node-typescript:app', function () {
   before  (function () {
     return helpers.run(path.join( __dirname, '../generators/app'))
       .withOptions({skipInstall: true})
-      .toPromise();                   // Get a Promise back for when the generator finishes
+      .toPromise();
   });
 
-  it('creates files', function () {
+  it('generates files', function () {
     assert.file([
       '.vscode/launch.json',
       '.vscode/tasks.json',
@@ -45,7 +45,7 @@ describe('generator-tonysneed-vscode-typescript:app', function () {
     ]);
   });
 
-  it('creates typings', function () {
+  it('generates typings', function () {
     assert.file([
       'typings/index.d.ts',
       'typings/globals/jasmine/index.d.ts',

Original file line number	Diff line number	Diff line change
`@@ -60,6 +60,7 @@`
`60`	`60`	`"tslint-stylish": "^2.1.0-beta",`
`61`	`61`	`"typescript": "^1.7.5",`
`62`	`62`	`"typings": "^1.0.4",`
	`63`	`+ "watchify": "^3.7.0",`
`63`	`64`	`"yargs": "^3.31.0"`
`64`	`65`	`}`
`65`	`66`	`}`