Merge pull request #148 from conveyal/dev

v3.6.0

Author: trevorgerhardt

README.md

@@ -30,7 +30,7 @@ $ npm install -g mastarm
 
 ## Configuration
 
-Mastarm can be pointed to a directory containing configuration files using the `--config` flag. By default, Mastarm looks in the `configurations/default` path of the current working directory. Mastarm looks for four different files: `env.yml`, `settings.yml`, `store.yml`, and `messages.yml`.
+Mastarm can be pointed to a directory containing configuration files using the `--config` flag. It will fall back to files in the `configurations/default` path of the current working directory if one of the files below does not exist in config folder specified.
 
 ### `env.yml`
 
@@ -56,6 +56,10 @@ Settings contain both Mastarm configuration settings and per environment setting
 
 Auto-populate your redux store with this configuration data instead of setting defaults directly in code.
 
+### `style.css`
+
+Add a stylesheet that gets `@import`ed at the beginning of your entry stylesheet. This allows you to override styles for specific deployments and use [custom CSS properties](http://cssnext.io/features/#custom-properties-var). Useful for configuration specific images and colors.
+
 ## CLI Usage
 
 Not all options pertain to all commands.  Entries are in the format `input/file.js:output/file.js`.

__tests__/lib/__snapshots__/load-config.js.snap

@@ -7,5 +7,6 @@ Object {
   "messages": Object {},
   "settings": Object {},
   "store": Object {},
+  "stylePath": null,
 }
 `;

lib/budo.js

@@ -46,7 +46,7 @@ module.exports = function ({
 
   files.map((file) => {
     if (path.extname(file[0]) === '.css') {
-      transformCss({entry: file[0], outfile: file[1], watch: true})
+      transformCss({config, entry: file[0], outfile: file[1], watch: true})
     } else {
       budoFiles.push(file.join(':'))
     }

lib/build.js

@@ -21,7 +21,7 @@ module.exports = function ({
 }) {
   return files.map(([entry, outfile]) =>
     path.extname(entry) === '.css'
-    ? buildCss({entry, outfile, watch})
+    ? buildCss({config, entry, outfile, watch})
     : buildJs({config, entry, env, minify, outfile, watch}))
 }
 

lib/css-transform.js

@@ -10,10 +10,14 @@ const postcssReporter = require('postcss-reporter')
 const postcssSafeParser = require('postcss-safe-parser')
 
 module.exports = function ({
+  config,
   entry,
   outfile,
   watch
 }) {
+  const configImport = config.stylePath
+    ? `@import url(${config.stylePath});`
+    : ''
   let watcher
   const transform = () =>
     postcss([
@@ -27,10 +31,11 @@ module.exports = function ({
           }
         }
       }),
+      base64ify(process.cwd()),
       postcssNext(),
       postcssReporter({clearMessages: true})
     ])
-      .process(fs.readFileSync(entry, 'utf8'), {
+      .process(`${configImport}${fs.readFileSync(entry, 'utf8')}`, {
         parser: postcssSafeParser,
         map: true,
         to: outfile
@@ -59,8 +64,6 @@ module.exports = function ({
 
 const base64ify = postcss.plugin('postcss-base64ify', function () {
   return function (css, result) {
-    const source = css.source.input.file
-    const dir = path.dirname(source)
     css.replaceValues(/url\((\s*)(['"]?)(.+?)\2(\s*)\)/g, function (string) {
       const filename = getUrl(string)
         .split('?')[0]
@@ -71,6 +74,8 @@ const base64ify = postcss.plugin('postcss-base64ify', function () {
       } else if (filename[0] === '/') {
         file = path.join(process.cwd(), filename)
       } else {
+        const source = css.source.input.file
+        const dir = path.dirname(source)
         file = path.resolve(dir, filename)
       }
       if (!fs.existsSync(file)) {

lib/load-config.js

@@ -3,26 +3,34 @@ const path = require('path')
 const YAML = require('yamljs')
 
 module.exports = function load (cwd, config, environment) {
+  const configDirectory = path.resolve(cwd, config || 'configurations/default')
   const defaultDirectory = path.resolve(cwd, 'configurations/default')
-  const directory = path.resolve(cwd, config || 'configurations/default')
-  const env = loadYml('env')
-  const settings = loadYml('settings')
+  const env = loadYaml('env')
+  const settings = loadYaml('settings')
 
   return {
     env: overrideWithEnvironment(env, environment),
     environment,
-    messages: loadYml('messages'),
-    path: directory,
+    messages: loadYaml('messages'),
+    path: configDirectory,
     settings: overrideWithEnvironment(settings, environment),
-    store: loadYml('store')
+    store: loadYaml('store'),
+    stylePath: findFile('style.css')
   }
 
-  function loadYml (filename) {
-    const defaultFile = defaultDirectory + '/' + filename + '.yml'
-    const file = directory + '/' + filename + '.yml'
-    if (fs.existsSync(file)) return YAML.load(file) || {}
-    else if (fs.existsSync(defaultFile)) return YAML.load(defaultFile) || {}
-    else return {}
+  function findFile (filename) {
+    const file = configDirectory + '/' + filename
+    if (fs.existsSync(file)) return file
+    const defaultFile = defaultDirectory + '/' + filename
+    if (fs.existsSync(defaultFile)) return defaultFile
+    return null
+  }
+
+  function loadYaml (filename) {
+    const file = findFile(`${filename}.yml`)
+    return file
+      ? YAML.parse(fs.readFileSync(file, 'utf8'))
+      : {}
   }
 }
 

lib/logger.js

@@ -1,12 +1,19 @@
+const nodeEmoji = require('node-emoji')
 const slack = require('./notify-slack')
 
 module.exports = function ({channel, webhook} = {}) {
-  if (webhook) console.log(`see slack@${channel} for notifications`)
-  return function (text) {
-    if (webhook) {
+  if (webhook) {
+    return function (text) {
+      emojifyLog(text)
       return slack({channel, text, webhook})
-    } else {
-      return Promise.resolve(console.log(text))
     }
   }
+  return function (text) {
+    return Promise.resolve(emojifyLog(text))
+  }
+}
+
+function emojifyLog (text) {
+  const strippedLinks = text.replace(/<[^|>]+\|([^>]+)>/g, '$1')
+  console.log(nodeEmoji.emojify(strippedLinks))
 }

lib/push-to-s3.js

@@ -58,7 +58,7 @@ function upload ({
 
     const bytes = bytesToSize(body.byteLength || body.length)
     const bucketLink = `<${bucketUrl}/${outfile}|${bucket}/${outfile}>`
-    log(`:satellite_antenna: ${tag} uploading to ${bucketLink} (${bytes})`)
+    log(`:airplane_departure: ${tag} uploading to ${bucketLink} (${bytes})`)
     s3object
       .upload()
       .send(function (err) {
@@ -99,5 +99,5 @@ function bytesToSize (bytes) {
   const sizes = ['bytes', 'kb', 'mb', 'gb', 'tb']
   if (bytes === 0) return '0 byte'
   const i = parseInt(Math.floor(Math.log(bytes) / Math.log(1024)))
-  return Math.round(bytes / Math.pow(1024, i), 2) + sizes[i]
+  return (bytes / Math.pow(1024, i)).toFixed(2) + sizes[i]
 }

package.json

@@ -71,6 +71,7 @@
     "middleware-proxy": "^2.0.2",
     "mime": "^1.3.4",
     "mkdirp": "^0.5.1",
+    "node-emoji": "^1.5.1",
     "postcss": "^5.0.21",
     "postcss-cssnext": "^2.6.0",
     "postcss-import": "^9.0.0",

yarn.lock

@@ -4075,6 +4075,12 @@ netrc@^0.1.4:
   version "0.1.4"
   resolved "https://registry.yarnpkg.com/netrc/-/netrc-0.1.4.tgz#6be94fcaca8d77ade0a9670dc460914c94472444"
 
+node-emoji@^1.5.1:
+  version "1.5.1"
+  resolved "https://registry.yarnpkg.com/node-emoji/-/node-emoji-1.5.1.tgz#fd918e412769bf8c448051238233840b2aff16a1"
+  dependencies:
+    string.prototype.codepointat "^0.2.0"
+
 node-fetch@^1.0.1:
   version "1.6.3"
   resolved "https://registry.yarnpkg.com/node-fetch/-/node-fetch-1.6.3.tgz#dc234edd6489982d58e8f0db4f695029abcd8c04"
@@ -5644,6 +5650,10 @@ string-width@^2.0.0:
     is-fullwidth-code-point "^2.0.0"
     strip-ansi "^3.0.0"
 
+string.prototype.codepointat@^0.2.0:
+  version "0.2.0"
+  resolved "https://registry.yarnpkg.com/string.prototype.codepointat/-/string.prototype.codepointat-0.2.0.tgz#6b26e9bd3afcaa7be3b4269b526de1b82000ac78"
+
 string_decoder@~0.10.0, string_decoder@~0.10.x:
   version "0.10.31"
   resolved "https://registry.yarnpkg.com/string_decoder/-/string_decoder-0.10.31.tgz#62e203bc41766c6c28c9fc84301dab1c5310fa94"