refactor

Author: btford

.travis.yml

@@ -15,8 +15,7 @@ install:
   - mkdir -p $LOGS_DIR
   - ./scripts/sauce_connect_setup.sh
   - npm install
-  - npm install -g bower
-  - ./bower-install.sh
+  - ./npm-install.sh
   - ./scripts/wait_for_browser_provider.sh
 
 script:

bower-install.sh

@@ -0,0 +1,32 @@
+/*
+ * karma.conf.js and karma.es5.conf.js optionally load this
+ */
+
+var CUSTOM_LAUNCHERS = {
+  'SL_Chrome': {
+    base: 'SauceLabs',
+    browserName: 'chrome',
+    version: '35'
+  },
+  'SL_Firefox': {
+    base: 'SauceLabs',
+    browserName: 'firefox',
+    version: '26'
+  },
+  'SL_Safari': {
+    base: 'SauceLabs',
+    browserName: 'safari',
+    platform: 'OS X 10.9',
+    version: '7'
+  }
+};
+
+module.exports = function(options) {
+  options.sauceLabs = {
+    testName: 'Angular Router Unit Tests',
+    startConnect: true
+  };
+  options.customLaunchers = CUSTOM_LAUNCHERS;
+  options.browsers = Object.keys(CUSTOM_LAUNCHERS);
+  options.reporters = ['dots', 'saucelabs'];
+};

config/karma.sauce.conf.js

@@ -0,0 +1,24 @@
+/*
+ * karma.conf.js and karma.es5.conf.js optionally load this
+ */
+
+module.exports = function(options) {
+  if (!isTravis()) {
+    return;
+  } else if (!options.sauceLabs) {
+    throw new Error('This should be loaded after karma.sauce config');
+  }
+  options.sauceLabs.build = 'TRAVIS #' + process.env.TRAVIS_BUILD_NUMBER + ' (' + process.env.TRAVIS_BUILD_ID + ')';
+  options.sauceLabs.tunnelIdentifier = process.env.TRAVIS_JOB_NUMBER;
+  options.sauceLabs.startConnect = false;
+
+  // TODO(vojta): remove once SauceLabs supports websockets.
+  // This speeds up the capturing a bit, as browsers don't even try to use websocket.
+  options.transports = ['xhr-polling'];
+
+  options.singleRun = true;
+};
+
+function isTravis() {
+  return !!process.env.TRAVIS;
+}

config/karma.travis.conf.js

@@ -0,0 +1,28 @@
+'use strict';
+
+module.exports = function (options) {
+  options.sauceUser = process.env.SAUCE_USERNAME;
+  options.sauceKey = process.env.SAUCE_ACCESS_KEY;
+
+  options.multiCapabilities = [{
+    'browserName': 'chrome',
+    'platform': 'OS X 10.9',
+    'name': 'Angular Hint E2E',
+    'tunnel-identifier': process.env.TRAVIS_JOB_NUMBER,
+    'build': process.env.TRAVIS_BUILD_NUMBER,
+    'version': '34'
+  }, {
+    'browserName': 'firefox',
+    'name': 'Angular Hint E2E',
+    'tunnel-identifier': process.env.TRAVIS_JOB_NUMBER,
+    'build': process.env.TRAVIS_BUILD_NUMBER,
+    'version': '28'
+  }, {
+    browserName: 'safari',
+    'platform': 'OS X 10.9',
+    'version': '7',
+    'name': 'Angular Hint E2E',
+    'tunnel-identifier': process.env.TRAVIS_JOB_NUMBER,
+    'build': process.env.TRAVIS_BUILD_NUMBER
+  }];
+};

config/protractor.travis.conf.js

@@ -58,7 +58,6 @@ <h1> Angular Best Practices </h1>
       </ul>
     </div>
     <script src="../bower_components/angular/angular.js"></script>
-    <script src="../dist/hint.js"></script>
     <script>
       angular.module('bpAppModule', []);
         /**
@@ -137,6 +136,7 @@ <h1> Angular Best Practices </h1>
           replace: true
         };
       });
+      angular.version.minor = 1;
     </script>
   </body>
 

hint_test.js renamed to e2e/hint.spec.js

@@ -0,0 +1,5 @@
+# Example
+
+This application is a corrected version of the `broken-example` application that was created to
+show off hints generated by AngularHint. This application loads AngularHint but generates no
+hints because it adheres to best practices.

correctExample/app.css renamed to examples/broken-example/app.css

@@ -1,26 +1,26 @@
 'use strict';
 
 // Create pipe for all hint messages from different modules
-window.angular.hint = require('angular-hint-log');
+require('./lib/modules/log');
 
 // Load angular hint modules
-require('angular-hint-controllers');
-require('angular-hint-directives');
-//require('angular-hint-dom');
-require('angular-hint-events');
-//require('angular-hint-interpolation');
-require('angular-hint-modules');
-require('angular-hint-scopes');
+require('./lib/modules/controllers');
+// require('./lib/modules/directives');
+// require('./lib/modules/dom');
+// require('./lib/modules/events');
+// require('./lib/modules/interpolation');
+// require('./lib/modules/modules');
+require('./lib/modules/scopes');
 
 // List of all possible modules
 // The default ng-hint behavior loads all modules
 var allModules = [
   'ngHintControllers',
-  'ngHintDirectives',
+// 'ngHintDirectives',
 //  'ngHintDom',
-  'ngHintEvents',
+//  'ngHintEvents',
 //  'ngHintInterpolation',
-  'ngHintModules',
+//  'ngHintModules',
   'ngHintScopes'
 ];
 
@@ -73,7 +73,7 @@ function loadModules() {
   } else if (document.querySelector('[ng-hint]')) {
     modules = allModules;
   } else {
-    angular.hint.logMessage('General', 'ngHint is included on the page, but is not active because ' +
+    angular.hint.log('General', 'ngHint is included on the page, but is not active because ' +
       'there is no `ng-hint` attribute present', SEVERITY_WARNING);
   }
   return modules;
@@ -91,7 +91,7 @@ function hintModulesFromElement (elt) {
 
   return selectedModules.map(hintModuleName).filter(function (name) {
     return (allModules.indexOf(name) > -1) ||
-      angular.hint.logMessage('General', 'Module ' + name + ' could not be found', SEVERITY_WARNING);
+      angular.hint.log('General', 'Module ' + name + ' could not be found', SEVERITY_WARNING);
   });
 }
 

example/index.html renamed to examples/broken-example/index.html

@@ -0,0 +1,35 @@
+'use strict';
+
+var sauceConfig = require('./config/karma.sauce.conf');
+var travisConfig = require('./config/karma.travis.conf');
+//var fs = require('fs');
+
+//fs.readdirSync(__dirname + '/lib/modules').filter
+
+module.exports = function(config) {
+  var options = {
+    frameworks: ['browserify', 'jasmine'],
+    files: [
+      'node_modules/angular/angular.js',
+      'node_modules/angular-mocks/angular-mocks.js',
+      'lib/modules/log.js',
+      'lib/modules/*.js'
+    ],
+    preprocessors: {
+      'lib/modules/controllers.js': ['browserify'],
+      'lib/modules/events.js': ['browserify'],
+      'lib/modules/scopes.js': ['browserify']
+    },
+    browsers: ['Chrome'],
+    browserify: {
+      debug: true
+    }
+  };
+
+  if (process.argv.indexOf('--sauce') > -1) {
+    sauceConfig(options);
+    travisConfig(options);
+  }
+
+  config.set(options);
+};

examples/correct-example/README.md

@@ -0,0 +1,13 @@
+'use strict';
+
+var getValidProps = require('./getValidProps'),
+  suggest = require('suggest-it');
+
+module.exports = function addSuggestions(messages) {
+  messages.forEach(function(messageObj) {
+    var dictionary = getValidProps(messageObj.scope),
+      suggestion = suggest(dictionary)(messageObj.boundFunc);
+    messageObj['match'] = suggestion;
+  });
+  return messages;
+};

example/app.css renamed to examples/correct-example/app.css

@@ -0,0 +1,5 @@
+module.exports = {
+  SEVERITY: {
+
+  }
+};