Extract grunt entry point to the project root

Instead of having all pointers to parent directories that are really
out of scope. This resolves the issue with browserify, so requires
works as expected with node_modules lookups

.gitignore

@@ -24,8 +24,6 @@ config/database.yml
 config/app_config.yml
 config/redis.conf
 src/
-!lib/build/src/
-lib/build/test/test_bundle.*
 spec/support/data/failed_remote/*
 *.swp
 *.swo
@@ -40,19 +38,19 @@ services/importer/spec/factories/database.json
 cartodb.sublime-workspace
 cartodb.sublime-project
 .rvmrc
-lib/build/dist
-lib/build/node_modules
 app/assets/images/sprites/*.png
 npm-debug.log
-.idea
 .ruby-gemset
 lib/build/dist
-lib/build/node_modules
-lib/build/.grunt/*
 lib/build/grunt-aws.json
 lib/build/app_config.js
 rubygems
-lib/build/_SpecRunner.html
 vendor/bundle/*
 .vagrant
 Vagrantfile
+node_modules
+.grunt/*
+_SpecRunner.html
+lib/assets/test/cartodb2_tests.js
+vendor/assets/javascripts/cartodb.*
+vendor/assets/stylesheets/cartodb.*

Gruntfile.js

@@ -10,8 +10,8 @@
 
     if (timer) timer.init(grunt);
 
-    var ROOT_ASSETS_DIR = '../../public/assets/';
-    var ASSETS_DIR = '../../public/assets/<%= pkg.version %>';
+    var ROOT_ASSETS_DIR = './public/assets/';
+    var ASSETS_DIR = './public/assets/<%= pkg.version %>';
 
     // use grunt --environment production
     var env = grunt.option('environment') || 'development';
@@ -25,50 +25,49 @@
     grunt.initConfig({
       pkg: grunt.file.readJSON('package.json'),
       aws: aws,
-      env: grunt.file.readJSON("./config/" + env + ".json"),
+      env: grunt.file.readJSON("./lib/build/config/" + env + ".json"),
       gitrev: exec('git rev-parse HEAD', { silent:true }).output.replace('\n', ''),
 
       assets_dir: ASSETS_DIR,
       root_assets_dir: ROOT_ASSETS_DIR,
 
       // Concat task
-      concat:   require('./tasks/concat').task(),
+      concat:   require('./lib/build/tasks/concat').task(),
 
       // JST generation task
-      jst:      require('./tasks/jst').task(),
+      jst:      require('./lib/build/tasks/jst').task(),
 
       // Compass files generation
-      compass:  require('./tasks/compass').task(),
+      compass:  require('./lib/build/tasks/compass').task(),
 
       // Copy assets (stylesheets, javascripts, images...)
-      copy:     require('./tasks/copy').task(grunt),
+      copy:     require('./lib/build/tasks/copy').task(grunt),
 
       // Watch actions
-      watch: require('./tasks/watch.js').task(),
+      watch: require('./lib/build/tasks/watch.js').task(),
 
       // Clean folders before other tasks
-      clean:    require('./tasks/clean').task(),
+      clean:    require('./lib/build/tasks/clean').task(),
 
       // Jasmine tests
-      jasmine:  require('./tasks/jasmine.js').task(),
+      jasmine:  require('./lib/build/tasks/jasmine.js').task(),
 
-      s3: require('./tasks/s3.js').task(),
+      s3: require('./lib/build/tasks/s3.js').task(),
 
-      uglify: require('./tasks/uglify.js').task(),
+      uglify: require('./lib/build/tasks/uglify.js').task(),
 
-      browserify: require('./tasks/browserify.js').task(),
-      exorcise: require('./tasks/exorcise.js').task()
+      browserify: require('./lib/build/tasks/browserify.js').task()
     });
 
     // Load Grunt tasks
     require('load-grunt-tasks')(grunt);
 
-    require('./tasks/manifest').register(grunt, ASSETS_DIR);
+    require('./lib/build/tasks/manifest').register(grunt, ASSETS_DIR);
 
     // builds cdb
     grunt.registerTask('cdb', "builds cartodb.js", function() {
       var done = this.async();
-      require("child_process").exec('cd ../../ && make update_cdb', function (error, stdout, stderr) {
+      require("child_process").exec('cd && make update_cdb', function (error, stdout, stderr) {
         if (error) {
           grunt.log.fail('cartodb.js not updated');
         } else {

app_config.js

@@ -0,0 +1,2 @@
+cdb.config.set('assets_url', '/assets/2.15.16');
+console.log('cartodbui v2.15.16 sha1: 7262e09e97ea72f91a682d1af7d69126c35b7055');

config.rb

@@ -1,11 +1,12 @@
+# Compass configuration, used by cartodb UI grunt task.
 # Require any additional compass plugins here.
 
 # Set this to the root of your project when deployed:
 http_path = "/"
 css_dir = "dist/css"
-sass_dir = "../../app/assets/stylesheets/tmp/"
-images_dir = "../../app/assets/images/"
-#javascripts_dir = "javascripts"
+sass_dir = "app/assets/stylesheets/tmp/"
+images_dir = "app/assets/images/"
+#javascripts_dir = "lib/assets/javascripts"
 
 # You can select your preferred output style here (can be overridden via the command line):
 output_style = :compact
@@ -23,4 +24,4 @@ line_comments = false
 # and then run:
 # sass-convert -R --from scss --to sass sass scss && rm -rf sass && mv scss sass
 
-Encoding.default_external = "utf-8"
+Encoding.default_external = "utf-8"

lib/build/.rvmrc

@@ -1 +0,0 @@
-rvm use --create 1.9.2@cartodbui > /dev/null

lib/build/files/js_files.js

@@ -3,263 +3,263 @@ var _ = require('underscore');
 module.exports = files = {
 
   dashboard: [
-    '../../vendor/assets/javascripts/d3.v2.js',
-    '../../vendor/assets/javascripts/select2.min.js',
-    '../../vendor/assets/javascripts/moment.js',
-    '../../vendor/assets/javascripts/jquery-ui/**/*.js',
-    '../../vendor/assets/javascripts/jquery.fileupload.js',
-    '../../vendor/assets/javascripts/jquery.fileupload-fp.js',
-    '../../vendor/assets/javascripts/jquery.fileupload-ui.js',
-    '../../vendor/assets/javascripts/models.js',
-    '../../vendor/assets/javascripts/markdown.js',
-    '../../vendor/assets/javascripts/datepicker.js',
-    '../assets/javascripts/cartodb/common/dropdown_menu.js',
-    '../assets/javascripts/cartodb/common/dropdown_basemap.js',
-    '../assets/javascripts/cartodb/common/forms/string_field.js',
-    '../assets/javascripts/cartodb/common/forms/widgets.js',
-    '../assets/javascripts/cartodb/common/import/import_pane.js',
-    '../assets/javascripts/cartodb/common/import/import_info/import_info.js',
-    '../assets/javascripts/cartodb/common/**/*.js',
-    '../assets/javascripts/cartodb/dashboard/**/*.js',
-    '../assets/javascripts/cartodb/dashboard/dashboard.js',
-    '../assets/javascripts/cartodb/dashboard/views/**/*.js',
-    '../assets/javascripts/cartodb/common/views/**/*.js',
-    '../assets/javascripts/cartodb/common/export_table_dialog.js',
+    'vendor/assets/javascripts/d3.v2.js',
+    'vendor/assets/javascripts/select2.min.js',
+    'vendor/assets/javascripts/moment.js',
+    'vendor/assets/javascripts/jquery-ui/**/*.js',
+    'vendor/assets/javascripts/jquery.fileupload.js',
+    'vendor/assets/javascripts/jquery.fileupload-fp.js',
+    'vendor/assets/javascripts/jquery.fileupload-ui.js',
+    'vendor/assets/javascripts/models.js',
+    'vendor/assets/javascripts/markdown.js',
+    'vendor/assets/javascripts/datepicker.js',
+    'lib/assets/javascripts/cartodb/common/dropdown_menu.js',
+    'lib/assets/javascripts/cartodb/common/dropdown_basemap.js',
+    'lib/assets/javascripts/cartodb/common/forms/string_field.js',
+    'lib/assets/javascripts/cartodb/common/forms/widgets.js',
+    'lib/assets/javascripts/cartodb/common/import/import_pane.js',
+    'lib/assets/javascripts/cartodb/common/import/import_info/import_info.js',
+    'lib/assets/javascripts/cartodb/common/**/*.js',
+    'lib/assets/javascripts/cartodb/dashboard/**/*.js',
+    'lib/assets/javascripts/cartodb/dashboard/dashboard.js',
+    'lib/assets/javascripts/cartodb/dashboard/views/**/*.js',
+    'lib/assets/javascripts/cartodb/common/views/**/*.js',
+    'lib/assets/javascripts/cartodb/common/export_table_dialog.js'
   ],
 
   application: [
-  '../../vendor/assets/javascripts/jquery.tipsy.js',
-  '../../vendor/assets/javascripts/rails.js'
+  'vendor/assets/javascripts/jquery.tipsy.js',
+  'vendor/assets/javascripts/rails.js'
   ],
 
   cdb: [
-  '../../vendor/assets/javascripts/cartodb.uncompressed.js',
-  '../../vendor/assets/javascripts/cartodb.mod.torque.uncompressed.js',
-  '../assets/javascripts/cartodb/app.js',
-  'app_config.js'
+  'vendor/assets/javascripts/cartodb.uncompressed.js',
+  'vendor/assets/javascripts/cartodb.mod.torque.uncompressed.js',
+  'lib/assets/javascripts/cartodb/app.js',
+  'lib/build/app_config.js'
   ],
 
   app: [
-    '../assets/javascripts/cartodb/app.js',
-    'app_config.js'
+    'lib/assets/javascripts/cartodb/app.js',
+    'lib/build/app_config.js'
   ],
 
   common_data: [
-  '../../vendor/assets/javascripts/jquery-ui/**/*.js',
-  '../../vendor/assets/javascripts/jquery.fileupload.js',
-  '../../vendor/assets/javascripts/jquery.fileupload-fp.js',
-  '../../vendor/assets/javascripts/jquery.fileupload-ui.js',
-  '../../vendor/assets/javascripts/select2.min.js',
-  '../../vendor/assets/javascripts/moment.js',
-  '../../vendor/assets/javascripts/datepicker.js',
-  '../../vendor/assets/javascripts/models.js',
-  '../../vendor/assets/javascripts/markdown.js',
-  '../assets/javascripts/cartodb/common/dropdown_menu.js',
-  '../assets/javascripts/cartodb/common/user_settings_dropdown.js',
-  '../assets/javascripts/cartodb/common/forms/string_field.js',
-  '../assets/javascripts/cartodb/common/forms/widgets.js',
-  '../assets/javascripts/cartodb/common/import/import_pane.js',
-  '../assets/javascripts/cartodb/common/import/import_info/import_info.js',
-  '../assets/javascripts/cartodb/common/**/*.js',
-  '../assets/javascripts/cartodb/common_data/**/*.js',
-  '../assets/javascripts/cartodb/common_data/common_data.js',
-  '../assets/javascripts/cartodb/dashboard/views/**/*.js',
-  '../assets/javascripts/cartodb/common/views/**/*.js'
+  'vendor/assets/javascripts/jquery-ui/**/*.js',
+  'vendor/assets/javascripts/jquery.fileupload.js',
+  'vendor/assets/javascripts/jquery.fileupload-fp.js',
+  'vendor/assets/javascripts/jquery.fileupload-ui.js',
+  'vendor/assets/javascripts/select2.min.js',
+  'vendor/assets/javascripts/moment.js',
+  'vendor/assets/javascripts/datepicker.js',
+  'vendor/assets/javascripts/models.js',
+  'vendor/assets/javascripts/markdown.js',
+  'lib/assets/javascripts/cartodb/common/dropdown_menu.js',
+  'lib/assets/javascripts/cartodb/common/user_settings_dropdown.js',
+  'lib/assets/javascripts/cartodb/common/forms/string_field.js',
+  'lib/assets/javascripts/cartodb/common/forms/widgets.js',
+  'lib/assets/javascripts/cartodb/common/import/import_pane.js',
+  'lib/assets/javascripts/cartodb/common/import/import_info/import_info.js',
+  'lib/assets/javascripts/cartodb/common/**/*.js',
+  'lib/assets/javascripts/cartodb/common_data/**/*.js',
+  'lib/assets/javascripts/cartodb/common_data/common_data.js',
+  'lib/assets/javascripts/cartodb/dashboard/views/**/*.js',
+  'lib/assets/javascripts/cartodb/common/views/**/*.js'
   ],
 
   keys: [
-  '../../vendor/assets/javascripts/ZeroClipboard.js',
-  '../../vendor/assets/javascripts/models.js',
-  '../assets/javascripts/cartodb/common/forms/string_field.js',
-  '../assets/javascripts/cartodb/common/search_form.js',
-  '../assets/javascripts/cartodb/common/dropdown_menu.js',
-  '../assets/javascripts/cartodb/common/user_settings_dropdown.js',
-  '../assets/javascripts/cartodb/common/error_stats.js',
-  '../assets/javascripts/cartodb/keys/**/*.js',
-  '../assets/javascripts/cartodb/common/view/**/*.js'
+  'vendor/assets/javascripts/ZeroClipboard.js',
+  'vendor/assets/javascripts/models.js',
+  'lib/assets/javascripts/cartodb/common/forms/string_field.js',
+  'lib/assets/javascripts/cartodb/common/search_form.js',
+  'lib/assets/javascripts/cartodb/common/dropdown_menu.js',
+  'lib/assets/javascripts/cartodb/common/user_settings_dropdown.js',
+  'lib/assets/javascripts/cartodb/common/error_stats.js',
+  'lib/assets/javascripts/cartodb/keys/**/*.js',
+  'lib/assets/javascripts/cartodb/common/view/**/*.js'
   ],
 
   login: [
-  '../../vendor/assets/javascripts/modernizr-min.js',
-  '../../vendor/assets/javascripts/selectivizr-min.js',
-  '../assets/javascripts/cartodb/app.js',
-  '../assets/javascripts/cartodb/common/error_stats.js',
-  '../assets/javascripts/cartodb/login/placeholder.js',
-  '../assets/javascripts/cartodb/login/login.js'
+  'vendor/assets/javascripts/modernizr-min.js',
+  'vendor/assets/javascripts/selectivizr-min.js',
+  'lib/assets/javascripts/cartodb/app.js',
+  'lib/assets/javascripts/cartodb/common/error_stats.js',
+  'lib/assets/javascripts/cartodb/login/placeholder.js',
+  'lib/assets/javascripts/cartodb/login/login.js'
   ],
 
   models: [
-  '../assets/javascripts/cartodb/models/table.js',
-  '../assets/javascripts/cartodb/models/tabledata.js',
-  '../assets/javascripts/cartodb/models/sqlview.js',
-  '../assets/javascripts/cartodb/models/cartodb_layer.js',
-  '../assets/javascripts/cartodb/models/map.js',
-  '../assets/javascripts/cartodb/models/user.js',
-  '../assets/javascripts/cartodb/models/organization.js',
-  '../assets/javascripts/cartodb/models/carto/*.js',
-  '../assets/javascripts/cartodb/models/**/*.js'
+  'lib/assets/javascripts/cartodb/models/table.js',
+  'lib/assets/javascripts/cartodb/models/tabledata.js',
+  'lib/assets/javascripts/cartodb/models/sqlview.js',
+  'lib/assets/javascripts/cartodb/models/cartodb_layer.js',
+  'lib/assets/javascripts/cartodb/models/map.js',
+  'lib/assets/javascripts/cartodb/models/user.js',
+  'lib/assets/javascripts/cartodb/models/organization.js',
+  'lib/assets/javascripts/cartodb/models/carto/*.js',
+  'lib/assets/javascripts/cartodb/models/**/*.js'
   ],
 
   organization: [
-  '../assets/javascripts/cartodb/common/forms/widgets.js',
-  '../assets/javascripts/cartodb/common/dropdown_menu.js',
-  '../assets/javascripts/cartodb/common/user_settings_dropdown.js',
-  '../assets/javascripts/cartodb/common/base_dialog.js',
-  '../assets/javascripts/cartodb/common/utils.js',
-  '../assets/javascripts/cartodb/common/global_click.js',
-  '../assets/javascripts/cartodb/common/error_stats.js',
-  '../assets/javascripts/cartodb/common/views/rollbar.js',
-  '../assets/javascripts/cartodb/common/views/settings_item.js',
-  '../assets/javascripts/cartodb/common/views/confirm_dialog.js',
-  '../assets/javascripts/cartodb/common/views/dialog_base.js',
-  '../../vendor/assets/javascripts/filestyle.js',
-  '../assets/javascripts/cartodb/organization/**/*.js'
+  'lib/assets/javascripts/cartodb/common/forms/widgets.js',
+  'lib/assets/javascripts/cartodb/common/dropdown_menu.js',
+  'lib/assets/javascripts/cartodb/common/user_settings_dropdown.js',
+  'lib/assets/javascripts/cartodb/common/base_dialog.js',
+  'lib/assets/javascripts/cartodb/common/utils.js',
+  'lib/assets/javascripts/cartodb/common/global_click.js',
+  'lib/assets/javascripts/cartodb/common/error_stats.js',
+  'lib/assets/javascripts/cartodb/common/views/rollbar.js',
+  'lib/assets/javascripts/cartodb/common/views/settings_item.js',
+  'lib/assets/javascripts/cartodb/common/views/confirm_dialog.js',
+  'lib/assets/javascripts/cartodb/common/views/dialog_base.js',
+  'vendor/assets/javascripts/filestyle.js',
+  'lib/assets/javascripts/cartodb/organization/**/*.js'
   ],
 
   specs: [
   /*'test/lib/jasmine-1.3.1/jasmine.js',
   'test/lib/jasmine-1.3.1/jasmine-html.js',*/
-  '../assets/test/spec/cartodb/**/*.js'
+  'lib/assets/test/spec/cartodb/**/*.js'
   ],
 
   _spec_helpers: [
-    //'../assets/test/lib/jasmine.jquery.js',
-    '../assets/test/lib/sinon-1.3.4.js',
-    '../assets/test/spec/SpecHelper.js',
+    //'lib/assets/test/lib/jasmine.jquery.js',
+    'lib/assets/test/lib/sinon-1.3.4.js',
+    'lib/assets/test/spec/SpecHelper.js'
   ],
 
   table: [
-  '../../vendor/assets/javascripts/codemirror.js',
-  '../../vendor/assets/javascripts/show-hint.js',
-  '../../vendor/assets/javascripts/anyword-hint.js',
-  '../../vendor/assets/javascripts/custom-list-hint.js',
-  '../../vendor/assets/javascripts/custom-list-with-type-hint.js',
-  '../../vendor/assets/javascripts/select2.min.js',
-  '../../vendor/assets/javascripts/jquery.faviconNotify.js',
-  '../../vendor/assets/javascripts/rgbcolor.js',
-  '../../vendor/assets/javascripts/crossfilter.js',
-  '../../vendor/assets/javascripts/jquery-ui/**/*.js',
-  '../../vendor/assets/javascripts/jquery.caret.js',
-  '../../vendor/assets/javascripts/ZeroClipboard.js',
-  '../../vendor/assets/javascripts/tag-it.js',
-  '../../vendor/assets/javascripts/jquery.tipsy.js',
-  '../../vendor/assets/javascripts/d3.v2.js',
-  '../../vendor/assets/javascripts/colorpicker.js',
-  '../../vendor/assets/javascripts/jquery.fileupload.js',
-  '../../vendor/assets/javascripts/jquery.fileupload-fp.js',
-  '../../vendor/assets/javascripts/jquery.fileupload-ui.js',
-  '../../vendor/assets/javascripts/leaflet.draw.js',
-  '../../vendor/assets/javascripts/moment.js',
-  '../../vendor/assets/javascripts/markdown.js',
-  '../../vendor/assets/javascripts/datepicker.js',
-  '../assets/javascripts/utils/postgres.codemirror.js',
-  '../assets/javascripts/utils/xml.codemirror.js',
-  '../assets/javascripts/utils/draggable.js',
-  '../assets/javascripts/utils/carto.codemirror.js',
-  '../assets/javascripts/utils/color.keywords.js',
-  '../../vendor/assets/javascripts/models.js',
-  '../assets/javascripts/cartodb/common/dropdown_menu.js',
-  '../assets/javascripts/cartodb/common/forms/string_field.js',
-  '../assets/javascripts/cartodb/common/forms/widgets.js',
-  '../assets/javascripts/cartodb/table/overlays/overlays.js',
-  '../assets/javascripts/cartodb/table/overlays/text.js',
-  '../assets/javascripts/cartodb/common/import/import_pane.js',
-  '../assets/javascripts/cartodb/common/import/import_info/import_info.js',
-  '../assets/javascripts/cartodb/common/**/*.js',
-  '../assets/javascripts/cartodb/table/right_menu.js',
-  '../assets/javascripts/cartodb/table/default_layers.js',
-  '../assets/javascripts/cartodb/table/menu_module.js',
-  '../assets/javascripts/cartodb/table/menu_modules/carto_editor.js',
-  '../assets/javascripts/cartodb/table/menu_modules/carto_wizard.js',
-  '../assets/javascripts/cartodb/table/**/*.js',
-  '../assets/javascripts/cartodb/table/table.js',
-  '../assets/javascripts/cartodb/table/views/**/*.js',
-  '../assets/javascripts/cartodb/dashboard/views/**/*.js'
+  'vendor/assets/javascripts/codemirror.js',
+  'vendor/assets/javascripts/show-hint.js',
+  'vendor/assets/javascripts/anyword-hint.js',
+  'vendor/assets/javascripts/custom-list-hint.js',
+  'vendor/assets/javascripts/custom-list-with-type-hint.js',
+  'vendor/assets/javascripts/select2.min.js',
+  'vendor/assets/javascripts/jquery.faviconNotify.js',
+  'vendor/assets/javascripts/rgbcolor.js',
+  'vendor/assets/javascripts/crossfilter.js',
+  'vendor/assets/javascripts/jquery-ui/**/*.js',
+  'vendor/assets/javascripts/jquery.caret.js',
+  'vendor/assets/javascripts/ZeroClipboard.js',
+  'vendor/assets/javascripts/tag-it.js',
+  'vendor/assets/javascripts/jquery.tipsy.js',
+  'vendor/assets/javascripts/d3.v2.js',
+  'vendor/assets/javascripts/colorpicker.js',
+  'vendor/assets/javascripts/jquery.fileupload.js',
+  'vendor/assets/javascripts/jquery.fileupload-fp.js',
+  'vendor/assets/javascripts/jquery.fileupload-ui.js',
+  'vendor/assets/javascripts/leaflet.draw.js',
+  'vendor/assets/javascripts/moment.js',
+  'vendor/assets/javascripts/markdown.js',
+  'vendor/assets/javascripts/datepicker.js',
+  'lib/assets/javascripts/utils/postgres.codemirror.js',
+  'lib/assets/javascripts/utils/xml.codemirror.js',
+  'lib/assets/javascripts/utils/draggable.js',
+  'lib/assets/javascripts/utils/carto.codemirror.js',
+  'lib/assets/javascripts/utils/color.keywords.js',
+  'vendor/assets/javascripts/models.js',
+  'lib/assets/javascripts/cartodb/common/dropdown_menu.js',
+  'lib/assets/javascripts/cartodb/common/forms/string_field.js',
+  'lib/assets/javascripts/cartodb/common/forms/widgets.js',
+  'lib/assets/javascripts/cartodb/table/overlays/overlays.js',
+  'lib/assets/javascripts/cartodb/table/overlays/text.js',
+  'lib/assets/javascripts/cartodb/common/import/import_pane.js',
+  'lib/assets/javascripts/cartodb/common/import/import_info/import_info.js',
+  'lib/assets/javascripts/cartodb/common/**/*.js',
+  'lib/assets/javascripts/cartodb/table/right_menu.js',
+  'lib/assets/javascripts/cartodb/table/default_layers.js',
+  'lib/assets/javascripts/cartodb/table/menu_module.js',
+  'lib/assets/javascripts/cartodb/table/menu_modules/carto_editor.js',
+  'lib/assets/javascripts/cartodb/table/menu_modules/carto_wizard.js',
+  'lib/assets/javascripts/cartodb/table/**/*.js',
+  'lib/assets/javascripts/cartodb/table/table.js',
+  'lib/assets/javascripts/cartodb/table/views/**/*.js',
+  'lib/assets/javascripts/cartodb/dashboard/views/**/*.js'
   ],
 
   public_dashboard: [
-    '../../vendor/assets/javascripts/jquery.tipsy.js',
-    '../assets/javascripts/cartodb/common/dropdown_menu.js',
-    '../assets/javascripts/cartodb/public/**/*.js',
-    '../assets/javascripts/cartodb/public_dashboard/*.js'
+    'vendor/assets/javascripts/jquery.tipsy.js',
+    'lib/assets/javascripts/cartodb/common/dropdown_menu.js',
+    'lib/assets/javascripts/cartodb/public/**/*.js',
+    'lib/assets/javascripts/cartodb/public_dashboard/*.js'
   ],
 
   public_table: [
   // Vendor
-  '../../vendor/assets/javascripts/modernizr-min.js',
-  '../../vendor/assets/javascripts/jquery.tipsy.js',
-  '../../vendor/assets/javascripts/select2.min.js',
+  'vendor/assets/javascripts/modernizr-min.js',
+  'vendor/assets/javascripts/jquery.tipsy.js',
+  'vendor/assets/javascripts/select2.min.js',
 
   // Models
-  '../assets/javascripts/cartodb/models/table.js',
-  '../assets/javascripts/cartodb/models/tabledata.js',
-  '../assets/javascripts/cartodb/models/sqlview.js',
-  '../assets/javascripts/cartodb/models/cartodb_layer.js',
-  '../assets/javascripts/cartodb/models/map.js',
-  '../assets/javascripts/cartodb/models/user.js',
-  '../assets/javascripts/cartodb/models/permissions.js',
-  '../assets/javascripts/cartodb/models/organization.js',
-  '../assets/javascripts/cartodb/models/synchronization.js',
-  '../assets/javascripts/cartodb/models/wkt.js',
-  '../assets/javascripts/cartodb/models/vis.js',
+  'lib/assets/javascripts/cartodb/models/table.js',
+  'lib/assets/javascripts/cartodb/models/tabledata.js',
+  'lib/assets/javascripts/cartodb/models/sqlview.js',
+  'lib/assets/javascripts/cartodb/models/cartodb_layer.js',
+  'lib/assets/javascripts/cartodb/models/map.js',
+  'lib/assets/javascripts/cartodb/models/user.js',
+  'lib/assets/javascripts/cartodb/models/permissions.js',
+  'lib/assets/javascripts/cartodb/models/organization.js',
+  'lib/assets/javascripts/cartodb/models/synchronization.js',
+  'lib/assets/javascripts/cartodb/models/wkt.js',
+  'lib/assets/javascripts/cartodb/models/vis.js',
 
   // Tabpane from CDB.js :S
-  '../assets/javascripts/cdb/src/ui/common/tabpane.js',  
+  'lib/assets/javascripts/cdb/src/ui/common/tabpane.js',  
 
   // UI
-  '../assets/javascripts/cartodb/common/dropdown_menu.js',
-  '../assets/javascripts/cartodb/common/forms/string_field.js',
-  '../assets/javascripts/cartodb/common/forms/widgets.js',
-  '../assets/javascripts/cartodb/common/import/import_pane.js',
-  '../assets/javascripts/cartodb/common/import/import_info/import_info.js',
-  '../assets/javascripts/cartodb/common/**/*.js',
-  '../assets/javascripts/cartodb/common/export_table_dialog.js',
-  '../assets/javascripts/cartodb/table/editor_small_dialog.js',
-
-  '../assets/javascripts/cartodb/table/header/duplicate_table_dialog.js',
-  '../assets/javascripts/cartodb/table/infowindow.js',
-  '../assets/javascripts/cartodb/table/tooltip.js',
-  '../assets/javascripts/cartodb/table/row_view.js',
-  '../assets/javascripts/cartodb/table/header_view.js',
-  '../assets/javascripts/cartodb/table/tableview.js',
-  '../assets/javascripts/cartodb/table/mapview.js',
-  '../assets/javascripts/cartodb/table/header_dropdown.js',
+  'lib/assets/javascripts/cartodb/common/dropdown_menu.js',
+  'lib/assets/javascripts/cartodb/common/forms/string_field.js',
+  'lib/assets/javascripts/cartodb/common/forms/widgets.js',
+  'lib/assets/javascripts/cartodb/common/import/import_pane.js',
+  'lib/assets/javascripts/cartodb/common/import/import_info/import_info.js',
+  'lib/assets/javascripts/cartodb/common/**/*.js',
+  'lib/assets/javascripts/cartodb/common/export_table_dialog.js',
+  'lib/assets/javascripts/cartodb/table/editor_small_dialog.js',
+
+  'lib/assets/javascripts/cartodb/table/header/duplicate_table_dialog.js',
+  'lib/assets/javascripts/cartodb/table/infowindow.js',
+  'lib/assets/javascripts/cartodb/table/tooltip.js',
+  'lib/assets/javascripts/cartodb/table/row_view.js',
+  'lib/assets/javascripts/cartodb/table/header_view.js',
+  'lib/assets/javascripts/cartodb/table/tableview.js',
+  'lib/assets/javascripts/cartodb/table/mapview.js',
+  'lib/assets/javascripts/cartodb/table/header_dropdown.js',
 
   // Public UI
-  '../assets/javascripts/cartodb/public/**/*.js',
-  '../assets/javascripts/cartodb/public_table/**/*.js',
+  'lib/assets/javascripts/cartodb/public/**/*.js',
+  'lib/assets/javascripts/cartodb/public_table/**/*.js',
 
-  '../assets/javascripts/cartodb/public_table/public_table.js'
+  'lib/assets/javascripts/cartodb/public_table/public_table.js'
   ],
 
   public_map: [
-    '../../vendor/assets/javascripts/jquery.tipsy.js',
-    '../assets/javascripts/cartodb/common/dropdown_menu.js',
-    '../assets/javascripts/cartodb/common/base_dialog.js',
-    '../assets/javascripts/cartodb/table/header/duplicate_visualization_dialog.js',
-    '../assets/javascripts/cartodb/public/**/*.js',
-    '../assets/javascripts/cartodb/public_map/**/*.js'
+    'vendor/assets/javascripts/jquery.tipsy.js',
+    'lib/assets/javascripts/cartodb/common/dropdown_menu.js',
+    'lib/assets/javascripts/cartodb/common/base_dialog.js',
+    'lib/assets/javascripts/cartodb/table/header/duplicate_visualization_dialog.js',
+    'lib/assets/javascripts/cartodb/public/**/*.js',
+    'lib/assets/javascripts/cartodb/public_map/**/*.js'
   ],
 
 
   tipsy: [
-    '../../vendor/assets/javascripts/jquery.tipsy.js'
+    'vendor/assets/javascripts/jquery.tipsy.js'
   ],
 
   modernizr: [
-    '../../vendor/assets/javascripts/modernizr-min.js',
+    'vendor/assets/javascripts/modernizr-min.js'
   ],
 
   statsc: [
-    '../../vendor/assets/javascripts/statsc.min.js'
+    'vendor/assets/javascripts/statsc.min.js'
   ],
 
   _templates: [
-    '../assets/javascripts/cartodb/**/*.jst.ejs'
+    'lib/assets/javascripts/cartodb/**/*.jst.ejs'
   ],
 
   _templates_mustache: [
-    '../assets/javascripts/cartodb/**/*.jst.mustache'
+    'lib/assets/javascripts/cartodb/**/*.jst.mustache'
   ]
 
 };

lib/build/tasks/browserify.js

@@ -8,20 +8,24 @@ module.exports = {
         preBundleCB: function (b) {
           b.plugin(remapify, [
             {
-              cwd: './src',
+              cwd: './lib/assets/javascripts/cartodb',
+              src: './**/*.js',
+              expose: 'cartodb'
+            }, {
+              cwd: './lib/assets/javascripts/cartodb2',
               src: './**/*.js',
               expose: ''
             }
           ]);
         }
       },
-      dashboard: {
-        src: 'src/dashboard.js',
+      cartodb2: {
+        src: 'lib/assets/javascripts/cartodb2/dashboard.js',
         dest: '<%= assets_dir %>/javascripts/new-dashboard.js'
       },
-      test: {
-        src: ['test/spec/**/*.spec.js'],
-        dest: './test/test_bundle.js',
+      cartodb2_tests: {
+        src: 'lib/assets/test/spec/cartodb2/**/*.spec.js',
+        dest: 'lib/assets/test/cartodb2_tests.js',
         options: {
           browserifyOptions: {
             debug: true

lib/build/tasks/clean.js

@@ -10,9 +10,9 @@
         force: true
       },
       src: [
-        "app_config.js",
-        "./.sass-cache",
-        "../../app/assets/stylesheets/tmp",
+        "lib/build/app_config.js",
+        ".sass-cache",
+        "app/assets/stylesheets/tmp",
         "<%= assets_dir %>"
       ]
     }

lib/build/tasks/compass.js

@@ -8,15 +8,15 @@
     return {
       dist: {
         options: {
-          importPath:               '../../app/assets/stylesheets/tmp/common',
+          importPath:               'app/assets/stylesheets/tmp/common',
 
-          sassDir:                  '../../app/assets/stylesheets/tmp',
+          sassDir:                  'app/assets/stylesheets/tmp',
           cssDir:                   '<%= assets_dir %>/stylesheets',
           
           fontsDir:                 '<%= assets_dir %>/fonts',
           httpFontsPath:            '<%= env.http_path_prefix %>/assets/<%= pkg.version %>/fonts',
 
-          imagesDir:                '../../app/assets/images/',
+          imagesDir:                'app/assets/images/',
           generatedImagesDir:       '<%= assets_dir %>/images/',
           httpImagesPath:           '<%= env.http_path_prefix %>/assets/<%= pkg.version %>/images/',
           httpGeneratedImagesPath:  '<%= env.http_path_prefix %>/assets/<%= pkg.version %>/images/',

lib/build/tasks/copy.js

@@ -11,9 +11,9 @@
 
       vendor: {
         expand: true,
-        cwd: '../../vendor/assets/stylesheets/',
+        cwd: 'vendor/assets/stylesheets/',
         src: ['**/*.css'],
-        dest: '../../app/assets/stylesheets/tmp/vendor/',
+        dest: 'app/assets/stylesheets/tmp/vendor/',
         rename: function(dest, src) {
           return dest + src.replace(/\.css$/, ".scss");
         },
@@ -38,9 +38,9 @@
             // App stylesheets
           {
             expand: true,
-            cwd: '../../app/assets/stylesheets/',
+            cwd: 'app/assets/stylesheets/',
             src: ['**/*.css.scss'],
-            dest: '../../app/assets/stylesheets/tmp/',
+            dest: 'app/assets/stylesheets/tmp/',
             rename: function(dest, src) {
               return dest + src.replace(/\.css.scss$/, ".scss");
             }
@@ -49,9 +49,9 @@
             // Jasmine stylesheets
           {
             expand: true,
-            cwd: '../../lib/assets/test/lib/jasmine-1.3.1/',
+            cwd: 'lib/assets/test/lib/jasmine-1.3.1/',
             src: ['**/*.css'],
-            dest: '../../app/assets/stylesheets/tmp/specs/',
+            dest: 'app/assets/stylesheets/tmp/specs/',
             rename: function(dest, src) {
               return dest + src.replace(/\.css$/, ".scss");
             }
@@ -60,7 +60,7 @@
             // Embed stylesheets
           {
             expand: true,
-            cwd: '../../lib/assets/javascripts/cdb/themes/css/',
+            cwd: 'lib/assets/javascripts/cdb/themes/css/',
             src: ['cartodb.css'],
             dest: '<%= assets_dir %>/stylesheets/tmp/embeds/',
             rename: function(dest, src) {
@@ -76,7 +76,7 @@
 
           {
             expand: true,
-            cwd: '../../app/assets/images/',
+            cwd: 'app/assets/images/',
             src: ['**/*'],
             dest: '<%= assets_dir %>/images/'
           },
@@ -85,7 +85,7 @@
 
           {
             expand: true,
-            cwd: '../../lib/assets/javascripts/cdb/themes/img/',
+            cwd: 'lib/assets/javascripts/cdb/themes/img/',
             src: ['**/*'],
             dest: '<%= assets_dir %>/images/themes/'
           },
@@ -96,7 +96,7 @@
 
           {
             expand: true,
-            cwd: '../../app/assets/fonts/',
+            cwd: 'app/assets/fonts/',
             src: ['**/*'],
             dest: '<%= assets_dir %>/fonts/'
           },
@@ -107,7 +107,7 @@
 
           {
             expand: true,
-            cwd: '../../app/assets/flash/',
+            cwd: 'app/assets/flash/',
             src: ['**/*'],
             dest: '<%= assets_dir %>/flash/'
           },
@@ -118,7 +118,7 @@
 
           {
             expand: true,
-            cwd: '../../public/favicons/',
+            cwd: 'public/favicons/',
             src: ['**/*'],
             dest: '<%= assets_dir %>/favicons/'
           }

lib/build/tasks/exorcise.js

@@ -1,13 +0,0 @@
-// Source maps
-module.exports = {
-  task: function() {
-    return {
-      test: {
-        options: {},
-        files: {
-          'test/test_bundle.map': ['test/test_bundle.js']
-        }
-      }
-    }
-  }
-};

lib/build/tasks/jasmine.js

@@ -9,10 +9,10 @@
     return {
       cartodbui: {
         src: js_files.all.concat([
-          'user_data.js', 
-          '<%= assets_dir %>/javascripts/templates_mustache.js', 
+          'lib/build/user_data.js',
+          '<%= assets_dir %>/javascripts/templates_mustache.js',
           '<%= assets_dir %>/javascripts/templates.js', 
-          'test_init.js']),
+          'lib/build/test_init.js']),
         options: {
           summary: true,
           display: 'short',
@@ -21,14 +21,14 @@
            //'--remote-debugger-port': 9000
         }
       },
-      new_dashboard: {
+      cartodbui2: {
         // src and options.specs are created by the browserify task.
         src: '<%= assets_dir %>/javascripts/new-dashboard.js',
         options: {
           summary: true,
           display: 'short',
-          specs: './test/test_bundle.js',
-          keepRunner: true
+          specs: './lib/assets/test/cartodb2_tests.js',
+          keepRunner: true // do not delete _SpecRunner.html, added in .gitignore so won't be versioned anyway.
         }
       }
     }

lib/build/tasks/jst.js

@@ -11,7 +11,7 @@
       compile: {
         options: {
            processName: function(filename) {
-            return filename.replace(/^\.\.\/assets\/javascripts\//, '').replace(/\.jst\.ejs$/, '');
+            return filename.replace(/^lib\/assets\/javascripts\//, '').replace(/\.jst\.ejs$/, '');
           }
         },
         files: {
@@ -21,15 +21,15 @@
       mustache: {
         options: {
            processName: function(filename) {
-            return filename.replace(/^..\/assets\/javascripts\//, '').replace(/\.jst\.mustache/, '');
+            return filename.replace(/^lib\/assets\/javascripts\//, '').replace(/\.jst\.mustache/, '');
           },
           template: function(source) {
-            var src = source.replace(/\n/g, '\\n').replace(/'/g,"\\'")
+            var src = source.replace(/\n/g, '\\n').replace(/'/g,"\\'");
             return { source: "Mustache.compile('"+ src +"')" }
           }
         },
         files: {
-          '<%= assets_dir %>/javascripts/templates_mustache.js': js_files._templates_mustache,
+          '<%= assets_dir %>/javascripts/templates_mustache.js': js_files._templates_mustache
         }
       }
     }

lib/build/tasks/watch.js

@@ -11,7 +11,7 @@ exports.task = function() {
   }
 
   // watch cdb files
-  js.push(['../assets/javascripts/cdb/src/**/*.js']);
+  js.push(['lib/assets/javascripts/cdb/src/**/*.js']);
 
   return {
     js: {
@@ -23,8 +23,8 @@ exports.task = function() {
     },
     css: {
       files: [
-        '../../vendor/assets/stylesheets/**/*.css.scss',
-        '../../app/assets/stylesheets/**/*.css.scss'
+        'assets/stylesheets/**/*.css.scss',
+        'app/assets/stylesheets/**/*.css.scss'
       ],
       tasks: ['css'],
       options: {
@@ -33,19 +33,19 @@ exports.task = function() {
     },
     livereload: {
       files: [
-        '../../public/assets/<%= pkg.version %>/stylesheets/*.css',
-        '../../public/assets/<%= pkg.version %>/javascripts/*.js'
+        'public/assets/<%= pkg.version %>/stylesheets/*.css',
+        'public/assets/<%= pkg.version %>/javascripts/*.js'
       ],
       options: {
         livereload: true
       }
     },
-    new_dashboard: {
+    cartodb2: {
       files: [
-        'src/**/*.js',
-        'test/**/*.js'
+        'lib/assets/javascripts/cartodb2/**/*.js',
+        'lib/assets/test/cartodb2/**/*.js'
       ],
-      tasks: ['browserify', 'exorcise', 'jasmine:new_dashboard'],
+      tasks: ['browserify', 'jasmine:cartodbui2'],
       options: {
         atBegin: true
       }

package.json

@@ -36,7 +36,6 @@
     "grunt-contrib-sass": "~0.7.3",
     "grunt-contrib-uglify": "~0.4.0",
     "grunt-contrib-watch": "~0.6.0",
-    "grunt-exorcise": "^0.2.0",
     "grunt-mustache": "~0.1.6",
     "grunt-timer": "~0.3.3",
     "load-grunt-tasks": "~0.2.0",

test/test_bundle.map

@@ -0,0 +1,17 @@
+{
+  "version": 3,
+  "sources": [
+    "node_modules/browserify/node_modules/browser-pack/_prelude.js",
+    "lib/assets/javascripts/cartodb2/dashboard/hello_world.js",
+    "lib/assets/test/spec/cartodb2/dashboard/hello_world.spec.js"
+  ],
+  "names": [],
+  "mappings": "AAAA;ACAA;AACA;AACA;AACA;;ACHA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA",
+  "file": "generated.js",
+  "sourceRoot": "",
+  "sourcesContent": [
+    "(function e(t,n,r){function s(o,u){if(!n[o]){if(!t[o]){var a=typeof require==\"function\"&&require;if(!u&&a)return a(o,!0);if(i)return i(o,!0);var f=new Error(\"Cannot find module '\"+o+\"'\");throw f.code=\"MODULE_NOT_FOUND\",f}var l=n[o]={exports:{}};t[o][0].call(l.exports,function(e){var n=t[o][1][e];return s(n?n:e)},l,l.exports,e,t,n,r)}return n[o].exports}var i=typeof require==\"function\"&&require;for(var o=0;o<r.length;o++)s(r[o]);return s})",
+    "module.exports = function(str) {\n  console.log(str);\n};\n",
+    "var hello = require('./../../../../javascripts/cartodb2/dashboard/hello_world.js');\n\ndescribe('hello', function() {\n  beforeEach(function() {\n    window.console = jasmine.createSpyObj('console', ['log']);\n    hello('hello world!');\n  });\n\n  it('writes the given string to the console.log', function() {\n    expect(console.log).toHaveBeenCalledWith('hello world!');\n  });\n});\n\n"
+  ]
+}