merging lts changes

.travis.yml

@@ -8,14 +8,14 @@ os: linux
 stages:
   - test
   - name: deploy
-    if: branch = master AND type != pull_request AND tag IS blank
+    if: (branch = "master" OR branch = "master-lts") AND type != pull_request AND tag IS blank
 jobs:
   include:
     - stage: deploy
       script:
         - yarn run travis-ssh
         - 'git remote set-url origin git@github.com:nativecode-dev/nofrills.git'
-        - git checkout master
+        - git checkout $TRAVIS_BRANCH
         - 'npm set //registry.npmjs.org/:_authToken "$NPM_TOKEN"'
         - yarn run push
 after_failure:

lerna.json

@@ -17,5 +17,5 @@
   ],
   "stream": true,
   "useWorkspaces": true,
-  "version": "2.0.0"
+  "version": "2.0.1"
 }

packages/smorgasbord/package.json

@@ -7,7 +7,7 @@
   "name": "@nofrills/smorgasbord",
   "private": false,
   "types": "./lib/index.d.ts",
-  "version": "2.0.0",
+  "version": "2.0.1",
   "bugs": {
     "url": "https://github.com/nativecode-dev/nofrills/issues"
   },

packages/smorgasbord/src/Strings.spec.ts

@@ -21,6 +21,13 @@ describe('when using string extensions', () => {
       expect(Strings.format(message, ...args)).to.equal(expected)
     })
 
+    it('should format based on object keys', () => {
+      const expected = 'The quick brown fox jumped over the test, because test.'
+      const message = 'The {q} brown fox jumped over the {t}, because {t}.'
+      const args = { q: 'quick', t: 'test' }
+      expect(Strings.formatObject(message, args)).to.equal(expected)
+    })
+
   })
 
 })

packages/smorgasbord/src/Strings.ts

@@ -7,10 +7,20 @@ const logger: Lincoln = Logger.extend('strings')
 export const Strings: Dictionary<any> = {
   format: (message: string, ...args: any[]): string => {
     logger.debug('format', message, args)
-    for (let index: number = 0; index < args.length; index++) {
-      const regex = new RegExp('\\{' + index + '\\}', 'gm')
-      message = message.replace(regex, args[index])
-    }
-    return message
-  }
+
+    return args.reduce((previous, current, index) => {
+      const regex = new RegExp(`\\{${index}\\}`, 'gm')
+      return previous.replace(regex, current)
+    }, message)
+  },
+
+  formatObject: (message: string, object: Dictionary<string>): string => {
+    const keys = Object.keys(object)
+    logger.debug('formatObject', message, keys)
+
+    return keys.reduce((previous, current, index) => {
+      const regex = new RegExp(`\\{${current}\\}`, 'igm')
+      return previous.replace(regex, object[current])
+    }, message)
+  },
 }

push.sh

@@ -1,14 +1,14 @@
 #!/bin/bash
 
-export RELEASE=${RELEASE:="prerelease"}
-export TRAVIS_BRANCH=${TRAVIS_BRANCH:="invalid"}
+RELEASE=${RELEASE:="prerelease"}
+TRAVIS_BRANCH=${TRAVIS_BRANCH:="invalid"}
 
 if [ $TRAVIS_BRANCH = "master" ] && [ $TRAVIS_EVENT_TYPE = "push" ]; then
-  export RELEASE=major
+  RELEASE=minor
+  lerna publish --allow-branch "master" --cd-version $RELEASE --message "$TRAVIS_BRANCH:$RELEASE:%s"
 fi
 
 if [ $TRAVIS_BRANCH  = "master-lts" ] && [ $TRAVIS_EVENT_TYPE = "push" ]; then
-  export RELEASE=minor
+  RELEASE=patch
+  lerna publish --allow-branch "master-lts" --cd-version $RELEASE --message "$TRAVIS_BRANCH:$RELEASE:%s"
 fi
-
-lerna publish --cd-version $RELEASE --message "$TRAVIS_BRANCH:$RELEASE:%s"