Merge branch 'master' into tests

Author: MaxymVlasov

.travis.yml

@@ -10,7 +10,7 @@ sudo: required
 # OS packages
 addons:
   apt:
-    packages: [uidmap, vagga]
+    packages: [vagga]
     sources:
       - sourceline: >-
           deb [arch=amd64 trusted=yes] http://ubuntu.zerogw.com vagga-testing main
@@ -25,11 +25,11 @@ cache:
 
 # Scripts to install dependencies
 # These are mostly honestly borrowed from https://github.com/tailhook/vagga/tree/master/.travis.yml
-before_install:
-  - 'echo ubuntu-mirror: http://mirrors.us.kernel.org/ubuntu/ > ~/.vagga.yaml'
-  - echo "$(id -un):100000:65536" | sudo tee /etc/subuid | sudo tee /etc/subgid
+before_install: 'echo ubuntu-mirror: http://mirrors.us.kernel.org/ubuntu/ > ~/.vagga.yaml'
 
-install: vagga _build nodejs-7-ubuntu-bin
+install:
+  - vagga _build nodejs-7-ubuntu-bin
+  - vagga version
 
 # Run tests
 script: vagga test

data/dataIO.js

@@ -21,19 +21,6 @@ module.exports = {
   dataIOTests
 }
 
-const url = require('url')
-const parsedStatsdUrl = url.parse(process.env.STATSD_URL, true, true)
-const StatsD = require('node-statsd')
-const statsClient = new StatsD(
-  {
-    host: parsedStatsdUrl.hostname,
-    port: parsedStatsdUrl.port
-  }
-      )
-statsClient.socket.on('error', function (error) {
-  _log_(`Error in socket: ${error}`)
-})
-
 const firstEvent = 0
 
 /**
@@ -53,8 +40,6 @@ dataIO.get = (srcName, srcType, srcLink, newJSON, oldJSON) => {
   // Save old data
   fs.renameSync(newJSON, oldJSON)
 
-  statsClient.increment('eventsparser.get')
-
   // Get data from source
   const res = request('GET', srcLink).getBody()
   const json = convertToJson(res, srcType)
@@ -106,8 +91,6 @@ dataIO.read = (srcFrom, file) => {
   let data = fs.readJsonSync(file, {'throws': false})
   data = eval(giveConfig[srcFrom].allEvents)
 
-  statsClient.gauge(`eventsparser.sources.${srcFrom}.count`, data.length)
-
   return data
 }
 
@@ -181,8 +164,6 @@ dataIO.sendtoAPI = (title, agenda, social, place, regUrl, imgUrl, whenStart, whe
     'submitter_email': process.env.EMAIL
   })
 
-  statsClient.increment('eventsparser.sendToAPI.sends')
-
   const options = {
     'hostname': process.env.HOSTNAME_URL,
     'port': process.env.HOSTNAME_PORT,
@@ -204,7 +185,6 @@ dataIO.sendtoAPI = (title, agenda, social, place, regUrl, imgUrl, whenStart, whe
   })
   req.on('error', (e) => {
     _log_(`problem with request: ${e.message}`)
-    statsClient.increment('eventsparser.sendToAPI.errors')
   })
 
   req.write(body)

package.json

@@ -25,7 +25,6 @@
     "moment": "~2.13.0",
     "node-statsd": "0.1.1",
     "sync-request": "~3.0.0",
-    "url": "0.11.0",
     "xml2json": "0.9.2",
     "yandex-translate": "~2.1.0"
   },

utils.js

@@ -117,20 +117,11 @@ function RIS (cmd, args) {
   )
 }
 
-const describe = RIS('git', ['describe'])
-const branch = RIS('git', ['rev-parse', '--abbrev-ref', 'HEAD'])
-
 /**
- * Getting build version based on 'git tags' and curent branch.
- * Patern: vMAJOR.MINOR.PATH-%branch name%-%number of commits from last tag%-%commit hash%.
- * Example: v0.5.0-vesioning-8-g65cc3b3.
- * @returns {string} version - curent build version.
+ * Get build version based on 'git tags' and current branch.
+ * Reads the app version from the env var or the file as a fallback.
+ * Pattern: vMAJOR.MINOR.PATCH-%branch name%-%number of commits from last tag%-%commit hash%.
+ * Example: v0.5.0-versioning-8-g65cc3b3.
+ * @returns {string} version - current build version.
  */
-utils.getVersion = () => {
-  const ds = describe.stdout.split('-')
-  const version = ds.length === 1
-    ? `${ds[0]}-${branch.stdout}`
-    : `${ds[0]}-${branch.stdout}-${ds[1]}-${ds[2]}`
-
-  return version
-}
+utils.getVersion = () => process.env.APP_VERSION || RIS('cat', [process.env.APP_VERSION_FILE]).stdout

vagga.yaml

@@ -6,10 +6,25 @@ containers:
       NODE_PATH: /usr/local/lib/node_modules
       NPM_CONFIG_LOGLEVEL: info
       HOSTNAME_URL: eventsmonkey.itkpi.pp.ua
+      APP_VERSION_FILE: /.app-version
+      APP_NAME: Events Parser
     setup:
     - !Ubuntu xenial
     - !Env
       <<: *env_vars
+    - !Depends .git/index
+    # Python is a dendency of node-gyp:
+    # Ref: https://github.com/nodejs/node-gyp#installation
+    - !BuildDeps [python, git]
+    - !Install [libexpat1]
+    # Generate the current version of app
+    - &generate_app_version !Sh |
+        ver=`git describe | awk -F- '{print$1}'`-`git rev-parse --abbrev-ref HEAD`
+        git describe | awk -F- '{print$2"\n"$3}' | while read sub_ver
+        do
+          ver=$ver-$sub_ver
+        done
+        echo $ver > $APP_VERSION_FILE
     # Get and install an official nodejs7 binary
     - &install_nodejs_7 !Tar
       url: https://nodejs.org/dist/v7.2.1/node-v7.2.1-linux-x64.tar.xz
@@ -21,10 +36,6 @@ containers:
     # Ref: vagga.readthedocs.io/en/latest/build_steps.html#step-NpmConfig
     - !NpmConfig
       install_node: false
-    # Python is a dendency of node-gyp:
-    # Ref: https://github.com/nodejs/node-gyp#installation
-    - !BuildDeps [python]
-    - !Install [libexpat1]
     # install dependencies from package.json, see the doc for extra options:
     # Ref: vagga.readthedocs.io/en/latest/build_steps.html#step-NpmDependencies
     - !NpmDependencies
@@ -35,10 +46,13 @@ containers:
       <<: *env_vars
     setup:
     - !Alpine v3.4
-    - !BuildDeps [binutils-gold, curl, g++, gcc, gnupg, libgcc, linux-headers, make, python]
+    - !BuildDeps [binutils-gold, curl, g++, gcc, gnupg, libgcc, linux-headers, make, python, git]
     - !Install [libstdc++]
     - !Env
       <<: *env_vars
+    - !Depends .git/index
+    # Generate the current version of app
+    - *generate_app_version
     # Add a user to make him nodejs files owner:
     - !Sh adduser -D -u 1000 node
     # Add trusted keys to the gpg registry:
@@ -72,9 +86,13 @@ containers:
       <<: *env_vars
     setup:
     - !Alpine v3.4
+    - !BuildDeps [git]
+    - !Depends .git/index
     - !Install [binutils-gold, curl, g++, gcc, gnupg, libgcc, linux-headers, make, python, libstdc++]
     - !Env
       <<: *env_vars
+    # Generate the current version of app
+    - *generate_app_version
     - !Download
       url: https://raw.githubusercontent.com/sgerrand/alpine-pkg-glibc/master/sgerrand.rsa.pub
       path: /etc/apk/keys/sgerrand.rsa.pub
@@ -93,6 +111,13 @@ containers:
     setup:
     - !Alpine v3.4
     - !BuildDeps [python, git]
+    # Catch branch changes
+    - !Depends .git/index
+    # Add env vars into build time
+    - !Env
+      <<: *env_vars
+    # Generate the current version of app
+    - *generate_app_version
     - !NpmDependencies
       file: package.json
     environ:
@@ -101,10 +126,24 @@ containers:
 commands:
   run7: !Command
     container: nodejs-7-ubuntu-bin
-    run: npm start
+    # add current version of the app to env vars
+    run: |
+      export APP_VERSION=`cat $APP_VERSION_FILE`
+      npm start
   test: !Command
     container: nodejs-7-ubuntu-bin
     run: [standard]
   run: !Command
     container: eventsparser
-    run: npm start
+    # add current version of the app to env vars
+    run: |
+      export APP_VERSION=`cat $APP_VERSION_FILE`
+      npm start
+  version: !Command
+    container: nodejs-7-ubuntu-bin
+    # add current version of the app to env vars
+    run: |
+      export APP_VERSION=`cat $APP_VERSION_FILE`
+      echo -n $APP_NAME 'version: ' >&2
+      echo -n $APP_VERSION
+      echo >&2