Merge branch 'clientBuild' into dev

Author: Francesca-Bit

.gitignore

@@ -1,4 +1,5 @@
 # Logs
+local.txt
 logs
 *.log
 npm-debug.log*

.travis.yml

@@ -1,59 +1,64 @@
-#node -pe "require('./package.json').version"
-#before_script:
-  # in master branch increment the version
-  #- npm version patch
-  #  on:
-   #     branch : master
-  #- npm install -g documentation
-  #- npm run doc
-
+before_script:
+  - |
+    if [[  $TRAVIS_BRANCH == 'clientBuild' && $TRAVIS_COMMIT_MESSAGE == *"[run deploy]"*  ]]; then
+      echo "__INCREMENT_VERSION_NUMBER__"
+      export PACKAGE_VERSION=$(npm version patch)
+      npm install -g documentation
+      npm run doc
+    fi
 
 language: node_js
 sudo: required
 node_js:
   - "stable"
+
 # travis call prepare
 # Send coverage data to Coveralls
+# Deploy terminusdb/terminus-client
 after_script:
   - npm run coveralls-after
 
 branches:
   only:
-    - dev
-    - master
+    - clientBuild
 
- before_deploy:
-     if ! [[ $TRAVIS_TAG ]]; then
-        export TRAVIS_TAG="1.$TRAVIS_BUILD_NUMBER" &&
-        npm install -g documentation &&
-        npm version patch &&
-        npm run doc
-      # Set up git user name and tag this commit
-        git config --local user.name "Francesca-Bit"  &&
-        git config --local user.email "[email protected]" &&
-        git add package.json &&
-        git commit -m "version changed travis_build_number $TRAVIS_TAG" &&
-        git push origin master &&
-        npm run git-tag;
-      fi
+before_deploy:
+  - |
+    if [[ ! $TRAVIS_VAR ]]; then
+      printf "//registry.npmjs.org/:_authToken=${NPM_TOKEN}" >> ~/.npmrc
+      npm run build
+      echo "___TRAVIS_VAR____"
+      export TRAVIS_VAR="1.$TRAVIS_BUILD_NUMBER"
+
+      git commit --amend -m "[skip travis] version changed $PACKAGE_VERSION"
+      git push https://${GITHUB_TOKEN}@github.com/$TRAVIS_REPO_SLUG HEAD:$TRAVIS_BRANCH
+      git tag -f -a "$PACKAGE_VERSION" -m "new version $PACKAGE_VERSION"
+      export LAST_HASH=$(git ls-remote https://github.com/$TRAVIS_REPO_SLUG $TRAVIS_BRANCH | awk '{ print $1}')
+      echo $LAST_HASH
+    fi
+#https://blog.travis-ci.com/2018-04-11-how_to_publish_node_js_packages_with_travis_ci_and_packagecloud/
 deploy:
-  - provider: releases
-     api_key: $GITHUB_TOKEN
-     file: public_pages/dist/*
-     skip_cleanup: true
-     on:
-       branch: master
-  -provider: pages
+  - provider: script
     skip_cleanup: true
-    github_token: $GITHUB_TOKEN  # Set in the settings page of your repository, as a secure variable
     keep_history: true
-    local_dir: public_pages
+    script: bash public_pages.sh
+    on:
+      branch: clientBuild 
+      condition: $TRAVIS_COMMIT_MESSAGE == *"[run deploy]"*
+  - provider: releases
+    target_commitish : $LAST_HASH
+    keep_history: true
+    api_key: $GITHUB_TOKEN
+    skip_cleanup: true
+    overwrite: true
     on:
-        branch: master
+      branch: clientBuild 
+      condition: $TRAVIS_COMMIT_MESSAGE == *"[run deploy]"*  
   - provider: npm
     skip_cleanup: true
     email: "[email protected]"
-    api_key: "NPM_TOKEN"
+    api_key: $NPM_TOKEN
     keep_history: true
     on:
-        branch : master
+      branch : clientBuild
+      condition: $TRAVIS_COMMIT_MESSAGE == *"[run deploy]"*

lib/viewer/chartConfig.js

@@ -104,7 +104,7 @@ WOQLChartConfig.prototype.layout=function(layout){
 }
 
 
-//default is { top: 10, right: 30, left: 0, bottom: 0 }
+//default is { top: 10, right: 30, left: 0, bottom: 80 }
 WOQLChartConfig.prototype.margin=function(marginObj){
 	if(marginObj){
 		this._margin=marginObj;
@@ -250,13 +250,23 @@ WOQLChartRule.prototype.dot=function(isVisible){
 }
 
 WOQLChartRule.prototype.labelRotate=function(angle){
-	if(angle){
+	if(angle!==undefined){
 		this.rule.labelRotate = angle;
 		return this
 	}
 	return this.rule.labelRotate;
 }
 
+//Specify the padding of x-axis. DEFAULT: { left: 0, right: 0 }
+WOQLChartRule.prototype.padding=function(paddingObj){
+	if(paddingObj){
+		this.rule.padding=paddingObj;
+		return this
+	}
+
+	return this.rule.padding;
+}
+
 /*
 * The type of xAxis or yAxis 'number' | 'category' default is 'category'.
 * The type of line chart 'basis'|'basisClosed'|'basisOpen'|'linear'|'linearClosed'|'natural'|'monotoneX'|'monotoneY'|'monotone' | 'step' | 'stepBefore' | 'stepAfter' | 

package-lock.json

@@ -1,14 +1,14 @@
 {
   "name": "@terminusdb/terminus-client",
-  "version": "1.0.2",
+  "version": "1.1.2",
   "description": "TerminusDB client library",
   "main": "index.js",
   "directories": {
     "lib": "lib",
     "test": "test"
   },
   "publishConfig": {
-   "access": "public"
+    "access": "public"
   },
   "author": "[email protected]",
   "license": "Apache-2.0",
@@ -46,17 +46,17 @@
     "webpack-dev-server": "^3.10.1"
   },
   "scripts": {
-    "versionWIN":"echo %npm_package_version%",
+    "versionWIN": "echo %npm_package_version%",
     "doc": "documentation build lib/** -f html -o public_pages/$npm_package_version/docs",
     "clean": "rimraf -r public_pages/$npm_package_version/dist",
     "test": "npm run cover",
-    "test:only": "mocha --require @babel/register --require @babel/preset-env --recursive",
+    "test:only": "mocha --require @babel/register --require @babel/preset-env --recursive  ",
     "test:watch": "mocha --watch --require @babel/register --require @babel/preset-env --recursive",
     "test:examples": "node examples/",
     "cover": "nyc --check-coverage --lines 30 npm run test:only ",
     "lint": "echo todo",
     "build": "webpack --mode production",
-    "prepare": "npm run clean && npm run test && npm run build",
+    "prepare": "npm run clean && npm run test",
     "coveralls-after": "nyc report --reporter=text-lcov | coveralls",
     "npm:publish": "npm publish --access public",
     "test-single": "mocha $1",

package.json

@@ -0,0 +1,25 @@
+#!/bin/bash
+echo "___SONO IN SCRIPT____"
+
+
+PUBLICATION_BRANCH=gh-pages
+# Checkout the branch
+REPO_PATH=$PWD
+
+echo "$REPO_PATH"
+
+pushd "$HOME" || exit
+git clone --branch=$PUBLICATION_BRANCH  "https://${GITHUB_TOKEN}@github.com/$TRAVIS_REPO_SLUG" tmp_pages 2>&1 > /dev/null
+cd tmp_pages || exit
+
+#rm -rf 1.1.4
+
+# Update pages
+cp -r $REPO_PATH/public_pages/.  .
+# Commit and push latest version
+git add .
+git config user.name  "Travis"
+git config user.email "[email protected]"
+git commit -m "Updated version."
+git push -fq origin $PUBLICATION_BRANCH 2>&1 > /dev/null
+popd || exit

public_pages.sh

@@ -22,3 +22,4 @@ describe('Object Frame Rules', function () {
     })
 })
 
+