Convert to ES6 (segmentio#110)

Author: Vadim Demedes

bin/analytics

@@ -1,9 +1,26 @@
 #!/usr/bin/env node
+'use strict'
 
-var Analytics = require('..')
-var assert = require('assert')
-var pkg = require('../package.json')
-var program = require('commander')
+const assert = require('assert')
+const program = require('commander')
+const Analytics = require('..')
+const pkg = require('../package')
+
+const run = (method, options) => {
+  const writeKey = process.env.SEGMENT_WRITE_KEY || program.writeKey
+  assert(writeKey, 'You need to define your write key via the $SEGMENT_WRITE_KEY environment variable or the --write-key flag.')
+
+  const analytics = new Analytics(writeKey, { flushAt: 1 })
+  analytics[method](options, err => {
+    if (err) {
+      console.error(err.stack)
+      process.exit(1)
+    }
+  })
+}
+
+const toDate = str => new Date(str)
+const toObject = str => JSON.parse(str)
 
 program
   .version(pkg.version)
@@ -17,9 +34,9 @@ program
   .option('-p, --properties <data>', 'the event properties to send (JSON-encoded)', toObject)
   .option('-t, --timestamp <date>', 'the date of the event', toDate)
   .option('-c, --context <data>', 'additional context for the event (JSON-encoded)', toObject)
-  .action(function (event, options) {
+  .action((event, options) => {
     run('track', {
-      event: event,
+      event,
       userId: options.user,
       anonymousId: options.anonymous,
       properties: options.properties,
@@ -37,7 +54,7 @@ program
   .option('-p, --properties <data>', 'attributes of the page (JSON-encoded)', toObject)
   .option('-t, --timestamp <date>', 'the date of the event', toDate)
   .option('-c, --context <data>', 'additional context for the event (JSON-encoded)', toObject)
-  .action(function (options) {
+  .action(options => {
     run('page', {
       userId: options.user,
       name: options.name,
@@ -55,7 +72,7 @@ program
   .option('-T, --traits <data>', 'the user traits to send (JSON-encoded)', toObject)
   .option('-t, --timestamp <date>', 'the date of the event', toDate)
   .option('-c, --context <data>', 'additional context for the event (JSON-encoded)', toObject)
-  .action(function (options) {
+  .action(options => {
     run('identify', {
       userId: options.user,
       traits: options.traits,
@@ -73,7 +90,7 @@ program
   .option('-T, --traits <data>', 'attributes about the group (JSON-encoded)', toObject)
   .option('-t, --timestamp <date>', 'the date of the event', toDate)
   .option('-c, --context <data>', 'additional context for the event (JSON-encoded)', toObject)
-  .action(function (options) {
+  .action(options => {
     run('group', {
       userId: options.user,
       anonymousId: options.anonymous,
@@ -89,7 +106,7 @@ program
   .description('remap a user to a new id')
   .option('-u, --user <id>', 'the user id to send the event as')
   .option('-p, --previous <id>', 'the previous user id (to add the alias for)')
-  .action(function (options) {
+  .action(options => {
     run('alias', {
       userId: options.user,
       previousId: options.previous
@@ -101,29 +118,3 @@ program.parse(process.argv)
 if (program.args.length === 0) {
   program.help()
 }
-
-function run (method, options) {
-  var writeKey = process.env.SEGMENT_WRITE_KEY || program.writeKey
-  assert(writeKey, 'you need to define your write key via the $SEGMENT_WRITE_KEY environment variable or the --write-key flag')
-
-  var analytics = new Analytics(writeKey, { flushAt: 1 })
-
-  analytics[method](options, done)
-}
-
-function toDate (str) {
-  return new Date(str)
-}
-
-function toObject (str) {
-  return JSON.parse(str)
-}
-
-function done (err) {
-  if (err) {
-    console.error(err.stack)
-    process.exit(1)
-  } else {
-    process.exit(0)
-  }
-}

circle.yml

@@ -5,9 +5,9 @@ machine:
 dependencies:
   pre:
     - curl -o- -L https://yarnpkg.com/install.sh | bash -s -- --version 0.21.3
-    - nvm install 4.1
     - nvm install 4
     - nvm install 6
+    - nvm install 8
   cache_directories:
     - ~/.yarn-cache
   override:
@@ -17,6 +17,6 @@ test:
   override:
     - make lint
     - node_modules/.bin/nsp check
-    - nvm use 4.1; npm rebuild > /dev/null; make test
     - nvm use 4; npm rebuild > /dev/null; make test
     - nvm use 6; npm rebuild > /dev/null; make test
+    - nvm use 8; npm rebuild > /dev/null; make test