correct release versioning and socket api url

Author: samuelcolvin

config.js

@@ -1,21 +1,27 @@
 var path = require('path')
 
-if (process.env['TRAVIS_TAG']) {
-  console.log(`detected TRAVIS_TAG "${process.env['TRAVIS_TAG']}", building for release deploy.`)
-  if (process.env['TRAVIS_TAG'] !== process.env.npm_package_version) {
-    throw `travis tag does not match npm_pckage_version: \
-${process.env['TRAVIS_TAG']} vs ${process.env.npm_package_version}`
+var prod_build_dir, prod_public_path, version
+if (process.env.TRAVIS_TAG) {
+  console.log(`detected TRAVIS_TAG "${process.env.TRAVIS_TAG}", building for release deploy.`)
+  if (process.env.TRAVIS_TAG !== process.env.npm_package_version) {
+    throw `travis tag doesn't match npm_pckage_version: ${process.env.TRAVIS_TAG} vs ${process.env.npm_package_version}`
   }
-  var prod_build_dir = path.resolve(__dirname, 'dist', process.env.npm_package_version)
-  var prod_public_path = 'https://cdn.tutorcruncher.com/socket/' + process.env.npm_package_version + '/'
+  prod_build_dir = path.resolve(__dirname, 'dist', process.env.npm_package_version)
+  prod_public_path = 'https://cdn.tutorcruncher.com/socket/' + process.env.npm_package_version + '/'
+  version = `${process.env.npm_package_version}`
 } else {
-  var prod_build_dir = path.resolve(__dirname, 'dist', 'dev', process.env.npm_package_version)
-  var prod_public_path = 'https://cdn.tutorcruncher.com/socket/dev/' + process.env.npm_package_version + '/'
+  prod_build_dir = path.resolve(__dirname, 'dist', 'dev', process.env.npm_package_version)
+  prod_public_path = 'https://cdn.tutorcruncher.com/socket/dev/' + process.env.npm_package_version + '/'
+  version = `${process.env.npm_package_version}-${process.env.TRAVIS_COMMIT}`
 }
 
 module.exports = {
   build: {
-    env: {NODE_ENV: '"production"'},
+    env: {
+      NODE_ENV: '"production"',
+      RELEASE: `"${version}"`,
+      SOCKET_API_URL: '"https://socket.tutorcruncher.com"',
+    },
     build_dir: prod_build_dir,
     public_path: prod_public_path,
     css_source_map: false,
@@ -24,22 +30,30 @@ module.exports = {
   TutorCruncher socket frontend, Copyright (c) 2017 TutorCruncher ltd.
   Released under the MIT license, see https://github.com/tutorcruncher/socket-frontend/
 
- * package version: ${process.env.npm_package_version}
- * build time:      ${new Date()}
- * tag:             ${process.env.TRAVIS_TAG || '-'}
- * branch:          ${process.env.TRAVIS_BRANCH || '-'}
- * commit sha:      ${process.env.TRAVIS_COMMIT || '-'}
+ * version:    ${version}
+ * build time: ${new Date()}
+ * tag:        ${process.env.TRAVIS_TAG || '-'}
+ * branch:     ${process.env.TRAVIS_BRANCH || '-'}
+ * commit sha: ${process.env.TRAVIS_COMMIT || '-'}
 */`,
   },
   dev: {
-    env: {NODE_ENV: '"development"'},
+    env: {
+      NODE_ENV: '"development"',
+      RELEASE: '"development"',
+      SOCKET_API_URL: '"api/"',
+    },
     port: 8000,
     build_dir: path.resolve(__dirname, 'dev'),
     css_source_map: true,
     public_path: '/',
   },
   test: {
-    env: {NODE_ENV: '"testing"'},
+    env: {
+      NODE_ENV: '"testing"',
+      RELEASE: '"testing"',
+      SOCKET_API_URL: '""',
+    },
     build_dir: path.resolve(__dirname, 'dist-test'),
     css_source_map: true,
     public_path: '/',

src/main.js

@@ -7,7 +7,7 @@ import grid from './components/grid'
 import modal from './components/modal'
 
 let dsn = process.env.NODE_ENV === 'production' && 'https://[email protected]/128441'
-Raven.config(dsn).addPlugin(RavenVue, Vue).install()
+Raven.config(dsn, {release: process.env.RELEASE}).addPlugin(RavenVue, Vue).install()
 
 Vue.use(VueRouter)
 
@@ -33,7 +33,7 @@ module.exports = function (config) {
   config = config || {}
 
   if (config.root_url === undefined) {
-    config.root_url = ''  // TODO
+    config.root_url = process.env.SOCKET_API_URL
   }
 
   if (config.element === undefined) {
@@ -72,7 +72,7 @@ module.exports = function (config) {
       // get_data is called by components, eg. grid
       get_data: function () {
         let xhr = new window.XMLHttpRequest()
-        let url = config.root_url + '/api/contractors.json'
+        let url = config.root_url + '/contractors.json'
         xhr.open('GET', url)
         xhr.onload = () => {
           let contractors
@@ -94,7 +94,7 @@ response status: ${xhr.status}
 
 response text:
 ${xhr.responseText}`
-            Raven.captureException(e)
+            Raven.captureException(new Error(this.error))
           }
         }
         xhr.send()

test/unit/specs/main.js

@@ -39,7 +39,7 @@ describe('main.vue', () => {
   before(() => {
     server = sinon.fakeServer.create()
     server.autoRespond = true
-    server.respondWith('/api/contractors.json', dft_response)
+    server.respondWith('/contractors.json', dft_response)
   })
   after(() => { server.restore() })
 
@@ -63,7 +63,7 @@ describe('main.vue', () => {
   before(() => {
     server = sinon.fakeServer.create()
     server.autoRespond = true
-    server.respondWith('/api/contractors.json', [404, {}, 'badness'])
+    server.respondWith('/contractors.json', [404, {}, 'badness'])
   })
   after(() => { server.restore() })