Merge remote-tracking branch 'origin/master' into soycode-simplesocksnode

Author: soycode

.bowerrc

@@ -6,5 +6,10 @@ before_install:
 install:
   - ./setup.sh install
 script:
-  - grunt lint test
+  - grunt build tslint unit_test
 sudo: false
+cache:
+  directories:
+    - node_modules
+before_script:
+  - npm prune

.travis.yml

@@ -603,28 +603,19 @@ gruntConfig = {
       Rule.copyLibs
         npmLibNames: ['freedom-for-chrome']
         pathsFromDevBuild: ['lib/churn-pipe', 'lib/loggingprovider', 'lib/zork']
-        pathsFromThirdPartyBuild: [
-          'uproxy-obfuscators',
-          'freedom-port-control'
-        ]
+        pathsFromThirdPartyBuild: ['freedom-port-control']
         localDestPath: 'lib/samples/zork-chromeapp/'
     libsForZorkFirefoxApp:
       Rule.copyLibs
         npmLibNames: ['freedom-for-firefox']
         pathsFromDevBuild: ['lib/churn-pipe', 'lib/loggingprovider', 'lib/zork']
-        pathsFromThirdPartyBuild: [
-          'uproxy-obfuscators',
-          'freedom-port-control'
-        ]
+        pathsFromThirdPartyBuild: ['freedom-port-control']
         localDestPath: 'lib/samples/zork-firefoxapp/data/'
     libsForZorkNode:
       Rule.copyLibs
         npmLibNames: ['freedom-for-node']
         pathsFromDevBuild: ['lib/churn-pipe', 'lib/loggingprovider', 'lib/zork']
-        pathsFromThirdPartyBuild: [
-          'uproxy-obfuscators',
-          'freedom-port-control'
-        ]
+        pathsFromThirdPartyBuild: ['freedom-port-control']
         localDestPath: 'lib/samples/zork-node/'
 
     libsForEchoServerChromeApp:
@@ -642,25 +633,19 @@ gruntConfig = {
       Rule.copyLibs
         npmLibNames: ['freedom-for-chrome']
         pathsFromDevBuild: ['lib/copypaste-chat', 'lib/churn-pipe', 'lib/loggingprovider']
-        pathsFromThirdPartyBuild: [
-          'freedom-port-control'
-        ]
+        pathsFromThirdPartyBuild: ['freedom-port-control']
         localDestPath: 'lib/samples/copypaste-chat-chromeapp/'
     libsForCopypasteChatFirefoxApp:
       Rule.copyLibs
         npmLibNames: ['freedom-for-firefox']
         pathsFromDevBuild: ['lib/copypaste-chat', 'lib/churn-pipe', 'lib/loggingprovider']
-        pathsFromThirdPartyBuild: [
-          'freedom-port-control'
-        ]
+        pathsFromThirdPartyBuild: ['freedom-port-control']
         localDestPath: 'lib/samples/copypaste-chat-firefoxapp/data'
     libsForCopypasteChatWebApp:
       Rule.copyLibs
         npmLibNames: ['freedom']
         pathsFromDevBuild: ['lib/copypaste-chat', 'lib/churn-pipe', 'lib/loggingprovider']
-        pathsFromThirdPartyBuild: [
-          'freedom-port-control'
-        ]
+        pathsFromThirdPartyBuild: ['freedom-port-control']
         localDestPath: 'lib/samples/copypaste-chat-webapp/'
 
     libsForCopyPasteSocksChromeApp:
@@ -670,7 +655,6 @@ gruntConfig = {
         ]
         pathsFromDevBuild: ['lib/copypaste-socks', 'lib/churn-pipe', 'lib/loggingprovider']
         pathsFromThirdPartyBuild: [
-          'uproxy-obfuscators'
           'i18n'
           'bower/polymer'
           'freedom-pgp-e2e'
@@ -684,7 +668,6 @@ gruntConfig = {
         ]
         pathsFromDevBuild: ['lib/copypaste-socks', 'lib/churn-pipe', 'lib/loggingprovider']
         pathsFromThirdPartyBuild: [
-          'uproxy-obfuscators'
           'i18n'
           'bower'
           'freedom-pgp-e2e'
@@ -696,19 +679,13 @@ gruntConfig = {
       Rule.copyLibs
         npmLibNames: ['freedom-for-chrome']
         pathsFromDevBuild: ['lib/simple-socks', 'lib/churn-pipe', 'lib/loggingprovider']
-        pathsFromThirdPartyBuild: [
-          'uproxy-obfuscators'
-          'freedom-port-control'
-        ]
+        pathsFromThirdPartyBuild: ['freedom-port-control']
         localDestPath: 'lib/samples/simple-socks-chromeapp/'
     libsForSimpleSocksFirefoxApp:
       Rule.copyLibs
         npmLibNames: ['freedom-for-firefox']
         pathsFromDevBuild: ['lib/simple-socks', 'lib/churn-pipe', 'lib/loggingprovider']
-        pathsFromThirdPartyBuild: [
-          'uproxy-obfuscators'
-          'freedom-port-control'
-        ]
+        pathsFromThirdPartyBuild: ['freedom-port-control']
         localDestPath: 'lib/samples/simple-socks-firefoxapp/data/'
     libsForSimpleSocksNode:
       Rule.copyLibs
@@ -724,17 +701,13 @@ gruntConfig = {
       Rule.copyLibs
         npmLibNames: ['freedom-for-chrome']
         pathsFromDevBuild: ['lib/simple-chat', 'lib/churn-pipe', 'lib/loggingprovider']
-        pathsFromThirdPartyBuild: [
-          'freedom-port-control'
-        ]
+        pathsFromThirdPartyBuild: ['freedom-port-control']
         localDestPath: 'lib/samples/simple-chat-chromeapp/'
     libsForSimpleChatFirefoxApp:
       Rule.copyLibs
         npmLibNames: ['freedom-for-firefox']
         pathsFromDevBuild: ['lib/simple-chat', 'lib/churn-pipe', 'lib/loggingprovider']
-        pathsFromThirdPartyBuild: [
-          'freedom-port-control'
-        ]
+        pathsFromThirdPartyBuild: ['freedom-port-control']
         localDestPath: 'lib/samples/simple-chat-firefoxapp/data'
     # While neither churn-pipe nor freedom-port-control can be used in a
     # regular web page environment, they are included so that obfuscation
@@ -743,9 +716,7 @@ gruntConfig = {
       Rule.copyLibs
         npmLibNames: ['freedom']
         pathsFromDevBuild: ['lib/simple-chat', 'lib/churn-pipe', 'lib/loggingprovider']
-        pathsFromThirdPartyBuild: [
-          'freedom-port-control'
-        ]
+        pathsFromThirdPartyBuild: ['freedom-port-control']
         localDestPath: 'lib/samples/simple-chat-webapp/'
 
     libsForUprobeChromeApp:
@@ -811,52 +782,25 @@ gruntConfig = {
             'freedom-social-wechat': '<%= pkgs.freedomwechat.version %>'
             'freedom-social-quiver': '<%= pkgs.freedomquiver.version %>'
         }]
-  #-------------------------------------------------------------------------
-  # All typescript compiles to locations in `build/`
-  # Typescript compilation rules
+
+  # One pass for code running inside freedom.js modules and another
+  # for code running outside, due to the differences in the meaning
+  # of the (global) freedom object between the two environments.
   ts:
-    # Compile all non-sample typescript code into the development build
-    # directory.
-    devInModuleEnv: compileTypescript [
-      devBuildPath + '/lib/**/*.ts'
-      devBuildPath + '/interfaces/**/*.ts'
-      devBuildPath + '/generic_core/**/*.ts'
+    moduleEnv: compileTypescript [
+      devBuildPath + '/**/*.ts'
       '!' + devBuildPath + '/lib/build-tools/**/*.ts'
+      '!' + devBuildPath + '/integration/**/*.ts'
       '!' + devBuildPath + '/**/*.core-env.ts'
       '!' + devBuildPath + '/**/*.core-env.spec.ts'
     ]
-
-    generic_ui: compileTypescript [
-      devBuildPath + '/generic_ui/**/*.ts'
-      devBuildPath + '/**/*.core-env.spec.ts'
+    coreEnv: compileTypescript [
       devBuildPath + '/**/*.core-env.ts'
+      devBuildPath + '/**/*.core-env.spec.ts'
+      '!' + devBuildPath + '/lib/build-tools/**/*.ts'
+      '!' + devBuildPath + '/integration/**/*.ts'
     ]
 
-    chrome_extension: compileTypescript [
-      devBuildPath + '/chrome/extension/**/*.ts'
-    ]
-
-    chrome_app: compileTypescript [
-      devBuildPath + '/chrome/app/**/*.ts'
-    ]
-
-    firefox: compileTypescript [
-      devBuildPath + '/firefox/**/*.ts'
-    ]
-
-    cca: compileTypescript [
-      devBuildPath + '/cca/**/*.ts'
-    ]
-
-    integration_specs: compileTypescript [
-      devBuildPath + '/integration/*.ts'
-      '!' + devBuildPath + '/integration/test_connection.ts'
-    ]
-    integration_freedom_module: compileTypescript [
-      devBuildPath + '/integration/test_connection.ts'
-    ]
-
-
   browserify:
     chromeAppMain: Rule.browserify 'chrome/app/scripts/main.core-env'
     chromeExtMain: Rule.browserify('chrome/extension/scripts/background',
@@ -896,30 +840,8 @@ gruntConfig = {
     # uproxy-lib
     loggingProvider: Rule.browserify 'lib/loggingprovider/freedom-module'
     churnPipeFreedomModule: Rule.browserify 'lib/churn-pipe/freedom-module'
-    cloudInstallerFreedomModule: Rule.browserify('lib/cloud/install/freedom-module', {
-      alias : [
-        # Shims for node's dns and net modules from freedom-social-xmpp,
-        # with a couple of fixes.
-        './src/lib/cloud/social/shim/net.js:net'
-        './src/lib/cloud/social/shim/dns.js:dns'
-        # Alternative that works for freedomjs modules.
-        './src/lib/cloud/social/alias/brorand.js:brorand'
-        # Fallback for crypto-browserify's randombytes, for Firefox.
-        './src/lib/cloud/social/alias/randombytes.js:randombytes'
-      ]
-    })
-    cloudSocialProviderFreedomModule: Rule.browserify('lib/cloud/social/freedom-module', {
-      alias : [
-        # Shims for node's dns and net modules from freedom-social-xmpp,
-        # with a couple of fixes.
-        './src/lib/cloud/social/shim/net.js:net'
-        './src/lib/cloud/social/shim/dns.js:dns'
-        # Alternative that works for freedomjs modules.
-        './src/lib/cloud/social/alias/brorand.js:brorand'
-        # Fallback for crypto-browserify's randombytes, for Firefox.
-        './src/lib/cloud/social/alias/randombytes.js:randombytes'
-      ]
-    })
+    cloudInstallerFreedomModule: Rule.browserify 'lib/cloud/install/freedom-module'
+    cloudSocialProviderFreedomModule: Rule.browserify 'lib/cloud/social/freedom-module'
     digitalOceanFreedomModule: Rule.browserify 'lib/cloud/digitalocean/freedom-module'
 
     # uproxy-lib sample apps.
@@ -951,6 +873,14 @@ gruntConfig = {
         'src/**/*.ts'
       ]
 
+  jshint:
+    firefox:
+      options:
+        moz: true
+      src: [
+        'src/firefox/lib/*.js'
+      ]
+
   #-------------------------------------------------------------------------
   jasmine:
     chrome_extension: Rule.jasmineSpec('chrome/extension/scripts/',
@@ -1082,8 +1012,7 @@ taskManager = new TaskManager.Manager()
 
 taskManager.add 'base', [
   'copy:dev'
-  'ts:devInModuleEnv'
-  'ts:generic_ui'
+  'ts'
   'version_file'
   'browserify:chromeAppMain'
   'browserify:genericCoreFreedomModule'
@@ -1178,13 +1107,11 @@ taskManager.add 'version_file', [
 
 taskManager.add 'build_chrome_app', [
   'base'
-  'ts:chrome_app'
   'copy:chrome_app'
 ].concat fullyVulcanize('chrome/app/polymer', 'ext-missing', 'vulcanized')
 
 taskManager.add('build_chrome_ext', [
   'base'
-  'ts:chrome_extension'
   'copy:chrome_extension'
   'copy:chrome_extension_additional'
   'browserify:chromeExtMain'
@@ -1200,7 +1127,6 @@ taskManager.add 'build_chrome', [
 # Firefox build tasks.
 taskManager.add('build_firefox', [
   'base'
-  'ts:firefox'
   'copy:firefox'
   'copy:firefox_additional'
   'browserify:firefoxContext'
@@ -1210,7 +1136,6 @@ taskManager.add('build_firefox', [
 # CCA build tasks.
 taskManager.add 'build_cca', [
   'base'
-  'ts:cca'
   'copy:cca'
   'copy:cca_additional'
   'browserify:ccaMain'
@@ -1305,44 +1230,45 @@ taskManager.add 'socksEchoIntegrationTest', [
   'jasmine_chromeapp:socksEcho'
 ]
 
+taskManager.add 'unit_test', [
+  'test_lib'
+  'test_core'
+  'test_ui'
+  'test_chrome'
+]
+
 # TODO: add test_chrome once it passes reliably
 taskManager.add 'integration_test', [
   'tcpIntegrationTest'
   'socksEchoIntegrationTest'
 ]
 
-taskManager.add 'everything', [
-  'build'
-  'test'
-  'integration_test'
-]
-
-# This is the target run by Travis. Targets in here should run locally
-# and on Travis/Sauce Labs.
 taskManager.add 'test', [
-  'test_lib'
-  'test_core'
-  'test_ui'
-  'test_chrome'
+  'unit_test'
+  'integration_test'
 ]
 
+# Builds all code, including the "dist" build, but skips
+# linting and testing which can both be annoying and slow.
+# jshint is here because catches hard syntax errors, etc.
 taskManager.add 'build', [
   'exec:rmIosBuild'
   'exec:rmAndroidBuild'
   'build_chrome'
   'build_firefox'
   'build_cca'
+  'samples'
+  'jshint'
+  'copy:dist'
+  'jpm:xpi'
 ]
 
-taskManager.add 'lint', [
-  'tslint'
-]
-
+# This is run prior to releasing uProxy and, in addition to
+# building, tests and lints all code.
 taskManager.add 'dist', [
   'build'
-  'lint'
-  'copy:dist'
-  'jpm:xpi'
+  'tslint'
+  'test'
 ]
 
 taskManager.add 'default', [
@@ -1356,6 +1282,7 @@ module.exports = (grunt) ->
   grunt.loadNpmTasks 'grunt-contrib-clean'
   grunt.loadNpmTasks 'grunt-contrib-copy'
   grunt.loadNpmTasks 'grunt-contrib-jasmine'
+  grunt.loadNpmTasks 'grunt-contrib-jshint'
   grunt.loadNpmTasks 'grunt-contrib-symlink'
   grunt.loadNpmTasks 'grunt-exec'
   grunt.loadNpmTasks 'grunt-gitinfo'