output both private and public contributions in YAML

Author: Lauri Piispanen

main.go

@@ -3,10 +3,11 @@ package main
 import (
 	"bufio"
 	"flag"
-	"github.com/lauripiispanen/most-active-github-users-counter/output"
-	"github.com/lauripiispanen/most-active-github-users-counter/top"
 	"log"
 	"os"
+
+	"github.com/lauripiispanen/most-active-github-users-counter/output"
+	"github.com/lauripiispanen/most-active-github-users-counter/top"
 )
 
 type arrayFlags []string
@@ -49,7 +50,8 @@ func main() {
 		log.Fatal("Unrecognized output format: ", *outputOpt)
 	}
 
-	data, err := top.GithubTop(top.Options{Token: *token, Locations: locations, Amount: *amount, ConsiderNum: *considerNum})
+	opts := top.Options{Token: *token, Locations: locations, Amount: *amount, ConsiderNum: *considerNum}
+	data, err := top.GithubTop(opts)
 
 	if err != nil {
 		log.Fatal(err)
@@ -67,7 +69,7 @@ func main() {
 		writer = bufio.NewWriter(os.Stdout)
 	}
 
-	err = format(data, writer)
+	err = format(data, writer, opts)
 	if err != nil {
 		log.Fatal(err)
 	}

output/output.go

@@ -4,16 +4,20 @@ import (
 	"encoding/csv"
 	"fmt"
 	"io"
+	"math"
+	"regexp"
+	"sort"
 	"strconv"
 	"strings"
 	"time"
 
+	"github.com/lauripiispanen/most-active-github-users-counter/github"
 	"github.com/lauripiispanen/most-active-github-users-counter/top"
 )
 
-type Format func(users top.GithubUsers, writer io.Writer) error
+type Format func(users GithubUserList, writer io.Writer, options top.Options) error
 
-func PlainOutput(users top.GithubUsers, writer io.Writer) error {
+func PlainOutput(users GithubUserList, writer io.Writer, options top.Options) error {
 	fmt.Fprintln(writer, "USERS\n--------")
 	for i, user := range users {
 		fmt.Fprintf(writer, "#%+v: %+v (%+v):%+v (%+v) %+v\n", i+1, user.Name, user.Login, user.ContributionCount, user.Company, strings.Join(user.Organizations, ","))
@@ -25,7 +29,7 @@ func PlainOutput(users top.GithubUsers, writer io.Writer) error {
 	return nil
 }
 
-func CsvOutput(users top.GithubUsers, writer io.Writer) error {
+func CsvOutput(users GithubUserList, writer io.Writer, options top.Options) error {
 	w := csv.NewWriter(writer)
 	if err := w.Write([]string{"rank", "name", "login", "contributions", "company", "organizations"}); err != nil {
 		return err
@@ -45,12 +49,16 @@ func CsvOutput(users top.GithubUsers, writer io.Writer) error {
 	return nil
 }
 
-func YamlOutput(users top.GithubUsers, writer io.Writer) error {
-	fmt.Fprintln(writer, "users:")
-	for i, user := range users {
-		fmt.Fprintf(
-			writer,
-			`
+func YamlOutput(users GithubUserList, writer io.Writer, options top.Options) error {
+	outputUsers := func(user []github.User, public_only bool) {
+		for i, u := range user {
+			contributionCount := u.ContributionCount
+			if public_only {
+				contributionCount = u.PublicContributionCount
+			}
+			fmt.Fprintf(
+				writer,
+				`
   - rank: %+v
     name: '%+v'
     login: '%+v'
@@ -59,30 +67,177 @@ func YamlOutput(users top.GithubUsers, writer io.Writer) error {
     company: '%+v'
     organizations: '%+v'
 `,
-			i+1,
-			strings.Replace(user.Name, "'", "''", -1),
-			strings.Replace(user.Login, "'", "''", -1),
-			user.AvatarURL,
-			user.ContributionCount,
-			strings.Replace(user.Company, "'", "''", -1),
-			strings.Replace(strings.Join(user.Organizations, ","), "'", "''", -1))
+				i+1,
+				strings.Replace(u.Name, "'", "''", -1),
+				strings.Replace(u.Login, "'", "''", -1),
+				u.AvatarURL,
+				contributionCount,
+				strings.Replace(u.Company, "'", "''", -1),
+				strings.Replace(strings.Join(u.Organizations, ","), "'", "''", -1))
+		}
 	}
-	fmt.Fprintln(writer, "\norganizations:")
 
-	for i, org := range users.TopOrgs(10) {
-		fmt.Fprintf(
-			writer,
-			`
+	topPublic := users.TopPublic(options.Amount)
+	fmt.Fprintln(writer, "public_users:")
+	outputUsers(topPublic, true)
+
+	topPrivate := users.TopPrivate(options.Amount)
+	fmt.Fprintln(writer, "\nprivate_users:")
+	outputUsers(topPrivate, false)
+
+	outputOrganizations := func(orgs Organizations) {
+		for i, org := range orgs {
+			fmt.Fprintf(
+				writer,
+				`
   - rank: %+v
     name: '%+v'
     membercount: %+v
 `,
-			i+1,
-			strings.Replace(org.Name, "'", "''", -1),
-			org.MemberCount)
+				i+1,
+				strings.Replace(org.Name, "'", "''", -1),
+				org.MemberCount)
+		}
 	}
 
+	fmt.Fprintln(writer, "\npublic_organizations:")
+	outputOrganizations(topPublic.TopOrgs(10))
+	fmt.Fprintln(writer, "\nprivate_organizations:")
+	outputOrganizations(topPrivate.TopOrgs(10))
+
 	fmt.Fprintf(writer, "generated: %+v\n", time.Now())
+	fmt.Fprintf(writer, "min_followers_required: %+v\n", users.MinFollowers())
 
 	return nil
 }
+
+var companyLogin = regexp.MustCompile(`^\@([a-zA-Z0-9]+)$`)
+
+func trim(users GithubUserList, numTop int) GithubUserList {
+	if numTop == 0 {
+		numTop = 256
+	}
+	if len(users) < numTop {
+		numTop = len(users)
+	}
+	return users[:numTop]
+}
+
+func clone(users GithubUserList) GithubUserList {
+	usersCloned := make(GithubUserList, len(users))
+	copy(usersCloned, users)
+	return usersCloned
+}
+
+type GithubUserList []github.User
+
+func (users GithubUserList) TopPublic(amount int) GithubUserList {
+	u := TopPublicUsers(clone(users))
+	sort.Sort(u)
+	return trim(GithubUserList(u), amount)
+}
+
+func (users GithubUserList) TopPrivate(amount int) GithubUserList {
+	u := TopPrivateUsers(clone(users))
+	sort.Sort(u)
+	return trim(GithubUserList(u), amount)
+}
+
+func (slice GithubUserList) MinFollowers() int {
+	if len(slice) == 0 {
+		return 0
+	}
+	followers := math.MaxInt32
+	for _, user := range slice {
+		if user.FollowerCount < followers {
+			followers = user.FollowerCount
+		}
+	}
+	return followers
+}
+
+type TopPublicUsers GithubUserList
+
+func (slice TopPublicUsers) Len() int {
+	return len(slice)
+}
+
+func (slice TopPublicUsers) Less(i, j int) bool {
+	return slice[i].PublicContributionCount > slice[j].PublicContributionCount
+}
+
+func (slice TopPublicUsers) Swap(i, j int) {
+	slice[i], slice[j] = slice[j], slice[i]
+}
+
+type TopPrivateUsers GithubUserList
+
+func (slice TopPrivateUsers) Len() int {
+	return len(slice)
+}
+
+func (slice TopPrivateUsers) Less(i, j int) bool {
+	return slice[i].ContributionCount > slice[j].ContributionCount
+}
+
+func (slice TopPrivateUsers) Swap(i, j int) {
+	slice[i], slice[j] = slice[j], slice[i]
+}
+
+type Organization struct {
+	Name        string
+	MemberCount int
+}
+
+type Organizations []Organization
+
+func (slice Organizations) Len() int {
+	return len(slice)
+}
+
+func (slice Organizations) Less(i, j int) bool {
+	return slice[i].MemberCount > slice[j].MemberCount
+}
+
+func (slice Organizations) Swap(i, j int) {
+	slice[i], slice[j] = slice[j], slice[i]
+}
+
+func (slice GithubUserList) TopOrgs(count int) Organizations {
+	orgsMap := make(map[string]int)
+	for _, user := range slice {
+		userOrgs := user.Organizations
+		orgMatches := companyLogin.FindStringSubmatch(strings.Trim(user.Company, " "))
+		if len(orgMatches) > 0 {
+			orgLogin := companyLogin.FindStringSubmatch(strings.Trim(user.Company, " "))[1]
+			if len(orgLogin) > 0 && !contains(userOrgs, orgLogin) {
+				userOrgs = append(userOrgs, orgLogin)
+			}
+		}
+
+		for _, o := range userOrgs {
+			org := strings.ToLower(o)
+			orgsMap[org] = orgsMap[org] + 1
+		}
+	}
+
+	orgs := Organizations{}
+
+	for k, v := range orgsMap {
+		orgs = append(orgs, Organization{Name: k, MemberCount: v})
+	}
+	sort.Sort(orgs)
+	if len(orgs) > count {
+		return orgs[:count]
+	}
+	return orgs
+}
+
+func contains(s []string, e string) bool {
+	for _, a := range s {
+		if a == e {
+			return true
+		}
+	}
+	return false
+}