Permalink
Browse files

jsonlint

  • Loading branch information...
1 parent b4a8ed3 commit 5cfe237dd4b4b84e5f717023ad13161ef14d2576 @Rudloff committed Aug 20, 2016
Showing with 131 additions and 109 deletions.
  1. +10 −1 Gruntfile.js
  2. +4 −4 bower.json
  3. +80 −74 composer.json
  4. +1 −1 composer.lock
  5. +35 −29 manifest.json
  6. +1 −0 package.json
View
@@ -77,6 +77,14 @@ module.exports = function (grunt) {
directory: 'classes/,controllers/,tests/'
}
}
+ },
+ jsonlint: {
+ manifests: {
+ src: '*.json',
+ options: {
+ format: true
+ }
+ }
}
}
);
@@ -90,9 +98,10 @@ module.exports = function (grunt) {
grunt.loadNpmTasks('grunt-contrib-compress');
grunt.loadNpmTasks('grunt-jslint');
grunt.loadNpmTasks('grunt-phpdocumentor');
+ grunt.loadNpmTasks('grunt-jsonlint');
grunt.registerTask('default', ['uglify', 'cssmin']);
- grunt.registerTask('lint', ['phpcs', 'jslint']);
+ grunt.registerTask('lint', ['phpcs', 'jslint', 'jsonlint']);
grunt.registerTask('test', ['phpunit']);
grunt.registerTask('doc', ['phpdocumentor']);
grunt.registerTask('release', ['default', 'githash', 'compress']);
View
@@ -1,6 +1,6 @@
{
- "name": "alltube",
- "dependencies": {
- "opensans-googlefont": "*"
- }
+ "name": "alltube",
+ "dependencies": {
+ "opensans-googlefont": "*"
+ }
}
View
@@ -1,76 +1,82 @@
{
- "name": "rudloff/alltube",
- "description": "HTML GUI for youtube-dl",
- "license": "GPL-3.0",
- "homepage": "http://alltubedownload.net/",
- "type": "project",
- "require": {
- "smarty/smarty": "~3.1.29",
- "rg3/youtube-dl": "~2016.08.12",
- "slim/slim": "~3.5.0",
- "mathmarques/smarty-view": "~1.1.0",
- "symfony/yaml": "~3.1.0",
- "symfony/process": "~3.1.0",
- "ptachoire/process-builder-chain": "~1.2.0",
- "ffmpeg/ffmpeg": "dev-release",
- "rudloff/smarty-plugin-noscheme": "~0.1.0",
- "rudloff/rtmpdump-bin": "~2.3"
- },
- "require-dev": {
- "symfony/var-dumper": "~3.1.0",
- "squizlabs/php_codesniffer": "~2.6.2",
- "phpunit/phpunit": "~5.5.2"
- },
- "extra": {
- "paas": {
- "nginx-includes": [
- "nginx.conf"
- ]
- }
- },
- "repositories": [{
- "type": "package",
- "package": {
- "name": "rg3/youtube-dl",
- "version": "2016.08.12",
- "source": {
- "url": "https://github.com/rg3/youtube-dl.git",
- "type": "git",
- "reference": "2016.08.12"
- }
- }
- }, {
- "type": "package",
- "package": {
- "name": "ffmpeg/ffmpeg",
- "version": "dev-release",
- "dist": {
- "url": "http://johnvansickle.com/ffmpeg/releases/ffmpeg-release-64bit-static.tar.xz",
- "type": "xz"
- },
- "bin": [
- "ffmpeg"
- ]
- }
- }],
- "authors": [{
- "name": "Pierre Rudloff",
- "email": "contact@rudloff.pro",
- "homepage": "https://rudloff.pro/",
- "role": "Developer"
- }, {
- "name": "Olivier Haquette",
- "email": "contact@olivierhaquette.fr",
- "homepage": "http://olivierhaquette.fr/",
- "role": "Designer"
- }],
- "autoload": {
- "psr-4": {
- "Alltube\\": "classes/",
- "Alltube\\Controller\\": "controllers/"
- }
- },
- "config": {
- "secure-http": false
- }
+ "name": "rudloff/alltube",
+ "description": "HTML GUI for youtube-dl",
+ "license": "GPL-3.0",
+ "homepage": "http://alltubedownload.net/",
+ "type": "project",
+ "require": {
+ "smarty/smarty": "~3.1.29",
+ "rg3/youtube-dl": "~2016.08.12",
+ "slim/slim": "~3.5.0",
+ "mathmarques/smarty-view": "~1.1.0",
+ "symfony/yaml": "~3.1.0",
+ "symfony/process": "~3.1.0",
+ "ptachoire/process-builder-chain": "~1.2.0",
+ "ffmpeg/ffmpeg": "dev-release",
+ "rudloff/smarty-plugin-noscheme": "~0.1.0",
+ "rudloff/rtmpdump-bin": "~2.3"
+ },
+ "require-dev": {
+ "symfony/var-dumper": "~3.1.0",
+ "squizlabs/php_codesniffer": "~2.6.2",
+ "phpunit/phpunit": "~5.5.2"
+ },
+ "extra": {
+ "paas": {
+ "nginx-includes": [
+ "nginx.conf"
+ ]
+ }
+ },
+ "repositories": [
+ {
+ "type": "package",
+ "package": {
+ "name": "rg3/youtube-dl",
+ "version": "2016.08.12",
+ "source": {
+ "url": "https://github.com/rg3/youtube-dl.git",
+ "type": "git",
+ "reference": "2016.08.12"
+ }
+ }
+ },
+ {
+ "type": "package",
+ "package": {
+ "name": "ffmpeg/ffmpeg",
+ "version": "dev-release",
+ "dist": {
+ "url": "http://johnvansickle.com/ffmpeg/releases/ffmpeg-release-64bit-static.tar.xz",
+ "type": "xz"
+ },
+ "bin": [
+ "ffmpeg"
+ ]
+ }
+ }
+ ],
+ "authors": [
+ {
+ "name": "Pierre Rudloff",
+ "email": "contact@rudloff.pro",
+ "homepage": "https://rudloff.pro/",
+ "role": "Developer"
+ },
+ {
+ "name": "Olivier Haquette",
+ "email": "contact@olivierhaquette.fr",
+ "homepage": "http://olivierhaquette.fr/",
+ "role": "Designer"
+ }
+ ],
+ "autoload": {
+ "psr-4": {
+ "Alltube\\": "classes/",
+ "Alltube\\Controller\\": "controllers/"
+ }
+ },
+ "config": {
+ "secure-http": false
+ }
}
View
@@ -4,7 +4,7 @@
"Read more about it at https://getcomposer.org/doc/01-basic-usage.md#composer-lock-the-lock-file",
"This file is @generated automatically"
],
- "hash": "9c4657008fcebce7e45807ae0dc59d30",
+ "hash": "85ec531cf9a73084ab531e5b781f8844",
"content-hash": "054a8bdbb08cfac744d4b28965fb6f17",
"packages": [
{
View
@@ -1,31 +1,37 @@
{
- "short_name": "AllTube",
- "name": "AllTube Download",
- "description": "Easily download videos from Youtube, Dailymotion, Vimeo and other websites",
- "display": "standalone",
- "icons": [{
- "src": "img/favicon.png",
- "sizes": "32x32",
- "type": "image/png"
- }, {
- "src": "img/logo_60.png",
- "sizes": "60x60",
- "type": "image/png"
- }, {
- "src": "img/logo_90.png",
- "sizes": "90x60",
- "type": "image/png"
- }, {
- "src": "img/logo_app.png",
- "sizes": "243x243",
- "type": "image/png"
- }, {
- "src": "img/logo_250.png",
- "sizes": "250x250",
- "type": "image/png"
- }],
- "lang": "en",
- "start_url": "./",
- "theme_color": "#4F4F4F",
- "orientation": "portrait"
+ "short_name": "AllTube",
+ "name": "AllTube Download",
+ "description": "Easily download videos from Youtube, Dailymotion, Vimeo and other websites",
+ "display": "standalone",
+ "icons": [
+ {
+ "src": "img/favicon.png",
+ "sizes": "32x32",
+ "type": "image/png"
+ },
+ {
+ "src": "img/logo_60.png",
+ "sizes": "60x60",
+ "type": "image/png"
+ },
+ {
+ "src": "img/logo_90.png",
+ "sizes": "90x60",
+ "type": "image/png"
+ },
+ {
+ "src": "img/logo_app.png",
+ "sizes": "243x243",
+ "type": "image/png"
+ },
+ {
+ "src": "img/logo_250.png",
+ "sizes": "250x250",
+ "type": "image/png"
+ }
+ ],
+ "lang": "en",
+ "start_url": "./",
+ "theme_color": "#4F4F4F",
+ "orientation": "portrait"
}
View
@@ -16,6 +16,7 @@
"grunt-contrib-watch": "~1.0.0",
"grunt-githash": "~0.1.3",
"grunt-jslint": "~1.1.14",
+ "grunt-jsonlint": "~1.1.0",
"grunt-phpcs": "~0.4.0",
"grunt-phpdocumentor": "~0.4.1",
"grunt-phpunit": "~0.3.6"

0 comments on commit 5cfe237

Please sign in to comment.