Abstracted NuGet handling to utilities package

Author: Sam Shelton

go.mod

@@ -1,9 +1,9 @@
-module github.com/soloworks/go-nuget
+module github.com/soloworks/go-nuget-cli
 
 go 1.13
 
 require (
-	github.com/cpuguy83/go-md2man/v2 v2.0.0 // indirect
+	github.com/soloworks/go-nuget v1.0.0
 	github.com/soloworks/go-nuspec v0.3.0
 	github.com/urfave/cli v1.22.1
 )

go.sum

@@ -9,6 +9,9 @@ github.com/russross/blackfriday/v2 v2.0.1 h1:lPqVAte+HuHNfhJ/0LC98ESWRz8afy9tM/0
 github.com/russross/blackfriday/v2 v2.0.1/go.mod h1:+Rmxgy9KzJVeS9/2gXHxylqXiyQDYRxCVz55jmeOWTM=
 github.com/shurcooL/sanitized_anchor_name v1.0.0 h1:PdmoCO6wvbs+7yrJyMORt4/BmY5IYyJwS/kOiWx8mHo=
 github.com/shurcooL/sanitized_anchor_name v1.0.0/go.mod h1:1NzhyTcUVG4SuEtjjoZeVRXNmyL/1OwPU0+IJeTBvfc=
+github.com/soloworks/go-nuget v1.0.0 h1:KMFgIWPKtC12rUeh9QtqSt9Z1S/DVSh+nzWcx8Y5ZBE=
+github.com/soloworks/go-nuget v1.0.0/go.mod h1:IqUp1+6g/kBxoROxkBFtlT62JtAuaEM6u4bquZq5dd8=
+github.com/soloworks/go-nuspec v0.1.0/go.mod h1:mLMhXDLZHIjX/90kJfhlt51RgJrYzj7LdgxqLI3zxl0=
 github.com/soloworks/go-nuspec v0.3.0 h1:guoIL3K13UkjjriTqXV6Xfs1PVcLLib3X4E1fTlm26U=
 github.com/soloworks/go-nuspec v0.3.0/go.mod h1:mLMhXDLZHIjX/90kJfhlt51RgJrYzj7LdgxqLI3zxl0=
 github.com/urfave/cli v1.22.1 h1:+mkCCcOFKPnCmVYVcURKps1Xe+3zP90gSYGNfRkjoIY=

main.go

@@ -2,7 +2,6 @@ package main
 
 import (
 	"log"
-	"math/rand"
 	"os"
 	"strconv"
 	"time"
@@ -14,16 +13,6 @@ import (
 var version string = "0.0.0.0-master"
 var compiled string = "1262304000" // 01/01/2010 @ 12:00am
 
-const letterBytes = "abcdef0123456789"
-
-func randomString(n int) string {
-	b := make([]byte, n)
-	for i := range b {
-		b[i] = letterBytes[rand.Intn(len(letterBytes))]
-	}
-	return string(b)
-}
-
 func checkError(e error) {
 	if e != nil {
 		println(e.Error())

pack.go

@@ -1,33 +1,18 @@
 package main
 
 import (
-	"archive/zip"
-	"bytes"
 	"errors"
 	"fmt"
 	"io/ioutil"
 	"log"
 	"os"
 	"path/filepath"
 
+	nuget "github.com/soloworks/go-nuget"
 	nuspec "github.com/soloworks/go-nuspec"
 	"github.com/urfave/cli"
 )
 
-func archiveFile(fn string, w *zip.Writer, b []byte) {
-
-	// Check and convert filepath to `/` if required
-	fn = filepath.ToSlash(fn)
-
-	// Create the file in the zip
-	f, err := w.Create(fn)
-	checkError(err)
-
-	// Write .nuspec bytes to file
-	_, err = f.Write([]byte(b))
-	checkError(err)
-}
-
 func cliPackNupkg(c *cli.Context) error {
 
 	// Get filename from command line
@@ -61,7 +46,7 @@ func cliPackNupkg(c *cli.Context) error {
 		outputPath = op
 	}
 
-	b, err := PackNupkg(ns, basePath, outputPath)
+	b, err := nuget.PackNupkg(ns, basePath, outputPath)
 	checkError(err)
 
 	// Override Version if option is set
@@ -87,116 +72,3 @@ func cliPackNupkg(c *cli.Context) error {
 
 	return nil
 }
-
-// PackNupkg produces a .nupkg file in byte format
-func PackNupkg(ns *nuspec.NuSpec, basePath string, outputPath string) ([]byte, error) {
-
-	// Assume filename from ID
-	nsfilename := ns.Meta.ID + ".nuspec"
-
-	// Create a buffer to write our archive to.
-	buf := new(bytes.Buffer)
-
-	// Create a new zip archive
-	w := zip.NewWriter(buf)
-	defer w.Close()
-
-	// Create a new Contenttypes Structure
-	ct := NewContentTypes()
-
-	// Add .nuspec to Archive
-	b, err := ns.ToBytes()
-	checkError(err)
-	archiveFile(filepath.Base(nsfilename), w, b)
-	ct.Add(filepath.Ext(nsfilename))
-
-	// Process files
-	// If there are no file globs specified then
-	if len(ns.Files.File) == 0 {
-		// walk the basePath and zip up all found files. Everything.]
-		err = filepath.Walk(basePath, func(path string, info os.FileInfo, err error) error {
-			if !info.IsDir() && filepath.Base(path) != filepath.Base(nsfilename) {
-				// Open the file
-				x, err := os.Open(path)
-				checkError(err)
-				// Gather all contents
-				y, err := ioutil.ReadAll(x)
-				checkError(err)
-				// Set relative path for file in archive
-				p, err := filepath.Rel(basePath, path)
-				checkError(err)
-				// Store the file
-				archiveFile(p, w, y)
-				// Add extension to the Rels file
-				ct.Add(filepath.Ext(p))
-			}
-			return nil
-		})
-		checkError(err)
-	} else {
-		// For each of the specified globs, get files an put in target
-		for _, f := range ns.Files.File {
-			// Apply glob, cater for
-			matches, err := filepath.Glob(filepath.ToSlash(filepath.Join(basePath, f.Source)))
-			checkError(err)
-			for _, m := range matches {
-				info, err := os.Stat(m)
-				if !info.IsDir() && filepath.Base(m) != filepath.Base(nsfilename) {
-					// Open the file
-					x, err := os.Open(m)
-					checkError(err)
-					// Gather all contents
-					y, err := ioutil.ReadAll(x)
-					checkError(err)
-					// Set relative path for file in archive
-					p, err := filepath.Rel(basePath, m)
-					checkError(err)
-					// Overide path if Target is set
-					if f.Target != "" {
-						p = filepath.Join(f.Target, filepath.Base(m))
-					}
-					// Store the file
-					archiveFile(p, w, y)
-					// Add extension to the Rels file
-					ct.Add(filepath.Ext(p))
-				}
-				checkError(err)
-			}
-		}
-	}
-
-	// Create and add .psmdcp file to Archive
-	pf := NewPsmdcpFile()
-	pf.Creator = ns.Meta.Authors
-	pf.Description = ns.Meta.Description
-	pf.Identifier = ns.Meta.ID
-	pf.Version = ns.Meta.Version
-	pf.Keywords = ns.Meta.Tags
-	pf.LastModifiedBy = "go-nuget"
-	b, err = pf.ToBytes()
-	checkError(err)
-	pfn := "package/services/metadata/core-properties/" + randomString(32) + ".psmdcp"
-	archiveFile(pfn, w, b)
-	ct.Add(filepath.Ext(pfn))
-
-	// Create and add .rels to Archive
-	rf := NewRelFile()
-	rf.Add("http://schemas.microsoft.com/packaging/2010/07/manifest", "/"+filepath.Base(nsfilename))
-	rf.Add("http://schemas.openxmlformats.org/package/2006/relationships/metadata/core-properties", pfn)
-
-	b, err = rf.ToBytes()
-	checkError(err)
-	archiveFile(filepath.Join("_rels", ".rels"), w, b)
-	ct.Add(filepath.Ext(".rels"))
-
-	// Add [Content_Types].xml to Archive
-	b, err = ct.ToBytes()
-	checkError(err)
-	archiveFile(`[Content_Types].xml`, w, b)
-
-	// Close the zipwriter
-	w.Close()
-
-	// Return
-	return buf.Bytes(), nil
-}

push.go

@@ -1,14 +1,12 @@
 package main
 
 import (
-	"bytes"
 	"errors"
 	"fmt"
 	"io/ioutil"
-	"mime/multipart"
 	"net/http"
-	"time"
 
+	nuget "github.com/soloworks/go-nuget"
 	"github.com/urfave/cli"
 )
 
@@ -27,7 +25,7 @@ func cliPushNupkg(c *cli.Context) error {
 	// print out for CLI
 	fmt.Println("Pushing " + filename + " to '" + c.String("Source") + "'...")
 	fmt.Println(" ", http.MethodPut, c.String("Source"))
-	status, dur, err := PushNupkg(fileContents, c.String("ApiKey"), c.String("Source"))
+	status, dur, err := nuget.PushNupkg(fileContents, c.String("ApiKey"), c.String("Source"))
 	checkError(err)
 
 	// print out for CLI
@@ -43,45 +41,3 @@ func cliPushNupkg(c *cli.Context) error {
 	// Return Ok
 	return nil
 }
-
-// PushNupkg PUTs a .nupkg binary to a NuGet Repository
-func PushNupkg(fileContents []byte, apiKey string, host string) (int, int64, error) {
-
-	// If no Source provided, exit
-	if host == "" {
-		return 0, 0, errors.New("Error: Please specify a Source/Host")
-	}
-
-	// Create MultiPart Writer
-	body := new(bytes.Buffer)
-	w := multipart.NewWriter(body)
-	// Create new File part
-	p, err := w.CreateFormFile("package", "package.nupkg")
-	checkError(err)
-	// Write contents to part
-	_, err = p.Write(fileContents)
-	checkError(err)
-	// Close the writer
-	err = w.Close()
-	checkError(err)
-
-	// Create new PUT request
-	request, err := http.NewRequest(http.MethodPut, host, body)
-	checkError(err)
-	// Add the ApiKey if supplied
-	if apiKey != "" {
-		request.Header.Add("X-Nuget-Apikey", apiKey)
-	}
-	// Add the Content Type header from the reader - includes boundary
-	request.Header.Add("Content-Type", w.FormDataContentType())
-
-	// Push to the server
-	startTime := time.Now()
-	client := &http.Client{}
-	resp, err := client.Do(request)
-	checkError(err)
-	duration := time.Now().Sub(startTime)
-
-	// Return Results
-	return resp.StatusCode, duration.Milliseconds(), nil
-}

spec.go

@@ -6,9 +6,8 @@ import (
 	"io/ioutil"
 	"os"
 	"os/user"
-	"time"
 
-	nuspec "github.com/soloworks/go-nuspec"
+	nuget "github.com/soloworks/go-nuget"
 	"github.com/urfave/cli"
 )
 
@@ -19,7 +18,7 @@ func cliSampleNuSpec(c *cli.Context) error {
 	checkError(err)
 
 	// Get the NuSpec
-	ns := SampleNuSpec(c.Args().First(), user.Name)
+	ns := nuget.SampleNuSpec(c.Args().First(), user.Name)
 
 	// Set filename string
 	fn := ns.Meta.ID + ".nuspec"
@@ -44,33 +43,3 @@ func cliSampleNuSpec(c *cli.Context) error {
 
 	return nil
 }
-
-// SampleNuSpec returns a populated sample NuSpec struct
-func SampleNuSpec(id string, user string) *nuspec.NuSpec {
-
-	// Create a new structure
-	n := nuspec.New()
-
-	// Populate Defaults
-	n.Meta.ID = "Package"
-	n.Meta.Version = "1.0.0"
-	n.Meta.Authors = user
-	n.Meta.Owners = user
-	n.Meta.LicenseURL = "http://LICENSE_URL_HERE_OR_DELETE_THIS_LINE"
-	n.Meta.ProjectURL = "http://LICENSE_URL_HERE_OR_DELETE_THIS_LINE"
-	n.Meta.IconURL = "http://LICENSE_URL_HERE_OR_DELETE_THIS_LINE"
-	n.Meta.ReqLicenseAccept = false
-	n.Meta.Description = "Package Description"
-	n.Meta.ReleaseNotes = "Summary of changes made in this release of the package."
-	n.Meta.Copyright = "Copyright " + time.Now().Format("2006")
-	n.Meta.Tags = "Tag1 Tag2"
-	d := nuspec.Dependency{ID: "SampleDependency", Version: "1.0"}
-	n.Meta.Dependencies.Dependency = append(n.Meta.Dependencies.Dependency, d)
-
-	// Override package ID if present
-	if id != "" {
-		n.Meta.ID = id
-	}
-
-	return n
-}