Permalink
Browse files

Merge pull request #3 from apiaryio/Update_Production

Update gruntjs to latest version
  • Loading branch information...
2 parents 7d47c82 + 148d092 commit ace1628717c611bb31f18280dd9dec239b400149 @XVincentX XVincentX committed Mar 20, 2015
View
@@ -0,0 +1,2 @@
+* text=auto
+/test/fixtures/*.txt text eol=lf
View
@@ -0,0 +1,5 @@
+{
+ "preset": "grunt",
+ // Nullified until the files in test/ can be cleaned
+ "maximumLineLength": null
+}
View
@@ -0,0 +1,14 @@
+{
+ "boss": true,
+ "curly": true,
+ "eqeqeq": true,
+ "eqnull": true,
+ "immed": true,
+ "latedef": "nofunc",
+ "newcap": true,
+ "noarg": true,
+ "node": true,
+ "sub": true,
+ "undef": true,
+ "unused": true
+}
View
@@ -1,8 +0,0 @@
-docs
-test
-.travis.yml
-appveyor.yml
-AUTHORS
-CHANGELOG
-custom-gruntfile.js
-Gruntfile.js
View
@@ -1,12 +1,17 @@
+sudo: false
language: node_js
node_js:
- "0.8"
- "0.10"
- - "0.11"
+ - "0.12"
+ - "0.13"
+ - "iojs"
+before_install:
+ - npm install -g npm
before_script:
- npm install -g grunt-cli
- npm uninstall grunt # https://github.com/npm/npm/issues/3958
matrix:
fast_finish: true
allow_failures:
- - node_js: "0.11"
+ - node_js: "0.13"
View
@@ -2,7 +2,7 @@
* grunt
* http://gruntjs.com/
*
- * Copyright (c) 2014 "Cowboy" Ben Alman
+ * Copyright (c) 2015 "Cowboy" Ben Alman
* Licensed under the MIT license.
* https://github.com/gruntjs/grunt/blob/master/LICENSE-MIT
*/
@@ -14,27 +14,31 @@ module.exports = function(grunt) {
// Project configuration.
grunt.initConfig({
nodeunit: {
- all: ['test/{grunt,tasks,util}/**/*.js']
+ all: ['test/{grunt,tasks,util}/**/*.js'],
+ tap: {
+ src: '<%= nodeunit.all %>',
+ options: {
+ reporter: 'tap',
+ reporterOutput: 'tests.tap'
+ }
+ }
},
jshint: {
gruntfile_tasks: ['Gruntfile.js', 'internal-tasks/*.js'],
libs_n_tests: ['lib/**/*.js', '<%= nodeunit.all %>'],
subgrunt: ['<%= subgrunt.all %>'],
options: {
- curly: true,
- eqeqeq: true,
- immed: true,
- latedef: 'nofunc',
- newcap: true,
- noarg: true,
- sub: true,
- undef: true,
- unused: true,
- boss: true,
- eqnull: true,
- node: true,
+ jshintrc: '.jshintrc'
}
},
+ jscs: {
+ src: [
+ 'lib/**/*.js',
+ 'internal-tasks/**/*.js',
+ 'test/**/*.js',
+ '!test/fixtures/**/*.js'
+ ]
+ },
watch: {
gruntfile_tasks: {
files: ['<%= jshint.gruntfile_tasks %>'],
@@ -56,14 +60,17 @@ module.exports = function(grunt) {
// These plugins provide necessary tasks.
grunt.loadNpmTasks('grunt-contrib-jshint');
+ grunt.loadNpmTasks('grunt-jscs');
grunt.loadNpmTasks('grunt-contrib-nodeunit');
grunt.loadNpmTasks('grunt-contrib-watch');
// Some internal tasks. Maybe someday these will be released.
grunt.loadTasks('internal-tasks');
// "npm test" runs these tasks
- grunt.registerTask('test', ['jshint', 'nodeunit', 'subgrunt']);
+ grunt.registerTask('test', '', function(reporter) {
+ grunt.task.run(['jshint', 'jscs', 'nodeunit:' + (reporter || 'all'), 'subgrunt']);
+ });
// Default task.
grunt.registerTask('default', ['test']);
View
@@ -1,4 +1,4 @@
-Copyright (c) 2014 "Cowboy" Ben Alman
+Copyright (c) 2015 "Cowboy" Ben Alman
Permission is hereby granted, free of charge, to any person
obtaining a copy of this software and associated documentation
View
@@ -1,7 +1,7 @@
# Grunt: The JavaScript Task Runner
-[![Build Status: Linux](https://secure.travis-ci.org/gruntjs/grunt.png?branch=master)](http://travis-ci.org/gruntjs/grunt)
-<a href="https://ci.appveyor.com/project/gruntjs/grunt"><img src="https://ci.appveyor.com/api/projects/status/32r7s2skrgm9ubva/branch/master" alt="Build Status: Windows" height="18" /></a>
+[![Build Status: Linux](https://travis-ci.org/gruntjs/grunt.svg?branch=master)](https://travis-ci.org/gruntjs/grunt)
+[![Build Status: Windows](https://ci.appveyor.com/api/projects/status/32r7s2skrgm9ubva/branch/master?svg=true)](https://ci.appveyor.com/project/gruntjs/grunt/branch/master)
[![Built with Grunt](https://cdn.gruntjs.com/builtwith.png)](http://gruntjs.com/)
<img align="right" height="260" src="http://gruntjs.com/img/grunt-logo-no-wordmark.svg">
View
@@ -1,43 +1,41 @@
+# AppVeyor file
# http://www.appveyor.com/docs/appveyor-yml
-# Fix line endings in Windows. (runs before repo cloning)
+# Build version format
+version: "{build}"
+
+clone_depth: 10
+
+# Fix line endings on Windows
init:
- - git config --global core.autocrlf input
+ - git config --global core.autocrlf true
-# Test against these versions of Node.js.
+# What combinations to test
environment:
matrix:
- - nodejs_version: "0.10"
- - nodejs_version: "0.8"
- - nodejs_version: "0.11"
+ - nodejs_version: 0.10
+ - nodejs_version: 0.12
+ - nodejs_version: 1
-# Allow failing jobs for bleeding-edge Node.js versions.
-matrix:
- allow_failures:
- - nodejs_version: "0.11"
-
-# Install scripts. (runs after repo cloning)
install:
- # Get the latest stable version of Node 0.STABLE.latest
- ps: Install-Product node $env:nodejs_version
- # Typical npm stuff.
- - npm install
- # Grunt-specific stuff.
- npm install -g grunt-cli
- - npm uninstall grunt # https://github.com/npm/npm/issues/3958
+ - npm install
+
+build: off
-# Post-install test scripts.
test_script:
# Output useful info for debugging.
- - node --version
- - npm --version
+ - node --version && npm --version
# We test multiple Windows shells because of prior stdout buffering issues
# filed against Grunt. https://github.com/joyent/node/issues/3584
- ps: "npm test # PowerShell" # Pass comment to PS for easier debugging
- cmd: npm test
-# Don't actually build.
-build: off
+matrix:
+ fast_finish: true
-# Set build version format here instead of in the admin panel.
-version: "{build}"
+cache:
+ - C:\Users\appveyor\AppData\Roaming\npm\node_modules -> package.json # global npm modules
+ - C:\Users\appveyor\AppData\Roaming\npm-cache -> package.json # npm cache
+ - node_modules -> package.json # local npm modules
View
@@ -2,7 +2,7 @@
* grunt-contrib-bump
* http://gruntjs.com/
*
- * Copyright (c) 2014 "Cowboy" Ben Alman, contributors
+ * Copyright (c) 2015 "Cowboy" Ben Alman, contributors
* Licensed under the MIT license.
*/
@@ -148,4 +148,4 @@ module.exports = function(grunt) {
}
}
-};
+};
View
@@ -2,7 +2,7 @@
* grunt
* http://gruntjs.com/
*
- * Copyright (c) 2014 "Cowboy" Ben Alman
+ * Copyright (c) 2015 "Cowboy" Ben Alman
* Licensed under the MIT license.
* https://github.com/gruntjs/grunt/blob/master/LICENSE-MIT
*/
View
@@ -2,7 +2,7 @@
* grunt
* http://gruntjs.com/
*
- * Copyright (c) 2014 "Cowboy" Ben Alman
+ * Copyright (c) 2015 "Cowboy" Ben Alman
* Licensed under the MIT license.
* https://github.com/gruntjs/grunt/blob/master/LICENSE-MIT
*/
@@ -46,7 +46,8 @@ var optlist = cli.optlist = {
type: Boolean
},
base: {
- info: 'Specify an alternate base path. By default, all file paths are relative to the Gruntfile. (grunt.file.setBase) *',
+ info: 'Specify an alternate base path. By default, all file paths are relative to the Gruntfile. ' +
+ '(grunt.file.setBase) *',
type: path
},
color: {
@@ -55,7 +56,8 @@ var optlist = cli.optlist = {
negate: true
},
gruntfile: {
- info: 'Specify an alternate Gruntfile. By default, grunt looks in the current or parent directories for the nearest Gruntfile.js or Gruntfile.coffee file.',
+ info: 'Specify an alternate Gruntfile. By default, grunt looks in the current or parent directories ' +
+ 'for the nearest Gruntfile.js or Gruntfile.coffee file.',
type: path
},
debug: {
View
@@ -2,7 +2,7 @@
* grunt
* http://gruntjs.com/
*
- * Copyright (c) 2014 "Cowboy" Ben Alman
+ * Copyright (c) 2015 "Cowboy" Ben Alman
* Licensed under the MIT license.
* https://github.com/gruntjs/grunt/blob/master/LICENSE-MIT
*/
View
@@ -2,7 +2,7 @@
* grunt
* http://gruntjs.com/
*
- * Copyright (c) 2014 "Cowboy" Ben Alman
+ * Copyright (c) 2015 "Cowboy" Ben Alman
* Licensed under the MIT license.
* https://github.com/gruntjs/grunt/blob/master/LICENSE-MIT
*/
View
@@ -2,7 +2,7 @@
* grunt
* http://gruntjs.com/
*
- * Copyright (c) 2014 "Cowboy" Ben Alman
+ * Copyright (c) 2015 "Cowboy" Ben Alman
* Licensed under the MIT license.
* https://github.com/gruntjs/grunt/blob/master/LICENSE-MIT
*/
View
@@ -2,7 +2,7 @@
* grunt
* http://gruntjs.com/
*
- * Copyright (c) 2014 "Cowboy" Ben Alman
+ * Copyright (c) 2015 "Cowboy" Ben Alman
* Licensed under the MIT license.
* https://github.com/gruntjs/grunt/blob/master/LICENSE-MIT
*/
@@ -122,7 +122,7 @@ file.expand = function() {
// If the file is of the right type and exists, this should work.
return fs.statSync(filepath)[options.filter]();
}
- } catch(e) {
+ } catch (e) {
// Otherwise, it's probably not the right type.
return false;
}
@@ -198,7 +198,7 @@ file.mkdir = function(dirpath, mode) {
if (!file.exists(subpath)) {
try {
fs.mkdirSync(subpath, mode);
- } catch(e) {
+ } catch (e) {
throw grunt.util.error('Unable to create directory "' + subpath + '" (Error code: ' + e.code + ').', e);
}
}
@@ -242,7 +242,7 @@ file.read = function(filepath, options) {
}
grunt.verbose.ok();
return contents;
- } catch(e) {
+ } catch (e) {
grunt.verbose.error();
throw grunt.util.error('Unable to read "' + filepath + '" file (Error code: ' + e.code + ').', e);
}
@@ -257,7 +257,7 @@ file.readJSON = function(filepath, options) {
result = JSON.parse(src);
grunt.verbose.ok();
return result;
- } catch(e) {
+ } catch (e) {
grunt.verbose.error();
throw grunt.util.error('Unable to parse "' + filepath + '" file (' + e.message + ').', e);
}
@@ -272,7 +272,7 @@ file.readYAML = function(filepath, options) {
result = YAML.load(src);
grunt.verbose.ok();
return result;
- } catch(e) {
+ } catch (e) {
grunt.verbose.error();
throw grunt.util.error('Unable to parse "' + filepath + '" file (' + e.problem + ').', e);
}
@@ -297,7 +297,7 @@ file.write = function(filepath, contents, options) {
}
grunt.verbose.ok();
return true;
- } catch(e) {
+ } catch (e) {
grunt.verbose.error();
throw grunt.util.error('Unable to write "' + filepath + '" file (Error code: ' + e.code + ').', e);
}
@@ -338,7 +338,7 @@ file._copy = function(srcpath, destpath, options) {
try {
contents = options.process(contents, srcpath, destpath);
grunt.verbose.ok();
- } catch(e) {
+ } catch (e) {
grunt.verbose.error();
throw grunt.util.error('Error while processing "' + srcpath + '" file.', e);
}
@@ -388,7 +388,7 @@ file.delete = function(filepath, options) {
}
grunt.verbose.ok();
return true;
- } catch(e) {
+ } catch (e) {
grunt.verbose.error();
throw grunt.util.error('Unable to delete "' + filepath + '" file (' + e.message + ').', e);
}
@@ -450,7 +450,7 @@ file.isPathCwd = function() {
var filepath = path.join.apply(path, arguments);
try {
return file.arePathsEquivalent(fs.realpathSync(process.cwd()), fs.realpathSync(filepath));
- } catch(e) {
+ } catch (e) {
return false;
}
};
@@ -460,7 +460,7 @@ file.isPathInCwd = function() {
var filepath = path.join.apply(path, arguments);
try {
return file.doesPathContain(fs.realpathSync(process.cwd()), fs.realpathSync(filepath));
- } catch(e) {
+ } catch (e) {
return false;
}
};
Oops, something went wrong.

0 comments on commit ace1628

Please sign in to comment.