chore(build): update angular from the build directory

tbosch · tbosch · commit e5d624a85fcf · 2014-01-08T10:23:34.000-08:00
diff --git a/.gitignore b/.gitignore
@@ -2,5 +2,6 @@ logs/*
 !.gitkeep
 node_modules/
 tmp
+.idea
 .DS_Store
 angular-phonecat-snapshots
diff --git a/app/index-async.html.template b/app/index-async.html.template
@@ -0,0 +1,52 @@
+<!doctype html>
+<html lang="en">
+<head>
+  <meta charset="utf-8">
+  <title>Google Phone Gallery</title>
+  <style>
+    [ng-cloak] {
+      display: none;
+    }
+  </style>
+  <link rel="stylesheet" href="css/app.css">
+  <link rel="stylesheet" href="css/bootstrap.css">
+  <link rel="stylesheet" href="css/animations.css">
+  <script>
+    // include angular loader, which allows the files to load in any order
+    @@NG_LOADER@@
+
+    // include a third-party async loader library
+    /*!
+     * $script.js v1.3
+     * https://github.com/ded/script.js
+     * Copyright: @ded & @fat - Dustin Diaz, Jacob Thornton 2011
+     * Follow our software http://twitter.com/dedfat
+     * License: MIT
+     */
+    !function(a,b,c){function t(a,c){var e=b.createElement("script"),f=j;e.onload=e.onerror=e[o]=function(){e[m]&&!/^c|loade/.test(e[m])||f||(e.onload=e[o]=null,f=1,c())},e.async=1,e.src=a,d.insertBefore(e,d.firstChild)}function q(a,b){p(a,function(a){return!b(a)})}var d=b.getElementsByTagName("head")[0],e={},f={},g={},h={},i="string",j=!1,k="push",l="DOMContentLoaded",m="readyState",n="addEventListener",o="onreadystatechange",p=function(a,b){for(var c=0,d=a.length;c<d;++c)if(!b(a[c]))return j;return 1};!b[m]&&b[n]&&(b[n](l,function r(){b.removeEventListener(l,r,j),b[m]="complete"},j),b[m]="loading");var s=function(a,b,d){function o(){if(!--m){e[l]=1,j&&j();for(var a in g)p(a.split("|"),n)&&!q(g[a],n)&&(g[a]=[])}}function n(a){return a.call?a():e[a]}a=a[k]?a:[a];var i=b&&b.call,j=i?b:d,l=i?a.join(""):b,m=a.length;c(function(){q(a,function(a){h[a]?(l&&(f[l]=1),o()):(h[a]=1,l&&(f[l]=1),t(s.path?s.path+a+".js":a,o))})},0);return s};s.get=t,s.ready=function(a,b,c){a=a[k]?a:[a];var d=[];!q(a,function(a){e[a]||d[k](a)})&&p(a,function(a){return e[a]})?b():!function(a){g[a]=g[a]||[],g[a][k](b),c&&c(d)}(a.join("|"));return s};var u=a.$script;s.noConflict=function(){a.$script=u;return this},typeof module!="undefined"&&module.exports?module.exports=s:a.$script=s}(this,document,setTimeout)
+
+    // load all of the dependencies asynchronously.
+    $script([
+      'lib/angular/angular.js',
+      'lib/angular/angular-animate.js',
+      'lib/angular/angular-resource.js',
+      'lib/angular/angular-route.js',
+      'js/app.js',
+      'js/services.js',
+      'js/controllers.js',
+      'js/filters.js',
+      'js/directives.js',
+      'js/animations.js'
+    ], function() {
+      // when all is done, execute bootstrap angular application
+      debugger;
+      angular.bootstrap(document, ['phonecatApp']);
+    })
+  </script>
+</head>
+<body ng-cloak>
+  <div class="view-container">
+    <div ng-view class="view-frame"></div>
+  </div>
+</body>
+</html>
diff --git a/scripts/private/download-angular.sh b/scripts/private/download-angular.sh
diff --git a/scripts/private/test-all.sh b/scripts/private/test-all.sh
@@ -1,22 +1,45 @@
+#!/bin/sh
+
+set -ex
+
+function cleanUp() {
+  kill $WEBSERVER_PID
+  git checkout -f $BRANCH
+}
+
+trap cleanUp EXIT
+
+# Define reasonable set of browsers in case we are running manually from commandline
+if [[ -z "$BROWSERS" ]]
+then
+  BROWSERS="Chrome"
+fi
+
+if [[ -z "$BROWSERS_E2E" ]]
+then
+  BROWSERS_E2E="Chrome"
+fi
+
 ROOT_DIR=`dirname $0`/../..
 
 cd $ROOT_DIR
+BRANCH=$(git rev-parse --abbrev-ref HEAD)
 npm install
 
+./scripts/web-server.js > /dev/null &
+WEBSERVER_PID=$!
+
 # Steps 0 and 1 do not have any tests - but going to step 0 copies useful files
 # Step 2 only has unit tests
 git checkout -f step-2
-karma start config/karma.conf.js --single-run
+./node_modules/karma/bin/karma start config/karma.conf.js --single-run
 
 # Steps 3 through 12 have both unit and e2e tests
 for i in {3..12}
 do
   git checkout -f step-$i
-  ./scripts/web-server.js > /dev/null &
-  WEBSERVER_PID=$!
 
-  karma start config/karma.conf.js --single-run
-  karma start config/karma-e2e.conf.js --single-run
+  ./node_modules/karma/bin/karma start config/karma.conf.js --single-run --browsers $BROWSERS --reporters=dots --no-colors --no-color
+  ./node_modules/karma/bin/karma start config/karma-e2e.conf.js --browsers $BROWSERS_E2E --reporters=dots --no-colors --no-color
 
-  kill $WEBSERVER_PID
 done
diff --git a/scripts/private/update-angular.sh b/scripts/private/update-angular.sh
@@ -1,19 +1,38 @@
 #! /bin/sh
-if [ -n "$1" ]; then
+set -xe
 
-	SCRIPT_DIR=`dirname $0`
-	ROOT_DIR=$SCRIPT_DIR/../../
+NG_BUILD_DIR=$1
+if [[ !  -e "$NG_BUILD_DIR/angular.js" ]]; then
+  echo "Usage: update-angular <angular-build-dir>"
+  exit 1
+fi
 
-	git checkout -f master
-	git checkout step-0^ -b update-$1
-	$SCRIPT_DIR/download-angular.sh $1
-	git add $ROOT_DIR/app/lib/angular
-	git commit -m"BUMP ANGULAR VERSION to $1"
+SCRIPT_DIR=$(dirname $0)
+ROOT_DIR=$SCRIPT_DIR/../../
+VERSION=$(cat $NG_BUILD_DIR/version.txt)
 
-	for (( i = 0; i <= 12; i++ )); do
-		git cherry-pick step-$i
-	done
+cd $ROOT_DIR
 
-else
-  echo "Usage: update-angular <version>"
-fi
+# go back before the first step
+git reset --hard step-0^
+
+# Remove the previous angular version
+rm -fr app/lib/angular
+# Copy all the angular library files over
+cp -r $NG_BUILD_DIR app/lib/angular
+# Clean up (in case the angular docs were left in the repos from)
+rm -fr app/lib/angular/docs
+# Update the inlined angular-loader in app/index-async.html
+sed '/@@NG_LOADER@@/{
+    s/@@NG_LOADER@@//g
+    r app/lib/angular/angular-loader.min.js
+}' app/index-async.html.template > app/index-async.html
+
+git add $ROOT_DIR/app
+git commit -m"BUMP ANGULAR VERSION to $VERSION"
+
+for (( i = 0; i <= 12; i++ )); do
+  git cherry-pick step-$i
+done
+
+$SCRIPT_DIR/retag.sh
