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

updated dependencies and changed to camelCase style variable names #52

Merged
merged 2 commits into from
Apr 6, 2016
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
48 changes: 24 additions & 24 deletions github.js
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
'use strict'

var GitHub = require('github')
var github = new GitHub({version: '3.0.0'})
var GitHub = require('github4')
var github = new GitHub()
var Request = require('request')
var _ = require('lodash')
var gitUrl
Expand All @@ -17,25 +17,25 @@ module.exports = function (options) {

opts = extend(opts, options)

seneca.add('role:github,cmd:get', cmd_get)
seneca.add('role:github,cmd:query', cmd_query)
seneca.add('role:github,cmd:parse', cmd_parse)
seneca.add('role:github,cmd:extract', cmd_extract)
seneca.add('role:github,cmd:get', cmdGet)
seneca.add('role:github,cmd:query', cmdQuery)
seneca.add('role:github,cmd:parse', cmdParse)
seneca.add('role:github,cmd:extract', cmdExtract)

return {
name: 'nodezoo-github'
}
}

function cmd_get (args, done) {
function cmdGet (args, done) {
var seneca = this

var github_name = args.name
var github_ent = seneca.make$('github')
var githubName = args.name
var githubEnt = seneca.make$('github')

var url = opts.registry + github_name
var url = opts.registry + githubName
// check if in the cache
github_ent.load$(github_name, function (err, github) {
githubEnt.load$(githubName, function (err, github) {
if (err) {
return done(err)
}
Expand All @@ -58,7 +58,7 @@ function cmd_get (args, done) {
return done(err)
}
// parse username and repo from giturl
var gitData = cmd_parse(data)
var gitData = cmdParse(data)

if (gitData) {
var user = gitData[1]
Expand All @@ -70,19 +70,19 @@ function cmd_get (args, done) {
}
else {
// get github data using github username and repo name
seneca.act('role:github,cmd:query', {name: github_name, user: user, repo: repo}, done)
seneca.act('role:github,cmd:query', {name: githubName, user: user, repo: repo}, done)
}
})
})
}
})
}

function cmd_query (args, done) {
function cmdQuery (args, done) {
var seneca = this

var github_ent = seneca.make$('github')
var github_name = args.name
var githubEnt = seneca.make$('github')
var githubName = args.name
var user = args.user
var repo = args.repo

Expand All @@ -99,7 +99,7 @@ function cmd_query (args, done) {
var data
if (repo) {
var pullRequests = []
github.pullRequests.getAll({user: user, repo: github_name, state: 'open'}, function (err, response) {
github.pullRequests.getAll({user: user, repo: githubName, state: 'open'}, function (err, response) {
if (err) {
console.log(err)
}
Expand All @@ -120,27 +120,27 @@ function cmd_query (args, done) {
pullRequests: pullRequests.length || ''
}
// update the data if module exists in cache, if not create it
github_ent.load$(github_name, function (err, github) {
githubEnt.load$(githubName, function (err, github) {
if (err) {
return done(err)
}
if (github) {
return github.data$(data).save$(done)
}
else {
data.id$ = github_name
github_ent.make$(data).save$(done)
data.id$ = githubName
githubEnt.make$(data).save$(done)
}
})
}
else return done()
})
}

function cmd_extract (args, done) {
function cmdExtract (args, done) {
var data = args.data
var dist_tags = data['dist-tags'] || {}
var latest = ((data.versions || {})[dist_tags.latest]) || {}
var distTags = data['dist-tags'] || {}
var latest = ((data.versions || {})[distTags.latest]) || {}
var repository = latest.repository || {}

var out = {
Expand All @@ -150,7 +150,7 @@ function cmd_extract (args, done) {
done(null, out)
}

function cmd_parse (args) {
function cmdParse (args) {
var m = /[\/:]([^\/:]+?)[\/:]([^\/]+?)(\.git)*$/.exec(args.giturl)
if (m) {
return (m)
Expand Down
2 changes: 1 addition & 1 deletion package.json
Original file line number Diff line number Diff line change
Expand Up @@ -31,7 +31,7 @@
"license": "MIT",
"dependencies": {
"eraro": "0.4.1",
"github": "0.2.2",
"github4": "0.5.4",
"lodash": "4.6.1",
"request": "2.69.0",
"seneca": "2.0.0",
Expand Down