change all references to bindownloader to bindown

WillAbides · WillAbides · commit 7a4dce719377 · 2019-11-25T14:04:34.000-06:00
diff --git a/.goreleaser.yml b/.goreleaser.yml
@@ -4,7 +4,7 @@ project_name: bindown
 release:
   github:
     owner: WillAbides
-    name: bindownloader
+    name: bindown
 before:
   hooks:
     - script/lint
diff --git a/bindown.go b/bindown.go
@@ -1,4 +1,4 @@
-package bindownloader
+package bindown
 
 import (
 	"bytes"
diff --git a/bindown_test.go b/bindown_test.go
@@ -1,4 +1,4 @@
-package bindownloader
+package bindown
 
 import (
 	"io/ioutil"
diff --git a/bootstrapper/main.sh b/bootstrapper/main.sh
@@ -1,13 +1,13 @@
-##/ this is the static part of bootstrap-bindownloader.sh
+##/ this is the static part of bootstrap-bindown.sh
 ##/ used in script/build-bootstrapper
 
 FORMAT=tar.gz
-GITHUB_DOWNLOAD=https://github.com/WillAbides/bindownloader/releases/download
+GITHUB_DOWNLOAD=https://github.com/WillAbides/bindown/releases/download
 
 usage() {
   this=$1
   cat <<EOT
-$this: download go binaries for WillAbides/bindownloader
+$this: download go binaries for WillAbides/bindown
 
 Usage: $this [-b] bindir [-d]
   -b sets bindir or installation directory, Defaults to ./bin
diff --git a/cmd/bindown/config.go b/cmd/bindown/config.go
@@ -9,7 +9,7 @@ import (
 	"path/filepath"
 
 	"github.com/alecthomas/kong"
-	"github.com/willabides/bindownloader"
+	"github.com/willabides/bindown"
 )
 
 var configKongVars = kong.Vars{
@@ -29,7 +29,7 @@ type configCmd struct {
 type configFmtCmd struct{}
 
 func (c configFmtCmd) Run() error {
-	config, err := bindownloader.LoadConfigFile(cli.Configfile)
+	config, err := bindown.LoadConfigFile(cli.Configfile)
 	if err != nil {
 		return err
 	}
@@ -45,7 +45,7 @@ type configUpdateChecksumsCmd struct {
 }
 
 func (d *configUpdateChecksumsCmd) Run(*kong.Context) error {
-	config, err := bindownloader.LoadConfigFile(cli.Configfile)
+	config, err := bindown.LoadConfigFile(cli.Configfile)
 	if err != nil {
 		return fmt.Errorf("error loading config from %q", cli.Configfile)
 	}
@@ -58,7 +58,7 @@ func (d *configUpdateChecksumsCmd) Run(*kong.Context) error {
 	}
 
 	for _, downloader := range downloaders {
-		err = downloader.UpdateChecksum(bindownloader.UpdateChecksumOpts{
+		err = downloader.UpdateChecksum(bindown.UpdateChecksumOpts{
 			DownloaderName: binary,
 			CellarDir:      cli.CellarDir,
 			TargetDir:      binDir,
@@ -81,11 +81,11 @@ type configValidateCmd struct {
 }
 
 func (d configValidateCmd) Run(kctx *kong.Context) error {
-	config, err := bindownloader.LoadConfigFile(cli.Configfile)
+	config, err := bindown.LoadConfigFile(cli.Configfile)
 	if err != nil {
 		return fmt.Errorf("error loading config from %q", cli.Configfile)
 	}
-	tmpDir, err := ioutil.TempDir("", "bindownloader")
+	tmpDir, err := ioutil.TempDir("", "bindown")
 	if err != nil {
 		return err
 	}
@@ -119,7 +119,7 @@ func (d configValidateCmd) Run(kctx *kong.Context) error {
 			return err
 		}
 
-		installOpts := bindownloader.InstallOpts{
+		installOpts := bindown.InstallOpts{
 			DownloaderName: binary,
 			TargetDir:      binDir,
 			Force:          true,
diff --git a/cmd/bindown/download.go b/cmd/bindown/download.go
@@ -6,7 +6,7 @@ import (
 	"runtime"
 
 	"github.com/alecthomas/kong"
-	"github.com/willabides/bindownloader"
+	"github.com/willabides/bindown"
 )
 
 var downloadKongVars = kong.Vars{
@@ -26,7 +26,7 @@ type downloadCmd struct {
 }
 
 func (d *downloadCmd) Run(*kong.Context) error {
-	config, err := bindownloader.LoadConfigFile(cli.Configfile)
+	config, err := bindown.LoadConfigFile(cli.Configfile)
 	if err != nil {
 		return fmt.Errorf("error loading config from %q", cli.Configfile)
 	}
@@ -41,7 +41,7 @@ os: %s
 arch: %s`, binary, d.OS, d.Arch)
 	}
 
-	installOpts := bindownloader.InstallOpts{
+	installOpts := bindown.InstallOpts{
 		DownloaderName: binary,
 		TargetDir:      binDir,
 		Force:          d.Force,
diff --git a/downloader.go b/downloader.go
@@ -1,4 +1,4 @@
-package bindownloader
+package bindown
 
 import (
 	"fmt"
@@ -182,7 +182,7 @@ got: %s`, targetFile, d.Checksum, result)
 type UpdateChecksumOpts struct {
 	// DownloaderName is the downloader's key from the config file
 	DownloaderName string
-	// CellarDir is the directory where downloads and extractions will be placed.  Default is a <TargetDir>/.bindownloader
+	// CellarDir is the directory where downloads and extractions will be placed.  Default is a <TargetDir>/.bindown
 	CellarDir string
 	// TargetDir is the directory where the executable should end up
 	TargetDir string
@@ -192,7 +192,7 @@ type UpdateChecksumOpts struct {
 func (d *Downloader) UpdateChecksum(opts UpdateChecksumOpts) error {
 	cellarDir := opts.CellarDir
 	if cellarDir == "" {
-		cellarDir = filepath.Join(opts.TargetDir, ".bindownloader")
+		cellarDir = filepath.Join(opts.TargetDir, ".bindown")
 	}
 
 	downloadDir := filepath.Join(cellarDir, "downloads", d.downloadsSubName())
@@ -221,7 +221,7 @@ func (d *Downloader) UpdateChecksum(opts UpdateChecksumOpts) error {
 type InstallOpts struct {
 	// DownloaderName is the downloader's key from the config file
 	DownloaderName string
-	// CellarDir is the directory where downloads and extractions will be placed.  Default is a <TargetDir>/.bindownloader
+	// CellarDir is the directory where downloads and extractions will be placed.  Default is a <TargetDir>/.bindown
 	CellarDir string
 	// TargetDir is the directory where the executable should end up
 	TargetDir string
@@ -242,7 +242,7 @@ func (d *Downloader) Install(opts InstallOpts) error {
 	d.setDefaultBinName(opts.DownloaderName)
 	cellarDir := opts.CellarDir
 	if cellarDir == "" {
-		cellarDir = filepath.Join(opts.TargetDir, ".bindownloader")
+		cellarDir = filepath.Join(opts.TargetDir, ".bindown")
 	}
 
 	downloadDir := filepath.Join(cellarDir, "downloads", d.downloadsSubName())
diff --git a/downloader_test.go b/downloader_test.go
@@ -1,4 +1,4 @@
-package bindownloader
+package bindown
 
 import (
 	"os"
diff --git a/go.mod b/go.mod
@@ -1,4 +1,4 @@
-module github.com/willabides/bindownloader
+module github.com/willabides/bindown
 
 go 1.12
 
diff --git a/script/release b/script/release
@@ -7,7 +7,7 @@ CDPATH="" cd -- "$(dirname -- "$(dirname -- "$0")")"
 make -s bin/goreleaser bin/semver-next
 
 GITHUB_SHA="${GITHUB_SHA:-"$(git rev-parse HEAD)"}"
-GITHUB_REPOSITORY="${GITHUB_REPOSITORY:-"WillAbides/bindownloader"}"
+GITHUB_REPOSITORY="${GITHUB_REPOSITORY:-"WillAbides/bindown"}"
 
 bin/semver-next "$GITHUB_REPOSITORY" -r "$GITHUB_SHA" --create-tag
 
diff --git a/script/upload-release-bootstrap b/script/upload-release-bootstrap
@@ -18,8 +18,8 @@ AUTH_HEADER="Authorization: token $GITHUB_TOKEN"
 
 TAG="$(grep "^TAG=" dist/bootstrap-bindown.sh | cut -d\" -f2)"
 
-release_id="$(curl -s -H "$AUTH_HEADER" "https://api.github.com/repos/WillAbides/bindownloader/releases/tags/$TAG" | jq .id)"
-upload_url="https://uploads.github.com/repos/WillAbides/bindownloader/releases/$release_id/assets?name=bootstrap-bindown.sh"
+release_id="$(curl -s -H "$AUTH_HEADER" "https://api.github.com/repos/WillAbides/bindown/releases/tags/$TAG" | jq .id)"
+upload_url="https://uploads.github.com/repos/WillAbides/bindown/releases/$release_id/assets?name=bootstrap-bindown.sh"
 echo "$upload_url"
 
 file_content="$(cat dist/bootstrap-bindown.sh)"
diff --git a/testhelper_test.go b/testhelper_test.go
@@ -1,4 +1,4 @@
-package bindownloader
+package bindown
 
 import (
 	"io/ioutil"
diff --git a/util.go b/util.go
@@ -1,4 +1,4 @@
-package bindownloader
+package bindown
 
 import (
 	"crypto/sha256"

Original file line number	Diff line number	Diff line change
`@@ -1,4 +1,4 @@`
`1`		`-package bindownloader`
	`1`	`+package bindown`
`2`	`2`
`3`	`3`	`import (`
`4`	`4`	`"bytes"`
Original file line number	Diff line number	Diff line change
`@@ -9,7 +9,7 @@ import (`
`9`	`9`	`"path/filepath"`
`10`	`10`
`11`	`11`	`"github.com/alecthomas/kong"`
`12`		`- "github.com/willabides/bindownloader"`
	`12`	`+ "github.com/willabides/bindown"`
`13`	`13`	`)`
`14`	`14`
`15`	`15`	`var configKongVars = kong.Vars{`
`@@ -29,7 +29,7 @@ type configCmd struct {`
`29`	`29`	`type configFmtCmd struct{}`
`30`	`30`
`31`	`31`	`func (c configFmtCmd) Run() error {`
`32`		`- config, err := bindownloader.LoadConfigFile(cli.Configfile)`
	`32`	`+ config, err := bindown.LoadConfigFile(cli.Configfile)`
`33`	`33`	`if err != nil {`
`34`	`34`	`return err`
`35`	`35`	`}`
`@@ -45,7 +45,7 @@ type configUpdateChecksumsCmd struct {`
`45`	`45`	`}`
`46`	`46`
`47`	`47`	`func (d configUpdateChecksumsCmd) Run(kong.Context) error {`
`48`		`- config, err := bindownloader.LoadConfigFile(cli.Configfile)`
	`48`	`+ config, err := bindown.LoadConfigFile(cli.Configfile)`
`49`	`49`	`if err != nil {`
`50`	`50`	`return fmt.Errorf("error loading config from %q", cli.Configfile)`
`51`	`51`	`}`
`@@ -58,7 +58,7 @@ func (d configUpdateChecksumsCmd) Run(kong.Context) error {`
`58`	`58`	`}`
`59`	`59`
`60`	`60`	`for _, downloader := range downloaders {`
`61`		`- err = downloader.UpdateChecksum(bindownloader.UpdateChecksumOpts{`
	`61`	`+ err = downloader.UpdateChecksum(bindown.UpdateChecksumOpts{`
`62`	`62`	`DownloaderName: binary,`
`63`	`63`	`CellarDir: cli.CellarDir,`
`64`	`64`	`TargetDir: binDir,`
`@@ -81,11 +81,11 @@ type configValidateCmd struct {`
`81`	`81`	`}`
`82`	`82`
`83`	`83`	`func (d configValidateCmd) Run(kctx *kong.Context) error {`
`84`		`- config, err := bindownloader.LoadConfigFile(cli.Configfile)`
	`84`	`+ config, err := bindown.LoadConfigFile(cli.Configfile)`
`85`	`85`	`if err != nil {`
`86`	`86`	`return fmt.Errorf("error loading config from %q", cli.Configfile)`
`87`	`87`	`}`
`88`		`- tmpDir, err := ioutil.TempDir("", "bindownloader")`
	`88`	`+ tmpDir, err := ioutil.TempDir("", "bindown")`
`89`	`89`	`if err != nil {`
`90`	`90`	`return err`
`91`	`91`	`}`
`@@ -119,7 +119,7 @@ func (d configValidateCmd) Run(kctx *kong.Context) error {`
`119`	`119`	`return err`
`120`	`120`	`}`
`121`	`121`
`122`		`- installOpts := bindownloader.InstallOpts{`
	`122`	`+ installOpts := bindown.InstallOpts{`
`123`	`123`	`DownloaderName: binary,`
`124`	`124`	`TargetDir: binDir,`
`125`	`125`	`Force: true,`
Original file line number	Diff line number	Diff line change
`@@ -6,7 +6,7 @@ import (`
`6`	`6`	`"runtime"`
`7`	`7`
`8`	`8`	`"github.com/alecthomas/kong"`
`9`		`- "github.com/willabides/bindownloader"`
	`9`	`+ "github.com/willabides/bindown"`
`10`	`10`	`)`
`11`	`11`
`12`	`12`	`var downloadKongVars = kong.Vars{`
`@@ -26,7 +26,7 @@ type downloadCmd struct {`
`26`	`26`	`}`
`27`	`27`
`28`	`28`	`func (d downloadCmd) Run(kong.Context) error {`
`29`		`- config, err := bindownloader.LoadConfigFile(cli.Configfile)`
	`29`	`+ config, err := bindown.LoadConfigFile(cli.Configfile)`
`30`	`30`	`if err != nil {`
`31`	`31`	`return fmt.Errorf("error loading config from %q", cli.Configfile)`
`32`	`32`	`}`
`@@ -41,7 +41,7 @@ os: %s`
`41`	`41`	arch: %s`, binary, d.OS, d.Arch)
`42`	`42`	`}`
`43`	`43`
`44`		`- installOpts := bindownloader.InstallOpts{`
	`44`	`+ installOpts := bindown.InstallOpts{`
`45`	`45`	`DownloaderName: binary,`
`46`	`46`	`TargetDir: binDir,`
`47`	`47`	`Force: d.Force,`
Original file line number	Diff line number	Diff line change
`@@ -1,4 +1,4 @@`
`1`		`-module github.com/willabides/bindownloader`
	`1`	`+module github.com/willabides/bindown`
`2`	`2`
`3`	`3`	`go 1.12`
`4`	`4`