use commits instead of contributions when possible

Author: Lauri Piispanen

github/github.go

@@ -108,7 +108,9 @@ Pages:
                 contributionsCollection {
                   contributionCalendar {
                     totalContributions
-                  }
+                  },
+                  totalCommitContributions,
+                  totalPullRequestContributions,
                   restrictedContributionsCount
                 }
               }
@@ -200,6 +202,8 @@ Pages:
 				contributionsCollection := userNode["contributionsCollection"].(map[string]interface{})
 				contributionCount := int(contributionsCollection["contributionCalendar"].(map[string]interface{})["totalContributions"].(float64))
 				privateContributionCount := int(contributionsCollection["restrictedContributionsCount"].(float64))
+				commitsCount := int(contributionsCollection["totalCommitContributions"].(float64))
+				pullRequestsCount := int(contributionsCollection["totalPullRequestContributions"].(float64))
 
 				user := User{
 					Login:                    login,
@@ -210,7 +214,9 @@ Pages:
 					FollowerCount:            followerCount,
 					ContributionCount:        contributionCount,
 					PublicContributionCount:  (contributionCount - privateContributionCount),
-					PrivateContributionCount: privateContributionCount}
+					PrivateContributionCount: privateContributionCount,
+					CommitsCount:             commitsCount,
+					PullRequestsCount:        pullRequestsCount}
 
 				if !userLogins[login] {
 					userLogins[login] = true
@@ -279,6 +285,8 @@ type User struct {
 	ContributionCount        int
 	PublicContributionCount  int
 	PrivateContributionCount int
+	CommitsCount             int
+	PullRequestsCount        int
 }
 
 type UserSearchQuery struct {

output/output.go

@@ -51,14 +51,25 @@ func CsvOutput(results github.GithubSearchResults, writer io.Writer, options top
 	return nil
 }
 
+type ContributionsSelector func(github.User) int
+
+func selectCommits(user github.User) int {
+	return user.CommitsCount
+}
+
+func selectContributions(user github.User) int {
+	return user.ContributionCount
+}
+
+func selectPublicContributions(user github.User) int {
+	return user.PublicContributionCount
+}
+
 func YamlOutput(results github.GithubSearchResults, writer io.Writer, options top.Options) error {
 	users := GithubUserList(results.Users)
-	outputUsers := func(user []github.User, public_only bool) {
+	outputUsers := func(user []github.User, cs ContributionsSelector) {
 		for i, u := range user {
-			contributionCount := u.ContributionCount
-			if public_only {
-				contributionCount = u.PublicContributionCount
-			}
+			contributionCount := cs(u)
 			fmt.Fprintf(
 				writer,
 				`
@@ -80,13 +91,17 @@ func YamlOutput(results github.GithubSearchResults, writer io.Writer, options to
 		}
 	}
 
-	topPublic := users.TopPublic(options.Amount)
+	topPublic := users.TopCommits(options.Amount)
 	fmt.Fprintln(writer, "users:")
-	outputUsers(topPublic, true)
+	outputUsers(topPublic, selectCommits)
+
+	topContributions := users.TopPublic(options.Amount)
+	fmt.Fprintln(writer, "users_public_contributions:")
+	outputUsers(topContributions, selectPublicContributions)
 
 	topPrivate := users.TopPrivate(options.Amount)
 	fmt.Fprintln(writer, "\nprivate_users:")
-	outputUsers(topPrivate, false)
+	outputUsers(topPrivate, selectContributions)
 
 	outputOrganizations := func(orgs Organizations) {
 		for i, org := range orgs {
@@ -105,6 +120,8 @@ func YamlOutput(results github.GithubSearchResults, writer io.Writer, options to
 
 	fmt.Fprintln(writer, "\norganizations:")
 	outputOrganizations(topPublic.TopOrgs(10))
+	fmt.Fprintln(writer, "\npublic_contributions_organizations:")
+	outputOrganizations(topContributions.TopOrgs(10))
 	fmt.Fprintln(writer, "\nprivate_organizations:")
 	outputOrganizations(topPrivate.TopOrgs(10))
 
@@ -135,6 +152,12 @@ func clone(users GithubUserList) GithubUserList {
 
 type GithubUserList []github.User
 
+func (users GithubUserList) TopCommits(amount int) GithubUserList {
+	u := TopCommitsUsers(clone(users))
+	sort.Sort(u)
+	return trim(GithubUserList(u), amount)
+}
+
 func (users GithubUserList) TopPublic(amount int) GithubUserList {
 	u := TopPublicUsers(clone(users))
 	sort.Sort(u)
@@ -160,6 +183,20 @@ func (slice GithubUserList) MinFollowers() int {
 	return followers
 }
 
+type TopCommitsUsers GithubUserList
+
+func (slice TopCommitsUsers) Len() int {
+	return len(slice)
+}
+
+func (slice TopCommitsUsers) Less(i, j int) bool {
+	return slice[i].CommitsCount > slice[j].CommitsCount
+}
+
+func (slice TopCommitsUsers) Swap(i, j int) {
+	slice[i], slice[j] = slice[j], slice[i]
+}
+
 type TopPublicUsers GithubUserList
 
 func (slice TopPublicUsers) Len() int {