Browse Source

Fix admin issues

pull/3078/merge
Jack 9 years ago
parent
commit
d1c6b9b7ba
4 changed files with 28 additions and 62 deletions
  1. 57
      package.json
  2. 23
      tasks/admin/distributions/init.js
  3. 3
      tasks/admin/distributions/update.js
  4. 7
      tasks/config/admin/oauth.example.js

57
package.json

@ -16,60 +16,28 @@
"scripts": {
"install": "gulp install"
},
"peerDependencies": {
"better-console": "*",
"del": "*",
"extend": "*",
"gulp": "*",
"gulp-autoprefixer": "*",
"gulp-chmod": "*",
"gulp-clone": "*",
"gulp-concat": "*",
"gulp-concat-css": "*",
"gulp-copy": "*",
"gulp-dedupe": "*",
"gulp-flatten": "*",
"gulp-header": "*",
"gulp-help": "*",
"gulp-if": "*",
"gulp-less": "*",
"gulp-minify-css": "*",
"gulp-notify": "*",
"gulp-plumber": "*",
"gulp-print": "*",
"gulp-rename": "*",
"gulp-replace": "*",
"gulp-rtlcss": "*",
"gulp-uglify": "*",
"gulp-util": "*",
"gulp-watch": "*",
"map-stream": "*",
"require-dot-file": "*",
"run-sequence": "*",
"yamljs": "*"
},
"dependencies": {
"better-console": "*",
"del": "^1.2.0",
"extend": "^2.0.1",
"del": "^2.0.2",
"extend": "^3.0.0",
"gulp": "^3.9.0",
"gulp-autoprefixer": "^2.3.1",
"gulp-autoprefixer": "^3.1.0",
"gulp-chmod": "^1.2.0",
"gulp-clone": "^1.0.0",
"gulp-concat": "^2.6.0",
"gulp-concat-css": "^2.2.0",
"gulp-copy": "0.0.2",
"gulp-dedupe": "0.0.2",
"gulp-flatten": "^0.1.0",
"gulp-flatten": "^0.2.0",
"gulp-header": "^1.2.2",
"gulp-help": "^1.6.0",
"gulp-if": "^1.2.5",
"gulp-if": "^2.0.0",
"gulp-json-editor": "^2.2.1",
"gulp-less": "^3.0.3",
"gulp-minify-css": "^1.2.0",
"gulp-notify": "^2.2.0",
"gulp-plumber": "^1.0.1",
"gulp-print": "^1.1.0",
"gulp-print": "^2.0.1",
"gulp-prompt": "^0.1.2",
"gulp-rename": "^1.2.2",
"gulp-replace": "^0.5.3",
@ -79,6 +47,7 @@
"gulp-watch": "^4.3.1",
"jquery": "^2.1.4",
"map-stream": "^0.1.0",
"merge-stream": "^1.0.0",
"mkdirp": "^0.5.1",
"require-dot-file": "^0.4.0",
"run-sequence": "^1.1.0",
@ -86,11 +55,11 @@
"yamljs": "^0.2.3"
},
"devDependencies": {
"github": "^0.2.4",
"gulp-concat-filenames": "^1.0.0",
"gulp-debug": "^2.0.1",
"gulp-git": "^1.2.4",
"gulp-tap": "^0.1.3",
"merge-stream": "^0.1.7"
"github": "*",
"gulp-concat-filenames": "*",
"gulp-debug": "*",
"gulp-git": "*",
"gulp-tap": "*",
"merge-stream": "*"
}
}

23
tasks/admin/distributions/init.js

@ -65,18 +65,17 @@ module.exports = function(callback) {
}
var
component = release.distributions[index],
lowerCaseComponent = component.toLowerCase(),
outputDirectory = path.resolve(release.outputRoot + lowerCaseComponent),
repoName = release.distRepoRoot + component,
gitOptions = { cwd: outputDirectory },
pullOptions = { args: '-q', cwd: outputDirectory, quiet: true },
resetOptions = { args: '-q --hard', cwd: outputDirectory, quiet: true },
gitURL = 'https://github.com/' + release.org + '/' + repoName + '.git',
repoURL = 'https://github.com/' + release.org + '/' + repoName + '/',
localRepoSetup = fs.existsSync(path.join(outputDirectory, '.git'))
component = release.distributions[index],
lowerCaseComponent = component.toLowerCase(),
outputDirectory = path.resolve(release.outputRoot + lowerCaseComponent),
repoName = release.distRepoRoot + component,
gitOptions = { cwd: outputDirectory },
pullOptions = { args: '-q', cwd: outputDirectory, quiet: true },
resetOptions = { args: '-q --hard', cwd: outputDirectory, quiet: true },
gitURL = 'git@github.com:' + release.org + '/' + repoName + '.git',
repoURL = 'https://github.com/' + release.org + '/' + repoName + '/',
localRepoSetup = fs.existsSync(path.join(outputDirectory, '.git'))
;
console.log('Processing repository: ' + outputDirectory);

3
tasks/admin/distributions/update.js

@ -67,9 +67,6 @@ module.exports = function(callback) {
outputDirectory = path.resolve(path.join(release.outputRoot, distribution.toLowerCase() )),
repoName = release.distRepoRoot + distribution,
gitURL = 'https://github.com/' + release.org + '/' + repoName + '.git',
repoURL = 'https://github.com/' + release.org + '/' + repoName + '/',
commitArgs = (oAuth.name !== undefined && oAuth.email !== undefined)
? '--author "' + oAuth.name + ' <' + oAuth.email + '>"'
: '',

7
tasks/config/admin/oauth.example.js

@ -4,7 +4,8 @@
*/
module.exports = {
token : 'AN-OAUTH2-TOKEN',
name : 'Your Name',
email : 'user@email.com'
token : 'AN-OAUTH2-TOKEN',
username : 'github-username',
name : 'Your Name',
email : 'user@email.com'
};
Loading…
Cancel
Save