Skip to content

Use go-git for Git operations #1

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 2 commits into from
May 4, 2021
Merged

Use go-git for Git operations #1

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
480cd88
Use go-git for Git operations
per1234 Apr 21, 2021
7dd8f69
Convert project to a Go module
per1234 Apr 21, 2021
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
10 changes: 4 additions & 6 deletions .github/workflows/test-go.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,11 +5,15 @@ on:
push:
paths:
- ".github/workflows/test-go.yml"
- "go.mod"
- "go.sum"
- "Taskfile.yml"
- "**.go"
pull_request:
paths:
- ".github/workflows/test-go.yml"
- "go.mod"
- "go.sum"
- "Taskfile.yml"
- "**.go"
workflow_dispatch:
Expand All @@ -34,9 +38,6 @@ jobs:
repo-token: ${{ secrets.GITHUB_TOKEN }}
version: 3.x

- name: Configure Git for go get access to private repo
run: git config --global url."https://${{ secrets.REPO_SCOPE_TOKEN }}:[email protected]/".insteadOf "https://github.com/"

- name: Build application
run: task go:build

Expand Down Expand Up @@ -65,8 +66,5 @@ jobs:
repo-token: ${{ secrets.GITHUB_TOKEN }}
version: 3.x

- name: Configure Git for go get access to private repo
run: git config --global url."https://${{ secrets.REPO_SCOPE_TOKEN }}:[email protected]/".insteadOf "https://github.com/"

- name: Run tests
run: task go:test
7 changes: 4 additions & 3 deletions .gitignore
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,9 +1,10 @@
token

bin
coverage_*.txt
libraries-repository-engine
src/code.google.com
src/github.com
libraries-repository-engine.exe
repository
repository.exe
test/arduino/cc/repository/libraries/testdata/test_db.json
config.json
repos.txt
Expand Down
28 changes: 3 additions & 25 deletions README.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,29 +2,7 @@ BUILD
----------------------------

```
go get github.com/google/go-github/github
go get github.com/vaughan0/go-ini
go get github.com/blang/semver
go get github.com/stretchr/testify
go get github.com/arduino/arduino-modules/git

go build arduino.cc/repository/libraries-repository-engine
```

You may want to setup git to allow "go get" from private repos, in this case you must
generate a personal access token from github that grants "repo access" permissions and do:

```
git config --global url."https://YOUR_ACCESS_TOKEN:[email protected]/".insteadOf "https://github.com/"
```

the configuration will be saved inside `~/.gitconfig` as:

```
...
[url "https://YOUR_ACCESS_TOKEN:[email protected]/"]
insteadOf = https://github.com/
...
task go:build
```

TDD
Expand All @@ -33,12 +11,12 @@ TDD
In order to run the tests, type

```
go test -v ./src/arduino.cc/repository/libraries/test/...
task go:test
```

RUN
----------------------------

Create a `config.json` file (or edit example one). Same thing for `repos.txt` file.

Run with `go run sync_libraries.go` or `go build` and then `./libraries-repository-engine`
Run with `go run sync_libraries.go` or `task go:build` and then `./libraries-repository-engine`
21 changes: 4 additions & 17 deletions Taskfile.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,29 +2,16 @@
version: "3"

env:
GOPATH: "$(echo $PWD)"
DEFAULT_GO_PACKAGES:
sh: echo $(go list ./... | tr '\n' ' ')

tasks:
go:deps:
desc: Install dependencies
cmds:
- go get github.com/arduino/arduino-modules/git
- go get github.com/arduino/golang-concurrent-workers
- go get github.com/blang/semver
- go get github.com/google/go-github/github
- go get github.com/stretchr/testify
- go get github.com/vaughan0/go-ini

go:build:
desc: Build the project
deps:
- task: go:deps
cmds:
- go build arduino.cc/repository/libraries-repository-engine
- go build -v -o libraries-repository-engine{{exeExt}}

go:test:
desc: Run unit tests
deps:
- task: go:deps
cmds:
- go test -v ./src/arduino.cc/repository/libraries/...
- go test -v -short -run '{{default ".*" .GO_TEST_REGEX}}' {{default "-timeout 10m -coverpkg=./... -covermode=atomic" .GO_TEST_FLAGS}} -coverprofile=coverage_unit.txt {{default .DEFAULT_GO_PACKAGES .GO_PACKAGES}}
6 changes: 3 additions & 3 deletions fmt_fix_vet
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,8 +1,8 @@
#!/bin/bash -x

go fmt ./src/arduino.cc/repository/...
go fmt ./...
go fmt sync_libraries.go
go fix ./src/arduino.cc/repository/...
go fix ./...
go fix sync_libraries.go
go vet ./src/arduino.cc/repository/...
go vet ./...
go vet sync_libraries.go
13 changes: 13 additions & 0 deletions go.mod
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,13 @@
module arduino.cc/repository

go 1.14

require (
github.com/arduino/golang-concurrent-workers v0.0.0-20170202182617-6710cdc954bc
github.com/blang/semver v3.5.1+incompatible
github.com/go-git/go-git/v5 v5.3.0
github.com/google/go-github v17.0.0+incompatible
github.com/google/go-querystring v1.1.0 // indirect
github.com/stretchr/testify v1.7.0
github.com/vaughan0/go-ini v0.0.0-20130923145212-a98ad7ee00ec
)
110 changes: 110 additions & 0 deletions go.sum
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,110 @@
github.com/Microsoft/go-winio v0.4.14/go.mod h1:qXqCSQ3Xa7+6tgxaGTIe4Kpcdsi+P8jBhyzoq1bpyYA=
github.com/Microsoft/go-winio v0.4.16 h1:FtSW/jqD+l4ba5iPBj9CODVtgfYAD8w2wS923g/cFDk=
github.com/Microsoft/go-winio v0.4.16/go.mod h1:XB6nPKklQyQ7GC9LdcBEcBl8PF76WugXOPRXwdLnMv0=
github.com/alcortesm/tgz v0.0.0-20161220082320-9c5fe88206d7 h1:uSoVVbwJiQipAclBbw+8quDsfcvFjOpI5iCf4p/cqCs=
github.com/alcortesm/tgz v0.0.0-20161220082320-9c5fe88206d7/go.mod h1:6zEj6s6u/ghQa61ZWa/C2Aw3RkjiTBOix7dkqa1VLIs=
github.com/anmitsu/go-shlex v0.0.0-20161002113705-648efa622239 h1:kFOfPq6dUM1hTo4JG6LR5AXSUEsOjtdm0kw0FtQtMJA=
github.com/anmitsu/go-shlex v0.0.0-20161002113705-648efa622239/go.mod h1:2FmKhYUyUczH0OGQWaF5ceTx0UBShxjsH6f8oGKYe2c=
github.com/arduino/golang-concurrent-workers v0.0.0-20170202182617-6710cdc954bc h1:PzGY1Ppud/Ng+LFHU16oOrWhYsnSLYurwiHlbVc/FJ0=
github.com/arduino/golang-concurrent-workers v0.0.0-20170202182617-6710cdc954bc/go.mod h1:E+WBbLkFBdPp+N+yijgbdDI33mr5pm6j42RYLN5K4do=
github.com/armon/go-socks5 v0.0.0-20160902184237-e75332964ef5 h1:0CwZNZbxp69SHPdPJAN/hZIm0C4OItdklCFmMRWYpio=
github.com/armon/go-socks5 v0.0.0-20160902184237-e75332964ef5/go.mod h1:wHh0iHkYZB8zMSxRWpUBQtwG5a7fFgvEO+odwuTv2gs=
github.com/blang/semver v3.5.1+incompatible h1:cQNTCjp13qL8KC3Nbxr/y2Bqb63oX6wdnnjpJbkM4JQ=
github.com/blang/semver v3.5.1+incompatible/go.mod h1:kRBLl5iJ+tD4TcOOxsy/0fnwebNt5EWlYSAyrTnjyyk=
github.com/creack/pty v1.1.9/go.mod h1:oKZEueFk5CKHvIhNR5MUki03XCEU+Q6VDXinZuGJ33E=
github.com/davecgh/go-spew v1.1.0/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38=
github.com/davecgh/go-spew v1.1.1 h1:vj9j/u1bqnvCEfJOwUhtlOARqs3+rkHYY13jYWTU97c=
github.com/davecgh/go-spew v1.1.1/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38=
github.com/emirpasic/gods v1.12.0 h1:QAUIPSaCu4G+POclxeqb3F+WPpdKqFGlw36+yOzGlrg=
github.com/emirpasic/gods v1.12.0/go.mod h1:YfzfFFoVP/catgzJb4IKIqXjX78Ha8FMSDh3ymbK86o=
github.com/flynn/go-shlex v0.0.0-20150515145356-3f9db97f8568 h1:BHsljHzVlRcyQhjrss6TZTdY2VfCqZPbv5k3iBFa2ZQ=
github.com/flynn/go-shlex v0.0.0-20150515145356-3f9db97f8568/go.mod h1:xEzjJPgXI435gkrCt3MPfRiAkVrwSbHsst4LCFVfpJc=
github.com/gliderlabs/ssh v0.2.2 h1:6zsha5zo/TWhRhwqCD3+EarCAgZ2yN28ipRnGPnwkI0=
github.com/gliderlabs/ssh v0.2.2/go.mod h1:U7qILu1NlMHj9FlMhZLlkCdDnU1DBEAqr0aevW3Awn0=
github.com/go-git/gcfg v1.5.0 h1:Q5ViNfGF8zFgyJWPqYwA7qGFoMTEiBmdlkcfRmpIMa4=
github.com/go-git/gcfg v1.5.0/go.mod h1:5m20vg6GwYabIxaOonVkTdrILxQMpEShl1xiMF4ua+E=
github.com/go-git/go-billy/v5 v5.0.0/go.mod h1:pmpqyWchKfYfrkb/UVH4otLvyi/5gJlGI4Hb3ZqZ3W0=
github.com/go-git/go-billy/v5 v5.1.0 h1:4pl5BV4o7ZG/lterP4S6WzJ6xr49Ba5ET9ygheTYahk=
github.com/go-git/go-billy/v5 v5.1.0/go.mod h1:pmpqyWchKfYfrkb/UVH4otLvyi/5gJlGI4Hb3ZqZ3W0=
github.com/go-git/go-git-fixtures/v4 v4.0.2-0.20200613231340-f56387b50c12 h1:PbKy9zOy4aAKrJ5pibIRpVO2BXnK1Tlcg+caKI7Ox5M=
github.com/go-git/go-git-fixtures/v4 v4.0.2-0.20200613231340-f56387b50c12/go.mod h1:m+ICp2rF3jDhFgEZ/8yziagdT1C+ZpZcrJjappBCDSw=
github.com/go-git/go-git/v5 v5.3.0 h1:8WKMtJR2j8RntEXR/uvTKagfEt4GYlwQ7mntE4+0GWc=
github.com/go-git/go-git/v5 v5.3.0/go.mod h1:xdX4bWJ48aOrdhnl2XqHYstHbbp6+LFS4r4X+lNVprw=
github.com/google/go-cmp v0.3.0 h1:crn/baboCvb5fXaQ0IJ1SGTsTVrWpDsCWC8EGETZijY=
github.com/google/go-cmp v0.3.0/go.mod h1:8QqcDgzrUqlUb/G2PQTWiueGozuR1884gddMywk6iLU=
github.com/google/go-cmp v0.5.2 h1:X2ev0eStA3AbceY54o37/0PQ/UWqKEiiO2dKL5OPaFM=
github.com/google/go-cmp v0.5.2/go.mod h1:v8dTdLbMG2kIc/vJvl+f65V22dbkXbowE6jgT/gNBxE=
github.com/google/go-github v17.0.0+incompatible h1:N0LgJ1j65A7kfXrZnUDaYCs/Sf4rEjNlfyDHW9dolSY=
github.com/google/go-github v17.0.0+incompatible/go.mod h1:zLgOLi98H3fifZn+44m+umXrS52loVEgC2AApnigrVQ=
github.com/google/go-querystring v1.1.0 h1:AnCroh3fv4ZBgVIf1Iwtovgjaw/GiKJo8M8yD/fhyJ8=
github.com/google/go-querystring v1.1.0/go.mod h1:Kcdr2DB4koayq7X8pmAG4sNG59So17icRSOU623lUBU=
github.com/imdario/mergo v0.3.12 h1:b6R2BslTbIEToALKP7LxUvijTsNI9TAe80pLWN2g/HU=
github.com/imdario/mergo v0.3.12/go.mod h1:jmQim1M+e3UYxmgPu/WyfjB3N3VflVyUjjjwH0dnCYA=
github.com/jbenet/go-context v0.0.0-20150711004518-d14ea06fba99 h1:BQSFePA1RWJOlocH6Fxy8MmwDt+yVQYULKfN0RoTN8A=
github.com/jbenet/go-context v0.0.0-20150711004518-d14ea06fba99/go.mod h1:1lJo3i6rXxKeerYnT8Nvf0QmHCRC1n8sfWVwXF2Frvo=
github.com/jessevdk/go-flags v1.5.0/go.mod h1:Fw0T6WPc1dYxT4mKEZRfG5kJhaTDP9pj1c2EWnYs/m4=
github.com/kevinburke/ssh_config v0.0.0-20201106050909-4977a11b4351 h1:DowS9hvgyYSX4TO5NpyC606/Z4SxnNYbT+WX27or6Ck=
github.com/kevinburke/ssh_config v0.0.0-20201106050909-4977a11b4351/go.mod h1:CT57kijsi8u/K/BOFA39wgDQJ9CxiF4nAY/ojJ6r6mM=
github.com/konsorten/go-windows-terminal-sequences v1.0.1/go.mod h1:T0+1ngSBFLxvqU3pZ+m/2kptfBszLMUkC4ZK/EgS/cQ=
github.com/kr/pretty v0.1.0/go.mod h1:dAy3ld7l9f0ibDNOQOHHMYYIIbhfbHSm3C4ZsoJORNo=
github.com/kr/pretty v0.2.1 h1:Fmg33tUaq4/8ym9TJN1x7sLJnHVwhP33CNkpYV/7rwI=
github.com/kr/pretty v0.2.1/go.mod h1:ipq/a2n7PKx3OHsz4KJII5eveXtPO4qwEXGdVfWzfnI=
github.com/kr/pty v1.1.1/go.mod h1:pFQYn66WHrOpPYNljwOMqo10TkYh1fy3cYio2l3bCsQ=
github.com/kr/text v0.1.0/go.mod h1:4Jbv+DJW3UT/LiOwJeYQe1efqtUx/iVham/4vfdArNI=
github.com/kr/text v0.2.0 h1:5Nx0Ya0ZqY2ygV366QzturHI13Jq95ApcVaJBhpS+AY=
github.com/kr/text v0.2.0/go.mod h1:eLer722TekiGuMkidMxC/pM04lWEeraHUUmBw8l2grE=
github.com/mitchellh/go-homedir v1.1.0 h1:lukF9ziXFxDFPkA1vsr5zpc1XuPDn/wFntq5mG+4E0Y=
github.com/mitchellh/go-homedir v1.1.0/go.mod h1:SfyaCUpYCn1Vlf4IUYiD9fPX4A5wJrkLzIz1N1q0pr0=
github.com/niemeyer/pretty v0.0.0-20200227124842-a10e7caefd8e/go.mod h1:zD1mROLANZcx1PVRCS0qkT7pwLkGfwJo4zjcN/Tysno=
github.com/pkg/errors v0.8.1/go.mod h1:bwawxfHBFNV+L2hUp1rHADufV3IMtnDRdf1r5NINEl0=
github.com/pkg/errors v0.9.1 h1:FEBLx1zS214owpjy7qsBeixbURkuhQAwrK5UwLGTwt4=
github.com/pkg/errors v0.9.1/go.mod h1:bwawxfHBFNV+L2hUp1rHADufV3IMtnDRdf1r5NINEl0=
github.com/pmezard/go-difflib v1.0.0 h1:4DBwDE0NGyQoBHbLQYPwSUPoCMWR5BEzIk/f1lZbAQM=
github.com/pmezard/go-difflib v1.0.0/go.mod h1:iKH77koFhYxTK1pcRnkKkqfTogsbg7gZNVY4sRDYZ/4=
github.com/sergi/go-diff v1.1.0 h1:we8PVUC3FE2uYfodKH/nBHMSetSfHDR6scGdBi+erh0=
github.com/sergi/go-diff v1.1.0/go.mod h1:STckp+ISIX8hZLjrqAeVduY0gWCT9IjLuqbuNXdaHfM=
github.com/sirupsen/logrus v1.4.1/go.mod h1:ni0Sbl8bgC9z8RoU9G6nDWqqs/fq4eDPysMBDgk/93Q=
github.com/stretchr/objx v0.1.0/go.mod h1:HFkY916IF+rwdDfMAkV7OtwuqBVzrE8GR6GFx+wExME=
github.com/stretchr/objx v0.1.1/go.mod h1:HFkY916IF+rwdDfMAkV7OtwuqBVzrE8GR6GFx+wExME=
github.com/stretchr/testify v1.2.2/go.mod h1:a8OnRcib4nhh0OaRAV+Yts87kKdq0PP7pXfy6kDkUVs=
github.com/stretchr/testify v1.4.0/go.mod h1:j7eGeouHqKxXV5pUuKE4zz7dFj8WfuZ+81PSLYec5m4=
github.com/stretchr/testify v1.7.0 h1:nwc3DEeHmmLAfoZucVR881uASk0Mfjw8xYJ99tb5CcY=
github.com/stretchr/testify v1.7.0/go.mod h1:6Fq8oRcR53rry900zMqJjRRixrwX3KX962/h/Wwjteg=
github.com/vaughan0/go-ini v0.0.0-20130923145212-a98ad7ee00ec h1:DGmKwyZwEB8dI7tbLt/I/gQuP559o/0FrAkHKlQM/Ks=
github.com/vaughan0/go-ini v0.0.0-20130923145212-a98ad7ee00ec/go.mod h1:owBmyHYMLkxyrugmfwE/DLJyW8Ro9mkphwuVErQ0iUw=
github.com/xanzy/ssh-agent v0.3.0 h1:wUMzuKtKilRgBAD1sUb8gOwwRr2FGoBVumcjoOACClI=
github.com/xanzy/ssh-agent v0.3.0/go.mod h1:3s9xbODqPuuhK9JV1R321M/FlMZSBvE5aY6eAcqrDh0=
golang.org/x/crypto v0.0.0-20190219172222-a4c6cb3142f2/go.mod h1:6SG95UA2DQfeDnfUPMdvaQW0Q7yPrPDi9nlGo2tz2b4=
golang.org/x/crypto v0.0.0-20210322153248-0c34fe9e7dc2 h1:It14KIkyBFYkHkwZ7k45minvA9aorojkyjGk9KJ5B/w=
golang.org/x/crypto v0.0.0-20210322153248-0c34fe9e7dc2/go.mod h1:T9bdIzuCu7OtxOm1hfPfRQxPLYneinmdGuTeoZ9dtd4=
golang.org/x/net v0.0.0-20210226172049-e18ecbb05110/go.mod h1:m0MpNAwzfU5UDzcl9v0D8zg8gWTRqZa9RBIspLL5mdg=
golang.org/x/net v0.0.0-20210326060303-6b1517762897 h1:KrsHThm5nFk34YtATK1LsThyGhGbGe1olrte/HInHvs=
golang.org/x/net v0.0.0-20210326060303-6b1517762897/go.mod h1:uSPa2vr4CLtc/ILN5odXGNXS6mhrKVzTaCXzk9m6W3k=
golang.org/x/sys v0.0.0-20180905080454-ebe1bf3edb33/go.mod h1:STP8DvDyc/dI5b8T5hshtkjS+E42TnysNCUPdjciGhY=
golang.org/x/sys v0.0.0-20190507160741-ecd444e8653b/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
golang.org/x/sys v0.0.0-20190916202348-b4ddaad3f8a3/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
golang.org/x/sys v0.0.0-20200302150141-5c8b2ff67527/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
golang.org/x/sys v0.0.0-20201119102817-f84b799fce68/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
golang.org/x/sys v0.0.0-20210320140829-1e4c9ba3b0c4/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
golang.org/x/sys v0.0.0-20210324051608-47abb6519492 h1:Paq34FxTluEPvVyayQqMPgHm+vTOrIifmcYxFBx9TLg=
golang.org/x/sys v0.0.0-20210324051608-47abb6519492/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
golang.org/x/term v0.0.0-20201126162022-7de9c90e9dd1 h1:v+OssWQX+hTHEmOBgwxdZxK4zHq3yOs8F9J7mk0PY8E=
golang.org/x/term v0.0.0-20201126162022-7de9c90e9dd1/go.mod h1:bj7SfCRtBDWHUb9snDiAeCFNEtKQo2Wmx5Cou7ajbmo=
golang.org/x/text v0.3.3 h1:cokOdA+Jmi5PJGXLlLllQSgYigAEfHXJAERHVMaCc2k=
golang.org/x/text v0.3.3/go.mod h1:5Zoc/QRtKVWzQhOtBMvqHzDpF6irO9z98xDceosuGiQ=
golang.org/x/tools v0.0.0-20180917221912-90fa682c2a6e/go.mod h1:n7NCudcB/nEzxVGmLbDWY5pfWTLqBcC2KZ6jyYvM4mQ=
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=
gopkg.in/check.v1 v0.0.0-20161208181325-20d25e280405/go.mod h1:Co6ibVJAznAaIkqp8huTwlJQCZ016jof/cbN4VW5Yz0=
gopkg.in/check.v1 v1.0.0-20190902080502-41f04d3bba15/go.mod h1:Co6ibVJAznAaIkqp8huTwlJQCZ016jof/cbN4VW5Yz0=
gopkg.in/check.v1 v1.0.0-20200227125254-8fa46927fb4f/go.mod h1:Co6ibVJAznAaIkqp8huTwlJQCZ016jof/cbN4VW5Yz0=
gopkg.in/check.v1 v1.0.0-20201130134442-10cb98267c6c h1:Hei/4ADfdWqJk1ZMxUNpqntNwaWcugrBjAiHlqqRiVk=
gopkg.in/check.v1 v1.0.0-20201130134442-10cb98267c6c/go.mod h1:JHkPIbrfpd72SG/EVd6muEfDQjcINNoR0C8j2r3qZ4Q=
gopkg.in/warnings.v0 v0.1.2 h1:wFXVbFY8DY5/xOe1ECiWdKCzZlxgshcYVNkBHstARME=
gopkg.in/warnings.v0 v0.1.2/go.mod h1:jksf8JmL6Qr/oQM2OXTHunEvvTAsrWBLb6OOjuVWRNI=
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=
gopkg.in/yaml.v2 v2.3.0 h1:clyUAQHOM3G0M3f5vQj7LuJrETvjVot3Z5el9nffUtU=
gopkg.in/yaml.v2 v2.3.0/go.mod h1:hI93XBmqTisBFMUTm0b8Fm+jr3Dg1NNxqwp+5A1VGuI=
gopkg.in/yaml.v3 v3.0.0-20200313102051-9f266ea9e77c h1:dUUwHk2QECo/6vqA44rthZ8ie2QXMNeKRTHCNY2nXvo=
gopkg.in/yaml.v3 v3.0.0-20200313102051-9f266ea9e77c/go.mod h1:K4uyk7z7BCEPqu6E+C64Yfv1cQ7kz7rIZviUmN+EgEM=
0 .../repository/libraries/bad_file_cleaner.go → libraries/bad_file_cleaner.go
View file
Open in desktop
File renamed without changes.
0 ...sitory/libraries/bad_file_cleaner_test.go → libraries/bad_file_cleaner_test.go
View file
Open in desktop
File renamed without changes.
0 ...arduino.cc/repository/libraries/clamav.go → libraries/clamav.go
View file
Open in desktop
File renamed without changes.
0 .../libraries/cron/fill_missing_checksums.go → libraries/cron/fill_missing_checksums.go
View file
Open in desktop
File renamed without changes.
0 src/arduino.cc/repository/libraries/db/db.go → libraries/db/db.go
View file
Open in desktop
File renamed without changes.
0 ...ository/libraries/db/dependencies_test.go → libraries/db/dependencies_test.go
View file
Open in desktop
File renamed without changes.
0 ...duino.cc/repository/libraries/db/index.go → libraries/db/index.go
View file
Open in desktop
File renamed without changes.
0 ...ino.cc/repository/libraries/db/library.go → libraries/db/library.go
View file
Open in desktop
File renamed without changes.
0 ....cc/repository/libraries/db/versioning.go → libraries/db/versioning.go
View file
Open in desktop
File renamed without changes.
0 ...epository/libraries/db/versioning_test.go → libraries/db/versioning_test.go
View file
Open in desktop
File renamed without changes.
0 ...uino.cc/repository/libraries/file/SCCS.go → libraries/file/SCCS.go
View file
Open in desktop
File renamed without changes.
10 changes: 7 additions & 3 deletions ...ository/libraries/git_integration_test.go → libraries/git_integration_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,6 +7,7 @@ import (
"testing"

"arduino.cc/repository/libraries/db"
"github.com/go-git/go-git/v5"
"github.com/stretchr/testify/require"
)

Expand All @@ -33,11 +34,14 @@ func TestUpdateLibraryJson(t *testing.T) {

defer os.RemoveAll(r.FolderPath)

tags, err := r.ListTags()
tags, err := r.Repository.Tags()
require.NoError(t, err)
tag, err := tags.Next()
require.NoError(t, err)
require.NotEmpty(t, tags)

err = r.CheckoutTag(tags[0])
repoTree, err := r.Repository.Worktree()
require.NoError(t, err)
err = repoTree.Checkout(&git.CheckoutOptions{Hash: tag.Hash()})
require.NoError(t, err)

library, err := GenerateLibraryFromRepo(r)
Expand Down
0 ...ry/libraries/github_release_downloader.go → libraries/github_release_downloader.go
View file
Open in desktop
File renamed without changes.
0 ...braries/github_release_downloader_test.go → libraries/github_release_downloader_test.go
View file
Open in desktop
File renamed without changes.
0 ...pository/libraries/hash/checksumhelper.go → libraries/hash/checksumhelper.go
View file
Open in desktop
File renamed without changes.
0 ...repository/libraries/metadata/metadata.go → libraries/metadata/metadata.go
View file
Open in desktop
File renamed without changes.
0 ...itory/libraries/metadata/metadata_test.go → libraries/metadata/metadata_test.go
View file
Open in desktop
File renamed without changes.
0 ...cc/repository/libraries/metadata/utils.go → libraries/metadata/utils.go
View file
Open in desktop
File renamed without changes.
0 ...pository/libraries/metadata/utils_test.go → libraries/metadata/utils_test.go
View file
Open in desktop
File renamed without changes.
0 ...no.cc/repository/libraries/repoarchive.go → libraries/repoarchive.go
View file
Open in desktop
File renamed without changes.
43 changes: 32 additions & 11 deletions ...uino.cc/repository/libraries/repoclone.go → libraries/repoclone.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,38 +12,59 @@ import (
"fmt"

"arduino.cc/repository/libraries/metadata"
"github.com/arduino/arduino-modules/git"
"github.com/go-git/go-git/v5"
)

func CloneOrFetch(repoMeta *Repo, folderName string) (*git.Repository, error) {
var repo *git.Repository
// Repository represents a Git repository located on the filesystem.
type Repository struct {
Repository *git.Repository
FolderPath string
URL string
}

func CloneOrFetch(repoMeta *Repo, folderName string) (*Repository, error) {
repo := Repository{
FolderPath: folderName,
URL: repoMeta.Url,
}

if _, err := os.Stat(folderName); os.IsNotExist(err) {
repo, err = git.Clone(repoMeta.Url, folderName)
repo.Repository, err = git.PlainClone(folderName, false, &git.CloneOptions{URL: repoMeta.Url})
if err != nil {
return nil, err
}
} else {
repo = &git.Repository{FolderPath: folderName, URL: repoMeta.Url}
repo.Repository, err = git.PlainOpen(folderName)
if err != nil {
return nil, err
}
}

tags, err := repo.ListTags()
tags, err := repo.Repository.Tags()
if err != nil {
return nil, err
}
for _, tag := range tags {
if err = repo.RemoveTag(tag); err != nil {

for {
tag, err := tags.Next()
if err != nil {
// Reached end of tags
break
}

if err = repo.Repository.DeleteTag(strings.TrimPrefix(tag.Name().String(), "refs/tags/")); err != nil {
return nil, err
}
}

if err = repo.Fetch(); err != nil {
if err = repo.Repository.Fetch(&git.FetchOptions{Tags: git.AllTags}); err != nil {
return nil, err
}

return repo, err
return &repo, err
}

func GenerateLibraryFromRepo(repo *git.Repository) (*metadata.LibraryMetadata, error) {
func GenerateLibraryFromRepo(repo *Repository) (*metadata.LibraryMetadata, error) {
bytes, err := ioutil.ReadFile(filepath.Join(repo.FolderPath, "library.properties"))
if err != nil {
return nil, fmt.Errorf("can't read library.properties: %s", err)
Expand Down
0 ...cc/repository/libraries/repoclone_test.go → libraries/repoclone_test.go
View file
Open in desktop
File renamed without changes.
0 ...duino.cc/repository/libraries/repolist.go → libraries/repolist.go
View file
Open in desktop
File renamed without changes.
0 ....cc/repository/libraries/repolist_test.go → libraries/repolist_test.go
View file
Open in desktop
File renamed without changes.
0 ...ory/libraries/testdata/git_only_servo.txt → libraries/testdata/git_only_servo.txt
View file
Open in desktop
File renamed without changes.
0 ...ory/libraries/testdata/git_test_repos.txt → libraries/testdata/git_test_repos.txt
View file
Open in desktop
File renamed without changes.
0 ...ory/libraries/testdata/lib_valid/test.txt → libraries/testdata/lib_valid/test.txt
View file
Open in desktop
File renamed without changes.
0 .../libraries/testdata/lib_with_exe/fake.exe → libraries/testdata/lib_with_exe/fake.exe
View file
Open in desktop
File renamed without changes.
0 .../libraries/testdata/lib_with_exe/test.txt → libraries/testdata/lib_with_exe/test.txt
View file
Open in desktop
File renamed without changes.
0 ...data/lib_with_forbidden_file/.development → ...data/lib_with_forbidden_file/.development
View file
Open in desktop
File renamed without changes.
0 ...testdata/lib_with_forbidden_file/test.txt → ...testdata/lib_with_forbidden_file/test.txt
View file
Open in desktop
File renamed without changes.
0 ...ository/libraries/zip/testzip/.hiddenfile → libraries/zip/testzip/.hiddenfile
View file
Open in desktop
File renamed without changes.
0 ...itory/libraries/zip/testzip/.svn/.gitkeep → libraries/zip/testzip/.svn/.gitkeep
View file
Open in desktop
File renamed without changes.
0 ...sitory/libraries/zip/testzip/CVS/.gitkeep → libraries/zip/testzip/CVS/.gitkeep
View file
Open in desktop
File renamed without changes.
0 ...sitory/libraries/zip/testzip/testfile.txt → libraries/zip/testzip/testfile.txt
View file
Open in desktop
File renamed without changes.
0 ...aries/zip/testzip/testfolder/CVS/.gitkeep → ...aries/zip/testzip/testfolder/CVS/.gitkeep
View file
Open in desktop
File renamed without changes.
0 ...p/testzip/testfolder/testfileinfolder.txt → ...p/testzip/testfolder/testfileinfolder.txt
View file
Open in desktop
File renamed without changes.
0 ....cc/repository/libraries/zip/ziphelper.go → libraries/zip/ziphelper.go
View file
Open in desktop
File renamed without changes.
0 ...epository/libraries/zip/ziphelper_test.go → libraries/zip/ziphelper_test.go
View file
Open in desktop
File renamed without changes.
3 changes: 0 additions & 3 deletions setup_go_env_vars
View file
Open in desktop

This file was deleted.

1 change: 0 additions & 1 deletion src/.gitignore
View file
Open in desktop

This file was deleted.

Loading