From 831ff1202eb32c50bbc57aa6e54e01c4a7c6e1a9 Mon Sep 17 00:00:00 2001
From: Roman Dvornov <rdvornov@gmail.com>
Date: Wed, 17 Feb 2016 19:00:23 +0300
Subject: [PATCH] use all dependencies via npm, update dependency versions and
 related fixes

---
 .gitignore                                    |  4 ++
 .npmignore                                    |  4 ++
 README.md                                     | 12 ++----
 basis.config                                  |  8 +++-
 bower.json                                    |  8 +---
 example/showcase.html                         |  6 +--
 package.json                                  | 38 ++++++++++++-------
 src/app/index.js                              |  3 +-
 .../default/module/test-tree/index.js         |  2 +-
 .../default/module/test-tree/test.js          | 10 ++++-
 src/app/reporters/default/module/toc/index.js |  4 +-
 src/app/reporters/default/template/view.tmpl  |  2 +-
 src/lib.html                                  |  6 +--
 src/reporter.html                             |  6 +--
 src/runner.html                               |  4 +-
 src/runner/env.js                             |  2 +-
 src/runner/source/utils.js                    |  2 +-
 src/runner/test.js                            |  2 +-
 18 files changed, 72 insertions(+), 51 deletions(-)
 create mode 100644 .npmignore

diff --git a/.gitignore b/.gitignore
index c443a06..5fdf0b8 100644
--- a/.gitignore
+++ b/.gitignore
@@ -18,3 +18,7 @@ bower_components/
 node_modules/
 build/
 phantom-*.*
+res/
+*.js
+*.css
+*.html
\ No newline at end of file
diff --git a/.npmignore b/.npmignore
new file mode 100644
index 0000000..625b206
--- /dev/null
+++ b/.npmignore
@@ -0,0 +1,4 @@
+/bower_components
+/example
+/node_modules
+/scripts
diff --git a/README.md b/README.md
index 3e3c342..e348ad0 100644
--- a/README.md
+++ b/README.md
@@ -33,19 +33,15 @@ Yatra (Yet Another Test Runner) – "еще один" исполнитель м
 
     > git clone https://github.com/basisjs/yatra.git yatra
     > cd yatra
-    > bower install
+    > npm install
 
 Основной файл интерфейса – `src/reporter.html`.
 
-Для сборки необходимы инструменты [`basisjs-tools`](https://github.com/basisjs/basisjs-tools). Их можно установить локально используя `npm`:
-
-    > npm install
-    > node node_modules/basisjs-tools/bin/basis build
+Сборка:
 
-Результат сборки окажется в папке `build`. По умолчанию собирается только приложение. Для сборки `lib` или `runner`, нужно указывать явно необходимый файл.
+    > npm run build
 
-    > node node_modules/basisjs-tools/bin/basis build src/lib.html
-    > node node_modules/basisjs-tools/bin/basis build src/runner.html
+Результат сборки окажется в папке `build`.
 
 ### Использование в проекте
 
diff --git a/basis.config b/basis.config
index 18f39bc..18a998c 100644
--- a/basis.config
+++ b/basis.config
@@ -1,6 +1,10 @@
 {
   "build": {
-    "file": "src/reporter.html",
-    "sameFilenames": true
+    "sameFilenames": true,
+    "preset": {
+      "runner":   { "file": "src/runner.html" },
+      "lib":      { "file": "src/lib.html" },
+      "reporter": { "file": "src/reporter.html" }
+    }
   }
 }
diff --git a/bower.json b/bower.json
index 482d6bb..749bfdb 100644
--- a/bower.json
+++ b/bower.json
@@ -1,13 +1,9 @@
 {
   "name": "yatra",
-  "version": "1.0.0-beta",
+  "version": "1.0.3",
   "description": "User friendly unit-test runner",
   "main": "src/reporter.html",
-  "dependencies": {
-    "basisjs": "1.4.0",
-    "esprima": "1.2.2",
-    "jsdiff": "1.0.8"
-  },
+  "dependencies": {},
   "ignore": [
     ".*",
     "**/.*",
diff --git a/example/showcase.html b/example/showcase.html
index 69b3371..0e03643 100644
--- a/example/showcase.html
+++ b/example/showcase.html
@@ -21,12 +21,12 @@
     }
   </style>
 
-  <script src="../bower_components/basisjs/src/basis.js" data-basis-config="
+  <script src="../node_modules/basisjs/src/basis.js" data-basis-config="
     noConflict: true,
     exports: true,
     modules: {
-      esprima: '../bower_components/esprima/',
-      diff: '../bower_components/jsdiff/',
+      esprima: '../node_modules/esprima/',
+      diff: '../node_modules/diff/',
       runner: {
         path: '../src/runner',
         filename: './index.js'
diff --git a/package.json b/package.json
index 387070d..aa83d3a 100644
--- a/package.json
+++ b/package.json
@@ -3,12 +3,11 @@
   "title": "Yatra",
   "description": "Yatra – user friendly unit-test runner",
   "version": "1.0.3",
+  "author": "Roman Dvornov <rdvornov@gmail.com>",
+  "license": "MIT",
   "main": "src/reporter.html",
   "homepage": "https://github.com/basisjs/yatra",
-  "repository": {
-    "type": "git",
-    "url": "https://github.com/basisjs/yatra.git"
-  },
+  "repository": "basisjs/yatra",
   "keywords": [
     "test",
     "runner",
@@ -19,18 +18,29 @@
   "bugs": {
     "url": "https://github.com/basisjs/yatra/issues"
   },
-  "licenses": [
-    {
-      "type": "MIT",
-      "url": "https://github.com/basisjs/yatra/blob/master/LICENSE"
-    }
-  ],
-  "dependencies": {},
+  "dependencies": {
+    "basisjs": "~1.6.0",
+    "esprima": "2.7.2",
+    "diff": "2.2.1"
+  },
   "devDependencies": {
-    "basisjs-tools": "basisjs/basisjs-tools"
+    "basisjs-tools": "1.7.0"
   },
   "scripts": {
-    "build": "basis build src/lib.html -p && basis build src/reporter.html -p && basis build src/runner.html -p",
+    "build": "node node_modules/basisjs-tools/bin/basis build -p",
     "release": "node scripts/release.js"
-  }
+  },
+  "files": [
+    "docs",
+    "src",
+    "LICENSE",
+    "README.md",
+    "lib.css",
+    "lib.js",
+    "package.json",
+    "reporter.css",
+    "reporter.html",
+    "reporter.js",
+    "runner.js"
+  ]
 }
diff --git a/src/app/index.js b/src/app/index.js
index e227408..95f268b 100644
--- a/src/app/index.js
+++ b/src/app/index.js
@@ -1,9 +1,10 @@
+var Value = require('basis.data').Value;
 var Node = require('basis.ui').Node;
 var DataObject = require('basis.data').Object;
 var Expression = require('basis.data.value').Expression;
 
 var runner = require('runner');
-var rootTest = new basis.Token();
+var rootTest = new Value();
 var rootTestSuite = new DataObject({
   deletegate: rootTest,
   getChildNodesDataset: function(){
diff --git a/src/app/reporters/default/module/test-tree/index.js b/src/app/reporters/default/module/test-tree/index.js
index 816fede..7a88d4e 100644
--- a/src/app/reporters/default/module/test-tree/index.js
+++ b/src/app/reporters/default/module/test-tree/index.js
@@ -19,7 +19,7 @@ var view = new appTest.TestSuiteNode({
   selection: true,
   satellite: {
     sourceCode: {
-      satelliteClass: appTest.CodeView,
+      instance: appTest.CodeView,
       events: 'update stateChanged',
       existsIf: function(owner){
         return owner.data.type == 'case';
diff --git a/src/app/reporters/default/module/test-tree/test.js b/src/app/reporters/default/module/test-tree/test.js
index ed94b5a..49e9496 100644
--- a/src/app/reporters/default/module/test-tree/test.js
+++ b/src/app/reporters/default/module/test-tree/test.js
@@ -27,6 +27,8 @@ function htmlEscape(str){
 }
 
 var CodeView = Node.subclass({
+  className: 'CodeView',
+
   template: resource('./template/test-source.tmpl'),
   binding: {
     beforeCode: 'beforeElement',
@@ -203,6 +205,8 @@ var CodeView = Node.subclass({
 //
 
 var TestNode = Node.subclass({
+  className: 'TestNode',
+
   template: resource('./template/test.tmpl'),
   binding: {
     name: 'data:',
@@ -274,6 +278,8 @@ var TestNode = Node.subclass({
 });
 
 var TestSuiteNode = TestNode.subclass({
+  className: 'TestSuiteNode',
+
   dataSource: Value.factory('rootChanged', function(node){
     return node.root ? node.root.getChildNodesDataset() : null;
   }),
@@ -291,6 +297,8 @@ var TestSuiteNode = TestNode.subclass({
 });
 
 var TestCaseNode = TestNode.subclass({
+  className: 'TestCaseNode',
+
   template: resource('./template/test-case.tmpl'),
   binding: {
     source: 'satellite:'
@@ -305,7 +313,7 @@ var TestCaseNode = TestNode.subclass({
                owner.state.data.data.testSource;
       },
       delegate: 'state.data',
-      satelliteClass: CodeView
+      instance: CodeView
     }
   }
 });
diff --git a/src/app/reporters/default/module/toc/index.js b/src/app/reporters/default/module/toc/index.js
index ad52cc0..5fc738d 100644
--- a/src/app/reporters/default/module/toc/index.js
+++ b/src/app/reporters/default/module/toc/index.js
@@ -72,9 +72,7 @@ var Item = Node.subclass({
 // main view
 //
 var view = new Node({
-  dataSource: Value.factory('rootChanged', function(node){
-    return node.root.getChildNodesDataset();
-  }),
+  dataSource: Value.query('root.getChildNodesDataset()'),
 
   template: resource('./template/toc.tmpl'),
   binding: {
diff --git a/src/app/reporters/default/template/view.tmpl b/src/app/reporters/default/template/view.tmpl
index 6723236..0d0943b 100644
--- a/src/app/reporters/default/template/view.tmpl
+++ b/src/app/reporters/default/template/view.tmpl
@@ -3,7 +3,7 @@
 <b:define name="runnerState" type="enum" values="running fault ok"/>
 
 <div class="layout">
-  <div class="header" class="header_{runnerState}">
+  <div class="header header_{runnerState}">
     <div class="header__buttons">
       <button class="header-button" event-click="run">
         {l10n:button.caption.{runnerState}}
diff --git a/src/lib.html b/src/lib.html
index bc529ee..73e5eb6 100644
--- a/src/lib.html
+++ b/src/lib.html
@@ -7,12 +7,12 @@
 </head>
 
 <body>
-  <script src="../bower_components/basisjs/src/basis.js" data-basis-config="
+  <script src="../node_modules/basisjs/src/basis.js" data-basis-config="
     noConflict: true,
     exports: true,
     modules: {
-      esprima: '../bower_components/esprima/',
-      diff: '../bower_components/jsdiff/',
+      esprima: '../node_modules/esprima/',
+      diff: '../node_modules/diff/',
       runner: {
         path: 'runner',
         filename: './index.js'
diff --git a/src/reporter.html b/src/reporter.html
index c8f4b71..234a640 100644
--- a/src/reporter.html
+++ b/src/reporter.html
@@ -26,11 +26,11 @@
 </head>
 
 <body>
-  <script src="../bower_components/basisjs/src/basis.js" data-basis-config="
+  <script src="../node_modules/basisjs/src/basis.js" data-basis-config="
     noConflict: true,
     modules: {
-      esprima: '../bower_components/esprima/',
-      diff: '../bower_components/jsdiff/',
+      esprima: '../node_modules/esprima/',
+      diff: '../node_modules/diff/',
       runner: {
         path: './runner',
         filename: './index.js'
diff --git a/src/runner.html b/src/runner.html
index 0deacc6..d523d2d 100644
--- a/src/runner.html
+++ b/src/runner.html
@@ -7,10 +7,10 @@
 </head>
 
 <body>
-  <script src="../bower_components/basisjs/src/basis.js" data-basis-config="
+  <script src="../node_modules/basisjs/src/basis.js" data-basis-config="
     noConflict: true,
     modules: {
-      esprima: '../bower_components/esprima/',
+      esprima: '../node_modules/esprima/',
       runner: {
         path: 'runner',
         filename: './index.js'
diff --git a/src/runner/env.js b/src/runner/env.js
index b199f47..fa1512a 100644
--- a/src/runner/env.js
+++ b/src/runner/env.js
@@ -22,6 +22,6 @@ module.exports = {
     if (clean)
       return createEnv(html);
 
-    return envMap.resolve(html);
+    return envMap.get(html, true);
   }
 };
diff --git a/src/runner/source/utils.js b/src/runner/source/utils.js
index e279cd3..747443c 100644
--- a/src/runner/source/utils.js
+++ b/src/runner/source/utils.js
@@ -1,7 +1,7 @@
 // import esprima as regular basis.js module and as worker environment
 var esprima;
 if (typeof importScripts == 'function')
-  importScripts('../../../bower_components/esprima/esprima.js');
+  importScripts('../../../node_modules/esprima/esprima.js');
 else
   esprima = require('esprima');
 
diff --git a/src/runner/test.js b/src/runner/test.js
index 6f6a63a..f0784a0 100644
--- a/src/runner/test.js
+++ b/src/runner/test.js
@@ -177,7 +177,7 @@ var TestCase = AbstractTest.subclass({
   childClass: null,
 
   emit_update: function(delta){
-    AbstractTest.prototype.init.call(this, delta);
+    AbstractTest.prototype.emit_update.call(this, delta);
     if ('test' in delta)
     {
       this.testSource = null;