Merge pull request #1 from Nirajkashyap/develop

init 2

Author: Nirajkashyap

.gitignore

@@ -1,2 +1,36 @@
-node_modules
+
+# Logs
+logs
+*.log
+
+# Runtime data
+pids
+*.pid
+*.seed
+
+# Directory for instrumented libs generated by jscoverage/JSCover
+lib-cov
+
+# Coverage directory used by tools like istanbul
 coverage
+
+# Grunt intermediate storage (http://gruntjs.com/creating-plugins#storing-task-files)
+.grunt
+
+# Compiled binary addons (http://nodejs.org/api/addons.html)
+build/Release
+
+# Users Environment Variables
+.lock-wscript
+
+# OS generated files #
+.DS_Store
+ehthumbs.db
+Icon?
+Thumbs.db
+
+# Node Files #
+/node_modules/
+/bower_components/
+npm-debug.log
+/npm-debug.log.*

.travis.yml

@@ -2,5 +2,69 @@ language: node_js
 node_js:
   - 7
   - 6
-  - 4
-after_script: 'cat ./coverage/lcov.info | coveralls'
+
+addons:
+  apt:
+    sources:
+      - google-chrome
+    packages:
+      - google-chrome-stable
+
+cache:
+  directories:
+    - node_modules
+
+before_install:
+  - npm install npm@5 -g
+  - npm cache verify
+  - npm prune
+  - npm update      
+
+install:
+  - npm install
+
+after_install:
+  - echo "echoing in after_install steps"    
+
+
+before_script:
+  - npm rebuild node-sass
+  - export DISPLAY=:99.0
+  - sh -e /etc/init.d/xvfb start
+  - sleep 3  
+
+script:
+  - npm run test
+
+after_success:
+  - echo 'please write auto merge script here'
+
+env:
+  global:
+  - secure: cjSbs+51rGnIQeUV/2ekYdZ3uC+k25i5gQittuULyzJrgXMMmBl1p0T1bbC6f2xVBjKmPb09iO7jRK9wAKheD2DXI+boOXk6kppUrVRsKLGqUMVCweAa9wsdi4u8JoW9mGqJCypl0y5T/b7iJYGvHCJLadsET9mvyYCNHM63GRM=
+  - secure: R3O/O5BskbWFSqSN9G1x1EDo83MHiyLue0GVMf5cCV+eiJHkag0A7cxYVGpoWzTx+t1UArMIpGLSzuIMiBpnLsR0vjm3R8UWhYM1ruqJCqdDP1bmJ7uYKGlJau2xHG86fc+190ChSY1l5ipjyui60564Yp02scePbX1aXbQXGbY=
+  
+
+after_failure:
+  - echo "echoing in after_failure steps"
+
+after_script:
+  - echo "echoing in after_script steps and will public coverage to coveralls" 
+  - 'cat ./coverage/lcov.info | coveralls'
+
+
+before_deploy:
+- test $TRAVIS_TEST_RESULT = 0 \# check that build passed successfully
+  && cd $TRAVIS_BUILD_DIR \
+  && tar -zcvf amber-storm-$TRAVIS_BRANCH.tar.gz dist
+
+deploy:
+  provider: releases
+  api_key:
+    secure: securekeyhere
+  file: myrepo-$TRAVIS_BRANCH.tar.gz
+  skip_cleanup: true
+  on:
+    condition: $PRODBUILDCOMPLETE = true    
+    all_branches: true
+    tags: true  

generators/app/index.js

@@ -12,53 +12,53 @@ module.exports = Generator.extend({
     ));
 
     var prompts = [{
-        type: 'input',
-        name: 'name',
-        message: 'What is your project name?',
-        default: path.parse(process.cwd()).name, // Default to current folder name
-        store: true
-      },
-      {
-        type: 'input',
-        name: 'description',
-        message: 'Enter a short project description:',
-        default: '',
-        store: true
-      },
-      {
-        type: 'input',
-        name: 'version',
-        message: 'What semver version should the project start on?',
-        default: '0.0.0',
-        store: true
-      },
-      {
-        type: 'input',
-        name: 'license',
-        message: 'What license is the project distributed under?',
-        default: 'UNLICENSED',
-        store: true
-      },
-      {
-        type: 'confirm',
-        name: 'isprivate',
-        message: 'Is this a private project?',
-        default: true,
-        store: true
-      },
-      {
-        type: 'input',
-        name: 'author',
-        message: 'Who/what is the author of this project?',
-        default: '',
-        store: true
-      },
-      {
-        type: 'input',
-        name: 'username',
-        message: 'What is your github user/organisation name?',
-        store: true
-      },
+      type: 'input',
+      name: 'name',
+      message: 'What is your project name?',
+      default: path.parse(process.cwd()).name, // Default to current folder name
+      store: true
+    },
+    {
+      type: 'input',
+      name: 'description',
+      message: 'Enter a short project description:',
+      default: '',
+      store: true
+    },
+    {
+      type: 'input',
+      name: 'version',
+      message: 'What semver version should the project start on?',
+      default: '0.0.0',
+      store: true
+    },
+    {
+      type: 'input',
+      name: 'license',
+      message: 'What license is the project distributed under?',
+      default: 'UNLICENSED',
+      store: true
+    },
+    {
+      type: 'confirm',
+      name: 'isprivate',
+      message: 'Is this a private project?',
+      default: true,
+      store: true
+    },
+    {
+      type: 'input',
+      name: 'author',
+      message: 'Who/what is the author of this project?',
+      default: '',
+      store: true
+    },
+    {
+      type: 'input',
+      name: 'username',
+      message: 'What is your github user/organisation name?',
+      store: true
+    },
       // {
       //   type: 'confirm',
       //   name: 'cssprocessor',
@@ -81,23 +81,23 @@ module.exports = Generator.extend({
       //     return val.toLowerCase();
       //   }
       // },
-      {
-        type: 'confirm',
-        name: 'jquery',
-        message: 'Would you like to use jquery ?',
-        default: true
-      },
-      {
-        when: function (prompts) {
-        // console.log(prompts);
+    {
+      type: 'confirm',
+      name: 'jquery',
+      message: 'Would you like to use jquery ?',
+      default: true
+    },
+    {
+      when: function (prompts) {
+        // Console.log(prompts);
         prompts.bootstrap = false;
         return prompts.jquery;
-        },
-        type: 'confirm',
-        name: 'bootstrap',
-        message: 'Would you like to use bootstrap css 3.7 ?',
-        default: true
-      }
+      },
+      type: 'confirm',
+      name: 'bootstrap',
+      message: 'Would you like to use bootstrap css 3.7 ?',
+      default: true
+    }
     ];
 
     return this.prompt(prompts).then(function (props) {
@@ -107,8 +107,7 @@ module.exports = Generator.extend({
   },
 
   writing: function () {
-
-    // console.log(this.props.cssstyle);
+    // Console.log(this.props.cssstyle);
     // if (this.props.cssstyle === "less") {
 
     //   this.props.less = true;
@@ -117,7 +116,7 @@ module.exports = Generator.extend({
     //   this.props.less = false;
     //   this.props.scss = true;
     // }
-    
+
     // copy sample file
     this.fs.copy(
       this.templatePath('_dummyfile.txt'),
@@ -184,7 +183,7 @@ module.exports = Generator.extend({
       this.destinationPath('webpack.config.js')
     );
 
-    //console.log(this.props);
+    // Console.log(this.props);
     this.fs.copyTpl(
       this.templatePath('_package.json'),
       this.destinationPath('package.json'),
@@ -200,7 +199,7 @@ module.exports = Generator.extend({
       this.templatePath('./src'),
       this.destinationPath('./src')
     );
-    // console.log(this.props);
+    // Console.log(this.props);
     this.fs.copyTpl(
       this.templatePath('./src/app/app.module.ts'),
       this.destinationPath('./src/app/app.module.ts'),
@@ -213,8 +212,7 @@ module.exports = Generator.extend({
       this.props
     );
 
-
-    // if (this.props.cssstyle === "less") {
+    // If (this.props.cssstyle === "less") {
     //   console.log("removing sccs file");
     //   this.fs.delete(this.destinationPath('./src/*.scss'));
     // } else {
@@ -224,8 +222,8 @@ module.exports = Generator.extend({
   },
 
   install: function () {
-    // this.yarnInstall();
-    
+    // This.yarnInstall();
+
     this.installDependencies({
       yarn: true,
       npm: false,

generators/app/templates/_package.json

@@ -46,8 +46,8 @@
     "github-deploy:prod": "webpack --config config/webpack.github-deploy.js --progress --profile --env.githubProd",
     "github-deploy": "npm run github-deploy:dev",
     "lint": "npm run tslint \"src/**/*.ts\"",
-    //"precommit": "npm run lint",
-    //"prepush": "npm run lint",
+    "precommit": "npm run lint",
+    "prepush": "npm run lint",
     "postinstall": "npm run webdriver:update",
     "postversion": "git push && git push --tags",
     "preclean:install": "npm run clean",