Merge pull request #266 from achilleas-k/deprecating-the-web

LGTM

Author: mpsonntag

.travis.yml

@@ -12,11 +12,11 @@ env:
 
 matrix:
   include:
-    - go: "1.11.x"
+    - go: "1.12.x"
       os: linux
     - go: tip
       os: linux
-    - go: "1.11.x"
+    - go: "1.12.x"
       os: osx
       addons:
         homebrew:
@@ -49,7 +49,7 @@ install:
   - gofmt -s -l .
 
 script:
-  - make install
+  - make testbuild
   - go test -v ./...
   - if [[ "${TRAVIS_GO_VERSION}" != "tip" ]]; then
       if [[ "${TRAVIS_OS_NAME}" == "linux" ]]; then
@@ -62,3 +62,8 @@ script:
           popd;
       fi;
     fi
+
+after_failure:
+  # upload logs to gist.github.com
+  - pip3 install requests
+  - python3 ./tests/scripts/pushtogist.py ./tests/log

Makefile

@@ -31,6 +31,10 @@ allplatforms: linux windows macos
 install: gin
 	install $(BUILDLOC)/$(GIN) $(INSTLOC)/$(GIN)
 
+testbuild: gin
+	mkdir -p $(TESTBINLOC)
+	install $(BUILDLOC)/$(GIN) $(TESTBINLOC)/$(GIN)
+
 linux: $(BUILDLOC)/linux/$(GIN)
 
 windows: $(BUILDLOC)/windows/$(GIN).exe

README.md

@@ -15,10 +15,10 @@ It offers a simplified interface for downloading and uploading files from reposi
 It consists of commands for interfacing with the GIN web API (e.g., listing repositories, creating repositories, managing SSH keys) but primarily, it wraps **git** and **git-annex** commands to make working with data repositories easier.
 
 ## Information, setup, and guides
-For installation instructions see the [GIN Client Setup](https://web.gin.g-node.org/G-Node/Info/wiki/GinCliSetup) page.
+For installation instructions see the [GIN Client Setup](https://gin.g-node.org/G-Node/Info/wiki/GinCliSetup) page.
 
-General information, help, and guides for using GIN can be found on the [GIN Info Wiki](https://web.gin.g-node.org/G-Node/info/wiki).
+General information, help, and guides for using GIN can be found on the [GIN Info Wiki](https://gin.g-node.org/G-Node/info/wiki).
 Help and information for the client in particular can be on the following pages:
-- [Usage guide (tutorial)](https://web.gin.g-node.org/G-Node/Info/wiki/GinUsageTutorial)
-- [Useful recipes and short workflows](https://web.gin.g-node.org/G-Node/Info/wiki/GinCliRecipes)
-- [Detailed command overview](https://web.gin.g-node.org/G-Node/Info/wiki/GinClientHelp)
+- [Usage guide (tutorial)](https://gin.g-node.org/G-Node/Info/wiki/GinUsageTutorial)
+- [Useful recipes and short workflows](https://gin.g-node.org/G-Node/Info/wiki/GinCliRecipes)
+- [Detailed command overview](https://gin.g-node.org/G-Node/Info/wiki/GinClientHelp)

appveyor.yml

@@ -3,14 +3,14 @@ build: off
 
 clone_folder: C:\gopath\src\github.com\G-Node\gin-cli
 
-stack: go 1.11
+stack: go 1.12
 
 environment:
   SRCDIR: C:\gopath\src\github.com\G-Node\gin-cli
   GOPATH: C:\gopath
   BINDIR: bin
   # download dev build
-  BUNDLEURL: https://web.gin.g-node.org/achilleas/gin-cli-builds/raw/master/gin-cli-latest-windows-386.zip
+  BUNDLEURL: https://gin.g-node.org/achilleas/gin-cli-builds/raw/master/gin-cli-latest-windows-386.zip
   GIN_LOG_DIR: C:\gin-log
 
 

doc/config.md

@@ -19,7 +19,7 @@ servers:
   gin:
     web:
       protocol: https
-      host: web.gin.g-node.org
+      host: gin.g-node.org
       port: 443
 
     git:

foobar

@@ -26,7 +26,7 @@ var (
 	ginDefaultServer = ServerCfg{
 		WebCfg{
 			Protocol: "https",
-			Host:     "web.gin.g-node.org",
+			Host:     "gin.g-node.org",
 			Port:     443,
 		},
 		GitCfg{
@@ -64,7 +64,7 @@ type WebCfg struct {
 }
 
 // AddressStr constructs a full address string from the configuration.
-// The string has the format Scheme://Host:Port (e.g., https://web.gin.g-node.org:443)
+// The string has the format Scheme://Host:Port (e.g., https://gin.g-node.org:443)
 func (c WebCfg) AddressStr() string {
 	return fmt.Sprintf("%s://%s:%d", c.Protocol, c.Host, c.Port)
 }

ginclient/config/config.go

@@ -117,7 +117,7 @@ The following information is required to configure a new server:
 For the web server: the protocol, hostname, and port
 
     The protocol should be either 'http' or 'https'.
-    The hostname for the server (e.g., web.gin.g-node.org).
+    The hostname for the server (e.g., gin.g-node.org).
     The web port for the server (e.g., 80, 443).
 
 For the git server: the git user, hostname, and port
@@ -132,7 +132,7 @@ See the Examples section for a full example.
 		"<alias>": "The alias (name) for the server.",
 	}
 	examples := map[string]string{
-		"This is what configuring the built-in G-Node GIN server would look like (note: this is already configured)": "$ gin add-server --web https://web.gin.g-node.org:443 --git [email protected]:22 gin",
+		"This is what configuring the built-in G-Node GIN server would look like (note: this is already configured)": "$ gin add-server --web https://gin.g-node.org:443 --git [email protected]:22 gin",
 	}
 	var cmd = &cobra.Command{
 		Use:                   "add-server [--web http[s]://<hostname>[:<port>]] [--git [<gituser>@]<hostname>[:<port>]] <alias>",

gincmd/addservercmd.go

@@ -138,26 +138,61 @@ func printProgressWithBar(statuschan <-chan git.RepoFileStatus, nitems int) (fil
 		return printProgressOutput(statuschan)
 	}
 	ndigits := len(fmt.Sprintf("%d", nitems))
-	dfmt := fmt.Sprintf("%%%dd/%%%dd", ndigits, ndigits)
+	dfmt := fmt.Sprintf("%%%dd/%%%dd", ndigits, ndigits) // dynamic formatting string adapts to number of digits in item count
 	filesuccess = make(map[string]bool)
-	var barratio float64
-	var ncomplt int
-	linewidth := termwidth()
-	if linewidth > 80 {
-		linewidth = 80
-	}
-	barwidth := linewidth - (5 + ndigits*2)
-	barratio = float64(barwidth) / float64(nitems)
+
+	// closure binds ndigits and nitems but keeps bar width dynamic so it can
+	// adapt to terminal resizing -- introduces a few operations per refresh,
+	// but makes the bar printing much nicer
+	printbar := func(completed int) int {
+		linewidth := termwidth()
+		if linewidth > 80 {
+			linewidth = 80
+		} else if linewidth < 30 {
+			// Skip bar printing for very small terminals
+			fmt.Println()
+			return 0
+		}
+		fullbarwidth := linewidth - (5 + ndigits*2)
+		if fullbarwidth < 0 {
+			// Again, skip bar printing if ndigits is so large that a bar would
+			// have negative width.  Since we skip printing the bar if the
+			// termwidth is < 30, this can only happen when processing more
+			// than 1e13 files, but if we ever change the min width to
+			// something smaller than 30 (or make it dynamic somehow), this
+			// guard will be useful.
+			fmt.Println()
+			return 0
+		}
+		barratio := float64(fullbarwidth) / float64(nitems)
+
+		complsigns := int(math.Floor(float64(completed) * barratio))
+		blocks := strings.Repeat("=", complsigns)
+		blanks := strings.Repeat(" ", fullbarwidth-complsigns)
+		dprg := fmt.Sprintf(dfmt, completed, nitems)
+		fmt.Printf("\n [%s%s] %s\r", blocks, blanks, dprg)
+		return linewidth
+	}
+
 	outline := new(bytes.Buffer)
 	outappend := func(part string) {
 		if len(part) > 0 {
 			outline.WriteString(part)
 			outline.WriteString(" ")
 		}
 	}
+
 	printed := false
+	prevlinewidth := 0
+	ncompleted := 0
 	for stat := range statuschan {
-		ncomplt++
+		ncompleted++
+		if ncompleted > nitems {
+			// BUG: Not sure when this occurs, but it's been happening in the
+			// CI environment for some remove-content calls and I haven't been
+			// able to reproduce - AK, 2019-07-07
+			nitems = ncompleted
+		}
 		outline.Reset()
 		outline.WriteString(" ")
 		outappend(stat.State)
@@ -172,13 +207,9 @@ func printProgressWithBar(statuschan <-chan git.RepoFileStatus, nitems int) (fil
 			filesuccess[stat.FileName] = false
 		}
 		newprint := outline.String()
-		fmt.Printf("\r%s\r", strings.Repeat(" ", linewidth)) // clear the line
+		fmt.Printf("\r%s\r", strings.Repeat(" ", prevlinewidth)) // clear the line
 		fmt.Fprint(color.Output, newprint)
-		complsigns := int(math.Floor(float64(ncomplt) * barratio))
-		blocks := strings.Repeat("=", complsigns)
-		blanks := strings.Repeat(" ", barwidth-complsigns)
-		dprg := fmt.Sprintf(dfmt, ncomplt, nitems)
-		fmt.Printf("\n [%s%s] %s\r", blocks, blanks, dprg)
+		prevlinewidth = printbar(ncompleted)
 		printed = true
 	}
 	if !printed {
@@ -381,7 +412,7 @@ func dependencyInfo(giterr, annexerr error) string {
 		errmsg = fmt.Sprintf("%s  %s\n", errmsg, annexerr)
 	}
 
-	helppage := "https://web.gin.g-node.org/G-Node/Info/wiki/GinCli"
+	helppage := "https://gin.g-node.org/G-Node/Info/wiki/GinCli"
 	var anchor string
 	switch runtime.GOOS {
 	case "windows":