make deps

Author: adam-hanna

Gopkg.lock

@@ -1,30 +1,3 @@
-# Gopkg.toml example
-#
-# Refer to https://github.com/golang/dep/blob/master/docs/Gopkg.toml.md
-# for detailed Gopkg.toml documentation.
-#
-# required = ["github.com/user/thing/cmd/thing"]
-# ignored = ["github.com/user/project/pkgX", "bitbucket.org/user/project/pkgA/pkgY"]
-#
-# [[constraint]]
-#   name = "github.com/user/project"
-#   version = "1.0.0"
-#
-# [[constraint]]
-#   name = "github.com/user/project2"
-#   branch = "dev"
-#   source = "github.com/myfork/project2"
-#
-# [[override]]
-#   name = "github.com/x/y"
-#   version = "2.4.0"
-#
-# [prune]
-#   non-go = false
-#   go-tests = true
-#   unused-packages = true
-
-
 [[constraint]]
   branch = "develop"
   name = "github.com/c3systems/c3-go"

Gopkg.toml

@@ -6,4 +6,17 @@ test:
 
 .PHONY: deps
 deps:
-	dep ensure -update -v
+	dep ensure -update -v  && \
+	$(MAKE) gxundo
+
+.PHONY: gxundo
+gxundo:
+	@bash scripts/gxundo.sh vendor/
+
+.PHONY: install/gxundo
+install/gxundo:
+	@mkdir -p scripts && \
+	wget https://raw.githubusercontent.com/c3systems/gxundo/master/gxundo.sh \
+	-O scripts/gxundo.sh && \
+	chmod +x scripts/gxundo.sh
+

Makefile

@@ -0,0 +1,81 @@
+#!/bin/bash
+
+#nc="\\033[0m"
+red="\\033[31m"
+green="\\033[32m"
+yellow="\\033[33m"
+#blue="\\033[34m"
+#purple="\\033[35m"
+cyan="\\033[36m"
+white="\\033[37m"
+bold="$(tput bold)"
+normal="$(tput sgr0)"
+
+# function to install `jq`
+install_jq() {
+  if [[ "$OSTYPE" == "linux-gnu" ]]; then
+      sudo apt-get install jq
+  elif [[ "$OSTYPE" == "darwin"* ]]; then
+      brew install jq
+  fi
+}
+
+# check if `gorep` is installed, otherwise install it.
+command -v gorep >/dev/null
+exit_code=$?
+if [ "$exit_code" -ne 0 ]; then
+  printf "$yellow%s$normal\\n" "gorep is not installed. Installing..."
+  go get github.com/novalagung/gorep && printf "$green%s$normal\\n" "gorep installed"
+fi
+
+# check if `jq` is installed, otherwise install it.
+command -v jq >/dev/null
+exit_code=$?
+if [ "$exit_code" -ne 0 ]; then
+  printf "$yellow%s$normal\\n" "jq is not installed. Installing..."
+  install_jq && printf "$green%s$normal\\n" "jq installed"
+fi
+
+# the path to search passed an the only argument
+dirpath="$1"
+
+if [[ "$dirpath" == "" ]]; then
+  printf "$red$bold%s$normal\\n" "Error: path is required"
+  exit 1
+fi
+
+printf "$yellow%s$normal\\n" "finding imports recursively under $dirpath"
+
+filter="sed -r 's|/[^/]+$||'"
+if [[ "$OSTYPE" == "darwin"* ]]; then
+  filter="sed -E 's|/[^/]+$||'"
+fi
+
+# read all Go imports that contain "gx/ipfs/"
+for dir in $(find "$dirpath" -maxdepth 100 -type f -name '*.go' | eval "$filter" | sort -u)
+do
+  for line in $(go list -json "./$dir" | jq '.Imports' | grep 'gx/ipfs/' | sed -e 's/gx\///g' | sed -e 's/"//g' | sed -e 's/,//g' | sed -e 's/ //g')
+  do
+    # fetch the gx package.json and read the github url
+    root="$(echo "$line" | tr "/" "\\n" | awk 'FNR <= 3 {print}' | tr '\n' '/' | sed -e s'/.$//g')"
+    pkg="$(echo "$line" | tr "/" "\\n" | awk 'FNR > 3 {print}' | tr '\n' '/' | sed -e s'/.$//g')"
+    jsonurl="https://gateway.ipfs.io/$root/package.json"
+    printf "$white%s$normal\\n" "fetching $jsonurl"
+    new="$(curl -s "$jsonurl" | jq '.gx.dvcsimport' | sed -e 's/"//g')"
+    if [ "$pkg" != "" ]; then
+      new="$new/$pkg"
+    fi
+    old="gx/$line"
+
+    printf "$cyan%s => %s$normal\\n" "$old" "$new"
+
+    # replace the imports
+    gorep -path="$dir" \
+        -from="$old" \
+        -to="$new"
+
+  done
+done
+
+printf "$green%s$normal\\n" "complete"
+

scripts/gxundo.sh

@@ -9,7 +9,7 @@ import (
 
 	log "github.com/sirupsen/logrus"
 
-	"github.com/c3systems/c3-go/common/hashing"
+	"github.com/c3systems/c3-go/common/hashutil"
 	"github.com/c3systems/c3-go/common/hexutil"
 	"github.com/c3systems/c3-go/common/stringutil"
 	c3config "github.com/c3systems/c3-go/config"
@@ -71,7 +71,7 @@ func NewC3() *C3 {
 
 // RegisterMethod ...
 func (c3 *C3) RegisterMethod(methodName string, types []string, ifn interface{}) error {
-	methodNameHash := hashing.HashToHexString([]byte(methodName))
+	methodNameHash := hashutil.HashToHexString([]byte(methodName))
 	if _, ok := c3.registeredMethods[methodNameHash]; ok {
 		return ErrMethodAlreadyRegistered
 	}
@@ -135,7 +135,7 @@ func (c3 *C3) RegisterMethod(methodName string, types []string, ifn interface{})
 func (c3 *C3) Serve() {
 	server.NewServer(&server.Config{
 		Host:     c3config.ServerHost,
-		Port:     c3config.ServerPort,
+		Port:     c3config.DefaultServerPort,
 		Receiver: c3.receiver,
 	}).Run()
 }