major refactoring of project structure

rogerwelin · Jan 16, 2020 · 85e9601 · 85e9601
1 parent 33b7e81
commit 85e9601
Show file tree

Hide file tree

Showing 12 changed files with 178 additions and 434 deletions.
diff --git a/cli.go b/cli.go
diff --git a/main.go b/main.go
diff --git a/fileops.go → pkg/client/fileops.go b/fileops.go → pkg/client/fileops.go
@@ -1,4 +1,4 @@
-package main
+package client
 
 import (
 	"bufio"

diff --git a/helpers.go → pkg/client/helpers.go b/helpers.go → pkg/client/helpers.go
@@ -1,19 +1,19 @@
-package main
+package client
 
 import (
 	"net/url"
 	"strconv"
 	"strings"
 )
 
-// Checks if string is valid URL
-func isValidURL(urlStr string) bool {
+// IsValidURL checks if string is valid URL
+func IsValidURL(urlStr string) bool {
 	u, err := url.Parse(urlStr)
 	return err == nil && u.Scheme != "" && u.Host != ""
 }
 
-// Split string on colon and return a slice
-func splitHeader(header string) (int, []string) {
+// SplitHeader splits string on colon and return a slice
+func SplitHeader(header string) (int, []string) {
 	splitted := strings.Split(header, ":")
 	return len(splitted), splitted
 

diff --git a/helpers_test.go → pkg/client/helpers_test.go b/helpers_test.go → pkg/client/helpers_test.go
@@ -1,4 +1,4 @@
-package main
+package client
 
 import "testing"
 
@@ -37,7 +37,7 @@ var testTLSScheme = []struct {
 
 func TestValidURL(t *testing.T) {
 	for i, tt := range testURL {
-		actual := isValidURL(tt.in)
+		actual := IsValidURL(tt.in)
 		if actual != tt.expected {
 			t.Errorf("test: %d, isValidURL(%s): expected %t, actual %t", i+1, tt.in, tt.expected, actual)
 		}
@@ -46,7 +46,7 @@ func TestValidURL(t *testing.T) {
 
 func TestSplitHeaders(t *testing.T) {
 	for i, tt := range testHeader {
-		actual, _ := splitHeader(tt.in)
+		actual, _ := SplitHeader(tt.in)
 		if actual != tt.expected {
 			t.Errorf("test: %d, splitHeader(%s): expected %d, actual %d", i+1, tt.in, tt.expected, actual)
 		}