Skip to content

Commit 36dfe9f

Browse files
sbellitysbellity
committed
Merge branch 'release/0.7.4'
2 parents abd1de9 + 54777a1 commit 36dfe9f

File tree

188 files changed

+6614
-2657
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

188 files changed

+6614
-2657
lines changed

‎.grunt/api.json‎

Lines changed: 9 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,11 +1,13 @@
11
{
2+
"namespace": "Hull",
23
"srcFiles": ["src/utils/promises.coffee", "src/api.coffee", "src/api/**/*.coffee"],
34
"requireJS": {
45
"baseUrl": ".",
56
"preserveLicenseComments": true,
67
"paths": {
8+
"requireLib": "bower_components/requirejs/require",
79
"underscore": "bower_components/underscore/underscore",
8-
"easyXDM": "bower_components/easyXDM/easyXDM",
10+
"easyXDM": "lib/shims/bower_components/easyXDM/easyXDM",
911
"cookie": "bower_components/jquery.cookie/jquery.cookie",
1012
"jquery": "empty:"
1113
},
@@ -15,12 +17,17 @@
1517
"jquery": { "exports": "jQuery" }
1618
},
1719
"include": [
20+
"requireLib",
1821
"underscore",
1922
"easyXDM",
2023
"cookie",
2124
"lib/api"
2225
],
23-
"out": "dist/<%= PKG_VERSION %>/hull-api.js"
26+
"out": "dist/<%= PKG_VERSION %>/hull.api.js",
27+
"wrap": {
28+
"start": "(function () {_chk = function (n,d) {if(!d){var _msg = n + \" is not defined. It is required to run hull.js\";alert(_msg); throw new Error(_msg);};return true;};_chk('jQuery', window.jQuery);var args; var dfd;;window.Hull=window.Hull||{};Hull.init = function(){args = arguments;dfd = jQuery.Deferred();return dfd.promise();};var require, requirejs, define,root = {jQuery: window.jQuery};(function () {",
29+
"end": ";define('jquery', function () {return root.jQuery;});Hull.require(['lib/api'], function (fn){Hull.init = fn; if (args) {return Hull.init.apply(undefined,args).then(function (a) {delete Hull.init;Hull.api=a.api;Hull.login=a.auth.login;Hull.logout=a.auth.logout;dfd.resolve(a);}, function(a){dfd.reject(a);});}});}).call(root);for(var i in root){_chk(i, root[i]) && root.hasOwnProperty(i) && Hull.define(i.toLowerCase(), function (){return root[i];})}})();"
30+
}
2431
}
2532
}
2633

‎.grunt/client.json‎

Lines changed: 5 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,8 @@
1818
"string": "bower_components/underscore.string/lib/underscore.string",
1919
"jquery": "empty:",
2020
"text": "bower_components/requirejs-text/text",
21-
"base64": "bower_components/base64/base64"
21+
"base64": "bower_components/base64/base64",
22+
"serializeJSON": "bower_components/jquery.serializeJSON/jquery.serializeJSON"
2223
},
2324
"shim": {
2425
"backbone": { "exports": "Backbone", "deps": ["underscore", "jquery"] },
@@ -34,15 +35,16 @@
3435
"base64",
3536
"backbone",
3637
"text",
38+
"serializeJSON",
3739
"aura/ext/debug",
3840
"aura/ext/mediator",
3941
"aura/ext/components",
4042
"lib/hull"
4143
],
4244
"out": "dist/<%= PKG_VERSION %>/hull.js",
4345
"wrap": {
44-
"start": "(function () {var require, requirejs, define,root = {jQuery: jQuery}; (function () {",
45-
"end": ";Hull.define = define; Hull.require = require; }).call(root);for(var i in root){root.hasOwnProperty(i) && Hull.define(i.toLowerCase(), function (){return root[i];})}})();"
46+
"start": "(function () {_chk = function (n,d) {if(!d){var _msg = n + \" is not defined. It is required to run hull.js\";alert(_msg); throw new Error(_msg);};return true;};_chk('jQuery', window.jQuery);var require, requirejs, define,root = {jQuery: window.jQuery};(function () {",
47+
"end": ";}).call(root);for(var i in root){_chk(i, root[i]) && root.hasOwnProperty(i) && Hull.define(i.toLowerCase(), function (){return root[i];})}})();"
4648
}
4749
}
4850
}

‎.grunt/customTasks.js‎

Lines changed: 17 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,11 +1,26 @@
1+
var git = require('git-rev');
2+
13
module.exports = function (grunt) {
24
grunt.registerMultiTask('dist', 'Builds the various flavours of hull.js', function () {
35
grunt.task.run(this.data);
46
});
57

68
grunt.registerTask("version", "generate a file from a template", function () {
79
var conf = grunt.config("version");
8-
grunt.file.write(conf.dest, grunt.template.process(conf.template));
9-
grunt.log.writeln('Generated \'' + conf.dest + '\' successfully.');
10+
var done = this.async();
11+
function write (name) {
12+
grunt.config.set("PKG_VERSION", name);
13+
grunt.file.write(conf.dest, grunt.template.process(conf.template));
14+
grunt.log.writeln('Generated version description for \'' + conf.dest + '\' successfully.');
15+
done();
16+
}
17+
git.branch(function(branch) {
18+
if (['HEAD', 'master'].indexOf(branch) !== -1) {
19+
git.tag(write);
20+
} else {
21+
write(branch);
22+
}
23+
});
24+
1025
});
1126
};

‎.grunt/helpers.js‎

Lines changed: 39 additions & 44 deletions
Original file line numberDiff line numberDiff line change
@@ -13,53 +13,48 @@ module.exports = function (grunt) {
1313
var aws = false;
1414
if (grunt.file.exists('.grunt/grunt-aws.json')) {
1515
aws = grunt.file.readJSON('.grunt/grunt-aws.json');
16-
if (aws) {
17-
config.aws = aws;
18-
config.s3 = {
19-
options: {
20-
key: '<%= aws.key %>',
21-
secret: '<%= aws.secret %>',
22-
bucket: '<%= aws.bucket %>',
23-
access: 'public-read',
24-
// debug: true,
25-
encodePaths: true,
26-
maxOperations: 20
27-
},
28-
prod: {
29-
upload: [
30-
{
31-
gzip: true,
32-
src: 'dist/<%= PKG_VERSION %>/**/*',
33-
dest: '',
34-
rel: 'dist/'
35-
},
36-
{
37-
gzip: false,
38-
src: 'dist/<%= PKG_VERSION %>/**/*',
39-
dest: '',
40-
rel: 'dist/'
41-
}
42-
]
43-
},
44-
staging:{
45-
upload:[
46-
{
47-
gzip: true,
48-
src: 'dist/<%= PKG_VERSION %>/**/*',
49-
dest: '<%= GIT_BRANCH %>',
50-
rel: 'dist/<%= PKG_VERSION %>'
51-
},
52-
{
53-
gzip: false,
54-
src: 'dist/<%= PKG_VERSION %>/**/*',
55-
dest: '<%= GIT_BRANCH %>',
56-
rel: 'dist/<%= PKG_VERSION %>'
57-
}
58-
]
59-
}
16+
} else {
17+
var aws_key = process.env.AWS_KEY;
18+
var aws_secret = process.env.AWS_SECRET;
19+
var aws_bucket = process.env.AWS_BUCKET;
20+
if (aws_key && aws_secret && aws_bucket) {
21+
aws = {
22+
key: aws_key,
23+
secret: aws_secret,
24+
bucket: aws_bucket
6025
};
6126
}
6227
}
28+
if (aws) {
29+
config.aws = aws;
30+
config.s3 = {
31+
options: {
32+
key: '<%= aws.key %>',
33+
secret: '<%= aws.secret %>',
34+
bucket: '<%= aws.bucket %>',
35+
access: 'public-read',
36+
// debug: true,
37+
encodePaths: true,
38+
maxOperations: 20
39+
},
40+
prod:{
41+
upload:[
42+
{
43+
gzip: true,
44+
src: 'dist/<%= PKG_VERSION %>/**/*',
45+
dest: '<%= PKG_VERSION %>',
46+
rel: 'dist/<%= PKG_VERSION %>'
47+
},
48+
{
49+
gzip: false,
50+
src: 'dist/<%= PKG_VERSION %>/**/*',
51+
dest: '<%= PKG_VERSION %>',
52+
rel: 'dist/<%= PKG_VERSION %>'
53+
}
54+
]
55+
}
56+
};
57+
}
6358
}
6459
};
6560
};

‎.jshintrc‎

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,7 @@
1+
{
2+
"undef": true,
3+
"browser": true,
4+
"globals": {
5+
"Hull": true
6+
}
7+
}

‎Gruntfile.js‎

Lines changed: 28 additions & 36 deletions
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,6 @@ module.exports = function (grunt) {
1818
grunt.loadNpmTasks('grunt-plato');
1919
grunt.loadNpmTasks('grunt-wrap');
2020

21-
var pkg = grunt.file.readJSON('bower.json');
2221
var clientConfig = grunt.file.readJSON('.grunt/client.json');
2322
var remoteConfig = grunt.file.readJSON('.grunt/remote.json');
2423
var apiConfig = grunt.file.readJSON('.grunt/api.json');
@@ -63,7 +62,6 @@ module.exports = function (grunt) {
6362

6463

6564
var gruntConfig = {
66-
PKG_VERSION: pkg.version,
6765
clean: {
6866
client: {
6967
src: 'lib/client/**/*'
@@ -159,15 +157,15 @@ module.exports = function (grunt) {
159157
out: 'tmp/aura_components/upload/deps/jquery.fileupload.js'
160158
}
161159
},
162-
registration: {
163-
options: {
164-
namespace: 'Hull',
165-
paths: { h5f: 'aura_components/registration/h5f' },
166-
shim: { h5f: { exports: 'H5F' } },
167-
include: ['h5f'],
168-
out: 'tmp/aura_components/registration/deps.js'
169-
}
170-
},
160+
// registration: {
161+
// options: {
162+
// namespace: 'Hull',
163+
// paths: { h5f: 'aura_components/registration/h5f' },
164+
// shim: { h5f: { exports: 'H5F' } },
165+
// include: ['h5f'],
166+
// out: 'tmp/aura_components/registration/deps.js'
167+
// }
168+
// },
171169
dox: {
172170
options: {
173171
namespace: 'Hull',
@@ -186,7 +184,7 @@ module.exports = function (grunt) {
186184
watch: {
187185
widgets: {
188186
files: ['aura_components/**/*'],
189-
tasks: ['hull_widgets']
187+
tasks: ['dist:widgets']
190188
},
191189
remote: {
192190
files: remoteConfig.srcFiles,
@@ -197,12 +195,16 @@ module.exports = function (grunt) {
197195
tasks: ['dist:api', 'do_test']
198196
},
199197
client: {
200-
files: clientConfig.srcFiles,
198+
files: [clientConfig.srcFiles, "aura-extensions/**/*.js"],
201199
tasks: ['dist:client', 'do_test']
202200
},
203201
spec: {
204202
files: ['spec/**/*.js'],
205203
tasks: ['mocha']
204+
},
205+
extensions: {
206+
files: ['aura-extensions/**/*.js'],
207+
tasks: ['dist:client', 'do_test']
206208
}
207209
},
208210
version: {
@@ -212,7 +214,7 @@ module.exports = function (grunt) {
212214
hull_widgets: {
213215
hull: {
214216
src: 'aura_components',
215-
before: ['requirejs:upload', 'requirejs:registration', 'requirejs:dox'],
217+
before: [],
216218
dest: 'dist/<%= PKG_VERSION%>',
217219
optimize: !grunt.option('dev')
218220
}
@@ -254,38 +256,28 @@ module.exports = function (grunt) {
254256
}
255257
},
256258
dist: {
257-
"remote": ['clean:remote', 'coffee:remote', 'wrap', 'version', 'requirejs:remote'],
258-
"client": ['clean:client', 'coffee:client', 'wrap', 'version', 'requirejs:client'],
259-
"api": ['clean:client', 'coffee:api', 'version', 'requirejs:api'],
260-
"client-no-underscore": ['clean:client', 'coffee:client', 'wrap', 'version', 'requirejs:client-no-underscore'],
261-
"client-no-backbone": ['clean:client', 'coffee:client', 'wrap', 'version', 'requirejs:client-no-backbone'],
262-
"widgets": ["hull_widgets"],
263-
"docs": ['dox']
259+
"remote": ['version', 'clean:remote', 'coffee:remote', 'wrap', 'version', 'requirejs:remote'],
260+
"client": ['version', 'clean:client', 'coffee:client', 'wrap', 'version', 'requirejs:client'],
261+
"api": ['version', 'clean:client', 'coffee:api', 'wrap', 'version', 'requirejs:api'],
262+
"client-no-underscore": ['version', 'clean:client', 'coffee:client', 'wrap', 'version', 'requirejs:client-no-underscore'],
263+
"client-no-backbone": ['version', 'clean:client', 'coffee:client', 'wrap', 'version', 'requirejs:client-no-backbone'],
264+
"widgets": ["version", "hull_widgets"],
265+
"docs": ['dox'],
266+
"describe": ['describe']
264267
}
265268
};
266269

267270
helpers.appendAWSConfig(gruntConfig);
268271
grunt.initConfig(gruntConfig);
269272

270-
grunt.registerTask('target','Set current target', function(){
271-
var done = this.async();
272-
git.branch(function(branch){
273-
grunt.config.set("PKG_VERSION",branch);
274-
grunt.config.set("GIT_BRANCH",branch);
275-
done();
276-
});
277-
278-
});
279273
grunt.registerTask('do_test', ['cover', 'plato', 'mocha']);
280274
grunt.registerTask('test', ['dist:api', 'dist:client', 'dist:remote', 'do_test']);
281-
grunt.registerTask('default', ['connect', 'test', 'dist:widgets', 'watch']);
282275
grunt.registerTask('reset', ['clean:reset']);
283276

284-
grunt.registerTask('deploy', ['dist', 'describe', 's3:prod']);
285-
286-
grunt.registerTask('staging', ['target','dist', 'describe', 's3:staging']);
287-
288-
var git = require('git-rev');
277+
//These tasks are the only ones needed to be used
278+
grunt.registerTask('default', 'server');
279+
grunt.registerTask('server', ['connect', 'test', 'dist:widgets', 'watch']);
280+
grunt.registerTask('deploy', ['dist', 's3:prod']);
289281

290282
require('./.grunt/customTasks')(grunt);
291283

0 commit comments

Comments
 (0)