From a57f18a871699d5053cb0b45a1d30267888b8a07 Mon Sep 17 00:00:00 2001 From: Julien Roy Date: Sat, 3 May 2025 10:49:21 +0200 Subject: [PATCH] [FEATURE] Implement HTTPS clone protocol --- .github/workflows/ci.yaml | 38 +++ .tool-versions | 2 + .travis.yml | 9 - Makefile | 117 ++++++++ build.gradle | 32 -- go.mod | 32 ++ go.sum | 67 +++++ gradle/wrapper/gradle-wrapper.jar | Bin 54208 -> 0 bytes gradle/wrapper/gradle-wrapper.properties | 6 - gradlew | 172 ----------- gradlew.bat | 84 ------ impl/banner.go | 1 + impl/cmd/cmd.go | 2 +- impl/commands.go | 131 ++++++--- impl/completer.go | 2 +- impl/config/config.go | 36 ++- impl/executor.go | 29 +- impl/git/azure.go | 356 +++++++++++++++++++++++ impl/git/commands.go | 254 +++++++++------- impl/git/git_remote.go | 10 +- impl/git/github.go | 67 ++--- impl/git/gitlab.go | 42 +-- impl/git/visualstudio.go | 315 -------------------- impl/glob/glob_matcher.go | 40 +++ impl/initialzr/initialzr.go | 11 +- impl/initialzr/initialzr_test.go | 8 +- impl/prompt/prompt.go | 31 +- main.go | 78 ++--- settings.gradle | 1 - 29 files changed, 1058 insertions(+), 915 deletions(-) create mode 100644 .github/workflows/ci.yaml create mode 100644 .tool-versions delete mode 100644 .travis.yml create mode 100644 Makefile delete mode 100644 build.gradle create mode 100644 go.mod create mode 100644 go.sum delete mode 100644 gradle/wrapper/gradle-wrapper.jar delete mode 100644 gradle/wrapper/gradle-wrapper.properties delete mode 100755 gradlew delete mode 100644 gradlew.bat create mode 100644 impl/git/azure.go delete mode 100644 impl/git/visualstudio.go create mode 100644 impl/glob/glob_matcher.go delete mode 100644 settings.gradle diff --git a/.github/workflows/ci.yaml b/.github/workflows/ci.yaml new file mode 100644 index 0000000..56e8a35 --- /dev/null +++ b/.github/workflows/ci.yaml @@ -0,0 +1,38 @@ +name: CI + +on: + push: + branches: + - main + pull_request: + +permissions: + contents: read + +jobs: + build: + runs-on: ubuntu-latest + + steps: + - uses: actions/checkout@v2 + + - name: Setup Go + uses: actions/setup-go@v2 + with: + go-version: '1.24.2' + + - name: golangci-lint + uses: golangci/golangci-lint-action@v8 + with: + version: v2.1.6 + + - name: Run testing + run: go test -v + + - name: Run the scripts + run: | + GOOS=darwin GOARCH=arm64 go build -o ./build/dist/mbx_darwin_arm64 . + GOOS=darwin GOARCH=amd64 go build -o ./build/dist/mbx_darwin_amd64 . + GOOS=linux GOARCH=amd64 go build -o ./build/dist/mbx_linux_amd64 . + GOOS=linux GOARCH=arm64 go build -o ./build/dist/mbx_linux_arm64 . + diff --git a/.tool-versions b/.tool-versions new file mode 100644 index 0000000..f7c27d5 --- /dev/null +++ b/.tool-versions @@ -0,0 +1,2 @@ +golang 1.24.2 +golangci-lint 2.1.6 diff --git a/.travis.yml b/.travis.yml deleted file mode 100644 index a2d93f0..0000000 --- a/.travis.yml +++ /dev/null @@ -1,9 +0,0 @@ -language: java - -jdk: - - oraclejdk8 - -install: true - -script: - - ./gradlew goClean goBuild diff --git a/Makefile b/Makefile new file mode 100644 index 0000000..589a945 --- /dev/null +++ b/Makefile @@ -0,0 +1,117 @@ +# Makefile for Go Project + +# ============================================================================== +# Variables +# ============================================================================== + +# Binary name (default: name of the current directory) +BINARY_NAME = mbx + +# Output directory for the binary +BUILD_OUTPUT_DIR = ./build/dist + +# Go command +GO_CMD ?= go + +# GolangCI-Lint command +# Assumes golangci-lint is in the PATH. If not, provide the full path. +GOLANGCI_LINT_CMD ?= golangci-lint + +# Go build flags (e.g., -ldflags="-s -w" to strip symbols and debug info) +# Example: GO_BUILD_FLAGS = -ldflags="-X main.Version=1.0.0" +GO_BUILD_FLAGS ?= + +# Go test flags (e.g., -v for verbose, -race for race detector) +GO_TEST_FLAGS ?= -v + +# Packages to include in build/test etc. (default: all packages in the current module) +# Note: golangci-lint typically uses ./... by default, but we keep the variable for consistency +PACKAGES ?= ./... + +# ============================================================================== +# Targets +# ============================================================================== + +.PHONY: all build run test cover clean deps fmt lint help + +# Default target: builds the project +all: build + +# Build the Go application +# Creates the binary in the specified BUILD_OUTPUT_DIR +build: deps + @echo "==> Building $(BINARY_NAME)..." + @mkdir -p $(BUILD_OUTPUT_DIR) + $(GO_CMD) build $(GO_BUILD_FLAGS) -o $(BUILD_OUTPUT_DIR)/$(BINARY_NAME) . + +build-multi: deps + @echo "==> Building $(BINARY_NAME)..." + @mkdir -p $(BUILD_OUTPUT_DIR) + GOOS=darwin GOARCH=arm64 $(GO_CMD) build $(GO_BUILD_FLAGS) -o $(BUILD_OUTPUT_DIR)/$(BINARY_NAME)_darwin_arm64 . + GOOS=darwin GOARCH=amd64 $(GO_CMD) build $(GO_BUILD_FLAGS) -o $(BUILD_OUTPUT_DIR)/$(BINARY_NAME)_darwin_amd64 . + GOOS=linux GOARCH=amd64 $(GO_CMD) build $(GO_BUILD_FLAGS) -o $(BUILD_OUTPUT_DIR)/$(BINARY_NAME)_linux_amd64 . + GOOS=linux GOARCH=arm64 $(GO_CMD) build $(GO_BUILD_FLAGS) -o $(BUILD_OUTPUT_DIR)/$(BINARY_NAME)_linux_arm64 . + +# Run the Go application +# Assumes the main package is in the current directory or specified by PACKAGES if it's a single package +run: build + @echo "==> Running $(BINARY_NAME)..." + $(BUILD_OUTPUT_DIR)/$(BINARY_NAME) + +# Run tests +test: deps + @echo "==> Running tests..." + $(GO_CMD) test $(GO_TEST_FLAGS) $(PACKAGES) + +# Run tests with coverage report +cover: deps + @echo "==> Running tests with coverage..." + $(GO_CMD) test $(GO_TEST_FLAGS) -coverprofile=coverage.out $(PACKAGES) + @echo "==> Generating coverage report (coverage.html)..." + $(GO_CMD) tool cover -html=coverage.out -o coverage.html + +# Clean build artifacts and coverage files +clean: + @echo "==> Cleaning..." + @rm -rf $(BUILD_OUTPUT_DIR) + @rm -f coverage.out coverage.html + +# Tidy dependencies (download new, remove unused) +deps: + @echo "==> Tidying dependencies..." + $(GO_CMD) mod tidy + $(GO_CMD) mod download # Optional: ensures all deps are downloaded + +# Format Go code +fmt: + @echo "==> Formatting code..." + $(GO_CMD) fmt $(PACKAGES) + +# Run golangci-lint linter +# Assumes golangci-lint is installed (go install github.com/golangci/golangci-lint/cmd/golangci-lint@latest) +# It will use the configuration file (.golangci.yml, .golangci.toml, or .golangci.json) if present. +lint: deps + @echo "==> Running golangci-lint..." + $(GOLANGCI_LINT_CMD) run $(PACKAGES) + +# Display help message +help: + @echo "Usage: make [target]" + @echo "" + @echo "Targets:" + @echo " all Build the application (default)" + @echo " build Compile the application" + @echo " run Compile and run the application" + @echo " test Run tests" + @echo " cover Run tests and generate HTML coverage report" + @echo " clean Remove build artifacts and coverage files" + @echo " deps Tidy and download dependencies" + @echo " fmt Format Go source code" + @echo " lint Run golangci-lint linter" + @echo " help Show this help message" + @echo "" + @echo "Variables:" + @echo " GOLANGCI_LINT_CMD Command to run golangci-lint (default: golangci-lint)" + @echo " GO_BUILD_FLAGS Flags for 'go build' (e.g., -ldflags='...') " + @echo " GO_TEST_FLAGS Flags for 'go test' (e.g., -v -race)" + @echo " PACKAGES Packages to target (default: ./...)" diff --git a/build.gradle b/build.gradle deleted file mode 100644 index 08ee78d..0000000 --- a/build.gradle +++ /dev/null @@ -1,32 +0,0 @@ -plugins { - id 'com.github.blindpirate.gogradle' version '0.11.3' -} - -golang { - goVersion = '1.11.4' - packagePath = 'github.com/vanroy/microcli' -} - -dependencies { - golang { - build 'github.com/urfave/cli#v1.20.0' - build 'github.com/c-bata/go-prompt#v0.1.1' - build 'github.com/thoas/go-funk#0.2' - build 'github.com/go-resty/resty#v1.0' - build 'github.com/BurntSushi/toml#v0.3.0' - build 'github.com/gobwas/glob#v0.2.2' - build 'github.com/howeyc/gopass' - build 'github.com/zalando/go-keyring' - } -} - -goBuild { - targetPlatform = ['linux-amd64', 'darwin-amd64'] - outputLocation = './build/dist/mbx_${GOOS}_${GOARCH}${GOEXE}' -} - -goBuild.dependsOn goTest - -task build() {} - -build.dependsOn goBuild diff --git a/go.mod b/go.mod new file mode 100644 index 0000000..61ecd69 --- /dev/null +++ b/go.mod @@ -0,0 +1,32 @@ +module github.com/vanroy/microcli + +go 1.24.2 + +require github.com/urfave/cli/v3 v3.3.2 + +require github.com/c-bata/go-prompt v0.2.6 + +require github.com/thoas/go-funk v0.9.3 + +require github.com/go-resty/resty/v2 v2.16.5 + +require github.com/BurntSushi/toml v1.4.0 + +require github.com/gobwas/glob v0.2.2 + +require github.com/zalando/go-keyring v0.2.6 + +require golang.org/x/term v0.31.0 + +require ( + al.essio.dev/pkg/shellescape v1.5.1 // indirect + github.com/danieljoos/wincred v1.2.2 // indirect + github.com/godbus/dbus/v5 v5.1.0 // indirect + github.com/mattn/go-colorable v0.1.7 // indirect + github.com/mattn/go-isatty v0.0.12 // indirect + github.com/mattn/go-runewidth v0.0.9 // indirect + github.com/mattn/go-tty v0.0.3 // indirect + github.com/pkg/term v1.2.0-beta.2 // indirect + golang.org/x/net v0.33.0 // indirect + golang.org/x/sys v0.32.0 // indirect +) diff --git a/go.sum b/go.sum new file mode 100644 index 0000000..fdf7c6a --- /dev/null +++ b/go.sum @@ -0,0 +1,67 @@ +al.essio.dev/pkg/shellescape v1.5.1 h1:86HrALUujYS/h+GtqoB26SBEdkWfmMI6FubjXlsXyho= +al.essio.dev/pkg/shellescape v1.5.1/go.mod h1:6sIqp7X2P6mThCQ7twERpZTuigpr6KbZWtls1U8I890= +github.com/BurntSushi/toml v1.4.0 h1:kuoIxZQy2WRRk1pttg9asf+WVv6tWQuBNVmK8+nqPr0= +github.com/BurntSushi/toml v1.4.0/go.mod h1:ukJfTF/6rtPPRCnwkur4qwRxa8vTRFBF0uk2lLoLwho= +github.com/c-bata/go-prompt v0.2.6 h1:POP+nrHE+DfLYx370bedwNhsqmpCUynWPxuHi0C5vZI= +github.com/c-bata/go-prompt v0.2.6/go.mod h1:/LMAke8wD2FsNu9EXNdHxNLbd9MedkPnCdfpU9wwHfY= +github.com/danieljoos/wincred v1.2.2 h1:774zMFJrqaeYCK2W57BgAem/MLi6mtSE47MB6BOJ0i0= +github.com/danieljoos/wincred v1.2.2/go.mod h1:w7w4Utbrz8lqeMbDAK0lkNJUv5sAOkFi7nd/ogr0Uh8= +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/go-resty/resty/v2 v2.16.5 h1:hBKqmWrr7uRc3euHVqmh1HTHcKn99Smr7o5spptdhTM= +github.com/go-resty/resty/v2 v2.16.5/go.mod h1:hkJtXbA2iKHzJheXYvQ8snQES5ZLGKMwQ07xAwp/fiA= +github.com/gobwas/glob v0.2.2 h1:czsC5u90AkrSujyGY0l7ST7QVLEPrdoMoXxRx/hXgq0= +github.com/gobwas/glob v0.2.2/go.mod h1:d3Ez4x06l9bZtSvzIay5+Yzi0fmZzPgnTbPcKjJAkT8= +github.com/godbus/dbus/v5 v5.1.0 h1:4KLkAxT3aOY8Li4FRJe/KvhoNFFxo0m6fNuFUO8QJUk= +github.com/godbus/dbus/v5 v5.1.0/go.mod h1:xhWf0FNVPg57R7Z0UbKHbJfkEywrmjJnf7w5xrFpKfA= +github.com/google/shlex v0.0.0-20191202100458-e7afc7fbc510 h1:El6M4kTTCOh6aBiKaUGG7oYTSPP8MxqL4YI3kZKwcP4= +github.com/google/shlex v0.0.0-20191202100458-e7afc7fbc510/go.mod h1:pupxD2MaaD3pAXIBCelhxNneeOaAeabZDe5s4K6zSpQ= +github.com/mattn/go-colorable v0.1.4/go.mod h1:U0ppj6V5qS13XJ6of8GYAs25YV2eR4EVcfRqFIhoBtE= +github.com/mattn/go-colorable v0.1.7 h1:bQGKb3vps/j0E9GfJQ03JyhRuxsvdAanXlT9BTw3mdw= +github.com/mattn/go-colorable v0.1.7/go.mod h1:u6P/XSegPjTcexA+o6vUJrdnUu04hMope9wVRipJSqc= +github.com/mattn/go-isatty v0.0.8/go.mod h1:Iq45c/XA43vh69/j3iqttzPXn0bhXyGjM0Hdxcsrc5s= +github.com/mattn/go-isatty v0.0.10/go.mod h1:qgIWMr58cqv1PHHyhnkY9lrL7etaEgOFcMEpPG5Rm84= +github.com/mattn/go-isatty v0.0.12 h1:wuysRhFDzyxgEmMf5xjvJ2M9dZoWAXNNr5LSBS7uHXY= +github.com/mattn/go-isatty v0.0.12/go.mod h1:cbi8OIDigv2wuxKPP5vlRcQ1OAZbq2CE4Kysco4FUpU= +github.com/mattn/go-runewidth v0.0.6/go.mod h1:H031xJmbD/WCDINGzjvQ9THkh0rPKHF+m2gUSrubnMI= +github.com/mattn/go-runewidth v0.0.9 h1:Lm995f3rfxdpd6TSmuVCHVb/QhupuXlYr8sCI/QdE+0= +github.com/mattn/go-runewidth v0.0.9/go.mod h1:H031xJmbD/WCDINGzjvQ9THkh0rPKHF+m2gUSrubnMI= +github.com/mattn/go-tty v0.0.3 h1:5OfyWorkyO7xP52Mq7tB36ajHDG5OHrmBGIS/DtakQI= +github.com/mattn/go-tty v0.0.3/go.mod h1:ihxohKRERHTVzN+aSVRwACLCeqIoZAWpoICkkvrWyR0= +github.com/pkg/term v1.2.0-beta.2 h1:L3y/h2jkuBVFdWiJvNfYfKmzcCnILw7mJWm2JQuMppw= +github.com/pkg/term v1.2.0-beta.2/go.mod h1:E25nymQcrSllhX42Ok8MRm1+hyBdHY0dCeiKZ9jpNGw= +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/stretchr/objx v0.1.0/go.mod h1:HFkY916IF+rwdDfMAkV7OtwuqBVzrE8GR6GFx+wExME= +github.com/stretchr/objx v0.5.2 h1:xuMeJ0Sdp5ZMRXx/aWO6RZxdr3beISkG5/G/aIRr3pY= +github.com/stretchr/objx v0.5.2/go.mod h1:FRsXN1f5AsAjCGJKqEizvkpNtU+EGNCLh3NxZ/8L+MA= +github.com/stretchr/testify v1.4.0/go.mod h1:j7eGeouHqKxXV5pUuKE4zz7dFj8WfuZ+81PSLYec5m4= +github.com/stretchr/testify v1.10.0 h1:Xv5erBjTwe/5IxqUQTdXv5kgmIvbHo3QQyRwhJsOfJA= +github.com/stretchr/testify v1.10.0/go.mod h1:r2ic/lqez/lEtzL7wO/rwa5dbSLXVDPFyf8C91i36aY= +github.com/thoas/go-funk v0.9.3 h1:7+nAEx3kn5ZJcnDm2Bh23N2yOtweO14bi//dvRtgLpw= +github.com/thoas/go-funk v0.9.3/go.mod h1:+IWnUfUmFO1+WVYQWQtIJHeRRdaIyyYglZN7xzUPe4Q= +github.com/urfave/cli/v3 v3.3.2 h1:BYFVnhhZ8RqT38DxEYVFPPmGFTEf7tJwySTXsVRrS/o= +github.com/urfave/cli/v3 v3.3.2/go.mod h1:FJSKtM/9AiiTOJL4fJ6TbMUkxBXn7GO9guZqoZtpYpo= +github.com/zalando/go-keyring v0.2.6 h1:r7Yc3+H+Ux0+M72zacZoItR3UDxeWfKTcabvkI8ua9s= +github.com/zalando/go-keyring v0.2.6/go.mod h1:2TCrxYrbUNYfNS/Kgy/LSrkSQzZ5UPVH85RwfczwvcI= +golang.org/x/net v0.33.0 h1:74SYHlV8BIgHIFC/LrYkOGIwL19eTYXQ5wc6TBuO36I= +golang.org/x/net v0.33.0/go.mod h1:HXLR5J+9DxmrqMwG9qjGCxZ+zKXxBru04zlTvWlWuN4= +golang.org/x/sync v0.0.0-20190911185100-cd5d95a43a6e/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM= +golang.org/x/sys v0.0.0-20190222072716-a9d3bda3a223/go.mod h1:STP8DvDyc/dI5b8T5hshtkjS+E42TnysNCUPdjciGhY= +golang.org/x/sys v0.0.0-20191008105621-543471e840be/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= +golang.org/x/sys v0.0.0-20191120155948-bd437916bb0e/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= +golang.org/x/sys v0.0.0-20200116001909-b77594299b42/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= +golang.org/x/sys v0.0.0-20200223170610-d5e6a3e2c0ae/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= +golang.org/x/sys v0.0.0-20200909081042-eff7692f9009/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= +golang.org/x/sys v0.0.0-20200918174421-af09f7315aff/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= +golang.org/x/sys v0.32.0 h1:s77OFDvIQeibCmezSnk/q6iAfkdiQaJi4VzroCFrN20= +golang.org/x/sys v0.32.0/go.mod h1:BJP2sWEmIv4KK5OTEluFJCKSidICx8ciO85XgH3Ak8k= +golang.org/x/term v0.31.0 h1:erwDkOK1Msy6offm1mOgvspSkslFnIGsFnxOKoufg3o= +golang.org/x/term v0.31.0/go.mod h1:R4BeIy7D95HzImkxGkTW1UQTtP54tio2RyHz7PwK0aw= +golang.org/x/time v0.6.0 h1:eTDhh4ZXt5Qf0augr54TN6suAUudPcawVZeIAPU7D4U= +golang.org/x/time v0.6.0/go.mod h1:3BpzKBy/shNhVucY/MWOyx10tF3SFh9QdLuxbVysPQM= +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.v3 v3.0.1 h1:fxVm/GzAzEWqLHuvctI91KS9hhNmmWOoWu0XTYJS7CA= +gopkg.in/yaml.v3 v3.0.1/go.mod h1:K4uyk7z7BCEPqu6E+C64Yfv1cQ7kz7rIZviUmN+EgEM= diff --git a/gradle/wrapper/gradle-wrapper.jar b/gradle/wrapper/gradle-wrapper.jar deleted file mode 100644 index 5b902e1f5b972eb1ee7f6a3ff35c92a356477e68..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 54208 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 \(.*\)$'` - if expr "$link" : '/.*' > /dev/null; then - PRG="$link" - else - PRG=`dirname "$PRG"`"/$link" - fi -done -SAVED="`pwd`" -cd "`dirname \"$PRG\"`/" >/dev/null -APP_HOME="`pwd -P`" -cd "$SAVED" >/dev/null - -APP_NAME="Gradle" -APP_BASE_NAME=`basename "$0"` - -# Add default JVM options here. You can also use JAVA_OPTS and GRADLE_OPTS to pass JVM options to this script. -DEFAULT_JVM_OPTS="" - -# Use the maximum available, or set MAX_FD != -1 to use that value. -MAX_FD="maximum" - -warn ( ) { - echo "$*" -} - -die ( ) { - echo - echo "$*" - echo - exit 1 -} - -# OS specific support (must be 'true' or 'false'). -cygwin=false -msys=false -darwin=false -nonstop=false -case "`uname`" in - CYGWIN* ) - cygwin=true - ;; - Darwin* ) - darwin=true - ;; - MINGW* ) - msys=true - ;; - NONSTOP* ) - nonstop=true - ;; -esac - -CLASSPATH=$APP_HOME/gradle/wrapper/gradle-wrapper.jar - -# Determine the Java command to use to start the JVM. -if [ -n "$JAVA_HOME" ] ; then - if [ -x "$JAVA_HOME/jre/sh/java" ] ; then - # IBM's JDK on AIX uses strange locations for the executables - JAVACMD="$JAVA_HOME/jre/sh/java" - else - JAVACMD="$JAVA_HOME/bin/java" - fi - if [ ! -x "$JAVACMD" ] ; then - die "ERROR: JAVA_HOME is set to an invalid directory: $JAVA_HOME - -Please set the JAVA_HOME variable in your environment to match the -location of your Java installation." - fi -else - JAVACMD="java" - which java >/dev/null 2>&1 || die "ERROR: JAVA_HOME is not set and no 'java' command could be found in your PATH. - -Please set the JAVA_HOME variable in your environment to match the -location of your Java installation." -fi - -# Increase the maximum file descriptors if we can. -if [ "$cygwin" = "false" -a "$darwin" = "false" -a "$nonstop" = "false" ] ; then - MAX_FD_LIMIT=`ulimit -H -n` - if [ $? -eq 0 ] ; then - if [ "$MAX_FD" = "maximum" -o "$MAX_FD" = "max" ] ; then - MAX_FD="$MAX_FD_LIMIT" - fi - ulimit -n $MAX_FD - if [ $? -ne 0 ] ; then - warn "Could not set maximum file descriptor limit: $MAX_FD" - fi - else - warn "Could not query maximum file descriptor limit: $MAX_FD_LIMIT" - fi -fi - -# For Darwin, add options to specify how the application appears in the dock -if $darwin; then - GRADLE_OPTS="$GRADLE_OPTS \"-Xdock:name=$APP_NAME\" \"-Xdock:icon=$APP_HOME/media/gradle.icns\"" -fi - -# For Cygwin, switch paths to Windows format before running java -if $cygwin ; then - APP_HOME=`cygpath --path --mixed "$APP_HOME"` - CLASSPATH=`cygpath --path --mixed "$CLASSPATH"` - JAVACMD=`cygpath --unix "$JAVACMD"` - - # We build the pattern for arguments to be converted via cygpath - ROOTDIRSRAW=`find -L / -maxdepth 1 -mindepth 1 -type d 2>/dev/null` - SEP="" - for dir in $ROOTDIRSRAW ; do - ROOTDIRS="$ROOTDIRS$SEP$dir" - SEP="|" - done - OURCYGPATTERN="(^($ROOTDIRS))" - # Add a user-defined pattern to the cygpath arguments - if [ "$GRADLE_CYGPATTERN" != "" ] ; then - OURCYGPATTERN="$OURCYGPATTERN|($GRADLE_CYGPATTERN)" - fi - # Now convert the arguments - kludge to limit ourselves to /bin/sh - i=0 - for arg in "$@" ; do - CHECK=`echo "$arg"|egrep -c "$OURCYGPATTERN" -` - CHECK2=`echo "$arg"|egrep -c "^-"` ### Determine if an option - - if [ $CHECK -ne 0 ] && [ $CHECK2 -eq 0 ] ; then ### Added a condition - eval `echo args$i`=`cygpath --path --ignore --mixed "$arg"` - else - eval `echo args$i`="\"$arg\"" - fi - i=$((i+1)) - done - case $i in - (0) set -- ;; - (1) set -- "$args0" ;; - (2) set -- "$args0" "$args1" ;; - (3) set -- "$args0" "$args1" "$args2" ;; - (4) set -- "$args0" "$args1" "$args2" "$args3" ;; - (5) set -- "$args0" "$args1" "$args2" "$args3" "$args4" ;; - (6) set -- "$args0" "$args1" "$args2" "$args3" "$args4" "$args5" ;; - (7) set -- "$args0" "$args1" "$args2" "$args3" "$args4" "$args5" "$args6" ;; - (8) set -- "$args0" "$args1" "$args2" "$args3" "$args4" "$args5" "$args6" "$args7" ;; - (9) set -- "$args0" "$args1" "$args2" "$args3" "$args4" "$args5" "$args6" "$args7" "$args8" ;; - esac -fi - -# Escape application args -save ( ) { - for i do printf %s\\n "$i" | sed "s/'/'\\\\''/g;1s/^/'/;\$s/\$/' \\\\/" ; done - echo " " -} -APP_ARGS=$(save "$@") - -# Collect all arguments for the java command, following the shell quoting and substitution rules -eval set -- $DEFAULT_JVM_OPTS $JAVA_OPTS $GRADLE_OPTS "\"-Dorg.gradle.appname=$APP_BASE_NAME\"" -classpath "\"$CLASSPATH\"" org.gradle.wrapper.GradleWrapperMain "$APP_ARGS" - -# by default we should be in the correct project dir, but when run from Finder on Mac, the cwd is wrong -if [ "$(uname)" = "Darwin" ] && [ "$HOME" = "$PWD" ]; then - cd "$(dirname "$0")" -fi - -exec "$JAVACMD" "$@" diff --git a/gradlew.bat b/gradlew.bat deleted file mode 100644 index f955316..0000000 --- a/gradlew.bat +++ /dev/null @@ -1,84 +0,0 @@ -@if "%DEBUG%" == "" @echo off -@rem ########################################################################## -@rem -@rem Gradle startup script for Windows -@rem -@rem ########################################################################## - -@rem Set local scope for the variables with windows NT shell -if "%OS%"=="Windows_NT" setlocal - -set DIRNAME=%~dp0 -if "%DIRNAME%" == "" set DIRNAME=. -set APP_BASE_NAME=%~n0 -set APP_HOME=%DIRNAME% - -@rem Add default JVM options here. You can also use JAVA_OPTS and GRADLE_OPTS to pass JVM options to this script. -set DEFAULT_JVM_OPTS= - -@rem Find java.exe -if defined JAVA_HOME goto findJavaFromJavaHome - -set JAVA_EXE=java.exe -%JAVA_EXE% -version >NUL 2>&1 -if "%ERRORLEVEL%" == "0" goto init - -echo. -echo ERROR: JAVA_HOME is not set and no 'java' command could be found in your PATH. -echo. -echo Please set the JAVA_HOME variable in your environment to match the -echo location of your Java installation. - -goto fail - -:findJavaFromJavaHome -set JAVA_HOME=%JAVA_HOME:"=% -set JAVA_EXE=%JAVA_HOME%/bin/java.exe - -if exist "%JAVA_EXE%" goto init - -echo. -echo ERROR: JAVA_HOME is set to an invalid directory: %JAVA_HOME% -echo. -echo Please set the JAVA_HOME variable in your environment to match the -echo location of your Java installation. - -goto fail - -:init -@rem Get command-line arguments, handling Windows variants - -if not "%OS%" == "Windows_NT" goto win9xME_args - -:win9xME_args -@rem Slurp the command line arguments. -set CMD_LINE_ARGS= -set _SKIP=2 - -:win9xME_args_slurp -if "x%~1" == "x" goto execute - -set CMD_LINE_ARGS=%* - -:execute -@rem Setup the command line - -set CLASSPATH=%APP_HOME%\gradle\wrapper\gradle-wrapper.jar - -@rem Execute Gradle -"%JAVA_EXE%" %DEFAULT_JVM_OPTS% %JAVA_OPTS% %GRADLE_OPTS% "-Dorg.gradle.appname=%APP_BASE_NAME%" -classpath "%CLASSPATH%" org.gradle.wrapper.GradleWrapperMain %CMD_LINE_ARGS% - -:end -@rem End local scope for the variables with windows NT shell -if "%ERRORLEVEL%"=="0" goto mainEnd - -:fail -rem Set variable GRADLE_EXIT_CONSOLE if you need the _script_ return code instead of -rem the _cmd.exe /c_ return code! -if not "" == "%GRADLE_EXIT_CONSOLE%" exit 1 -exit /b 1 - -:mainEnd -if "%OS%"=="Windows_NT" endlocal - -:omega diff --git a/impl/banner.go b/impl/banner.go index 42844a8..85d1a44 100644 --- a/impl/banner.go +++ b/impl/banner.go @@ -2,6 +2,7 @@ package impl import ( "fmt" + "github.com/vanroy/microcli/impl/config" ) diff --git a/impl/cmd/cmd.go b/impl/cmd/cmd.go index 49aff34..698d79a 100644 --- a/impl/cmd/cmd.go +++ b/impl/cmd/cmd.go @@ -34,5 +34,5 @@ func ExecAndOutCmd(cmdName string, cmdArgs []string) error { } func ErrorString(err string) string { - return strings.Replace(strings.TrimSuffix(err, "\n"), "\n", " ", -1) + return strings.ReplaceAll(strings.TrimSuffix(err, "\n"), "\n", " ") } diff --git a/impl/commands.go b/impl/commands.go index 0154fd7..297434b 100644 --- a/impl/commands.go +++ b/impl/commands.go @@ -1,20 +1,23 @@ package impl import ( + "context" "fmt" + "os" + "sort" + + "github.com/c-bata/go-prompt" "github.com/thoas/go-funk" - "github.com/urfave/cli" + "github.com/urfave/cli/v3" "github.com/vanroy/microcli/impl/config" "github.com/vanroy/microcli/impl/git" - "os" - "sort" ) type CliCommands map[string]cli.Command var Commands CliCommands -func InitCommands(config config.Config) []cli.Command { +func InitCommands(config config.Config) []*cli.Command { gitCommands := git.NewCommands(config) @@ -25,62 +28,85 @@ func InitCommands(config config.Config) []cli.Command { {Name: "list", Usage: "list projects on workspace", Action: gitCommands.ListLocal}, {Name: "glist", Usage: "list all remote " + labels.RepositoriesLabel + " from " + labels.GroupsLabel, Action: gitCommands.ListRemote}, - {Name: "gclone", Usage: "clone all remote " + labels.RepositoriesLabel + " from " + labels.GroupsLabel, ArgsUsage: "[glob]", Action: gitCommands.Clone}, + {Name: "gclone", Usage: "clone all remote " + labels.RepositoriesLabel + " from " + labels.GroupsLabel, ArgsUsage: "[glob]", Flags: []cli.Flag{ + &cli.StringSliceFlag{ + Name: "exclude", + Aliases: []string{"e"}, + Usage: "Pattern to exclude", + }, + }, Action: gitCommands.Clone}, {Name: "gup", Usage: "git pull + rebase all local " + labels.RepositoriesLabel, ArgsUsage: "[glob]", Flags: []cli.Flag{ - cli.BoolFlag{ - Name: "stash, s", - Usage: "Enable autostash before pull", + &cli.BoolFlag{ + Name: "stash", + Aliases: []string{"s"}, + Usage: "Enable autostash before pull", }, }, Action: gitCommands.Up}, {Name: "gst", Usage: "show git status for all local " + labels.RepositoriesLabel, ArgsUsage: "[glob]", Action: gitCommands.St}, {Name: "ggadd", Usage: "create new " + labels.GroupLabel, ArgsUsage: labels.CreateGroupUsage, Action: gitCommands.AddGroup}, {Name: "gadd", Usage: "create new " + labels.RepositoryLabel, ArgsUsage: labels.CreateRepositoryUsage, Flags: []cli.Flag{ - cli.BoolFlag{ - Name: "init, i", - Usage: "Init repository with Initializr", + &cli.BoolFlag{ + Name: "init", + Aliases: []string{"i"}, + Usage: "Init repository with Initializr", }, - cli.StringFlag{ - Name: "type, t", - Usage: "Project initializr type", + &cli.StringFlag{ + Name: "type", + Aliases: []string{"t"}, + Usage: "Project initializr type", }, - cli.StringFlag{ - Name: "name, n", - Usage: "Project initializr name", + &cli.StringFlag{ + Name: "name", + Aliases: []string{"n"}, + Usage: "Project initializr name", }, - cli.StringFlag{ - Name: "dependencies, d", - Usage: "Project dependencies ( separated with comma )", + &cli.StringFlag{ + Name: "dependencies", + Aliases: []string{"d"}, + Usage: "Project dependencies ( separated with comma )", }, }, Action: gitCommands.Add}, {Name: "ginit", Usage: "initialize " + labels.RepositoryLabel + " with Initializr", ArgsUsage: "repo type name dependencies", Action: gitCommands.Init}, - {Name: "exec", Usage: "execute script / action on " + labels.RepositoryLabel + "", ArgsUsage: "glob action", Flags: []cli.Flag{ - cli.BoolFlag{ - Name: "interactive, i", - Usage: "Wait manual approval after each steps", + {Name: "exec", Usage: "execute script / action on " + labels.RepositoryLabel + "", ArgsUsage: "[glob] [action]", Flags: []cli.Flag{ + &cli.BoolFlag{ + Name: "interactive", + Aliases: []string{"i"}, + Usage: "Wait manual approval after each steps", + }, + &cli.StringFlag{ + Name: "branch", + Aliases: []string{"b"}, + Usage: "Name of branch to create for execution", }, - cli.StringFlag{ - Name: "branch, b", - Usage: "Name of branch to create for execution", + &cli.StringFlag{ + Name: "commit-message", + Aliases: []string{"cm"}, + Usage: "Message of commit", }, - cli.StringFlag{ - Name: "commitMessage, cm", - Usage: "Message of commit", + &cli.BoolFlag{ + Name: "review", + Aliases: []string{"r"}, + Usage: "Enable creation of " + labels.CodeReviewRequest, }, - cli.BoolFlag{ - Name: "review, r", - Usage: "Enable creation of " + labels.CodeReviewRequest, + &cli.StringFlag{ + Name: "review-title", + Aliases: []string{"rt"}, + Usage: "Title of review use on " + labels.CodeReviewRequest, }, - cli.StringFlag{ - Name: "reviewTitle, rt", - Usage: "Title of review use on " + labels.CodeReviewRequest, + &cli.StringFlag{ + Name: "review-message", + Aliases: []string{"rm"}, + Usage: "Message of review use on " + labels.CodeReviewRequest, }, - cli.StringFlag{ - Name: "reviewMessage, rm", - Usage: "Message of review use on " + labels.CodeReviewRequest, + &cli.BoolFlag{ + Name: "review-draft", + Aliases: []string{"rd"}, + Usage: "Submit " + labels.CodeReviewRequest + " as draft", }, }, Action: gitCommands.Exec}, + {Name: "shell", Usage: "Enter in interactive shell mode", Action: displayPrompt}, {Name: "exit", Usage: "exit the prompt", Action: exitCommand}, {Name: "clear", Usage: "clear the screen", Action: clearCommand}, }, "Name").(map[string]cli.Command) @@ -88,7 +114,7 @@ func InitCommands(config config.Config) []cli.Command { return Commands.GetCliCmdArray() } -func (c *CliCommands) GetCliCmdArray() []cli.Command { +func (c *CliCommands) GetCliCmdArray() []*cli.Command { commands := funk.Values(c).([]cli.Command) @@ -96,16 +122,35 @@ func (c *CliCommands) GetCliCmdArray() []cli.Command { return commands[i].Name < commands[j].Name }) - return commands + // var cmds []*cli.Command + return funk.Map(commands, func(c cli.Command) *cli.Command { return &c }).([]*cli.Command) } -func exitCommand(c *cli.Context) error { +func exitCommand(_ context.Context, c *cli.Command) error { os.Exit(0) return nil } -func clearCommand(c *cli.Context) error { +func clearCommand(_ context.Context, c *cli.Command) error { fmt.Print("\033[2J") fmt.Printf("\033[%d;%dH", 1, 1) return nil } + +// Display interactive prompt +func displayPrompt(_ context.Context, c *cli.Command) error { + + p := prompt.New( + NexExecutor(c.Root()).Execute, + Completer, + prompt.OptionTitle("Microbox CLI"), + prompt.OptionPrefix("=> "), + prompt.OptionAddKeyBind(prompt.KeyBind{Key: prompt.ControlC, Fn: func(buffer *prompt.Buffer) { + os.Exit(1) + }}), + ) + + p.Run() + + return nil +} diff --git a/impl/completer.go b/impl/completer.go index d17e609..648c8da 100644 --- a/impl/completer.go +++ b/impl/completer.go @@ -3,7 +3,7 @@ package impl import ( "github.com/c-bata/go-prompt" "github.com/thoas/go-funk" - "github.com/urfave/cli" + "github.com/urfave/cli/v3" ) // completer returns the completion items from user input. diff --git a/impl/config/config.go b/impl/config/config.go index 2d3f12e..45cc865 100644 --- a/impl/config/config.go +++ b/impl/config/config.go @@ -3,14 +3,15 @@ package config import ( "bufio" "errors" - "github.com/BurntSushi/toml" - "github.com/zalando/go-keyring" "log" "net/url" "os" "os/user" "path/filepath" "strings" + + "github.com/BurntSushi/toml" + "github.com/zalando/go-keyring" ) const CONFIG_FILE = ".microbox/config.toml" @@ -37,6 +38,9 @@ type GitConfig struct { PrivateToken string GroupIds []string IncludeArchivedProjects bool + NormalizeName bool + CloneProtocol string + UseTokenForOperation bool } type InitializrConfig struct { @@ -61,7 +65,7 @@ func Exist() (bool, error) { func Load() (*Config, error) { - if exist, err := Exist(); exist == false { + if exist, err := Exist(); !exist { return nil, err } @@ -78,6 +82,11 @@ func Load() (*Config, error) { conf.Git.PrivateToken = getPassword(conf.Git) } + // Default to SSH clone protocol + if len(conf.Git.CloneProtocol) == 0 { + conf.Git.CloneProtocol = "ssh" + } + return &conf, nil } @@ -86,11 +95,14 @@ func Save(config Config) { configFile, _ := getConfigFile() dir := filepath.Dir(configFile) - os.Mkdir(dir, 0755) + err := os.Mkdir(dir, 0755) + if err != nil { + panic(err) + } file, _ := os.Create(configFile) - defer file.Close() + defer closeFile(file) writer := bufio.NewWriter(file) @@ -101,14 +113,17 @@ func Save(config Config) { config.Git.PrivateToken = "" } - toml.NewEncoder(writer).Encode(config) + writeError := toml.NewEncoder(writer).Encode(config) + if writeError != nil { + panic(writeError) + } } func getConfigFile() (string, error) { currentDir, err := os.Getwd() if err != nil { - return "", errors.New("Cannot retreive current dir.") + return "", errors.New("cannot retreive current dir") } return filepath.Join(currentDir, CONFIG_FILE), nil @@ -149,3 +164,10 @@ func savePassword(conf GitConfig) { } } + +func closeFile(f *os.File) { + err := f.Close() + if err != nil { + panic(err) + } +} diff --git a/impl/executor.go b/impl/executor.go index d638ec1..04b90e7 100644 --- a/impl/executor.go +++ b/impl/executor.go @@ -1,20 +1,20 @@ package impl import ( - "flag" "fmt" - "github.com/urfave/cli" "os" "strings" + + "github.com/urfave/cli/v3" ) type Executor struct { - context *cli.Context + command *cli.Command } -func NexExecutor(context *cli.Context) *Executor { +func NexExecutor(command *cli.Command) *Executor { return &Executor{ - context: context, + command: command, } } @@ -22,9 +22,10 @@ func NexExecutor(context *cli.Context) *Executor { func (e *Executor) Execute(s string) { s = strings.TrimSpace(s) - if s == "" { + switch s { + case "": return - } else if s == "quit" || s == "exit" { + case "quit", "exit": fmt.Println("Bye!") os.Exit(0) return @@ -33,13 +34,11 @@ func (e *Executor) Execute(s string) { args := strings.Split(s, " ") cmd := args[0] - cli.HandleAction(e.context.App.Command(cmd).Action, e.makeContext(args[1:])) -} - -func (e *Executor) makeContext(args []string) *cli.Context { - - flagSet := flag.NewFlagSet("cmd", flag.ContinueOnError) - flagSet.Parse(args) + command := e.command.Command(cmd) + if command != nil { + command.Action(nil, e.command) //nolint:errcheck + return + } - return cli.NewContext(e.context.App, flagSet, e.context) + e.command.CommandNotFound(nil, e.command, cmd) } diff --git a/impl/git/azure.go b/impl/git/azure.go new file mode 100644 index 0000000..91c4e7e --- /dev/null +++ b/impl/git/azure.go @@ -0,0 +1,356 @@ +package git + +import ( + "errors" + "fmt" + "strconv" + "strings" + + "github.com/go-resty/resty/v2" + "github.com/thoas/go-funk" + "github.com/urfave/cli/v3" + "github.com/vanroy/microcli/impl/config" + "github.com/vanroy/microcli/impl/prompt" +) + +type azure struct { + config config.Config + labels Labels +} + +type azProject struct { + Id string `json:"id"` + Name string `json:"name"` + Description string `json:"description"` + Url string `json:"url"` + State string `json:"state"` + Revision int `json:"revision"` + Visibility string `json:"visibility"` +} + +type azProjectResponse struct { + Value []azProject `json:"value"` + Count int `json:"count"` +} + +type azRepository struct { + Id string `json:"id"` + Name string `json:"name"` + Url string `json:"url"` + RemoteUrl string `json:"remoteUrl"` + SshUrl string `json:"sshUrl"` + WebUrl string `json:"webUrl"` + DefaultBranch string `json:"defaultBranch"` + Project azProject `json:"project"` +} + +type azRepositoriesResponse struct { + Value []azRepository `json:"value"` + Count int `json:"count"` +} + +type azProcess struct { + Id string `json:"id"` + Name string `json:"name"` + Description string `json:"description"` + IsDefault bool `json:"isDefault"` +} + +type azProcessResponse struct { + Value []azProcess `json:"value"` + Count int `json:"count"` +} + +type azCreateProject struct { + Name string `json:"name"` + Description string `json:"description"` + Capabilities azCreateProjectCapabilities `json:"capabilities"` + Visibility string `json:"visibility"` +} + +type azCreateProjectCapabilities struct { + VersionControl azCreateProjectVersionControl `json:"versioncontrol"` + ProcessTemplate azCreateProjectProcessTemplate `json:"processTemplate"` +} + +type azCreateProjectVersionControl struct { + Type string `json:"sourceControlType"` +} + +type azCreateProjectProcessTemplate struct { + Id string `json:"templateTypeId"` +} + +type azCreateProjectResponse struct { + Id string `json:"id"` + Status string `json:"status"` + Url string `json:"url"` +} + +type azCreateRepository struct { + Name string `json:"name"` + Project azCreateRepositoryProject `json:"project"` +} + +type azCreateRepositoryProject struct { + Id string `json:"id"` +} + +type azCreatePullRequest struct { + Title string `json:"title"` + Description string `json:"description"` + SourceRefName string `json:"sourceRefName"` + TargetRefName string `json:"targetRefName"` + IsDraft bool `json:"isDraft"` +} + +type azPullRequest struct { + PullRequestId int `json:"pullRequestId"` + Repository azRepository `json:"repository"` + Url string `json:"url"` + Status string `json:"status"` +} + +var azProjectVisibilities = []prompt.Option{ + {Id: "private", Name: "Private"}, + {Id: "public", Name: "Public"}, +} + +func newAzure(config config.Config) gitRemote { + return &azure{ + config: config, + labels: Labels{ + GroupLabel: "projet", + GroupsLabel: "projets", + RepositoryLabel: "repository", + RepositoriesLabel: "repositories", + CreateGroupUsage: "name [description] [visibility] [process]", + CreateRepositoryUsage: "[project] name", + CodeReviewRequest: "pull requests", + }, + } +} + +func (az *azure) getLabels() Labels { + return az.labels +} + +func (az *azure) createGroup(args cli.Args) (string, error) { + + processResp, processErr := az.execGet("_apis/process/processes?api-version=7.1", &azProcessResponse{}) + if processErr != nil { + return "", processErr + } + + var selectedProcessId = "" + var defaultProcessId = "" + processOptions := funk.Map(processResp.(*azProcessResponse).Value, func(process azProcess) prompt.Option { + var def = "" + + if args.Get(3) == process.Name { + selectedProcessId = process.Id + } + + if process.IsDefault { + def = " (default)" + defaultProcessId = process.Id + } + return prompt.Option{Id: process.Id, Name: fmt.Sprintf("%s : %s%s", process.Name, process.Description, def)} + }).([]prompt.Option) + + projectName := prompt.Input("Enter your project name :", args.Get(0)) + projectDescription := prompt.Input("\nEnter your project description :", args.Get(1)) + visibility := prompt.Choice("\nSelect your project visibility :", azProjectVisibilities, args.Get(2)) + projectProcessTemplateId := prompt.Choice("\nSelect your project process template :", processOptions, selectedProcessId) + if projectProcessTemplateId == "" { + projectProcessTemplateId = defaultProcessId + } + + prompt.PrintNewLine() + + data := azCreateProject{ + Name: projectName, + Description: projectDescription, + Visibility: visibility, + Capabilities: azCreateProjectCapabilities{ + VersionControl: azCreateProjectVersionControl{Type: "GIT"}, + ProcessTemplate: azCreateProjectProcessTemplate{Id: projectProcessTemplateId}, + }, + } + + createResp, err := az.execPost("_apis/projects?api-version=2.0-preview", data, &azCreateProjectResponse{}) + + if err != nil { + prompt.PrintErrorf("Cannot create project. ( %s )", err.Error()) + return "", err + } + + prompt.PrintInfo("Project created") + + return createResp.(*azCreateProjectResponse).Id, nil +} + +func (az *azure) createRepository(args cli.Args) (string, error) { + + groups, _ := az.getGroups() + + groups = funk.Filter(groups, func(g gitGroup) bool { return funk.ContainsString(az.config.Git.GroupIds, g.Id) }).([]gitGroup) + + idx := 0 + groupId := "" + if len(groups) == 0 { + prompt.PrintErrorf("No projects available") + return "", errors.New("no projects available") + } else if len(groups) == 1 { + groupId = groups[0].Id + } else { + defaultProjectId := "" + groupOptions := funk.Map(groups, func(group gitGroup) prompt.Option { + if args.Get(0) == group.Name { + defaultProjectId = group.Id + } + return prompt.Option{Id: group.Id, Name: group.Name} + }).([]prompt.Option) + + groupId = prompt.Choice("Select your project :", groupOptions, defaultProjectId) + idx = idx + 1 + } + + projectName := prompt.Input("\nEnter your repository name :", args.Get(idx)) + prompt.PrintNewLine() + + data := azCreateRepository{ + Name: projectName, + Project: azCreateRepositoryProject{ + Id: groupId, + }, + } + + createResp, err := az.execPost("_apis/git/repositories/?api-version=7.1", data, &azRepository{}) + + if err != nil { + prompt.PrintErrorf("Cannot create repository. ( %s )", err.Error()) + return "", err + } + + prompt.PrintInfo("Repository created") + + return createResp.(*azRepository).Id, nil +} + +func (az *azure) getGroups() ([]gitGroup, error) { + + resp, err := az.execGet("_apis/projects/?api-version=7.1", &azProjectResponse{}) + if err != nil { + return nil, err + } + + return funk.Map(resp.(*azProjectResponse).Value, az.toGitGroup).([]gitGroup), nil +} + +func (az *azure) getRepositories() ([]gitRepository, error) { + + var repos []gitRepository + + funk.ForEach(az.config.Git.GroupIds, func(groupId string) { + + resp, err := az.execGet(groupId+"/_apis/git/repositories/?api-version=7.1", &azRepositoriesResponse{}) + if err == nil { + repos = append(repos, funk.Map(resp.(*azRepositoriesResponse).Value, az.toGitRepo(groupId)).([]gitRepository)...) + } + }) + + return repos, nil +} + +func (az *azure) createReviewRequest(groupId string, repoId string, from string, into string, title string, message string, draft bool) (reviewRequest, error) { + data := azCreatePullRequest{ + Title: title, + SourceRefName: "refs/heads/" + strings.TrimPrefix(from, "refs/heads/"), + TargetRefName: "refs/heads/" + strings.TrimPrefix(into, "refs/heads/"), + Description: message, + IsDraft: draft, + } + + azReview, err := az.execPost(groupId+"/_apis/git/repositories/"+repoId+"/pullrequests?api-version=7.1", data, &azPullRequest{}) + if err != nil { + return reviewRequest{}, err + } + + return az.toReviewRequest(azReview.(*azPullRequest)), err +} + +func (az *azure) execGet(url string, resultType interface{}) (interface{}, error) { + + resp, err := resty.New().R(). + SetBasicAuth("", az.config.Git.PrivateToken). + SetResult(resultType). + Get(az.config.Git.BaseUrl + "/" + url) + + if err != nil { + prompt.PrintError(resp.String()) + } + + return resp.Result(), err +} + +func (az *azure) execPost(url string, data interface{}, resultType interface{}) (interface{}, error) { + + resp, err := resty.New().R(). + SetBasicAuth("", az.config.Git.PrivateToken). + SetResult(resultType). + SetBody(data). + Post(az.config.Git.BaseUrl + "/" + url) + + if err != nil { + return nil, err + } + + if resp.StatusCode() < 200 || resp.StatusCode() > 300 { + return nil, fmt.Errorf("cannot execute post request. Status code : %d. Message : %s", resp.StatusCode(), resp.String()) + } + + return resp.Result(), nil +} + +func (az *azure) toGitRepo(groupId string) interface{} { + + return func(repository azRepository) gitRepository { + return gitRepository{ + Id: repository.Id, + Name: repository.Name, + NameWithNamespace: repository.Project.Name + " / " + repository.Name, + Path: az.normalize(repository.Name), + PathWithNamespace: az.normalize(repository.Project.Name) + "/" + az.normalize(repository.Name), + SshUrl: repository.SshUrl, + HttpUrl: repository.RemoteUrl, + DefaultBranch: strings.TrimPrefix(repository.DefaultBranch, "refs/heads/"), + Archived: false, + GroupId: groupId, + } + } +} + +func (az *azure) toGitGroup(project azProject) gitGroup { + + return gitGroup{ + Id: project.Id, + Name: project.Name, + } +} +func (az *azure) toReviewRequest(request *azPullRequest) reviewRequest { + + return reviewRequest{ + Id: strconv.Itoa(request.PullRequestId), + Url: fmt.Sprintf("%s/pullrequest/%d", request.Repository.WebUrl, request.PullRequestId), + State: request.Status, + Mergeable: "", + } +} + +func (az *azure) normalize(name string) string { + if !az.config.Git.NormalizeName { + return name + } + return strings.ToLower(strings.ReplaceAll(name, " ", "-")) +} diff --git a/impl/git/commands.go b/impl/git/commands.go index 8a79bb6..a697aac 100644 --- a/impl/git/commands.go +++ b/impl/git/commands.go @@ -1,19 +1,22 @@ package git import ( + "context" + "encoding/base64" "fmt" - "github.com/gobwas/glob" + "os" + "path/filepath" + "sort" + "strings" + "github.com/thoas/go-funk" - "github.com/urfave/cli" + "github.com/urfave/cli/v3" "github.com/vanroy/microcli/impl/cmd" "github.com/vanroy/microcli/impl/config" "github.com/vanroy/microcli/impl/file" + "github.com/vanroy/microcli/impl/glob" "github.com/vanroy/microcli/impl/initialzr" "github.com/vanroy/microcli/impl/prompt" - "os" - "path/filepath" - "sort" - "strings" ) const ( @@ -21,6 +24,7 @@ const ( ) type GitCommands struct { + config config.Config impl gitRemote initializr *initialzr.Initializr } @@ -34,19 +38,20 @@ type GitImplement struct { var gitImplements = []GitImplement{ {Id: "github", Name: "GitHub", Impl: newGitHub}, {Id: "gitlab", Name: "GitLab", Impl: newGitLab}, - {Id: "visualstudio", Name: "VisualStudio", Impl: newVisualStudio}, + {Id: "azure", Name: "Azure DevOps", Impl: newAzure}, } func NewCommands(config config.Config) *GitCommands { return &GitCommands{ + config: config, impl: getImpl(config), initializr: initialzr.NewInitializr(config), } } // Init config -func Init(c *cli.Context) error { +func Init(_ context.Context, c *cli.Command) error { typeOptions := funk.Map(gitImplements, func(impl GitImplement) prompt.Option { return prompt.Option{Id: impl.Id, Name: impl.Name} @@ -57,7 +62,6 @@ func Init(c *cli.Context) error { gitTypeName := getImplCfg(gitType).Name baseUrl := prompt.Input(fmt.Sprintf("Enter your %s base url :", gitTypeName)) - prompt.PrintNewLine() token := prompt.Password(fmt.Sprintf("Enter your %s token :", gitTypeName)) prompt.PrintNewLine() @@ -72,11 +76,11 @@ func Init(c *cli.Context) error { impl := getImpl(tmpConfig) groups, err := impl.getGroups() if err != nil { - prompt.PrintError("Cannot retrieve %s (%s)", impl.getLabels().GroupsLabel, err.Error()) + prompt.PrintErrorf("Cannot retrieve %s (%s)", impl.getLabels().GroupsLabel, err.Error()) os.Exit(1) } if len(groups) == 0 { - prompt.PrintError("Cannot retrieve %s", impl.getLabels().GroupsLabel) + prompt.PrintErrorf("Cannot retrieve %s", impl.getLabels().GroupsLabel) os.Exit(1) } @@ -84,11 +88,32 @@ func Init(c *cli.Context) error { return prompt.Option{Id: group.Id, Name: group.Name} }).([]prompt.Option) + prompt.PrintNewLine() groupId := prompt.Choice("Select group to add on workspace :", groupOptions) prompt.PrintNewLine() tmpConfig.Git.GroupIds = []string{groupId} + protocolOptions := []prompt.Option{ + {Id: "ssh", Name: "SSH"}, + {Id: "https", Name: "HTTPS"}, + } + + protocol := prompt.Choice("Select the protocol used for cloning repositories :", protocolOptions) + prompt.PrintNewLine() + + tmpConfig.Git.CloneProtocol = protocol + + if protocol == "https" { + useTokenOpen := []prompt.Option{ + {Id: "token", Name: "Use token for GIT operation"}, + {Id: "cm", Name: "Use GIT integrated authentication ( git-credentials-manager)"}, + } + useToken := prompt.Choice("Select the protocol used for cloning repositories :", useTokenOpen) + prompt.PrintNewLine() + tmpConfig.Git.UseTokenForOperation = useToken == "token" + } + config.Save(tmpConfig) return nil @@ -100,9 +125,9 @@ func (g *GitCommands) GetLabels() Labels { } // Return list of GIT repository present in local folder -func (g *GitCommands) ListLocal(c *cli.Context) error { +func (g *GitCommands) ListLocal(_ context.Context, c *cli.Command) error { - folders, err := getGitFolders("") + folders, err := getGitFolders("", c.StringArgs("exclude")) if err != nil { return err } @@ -119,43 +144,44 @@ func (g *GitCommands) ListLocal(c *cli.Context) error { } // Return list of GIT repository present on remote server -func (g *GitCommands) ListRemote(c *cli.Context) error { +func (g *GitCommands) ListRemote(_ context.Context, c *cli.Command) error { repos, err := g.impl.getRepositories() if err != nil || len(repos) == 0 { - prompt.PrintError("No project found") + prompt.PrintErrorf("No project found") } funk.ForEach(repos, func(repo gitRepository) { - prompt.PrintItem(repo.NameWithNamespace + " ( " + strings.Replace(repo.Description, "\n", " ", -1) + " )") + prompt.PrintItem(repo.NameWithNamespace + " ( " + strings.ReplaceAll(repo.Description, "\n", " ") + " )") }) return nil } // Clone GIT repository matching with pattern -func (g *GitCommands) Clone(c *cli.Context) error { +func (g *GitCommands) Clone(_ context.Context, c *cli.Command) error { var globStr = "" if c.NArg() > 0 { globStr = c.Args().Get(0) } - _, error := g.cloneRepos(globStr, true) + _, error := g.cloneRepos(globStr, c.StringSlice("exclude"), true) return error } // PULL + REBASE all local GIT repository -func (g *GitCommands) Up(c *cli.Context) error { +func (g *GitCommands) Up(_ context.Context, c *cli.Command) error { - folders, err := getGitFolders(c.Args().Get(0)) + folders, err := getGitFolders(c.Args().Get(0), c.StringSlice("exclude")) if err != nil { return err } funk.ForEach(folders, func(folder string) { - var args = []string{"-C", file.Rel(folder), "pull", "-q", "--rebase"} + args := g.authorization() + args = append(args, []string{"-C", file.Rel(folder), "pull", "-q", "--rebase"}...) if c.Bool("stash") { args = append(args, "--autostash") } @@ -172,9 +198,9 @@ func (g *GitCommands) Up(c *cli.Context) error { } // Display status for all local GIT repository -func (g *GitCommands) St(c *cli.Context) error { +func (g *GitCommands) St(_ context.Context, c *cli.Command) error { - folders, err := getGitFolders(c.Args().Get(0)) + folders, err := getGitFolders(c.Args().Get(0), c.StringArgs("exclude")) if err != nil { return err } @@ -185,15 +211,18 @@ func (g *GitCommands) St(c *cli.Context) error { } // Add new ( group / orga / project ) on remote hosting -func (g *GitCommands) AddGroup(c *cli.Context) error { +func (g *GitCommands) AddGroup(_ context.Context, c *cli.Command) error { - g.impl.createGroup(c.Args()) + _, err := g.impl.createGroup(c.Args()) + if err != nil { + prompt.PrintErrorf("Cannot create group, error : %s", err.Error()) + } return nil } // Add new GIT repository on remote hosting -func (g *GitCommands) Add(c *cli.Context) error { +func (g *GitCommands) Add(_ context.Context, c *cli.Command) error { id, err := g.impl.createRepository(c.Args()) if err != nil { @@ -223,29 +252,35 @@ func (g *GitCommands) Add(c *cli.Context) error { repo := funk.Find(repos, func(repo gitRepository) bool { return repo.Id == id }).(gitRepository) - _, cloneErr := clone(repo.SshUrl, repo.Path) + _, cloneErr := g.clone(g.computeCloneUrl(repo), repo.Path) if cloneErr != nil { return cloneErr } // Init repo - g.initRepo(repo.Path, pType, pName, pDeps) + initErr := g.initRepo(repo.Path, pType, pName, pDeps) + if initErr != nil { + prompt.PrintErrorf("Cannot init repository, error : %s", err.Error()) + } } return nil } // Initialize existing GIT repository -func (g *GitCommands) Init(c *cli.Context) error { +func (g *GitCommands) Init(_ context.Context, c *cli.Command) error { // Init repository - g.initRepo(c.Args().Get(0), c.Args().Get(1), c.Args().Get(2), c.Args().Get(3)) + err := g.initRepo(c.Args().Get(0), c.Args().Get(1), c.Args().Get(2), c.Args().Get(3)) + if err != nil { + prompt.PrintErrorf("Cannot init repository, error : %s", err.Error()) + } return nil } // Execute scripts on repositories -func (g *GitCommands) Exec(c *cli.Context) error { +func (g *GitCommands) Exec(_ context.Context, c *cli.Command) error { pGlob := prompt.Input("\nEnter your project filter :", c.Args().Get(0)) pAction := prompt.Input("\nEnter your action name :", c.Args().Get(1)) @@ -254,32 +289,33 @@ func (g *GitCommands) Exec(c *cli.Context) error { acceptAll := false isInteractive := c.Bool("interactive") branchName := c.String("branch") - commitMessage := c.String("commitMessage") + commitMessage := c.String("commit-message") review := c.Bool("review") - reviewTitle := c.String("reviewTitle") + reviewTitle := c.String("review-title") if len(reviewTitle) == 0 { reviewTitle = commitMessage } - reviewMessage := c.String("reviewMessage") + reviewMessage := c.String("review-message") + reviewDraft := c.Bool("review-draft") pParams := []string{} - if len(c.Args()) < 2 { + if c.Args().Len() < 2 { pParams = strings.Split(prompt.Input("\nEnter your action parameters :"), " ") } else { - pParams = c.Args()[2:] + pParams = c.Args().Slice()[2:] } // Start by cloning matching repositories - repos, err := g.cloneRepos(pGlob, false) + repos, err := g.cloneRepos(pGlob, c.StringArgs("exclude"), false) if err != nil { - prompt.PrintError("Cannot clone repositories (%s)", err.Error()) + prompt.PrintErrorf("Cannot clone repositories (%s)", err.Error()) return err } pathToRepo := funk.Map(repos, func(r gitRepository) (string, gitRepository) { return r.Path, r }).(map[string]gitRepository) - folders, _ := getGitFolders(pGlob) + folders, _ := getGitFolders(pGlob, c.StringArgs("exclude")) funk.ForEach(folders, func(folder string) { repo := pathToRepo[folder] @@ -291,9 +327,9 @@ func (g *GitCommands) Exec(c *cli.Context) error { prompt.PrintInfo("Executing action for '%s'", folder) - //Cleanup ( defaultBranch ) + // Cleanup ( defaultBranch ) prompt.PrintInfo("Executing action for '%s' : %sinitializing", folder, prompt.Color(prompt.FgYellow)) - cleanup(folder, defaultBranch) + g.cleanup(folder, defaultBranch) // Check branch if required if len(branchName) > 0 { @@ -302,11 +338,12 @@ func (g *GitCommands) Exec(c *cli.Context) error { if isInteractive && !acceptAll { response := prompt.RestrictedInput("Initialization done, continue to execute?", acceptedInputs) - if response == "q" { + switch response { + case "q": os.Exit(0) - } else if response == "n" { + case "n": return - } else if response == "a" { + case "a": acceptAll = true } } @@ -315,7 +352,7 @@ func (g *GitCommands) Exec(c *cli.Context) error { prompt.PrintInfo("Executing action for '%s' : %sexecuting", folder, prompt.Color(prompt.FgYellow)) out, err := g.exec(folder, pAction, pParams) if err != nil { - prompt.PrintError("Cannot execute action for %s , error : %s \n%s", folder, err.Error(), out) + prompt.PrintErrorf("Cannot execute action for %s , error : %s \n%s", folder, err.Error(), out) return } @@ -328,7 +365,7 @@ func (g *GitCommands) Exec(c *cli.Context) error { for { response := prompt.RestrictedInput("Execution done, continue to commit?", append(acceptedInputs, "d")) if response == "y" { - break; + break } else if response == "q" { os.Exit(0) } else if response == "n" { @@ -339,7 +376,7 @@ func (g *GitCommands) Exec(c *cli.Context) error { } else if response == "d" { err := displayDiff(folder) if err != nil { - prompt.PrintError("Cannot execute diff for %s , error : %s \n", folder, err.Error()) + prompt.PrintErrorf("Cannot execute diff for %s , error : %s \n", folder, err.Error()) } } } @@ -350,35 +387,38 @@ func (g *GitCommands) Exec(c *cli.Context) error { if isInteractive && !acceptAll { response := prompt.RestrictedInput("Commit done, continue to push?", acceptedInputs) - if response == "q" { + switch response { + case "q": os.Exit(0) - } else if response == "n" { + case "n": return - } else if response == "a" { + case "a": acceptAll = true } } prompt.PrintInfo("Executing action for '%s' : %spushing", folder, prompt.Color(prompt.FgYellow)) - push(folder, branchName) + g.push(folder, branchName) if repo.Id != "" && len(branchName) > 0 && branchName != defaultBranch && review && len(reviewTitle) > 0 { if isInteractive && !acceptAll { response := prompt.RestrictedInput("Push done, continue to create "+g.GetLabels().CodeReviewRequest+"?", acceptedInputs) - if response == "q" { + + switch response { + case "q": os.Exit(0) - } else if response == "n" { + case "n": return - } else if response == "a" { + case "a": acceptAll = true } } prompt.PrintInfo("Executing action for '%s' : %screating %s", folder, prompt.Color(prompt.FgYellow), g.GetLabels().CodeReviewRequest) - review, err := g.impl.createReviewRequest(repo.GroupId, folder, branchName, defaultBranch, reviewTitle, reviewMessage) + review, err := g.impl.createReviewRequest(repo.GroupId, repo.Id, branchName, defaultBranch, reviewTitle, reviewMessage, reviewDraft) if err != nil { - prompt.PrintError("Cannot create %s for '%s' : , error : %s", g.GetLabels().CodeReviewRequest, folder, err.Error()) + prompt.PrintErrorf("Cannot create %s for '%s' : , error : %s", g.GetLabels().CodeReviewRequest, folder, err.Error()) } else { prompt.PrintInfo("Succeeded to create %s for '%s' , URL: %s%s", g.GetLabels().CodeReviewRequest, folder, prompt.Color(prompt.FgBlue), review.Url) } @@ -400,33 +440,27 @@ func (g *GitCommands) Exec(c *cli.Context) error { // Execute scripts one repository func (g *GitCommands) exec(folder string, action string, params []string) (string, error) { - dir, _ := os.Getwd() return cmd.ExecCmdDir(dir+"/.microbox/actions/"+action, params, dir+"/"+folder) } // Clone GIT repository matching with pattern -func (g *GitCommands) cloneRepos(globStr string, output bool) ([]gitRepository, error) { +func (g *GitCommands) cloneRepos(globStr string, exclusion []string, output bool) ([]gitRepository, error) { repos, err := g.impl.getRepositories() if err != nil || len(repos) == 0 { if output { - prompt.PrintError("No project found") + prompt.PrintErrorf("No project found") } } - var pattern glob.Glob - var patternString string - - if globStr != "" { - patternString = globStr - pattern = glob.MustCompile(patternString, '-', '.', '_', '/') - } + var matcher = glob.NewGlobMatcher(globStr, exclusion...) funk.ForEach(repos, func(repo gitRepository) { - if pattern != nil && !pattern.Match(repo.Path) { + match, reason := matcher.Match(repo.Path) + if !match { if output { - prompt.PrintInfo("'%s' not match with pattern '%s' %sskipping", repo.Name, patternString, prompt.Color(prompt.FgYellow)) + prompt.PrintInfo("%s %sskipping", reason, prompt.Color(prompt.FgYellow)) } return } @@ -441,8 +475,8 @@ func (g *GitCommands) cloneRepos(globStr string, output bool) ([]gitRepository, prompt.PrintInfo("'%s' not existing, %scloning%s into '%s'", repo.Name, prompt.Color(prompt.FgGreen), prompt.Color(prompt.FgWhite), repo.Path) } - if out, err := clone(repo.SshUrl, repo.Path); err != nil { - prompt.PrintError("Cannot clone ( %s )", err) + if out, err := g.clone(g.computeCloneUrl(repo), repo.Path); err != nil { + prompt.PrintErrorf("Cannot clone ( %s )", err) } else { if checkIsRepoEmptyErr(out) { if output { @@ -469,7 +503,7 @@ func (g *GitCommands) initRepo(folder string, projectType string, projectName st addAndCommit(folder, "Initial commit", false) // Push - push(folder, "") + g.push(folder, "") return nil } @@ -502,7 +536,7 @@ func (g *GitCommands) status(folder string) { } else { // Fetch from remote - fetch(folder) + g.fetch(folder) // Check for diverged branches local, remote := checkBranchOrigin(folder, currentBranch) @@ -519,21 +553,44 @@ func (g *GitCommands) status(folder string) { } } +// Compute Clone URL based on selected protocol +func (g *GitCommands) computeCloneUrl(repo gitRepository) string { + cloneProtocol := g.config.Git.CloneProtocol + switch cloneProtocol { + case "ssh": + return repo.SshUrl + case "https": + return repo.HttpUrl + default: + prompt.PrintErrorf("Invalid clone URL protocol '%s'", cloneProtocol) + os.Exit(1) + return "" + } +} + +// Compute authorization GIT parameter if required +func (g *GitCommands) authorization() []string { + + cloneProtocol := g.config.Git.CloneProtocol + usePatToken := g.config.Git.UseTokenForOperation + + if cloneProtocol != "https" || !usePatToken { + return []string{} + } + + pat := base64.StdEncoding.EncodeToString([]byte(":" + g.config.Git.PrivateToken)) + return []string{"-c", "http.extraHeader=Authorization: Basic " + pat} +} + // Return all git folders matching with glob -func getGitFolders(globPattern string) (folders []string, err error) { +func getGitFolders(globPattern string, exclusion []string) (folders []string, err error) { dir, err := os.Getwd() if err != nil { return nil, err } - var pattern glob.Glob - var patternString string - - if globPattern != "" { - patternString = globPattern - pattern = glob.MustCompile(patternString, '-', '.', '_', '/') - } + var matcher = glob.NewGlobMatcher(globPattern, exclusion...) var gitFolders []string @@ -543,9 +600,9 @@ func getGitFolders(globPattern string) (folders []string, err error) { relativePath := strings.TrimPrefix(filepath.Clean(strings.TrimPrefix(path, dir)), string(os.PathSeparator)) if strings.HasSuffix(relativePath, "/.git") { - folder := strings.TrimSuffix(relativePath, "/.git") - if pattern == nil || pattern.Match(folder) { + match, _ := matcher.Match(folder) + if match { gitFolders = append(gitFolders, folder) } } @@ -619,37 +676,33 @@ func checkBranchOrigin(folder string, branch string) (string, string) { } // Return true if files is changed and not tracked in GIT repo -func clone(sshUrl string, folder string) (string, error) { - return cmd.ExecCmd("git", []string{"clone", "-q", sshUrl, folder}) +func (g *GitCommands) clone(cloneUrl string, folder string) (string, error) { + return cmd.ExecCmd("git", append(g.authorization(), []string{"clone", "-q", cloneUrl, folder}...)) } // Return true if files is changed and not tracked in GIT repo -func fetch(folder string) { - cmd.ExecCmd("git", []string{"-C", file.Rel(folder), "fetch"}) +func (g *GitCommands) fetch(folder string) { + cmd.ExecCmd("git", append(g.authorization(), []string{"-C", file.Rel(folder), "fetch"}...)) //nolint:errcheck } // Checkout existing branch func checkout(folder string, branch string) { - cmd.ExecCmd("git", []string{"-C", file.Rel(folder), "checkout", branch}) + cmd.ExecCmd("git", []string{"-C", file.Rel(folder), "checkout", branch}) //nolint:errcheck } // Create new branch func branch(folder string, branch string) { - cmd.ExecCmd("git", []string{"-C", file.Rel(folder), "checkout", "-B", branch}) + cmd.ExecCmd("git", []string{"-C", file.Rel(folder), "checkout", "-B", branch}) //nolint:errcheck } // Cleanup repo and update to specified branch -func cleanup(folder string, branch string) { - cmd.ExecCmd("git", []string{"-C", file.Rel(folder), "stash", "save", "Auto-stash by microcli"}) - cmd.ExecCmd("git", []string{"-C", file.Rel(folder), "checkout", branch}) - cmd.ExecCmd("git", []string{"-C", file.Rel(folder), "pull", "-q", "--rebase"}) +func (g *GitCommands) cleanup(folder string, branch string) { + cmd.ExecCmd("git", []string{"-C", file.Rel(folder), "stash", "save", "Auto-stash by microcli"}) //nolint:errcheck + cmd.ExecCmd("git", []string{"-C", file.Rel(folder), "checkout", branch}) //nolint:errcheck + cmd.ExecCmd("git", append(g.authorization(), []string{"-C", file.Rel(folder), "pull", "-q", "--rebase"}...)) //nolint:errcheck } // Show diff -func diff(folder string) (string, error) { - return cmd.ExecCmd("git", []string{"-C", file.Rel(folder), "diff"}) -} - func displayDiff(folder string) error { return cmd.ExecAndOutCmd("git", []string{"-C", file.Rel(folder), "diff"}) } @@ -675,9 +728,10 @@ func addAndCommit(folder string, comment string, onlyTracked bool) { } // Return true if files is changed and not tracked in GIT repo -func push(folder string, track string) { +func (g *GitCommands) push(folder string, track string) { - params := []string{"-C", file.Rel(folder), "push"} + params := g.authorization() + params = append(params, "-C", file.Rel(folder), "push") if len(track) > 0 { params = append(params, "-u", "origin", track) @@ -699,7 +753,7 @@ func getImpl(config config.Config) gitRemote { impl := getImplCfg(config.Git.Type) if impl == nil { - prompt.PrintError("Invalid server type '%s,'", config.Git.Type) + prompt.PrintErrorf("Invalid server type '%s,'", config.Git.Type) os.Exit(1) } @@ -709,7 +763,7 @@ func getImpl(config config.Config) gitRemote { func getImplCfg(gitType string) *GitImplement { for e := range gitImplements { - if strings.ToLower(gitImplements[e].Id) == strings.ToLower(gitType) { + if strings.EqualFold(gitImplements[e].Id, gitType) { return &gitImplements[e] } } diff --git a/impl/git/git_remote.go b/impl/git/git_remote.go index bbbd114..8b72d84 100644 --- a/impl/git/git_remote.go +++ b/impl/git/git_remote.go @@ -1,6 +1,6 @@ package git -import "github.com/urfave/cli" +import "github.com/urfave/cli/v3" type Labels struct { GroupLabel string @@ -31,9 +31,9 @@ type gitGroup struct { Name string } -var PERSONAL_GROUP = gitGroup { - Id:"PERSONAL", - Name:"Personal", +var PERSONAL_GROUP = gitGroup{ + Id: "PERSONAL", + Name: "Personal", } type reviewRequest struct { @@ -50,5 +50,5 @@ type gitRemote interface { createRepository(args cli.Args) (string, error) getGroups() ([]gitGroup, error) getRepositories() ([]gitRepository, error) - createReviewRequest(group string, folder string, from string, into string, title string, message string) (reviewRequest, error) + createReviewRequest(groupId string, repoId string, from string, into string, title string, message string, draft bool) (reviewRequest, error) } diff --git a/impl/git/github.go b/impl/git/github.go index 3e0092b..e106eb8 100644 --- a/impl/git/github.go +++ b/impl/git/github.go @@ -3,15 +3,16 @@ package git import ( "errors" "fmt" - "github.com/go-resty/resty" - "github.com/thoas/go-funk" - "github.com/urfave/cli" - "github.com/vanroy/microcli/impl/config" - "github.com/vanroy/microcli/impl/prompt" "net/url" "sort" "strconv" "strings" + + "github.com/go-resty/resty/v2" + "github.com/thoas/go-funk" + "github.com/urfave/cli/v3" + "github.com/vanroy/microcli/impl/config" + "github.com/vanroy/microcli/impl/prompt" ) type gitHub struct { @@ -67,6 +68,7 @@ type ghCreatePullRequest struct { Head string `json:"head"` Base string `json:"base"` Body string `json:"body"` + Draft bool `json:"draft"` } type ghPullRequest struct { @@ -87,9 +89,7 @@ func newGitHub(config config.Config) gitRemote { baseUrl += "api/v3" } - if strings.HasSuffix(baseUrl, "/") { - baseUrl = strings.TrimSuffix(baseUrl, "/") - } + baseUrl = strings.TrimSuffix(baseUrl, "/") return &gitHub{ config: config, @@ -119,7 +119,7 @@ func (gh *gitHub) createGroup(args cli.Args) (string, error) { prompt.PrintNewLine() if orgaLogin == "" || orgaAdminLogin == "" { - prompt.PrintError("Missing parameters, group name and group admin login are required") + prompt.PrintErrorf("Missing parameters, group name and group admin login are required") return "", errors.New("missing parameters") } @@ -131,7 +131,7 @@ func (gh *gitHub) createGroup(args cli.Args) (string, error) { createResp, err := gh.execPost("admin/organizations", data, &ghOrg{}) if err != nil { - prompt.PrintError("Cannot create organization. ( %s )", err.Error()) + prompt.PrintErrorf("Cannot create organization. ( %s )", err.Error()) return "", err } @@ -144,7 +144,7 @@ func (gh *gitHub) createGroup(args cli.Args) (string, error) { } _, err := gh.execPatch("orgs/"+orgId, descData, &ghOrg{}) if err != nil { - prompt.PrintError("Cannot create organization. ( %s )", err.Error()) + prompt.PrintErrorf("Cannot create organization. ( %s )", err.Error()) return "", err } @@ -157,14 +157,14 @@ func (gh *gitHub) createGroup(args cli.Args) (string, error) { func (gh *gitHub) createRepository(args cli.Args) (string, error) { - groups, err := gh.getGroups() + groups, _ := gh.getGroups() groups = funk.Filter(groups, func(g gitGroup) bool { return funk.ContainsString(gh.config.Git.GroupIds, g.Id) }).([]gitGroup) idx := 0 groupId := "" if len(groups) == 0 { - prompt.PrintError("No organization available") + prompt.PrintErrorf("No organization available") return "", errors.New("no organization available") } else if len(groups) == 1 { groupId = groups[0].Id @@ -185,15 +185,12 @@ func (gh *gitHub) createRepository(args cli.Args) (string, error) { projectDescription := prompt.Input("\nEnter your repository description :", args.Get(idx+1)) projectVisibility := prompt.Choice("\nSelect your repository visibility ( default: private ) :", ghVisibilityOptions, args.Get(idx+2)) - projectPrivate := true - if projectVisibility == "public" { - projectPrivate = false - } + projectPrivate := projectVisibility != "public" prompt.PrintNewLine() if groupId == "" || projectName == "" { - prompt.PrintError("Missing parameters, project name and group are required") + prompt.PrintErrorf("Missing parameters, project name and group are required") return "", errors.New("missing parameters") } @@ -205,7 +202,7 @@ func (gh *gitHub) createRepository(args cli.Args) (string, error) { createResp, err := gh.execPost(gh.getGroupBasePath(groupId)+"/repos", data, &ghRepo{}) if err != nil { - prompt.PrintError("Cannot create repository. ( %s )", err.Error()) + prompt.PrintErrorf("Cannot create repository. ( %s )", err.Error()) return "", err } @@ -262,16 +259,17 @@ func (gh *gitHub) getRepositories() ([]gitRepository, error) { return repos, nil } -func (gh *gitHub) createReviewRequest(group string, folder string, from string, into string, title string, message string) (reviewRequest, error) { +func (gh *gitHub) createReviewRequest(groupId string, repoId string, from string, into string, title string, message string, draft bool) (reviewRequest, error) { data := ghCreatePullRequest{ Title: title, Head: from, Base: into, Body: message, + Draft: draft, } - ghReview, err := gh.execPost("repos/"+group+"/"+folder+"/pulls", data, &ghPullRequest{}) + ghReview, err := gh.execPost("repos/"+groupId+"/"+repoId+"/pulls", data, &ghPullRequest{}) if err != nil { return reviewRequest{}, err } @@ -281,7 +279,7 @@ func (gh *gitHub) createReviewRequest(group string, folder string, from string, func (gh *gitHub) execGet(url string, resultType interface{}) (interface{}, int, error) { - resp, err := resty.R(). + resp, err := resty.New().R(). SetHeader("Authorization", "token "+gh.config.Git.PrivateToken). SetResult(resultType). Get(gh.apiUrl + "/" + url) @@ -297,7 +295,7 @@ func (gh *gitHub) execGet(url string, resultType interface{}) (interface{}, int, func (gh *gitHub) execPost(url string, data interface{}, resultType interface{}) (interface{}, error) { - resp, err := resty.R(). + resp, err := resty.New().R(). SetHeader("Authorization", "token "+gh.config.Git.PrivateToken). SetResult(resultType). SetBody(data). @@ -308,7 +306,7 @@ func (gh *gitHub) execPost(url string, data interface{}, resultType interface{}) } if resp.StatusCode() < 200 || resp.StatusCode() > 300 { - return nil, errors.New(fmt.Sprintf("Cannot execute post request. Status code : %d. Message : %s", resp.StatusCode(), resp.String())) + return nil, fmt.Errorf("cannot execute post request. Status code : %d. Message : %s", resp.StatusCode(), resp.String()) } return resp.Result(), nil @@ -316,7 +314,7 @@ func (gh *gitHub) execPost(url string, data interface{}, resultType interface{}) func (gh *gitHub) execPatch(url string, data interface{}, resultType interface{}) (interface{}, error) { - resp, err := resty.R(). + resp, err := resty.New().R(). SetHeader("Authorization", "token "+gh.config.Git.PrivateToken). SetResult(resultType). SetBody(data). @@ -327,7 +325,7 @@ func (gh *gitHub) execPatch(url string, data interface{}, resultType interface{} } if resp.StatusCode() < 200 || resp.StatusCode() > 300 { - return nil, errors.New(fmt.Sprintf("Cannot execute post request. Status code : %d. Message : %s", resp.StatusCode(), resp.String())) + return nil, fmt.Errorf("cannot execute post request. Status code : %d. Message : %s", resp.StatusCode(), resp.String()) } return resp.Result(), nil @@ -350,8 +348,8 @@ func (gh *gitHub) toGitRepo(groupId string) interface{} { Name: repository.Name, Description: repository.Description, NameWithNamespace: repository.NameWithNamespace, - Path: repository.Name, - PathWithNamespace: repository.NameWithNamespace, + Path: gh.normalize(repository.Name), + PathWithNamespace: gh.normalize(repository.NameWithNamespace), SshUrl: repository.SshUrl, HttpUrl: repository.HttpUrl, DefaultBranch: repository.DefaultBranch, @@ -375,14 +373,10 @@ func (gh *gitHub) getGroupBasePath(groupId string) string { if groupId == PERSONAL_GROUP.Id { return "user" } else { - return "orgs/"+groupId + return "orgs/" + groupId } } -func (gh *gitHub) normalize(name string) string { - return strings.ToLower(strings.Replace(name, " ", "-", -1)) -} - func (gh *gitHub) parseNextPageValue(r *resty.Response) int { link := r.Header().Get("Link") if len(link) == 0 { @@ -423,3 +417,10 @@ func (gh *gitHub) parseNextPageValue(r *resty.Response) int { return 0 } + +func (gh *gitHub) normalize(name string) string { + if !gh.config.Git.NormalizeName { + return name + } + return strings.ToLower(strings.ReplaceAll(name, " ", "-")) +} diff --git a/impl/git/gitlab.go b/impl/git/gitlab.go index e759e1f..b7e2cde 100644 --- a/impl/git/gitlab.go +++ b/impl/git/gitlab.go @@ -3,13 +3,14 @@ package git import ( "errors" "fmt" - "github.com/go-resty/resty" + "strconv" + "strings" + + "github.com/go-resty/resty/v2" "github.com/thoas/go-funk" - "github.com/urfave/cli" + "github.com/urfave/cli/v3" "github.com/vanroy/microcli/impl/config" "github.com/vanroy/microcli/impl/prompt" - "strconv" - "strings" ) type gitLab struct { @@ -93,7 +94,7 @@ func (gl *gitLab) createGroup(args cli.Args) (string, error) { prompt.PrintNewLine() if groupName == "" || groupPath == "" { - prompt.PrintError("Missing parameters, group name and group path are required") + prompt.PrintErrorf("Missing parameters, group name and group path are required") return "", errors.New("missing parameters") } @@ -107,7 +108,7 @@ func (gl *gitLab) createGroup(args cli.Args) (string, error) { createResp, err := gl.execPost("/groups", data, &glGroup{}) if err != nil { - prompt.PrintError("Cannot create group. ( %s )", err.Error()) + prompt.PrintErrorf("Cannot create group. ( %s )", err.Error()) return "", err } @@ -118,14 +119,14 @@ func (gl *gitLab) createGroup(args cli.Args) (string, error) { func (gl *gitLab) createRepository(args cli.Args) (string, error) { - groups, err := gl.getGroups() + groups, _ := gl.getGroups() groups = funk.Filter(groups, func(g gitGroup) bool { return funk.ContainsString(gl.config.Git.GroupIds, g.Id) }).([]gitGroup) idx := 0 groupId := "" if len(groups) == 0 { - prompt.PrintError("No groups available") + prompt.PrintErrorf("No groups available") return "", errors.New("no groups available") } else if len(groups) == 1 { groupId = groups[0].Id @@ -152,7 +153,7 @@ func (gl *gitLab) createRepository(args cli.Args) (string, error) { prompt.PrintNewLine() if groupId == "" || projectName == "" { - prompt.PrintError("Missing parameters, project name and group are required") + prompt.PrintErrorf("Missing parameters, project name and group are required") return "", errors.New("missing parameters") } @@ -170,7 +171,7 @@ func (gl *gitLab) createRepository(args cli.Args) (string, error) { createResp, err := gl.execPost("projects", data, &glProject{}) if err != nil { - prompt.PrintError("Cannot create repository. ( %s )", err.Error()) + prompt.PrintErrorf("Cannot create repository. ( %s )", err.Error()) return "", err } @@ -213,7 +214,7 @@ func (gl *gitLab) getRepositories() ([]gitRepository, error) { return repos, nil } -func (gl *gitLab) createReviewRequest(group string, folder string, from string, into string, title string, message string) (reviewRequest, error) { +func (gl *gitLab) createReviewRequest(group string, folder string, from string, into string, title string, message string, draft bool) (reviewRequest, error) { // TODO ( Implement ) return reviewRequest{}, nil @@ -221,7 +222,7 @@ func (gl *gitLab) createReviewRequest(group string, folder string, from string, func (gl *gitLab) execGet(url string, resultType interface{}) (interface{}, error) { - resp, err := resty.R(). + resp, err := resty.New().R(). SetHeader("PRIVATE-TOKEN", gl.config.Git.PrivateToken). SetResult(resultType). Get(gl.apiUrl + "/" + url) @@ -235,7 +236,7 @@ func (gl *gitLab) execGet(url string, resultType interface{}) (interface{}, erro func (gl *gitLab) execPost(url string, data map[string]string, resultType interface{}) (interface{}, error) { - resp, err := resty.R(). + resp, err := resty.New().R(). SetHeader("PRIVATE-TOKEN", gl.config.Git.PrivateToken). SetResult(resultType). SetFormData(data). @@ -246,7 +247,7 @@ func (gl *gitLab) execPost(url string, data map[string]string, resultType interf } if resp.StatusCode() < 200 || resp.StatusCode() > 300 { - return nil, errors.New(fmt.Sprintf("Cannot execute post request. Status code : %d. Message : %s", resp.StatusCode(), resp.String())) + return nil, fmt.Errorf("cannot execute post request. Status code : %d. Message : %s", resp.StatusCode(), resp.String()) } return resp.Result(), nil @@ -269,8 +270,8 @@ func (gl *gitLab) toGitRepo(groupId string) interface{} { Name: project.Name, Description: project.Description, NameWithNamespace: project.NameWithNamespace, - Path: project.Path, - PathWithNamespace: project.PathWithNamespace, + Path: gl.normalize(project.Path), + PathWithNamespace: gl.normalize(project.PathWithNamespace), SshUrl: project.SshUrl, HttpUrl: project.HttpUrl, DefaultBranch: project.DefaultBranch, @@ -284,6 +285,13 @@ func (gh *gitLab) getGroupBasePath(groupId string) string { if groupId == PERSONAL_GROUP.Id { return "" } else { - return "groups/"+groupId + return "groups/" + groupId + } +} + +func (gh *gitLab) normalize(name string) string { + if !gh.config.Git.NormalizeName { + return name } + return strings.ToLower(strings.ReplaceAll(name, " ", "-")) } diff --git a/impl/git/visualstudio.go b/impl/git/visualstudio.go deleted file mode 100644 index cba1500..0000000 --- a/impl/git/visualstudio.go +++ /dev/null @@ -1,315 +0,0 @@ -package git - -import ( - "errors" - "fmt" - "github.com/go-resty/resty" - "github.com/thoas/go-funk" - "github.com/urfave/cli" - "github.com/vanroy/microcli/impl/config" - "github.com/vanroy/microcli/impl/prompt" - "strings" -) - -type visualStudio struct { - config config.Config - labels Labels -} - -type vsProject struct { - Id string `json:"id"` - Name string `json:"name"` - Description string `json:"description"` - Url string `json:"url"` - State string `json:"state"` - Revision int `json:"revision"` - Visibility string `json:"visibility"` -} - -type vsProjectResponse struct { - Value []vsProject `json:"value"` - Count int `json:"count"` -} - -type vsRepository struct { - Id string `json:"id"` - Name string `json:"name"` - Url string `json:"url"` - RemoteUrl string `json:"remoteUrl"` - SshUrl string `json:"sshUrl"` - DefaultBranch string `json:"defaultBranch"` - Project vsProject `json:"project"` -} - -type vsRepositoriesResponse struct { - Value []vsRepository `json:"value"` - Count int `json:"count"` -} - -type vsProcess struct { - Id string `json:"id"` - Name string `json:"name"` - Description string `json:"description"` - IsDefault bool `json:"isDefault"` -} - -type vsProcessResponse struct { - Value []vsProcess `json:"value"` - Count int `json:"count"` -} - -type vsCreateProject struct { - Name string `json:"name"` - Description string `json:"description"` - Capabilities vsCreateProjectCapabilities `json:"capabilities"` - Visibility string `json:"visibility"` -} - -type vsCreateProjectCapabilities struct { - VersionControl vsCreateProjectVersionControl `json:"versioncontrol"` - ProcessTemplate vsCreateProjectProcessTemplate `json:"processTemplate"` -} - -type vsCreateProjectVersionControl struct { - Type string `json:"sourceControlType"` -} - -type vsCreateProjectProcessTemplate struct { - Id string `json:"templateTypeId"` -} - -type vsCreateProjectResponse struct { - Id string `json:"id"` - Status string `json:"status"` - Url string `json:"url"` -} - -type vsCreateRepository struct { - Name string `json:"name"` - Project vsCreateRepositoryProject `json:"project"` -} - -type vsCreateRepositoryProject struct { - Id string `json:"id"` -} - -var vsProjectVisibilities = []prompt.Option{ - {Id: "private", Name: "Private"}, - {Id: "public", Name: "Public"}, -} - -func newVisualStudio(config config.Config) gitRemote { - return &visualStudio{ - config: config, - labels: Labels{ - GroupLabel: "projet", - GroupsLabel: "projets", - RepositoryLabel: "repository", - RepositoriesLabel: "repositories", - CreateGroupUsage: "name [description] [visibility] [process]", - CreateRepositoryUsage: "[project] name", - CodeReviewRequest: "pull requests", - }, - } -} - -func (vs *visualStudio) getLabels() Labels { - return vs.labels -} - -func (vs *visualStudio) createGroup(args cli.Args) (string, error) { - - processResp, processErr := vs.execGet("_apis/process/processes?api-version=1.0", &vsProcessResponse{}) - if processErr != nil { - return "", processErr - } - - var selectedProcessId = "" - var defaultProcessId = "" - processOptions := funk.Map(processResp.(*vsProcessResponse).Value, func(process vsProcess) prompt.Option { - var def = "" - - if args.Get(3) == process.Name { - selectedProcessId = process.Id - } - - if process.IsDefault { - def = " (default)" - defaultProcessId = process.Id - } - return prompt.Option{Id: process.Id, Name: fmt.Sprintf("%s : %s%s", process.Name, process.Description, def)} - }).([]prompt.Option) - - projectName := prompt.Input("Enter your project name :", args.Get(0)) - projectDescription := prompt.Input("\nEnter your project description :", args.Get(1)) - visibility := prompt.Choice("\nSelect your project visibility :", vsProjectVisibilities, args.Get(2)) - projectProcessTemplateId := prompt.Choice("\nSelect your project process template :", processOptions, selectedProcessId) - if projectProcessTemplateId == "" { - projectProcessTemplateId = defaultProcessId - } - - prompt.PrintNewLine() - - data := vsCreateProject{ - Name: projectName, - Description: projectDescription, - Visibility: visibility, - Capabilities: vsCreateProjectCapabilities{ - VersionControl: vsCreateProjectVersionControl{Type: "GIT"}, - ProcessTemplate: vsCreateProjectProcessTemplate{Id: projectProcessTemplateId}, - }, - } - - createResp, err := vs.execPost("_apis/projects?api-version=2.0-preview", data, &vsCreateProjectResponse{}) - - if err != nil { - prompt.PrintError("Cannot create project. ( %s )", err.Error()) - return "", err - } - - prompt.PrintInfo("Project created") - - return createResp.(*vsCreateProjectResponse).Id, nil -} - -func (vs *visualStudio) createRepository(args cli.Args) (string, error) { - - groups, err := vs.getGroups() - - groups = funk.Filter(groups, func(g gitGroup) bool { return funk.ContainsString(vs.config.Git.GroupIds, g.Id) }).([]gitGroup) - - idx := 0 - groupId := "" - if len(groups) == 0 { - prompt.PrintError("No projects available") - return "", errors.New("no projects available") - } else if len(groups) == 1 { - groupId = groups[0].Id - } else { - defaultProjectId := "" - groupOptions := funk.Map(groups, func(group gitGroup) prompt.Option { - if args.Get(0) == group.Name { - defaultProjectId = group.Id - } - return prompt.Option{Id: group.Id, Name: group.Name} - }).([]prompt.Option) - - groupId = prompt.Choice("Select your project :", groupOptions, defaultProjectId) - idx = idx + 1 - } - - projectName := prompt.Input("\nEnter your repository name :", args.Get(idx)) - prompt.PrintNewLine() - - data := vsCreateRepository{ - Name: projectName, - Project: vsCreateRepositoryProject{ - Id: groupId, - }, - } - - createResp, err := vs.execPost("_apis/git/repositories/?api-version=1.0", data, &vsRepository{}) - - if err != nil { - prompt.PrintError("Cannot create repository. ( %s )", err.Error()) - return "", err - } - - prompt.PrintInfo("Repository created") - - return createResp.(*vsRepository).Id, nil -} - -func (vs *visualStudio) getGroups() ([]gitGroup, error) { - - resp, err := vs.execGet("_apis/projects/?api-version=1.0", &vsProjectResponse{}) - if err != nil { - return nil, err - } - - return funk.Map(resp.(*vsProjectResponse).Value, vs.toGitGroup).([]gitGroup), nil -} - -func (vs *visualStudio) getRepositories() ([]gitRepository, error) { - - var repos []gitRepository - - funk.ForEach(vs.config.Git.GroupIds, func(groupId string) { - - resp, err := vs.execGet(groupId+"/_apis/git/repositories/?api-version=1.0", &vsRepositoriesResponse{}) - if err == nil { - repos = append(repos, funk.Map(resp.(*vsRepositoriesResponse).Value, vs.toGitRepo(groupId)).([]gitRepository)...) - } - }) - - return repos, nil -} - -func (vs *visualStudio) createReviewRequest(group string, folder string, from string, into string, title string, message string) (reviewRequest, error) { - - // TODO ( Implement ) - return reviewRequest{}, nil -} - -func (vs *visualStudio) execGet(url string, resultType interface{}) (interface{}, error) { - - resp, err := resty.R(). - SetBasicAuth("", vs.config.Git.PrivateToken). - SetResult(resultType). - Get(vs.config.Git.BaseUrl + "/" + url) - - if err != nil { - prompt.PrintError(resp.String()) - } - - return resp.Result(), err -} - -func (vs *visualStudio) execPost(url string, data interface{}, resultType interface{}) (interface{}, error) { - - resp, err := resty.R(). - SetBasicAuth("", vs.config.Git.PrivateToken). - SetResult(resultType). - SetBody(data). - Post(vs.config.Git.BaseUrl + "/" + url) - - if err != nil { - return nil, err - } - - if resp.StatusCode() < 200 || resp.StatusCode() > 300 { - return nil, errors.New(fmt.Sprintf("Cannot execute post request. Status code : %d. Message : %s", resp.StatusCode(), resp.String())) - } - - return resp.Result(), nil -} - -func (vs *visualStudio) toGitRepo(groupId string) interface{} { - - return func(repository vsRepository) gitRepository { - return gitRepository{ - Id: repository.Id, - Name: repository.Name, - NameWithNamespace: repository.Project.Name + " / " + repository.Name, - Path: vs.normalize(repository.Name), - PathWithNamespace: vs.normalize(repository.Project.Name) + "/" + vs.normalize(repository.Name), - SshUrl: repository.SshUrl, - HttpUrl: repository.RemoteUrl, - DefaultBranch: repository.DefaultBranch, - Archived: false, - GroupId: groupId, - } - } -} - -func (vs *visualStudio) toGitGroup(project vsProject) gitGroup { - - return gitGroup{ - Id: project.Id, - Name: project.Name, - } -} - -func (vs *visualStudio) normalize(name string) string { - return strings.ToLower(strings.Replace(name, " ", "-", -1)) -} diff --git a/impl/glob/glob_matcher.go b/impl/glob/glob_matcher.go new file mode 100644 index 0000000..5f1155d --- /dev/null +++ b/impl/glob/glob_matcher.go @@ -0,0 +1,40 @@ +package glob + +import ( + "fmt" + + "github.com/gobwas/glob" + "github.com/thoas/go-funk" +) + +type GlobMatcher struct { + pattern string + globPattern glob.Glob + excludes []string + excludesPattern []glob.Glob +} + +func NewGlobMatcher(pattern string, excludes ...string) *GlobMatcher { + return &GlobMatcher{ + pattern: pattern, + globPattern: glob.MustCompile(pattern), + excludes: excludes, + excludesPattern: funk.Map(excludes, func(p string) glob.Glob { return glob.MustCompile(p) }).([]glob.Glob), + } +} + +func (m GlobMatcher) Match(value string) (bool, string) { + + // Handle exclusion + for i, p := range m.excludesPattern { + if p.Match((value)) { + return false, fmt.Sprintf("'%s' match exclusion pattern '%s'", value, m.excludes[i]) + } + } + + if m.pattern != "" && !m.globPattern.Match(value) { + return false, fmt.Sprintf("'%s' not match with pattern '%s'", value, m.pattern) + } + + return true, "" +} diff --git a/impl/initialzr/initialzr.go b/impl/initialzr/initialzr.go index 5f69a5c..7e498ef 100644 --- a/impl/initialzr/initialzr.go +++ b/impl/initialzr/initialzr.go @@ -2,12 +2,13 @@ package initialzr import ( "fmt" - "github.com/go-resty/resty" + "os" + "strings" + + "github.com/go-resty/resty/v2" "github.com/vanroy/microcli/impl/cmd" "github.com/vanroy/microcli/impl/config" "github.com/vanroy/microcli/impl/prompt" - "os" - "strings" ) type Initializr struct { @@ -36,7 +37,7 @@ func (init *Initializr) Init(projectType string, projectName string, dependencie url = init.config.Initializr.Url } - resp, err := resty.R(). + resp, err := resty.New().R(). SetFormData(data). SetOutput(archive). Post(fmt.Sprintf("%s/starter.tgz", url)) @@ -47,7 +48,7 @@ func (init *Initializr) Init(projectType string, projectName string, dependencie } // Remove archive - defer os.Remove(archive) + defer os.Remove(archive) //nolint:errcheck // Extract archive _, archiveErr := cmd.ExecCmdDir("tar", []string{"xvzf", archive}, destFolder) diff --git a/impl/initialzr/initialzr_test.go b/impl/initialzr/initialzr_test.go index 83acfe7..e4562fe 100644 --- a/impl/initialzr/initialzr_test.go +++ b/impl/initialzr/initialzr_test.go @@ -1,13 +1,17 @@ package initialzr import ( - "github.com/vanroy/microcli/impl/config" "testing" + + "github.com/vanroy/microcli/impl/config" ) func SkipTestDownload(t *testing.T) { initializr := NewInitializr(config.Config{}) - initializr.Init("gradle-project", "test", []string{}, "/tmp/microcli-init") + err := initializr.Init("gradle-project", "test", []string{}, "/tmp/microcli-init") + if err != nil { + t.Error("Error during init") + } } diff --git a/impl/prompt/prompt.go b/impl/prompt/prompt.go index afbe026..e0d2f6d 100644 --- a/impl/prompt/prompt.go +++ b/impl/prompt/prompt.go @@ -3,18 +3,18 @@ package prompt import ( "bufio" "fmt" - "github.com/howeyc/gopass" - "github.com/thoas/go-funk" - "github.com/vanroy/microcli/impl/config" "os" "strconv" "strings" + + "github.com/thoas/go-funk" + "github.com/vanroy/microcli/impl/config" + "golang.org/x/term" ) // Color defines a custom color object which is defined by SGR parameters. type color struct { - params []Attribute - noColor *bool + params []Attribute } type Option struct { @@ -95,19 +95,25 @@ func PrintItem(text string) { } } -func PrintInfo(format string, a ...interface{}) { +func PrintInfo(format string, a ...any) { if config.Options.Verbose { fmt.Printf("%s==> %s%s%s\n", Color(Bold, FgBlue), Color(FgWhite), fmt.Sprintf(format, a...), Color(Reset)) } } -func PrintWarn(format string, a ...interface{}) { +func PrintWarn(format string, a ...any) { if config.Options.Verbose { fmt.Printf("%sWARNING: %s%s%s\n", Color(Bold, FgYellow), Color(FgWhite), fmt.Sprintf(format, a...), Color(Reset)) } } -func PrintError(format string, a ...interface{}) { +func PrintError(message string) { + if config.Options.Verbose { + fmt.Printf("%sERROR: %s%s%s\n", Color(Bold, FgRed), Color(FgWhite), message, Color(Reset)) + } +} + +func PrintErrorf(format string, a ...any) { if config.Options.Verbose { fmt.Printf("%sERROR: %s%s%s\n", Color(Bold, FgRed), Color(FgWhite), fmt.Sprintf(format, a...), Color(Reset)) } @@ -150,7 +156,7 @@ func RestrictedInput(prompt string, acceptedValues []string) string { for { input := Input(prompt + " ( " + strings.Join(acceptedValues, " / ") + " ) :") if funk.ContainsString(acceptedValues, input) { - return input; + return input } } } @@ -173,7 +179,7 @@ func Choice(prompt string, options []Option, defaultValue ...string) string { fmt.Printf("%d) %s\n", i+1, options[i].Name) } - for true { + for { str := Input("#? ") if str == "" { return "" @@ -184,8 +190,6 @@ func Choice(prompt string, options []Option, defaultValue ...string) string { return options[result-1].Id } } - - return "" } func Password(prompt string) string { @@ -198,8 +202,7 @@ func Password(prompt string) string { fmt.Print(prompt + " ") } - // Silent. For printing *'s use gopass.GetPasswdMasked() - pass, err := gopass.GetPasswdMasked() + pass, err := term.ReadPassword(int(os.Stdin.Fd())) if err == nil { return string(pass) } diff --git a/main.go b/main.go index a2e73e8..fe62d2f 100644 --- a/main.go +++ b/main.go @@ -1,60 +1,62 @@ package main import ( + "context" "os" - "github.com/c-bata/go-prompt" - "github.com/urfave/cli" + "github.com/urfave/cli/v3" + + "os/signal" + "syscall" microcli "github.com/vanroy/microcli/impl" "github.com/vanroy/microcli/impl/config" "github.com/vanroy/microcli/impl/git" pmt "github.com/vanroy/microcli/impl/prompt" - "os/signal" - "syscall" ) func main() { handleSignals() - conf, err := loadConf() + conf, err := loadConf(context.Background()) if err != nil { - pmt.PrintError("Command load config '%s'", err.Error()) + pmt.PrintErrorf("Command load config '%s'", err.Error()) os.Exit(1) } - app := cli.NewApp() - app.Name = "Microbox" + app := &cli.Command{} + app.Name = "mbx" app.Usage = "This script provides utilities to manage microservices git repositories." app.Version = "1.0.0" app.Before = initContext - app.Action = displayPrompt app.CommandNotFound = commandNotFound app.Commands = microcli.InitCommands(*conf) app.Flags = []cli.Flag{ - cli.BoolFlag{ - Name: "quiet, q", - Usage: "Disable verbose output", + &cli.BoolFlag{ + Name: "quiet", + Aliases: []string{"q"}, + Usage: "Disable verbose output", }, - cli.BoolFlag{ - Name: "non-interactive, n", - Usage: "Non interactive mode", + &cli.BoolFlag{ + Name: "non-interactive", + Aliases: []string{"n"}, + Usage: "Non interactive mode", }, } - app.Run(os.Args) + app.Run(context.Background(), os.Args) //nolint:errcheck } // Load or init configuration -func loadConf() (*config.Config, error) { +func loadConf(context context.Context) (*config.Config, error) { - if exist, err := config.Exist(); exist == false && err == nil { + if exist, err := config.Exist(); !exist && err == nil { microcli.ShowBanner() pmt.PrintWarn("Settings not exist, starting initialization\n") - git.Init(nil) + git.Init(context, nil) //nolint:errcheck pmt.PrintInfo("Settings initialized, enjoy !") os.Exit(0) } @@ -63,7 +65,7 @@ func loadConf() (*config.Config, error) { } // Init context before commands -func initContext(c *cli.Context) error { +func initContext(ctx context.Context, c *cli.Command) (context.Context, error) { config.Options = config.GlobalOptions{ Verbose: !c.Bool("quiet"), @@ -72,42 +74,12 @@ func initContext(c *cli.Context) error { microcli.ShowBanner() - return nil -} - -// Display interactive prompt -func displayPrompt(c *cli.Context) error { - - p := prompt.New( - microcli.NexExecutor(c).Execute, - microcli.Completer, - prompt.OptionTitle("Microbox CLI"), - prompt.OptionPrefix("=> "), - prompt.OptionPrefixTextColor(prompt.DefaultColor), - prompt.OptionSuggestionBGColor(prompt.LightGray), - prompt.OptionSuggestionTextColor(prompt.White), - prompt.OptionDescriptionBGColor(prompt.DarkGray), - prompt.OptionDescriptionTextColor(prompt.White), - prompt.OptionPreviewSuggestionBGColor(prompt.DarkGray), - prompt.OptionPreviewSuggestionTextColor(prompt.White), - prompt.OptionSelectedSuggestionBGColor(prompt.DarkGray), - prompt.OptionSelectedSuggestionTextColor(prompt.White), - prompt.OptionSelectedDescriptionBGColor(prompt.LightGray), - prompt.OptionSelectedDescriptionTextColor(prompt.White), - prompt.OptionAddKeyBind(prompt.KeyBind{Key: prompt.ControlC, Fn: func(buffer *prompt.Buffer) { - os.Exit(1) - }}), - ) - - p.Run() - - return nil + return ctx, nil } // Display command not found -func commandNotFound(c *cli.Context, cmd string) { - pmt.PrintError("Command not exit '%s'", cmd) - os.Exit(1) +func commandNotFound(ctx context.Context, c *cli.Command, cmd string) { + pmt.PrintErrorf("Command not exist '%s'", cmd) } func handleSignals() { diff --git a/settings.gradle b/settings.gradle deleted file mode 100644 index 19acb70..0000000 --- a/settings.gradle +++ /dev/null @@ -1 +0,0 @@ -rootProject.name = 'microcli'