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.

Sign up for GitHub

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

Jump to bottom

Adding github config file for adding the github variables there #30

Closed
wants to merge 1 commit into from
Closed

Adding github config file for adding the github variables there #30

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1 +1,2 @@
node_modules
config/*.js
29 changes: 21 additions & 8 deletions bin/nodeschool-admin
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,7 @@
var nopt = require('nopt')
var log = require('npmlog')
var path = require('path')
var fs = require('fs')
var input = nopt({
loglevel: ['info', 'silly', 'verbose', 'http', 'warn', 'error'],
chapter: String,
Expand All @@ -27,13 +28,25 @@ var input = nopt({
input.path = input.path || process.cwd()
log.level = input.loglevel || 'info'

if (!input['gh-client-id'] && process.env.GITHUB_CLIENT_SECRET && process.env.GITHUB_CLIENT_ID) {
input['gh-client-id'] = process.env.GITHUB_CLIENT_ID
input['gh-client-secret'] = process.env.GITHUB_CLIENT_SECRET
}

if (!input['gh-token'] && process.env.GITHUB_TOKEN) {
input['gh-token'] = process.env.GITHUB_TOKEN
// Checking it Github variables exist in '/config/github.js'
if (fs.exists('../config/github')) {
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

This path is a rather random path. How about putting it in ~/.nodeschool-admin.json ?

Copy link
Member Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Way better, will fix as soon as I get home.

var githubConfig = require('../config/github').githubConfig
if (githubConfig.GITHUB_CLIENT_ID) {
input['gh-client-id'] = githubConfig.GITHUB_CLIENT_ID
}
if (githubConfig.GITHUB_CLIENT_SECRET && githubConfig.GITHUB_CLIENT_ID) {
input['gh-client-id'] = githubConfig.GITHUB_CLIENT_SECRET
input['gh-client-secret'] = githubConfig.GITHUB_CLIENT_ID
}
} else {
// if Github variables does not exist in '/config/github.js', search in ENV
if (!input['gh-client-id'] && process.env.GITHUB_CLIENT_SECRET && process.env.GITHUB_CLIENT_ID) {
input['gh-client-id'] = process.env.GITHUB_CLIENT_ID
input['gh-client-secret'] = process.env.GITHUB_CLIENT_SECRET
}
if (!input['gh-token'] && process.env.GITHUB_TOKEN) {
input['gh-token'] = process.env.GITHUB_TOKEN
}
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

The logic of the gh-config and process block are same it could be reasonably be reduced to:

var config = process.env;
if (<gh-config-exists>) {
  config = Object.assign(<gh-config-json>, config);
}

}

require('..').run(input)
Expand Down Expand Up @@ -61,6 +74,6 @@ require('..').run(input)
} else {
log.error('error', e)
}
log.error('oh!', '\nSomething went wrong, sorry for that. (-_-\')\n' )
log.error('oh!', '\nSomething went wrong, sorry for that. (-_-\')\n')
process.exit(1)
})
15 changes: 15 additions & 0 deletions config/github.js.config
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,15 @@
/*
* You will need to specify an github API authentication to bypass the API limitations.
* You can specify it by providing an environment variable GITHUB_CLIENT_ID and GITHUB_CLIENT_SECRET or pass in a GITHUB_TOKEN (for more permissions).
* If you don't want to, or can't set them in the ENV you can always set them here.
* Copy this file and change it's name to 'github.js'
*
* Get your GITHUB_CLIENT_ID and GITHUB_CLIENT_SECRET here: https://github.com/settings/developers
* Get a GITHUB_TOKEN here: https://github.com/settings/tokens
*
*/
exports.githubConfig = {
'GITHUB_CLIENT_SECRET': '',
'GITHUB_CLIENT_ID': '',
'GITHUB_TOKEN': ''
}