Merge pull request #35 from ng-book/ng-cli

Updates project to Angular CLI and new styleguide

Author: jashmenn

.angular-cli.json

@@ -0,0 +1,57 @@
+{
+  "$schema": "./node_modules/@angular/cli/lib/config/schema.json",
+  "project": {
+    "name": "angular-redux-chat"
+  },
+  "apps": [
+    {
+      "root": "src",
+      "outDir": "dist",
+      "assets": [
+        "assets",
+        "favicon.ico"
+      ],
+      "index": "index.html",
+      "main": "main.ts",
+      "polyfills": "polyfills.ts",
+      "test": "test.ts",
+      "tsconfig": "tsconfig.app.json",
+      "testTsconfig": "tsconfig.spec.json",
+      "prefix": "app",
+      "styles": [
+        "styles.css"
+      ],
+      "scripts": [],
+      "environmentSource": "environments/environment.ts",
+      "environments": {
+        "dev": "environments/environment.ts",
+        "prod": "environments/environment.prod.ts"
+      }
+    }
+  ],
+  "e2e": {
+    "protractor": {
+      "config": "./protractor.conf.js"
+    }
+  },
+  "lint": [
+    {
+      "project": "src/tsconfig.app.json"
+    },
+    {
+      "project": "src/tsconfig.spec.json"
+    },
+    {
+      "project": "e2e/tsconfig.e2e.json"
+    }
+  ],
+  "test": {
+    "karma": {
+      "config": "./karma.conf.js"
+    }
+  },
+  "defaults": {
+    "styleExt": "css",
+    "component": {}
+  }
+}

.editorconfig

@@ -0,0 +1,13 @@
+# Editor configuration, see http://editorconfig.org
+root = true
+
+[*]
+charset = utf-8
+indent_style = space
+indent_size = 2
+insert_final_newline = true
+trim_trailing_whitespace = true
+
+[*.md]
+max_line_length = off
+trim_trailing_whitespace = false

.gitignore

@@ -1,51 +1,41 @@
-build/
-\.\#*
-
-### Node ###
-# Logs
-logs
-*.log
-npm-debug.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
-
-# node-waf configuration
-.lock-wscript
-
-# Compiled binary addons (http://nodejs.org/api/addons.html)
-build/Release
-
-# Dependency directory
-# https://docs.npmjs.com/misc/faq#should-i-check-my-node-modules-folder-into-git
-node_modules
-
-.webpack.json
-
-
-app/ts/ChatExampleData.js
-app/ts/app.js
-app/ts/components/ChatNavBar.js
-app/ts/components/ChatThreads.js
-app/ts/components/ChatWindow.js
-app/ts/models.js
-app/ts/services/MessagesService.js
-app/ts/services/ThreadsService.js
-app/ts/services/UserService.js
-app/ts/services/services.js
-app/ts/util/FromNowPipe.js
-app/ts/util/RxPipe.js
-app/ts/util/util.js
-app/ts/util/uuid.js
-.tern-port
+# See http://help.github.com/ignore-files/ for more about ignoring files.
+
+# compiled output
+/dist
+/tmp
+
+# dependencies
+/node_modules
+
+# IDEs and editors
+/.idea
+.project
+.classpath
+.c9/
+*.launch
+.settings/
+*.sublime-workspace
+
+# IDE - VSCode
+.vscode/*
+!.vscode/settings.json
+!.vscode/tasks.json
+!.vscode/launch.json
+!.vscode/extensions.json
+
+# misc
+/.sass-cache
+/connect.lock
+/coverage/*
+/libpeerconnection.log
+npm-debug.log
+testem.log
+/typings
+
+# e2e
+/e2e/*.js
+/e2e/*.map
+
+#System Files
+.DS_Store
+Thumbs.db

.test.bats

@@ -5,23 +5,38 @@ load "${NGBOOK_ROOT}/scripts/bats/fullstack.bats"
 load "${NGBOOK_ROOT}/scripts/bats-support/load.bash"
 load "${NGBOOK_ROOT}/scripts/bats-assert/load.bash"
 
-@test "angular2-rxjs-chat e2e tests pass" {
+@test "angular-rxjs-chat unit tests pass" {
+ cd $DIR
+ run npm run test
+ assert_output --partial 'SUCCESS'
+}
+
+@test "angular-rxjs-chat e2e tests pass" {
   cd $DIR
-  run ./node_modules/.bin/protractor
+  run_ng_e2e $TEST_TMP_DIR
+  run cat ${TEST_TMP_DIR}/log.txt
   assert_output --partial 'SUCCESS'
 }
 
+@test "angular-rxjs-chat linting passes" {
+  cd $DIR
+  run npm run lint
+  assert_output --partial 'All files pass linting'
+}
+
 setup() {
+  echo "travis_fold:start:angular-rxjs-chat"
   cd $DIR
-  kill_by_port 8080
-  kill_by_grep "webpack-dev-server"
-  npm run go 3>- &
+  TEST_TMP_DIR="$(mktemp -d -t fullstackXXX)"
+  kill_ng_cli || :
+  kill_by_port 4200
   true
 }
 
 teardown() {
   cd $DIR
-  kill_by_port 8080
-  kill_by_grep "webpack-dev-server"
+  kill_ng_cli || :
+  kill_by_port 4200
+  echo "travis_fold:end:angular-rxjs-chat"
   true
 }