Merge pull request #75 from phovea/release_0.1.0

Release 0.1.0

.gitattributes

@@ -67,6 +67,7 @@
 # build config
 *.npmignore text
 *.bowerrc text
+Dockerfile text eof=LF
 
 # Heroku
 Procfile text
@@ -123,4 +124,4 @@ AUTHORS text
 # Note: .db, .p, and .pkl files are associated
 # with the python modules ``pickle``, ``dbm.*``,
 # ``shelve``, ``marshal``, ``anydbm``, & ``bsddb``
-# (among others).
+# (among others).

.travis.yml

@@ -1,27 +1,30 @@
 language: node_js
-
 node_js:
 - 6
-
+addons:
+  firefox: 49.0.1
 before_install:
 - export DISPLAY=:99.0
 - sh -e /etc/init.d/xvfb start
 - if [[ `npm -v` != 3* ]]; then npm i -g npm@3; fi
-
-addons:
-  firefox: 49.0.1 
-script: npm run dist
-
-deploy:
-  provider: releases
-  api_key:
-    secure: TK9/P34Bi3WuppiDrBCwVcn41yCBwmILaU8hXTBzUPbT7TbeFIwsC6/4CtH85Z+ZrUve4S5pTmWRNf2dQDxWw3uYu7+bJuemV2J1LHG76mognj+TNEiYxfLQUt3Gql4W7C7FcI4Rlx5/uMN9wY1wro8TWUBMwT6jjSrUWIvK3GXoojd5bHvJx07XpjWl9wCon4D0ruZiFoM2mdeP23lbc2GckETi32oEKswnQXxkMACmxbPzoWbvkxH4aK8Bt2Rj2sl2TbPhVkN6DAkHGkGAvLI+2/aRfG27+oo3OKsaDjbuGABct8TfZccJ970CbQ8kbnCjYxstvqkg1JWjF0W67sX/flBZZOEUA5l0OLWo6HqMGMxm7/lEQhIdPMsRmvXL+HVOxkMrB2dda58QzxVwiZp+rRqUaeabPZp8Kl5xodGrVxsBvxe6zAbJ5jCtCSumG6+kLyKI00/kYlghqQNrgUw0ZsYJlQ34h3lo/24QpaeyDpQoCkGWQgtgqiXGpeKSu7bCnOqIqAy3nbT9Utwj7K8gIasTG5idosEAz/THMampNbGDuyxxc340sYGNMg9Bhm1g2ILWRdtV470p5hwBtIDTKi3/PAizEO26+Wh0zI47Sg3ao57avcbCsTmzbZUeA5J4bojmchhJCHX8su9cSCGh/2fJA/1eBIgEvOQ8LNE=
-  file: dist/phovea_importer.tar.gz
-  on:
-    tags: true
-
+script: npm run dist  
 notifications:
   slack:
-    secure: E8/1UIdHSczUbN+6i6gd1d5LM4vmLdwLQ30tpyjvnM0wvfDce76oPxLJAy240WJ5ybXRZUtNrttpVpt4tEXCy8aLFCmxD7s77rVloH+q1J8R/ptTFWZGhFGEujk1awEmVbzcWxJkV9/JENQaeGBKxwv8/EQwWwEkAb7p/+AJb9owmH88b3wUZUGHBWtbMiyyaF4Rm1Wg1stJB8Z1Ga7PRF4cqufTgcDdsCPVv9gAY+VxOIGqX/Vfuc9UWpUH8vq8lHUE7Inn5QS78kuFfSgLWga3H6Mu/Gko1XNlWk0QWWQBUvEZ6ZC6Wuo68KzvUjJHDTnx8WyfHue2JNHIslcX+eJq2WHLeEgM24VeNkILCGo/H/60NGHiSjrIv/Y9h6bQ9FDjo6TUyE4nbdPYN1RN9FQ5UbI9Y4Gi753H9mqnHWlEywBOzHxdZCAuz9Wh03CCF/blsvJ+Obbyo6Jrfe+g44jyi9kQdBNQ78qG6v4EXws8FiYao6x3PpgIwFix42Cpr+soAh5FpA3C1zHSAyZZpXF65/lrDl5yPNofK7Wy0B9bw+0I6Z/u7ZKFNVZXvYPGYvtUVcsALGBdmYc61+LCta36Po0KZseWVAlJj6QnOJDYzv0wvV/zsuf9A5KpYFGiqV9Q7zmtiO5FYF5sBy+lE7O9tHVO4O18IRndhRQgxhs=
+    secure: CF9m1jVv+0A8/d9nMrNiYB0zRUNy6Fw3PzIKaun3buTLIJEIu+kkVmgoliym7Q90mvZhSryp49gyVNa2pjSXPUhcrCL0CtlXrGQkwa+1CkCmx+uXi3UdsOxYbq3hZeIwU2OYUTGAixEACvD6Up1YkmMzA8oNfKckMOEvPdRu2ZMWsUICIcRikJzaDxt86Bik5fBLUzfNCY3/Y37iUmKqd2DRpibkR6h5p3HCyJ63VgeSQxPs+nSg1IU5XEshR0XEoUD9x6gIp4GW24AC/u9bdwsPW2l3CER1HnuiVhUf/3CK91kjoOjoGnhwfYwzSyXjggRPfXfrF1IFV7mX753swzSTAs2B6JScjOZjmJgYqFsGjqjO7XWqu6wUw2n4djIlCrhWlOSwMNpHH+Zuv+joPjqkZMlR+Nj41gQ80Ws59ySNfRnBMIlskh96cMTvzXPFqHiEhCN9KOMM7EaYK7XoVqYxfot0xvzlbJlZZThyOpl93plgvNStfWSXXi3bhhpl1Isr1rlIdRpc0SKZU6LlgcWQ1SV2Z+XpuqBt35MzFq+7BIg+cI2J7kXHzCUTrl9SiYXIsVdI02HOEVAc/s35YzsJtN6P1E591gmqzTvNS2y6J1f0uIkCuOOHaOuJTAhpXR5iFxz1lv5e6eWwyYCh4GkBU9A6p2cSCWVPKh62LWc=
     on_success: change
     on_failure: always
+deploy:
+  - provider: releases
+    api_key:
+      secure: BGCnDLiNvtTq6ZYdcTspCpUKYiBU7xpbDMl54dBv/ujP4CFtqIPEU+TTYM7eO6Oi3v8y4DFlLfBT6TZinDTJrzGvsWVhPlvcKYroMQdNgPwmHPE/zDxAltWTpT/u/TxMX5DbsdHzg7BETCiSU/0CiwMikWb8jPyO16kyJO3POZClTPisv5inOEo2XOzI5uxib9JAZJLe2lOFD5ObM1erodnk4964z8RHxt+Izc1GONj9QayoOQJSWwMC3ed1s8sw/RLmV6OuarXwJjXe5beth2evz60h/4TmRhGcNp++JChT4al6sHEE8L3durJMtmhX7pXFTzkfDB7N1VF1T9m+Y71VxqAeEP92Hgj7ADtkNI72UJz4aeqh4APvMF+Y4GeILwOtoHpKSvXU+zO7gtp+pSPgk8DpRS2nsNad082rPLIsjGZyD92lj3Hs7+v/6NcQMRsQdDkAvbPkBj17itTGMuG37yT79pZCltBC8PkxiSDQnjUW5UMAYAR31QBqnQ1tq65LMKoPpducWyyGek6XUb7A1Zrl480lOv0F7R7mH9jp0D0T014QZZSI7BAVYOHCgeH6t8OlfH8P1694iSeKWR8rCRaPD+z69D58gftW7zMY/lJGlpjZpbdb0rHsgT/AlRQ92Un1VQNoKnnxZ/TJAf8uBpHUcaR5SlKbKco2Zko=
+    file: dist/phovea_importer.tar.gz
+    on:
+      tags: true
+      repo: phovea/phovea_importer
+  - provider: npm
+    email: [email protected]
+    api_key:
+      secure: EqIRx6qYyXVXl0YVBwNS7kAiZFEKYYJCmAw74KasWRfuTDE87eAHS6vYh8PcRVSf6O82ii4BLk0t1u3c5EtkNv9Q6JutHg3661/NhHU4OleaddrdmHIjHuxX4fyLeN8cDgckl+Vh8uRNfdsxma6ASB+lOBpoOrIWmplHOaM1Fi93ciAwLgB4ghUkX5qxBDprDijajPjslK4kPoet+A3CWaZneTAerpAkeTDT+aoB8exZb00dNNetJXg7frfkmVZDhT2IWTZsPIBCdDXsBcUOpR9jlNTiavuSr8AzYpIiIIVyfIK7J6w+evC/GbBraAqcq03RAO31SNt7uWNjcMIk4ZtXbQmGspVT9IJCtfFtv0OYHBMVL4LcLR1O1lE4+lkaBhprDKioMZgyDwzfB3tR0bTcrT/An2HbuCMDAv6wi119Hih8/Y2uNWT7h9o00rhpRnpBbjVBXattEbc6CtkI2gRbqZXmsKBZ6DkQUxJ+bKx8ADvRRO8iL9iWgJDnhELxvCHFvgiew1R4cQjMy3vKQiN4R710VsLTPervyUt9YCparBh9MnndIy/2Vi3yKICIz58m68I76nb4776OaVg+l39jD7N7oLh1ppuwWmKS5/vhC9x/77xgtA+p9DAGjgaYNaZiruTXfZBNWjFGhsyiKy+kHLhsPYhIQ1wQPfYi8fw=
+    on:
+      tags: true
+      repo: phovea/phovea_importer

ISSUE_TEMPLATE.md

@@ -14,4 +14,4 @@
 * Static or animated images showing the UI behavior
 
 ### Expected behavior
-*
+* 

README.md

@@ -31,7 +31,7 @@ npm run build
 ***
 
 <a href="https://caleydo.org"><img src="http://caleydo.org/assets/images/logos/caleydo.svg" align="left" width="200px" hspace="10" vspace="6"></a>
-This repository is part of **[Phovea](http://phovea.caleydo.org/)**, a platform for developing web-based visualization applications. For tutorials, API docs, and more information about the build and deployment process, see the [documentation page](http://caleydo.org/documentation/).
+This repository is part of **[Phovea](http://phovea.caleydo.org/)**, a platform for developing web-based visualization applications. For tutorials, API docs, and more information about the build and deployment process, see the [documentation page](http://phovea.caleydo.org).
 
 
 [phovea-image]: https://img.shields.io/badge/Phovea-Client%20Plugin-F47D20.svg
@@ -40,5 +40,5 @@ This repository is part of **[Phovea](http://phovea.caleydo.org/)**, a platform
 [npm-url]: https://npmjs.org/package/phovea_importer
 [travis-image]: https://travis-ci.org/phovea/phovea_importer.svg?branch=master
 [travis-url]: https://travis-ci.org/phovea/phovea_importer
-[daviddm-image]: https://david-dm.org/phovea/phovea_importer.svg?theme=shields.io
+[daviddm-image]: https://david-dm.org/phovea/phovea_importer/status.svg
 [daviddm-url]: https://david-dm.org/phovea/phovea_importer

buildInfo.js

@@ -50,28 +50,29 @@ function cleanupDependency(d) {
   return d;
 }
 
-function resolveUeber() {
+function resolveWorkspace() {
   console.log('resolve parent');
-  const ueberDeps = dependencyGraph('..').dependencies;
+  const workspaceDeps = dependencyGraph('..').dependencies;
   const modules = new Set(resolveModules());
 
   const resolveModule = (m) => {
     console.log('resolve', m);
     const pkg = require(`../${m}/package.json`);
     const head = gitHead('../' + m);
+    const repo = pkg.repository.url;
     return {
       name: pkg.name,
       version: pkg.version,
-      resolved: head ? `${pkg.repository.url}#${head}` : pkg.version,
+      resolved: head ? `${repo.endsWith('.git') ? repo.slice(0, repo.length-4) : repo}/commit/${head}` : pkg.version,
       dependencies: deps(pkg.dependencies)
     };
   };
   const deps = (deps) => {
     const r = {};
     Object.keys(deps).forEach((d) => {
-      if (d in ueberDeps) {
-        r[d] = cleanupDependency(ueberDeps[d]);
-        delete ueberDeps[d];
+      if (d in workspaceDeps) {
+        r[d] = cleanupDependency(workspaceDeps[d]);
+        delete workspaceDeps[d];
       } else if (modules.has(d)) {
         modules.delete(d);
         r[d] = resolveModule(d);
@@ -103,7 +104,7 @@ function resolveSingle() {
   const pkg = require(`./package.json`);
   const head = gitHead('.');
   const deps = {};
-  Object.keys(self.dependencies).forEach((d) => {
+  Object.keys(self.dependencies || {}).forEach((d) => {
     deps[d] = cleanupDependency(self.dependencies[d]);
   });
   return {
@@ -117,9 +118,9 @@ function resolveSingle() {
 
 function generate() {
   console.log('building buildInfo');
-  const isUeberContext = fs.existsSync('../phovea_registry.js');
-  if (isUeberContext) {
-    return resolveUeber();
+  const isWorkspaceContext = fs.existsSync('../phovea_registry.js');
+  if (isWorkspaceContext) {
+    return resolveWorkspace();
   } else {
     return resolveSingle();
   }

index.js

@@ -20,30 +20,32 @@ var INDEX_FILE = './index.ts';
  * @returns {number}
  */
 function byName(a, b) {
-    if (a === INDEX_FILE) {
-        return a === b ? 0 : -1;
-    }
-    if (b === INDEX_FILE) {
-        return 1;
-    }
-    return a.toLowerCase().localeCompare(b.toLowerCase());
+  if (a === INDEX_FILE) {
+    return a === b ? 0 : -1;
+  }
+  if (b === INDEX_FILE) {
+    return 1;
+  }
+  return a.toLowerCase().localeCompare(b.toLowerCase());
 }
 //list all modules in the src folder excluding the one starting with _
-var req = require.context('./src', false, /\/[^_].*\.tsx?$/);
+var req = require.context('./src', true, /^\.\/(?!internal)(([^_][\w]+)|(\w+\/index))\.tsx?$/);
 
 var files = req.keys().sort(byName);
 
 //root file exists? else use anonymous root object
 if (files[0] === INDEX_FILE) {
-    module.exports = req(files.shift());
+  module.exports = req(files.shift());
 } else {
-    module.exports = {};
+  module.exports = {};
 }
 
 //generate getter for all modules
 files.forEach(function (f) {
-    Object.defineProperty(module.exports, f.substring(2, f.length - 3), {
-        get: function () { return req(f); },
-        enumerable: true
-    });
+  Object.defineProperty(module.exports, f.substring(2, f.lastIndexOf('/index.') > 0 ? f.lastIndexOf('/index.') : f.lastIndexOf('.')), {
+    get: function () {
+      return req(f);
+    },
+    enumerable: true
+  });
 });

package.json

@@ -17,9 +17,9 @@
     "compile": "tsc",
     "lint": "tslint -c tslint.json src/**.ts tests/**.ts",
     "docs": "typedoc --options typedoc.json src/**.ts",
-    "prebuild": "npm run test",
+    "prebuild": "node -e \"process.exit(process.env.PHOVEA_SKIP_TESTS === undefined?1:0)\" || npm run test",
     "pretest": "npm run compile",
-    "test": "karma start",
+    "test": "test ! -d tests || karma start",
     "posttest": "npm run lint",
     "test:watch": "karma start --autoWatch=true --singleRun=false",
     "build:dev": "webpack",
@@ -30,44 +30,45 @@
     "release:major": "npm version major && npm publish && git push --follow-tags",
     "release:minor": "npm version minor && npm publish && git push --follow-tags",
     "release:patch": "npm version patch && npm publish && git push --follow-tags",
-    "predist": "npm run build",
+    "predist": "npm run build && npm run docs",
     "dist": "mkdirp dist && cd build && tar cvzf ../dist/phovea_importer.tar.gz *"
   },
   "devDependencies": {
-    "@types/jasmine": "2.5.35",
-    "awesome-typescript-loader": "2.2.4",
-    "css-loader": "0.25.0",
-    "extract-text-webpack-plugin": "2.0.0-beta.4",
-    "file-loader": "0.9.0",
+    "@types/jasmine": "2.5.41",
+    "awesome-typescript-loader": "3.0.3",
+    "css-loader": "0.26.1",
+    "extract-text-webpack-plugin": "2.0.0-rc.3",
+    "file-loader": "0.10.0",
     "html-loader": "0.4.4",
-    "imports-loader": "0.6.5",
-    "jasmine": "2.5.2",
+    "imports-loader": "0.7.0",
+    "jasmine": "2.5.3",
     "json-loader": "0.5.4",
-    "karma": "1.3.0",
+    "karma": "1.4.0",
     "karma-chrome-launcher": "2.0.0",
     "karma-firefox-launcher": "1.0.0",
-    "karma-jasmine": "1.0.2",
-    "karma-junit-reporter": "1.1.0",
+    "karma-jasmine": "1.1.0",
+    "karma-junit-reporter": "2.0.0",
     "karma-sourcemap-loader": "0.3.7",
-    "karma-webpack": "1.8.0",
-    "node-sass": "3.10.0",
+    "karma-webpack": "2.0.2",
+    "node-sass": "4.5.0",
     "null-loader": "0.1.1",
     "raw-loader": "0.5.1",
-    "sass-loader": "4.0.2",
+    "sass-loader": "5.0.0",
     "style-loader": "0.13.1",
-    "tslint": "3.15.1",
-    "typedoc": "0.5.1",
-    "typescript": "2.0.6",
+    "tslint": "4.4.2",
+    "typedoc": "0.5.5",
+    "typescript": "2.2.0",
     "url-loader": "0.5.7",
-    "webpack": "2.1.0-beta.26",
-    "webpack-dev-server": "2.1.0-beta.10",
+    "webpack": "2.2.1",
+    "webpack-dev-server": "2.3.0",
     "mkdirp": "0.5.1",
-    "extract-loader": "0.0.2"
+    "extract-loader": "0.1.0",
+    "tslib": "1.5.0"
   },
   "dependencies": {
-    "phovea_core": "github:phovea/phovea_core#v0.0.5",
-    "phovea_ui": "github:phovea/phovea_ui#v0.0.5",
-    "phovea_d3": "github:phovea/phovea_d3#v0.0.5",
+    "phovea_core": "0.1.0",
+    "phovea_ui": "0.1.0",
+    "phovea_d3": "0.1.0",
     "@types/papaparse": "4.1.28",
     "papaparse": "4.1.2",
     "@types/d3": "3.5.36",
@@ -76,7 +77,7 @@
   "name": "phovea_importer",
   "description": "Flexible Smart and Visual Data Importer for Web Based Visualization",
   "homepage": "https://github.com/Caleydo/caleydo_importer",
-  "version": "0.0.5",
+  "version": "0.1.0",
   "author": {
     "name": "The Caleydo Team",
     "email": "[email protected]",