New upstream version 0.5.0

Author: anthonyfok

.github/workflows/ci-test.yml

@@ -0,0 +1,52 @@
+name: CI Test
+
+on: [push, pull_request, workflow_dispatch]
+
+jobs:
+  ci-test:
+    runs-on: ubuntu-latest
+    if: "!contains(github.event.head_commit.message, '[ci skip]') && !contains(github.event.head_commit.message, '[skip ci]')"
+    strategy:
+      matrix:
+        go-version: ['1.15.x', '1.16.x', '1.17.x']
+    env:
+      GO111MODULE: on  # Needed for github.com/google/go-github/v38
+
+    steps:
+      - name: Checkout code
+        uses: actions/checkout@v2
+
+      - name: Install Go ${{ matrix.go-version }}
+        uses: actions/setup-go@v2
+        with:
+          go-version: ${{ matrix.go-version }}
+
+      - run: diff -u <(echo -n) <(gofmt -d -s .)
+
+      - run: go get -t -v ./...
+
+      - run: go test -v ./...
+
+      - run: go vet ./...
+
+      - name: apt install needed Debian packages
+        run: |
+          sudo eatmydata apt update
+          sudo eatmydata apt install git-buildpackage golang-any pristine-tar pandoc
+
+      - name: Generate man page from Markdown
+        run: pandoc -f markdown -t man -s dh-make-golang.md -o dh-make-golang.1
+
+      - name: dh-make-golang test run for "gh"
+        run: |
+          git config --global user.email "[email protected]"
+          git config --global user.name "dh-make-golang on GitHub"
+          mkdir -p _test-run
+          cd _test-run
+          ~/go/bin/dh-make-golang -type p -pristine-tar -program_package_name gh github.com/cli/cli
+
+      - name: Upload dh-make-golang test run as artifact
+        uses: actions/upload-artifact@v2
+        with:
+          name: dh-make-golang_test-run_go${{ matrix.go-version }}
+          path: _test-run

.gitignore

@@ -1,2 +1,4 @@
 dh-make-golang
 _build/
+*~
+*.sw[op]

.travis.yml

@@ -1,4 +1,4 @@
-[![Build Status](https://travis-ci.org/Debian/dh-make-golang.svg?branch=master)](https://travis-ci.org/Debian/dh-make-golang)
+![CI Test](https://github.com/anthonyfok/dh-make-golang/actions/workflows/ci-test.yml/badge.svg)
 
 dh-make-golang is a tool to automatically create Debian packaging for Go
 packages. Its goal is to automate away as much of the work as possible when

README.md

@@ -19,7 +19,7 @@ func execCreateSalsaProject(args []string) {
 	}
 
 	if err := fs.Parse(args); err != nil {
-		log.Fatal(err)
+		log.Fatalf("parse: %s", err)
 	}
 
 	if fs.NArg() != 1 {
@@ -38,7 +38,7 @@ func execCreateSalsaProject(args []string) {
 
 	resp, err := http.Post(u.String(), "", nil)
 	if err != nil {
-		log.Fatal(err)
+		log.Fatalf("http post: %s", err)
 	}
 	if got, want := resp.StatusCode, http.StatusOK; got != want {
 		b, _ := ioutil.ReadAll(resp.Body)

create_salsa_project.go

@@ -3,6 +3,7 @@ package main
 import (
 	"bytes"
 	"context"
+	"fmt"
 	"os/exec"
 	"strings"
 
@@ -22,17 +23,17 @@ func reformatForControl(raw string) string {
 func getLongDescriptionForGopkg(gopkg string) (string, error) {
 	owner, repo, err := findGitHubRepo(gopkg)
 	if err != nil {
-		return "", err
+		return "", fmt.Errorf("find github repo: %w", err)
 	}
 
 	rr, _, err := gitHub.Repositories.GetReadme(context.TODO(), owner, repo, nil)
 	if err != nil {
-		return "", err
+		return "", fmt.Errorf("get readme: %w", err)
 	}
 
 	content, err := rr.GetContent()
 	if err != nil {
-		return "", err
+		return "", fmt.Errorf("get content: %w", err)
 	}
 
 	// Supported filename suffixes are from
@@ -55,7 +56,7 @@ func getLongDescriptionForGopkg(gopkg string) (string, error) {
 	cmd.Stdin = bytes.NewBuffer(output)
 	out, err := cmd.Output()
 	if err != nil {
-		return "", err
+		return "", fmt.Errorf("fmt: %w", err)
 	}
 	return reformatForControl(strings.TrimSpace(string(out))), nil
 }

description.go

@@ -31,7 +31,8 @@ func get(gopath, repo string) error {
 	cmd := exec.Command("go", "get", "-d", "-t", repo+"/...")
 	cmd.Stderr = os.Stderr
 	cmd.Env = append([]string{
-		fmt.Sprintf("GOPATH=%s", gopath),
+		"GO111MODULE=off",
+		"GOPATH=" + gopath,
 	}, passthroughEnv()...)
 	return cmd.Run()
 }
@@ -49,47 +50,48 @@ func removeVendor(gopath string) (found bool, _ error) {
 		}
 		found = true
 		if err := os.RemoveAll(path); err != nil {
-			return err
+			return fmt.Errorf("remove all: %w", err)
 		}
 		return filepath.SkipDir
 	})
-	return found, err
+	return found, fmt.Errorf("walk: %w", err)
 }
 
 func estimate(importpath string) error {
 	// construct a separate GOPATH in a temporary directory
 	gopath, err := ioutil.TempDir("", "dh-make-golang")
 	if err != nil {
-		return err
+		return fmt.Errorf("create temp dir: %w", err)
 	}
 	defer os.RemoveAll(gopath)
 
 	if err := get(gopath, importpath); err != nil {
-		return err
+		return fmt.Errorf("go get: %w", err)
 	}
 
 	found, err := removeVendor(gopath)
 	if err != nil {
-		return err
+		return fmt.Errorf("remove vendor: %w", err)
 	}
 
 	if found {
 		// Fetch un-vendored dependencies
 		if err := get(gopath, importpath); err != nil {
-			return err
+			return fmt.Errorf("fetch un-vendored: go get: %w", err)
 		}
 	}
 
 	// Remove standard lib packages
 	cmd := exec.Command("go", "list", "std")
 	cmd.Stderr = os.Stderr
 	cmd.Env = append([]string{
-		fmt.Sprintf("GOPATH=%s", gopath),
+		"GO111MODULE=off",
+		"GOPATH=" + gopath,
 	}, passthroughEnv()...)
 
 	out, err := cmd.Output()
 	if err != nil {
-		return fmt.Errorf("%v: %v", cmd.Args, err)
+		return fmt.Errorf("go list std: args: %v; error: %w", cmd.Args, err)
 	}
 	stdlib := make(map[string]bool)
 	for _, line := range strings.Split(strings.TrimSpace(string(out)), "\n") {
@@ -185,7 +187,7 @@ func execEstimate(args []string) {
 
 	err := fs.Parse(args)
 	if err != nil {
-		log.Fatal(err)
+		log.Fatalf("parse args: %s", err)
 	}
 
 	if fs.NArg() != 1 {
@@ -196,6 +198,6 @@ func execEstimate(args []string) {
 	// TODO: support the -git_revision flag
 
 	if err := estimate(fs.Arg(0)); err != nil {
-		log.Fatal(err)
+		log.Fatalf("estimate: %s", err)
 	}
 }

estimate.go

@@ -1,9 +1,9 @@
 module github.com/Debian/dh-make-golang
 
-go 1.12
+go 1.13
 
 require (
-	github.com/google/go-github/v32 v32.1.0
+	github.com/google/go-github/v38 v38.1.0
 	github.com/gregjones/httpcache v0.0.0-20190611155906-901d90724c79
 	github.com/mattn/go-isatty v0.0.10
 	github.com/russross/blackfriday v1.5.2

go.mod

@@ -1,6 +1,8 @@
 github.com/golang/protobuf v1.3.2/go.mod h1:6lQm79b+lXiMfvg/cZm0SGofjICqVBUtrP5yJMmIC1U=
-github.com/google/go-github/v32 v32.1.0 h1:GWkQOdXqviCPx7Q7Fj+KyPoGm4SwHRh8rheoPhd27II=
-github.com/google/go-github/v32 v32.1.0/go.mod h1:rIEpZD9CTDQwDK9GDrtMTycQNA4JU3qBsCizh3q2WCI=
+github.com/google/go-cmp v0.5.6 h1:BKbKCqvP6I+rmFHt06ZmyQtvB8xAkWdhFyr0ZUNZcxQ=
+github.com/google/go-cmp v0.5.6/go.mod h1:v8dTdLbMG2kIc/vJvl+f65V22dbkXbowE6jgT/gNBxE=
+github.com/google/go-github/v38 v38.1.0 h1:C6h1FkaITcBFK7gAmq4eFzt6gbhEhk7L5z6R3Uva+po=
+github.com/google/go-github/v38 v38.1.0/go.mod h1:cStvrz/7nFr0FoENgG6GLbp53WaelXucT+BBz/3VKx4=
 github.com/google/go-querystring v1.0.0 h1:Xkwi/a1rcvNg1PPYe5vI8GbeBY/jrVuDX5ASuANWTrk=
 github.com/google/go-querystring v1.0.0/go.mod h1:odCYkC5MyYFN7vkCjXpyrEuKhc/BUO6wN/zVPAxq5ck=
 github.com/gregjones/httpcache v0.0.0-20190611155906-901d90724c79 h1:+ngKgrYPPJrOjhax5N+uePQ0Fh1Z7PheYoUI/0nzkPA=
@@ -24,4 +26,6 @@ golang.org/x/sys v0.0.0-20191008105621-543471e840be/go.mod h1:h1NjWce9XRLGQEsW7w
 golang.org/x/text v0.3.0/go.mod h1:NqM8EUOU14njkJ3fqMW+pc6Ldnwhi/IjpwHt7yyuwOQ=
 golang.org/x/tools v0.0.0-20190731163215-a81e99d7481f h1:vwy91pya0J00SsPf35DrwOUOe/76iE4RbegH6XWNn9I=
 golang.org/x/tools v0.0.0-20190731163215-a81e99d7481f/go.mod h1:jcCCGcm9btYwXyDqrUWc6MKQKKGJCWEQ3AfLSRIbEuI=
+golang.org/x/xerrors v0.0.0-20191204190536-9bdfabe68543 h1:E7g+9GITq07hpfrRu66IVDexMakfv52eLZ2CXBWiKr4=
+golang.org/x/xerrors v0.0.0-20191204190536-9bdfabe68543/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0=
 google.golang.org/appengine v1.1.0/go.mod h1:EbEs0AVv82hx2wNQdGPgUI5lhzA/G0D9YwlJXL52JkM=

go.sum

@@ -4,7 +4,7 @@ import (
 	"fmt"
 	"os"
 
-	"github.com/google/go-github/v32/github"
+	"github.com/google/go-github/v38/github"
 	"github.com/gregjones/httpcache"
 )