Compare commits
4 Commits
Author | SHA1 | Date |
---|---|---|
jolheiser | ea7a455d75 | |
John Olheiser | 3c1a19d31c | |
John Olheiser | 9222b99fd1 | |
John Olheiser | a02c1c96ea |
|
@ -0,0 +1,41 @@
|
|||
---
|
||||
kind: pipeline
|
||||
name: compliance
|
||||
trigger:
|
||||
event:
|
||||
- pull_request
|
||||
steps:
|
||||
- name: test
|
||||
pull: always
|
||||
image: golang:1.16
|
||||
commands:
|
||||
- make test
|
||||
- name: check
|
||||
pull: always
|
||||
image: golang:1.16
|
||||
commands:
|
||||
- make vet
|
||||
|
||||
---
|
||||
kind: pipeline
|
||||
name: release
|
||||
trigger:
|
||||
event:
|
||||
- push
|
||||
branch:
|
||||
- main
|
||||
steps:
|
||||
- name: build
|
||||
pull: always
|
||||
image: golang:1.16
|
||||
commands:
|
||||
- make build
|
||||
- name: gitea-release
|
||||
pull: always
|
||||
image: jolheiser/drone-gitea-main:latest
|
||||
settings:
|
||||
token:
|
||||
from_secret: gitea_token
|
||||
base: https://git.jojodev.com
|
||||
files:
|
||||
- "git-get"
|
|
@ -2,4 +2,4 @@
|
|||
.idea
|
||||
|
||||
# Binaries
|
||||
/git-import*
|
||||
/git-get*
|
|
@ -1,23 +0,0 @@
|
|||
linters:
|
||||
enable:
|
||||
- deadcode
|
||||
- dogsled
|
||||
- dupl
|
||||
- errcheck
|
||||
- funlen
|
||||
- gocognit
|
||||
- goconst
|
||||
- gocritic
|
||||
- gocyclo
|
||||
- gofmt
|
||||
- golint
|
||||
- gosimple
|
||||
- govet
|
||||
- misspell
|
||||
- prealloc
|
||||
- staticcheck
|
||||
- structcheck
|
||||
- typecheck
|
||||
- unparam
|
||||
- unused
|
||||
- varcheck
|
82
Makefile
82
Makefile
|
@ -1,32 +1,13 @@
|
|||
DIST := dist
|
||||
GO ?= go
|
||||
SHASUM ?= shasum -a 256
|
||||
|
||||
ifneq ($(DRONE_TAG),)
|
||||
VERSION ?= $(subst v,,$(DRONE_TAG))
|
||||
LONG_VERSION ?= $(VERSION)
|
||||
else
|
||||
ifneq ($(DRONE_BRANCH),)
|
||||
VERSION ?= $(subst release/v,,$(DRONE_BRANCH))
|
||||
else
|
||||
VERSION ?= master
|
||||
endif
|
||||
LONG_VERSION ?= $(shell git describe --tags --always | sed 's/-/+/' | sed 's/^v//')
|
||||
endif
|
||||
|
||||
LDFLAGS := $(LDFLAGS) -X "main.Version=$(LONG_VERSION)"
|
||||
VERSION ?= $(shell git describe --tags --always | sed 's/-/+/' | sed 's/^v//')
|
||||
|
||||
.PHONY: build
|
||||
build:
|
||||
$(GO) build -ldflags '-s -w $(LDFLAGS)'
|
||||
$(GO) build -ldflags '-w -X "main.Version=$(VERSION)"' go.jolheiser.com/git-import/cmd/git-get
|
||||
|
||||
.PHONY: lint
|
||||
lint:
|
||||
@hash golangci-lint > /dev/null 2>&1; if [ $$? -ne 0 ]; then \
|
||||
export BINARY="golangci-lint"; \
|
||||
curl -sfL https://install.goreleaser.com/github.com/golangci/golangci-lint.sh | sh -s -- -b $(go env GOPATH)/bin v1.23.1; \
|
||||
fi
|
||||
golangci-lint run --timeout 5m
|
||||
.PHONY: install
|
||||
install:
|
||||
$(GO) install -ldflags '-w -X "main.Version=$(VERSION)"' go.jolheiser.com/git-import/cmd/git-get
|
||||
|
||||
.PHONY: fmt
|
||||
fmt:
|
||||
|
@ -34,53 +15,8 @@ fmt:
|
|||
|
||||
.PHONY: test
|
||||
test:
|
||||
$(GO) test -race ./...
|
||||
$(GO) test --race ./...
|
||||
|
||||
.PHONY: release
|
||||
release: release-dirs check-xgo release-windows release-linux release-darwin release-copy release-compress release-check
|
||||
|
||||
.PHONY: check-xgo
|
||||
check-xgo:
|
||||
@hash xgo > /dev/null 2>&1; if [ $$? -ne 0 ]; then \
|
||||
$(GO) get -u src.techknowlogick.com/xgo; \
|
||||
fi
|
||||
|
||||
.PHONY: release-dirs
|
||||
release-dirs:
|
||||
mkdir -p $(DIST)/binaries $(DIST)/release
|
||||
|
||||
.PHONY: release-windows
|
||||
release-windows:
|
||||
xgo -dest $(DIST)/binaries -ldflags '-linkmode external -extldflags "-static" $(LDFLAGS)' -targets 'windows/*' -out git-import-$(VERSION) .
|
||||
ifeq ($(CI),drone)
|
||||
cp /build/* $(DIST)/binaries
|
||||
endif
|
||||
|
||||
.PHONY: release-linux
|
||||
release-linux:
|
||||
xgo -dest $(DIST)/binaries -ldflags '-linkmode external -extldflags "-static" $(LDFLAGS)' -targets 'linux/amd64,linux/386,linux/arm-5,linux/arm-6,linux/arm64,linux/mips64le,linux/mips,linux/mipsle' -out git-import-$(VERSION) .
|
||||
ifeq ($(CI),drone)
|
||||
cp /build/* $(DIST)/binaries
|
||||
endif
|
||||
|
||||
.PHONY: release-darwin
|
||||
release-darwin:
|
||||
xgo -dest $(DIST)/binaries -tags 'netgo osusergo $(TAGS)' -ldflags '$(LDFLAGS)' -targets 'darwin/*' -out git-import-$(VERSION) .
|
||||
ifeq ($(CI),drone)
|
||||
cp /build/* $(DIST)/binaries
|
||||
endif
|
||||
|
||||
.PHONY: release-copy
|
||||
release-copy:
|
||||
cd $(DIST); for file in `find /build -type f -name "*"`; do cp $${file} ./release/; done;
|
||||
|
||||
.PHONY: release-check
|
||||
release-check:
|
||||
cd $(DIST)/release/; for file in `find . -type f -name "*"`; do echo "checksumming $${file}" && $(SHASUM) `echo $${file} | sed 's/^..//'` > $${file}.sha256; done;
|
||||
|
||||
.PHONY: release-compress
|
||||
release-compress:
|
||||
@hash gxz > /dev/null 2>&1; if [ $$? -ne 0 ]; then \
|
||||
$(GO) get -u github.com/ulikunitz/xz/cmd/gxz; \
|
||||
fi
|
||||
cd $(DIST)/release/; for file in `find . -type f -name "*"`; do echo "compressing $${file}" && gxz -k -9 $${file}; done;
|
||||
.PHONY: vet
|
||||
vet:
|
||||
$(GO) vet ./...
|
31
README.md
31
README.md
|
@ -4,40 +4,37 @@ Similar to `go-import`, a way to create vanity URLs for git repository paths.
|
|||
|
||||
Information on `go-import` can be found on the [golang website](https://golang.org/cmd/go/#hdr-Remote_import_paths)
|
||||
|
||||
`git-import` strives to work in a similar manner
|
||||
`git-import` strives to work similarly
|
||||
By providing a `meta` tag with appropriate information, `git-import` will clone the specified repository
|
||||
|
||||
The following is the `meta` tag for this repository, hosted on https://go.jolheiser.com/git-import with [Vanity](https://gitea.com/jolheiser/vanity)
|
||||
The following is the `meta` tag for this repository, hosted on https://go.jolheiser.com/git-import with [Vanity](https://git.jojodev.com/jolheiser/vanity)
|
||||
|
||||
```html
|
||||
<meta name="git-import" content="git-import https://gitea.com/jolheiser/git-import.git git@gitea.com:jolheiser/git-import.git" />
|
||||
<meta name="git-import" content="git-import https://git.jojodev.com/jolheiser/git-import.git git@git.jojodev.com:jolheiser/git-import.git" />
|
||||
```
|
||||
|
||||
## Installation (Git extension)
|
||||
|
||||
To install the Git extension:
|
||||
|
||||
`go install go.jolheiser.com/git-import/cmd/git-get`
|
||||
|
||||
## SSH
|
||||
`git-import` can set up SSH if applicable, however it must be ran with `GIT_SSH_COMMAND` set in order to configure the repository properly.
|
||||
`git-get` can set up SSH if applicable, however it must be run with `GIT_SSH_COMMAND` set in order to configure the repository properly.
|
||||
|
||||
## Examples
|
||||
|
||||
Clone this repository
|
||||
`git-import go.jolheiser.com/git-import`
|
||||
`git get go.jolheiser.com/git-import`
|
||||
|
||||
Clone this repository with SSH
|
||||
`GIT_SSH_COMMAND="/usr/bin/ssh -i /home/user/.ssh/id_rsa" git-import -s go.jolheiser.com/git-import`
|
||||
`GIT_SSH_COMMAND="/usr/bin/ssh -i /home/user/.ssh/id_rsa" git-import -ssh go.jolheiser.com/git-import`
|
||||
|
||||
Clone this repository, but clone into "import-git"
|
||||
`git-import go.jolheiser.com/git-import import-git`
|
||||
`git get -out import-git go.jolheiser.com/git-import`
|
||||
|
||||
Output the repository URL of this repo (without cloning)
|
||||
`git-import -d go.jolheiser.com/git-import`
|
||||
`git get -display go.jolheiser.com/git-import`
|
||||
|
||||
Output the repository SSH URL of this repo (without cloning)
|
||||
`git-import -d -s go.jolheiser.com/git-import`
|
||||
|
||||
## Bonus Points
|
||||
|
||||
Create a git alias for `git-import`
|
||||
```
|
||||
git config --global alias.get /path/to/git-import
|
||||
```
|
||||
and use like `git get go.jolheiser.com/git-import`
|
||||
`git get -display -ssh go.jolheiser.com/git-import`
|
|
@ -0,0 +1,167 @@
|
|||
package main
|
||||
|
||||
import (
|
||||
"context"
|
||||
"errors"
|
||||
"flag"
|
||||
"fmt"
|
||||
"net/http"
|
||||
"net/url"
|
||||
"os"
|
||||
"os/exec"
|
||||
"path/filepath"
|
||||
"strings"
|
||||
|
||||
"go.jolheiser.com/git-import"
|
||||
|
||||
"github.com/peterbourgon/ff/v3"
|
||||
"github.com/peterbourgon/ff/v3/ffcli"
|
||||
"go.jolheiser.com/beaver"
|
||||
)
|
||||
|
||||
var (
|
||||
Version = "develop"
|
||||
|
||||
fs = flag.NewFlagSet("git-get <import-url>", flag.ExitOnError)
|
||||
output = fs.String("out", "", "Path to clone into (default: git-import name)")
|
||||
author = fs.String("author", "", "Signature Author ($GIT_IMPORT_AUTHOR)")
|
||||
email = fs.String("email", "", "Signature Email ($GIT_IMPORT_EMAIL)")
|
||||
gpg = fs.String("gpg", "", "GPG key to sign with ($GIT_IMPORT_GPG)")
|
||||
noMeta = fs.Bool("no-meta", false, "Don't check for meta, just clone")
|
||||
display = fs.Bool("display", false, "Display URL instead of cloning")
|
||||
ssh = fs.Bool("ssh", false, "Use SSH if $GIT_SSH_COMMAND is set")
|
||||
insecure = fs.Bool("insecure", false, "Use HTTP instead of HTTPS by default")
|
||||
debug = fs.Bool("debug", false, "Debug logging")
|
||||
)
|
||||
|
||||
func main() {
|
||||
cmd := &ffcli.Command{
|
||||
Name: "git-get",
|
||||
ShortUsage: "git-get <import-url>",
|
||||
LongHelp: fmt.Sprintf("VERSION\n %s", Version),
|
||||
FlagSet: fs,
|
||||
Options: []ff.Option{
|
||||
ff.WithEnvVarPrefix("GIT_IMPORT"),
|
||||
},
|
||||
Exec: doImport,
|
||||
}
|
||||
|
||||
if err := cmd.ParseAndRun(context.Background(), os.Args[1:]); err != nil {
|
||||
beaver.Error(err)
|
||||
}
|
||||
}
|
||||
|
||||
func doImport(_ context.Context, _ []string) error {
|
||||
if *debug {
|
||||
beaver.Console.Level = beaver.DEBUG
|
||||
}
|
||||
|
||||
if fs.NArg() == 0 {
|
||||
fs.Usage()
|
||||
return nil
|
||||
}
|
||||
|
||||
raw := fs.Arg(0)
|
||||
if !strings.HasPrefix(raw, "http") {
|
||||
raw = fmt.Sprintf("https://%s", raw)
|
||||
}
|
||||
|
||||
u, err := url.Parse(raw)
|
||||
if err != nil {
|
||||
return err
|
||||
}
|
||||
if *insecure {
|
||||
u.Scheme = "http"
|
||||
}
|
||||
|
||||
var gitImport gimport.GitImport
|
||||
if *noMeta {
|
||||
p := strings.Split(u.Path, "/")
|
||||
gitImport = gimport.GitImport{
|
||||
Name: p[len(p)-1],
|
||||
HTTP: u.String(),
|
||||
SSH: fmt.Sprintf("git@%s:%s.git", u.Host, u.Path[1:]),
|
||||
}
|
||||
} else {
|
||||
u.RawQuery = "git-import=1"
|
||||
beaver.Debugf("Getting git-import from %s", u.String())
|
||||
res, err := http.Get(u.String())
|
||||
if err != nil {
|
||||
return fmt.Errorf("could not request URL `%s`: %v", u.String(), err)
|
||||
}
|
||||
defer res.Body.Close()
|
||||
gitImport, err = gimport.ParseMetaGitImport(res.Body)
|
||||
if err != nil {
|
||||
return fmt.Errorf("could not parse: %v", err)
|
||||
}
|
||||
}
|
||||
beaver.Debug(gitImport)
|
||||
|
||||
if *display {
|
||||
if *ssh {
|
||||
fmt.Println(gitImport.SSH)
|
||||
return nil
|
||||
}
|
||||
fmt.Println(gitImport.HTTP)
|
||||
return nil
|
||||
}
|
||||
return doClone(gitImport)
|
||||
}
|
||||
|
||||
func doClone(gitImport gimport.GitImport) error {
|
||||
if *output == "" {
|
||||
*output = gitImport.Name
|
||||
}
|
||||
|
||||
cmd := exec.Command("git", "clone", gitImport.HTTP, *output)
|
||||
if *ssh {
|
||||
if gitImport.SSH == "" {
|
||||
return errors.New("SSH was not provided by git-import")
|
||||
}
|
||||
if os.Getenv("GIT_SSH_COMMAND") == "" {
|
||||
return errors.New("no environment variable found for GIT_SSH_COMMAND")
|
||||
}
|
||||
cmd = exec.Command("git", "clone", gitImport.SSH, *output)
|
||||
}
|
||||
cmd.Stdout = os.Stdout
|
||||
cmd.Stderr = os.Stderr
|
||||
|
||||
if err := cmd.Run(); err != nil {
|
||||
return fmt.Errorf("could not clone: %v", err)
|
||||
}
|
||||
|
||||
if *ssh {
|
||||
if err := gitConfig("core.sshCommand", os.Getenv("GIT_SSH_COMMAND")); err != nil {
|
||||
beaver.Errorf("could not configure SSH: %v", err)
|
||||
}
|
||||
}
|
||||
|
||||
if *author != "" {
|
||||
if err := gitConfig("user.name", *author); err != nil {
|
||||
beaver.Errorf("could not configure author: %v", err)
|
||||
}
|
||||
}
|
||||
if *email != "" {
|
||||
if err := gitConfig("user.email", *email); err != nil {
|
||||
beaver.Errorf("could not configure email: %v", err)
|
||||
}
|
||||
}
|
||||
if *gpg != "" {
|
||||
if err := gitConfig("user.signingkey", *gpg); err != nil {
|
||||
beaver.Errorf("could not configure GPG key: %v", err)
|
||||
}
|
||||
if err := gitConfig("commit.gpgsign", "true"); err != nil {
|
||||
beaver.Errorf("could not configure GPG signing: %v", err)
|
||||
}
|
||||
}
|
||||
|
||||
return nil
|
||||
}
|
||||
|
||||
func gitConfig(key, value string) error {
|
||||
cmd := exec.Command("git", "config", "--local", key, value)
|
||||
cmd.Dir = filepath.Join(".", *output)
|
||||
cmd.Stdout = os.Stdout
|
||||
cmd.Stderr = os.Stderr
|
||||
return cmd.Run()
|
||||
}
|
6
go.mod
6
go.mod
|
@ -3,7 +3,7 @@ module go.jolheiser.com/git-import
|
|||
go 1.12
|
||||
|
||||
require (
|
||||
github.com/mattn/go-isatty v0.0.8 // indirect
|
||||
github.com/urfave/cli/v2 v2.1.1
|
||||
go.jolheiser.com/beaver v1.0.1
|
||||
github.com/peterbourgon/ff/v3 v3.0.0
|
||||
go.jolheiser.com/beaver v1.0.2
|
||||
golang.org/x/sys v0.0.0-20200909081042-eff7692f9009 // indirect
|
||||
)
|
||||
|
|
30
go.sum
30
go.sum
|
@ -1,24 +1,12 @@
|
|||
github.com/BurntSushi/toml v0.3.1/go.mod h1:xHWCNGjB5oqiDr8zfno3MHue2Ht5sIBksp03qcyfWMU=
|
||||
github.com/cpuguy83/go-md2man/v2 v2.0.0-20190314233015-f79a8a8ca69d h1:U+s90UTSYgptZMwQh2aRr3LuazLJIa+Pg3Kc1ylSYVY=
|
||||
github.com/cpuguy83/go-md2man/v2 v2.0.0-20190314233015-f79a8a8ca69d/go.mod h1:maD7wRr/U5Z6m/iR4s+kqSMx2CaBsrgA7czyZG/E6dU=
|
||||
github.com/mattn/go-isatty v0.0.8 h1:HLtExJ+uU2HOZ+wI0Tt5DtUDrx8yhUqDcp7fYERX4CE=
|
||||
github.com/mattn/go-isatty v0.0.8/go.mod h1:Iq45c/XA43vh69/j3iqttzPXn0bhXyGjM0Hdxcsrc5s=
|
||||
github.com/pmezard/go-difflib v1.0.0/go.mod h1:iKH77koFhYxTK1pcRnkKkqfTogsbg7gZNVY4sRDYZ/4=
|
||||
github.com/russross/blackfriday/v2 v2.0.1 h1:lPqVAte+HuHNfhJ/0LC98ESWRz8afy9tM/0RK8m9o+Q=
|
||||
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/urfave/cli v1.22.2 h1:gsqYFH8bb9ekPA12kRo0hfjngWQjkJPlN9R0N78BoUo=
|
||||
github.com/urfave/cli/v2 v2.1.1 h1:Qt8FeAtxE/vfdrLmR3rxR6JRE0RoVmbXu8+6kZtYU4k=
|
||||
github.com/urfave/cli/v2 v2.1.1/go.mod h1:SE9GqnLQmjVa0iPEY0f1w3ygNIYcIJ0OKPMoW2caLfQ=
|
||||
go.jolheiser.com/beaver v1.0.1 h1:gt3aGEr5Bj4ZjDF1g8t8OYOGRCRXGaanGR9CmXUxez8=
|
||||
go.jolheiser.com/beaver v1.0.1/go.mod h1:7X4F5+XOGSC3LejTShoBdqtRCnPWcnRgmYGmG3EKW8g=
|
||||
go.jolheiser.com/beaver v1.1.1 h1:WCbTD76qMzsaZ9EOZh8tTrjRKUFludYWmepXakTcnPQ=
|
||||
go.jolheiser.com/beaver v1.1.1/go.mod h1:InRbUdHTqDYNk0SB1GyO9nJRczk5gKOMmuwpyj6FlAM=
|
||||
golang.org/x/sys v0.0.0-20190222072716-a9d3bda3a223/go.mod h1:STP8DvDyc/dI5b8T5hshtkjS+E42TnysNCUPdjciGhY=
|
||||
golang.org/x/sys v0.0.0-20190710143415-6ec70d6a5542 h1:6ZQFf1D2YYDDI7eSwW8adlkkavTB9sw5I24FVtEvNUQ=
|
||||
golang.org/x/sys v0.0.0-20190710143415-6ec70d6a5542/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
|
||||
golang.org/x/sys v0.0.0-20190813064441-fde4db37ae7a h1:aYOabOQFp6Vj6W1F80affTUvO9UxmJRx8K0gsfABByQ=
|
||||
github.com/davecgh/go-spew v1.1.1/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38=
|
||||
github.com/pelletier/go-toml v1.6.0/go.mod h1:5N711Q9dKgbdkxHL+MEfF31hpT7l0S0s/t2kKREewys=
|
||||
github.com/peterbourgon/ff/v3 v3.0.0 h1:eQzEmNahuOjQXfuegsKQTSTDbf4dNvr/eNLrmJhiH7M=
|
||||
github.com/peterbourgon/ff/v3 v3.0.0/go.mod h1:UILIFjRH5a/ar8TjXYLTkIvSvekZqPm5Eb/qbGk6CT0=
|
||||
go.jolheiser.com/beaver v1.0.2 h1:KA2D6iO8MQhZi1nZYi/Chak/f1Cxfrs6b1XO623+Khk=
|
||||
go.jolheiser.com/beaver v1.0.2/go.mod h1:7X4F5+XOGSC3LejTShoBdqtRCnPWcnRgmYGmG3EKW8g=
|
||||
golang.org/x/sys v0.0.0-20190813064441-fde4db37ae7a/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
|
||||
golang.org/x/sys v0.0.0-20200909081042-eff7692f9009 h1:W0lCpv29Hv0UaM1LXb9QlBHLNP8UFfcKjblhVCWftOM=
|
||||
golang.org/x/sys v0.0.0-20200909081042-eff7692f9009/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
|
||||
gopkg.in/check.v1 v0.0.0-20161208181325-20d25e280405/go.mod h1:Co6ibVJAznAaIkqp8huTwlJQCZ016jof/cbN4VW5Yz0=
|
||||
gopkg.in/yaml.v2 v2.2.2/go.mod h1:hI93XBmqTisBFMUTm0b8Fm+jr3Dg1NNxqwp+5A1VGuI=
|
||||
gopkg.in/yaml.v2 v2.2.4/go.mod h1:hI93XBmqTisBFMUTm0b8Fm+jr3Dg1NNxqwp+5A1VGuI=
|
||||
|
|
|
@ -1,4 +1,4 @@
|
|||
package main
|
||||
package gimport
|
||||
|
||||
import (
|
||||
"encoding/xml"
|
||||
|
@ -16,11 +16,15 @@ var (
|
|||
)
|
||||
|
||||
type GitImport struct {
|
||||
ProjectName string
|
||||
HTTPS string
|
||||
Name string
|
||||
HTTP string
|
||||
SSH string
|
||||
}
|
||||
|
||||
func (g GitImport) String() string {
|
||||
return fmt.Sprintf("%s %s %s", g.Name, g.HTTP, g.SSH)
|
||||
}
|
||||
|
||||
// charsetReader returns a reader for the given charset.
|
||||
func charsetReader(charset string, input io.Reader) (io.Reader, error) {
|
||||
switch strings.ToLower(charset) {
|
||||
|
@ -31,9 +35,9 @@ func charsetReader(charset string, input io.Reader) (io.Reader, error) {
|
|||
}
|
||||
}
|
||||
|
||||
// parseMetaGoImports returns meta imports from the HTML in r.
|
||||
// ParseMetaGitImport returns meta imports from the HTML in r.
|
||||
// Parsing ends at the end of the <head> section or the beginning of the <body>.
|
||||
func parseMetaGitImport(r io.Reader) (gitImport GitImport, err error) {
|
||||
func ParseMetaGitImport(r io.Reader) (gitImport GitImport, err error) {
|
||||
d := xml.NewDecoder(r)
|
||||
d.CharsetReader = charsetReader
|
||||
d.Strict = false
|
||||
|
@ -69,8 +73,8 @@ func parseMetaGitImport(r io.Reader) (gitImport GitImport, err error) {
|
|||
break
|
||||
}
|
||||
gitImport = GitImport{
|
||||
ProjectName: f[0],
|
||||
HTTPS: f[1],
|
||||
Name: f[0],
|
||||
HTTP: f[1],
|
||||
}
|
||||
if len(f) >= 3 {
|
||||
if !SSHRegex.MatchString(f[2]) {
|
||||
|
@ -81,7 +85,7 @@ func parseMetaGitImport(r io.Reader) (gitImport GitImport, err error) {
|
|||
}
|
||||
err = nil
|
||||
} else {
|
||||
err = fmt.Errorf("incorrect number of import arguments\n\n wanted: project_name https://www.myproject.com/repo [git@myproject.com:repo]\n got: %s", content)
|
||||
err = fmt.Errorf("incorrect number of import arguments\n\n wanted: project_name cloneHTTP://www.myproject.com/repo [git@myproject.com:repo]\n got: %s", content)
|
||||
}
|
||||
break
|
||||
}
|
|
@ -1,4 +1,4 @@
|
|||
package main
|
||||
package gimport
|
||||
|
||||
import (
|
||||
"fmt"
|
||||
|
@ -11,13 +11,13 @@ import (
|
|||
|
||||
var (
|
||||
name = "repo"
|
||||
https = "https://www.git.com/user/repo"
|
||||
ssh = "git@git.com:user/repo"
|
||||
cloneHTTP = "http://www.git.com/user/repo.git"
|
||||
cloneSSH = "git@git.com:user/repo.git"
|
||||
|
||||
tpl1 = `<html><head><meta name="git-import" content="repo https://www.git.com/user/repo" /></head><body></body></html>`
|
||||
tpl2 = `<html><head><meta name="git-import" content="repo https://www.git.com/user/repo git@git.com:user/repo" /></head><body></body></html>`
|
||||
tpl3 = `<html><head><meta name="git-import" content="repo git@git.com:user/repo" /></head><body></body></html>`
|
||||
tpl4 = `<html><head><meta name="git-import" content="repo https://www.git.com/user/repo https://www.git.com/user/repo" /></head><body></body></html>`
|
||||
tpl1 = `<html><head><meta name="git-import" content="repo http://www.git.com/user/repo.git" /></head><body></body></html>`
|
||||
tpl2 = `<html><head><meta name="git-import" content="repo http://www.git.com/user/repo.git git@git.com:user/repo.git" /></head><body></body></html>`
|
||||
tpl3 = `<html><head><meta name="git-import" content="repo git@git.com:user/repo.git" /></head><body></body></html>`
|
||||
tpl4 = `<html><head><meta name="git-import" content="repo http://www.git.com/user/repo.git http://www.git.com/user/repo.git" /></head><body></body></html>`
|
||||
h1 = handle1{}
|
||||
h2 = handle2{}
|
||||
h3 = handle3{}
|
||||
|
@ -37,12 +37,12 @@ func TestGitImport(t *testing.T) {
|
|||
value string
|
||||
err bool
|
||||
}{
|
||||
{name: "HTTPS 1", handler: h1, value: https},
|
||||
{name: "HTTPS 2", handler: h2, value: https},
|
||||
{name: "HTTPS 1", handler: h1, value: cloneHTTP},
|
||||
{name: "HTTPS 2", handler: h2, value: cloneHTTP},
|
||||
{name: "HTTPS 3", handler: h3, err: true},
|
||||
|
||||
{name: "SSH 1", handler: h1, ssh: true, value: ""},
|
||||
{name: "SSH 2", handler: h2, ssh: true, value: ssh},
|
||||
{name: "SSH 2", handler: h2, ssh: true, value: cloneSSH},
|
||||
{name: "SSH 4", handler: h4, ssh: true, err: true},
|
||||
}
|
||||
|
||||
|
@ -51,7 +51,7 @@ func TestGitImport(t *testing.T) {
|
|||
rec := httptest.NewRecorder()
|
||||
req, _ := http.NewRequest(http.MethodGet, "", nil)
|
||||
tc.handler.ServeHTTP(rec, req)
|
||||
gi, err := parseMetaGitImport(rec.Body)
|
||||
gi, err := ParseMetaGitImport(rec.Body)
|
||||
if err != nil {
|
||||
if tc.err {
|
||||
return
|
||||
|
@ -60,16 +60,16 @@ func TestGitImport(t *testing.T) {
|
|||
t.FailNow()
|
||||
}
|
||||
if tc.err {
|
||||
format := "GitImport.ProjectName: %s\nGitImport.HTTPS: %s\nGitImport.SSH: %s"
|
||||
formatted := fmt.Sprintf(format, gi.ProjectName, gi.HTTPS, gi.SSH)
|
||||
format := "GitImport.Name: %s\nGitImport.HTTP: %s\nGitImport.SSH: %s"
|
||||
formatted := fmt.Sprintf(format, gi.Name, gi.HTTP, gi.SSH)
|
||||
t.Logf("test-case should have produced an error\n%s", formatted)
|
||||
t.FailNow()
|
||||
}
|
||||
if gi.ProjectName != name {
|
||||
expected(t, name, gi.ProjectName)
|
||||
if gi.Name != name {
|
||||
expected(t, name, gi.Name)
|
||||
}
|
||||
if !tc.ssh && gi.HTTPS != tc.value {
|
||||
expected(t, tc.value, gi.HTTPS)
|
||||
if !tc.ssh && gi.HTTP != tc.value {
|
||||
expected(t, tc.value, gi.HTTP)
|
||||
t.FailNow()
|
||||
}
|
||||
if tc.ssh && gi.SSH != tc.value {
|
108
main.go
108
main.go
|
@ -1,108 +0,0 @@
|
|||
package main
|
||||
|
||||
import (
|
||||
"errors"
|
||||
"fmt"
|
||||
"github.com/urfave/cli/v2"
|
||||
"go.jolheiser.com/beaver"
|
||||
"net/http"
|
||||
"os"
|
||||
"os/exec"
|
||||
"strings"
|
||||
)
|
||||
|
||||
var Version = "develop"
|
||||
|
||||
func main() {
|
||||
app := cli.NewApp()
|
||||
app.Name = "git-import"
|
||||
app.Usage = "Import from vanity git URLs"
|
||||
app.Version = Version
|
||||
app.Flags = []cli.Flag{
|
||||
&cli.BoolFlag{
|
||||
Name: "display",
|
||||
Aliases: []string{"d"},
|
||||
Usage: "Display URL instead of cloning",
|
||||
},
|
||||
&cli.BoolFlag{
|
||||
Name: "ssh",
|
||||
Aliases: []string{"s"},
|
||||
Usage: "Use SSH if available",
|
||||
},
|
||||
}
|
||||
app.UseShortOptionHandling = true
|
||||
app.EnableBashCompletion = true
|
||||
app.Action = doImport
|
||||
err := app.Run(os.Args)
|
||||
if err != nil {
|
||||
beaver.Error(err)
|
||||
}
|
||||
}
|
||||
|
||||
func doImport(ctx *cli.Context) error {
|
||||
if ctx.NArg() < 1 {
|
||||
return errors.New("must specify an import URL")
|
||||
}
|
||||
importURL := ctx.Args().First()
|
||||
if !strings.HasPrefix(importURL, "https") {
|
||||
importURL = fmt.Sprintf("http://%s", importURL)
|
||||
}
|
||||
|
||||
res, err := http.Get(importURL)
|
||||
if err != nil {
|
||||
return fmt.Errorf("could not request URL `%s`: %v", importURL, err)
|
||||
}
|
||||
defer res.Body.Close()
|
||||
|
||||
gitImport, err := parseMetaGitImport(res.Body)
|
||||
if err != nil {
|
||||
return fmt.Errorf("could not parse: %v", err)
|
||||
}
|
||||
|
||||
if ctx.Bool("display") {
|
||||
if ctx.Bool("ssh") {
|
||||
fmt.Println(gitImport.SSH)
|
||||
return nil
|
||||
}
|
||||
fmt.Println(gitImport.HTTPS)
|
||||
return nil
|
||||
}
|
||||
return doClone(ctx, gitImport)
|
||||
}
|
||||
|
||||
func doClone(ctx *cli.Context, gitImport GitImport) error {
|
||||
projectName := gitImport.ProjectName
|
||||
if ctx.NArg() > 1 {
|
||||
projectName = ctx.Args().Get(1)
|
||||
}
|
||||
|
||||
cmd := exec.Command("git", "clone", gitImport.HTTPS, projectName)
|
||||
if ctx.Bool("ssh") {
|
||||
if gitImport.SSH == "" {
|
||||
return errors.New("SSH was not provided by git-import")
|
||||
}
|
||||
if os.Getenv("GIT_SSH_COMMAND") == "" {
|
||||
return errors.New("no environment variable found for GIT_SSH_COMMAND")
|
||||
}
|
||||
cmd = exec.Command("git", "clone", gitImport.SSH, projectName)
|
||||
}
|
||||
cmd.Stdout = os.Stdout
|
||||
cmd.Stderr = os.Stderr
|
||||
|
||||
if err := cmd.Run(); err != nil {
|
||||
return fmt.Errorf("could not clone: %v", err)
|
||||
}
|
||||
|
||||
if ctx.Bool("ssh") {
|
||||
if err := os.Chdir(projectName); err != nil {
|
||||
return fmt.Errorf("could not change to `%s` directory. Git config will not store SSH command", projectName)
|
||||
}
|
||||
cmd := exec.Command("git", "config", "--local", "core.sshCommand", os.Getenv("GIT_SSH_COMMAND"))
|
||||
cmd.Stdout = os.Stdout
|
||||
cmd.Stderr = os.Stderr
|
||||
if err := cmd.Run(); err != nil {
|
||||
return fmt.Errorf("could not configure SSH: %v", err)
|
||||
}
|
||||
}
|
||||
return nil
|
||||
}
|
Loading…
Reference in New Issue