chore(module): move files around in preparation for more modules

Author: mhevery

Rakefile

@@ -37,10 +37,10 @@ task :compile_scenario => :init do
 
   deps = [
       'lib/jquery/jquery.js',
-      'src/scenario/angular.prefix',
+      'src/ngScenario/angular.prefix',
       files['angularSrc'],
       files['angularScenario'],
-      'src/scenario/angular.suffix',
+      'src/ngScenario/angular.suffix',
   ]
 
   concat = 'cat ' + deps.flatten.join(' ')
@@ -56,9 +56,9 @@ desc 'Compile JSTD Scenario Adapter'
 task :compile_jstd_scenario_adapter => :init do
 
   deps = [
-      'src/jstd-scenario-adapter/angular.prefix',
-      'src/jstd-scenario-adapter/Adapter.js',
-      'src/jstd-scenario-adapter/angular.suffix',
+      'src/ngScenario/jstd-scenario-adapter/angular.prefix',
+      'src/ngScenario/jstd-scenario-adapter/Adapter.js',
+      'src/ngScenario/jstd-scenario-adapter/angular.suffix',
   ]
 
   concat = 'cat ' + deps.flatten.join(' ')
@@ -108,7 +108,7 @@ task :compile => [:init, :compile_scenario, :compile_jstd_scenario_adapter] do
         --js #{path_to('angular.js')} \
         --js_output_file #{path_to('angular.min.js')})
 
-  FileUtils.cp_r 'i18n/locale', path_to('i18n')
+  FileUtils.cp_r 'src/ngLocale', path_to('i18n')
 
   File.open(path_to('angular-loader.js'), 'w') do |f|
     concat = 'cat ' + [
@@ -153,7 +153,7 @@ task :package => [:clean, :compile, :docs] do
   FileUtils.rm_r(path_to('pkg'), :force => true)
   FileUtils.mkdir_p(pkg_dir)
 
-  ['src/angular-mocks.js',
+  ['src/ngMock/angular-mocks.js',
     path_to('angular.js'),
     path_to('angular-loader.js'),
     path_to('angular.min.js'),
@@ -162,7 +162,7 @@ task :package => [:clean, :compile, :docs] do
     path_to('jstd-scenario-adapter.js'),
     path_to('jstd-scenario-adapter-config.js'),
   ].each do |src|
-    dest = src.gsub(/^[^\/]+\//, '').gsub(/((\.min)?\.js)$/, "-#{NG_VERSION.full}\\1")
+    dest = src.gsub(/^.*\//, '').gsub(/((\.min)?\.js)$/, "-#{NG_VERSION.full}\\1")
     FileUtils.cp(src, pkg_dir + '/' + dest)
   end
 

angularFiles.js

@@ -4,79 +4,83 @@ angularFiles = {
     'src/loader.js',
     'src/AngularPublic.js',
     'src/JSON.js',
-    'src/Injector.js',
     'src/jqLite.js',
     'src/apis.js',
-    'src/service/anchorScroll.js',
-    'src/service/browser.js',
-    'src/service/cacheFactory.js',
-    'src/service/compiler.js',
-    'src/service/controller.js',
-    'src/service/cookieStore.js',
-    'src/service/cookies.js',
-    'src/service/defer.js',
-    'src/service/document.js',
-    'src/service/exceptionHandler.js',
-    'src/service/filter.js',
-    'src/service/filter/filter.js',
-    'src/service/filter/filters.js',
-    'src/service/filter/limitTo.js',
-    'src/service/filter/orderBy.js',
-    'src/service/interpolate.js',
-    'src/service/location.js',
-    'src/service/log.js',
-    'src/service/resource.js',
-    'src/service/parse.js',
-    'src/service/q.js',
-    'src/service/route.js',
-    'src/service/routeParams.js',
-    'src/service/scope.js',
-    'src/service/sanitize.js',
-    'src/service/sniffer.js',
-    'src/service/window.js',
-    'src/service/http.js',
-    'src/service/httpBackend.js',
-    'src/service/locale.js',
-    'src/directive/directives.js',
-    'src/directive/a.js',
-    'src/directive/booleanAttrDirs.js',
-    'src/directive/form.js',
-    'src/directive/input.js',
-    'src/directive/ngBind.js',
-    'src/directive/ngClass.js',
-    'src/directive/ngCloak.js',
-    'src/directive/ngController.js',
-    'src/directive/ngEventDirs.js',
-    'src/directive/ngInclude.js',
-    'src/directive/ngInit.js',
-    'src/directive/ngNonBindable.js',
-    'src/directive/ngPluralize.js',
-    'src/directive/ngRepeat.js',
-    'src/directive/ngShowHide.js',
-    'src/directive/ngStyle.js',
-    'src/directive/ngSwitch.js',
-    'src/directive/ngTransclude.js',
-    'src/directive/ngView.js',
-    'src/directive/script.js',
-    'src/directive/select.js',
-    'src/directive/style.js'
+
+    'src/auto/injector.js',
+
+    'src/ng/anchorScroll.js',
+    'src/ng/browser.js',
+    'src/ng/cacheFactory.js',
+    'src/ng/compiler.js',
+    'src/ng/controller.js',
+    'src/ng/cookieStore.js',
+    'src/ng/cookies.js',
+    'src/ng/defer.js',
+    'src/ng/document.js',
+    'src/ng/exceptionHandler.js',
+    'src/ng/interpolate.js',
+    'src/ng/location.js',
+    'src/ng/log.js',
+    'src/ng/parse.js',
+    'src/ng/q.js',
+    'src/ng/resource.js',
+    'src/ng/route.js',
+    'src/ng/routeParams.js',
+    'src/ng/rootScope.js',
+    'src/ng/sanitize.js',
+    'src/ng/sniffer.js',
+    'src/ng/window.js',
+    'src/ng/http.js',
+    'src/ng/httpBackend.js',
+    'src/ng/locale.js',
+
+    'src/ng/filter.js',
+    'src/ng/filter/filter.js',
+    'src/ng/filter/filters.js',
+    'src/ng/filter/limitTo.js',
+    'src/ng/filter/orderBy.js',
+
+    'src/ng/directive/directives.js',
+    'src/ng/directive/a.js',
+    'src/ng/directive/booleanAttrDirs.js',
+    'src/ng/directive/form.js',
+    'src/ng/directive/input.js',
+    'src/ng/directive/ngBind.js',
+    'src/ng/directive/ngClass.js',
+    'src/ng/directive/ngCloak.js',
+    'src/ng/directive/ngController.js',
+    'src/ng/directive/ngEventDirs.js',
+    'src/ng/directive/ngInclude.js',
+    'src/ng/directive/ngInit.js',
+    'src/ng/directive/ngNonBindable.js',
+    'src/ng/directive/ngPluralize.js',
+    'src/ng/directive/ngRepeat.js',
+    'src/ng/directive/ngShowHide.js',
+    'src/ng/directive/ngStyle.js',
+    'src/ng/directive/ngSwitch.js',
+    'src/ng/directive/ngTransclude.js',
+    'src/ng/directive/ngView.js',
+    'src/ng/directive/script.js',
+    'src/ng/directive/select.js',
+    'src/ng/directive/style.js'
   ],
 
   'angularScenario': [
-    'src/scenario/Scenario.js',
-    'src/scenario/Application.js',
-    'src/scenario/Describe.js',
-    'src/scenario/Future.js',
-    'src/scenario/ObjectModel.js',
-    'src/scenario/Describe.js',
-    'src/scenario/Runner.js',
-    'src/scenario/SpecRunner.js',
-    'src/scenario/dsl.js',
-    'src/scenario/matchers.js',
-    'src/scenario/output/Html.js',
-    'src/scenario/output/Json.js',
-    'src/scenario/output/Xml.js',
-    'src/scenario/output/Object.js'
+    'src/ngScenario/Scenario.js',
+    'src/ngScenario/Application.js',
+    'src/ngScenario/Describe.js',
+    'src/ngScenario/Future.js',
+    'src/ngScenario/ObjectModel.js',
+    'src/ngScenario/Describe.js',
+    'src/ngScenario/Runner.js',
+    'src/ngScenario/SpecRunner.js',
+    'src/ngScenario/dsl.js',
+    'src/ngScenario/matchers.js',
+    'src/ngScenario/output/Html.js',
+    'src/ngScenario/output/Json.js',
+    'src/ngScenario/output/Xml.js',
+    'src/ngScenario/output/Object.js'
   ],
 
   'jstd': [
@@ -88,25 +92,27 @@ angularFiles = {
     'example/personalLog/*.js',
     'test/testabilityPatch.js',
     'test/matchers.js',
-    'src/scenario/Scenario.js',
-    'src/scenario/output/*.js',
-    'src/jstd-scenario-adapter/*.js',
-    'src/scenario/*.js',
-    'src/angular-mocks.js',
-    'test/scenario/*.js',
-    'test/scenario/output/*.js',
-    'test/jstd-scenario-adapter/*.js',
+    'src/ngScenario/Scenario.js',
+    'src/ngScenario/output/*.js',
+    'src/ngScenario/jstd-scenario-adapter/*.js',
+    'src/ngScenario/*.js',
+    'src/ngMock/angular-mocks.js',
+    'test/ngScenario/*.js',
+    'test/ngScenario/output/*.js',
+    'test/ngScenario/jstd-scenario-adapter/*.js',
     'test/*.js',
-    'test/service/*.js',
-    'test/service/filter/*.js',
-    'test/directive/*.js',
+    'test/auto/*.js',
+    'test/ng/*.js',
+    'test/ng/directive/*.js',
+    'test/ng/filter/*.js',
+    'test/ngMock/*.js',
     'example/personalLog/test/*.js'
   ],
 
   'jstdExclude': [
     'test/jquery_alias.js',
     'src/angular-bootstrap.js',
-    'src/scenario/angular-bootstrap.js'
+    'src/ngScenario/angular-bootstrap.js'
   ],
 
   'jstdScenario': [
@@ -120,24 +126,24 @@ angularFiles = {
     'lib/jasmine/jasmine.js',
     'lib/jasmine-jstd-adapter/JasmineAdapter.js',
     'build/angular.js',
-    'src/angular-mocks.js',
+    'src/ngMock/angular-mocks.js',
     'test/matchers.js',
-    'test/angular-mocksSpec.js'
+    'test/ngMock/angular-mocksSpec.js'
   ],
 
   'jstdPerf': [
    'lib/jasmine/jasmine.js',
    'lib/jasmine-jstd-adapter/JasmineAdapter.js',
    'angularSrc',
-   'src/angular-mocks.js',
+   'src/ngMock/angular-mocks.js',
    'perf/data/*.js',
    'perf/testUtils.js',
    'perf/*.js'
   ],
 
   'jstdPerfExclude': [
-    'src/angular-bootstrap.js',
-    'src/scenario/angular-bootstrap.js'
+    'src/ng/angular-bootstrap.js',
+    'src/ngScenario/angular-bootstrap.js'
   ],
 
   'jstdJquery': [
@@ -149,23 +155,26 @@ angularFiles = {
     'example/personalLog/*.js',
     'test/testabilityPatch.js',
     'test/matchers.js',
-    'src/scenario/Scenario.js',
-    'src/scenario/output/*.js',
-    'src/jstd-scenario-adapter/*.js',
-    'src/scenario/*.js',
-    'src/angular-mocks.js',
-    'test/scenario/*.js',
-    'test/scenario/output/*.js',
-    'test/jstd-scenario-adapter/*.js',
+    'src/ngScenario/Scenario.js',
+    'src/ngScenario/output/*.js',
+    'src/ngScenario/jstd-scenario-adapter/*.js',
+    'src/ngScenario/*.js',
+    'src/ngMock/angular-mocks.js',
+    'test/ngScenario/*.js',
+    'test/ngScenario/output/*.js',
+    'test/ngScenario/jstd-scenario-adapter/*.js',
     'test/*.js',
-    'test/service/*.js',
-    'test/directive/*.js',
+    'test/auto/*.js',
+    'test/ng/*.js',
+    'test/ng/directive/*.js',
+    'test/ng/filter/*.js',
+    'test/ngMock/*.js',
     'example/personalLog/test/*.js'
   ],
 
   'jstdJqueryExclude': [
     'src/angular-bootstrap.js',
-    'src/scenario/angular-bootstrap.js',
+    'src/ngScenario/angular-bootstrap.js',
     'test/jquery_remove.js'
   ]
 };

i18n/src/closureSlurper.js

@@ -12,7 +12,7 @@ var Q  = require('qq'),
              require: function() {},
              i18n: {currency: {}, pluralRules: {}} };
 
-createFolder('../locale/').then(function() {
+createFolder('../../src/ngLocale/').then(function() {
   var promiseA = Q.defer(),
       promiseB = Q.defer();