From c9c176a53b1632ca2b1c6ed27382ab72ac21d45d Mon Sep 17 00:00:00 2001 From: Adam Abrons Date: Tue, 5 Jan 2010 16:36:58 -0800 Subject: angular.js --- Rakefile | 74 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 74 insertions(+) create mode 100644 Rakefile (limited to 'Rakefile') diff --git a/Rakefile b/Rakefile new file mode 100644 index 00000000..9fb7f173 --- /dev/null +++ b/Rakefile @@ -0,0 +1,74 @@ +include FileUtils + +desc 'Compile JavaScript' +task :compile do + compiled = %x(java -jar lib/shrinksafe/shrinksafe.jar \ + lib/webtoolkit/webtoolkit.base64.js \ + lib/underscore/underscore.js \ + src/Loader.js \ + src/API.js \ + src/Binder.js \ + src/ControlBar.js \ + src/DataStore.js \ + src/Filters.js \ + src/JSON.js \ + src/Model.js \ + src/Parser.js \ + src/Scope.js \ + src/Server.js \ + src/Users.js \ + src/Validators.js \ + src/Widgets.js \ + src/angular-bootstrap.js \ + ) + f = File.new("angular.js", 'w') + f.write(compiled) + f.close +end + +desc 'Compile JavaScript with Google Closure Compiler' +task :compileclosure do + %x(java -jar lib/compiler-closure/compiler.jar \ + --compilation_level ADVANCED_OPTIMIZATIONS \ + --js lib/webtoolkit/webtoolkit.base64.js \ + --js lib/underscore/underscore.js \ + --js src/Loader.js \ + --js src/API.js \ + --js src/Binder.js \ + --js src/ControlBar.js \ + --js src/DataStore.js \ + --js src/Filters.js \ + --js src/JSON.js \ + --js src/Model.js \ + --js src/Parser.js \ + --js src/Scope.js \ + --js src/Server.js \ + --js src/Users.js \ + --js src/Validators.js \ + --js src/Widgets.js \ + --js src/angular-bootstrap.js \ + --js_output_file angular.js) +end + +namespace :server do + desc 'Run JsTestDriver Server' + task :start do + sh %x(java -jar lib/jstestdriver/JsTestDriver.jar --browser open --port 9876) + end + + desc "Run JavaScript tests against the server" + task :test do + sh %(java -jar lib/jstestdriver/JsTestDriver.jar --tests all) + end +end + +desc "Run JavaScript tests" +task :test do + sh %(java -jar lib/jstestdriver/JsTestDriver.jar --tests all --browser open --port 9876) +end + +desc 'Lint' +task :lint do + out = %x(lib/jsl/jsl -conf lib/jsl/jsl.default.conf) + print out +end -- cgit v1.2.3 From eb9e66f4804cf417ce142e5515b039db73d31144 Mon Sep 17 00:00:00 2001 From: Misko Hevery Date: Sat, 9 Jan 2010 13:21:24 -0800 Subject: cleanup --- Rakefile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'Rakefile') diff --git a/Rakefile b/Rakefile index 9fb7f173..56482e39 100644 --- a/Rakefile +++ b/Rakefile @@ -28,8 +28,8 @@ end desc 'Compile JavaScript with Google Closure Compiler' task :compileclosure do +# --compilation_level ADVANCED_OPTIMIZATIONS \ %x(java -jar lib/compiler-closure/compiler.jar \ - --compilation_level ADVANCED_OPTIMIZATIONS \ --js lib/webtoolkit/webtoolkit.base64.js \ --js lib/underscore/underscore.js \ --js src/Loader.js \ -- cgit v1.2.3 From 9b9a0dadcce82ae42ac09ad396d647739af20a06 Mon Sep 17 00:00:00 2001 From: Misko Hevery Date: Sat, 9 Jan 2010 15:02:43 -0800 Subject: removed nglr namespace --- Rakefile | 35 +++++++++-------------------------- 1 file changed, 9 insertions(+), 26 deletions(-) (limited to 'Rakefile') diff --git a/Rakefile b/Rakefile index 56482e39..a4823809 100644 --- a/Rakefile +++ b/Rakefile @@ -2,9 +2,11 @@ include FileUtils desc 'Compile JavaScript' task :compile do - compiled = %x(java -jar lib/shrinksafe/shrinksafe.jar \ - lib/webtoolkit/webtoolkit.base64.js \ + concat = %x(cat \ lib/underscore/underscore.js \ + src/angular.prefix \ + lib/webtoolkit/webtoolkit.base64.js \ + lib/swfobject.js/swfobject.js \ src/Loader.js \ src/API.js \ src/Binder.js \ @@ -19,35 +21,16 @@ task :compile do src/Users.js \ src/Validators.js \ src/Widgets.js \ - src/angular-bootstrap.js \ + src/angular.suffix \ ) f = File.new("angular.js", 'w') - f.write(compiled) + f.write(concat) f.close -end -desc 'Compile JavaScript with Google Closure Compiler' -task :compileclosure do -# --compilation_level ADVANCED_OPTIMIZATIONS \ %x(java -jar lib/compiler-closure/compiler.jar \ - --js lib/webtoolkit/webtoolkit.base64.js \ - --js lib/underscore/underscore.js \ - --js src/Loader.js \ - --js src/API.js \ - --js src/Binder.js \ - --js src/ControlBar.js \ - --js src/DataStore.js \ - --js src/Filters.js \ - --js src/JSON.js \ - --js src/Model.js \ - --js src/Parser.js \ - --js src/Scope.js \ - --js src/Server.js \ - --js src/Users.js \ - --js src/Validators.js \ - --js src/Widgets.js \ - --js src/angular-bootstrap.js \ - --js_output_file angular.js) + --compilation_level ADVANCED_OPTIMIZATIONS \ + --js angular.js \ + --js_output_file angular-minified.js) end namespace :server do -- cgit v1.2.3 From 1aba6b53b88c70b61a0cc991b1371739305d117b Mon Sep 17 00:00:00 2001 From: Misko Hevery Date: Sun, 10 Jan 2010 08:58:57 -0800 Subject: basic calculator works with minified.js, lots of references still broken --- Rakefile | 33 +++++++++++++++++++++++++++++++-- 1 file changed, 31 insertions(+), 2 deletions(-) (limited to 'Rakefile') diff --git a/Rakefile b/Rakefile index a4823809..8f7bc7ec 100644 --- a/Rakefile +++ b/Rakefile @@ -1,12 +1,39 @@ include FileUtils +desc 'Generate Externs' +task :compileexterns do + out = File.new("externs.js", "w") + + out.write("function _(){};\n") + file = File.new("lib/underscore/underscore.js", "r") + while (line = file.gets) + if line =~ /^\s*_\.(\w+)\s*=.*$/ + out.write("_.#{$1}=function(){};\n") + end + end + file.close + + out.write("function jQuery(){};\n") + file = File.new("lib/jquery/jquery-1.3.2.js", "r") + while (line = file.gets) + if line =~ /^\s*(\w+)\s*:\s*function.*$/ + out.write("jQuery.#{$1}=function(){};\n") + end + end + file.close + out.write("jQuery.scope=function(){};\n") + out.write("jQuery.controller=function(){};\n") + + out.close +end + desc 'Compile JavaScript' task :compile do + Rake::Task['compileexterns'].execute + concat = %x(cat \ - lib/underscore/underscore.js \ src/angular.prefix \ lib/webtoolkit/webtoolkit.base64.js \ - lib/swfobject.js/swfobject.js \ src/Loader.js \ src/API.js \ src/Binder.js \ @@ -30,6 +57,8 @@ task :compile do %x(java -jar lib/compiler-closure/compiler.jar \ --compilation_level ADVANCED_OPTIMIZATIONS \ --js angular.js \ + --externs externs.js \ + --create_source_map ./angular-minified.map \ --js_output_file angular-minified.js) end -- cgit v1.2.3 From 595b4ea097bcb512173b6d4a12924ea1a3d70ecd Mon Sep 17 00:00:00 2001 From: Misko Hevery Date: Mon, 18 Jan 2010 10:47:03 -0800 Subject: checkpoint for integration with angular --- Rakefile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'Rakefile') diff --git a/Rakefile b/Rakefile index 8f7bc7ec..56f7a9c4 100644 --- a/Rakefile +++ b/Rakefile @@ -34,7 +34,7 @@ task :compile do concat = %x(cat \ src/angular.prefix \ lib/webtoolkit/webtoolkit.base64.js \ - src/Loader.js \ + src/Angular.js \ src/API.js \ src/Binder.js \ src/ControlBar.js \ -- cgit v1.2.3 From 88384854c209f87507c273218fea85009f3801d6 Mon Sep 17 00:00:00 2001 From: Adam Abrons Date: Tue, 26 Jan 2010 11:27:50 -0800 Subject: add default rake task (compile and test), send database name to login --- Rakefile | 2 ++ 1 file changed, 2 insertions(+) (limited to 'Rakefile') diff --git a/Rakefile b/Rakefile index 56f7a9c4..8bb7e1f2 100644 --- a/Rakefile +++ b/Rakefile @@ -1,5 +1,7 @@ include FileUtils +task :default => [:compile, :test] + desc 'Generate Externs' task :compileexterns do out = File.new("externs.js", "w") -- cgit v1.2.3 From a9c182764b5feeb2466c4bb32f7572762f7fab6d Mon Sep 17 00:00:00 2001 From: Misko Hevery Date: Thu, 28 Jan 2010 22:10:49 -0800 Subject: added formatters --- Rakefile | 1 + 1 file changed, 1 insertion(+) (limited to 'Rakefile') diff --git a/Rakefile b/Rakefile index 8bb7e1f2..883198dc 100644 --- a/Rakefile +++ b/Rakefile @@ -42,6 +42,7 @@ task :compile do src/ControlBar.js \ src/DataStore.js \ src/Filters.js \ + src/Formatters.js \ src/JSON.js \ src/Model.js \ src/Parser.js \ -- cgit v1.2.3 From 2df072e3f89e8998b06b5a9e5ffb10fa32155136 Mon Sep 17 00:00:00 2001 From: Adam Abrons Date: Tue, 16 Mar 2010 14:38:56 -0700 Subject: twitter using resources --- Rakefile | 1 + 1 file changed, 1 insertion(+) (limited to 'Rakefile') diff --git a/Rakefile b/Rakefile index 883198dc..5e0bf008 100644 --- a/Rakefile +++ b/Rakefile @@ -46,6 +46,7 @@ task :compile do src/JSON.js \ src/Model.js \ src/Parser.js \ + src/Resource.js \ src/Scope.js \ src/Server.js \ src/Users.js \ -- cgit v1.2.3 From 563a98e4bd0fd9f2277befcfe45ff2d0476878d8 Mon Sep 17 00:00:00 2001 From: Shyam Seshadri Date: Wed, 24 Mar 2010 10:50:02 -0700 Subject: Fix rakefile to work with older versions of rake --- Rakefile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'Rakefile') diff --git a/Rakefile b/Rakefile index 5e0bf008..c3189831 100644 --- a/Rakefile +++ b/Rakefile @@ -31,7 +31,7 @@ end desc 'Compile JavaScript' task :compile do - Rake::Task['compileexterns'].execute + Rake::Task['compileexterns'].execute 0 concat = %x(cat \ src/angular.prefix \ -- cgit v1.2.3 From fd72031e9626b574a4459747c2e0261f69102364 Mon Sep 17 00:00:00 2001 From: Misko Hevery Date: Wed, 24 Mar 2010 12:08:09 -0700 Subject: work in progress --- Rakefile | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) (limited to 'Rakefile') diff --git a/Rakefile b/Rakefile index 5e0bf008..a5edf04f 100644 --- a/Rakefile +++ b/Rakefile @@ -9,16 +9,16 @@ task :compileexterns do out.write("function _(){};\n") file = File.new("lib/underscore/underscore.js", "r") while (line = file.gets) - if line =~ /^\s*_\.(\w+)\s*=.*$/ + if line =~ /^\s*_\.(\w+)\s*=.*$/ out.write("_.#{$1}=function(){};\n") end end file.close out.write("function jQuery(){};\n") - file = File.new("lib/jquery/jquery-1.3.2.js", "r") + file = File.new("lib/jquery/jquery-1.4.2.js", "r") while (line = file.gets) - if line =~ /^\s*(\w+)\s*:\s*function.*$/ + if line =~ /^\s*(\w+)\s*:\s*function.*$/ out.write("jQuery.#{$1}=function(){};\n") end end -- cgit v1.2.3 From c655b884e268c8c9b6853d440143953f51b7e7de Mon Sep 17 00:00:00 2001 From: Misko Hevery Date: Mon, 29 Mar 2010 10:40:57 -0700 Subject: tests broken, but bootstrap works --- Rakefile | 24 +++++++++++------------- 1 file changed, 11 insertions(+), 13 deletions(-) (limited to 'Rakefile') diff --git a/Rakefile b/Rakefile index c213874d..99f379ab 100644 --- a/Rakefile +++ b/Rakefile @@ -35,23 +35,21 @@ task :compile do concat = %x(cat \ src/angular.prefix \ - lib/webtoolkit/webtoolkit.base64.js \ src/Angular.js \ - src/API.js \ - src/Binder.js \ - src/ControlBar.js \ - src/DataStore.js \ - src/Filters.js \ - src/Formatters.js \ src/JSON.js \ - src/Model.js \ + src/Compiler.js \ + src/Scope.js \ + src/jqlite.js \ src/Parser.js \ src/Resource.js \ - src/Scope.js \ - src/Server.js \ - src/Users.js \ - src/Validators.js \ - src/Widgets.js \ + src/URLWatcher.js \ + src/apis.js \ + src/filters.js \ + src/formatters.js \ + src/validators.js \ + src/directives.js \ + src/markups.js \ + src/widgets.js \ src/angular.suffix \ ) f = File.new("angular.js", 'w') -- cgit v1.2.3 From 0df93fd49c1687b2eddaa79faa1c0adbef82bf72 Mon Sep 17 00:00:00 2001 From: Misko Hevery Date: Wed, 7 Apr 2010 10:17:15 -0700 Subject: clean up, fixes for app --- Rakefile | 10 ++++++---- 1 file changed, 6 insertions(+), 4 deletions(-) (limited to 'Rakefile') diff --git a/Rakefile b/Rakefile index 99f379ab..6f6ee8ad 100644 --- a/Rakefile +++ b/Rakefile @@ -39,10 +39,10 @@ task :compile do src/JSON.js \ src/Compiler.js \ src/Scope.js \ - src/jqlite.js \ src/Parser.js \ src/Resource.js \ - src/URLWatcher.js \ + src/Browser.js \ + src/jqLite.js \ src/apis.js \ src/filters.js \ src/formatters.js \ @@ -50,15 +50,17 @@ task :compile do src/directives.js \ src/markups.js \ src/widgets.js \ + src/services.js \ + src/AngularPublic.js \ src/angular.suffix \ ) - f = File.new("angular.js", 'w') + f = File.new("angular-debug.js", 'w') f.write(concat) f.close %x(java -jar lib/compiler-closure/compiler.jar \ --compilation_level ADVANCED_OPTIMIZATIONS \ - --js angular.js \ + --js angular-debug.js \ --externs externs.js \ --create_source_map ./angular-minified.map \ --js_output_file angular-minified.js) -- cgit v1.2.3 From 5992e81b2e302c3b3375567e347227f6a9496585 Mon Sep 17 00:00:00 2001 From: Misko Hevery Date: Tue, 25 May 2010 14:23:52 -0700 Subject: added rake task to create a single file for scenario runner --- Rakefile | 26 ++++++++++++++++++++++++-- 1 file changed, 24 insertions(+), 2 deletions(-) (limited to 'Rakefile') diff --git a/Rakefile b/Rakefile index 6f6ee8ad..a6edb860 100644 --- a/Rakefile +++ b/Rakefile @@ -3,7 +3,7 @@ include FileUtils task :default => [:compile, :test] desc 'Generate Externs' -task :compileexterns do +task :compile_externs do out = File.new("externs.js", "w") out.write("function _(){};\n") @@ -29,9 +29,31 @@ task :compileexterns do out.close end +desc 'Compile Scenario' +task :compile_scenario do + concat = %x(cat \ + lib/underscore/underscore.js \ + lib/jquery/jquery-1.4.2.js \ + src/scenario/angular.prefix \ + src/Angular.js \ + src/JSON.js \ + src/scenario/Runner.js \ + src/scenario/DSL.js \ + src/scenario/angular.suffix \ + ) + css = %x(cat css/angular-scenario.css) + f = File.new("angular-scenario.js", 'w') + f.write(concat) + f.write('document.write(\'\');') + f.close +end + desc 'Compile JavaScript' task :compile do - Rake::Task['compileexterns'].execute 0 + Rake::Task['compile_externs'].execute 0 + Rake::Task['compile_scenario'].execute 0 concat = %x(cat \ src/angular.prefix \ -- cgit v1.2.3 From cb5d21192787985bbff20b369e885639de253345 Mon Sep 17 00:00:00 2001 From: Andres Ornelas Date: Thu, 27 May 2010 11:26:23 -0700 Subject: extracted switchRouteMatcher and added necessary libraries to angular-scenario --- Rakefile | 7 +++++++ 1 file changed, 7 insertions(+) (limited to 'Rakefile') diff --git a/Rakefile b/Rakefile index a6edb860..82b56dd9 100644 --- a/Rakefile +++ b/Rakefile @@ -37,6 +37,13 @@ task :compile_scenario do src/scenario/angular.prefix \ src/Angular.js \ src/JSON.js \ + src/Scope.js \ + src/Parser.js \ + src/Resource.js \ + src/Browser.js \ + src/apis.js \ + src/services.js \ + src/AngularPublic.js \ src/scenario/Runner.js \ src/scenario/DSL.js \ src/scenario/angular.suffix \ -- cgit v1.2.3 From fa0702bad1714965c1f236fb195b8a4f7ce7bbc6 Mon Sep 17 00:00:00 2001 From: Misko Hevery Date: Fri, 28 May 2010 10:32:03 -0700 Subject: change order of initialization --- Rakefile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'Rakefile') diff --git a/Rakefile b/Rakefile index 82b56dd9..c8de5b78 100644 --- a/Rakefile +++ b/Rakefile @@ -76,10 +76,10 @@ task :compile do src/filters.js \ src/formatters.js \ src/validators.js \ + src/services.js \ src/directives.js \ src/markups.js \ src/widgets.js \ - src/services.js \ src/AngularPublic.js \ src/angular.suffix \ ) -- cgit v1.2.3