Merge branch 'develop'

Author: ssoloff

.travis.yml

@@ -2,7 +2,7 @@ dist: trusty
 sudo: false
 language: node_js
 node_js:
-- 6.9.2
+- 6.9.4
 addons:
   apt:
     sources:
@@ -16,8 +16,8 @@ before_install:
 - "./tools/travis/install-geckodriver"
 - "./tools/travis/start-xvfb"
 - ". ./tools/travis/env.sh"
-- export DISPLAY=$ENV_DISPLAY
-- export PATH=$PATH:$ENV_LOCAL_BIN_DIR
+- export DISPLAY=$DSJS_DISPLAY
+- export PATH=$PATH:$DSJS_LOCAL_BIN_DIR
 install:
 - npm install --global gulp-cli
 - npm install

features/server/evaluate-expression/enumerating_die_rolls.feature

@@ -23,3 +23,4 @@ Scenario Outline: Enumerating die rolls
     | 1+1        | []                                                                             |
     | 1d6+1      | [{"sides": 6, "value": 6}]                                                     |
     | 2d6+1d4    | [{"sides": 6, "value": 6}, {"sides": 6, "value": 6}, {"sides": 4, "value": 4}] |
+    | d%         | [{"sides": 10, "value": 10}, {"sides": 10, "value": 10}]                       |

features/server/evaluate-expression/evaluating_dice_notation.feature

@@ -97,9 +97,21 @@ Scenario Outline: Evaluating dice rolls
     | expression       | result text                             | result value |
     | 3d6              | [sum([roll(3, d6) -> [6, 6, 6]]) -> 18] | 18           |
     | 1d10             | [sum([roll(1, d10) -> [10]]) -> 10]     | 10           |
-    | 1d%              | [sum([roll(1, d100) -> [100]]) -> 100]  | 100          |
     | sum(roll(2, d8)) | [sum([roll(2, d8) -> [8, 8]]) -> 16]    | 16           |
 
+Scenario Outline: Evaluating decimal dice rolls
+  Given a request with the expression "<expression>"
+  When the evaluate expression service is invoked
+  Then the response should indicate success
+    And the response should contain the expression result text "<result text>"
+    And the response should contain the expression result value <result value>
+  Examples:
+    | expression            | result text                                            | result value |
+    | d%                    | [decimal([roll(2, d10) -> [10, 10]]) -> 100]           | 100          |
+    | d%0                   | [decimal([roll(3, d10) -> [10, 10, 10]]) -> 1000]      | 1000         |
+    | d%00                  | [decimal([roll(4, d10) -> [10, 10, 10, 10]]) -> 10000] | 10000        |
+    | decimal(roll(3, d10)) | [decimal([roll(3, d10) -> [10, 10, 10]]) -> 1000]      | 1000         |
+
 Scenario Outline: Evaluating modified dice rolls
   Given a request with the expression "<expression>"
   When the evaluate expression service is invoked
@@ -134,10 +146,22 @@ Scenario Outline: Evaluating arithmetic expressions with dice rolls and constant
     | 4*3d6      | 4 * [sum([roll(3, d6) -> [6, 6, 6]]) -> 18]                            | 72           |
     | 3d6/4      | [sum([roll(3, d6) -> [6, 6, 6]]) -> 18] / 4                            | 4.5          |
     | 3d6%4      | [sum([roll(3, d6) -> [6, 6, 6]]) -> 18] % 4                            | 2            |
-    | 1d%%3      | [sum([roll(1, d100) -> [100]]) -> 100] % 3                             | 1            |
     | 2d6-L-1    | [sum([dropLowestRolls([roll(2, d6) -> [6, 6]], 1) -> [6]]) -> 6] - 1   | 5            |
     | 1d6+L+1    | [sum([cloneLowestRolls([roll(1, d6) -> [6]], 1) -> [6, 6]]) -> 12] + 1 | 13           |
 
+Scenario Outline: Evaluating arithmetic expressions with decimal dice rolls and constants
+  Given a request with the expression "<expression>"
+  When the evaluate expression service is invoked
+  Then the response should indicate success
+    And the response should contain the expression result text "<result text>"
+    And the response should contain the expression result value <result value>
+  Examples:
+    | expression | result text                                           | result value |
+    | d%+4       | [decimal([roll(2, d10) -> [10, 10]]) -> 100] + 4      | 104          |
+    | d%0-4      | [decimal([roll(3, d10) -> [10, 10, 10]]) -> 1000] - 4 | 996          |
+    | 4*d%       | 4 * [decimal([roll(2, d10) -> [10, 10]]) -> 100]      | 400          |
+    | d%%3       | [decimal([roll(2, d10) -> [10, 10]]) -> 100] % 3      | 1            |
+
 Scenario Outline: Rounding fractional values
   Given a request with the expression "<expression>"
   When the evaluate expression service is invoked

gulpfile.js

@@ -14,7 +14,9 @@ const childProcess = require('child_process')
 const del = require('del')
 const fs = require('fs')
 const gulp = require('gulp')
+const replace = require('gulp-replace')
 const runSequence = require('run-sequence')
+const streamToPromise = require('stream-to-promise')
 
 const BUILD_OUTPUT_DIR = 'build'
 const FEATURES_DIR = 'features'
@@ -40,6 +42,20 @@ function exec (command, callback) {
   })
 }
 
+function getGitInfo () {
+  const git = require('git-rev')
+  return Promise.all([
+    promisifyWithoutError(git.branch),
+    promisifyWithoutError(git.short)
+  ])
+  .then((results) => {
+    return {
+      branch: results[0],
+      commit: results[1]
+    }
+  })
+}
+
 function getLocalVersionQualifier (gitInfo) {
   return `local-${gitInfo.branch}-${gitInfo.commit}`
 }
@@ -56,17 +72,28 @@ function getVersionQualifier (gitInfo) {
   return getLocalVersionQualifier(gitInfo)
 }
 
+function injectCopyright () {
+  const buildDate = new Date()
+  return replace('{{COPYRIGHT_YEAR}}', buildDate.getUTCFullYear())
+}
+
 function injectVersion (gitInfo) {
   const packageInfo = require('./package.json')
-  const replace = require('gulp-replace')
   const versionQualifier = getVersionQualifier(gitInfo)
   return replace('{{VERSION}}', `${packageInfo.version}-${versionQualifier}`)
 }
 
+function promisifyWithoutError (func) {
+  return new Promise((resolve, reject) => {
+    func((result) => {
+      resolve(result)
+    })
+  })
+}
+
 function runCucumber (path) {
   const cucumber = require('gulp-cucumber')
   const glob = require('glob')
-  const streamToPromise = require('stream-to-promise')
 
   let promise = Promise.resolve()
 
@@ -144,26 +171,20 @@ gulp.task('compile:client:html', () => {
     .pipe(gulp.dest(COMPILE_OUTPUT_DIR))
 })
 
-gulp.task('compile:client:js', (done) => {
+gulp.task('compile:client:js', () => {
   const browserify = require('browserify')
-  const git = require('git-rev')
   const source = require('vinyl-source-stream')
-
-  const gitInfo = {}
-  git.branch((branch) => {
-    gitInfo.branch = branch
-    git.short((commit) => {
-      gitInfo.commit = commit
+  return getGitInfo()
+    .then((gitInfo) => streamToPromise(
       browserify([`${CLIENT_SRC_DIR}/index.js`])
         .transform('browserify-css')
         .transform('brfs')
         .bundle()
         .pipe(source('bundle.js'))
         .pipe(injectVersion(gitInfo))
+        .pipe(injectCopyright())
         .pipe(gulp.dest(`${COMPILE_OUTPUT_DIR}/${CLIENT_SRC_DIR}`))
-      done()
-    })
-  })
+    ))
 })
 
 gulp.task('compile:client', ['compile:client:html', 'compile:client:js'])