Merge pull request #85 from caridy/data-fix

supporting short `month` format in most cases to match browser's behavior

Author: andyearnshaw

.gitignore

@@ -15,3 +15,6 @@ node_modules
 
 lib/
 tmp/
+data/
+tests/test262/harness/
+tests/test262/test/

.npmignore

@@ -1,5 +1,6 @@
 # Pre-processed locale data output from Ldml2JsonConverter
 cldr/
+data/
 
 # test262 compiled python files
 *.pyc

.travis.yml

@@ -1,7 +1,7 @@
 language: node_js
 node_js:
   - '0.10'
-  - '0.11'
+  - '0.12'
 
 addons:
   sauce_connect:

CONTRIBUTING.md

@@ -16,7 +16,17 @@ To build files in `dist/` and `lib/`:
 
     grunt
 
-To build files in `locale-data/` based on CLDR:
+
+Updating CLDR Data
+------------------
+
+_Note: this step is completely optional._
+
+Copy fresh CLDR data in `data/`:
+
+    grunt update-cldr-data
+
+To build files in `locale-data/` based on CLDR `data/`:
 
     grunt cldr
 

Gruntfile.js

@@ -4,13 +4,57 @@ module.exports = function (grunt) {
         pkg: grunt.file.readJSON('package.json'),
 
         clean: {
-            dist: 'dist/',
-            lib : 'lib/',
-            tmp : 'tmp/'
+            cldr   : ['tmp/cldr**', 'data/cldr**', 'locale-data/'],
+            test262: ['tmp/test262**', 'data/test262**', 'tests/test262/'],
+            lib    : ['lib/', 'dist/'],
+        },
+
+        curl: {
+            cldr: {
+                src : 'http://www.unicode.org/Public/cldr/26/json-full.zip',
+                dest: 'tmp/cldr.zip',
+            },
+            test262: {
+                src : 'https://github.com/tc39/test262/archive/master.zip',
+                dest: 'tmp/test262.zip',
+            }
+        },
+
+        unzip: {
+            cldr: {
+                src : 'tmp/cldr.zip',
+                dest: 'tmp/cldr/',
+            },
+            test262: {
+                src : 'tmp/test262.zip',
+                dest: 'tmp/',
+            }
         },
 
         copy: {
-            tmp: {
+            cldr: {
+                expand: true,
+                cwd   : 'tmp/cldr/',
+                dest  : 'data/',
+                src   : [
+                    '*-license.*',
+                    'supplemental/parentLocales.json',
+                    'main/*/ca-*.json',
+                    'main/*/currencies.json',
+                    'main/*/numbers.json',
+                ]
+            },
+            test262: {
+                expand: true,
+                cwd   : 'tmp/test262-master/',
+                dest  : 'tests/test262',
+                src   : [
+                    'LICENSE',
+                    'test/intl402/*.js',
+                    'harness/*.js',
+                ]
+            },
+            src: {
                 expand : true,
                 flatten: true,
                 src    : ['tmp/src/*.js'],
@@ -20,9 +64,9 @@ module.exports = function (grunt) {
 
         concat: {
             complete: {
-                src: ['dist/Intl.min.js', 'locale-data/complete.js'],
+                src : ['dist/Intl.min.js', 'locale-data/complete.js'],
                 dest: 'dist/Intl.complete.js',
-            }
+            },
         },
 
         jshint: {
@@ -49,7 +93,8 @@ module.exports = function (grunt) {
                     'dist/Intl.min.js': ['dist/Intl.js']
                 }
             }
-        }
+        },
+
     });
 
     grunt.loadTasks('./tasks');
@@ -59,12 +104,32 @@ module.exports = function (grunt) {
     grunt.loadNpmTasks('grunt-contrib-jshint');
     grunt.loadNpmTasks('grunt-contrib-uglify');
     grunt.loadNpmTasks('grunt-bundle-jsnext-lib');
+    grunt.loadNpmTasks('grunt-extract-cldr-data');
+    grunt.loadNpmTasks('grunt-curl');
+    grunt.loadNpmTasks('grunt-zip');
 
     grunt.registerTask('build', [
-        'bundle_jsnext', 'uglify', 'cjs_jsnext', 'copy', 'concat'
+        'bundle_jsnext', 'uglify', 'cjs_jsnext', 'copy:src', 'concat:complete'
     ]);
 
-    grunt.registerTask('cldr', ['compile-data']);
+    grunt.registerTask('cldr', ['extract-cldr-data', 'compile-data']);
+
+    grunt.registerTask('default', ['jshint', 'clean:lib', 'build']);
+
+    grunt.registerTask('update-cldr-data', [
+        'clean:cldr',
+        'curl:cldr',
+        'unzip:cldr',
+        'copy:cldr',
+        'cldr',
+    ]);
+
+    grunt.registerTask('update-test262', [
+        'clean:test262',
+        'curl:test262',
+        'unzip:test262',
+        'copy:test262',
+        'update-tests',
+    ]);
 
-    grunt.registerTask('default', ['jshint', 'clean', 'build']);
 };