Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

d #1

Merged
merged 67 commits into from
Oct 22, 2013
Merged

d #1

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
67 commits
Select commit Hold shift + click to select a range
ac90210
Updating references
daffl Feb 21, 2013
4e8a83c
Update to grunt 4, add and config grunt-contrib-connect
Feb 26, 2013
5e6cbcd
Merge pull request #40 from schovi/f/grunt
daffl Feb 26, 2013
d1b9220
fixes hard coded Recipe
justinbmeyer Mar 8, 2013
44f8b71
Merge branch 'master' of github.com:bitovi/javascriptmvc
justinbmeyer Mar 8, 2013
f3287b0
updating submodules
justinbmeyer Mar 8, 2013
bab33b2
working on docs and updating submodules
justinbmeyer Mar 20, 2013
6dfc4aa
moving jquerypp submodule in jquery folder to jquerypp folder
justinbmeyer Mar 20, 2013
a068336
pointing to jquerypp's jquerypp branch
justinbmeyer Mar 20, 2013
4f90582
Updating build tasks & can/jquery refs.
Mar 22, 2013
677d61f
Merge branch 'master' of github.com:bitovi/javascriptmvc
Mar 22, 2013
ae81f6a
Removing shell/strip tasks
Mar 22, 2013
6d3b233
Updating references and Grunt to 0.4
daffl Mar 24, 2013
69f659e
Fixing steal reference. Closes #41
Mar 25, 2013
69c8a7d
Adding changelog task. Updating can ref to 1.1.5
Mar 25, 2013
2985512
Changing jQuery++ submodule folder. Removing CanUI for now.
daffl Mar 29, 2013
f1785de
Merging
daffl Mar 29, 2013
b501222
Merge branch 'master' of git://github.com/bitovi/javascriptmvc
daffl Mar 29, 2013
85740e5
updating documentjs submodule
justinbmeyer Apr 4, 2013
1cd2b9c
Build tasks
daffl Apr 9, 2013
02548a9
latest greatest
justinbmeyer Apr 17, 2013
e8bd8ae
Merge branch 'master' of github.com:bitovi/javascriptmvc
justinbmeyer Apr 17, 2013
aa566a4
removing jmvc folder and replacing it with submodule
justinbmeyer Apr 17, 2013
891e5fe
adding generators in jmvc
justinbmeyer Apr 17, 2013
521c9f9
Adding grunt task for replacing @VERSION in CanJS
Apr 21, 2013
3982423
Updating refs.
Apr 22, 2013
cf161f5
Updating testify
daffl Apr 26, 2013
50761a5
Merge branch 'master' of git://github.com/bitovi/javascriptmvc
daffl Apr 26, 2013
8a5d5af
Fix failing test
retro May 26, 2013
0ab6825
Revert "Fix failing test"
retro May 26, 2013
e704606
updating getting started guide
moschel May 27, 2013
1f77425
updating getting started guide
moschel May 27, 2013
de668ff
site/scripts/doc.js working
moschel May 28, 2013
c511201
moving docs location
moschel May 28, 2013
3e65103
updated docs
justinbmeyer May 28, 2013
4c89363
updated get script site is better
justinbmeyer May 28, 2013
2b7ff42
removing contacts ap
amcdnl May 28, 2013
4700935
Adding can.util to the docu.
dispatchrabbi May 28, 2013
a6f4a18
Adding contacts to examples
amcdnl May 28, 2013
76f3e5c
More documentation updates, this time to tutorials.
imjoshdean May 28, 2013
09e0feb
parent is not index
moschel May 29, 2013
e5c1eec
Last minute changes from Justin to docs.
imjoshdean May 29, 2013
6f540a6
Merge branch 'master' of git://github.com/bitovi/javascriptmvc
imjoshdean May 29, 2013
ce78005
Updating submodule references.
dispatchrabbi May 29, 2013
853fb3b
including func.js
justinbmeyer May 29, 2013
509a0a7
Merge branch 'master' of github.com:bitovi/javascriptmvc
justinbmeyer May 29, 2013
e694171
Adding docu to doc.js.
dispatchrabbi May 29, 2013
43f3d67
Updating submodule refs.
dispatchrabbi May 29, 2013
3cd7c28
updated to use latest docs
justinbmeyer Jun 16, 2013
baab1b8
Merge branch 'master' of github.com:bitovi/javascriptmvc
justinbmeyer Jun 16, 2013
a46d098
updating submodules
justinbmeyer Jun 16, 2013
3f0f62f
updating submodules
justinbmeyer Jun 16, 2013
7d217d2
updating submodule refs
justinbmeyer Jun 16, 2013
524611b
Updating submodule
bitovitom Jun 17, 2013
df2dc08
updating submodule references
justinbmeyer Jun 17, 2013
887df45
Updates to config file
tomgreever Jun 17, 2013
5e12a0b
Merging
tomgreever Jun 17, 2013
4c67c64
Updating colors in config
tomgreever Jun 17, 2013
99859d3
updated docs
justinbmeyer Jul 5, 2013
accc0d3
Merge branch 'master' of github.com:bitovi/javascriptmvc
justinbmeyer Jul 5, 2013
1a47e11
documentation improvements
justinbmeyer Jul 17, 2013
3685e15
updating submodules and docs
justinbmeyer Jul 23, 2013
864af9c
Updating submodules for 3.3 release
Jul 23, 2013
2b6717f
making headers on docs site
justinbmeyer Jul 24, 2013
2164b43
Merge branch 'master' of github.com:bitovi/javascriptmvc
justinbmeyer Jul 24, 2013
71989a1
Updating can to 1.1.7.
dispatchrabbi Jul 24, 2013
ce0280b
Updating jQuery++.
dispatchrabbi Jul 24, 2013
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 1 addition & 0 deletions .gitignore
Original file line number Diff line number Diff line change
@@ -1,3 +1,4 @@
docs/*
.tmp*
cookbook*
site/docs/*
Expand Down
12 changes: 6 additions & 6 deletions .gitmodules
Original file line number Diff line number Diff line change
@@ -1,12 +1,6 @@
[submodule "can"]
path = can
url = git://github.com/bitovi/canjs.git
[submodule "canui"]
path = canui
url = git://github.com/bitovi/canui.git
[submodule "jquery"]
path = jquery
url = git://github.com/bitovi/jquerypp.git
[submodule "steal"]
path = steal
url = git://github.com/bitovi/steal.git
Expand All @@ -16,3 +10,9 @@
[submodule "documentjs"]
path = documentjs
url = git://github.com/bitovi/documentjs.git
[submodule "jquerypp"]
path = jquerypp
url = https://github.com/bitovi/jquerypp.git
[submodule "jmvc"]
path = jmvc
url = git://github.com/bitovi/jmvc-generators
18 changes: 18 additions & 0 deletions Gruntfile.js
Original file line number Diff line number Diff line change
@@ -0,0 +1,18 @@
module.exports = function (grunt) {

grunt.loadNpmTasks('grunt-contrib-connect');

grunt.initConfig({
connect: {
server: {
options: {
port: 8000,
base: '.',
keepalive: true
}
}
}
})

grunt.registerTask("server", "connect:server")
};
4 changes: 4 additions & 0 deletions build/changelog.ejs
Original file line number Diff line number Diff line change
@@ -0,0 +1,4 @@
__<%= version %>__ ( <%= date.toDateString().substring(4) %> )
<% for(var i = 0; i < issues.length; i++) { %>
- change: [<%= issues[i].title %>](<%= issues[i].url %>)<% } %>

19 changes: 6 additions & 13 deletions build/tasks/bannerize.js
Original file line number Diff line number Diff line change
@@ -1,23 +1,16 @@
var path = require('path');

// A grunt task that strips multiline comments
// A grunt task that writes the banner to every file
module.exports = function (grunt) {
grunt.registerMultiTask('bannerize', 'Adds the banner to a set of files', function () {
var _ = grunt.utils._;
var options = grunt.config.process(['bannerize', this.target]);
var banner = grunt.helper('banner');
var defaults = _.extend({ exclude : [] }, grunt.config('strip')._options);
grunt.file.expandFiles(this.file.src).forEach(function (file) {
for(var i = 0; i < defaults.exclude.length; i++) {
if(defaults.exclude[i].test(file)) {
return;
}
}
var banner = this.data.banner;

grunt.file.expand(this.data.files).forEach(function (file) {
var outFile = options.out ? path.join(options.out, path.basename(file)) : file;
grunt.log.writeln('Adding banner to ' + file);

var code = grunt.helper('file_strip_banner', file, { block : true });
grunt.file.write(outFile, banner + code);
grunt.log.writeln('Adding banner to ' + file);
grunt.file.write(outFile, banner + grunt.file.read(file));
});
});
}
13 changes: 9 additions & 4 deletions build/tasks/beautify.js
Original file line number Diff line number Diff line change
Expand Up @@ -5,6 +5,7 @@
* Copyright (c) 2012 Camille Moncelier
* Licensed under the MIT license.
*/
var beautifier = require('js-beautify');

module.exports = function (grunt) {

Expand All @@ -18,8 +19,6 @@ module.exports = function (grunt) {
};

grunt.registerMultiTask('beautify', 'Javascript beautifier', function () {
var beautifier = require('node-beautify');

var options = null;
var tmp = grunt.config(['beautifier', this.target, 'options']);
if (typeof tmp === 'object') {
Expand All @@ -38,7 +37,13 @@ module.exports = function (grunt) {

// Beautify specified files.
var excludes = grunt.config(['beautifier', this.target, 'exclude']);
grunt.file.expandFiles(this.file.src).filter(function (file) {

grunt.file.expand(this.filesSrc).filter(function (file) {
if(/\.min\./.test(file)) {
grunt.log.writeln('Not beautifying ' + file);
return false;
}

for (var i = 0; i < excludes.length; i++) {
if (excludes[i].test(file)) {
grunt.log.writeln('Not beautifying ' + file);
Expand All @@ -48,7 +53,7 @@ module.exports = function (grunt) {
return true;
}).forEach(function (filepath) {
grunt.log.writeln('Beautifying ' + filepath);
var result = beautifier.beautifyJs(grunt.file.read(filepath), options);
var result = beautifier(grunt.file.read(filepath), options);
grunt.file.write(filepath, result);
});

Expand Down
38 changes: 15 additions & 23 deletions build/tasks/build.js
Original file line number Diff line number Diff line change
Expand Up @@ -5,35 +5,27 @@ module.exports = function( grunt ) {
grunt.registerMultiTask('build', 'Runs build files.', function() {
var done = this.async();
var target = this.target;
var files = Array.isArray(this.file.src) ? this.file.src : [this.file.src];
// TODO grunt.file.expandFiles(this.file.src);
var series = files.map(function (file) {
return function(callback) {
var options = grunt.config.process(['build', target]);
var args = [file, options.out || 'dist/', options.version || 'edge'];
var libraries = Array.isArray(options.libraries) ? options.libraries : [];

args.push.apply(args, libraries);
var options = grunt.config.process(['build', target]);
var args = [this.data.src, this.data.out || 'dist/', this.data.version || 'edge'];
var libraries = Array.isArray(this.data.libraries) ? this.data.libraries : [];

grunt.verbose.writeflags(options, 'Options');
grunt.log.writeln('Running ./js ' + args.join(' '));
args.push.apply(args, libraries);

grunt.utils.exec({
cmd : "./js",
args : args,
opts : {
cwd: jsDir
}
}, function(error, result, code) {
callback(error, result, code);
});
grunt.verbose.writeflags(this.data, 'Options');
grunt.log.writeln('Running ./js ' + args.join(' '));

grunt.log.write("Building " + file + " with Steal...\n");
grunt.util.spawn({
cmd : "./js",
args : args,
opts : {
cwd: jsDir
}
});
grunt.utils.async.parallel(series, function(error, results) {
}, function(error, result, code) {
grunt.log.writeln('Done building');
done();
})
});

grunt.log.write("Building " + this.data.src + " with Steal...\n");
});
};
65 changes: 65 additions & 0 deletions build/tasks/changelog.js
Original file line number Diff line number Diff line change
@@ -0,0 +1,65 @@
var https = require('https'),
querystring = require('querystring'),
ejs = require('ejs');

module.exports = function(grunt) {

grunt.registerMultiTask('changelog', 'Updates changelog.md based on GitHub milestones', function() {
var done = this.async(),

params = querystring.stringify({
milestone: this.data.milestone,
state: 'closed',
per_page: 100
}),

path = '/repos/' + this.data.user + '/' + this.data.repo + '/issues?' + params,

buffer = '',
self = this;

var write = function() {
var issues = JSON.parse(buffer),
log = '';

if(grunt.file.exists('changelog.md')) {
log = grunt.file.read('changelog.md');
};

ejs.renderFile(__dirname + '/../changelog.ejs', {
version: self.data.version,
date: new Date(Date.now()),
issues: issues
}, function(e, template) {

if(e) {
done(e);
}

grunt.file.write('changelog.md', template + log);
done();

});
},

req = https.request({
hostname: 'api.github.com',
path: path
}, function(res) {

res.on('data', function(data) {
buffer += data;
});

res.on('end', write);
});

req.end();

req.on('error', function(e) {
done(e);
});

});

}
24 changes: 9 additions & 15 deletions build/tasks/docco.js
Original file line number Diff line number Diff line change
Expand Up @@ -5,24 +5,18 @@ var docco = require('docco');

module.exports = function(grunt) {
grunt.registerMultiTask('docco', 'Docco processor.', function() {
var _ = grunt.utils._;
var options = grunt.config.process(['docco', this.target]);
var defaults = _.extend({
exclude : [/\.min\./]
}, grunt.config.process('docco')._options);
grunt.verbose.writeflags(options, 'Options');
var _ = grunt.util._;
var done = this.async();
var src = grunt.file.expandFiles(this.file.src).filter(function(file) {
for(var i = 0; i < defaults.exclude.length; i++) {
if(defaults.exclude[i].test(file)) {
return false;
}
}
return true;
var options = this.options();
var src = grunt.file.expand(this.data.files).filter(function(file) {
return !_.some(options.exclude, function(exclude) {
return exclude.test(file);
});
});

docco.document(src, _.extend({}, defaults.docco, options.docco) || {}, function(err, result, code){
grunt.log.writeln("Doccoed [" + src.join(", ") + "]; " + err ? err : "(No errors)" + "\n" + result + " " + code);
docco.document( _.extend({ args: src }, this.data.docco, options.docco), function(err, result, code){
grunt.log.writeln("Doccoed [" + src.join(", ") + "]; " +
err ? err : "(No errors)" + "\n" + result + " " + code);
done();
});
});
Expand Down
103 changes: 0 additions & 103 deletions build/tasks/downloads.js

This file was deleted.

Loading