add documentation

This commit is contained in:
David 2021-05-09 17:25:23 -04:00
parent 1ee89cad34
commit 573de70682
5 changed files with 45 additions and 17 deletions

5
pkg/cache/cache.go vendored
View File

@ -2,11 +2,13 @@ package cache
import "git.yetaga.in/alazyreader/libyear/pkg/libyear" import "git.yetaga.in/alazyreader/libyear/pkg/libyear"
// Cache isn't concurrency-safe, but we don't care about that right now // Cache holds maps of strings to Info structs.
// It isn't concurrency-safe, but we don't care about that right now.
type Cache struct { type Cache struct {
items map[string]libyear.Info items map[string]libyear.Info
} }
// Get retrives an Info struct from the cache, if it exists.
func (c *Cache) Get(k string) libyear.Info { func (c *Cache) Get(k string) libyear.Info {
i, ok := c.items[k] i, ok := c.items[k]
if ok { if ok {
@ -15,6 +17,7 @@ func (c *Cache) Get(k string) libyear.Info {
return libyear.Info{} return libyear.Info{}
} }
// Set adds an Info struct to the cache.
func (c *Cache) Set(k string, v libyear.Info) { func (c *Cache) Set(k string, v libyear.Info) {
if c.items == nil { if c.items == nil {
c.items = make(map[string]libyear.Info) c.items = make(map[string]libyear.Info)

View File

@ -7,26 +7,23 @@ import (
"golang.org/x/mod/modfile" "golang.org/x/mod/modfile"
) )
type logger interface { // GoMod represents a Go Modules parser.
Logf(f string, s ...interface{}) // Running LoadAndComputePairs with a filename will return a slice of parsed dependencies.
Debugf(f string, s ...interface{})
}
type GoMod struct { type GoMod struct {
IncludeIndirect bool IncludeIndirect bool
ProxyLoader Queryer ProxyLoader Queryer
Logger logger Logger logger
} }
func isReplaced(module string, replaces []*modfile.Replace) bool { // logger is an extremely simple leveled logger
for i := range replaces { type logger interface {
if module == replaces[i].Old.Path { Logf(f string, s ...interface{})
return true Debugf(f string, s ...interface{})
}
}
return false
} }
// LoadAndComputePairs takes a filename of a go.mod file,
// runs the resolution algorithm in the provided Querier,
// and returns parsed pairs of dependencies and their latest versions.
func (g *GoMod) LoadAndComputePairs(filename string) ([]libyear.Pair, error) { func (g *GoMod) LoadAndComputePairs(filename string) ([]libyear.Pair, error) {
b, err := os.ReadFile(filename) b, err := os.ReadFile(filename)
if err != nil { if err != nil {
@ -59,3 +56,12 @@ func (g *GoMod) LoadAndComputePairs(filename string) ([]libyear.Pair, error) {
} }
return pairs, nil return pairs, nil
} }
func isReplaced(module string, replaces []*modfile.Replace) bool {
for i := range replaces {
if module == replaces[i].Old.Path {
return true
}
}
return false
}

View File

@ -13,6 +13,7 @@ import (
"git.yetaga.in/alazyreader/libyear/pkg/libyear" "git.yetaga.in/alazyreader/libyear/pkg/libyear"
) )
// A Queryer holds settings for a
type Queryer struct { type Queryer struct {
Root string Root string
Client http.Client Client http.Client
@ -25,11 +26,19 @@ type majorVersion struct {
version int version int
} }
// GetLatestVersion returns the "latest" major version of a module,
// jumping across MVS boundaries:
// i.e. github.com/foo/bar => github.com/foo/bar/v2 in the case of one version bump
// github.com/foo/baz/v2 => github.com/foo/baz/v6 in the case of a large jump
// github.com/foo/quuz/v2 => github.com/foo/quuz/v2 in the case of no jump at all.
func (q *Queryer) GetLatestVersion(module string) libyear.Info { func (q *Queryer) GetLatestVersion(module string) libyear.Info {
latestMod := q.findLatestMajorVersion(module) latestMod := q.findLatestMajorVersion(module)
return q.makeProxyRequest(latestMod + "/@latest") return q.makeProxyRequest(latestMod + "/@latest")
} }
// GetVersion returns the proxy's information about a given version of a module.
// `module` in this case is a fully-disambiguated MVS name (github.com/foo/bar/v2),
// and `version` is a version identifier as defined in `https://blog.golang.org/publishing-go-modules#TOC_3.`
func (q *Queryer) GetVersion(module string, version string) libyear.Info { func (q *Queryer) GetVersion(module string, version string) libyear.Info {
if !strings.HasPrefix(version, "v") { if !strings.HasPrefix(version, "v") {
return libyear.Info{ return libyear.Info{
@ -44,9 +53,6 @@ func (q *Queryer) GetVersion(module string, version string) libyear.Info {
} }
// given a module, return the "latest" major version of that module, fully defined // given a module, return the "latest" major version of that module, fully defined
// i.e. github.com/foo/bar => github.com/foo/bar/v2 in the case of one version bump
// github.com/foo/baz/v2 => github.com/foo/baz/v6 in the case of a large jump
// github.com/foo/quuz/v2 => github.com/foo/quuz/v2 in the case of no jump at all!
func (q *Queryer) findLatestMajorVersion(module string) string { func (q *Queryer) findLatestMajorVersion(module string) string {
for { for {
nextModule := incrementMajorVersion(module) nextModule := incrementMajorVersion(module)
@ -58,6 +64,7 @@ func (q *Queryer) findLatestMajorVersion(module string) string {
} }
} }
// handle calling the go module proxy
func (q *Queryer) makeProxyRequest(mod string) libyear.Info { func (q *Queryer) makeProxyRequest(mod string) libyear.Info {
if q.Root == "" { if q.Root == "" {
q.Root = "https://proxy.golang.org/" q.Root = "https://proxy.golang.org/"

View File

@ -5,17 +5,20 @@ import (
"time" "time"
) )
// Info defines a version and a commit time for that version
type Info struct { type Info struct {
Version string // version string Version string // version string
Time time.Time // commit time Time time.Time // commit time
} }
// Pair is a set of versions for a dependency (current and newest possible)
type Pair struct { type Pair struct {
Name string Name string
Latest Info Latest Info
Current Info Current Info
} }
// Calc returns the summed time distance (as a time.Duration) between a set of Pairs of modules.
// TODO: sum can only represent ~290 years before overflowing, but we don't actually need nanosecond precision! // TODO: sum can only represent ~290 years before overflowing, but we don't actually need nanosecond precision!
// Probably worth switching to hour-based summing here. // Probably worth switching to hour-based summing here.
func Calc(p ...Pair) time.Duration { func Calc(p ...Pair) time.Duration {
@ -26,6 +29,7 @@ func Calc(p ...Pair) time.Duration {
return sum return sum
} }
// DecimalYear conversts a time.Duration (which is in nsec) to a two-decimal-place count of years.
func DecimalYear(d time.Duration) string { func DecimalYear(d time.Duration) string {
return fmt.Sprintf("%.2f", float64(d.Truncate(time.Hour)/time.Hour)/float64(8760)) return fmt.Sprintf("%.2f", float64(d.Truncate(time.Hour)/time.Hour)/float64(8760))
} }

View File

@ -6,6 +6,7 @@ import (
"os" "os"
) )
// Log provices a simple leveled logger
type Log struct { type Log struct {
quiet bool quiet bool
debug bool debug bool
@ -13,6 +14,7 @@ type Log struct {
stdOut io.Writer stdOut io.Writer
} }
// NewLogger returns a new logger (duh) with the given levels and output writers
func NewLogger(quiet, debug bool, stdOut, errOut io.Writer) *Log { func NewLogger(quiet, debug bool, stdOut, errOut io.Writer) *Log {
if stdOut == nil { if stdOut == nil {
stdOut = os.Stdout stdOut = os.Stdout
@ -28,32 +30,38 @@ func NewLogger(quiet, debug bool, stdOut, errOut io.Writer) *Log {
} }
} }
// Error logs at the error level
func (l *Log) Error(s ...interface{}) { func (l *Log) Error(s ...interface{}) {
fmt.Fprint(l.errOut, s...) fmt.Fprint(l.errOut, s...)
} }
// Errorf uses fmt.Fprint formatting
func (l *Log) Errorf(f string, s ...interface{}) { func (l *Log) Errorf(f string, s ...interface{}) {
fmt.Fprint(l.errOut, s...) fmt.Fprintf(l.errOut, f, s...)
} }
// Log only logs if quiet is false
func (l *Log) Log(s ...interface{}) { func (l *Log) Log(s ...interface{}) {
if !l.quiet { if !l.quiet {
fmt.Fprint(l.stdOut, s...) fmt.Fprint(l.stdOut, s...)
} }
} }
// Logf uses fmt.Fprint fprmatting
func (l *Log) Logf(f string, s ...interface{}) { func (l *Log) Logf(f string, s ...interface{}) {
if !l.quiet { if !l.quiet {
fmt.Fprintf(l.stdOut, f, s...) fmt.Fprintf(l.stdOut, f, s...)
} }
} }
// Debug logs debug-level logs if debug is true
func (l *Log) Debug(s ...interface{}) { func (l *Log) Debug(s ...interface{}) {
if l.debug { if l.debug {
fmt.Fprint(l.errOut, s...) fmt.Fprint(l.errOut, s...)
} }
} }
// Debugf uses fmt.Fprint fprmatting
func (l *Log) Debugf(f string, s ...interface{}) { func (l *Log) Debugf(f string, s ...interface{}) {
if l.debug { if l.debug {
fmt.Fprintf(l.errOut, f, s...) fmt.Fprintf(l.errOut, f, s...)