Merge branch 'release/v0.1.4'

FreeAllMedia · Aug 10, 2015 · f85b43b · f85b43b
2 parents f839887 + 74f020e
commit f85b43b
Show file tree

Hide file tree

Showing 20 changed files with 301 additions and 239 deletions.
diff --git a/.bithoundrc b/.bithoundrc
@@ -0,0 +1,5 @@
+{
+  "ignore": [
+    "es5/**/*.js"
+  ]
+}
diff --git a/.codeclimate.yml b/.codeclimate.yml
@@ -1,9 +1,4 @@
-# Save as .codeclimate.yml (note leading .) in project root directory
 languages:
   JavaScript: true
-  Ruby: false
-  PHP: false
-  Python: false
-
-# exclude_paths:
-# - "foo/bar.rb"
+exclude_paths:
+  - es5/*
diff --git a/.eslintrc b/.eslintrc
@@ -32,7 +32,7 @@
         "no-duplicate-case": 2,
         "no-else-return": 0,
         "no-empty": 2,
-        "no-empty-character-class": 2,
+        "no-empty-class": 2,
         "no-empty-label": 2,
         "no-eq-null": 0,
         "no-eval": 2,
@@ -42,7 +42,7 @@
         "no-extra-boolean-cast": 2,
         "no-extra-parens": 0,
         "no-extra-semi": 2,
-        "strict": 2,
+        "no-extra-strict": 2,
         "no-fallthrough": 2,
         "no-floating-decimal": 0,
         "no-func-assign": 2,
@@ -108,7 +108,7 @@
         "no-var": 0,
         "no-warning-comments": [0, { "terms": ["todo", "fixme", "xxx"], "location": "start" }],
         "no-with": 2,
-        "no-extra-parens": 2,
+        "no-wrap-func": 2,
 
         "block-scoped-var": 0,
         "brace-style": [0, "1tbs"],
@@ -128,6 +128,7 @@
         "func-style": [0, "declaration"],
         "generator-star": 0,
         "generator-star-spacing": 0,
+        "global-strict": [2, "never"],
         "guard-for-in": 0,
         "handle-callback-err": 0,
         "indent": 0,
@@ -171,4 +172,4 @@
         "wrap-regex": 0,
         "yoda": [2, "never"]
     }
-}
+}
diff --git a/.gitignore b/.gitignore
@@ -10,9 +10,6 @@ pids
 # Directory for instrumented libs generated by jscoverage/JSCover
 lib-cov
 
-# Coverage file
-lcov.info
-
 # Coverage directory used by tools like istanbul
 coverage
 
@@ -28,3 +25,6 @@ build/Release
 # Dependency directory
 # https://www.npmjs.org/doc/misc/npm-faq.html#should-i-check-my-node_modules-folder-into-git
 node_modules
+
+# lcov file
+lcov.info
diff --git a/.karma.conf.js b/.karma.conf.js
@@ -58,31 +58,13 @@ let configOptions = {
 
     // Continuous Integration mode
     // if true, Karma captures browsers, runs the tests and exits
-    singleRun: false
+    singleRun: true
 };
 
 /**
  * Special Options For SauceLabs
  */
-if (process.env.SAUCE_USERNAME) {
-    /**
-     * If SauceLabs credentials are available,
-     * set up the tests to run through them.
-     */
-    configOptions.sauceLabs = {
-        testName: "Omnirouter.js"
-    };
-    const customLaunchers = require("./.sauce.json").platforms;
-    configOptions.customLaunchers = customLaunchers;
-    configOptions.browsers = Object.keys(customLaunchers);
-    reporters.push("saucelabs");
-} else {
-    /**
-     * If there are no SauceLabs credentials available,
-     * detect the browsers that we *can* use.
-     */
-    frameworks.push("detectBrowsers");
-}
+frameworks.push("detectBrowsers");
 
 module.exports = function(config) {
     // level of logging

diff --git a/.travis.yml b/.travis.yml
@@ -2,10 +2,18 @@ language: node_js
 node_js:
 - '0.12'
 - '0.11'
-- 'iojs-v1'
-- 'iojs-v2'
+- iojs-v1
+- iojs-v2
 script: npm test
 before_script:
 - npm install
 after_success:
-  - ./node_modules/coveralls/bin/coveralls.js < ./lcov.info
+- ./node_modules/coveralls/bin/coveralls.js < ./lcov.info
+deploy:
+  provider: npm
+  email: fam-operations@freeallmedia.com
+  api_key:
+    secure: FuRaQjnEpteY819AhNyUI1y41jeAxVribPXqbMexgusX52qqAZq2V5OHa7Q+wJon7sFe3U1n4oJeBz8Qc/axM7fyUNqPt+0Nsp6mExKo/Q8xx60HpdwFzp+E5tb/ceCfjKDAWj3HgmTHrEWLKZ1vrUDObjgdVPkftegGbdBTi3CqCFzBywYe0INPsUA9KZjFRsHfsJRgri9aw8gCYEj+qBYXmL4LdTVWH9q0hX6ZcksDaKSUaSGR3ok12yZQRG4+BOsTIU27NRQxEdF7k4cNW0bfmr5PRvbG0W1sgvWiRMOOnUXAnHk7AsjYtpARZDIrCGHBarNM/f37e8dwK4XuUsAgLO4x5sT6VdKXKil4FOZSWYaNvbKnnnOKnNy+78IRQGjg7pTub5PBNeCtBggG8A1Oa+NH5L3D7OcJrS1FpsY9jmyyM9usE76iKO3lvrY5e4xZ5+gXGLifXaN6VegLQx4coGBLx3PH0qiFfGDPh0CR9Qi2Q5qQ8UU7Luorx/ysI2esEVLY1s8ITwiz6UPTJWP5N//ptWCH0p3K/1LYfUDo+PBrSoP1lYElNywC7YgpgeOs81ycr7ZKduxPenl8IJoJ7neHdFfRcXQgh/3gPrUna9XXBNgW1dhaCmbjgVD3OKmNif5WJR0uQKDHsQHycIo3gp2ugOiTq4fXzrU5Dpo=
+  on:
+    repo: FreeAllMedia/omnirouter
+    branch: feature/watch
diff --git a/LICENSE b/LICENSE
@@ -1,6 +1,6 @@
 The MIT License (MIT)
 
-Copyright (c) 2015 Free All Media LLC
+Copyright (c) 2015 Free All Media, LLC
 
 Permission is hereby granted, free of charge, to any person obtaining a copy
 of this software and associated documentation files (the "Software"), to deal