rename mod back

This commit is contained in:
Waleed Gadelkareem 2020-04-18 22:16:51 +02:00
parent 0656abea7a
commit ce75034062
39 changed files with 135 additions and 135 deletions

View File

@ -24,6 +24,6 @@ clean:
publish: publish:
mkdir -p bin/$(VERSION) mkdir -p bin/$(VERSION)
cd bin/$(VERSION) cd bin/$(VERSION)
xgo -v -x --targets="windows/*,darwin/*,linux/386,linux/amd64,linux/arm-5,linux/arm64" -out bee_$(VERSION) github.com/gadelkareem/bee xgo -v -x --targets="windows/*,darwin/*,linux/386,linux/amd64,linux/arm-5,linux/arm64" -out bee_$(VERSION) github.com/beego/bee
cd .. cd ..
ghr -u beego -r bee $(VERSION) $(VERSION) ghr -u beego -r bee $(VERSION) $(VERSION)

View File

@ -16,7 +16,7 @@ Bee is a command-line tool facilitating development of Beego-based application.
To install `bee` use the `go get` command: To install `bee` use the `go get` command:
```bash ```bash
go get github.com/gadelkareem/bee go get github.com/beego/bee
``` ```
Then you can add `bee` binary to PATH environment variable in your `~/.bashrc` or `~/.bash_profile` file: Then you can add `bee` binary to PATH environment variable in your `~/.bashrc` or `~/.bash_profile` file:
@ -28,7 +28,7 @@ export PATH=$PATH:<your_main_gopath>/bin
> If you already have `bee` installed, updating `bee` is simple: > If you already have `bee` installed, updating `bee` is simple:
```bash ```bash
go get -u github.com/gadelkareem/bee go get -u github.com/beego/bee
``` ```
## Basic commands ## Basic commands

View File

@ -16,22 +16,22 @@
package cmd package cmd
import ( import (
"github.com/gadelkareem/bee/cmd/commands" "github.com/beego/bee/cmd/commands"
_ "github.com/gadelkareem/bee/cmd/commands/api" _ "github.com/beego/bee/cmd/commands/api"
_ "github.com/gadelkareem/bee/cmd/commands/bale" _ "github.com/beego/bee/cmd/commands/bale"
_ "github.com/gadelkareem/bee/cmd/commands/beefix" _ "github.com/beego/bee/cmd/commands/beefix"
_ "github.com/gadelkareem/bee/cmd/commands/dlv" _ "github.com/beego/bee/cmd/commands/dlv"
_ "github.com/gadelkareem/bee/cmd/commands/dockerize" _ "github.com/beego/bee/cmd/commands/dockerize"
_ "github.com/gadelkareem/bee/cmd/commands/generate" _ "github.com/beego/bee/cmd/commands/generate"
_ "github.com/gadelkareem/bee/cmd/commands/hprose" _ "github.com/beego/bee/cmd/commands/hprose"
_ "github.com/gadelkareem/bee/cmd/commands/migrate" _ "github.com/beego/bee/cmd/commands/migrate"
_ "github.com/gadelkareem/bee/cmd/commands/new" _ "github.com/beego/bee/cmd/commands/new"
_ "github.com/gadelkareem/bee/cmd/commands/pack" _ "github.com/beego/bee/cmd/commands/pack"
_ "github.com/gadelkareem/bee/cmd/commands/rs" _ "github.com/beego/bee/cmd/commands/rs"
_ "github.com/gadelkareem/bee/cmd/commands/run" _ "github.com/beego/bee/cmd/commands/run"
_ "github.com/gadelkareem/bee/cmd/commands/server" _ "github.com/beego/bee/cmd/commands/server"
_ "github.com/gadelkareem/bee/cmd/commands/version" _ "github.com/beego/bee/cmd/commands/version"
"github.com/gadelkareem/bee/utils" "github.com/beego/bee/utils"
) )
func IfGenerateDocs(name string, args []string) bool { func IfGenerateDocs(name string, args []string) bool {

View File

@ -20,11 +20,11 @@ import (
path "path/filepath" path "path/filepath"
"strings" "strings"
"github.com/gadelkareem/bee/cmd/commands" "github.com/beego/bee/cmd/commands"
"github.com/gadelkareem/bee/cmd/commands/version" "github.com/beego/bee/cmd/commands/version"
"github.com/gadelkareem/bee/generate" "github.com/beego/bee/generate"
beeLogger "github.com/gadelkareem/bee/logger" beeLogger "github.com/beego/bee/logger"
"github.com/gadelkareem/bee/utils" "github.com/beego/bee/utils"
) )
var CmdApiapp = &commands.Command{ var CmdApiapp = &commands.Command{

View File

@ -24,11 +24,11 @@ import (
"runtime" "runtime"
"strings" "strings"
"github.com/gadelkareem/bee/cmd/commands" "github.com/beego/bee/cmd/commands"
"github.com/gadelkareem/bee/cmd/commands/version" "github.com/beego/bee/cmd/commands/version"
"github.com/gadelkareem/bee/config" "github.com/beego/bee/config"
beeLogger "github.com/gadelkareem/bee/logger" beeLogger "github.com/beego/bee/logger"
"github.com/gadelkareem/bee/utils" "github.com/beego/bee/utils"
) )
var CmdBale = &commands.Command{ var CmdBale = &commands.Command{

View File

@ -10,10 +10,10 @@ import (
"regexp" "regexp"
"strings" "strings"
"github.com/gadelkareem/bee/cmd/commands" "github.com/beego/bee/cmd/commands"
"github.com/gadelkareem/bee/cmd/commands/version" "github.com/beego/bee/cmd/commands/version"
beeLogger "github.com/gadelkareem/bee/logger" beeLogger "github.com/beego/bee/logger"
"github.com/gadelkareem/bee/logger/colors" "github.com/beego/bee/logger/colors"
) )
var CmdFix = &commands.Command{ var CmdFix = &commands.Command{

View File

@ -6,8 +6,8 @@ import (
"os" "os"
"strings" "strings"
"github.com/gadelkareem/bee/logger/colors" "github.com/beego/bee/logger/colors"
"github.com/gadelkareem/bee/utils" "github.com/beego/bee/utils"
) )
// Command is the unit of execution // Command is the unit of execution

View File

@ -24,10 +24,10 @@ import (
"strings" "strings"
"time" "time"
"github.com/gadelkareem/bee/cmd/commands" "github.com/beego/bee/cmd/commands"
"github.com/gadelkareem/bee/cmd/commands/version" "github.com/beego/bee/cmd/commands/version"
beeLogger "github.com/gadelkareem/bee/logger" beeLogger "github.com/beego/bee/logger"
"github.com/gadelkareem/bee/utils" "github.com/beego/bee/utils"
"github.com/go-delve/delve/service" "github.com/go-delve/delve/service"
"github.com/go-delve/delve/service/rpc2" "github.com/go-delve/delve/service/rpc2"
"github.com/go-delve/delve/service/rpccommon" "github.com/go-delve/delve/service/rpccommon"

View File

@ -22,10 +22,10 @@ import (
"strings" "strings"
"text/template" "text/template"
"github.com/gadelkareem/bee/cmd/commands" "github.com/beego/bee/cmd/commands"
"github.com/gadelkareem/bee/cmd/commands/version" "github.com/beego/bee/cmd/commands/version"
beeLogger "github.com/gadelkareem/bee/logger" beeLogger "github.com/beego/bee/logger"
"github.com/gadelkareem/bee/utils" "github.com/beego/bee/utils"
) )
const dockerBuildTemplate = `FROM {{.BaseImage}} const dockerBuildTemplate = `FROM {{.BaseImage}}

View File

@ -17,13 +17,13 @@ import (
"os" "os"
"strings" "strings"
"github.com/gadelkareem/bee/cmd/commands" "github.com/beego/bee/cmd/commands"
"github.com/gadelkareem/bee/cmd/commands/version" "github.com/beego/bee/cmd/commands/version"
"github.com/gadelkareem/bee/config" "github.com/beego/bee/config"
"github.com/gadelkareem/bee/generate" "github.com/beego/bee/generate"
"github.com/gadelkareem/bee/generate/swaggergen" "github.com/beego/bee/generate/swaggergen"
"github.com/gadelkareem/bee/logger" "github.com/beego/bee/logger"
"github.com/gadelkareem/bee/utils" "github.com/beego/bee/utils"
) )
var CmdGenerate = &commands.Command{ var CmdGenerate = &commands.Command{

View File

@ -7,12 +7,12 @@ import (
"path" "path"
"strings" "strings"
"github.com/gadelkareem/bee/cmd/commands" "github.com/beego/bee/cmd/commands"
"github.com/gadelkareem/bee/cmd/commands/api" "github.com/beego/bee/cmd/commands/api"
"github.com/gadelkareem/bee/cmd/commands/version" "github.com/beego/bee/cmd/commands/version"
"github.com/gadelkareem/bee/generate" "github.com/beego/bee/generate"
beeLogger "github.com/gadelkareem/bee/logger" beeLogger "github.com/beego/bee/logger"
"github.com/gadelkareem/bee/utils" "github.com/beego/bee/utils"
) )
var CmdHproseapp = &commands.Command{ var CmdHproseapp = &commands.Command{

View File

@ -23,12 +23,12 @@ import (
"strings" "strings"
"time" "time"
"github.com/gadelkareem/bee/cmd/commands" "github.com/beego/bee/cmd/commands"
"github.com/gadelkareem/bee/cmd/commands/version" "github.com/beego/bee/cmd/commands/version"
"github.com/gadelkareem/bee/config" "github.com/beego/bee/config"
"github.com/gadelkareem/bee/utils" "github.com/beego/bee/utils"
beeLogger "github.com/gadelkareem/bee/logger" beeLogger "github.com/beego/bee/logger"
) )
var CmdMigrate = &commands.Command{ var CmdMigrate = &commands.Command{

View File

@ -20,11 +20,11 @@ import (
path "path/filepath" path "path/filepath"
"strings" "strings"
"github.com/gadelkareem/bee/cmd/commands" "github.com/beego/bee/cmd/commands"
"github.com/gadelkareem/bee/cmd/commands/version" "github.com/beego/bee/cmd/commands/version"
beeLogger "github.com/gadelkareem/bee/logger" beeLogger "github.com/beego/bee/logger"
"github.com/gadelkareem/bee/logger/colors" "github.com/beego/bee/logger/colors"
"github.com/gadelkareem/bee/utils" "github.com/beego/bee/utils"
) )
var CmdNew = &commands.Command{ var CmdNew = &commands.Command{

View File

@ -18,10 +18,10 @@ import (
"syscall" "syscall"
"time" "time"
"github.com/gadelkareem/bee/cmd/commands" "github.com/beego/bee/cmd/commands"
"github.com/gadelkareem/bee/cmd/commands/version" "github.com/beego/bee/cmd/commands/version"
beeLogger "github.com/gadelkareem/bee/logger" beeLogger "github.com/beego/bee/logger"
"github.com/gadelkareem/bee/utils" "github.com/beego/bee/utils"
) )
var CmdPack = &commands.Command{ var CmdPack = &commands.Command{

View File

@ -24,12 +24,12 @@ import (
"strings" "strings"
"github.com/gadelkareem/bee/cmd/commands" "github.com/beego/bee/cmd/commands"
"github.com/gadelkareem/bee/cmd/commands/version" "github.com/beego/bee/cmd/commands/version"
"github.com/gadelkareem/bee/config" "github.com/beego/bee/config"
"github.com/gadelkareem/bee/logger" "github.com/beego/bee/logger"
"github.com/gadelkareem/bee/logger/colors" "github.com/beego/bee/logger/colors"
"github.com/gadelkareem/bee/utils" "github.com/beego/bee/utils"
) )
var cmdRs = &commands.Command{ var cmdRs = &commands.Command{

View File

@ -7,7 +7,7 @@ import (
"os" "os"
"strings" "strings"
beeLogger "github.com/gadelkareem/bee/logger" beeLogger "github.com/beego/bee/logger"
) )
var ( var (

View File

@ -18,7 +18,7 @@ import (
"net/http" "net/http"
"time" "time"
beeLogger "github.com/gadelkareem/bee/logger" beeLogger "github.com/beego/bee/logger"
"github.com/gorilla/websocket" "github.com/gorilla/websocket"
) )

View File

@ -20,11 +20,11 @@ import (
"runtime" "runtime"
"strings" "strings"
"github.com/gadelkareem/bee/cmd/commands" "github.com/beego/bee/cmd/commands"
"github.com/gadelkareem/bee/cmd/commands/version" "github.com/beego/bee/cmd/commands/version"
"github.com/gadelkareem/bee/config" "github.com/beego/bee/config"
beeLogger "github.com/gadelkareem/bee/logger" beeLogger "github.com/beego/bee/logger"
"github.com/gadelkareem/bee/utils" "github.com/beego/bee/utils"
) )
var CmdRun = &commands.Command{ var CmdRun = &commands.Command{

View File

@ -24,10 +24,10 @@ import (
"sync" "sync"
"time" "time"
"github.com/gadelkareem/bee/config" "github.com/beego/bee/config"
beeLogger "github.com/gadelkareem/bee/logger" beeLogger "github.com/beego/bee/logger"
"github.com/gadelkareem/bee/logger/colors" "github.com/beego/bee/logger/colors"
"github.com/gadelkareem/bee/utils" "github.com/beego/bee/utils"
"github.com/fsnotify/fsnotify" "github.com/fsnotify/fsnotify"
) )

View File

@ -17,13 +17,13 @@ package apiapp
import ( import (
"net/http" "net/http"
beeLogger "github.com/gadelkareem/bee/logger" beeLogger "github.com/beego/bee/logger"
"os" "os"
"github.com/gadelkareem/bee/cmd/commands" "github.com/beego/bee/cmd/commands"
"github.com/gadelkareem/bee/cmd/commands/version" "github.com/beego/bee/cmd/commands/version"
"github.com/gadelkareem/bee/utils" "github.com/beego/bee/utils"
) )
var CmdServer = &commands.Command{ var CmdServer = &commands.Command{

View File

@ -9,7 +9,7 @@ import (
"time" "time"
beeLogger "github.com/gadelkareem/bee/logger" beeLogger "github.com/beego/bee/logger"
) )
// RuntimeInfo holds information about the current runtime. // RuntimeInfo holds information about the current runtime.

View File

@ -14,10 +14,10 @@ import (
"runtime" "runtime"
"strings" "strings"
"github.com/gadelkareem/bee/cmd/commands" "github.com/beego/bee/cmd/commands"
beeLogger "github.com/gadelkareem/bee/logger" beeLogger "github.com/beego/bee/logger"
"github.com/gadelkareem/bee/logger/colors" "github.com/beego/bee/logger/colors"
"github.com/gadelkareem/bee/utils" "github.com/beego/bee/utils"
"gopkg.in/yaml.v2" "gopkg.in/yaml.v2"
) )

View File

@ -19,7 +19,7 @@ import (
"os" "os"
"path/filepath" "path/filepath"
beeLogger "github.com/gadelkareem/bee/logger" beeLogger "github.com/beego/bee/logger"
"gopkg.in/yaml.v2" "gopkg.in/yaml.v2"
) )

View File

@ -14,7 +14,7 @@
package generate package generate
import "github.com/gadelkareem/bee/utils" import "github.com/beego/bee/utils"
var SQLDriver utils.DocValue var SQLDriver utils.DocValue
var SQLConn utils.DocValue var SQLConn utils.DocValue

View File

@ -23,9 +23,9 @@ import (
"regexp" "regexp"
"strings" "strings"
beeLogger "github.com/gadelkareem/bee/logger" beeLogger "github.com/beego/bee/logger"
"github.com/gadelkareem/bee/logger/colors" "github.com/beego/bee/logger/colors"
"github.com/gadelkareem/bee/utils" "github.com/beego/bee/utils"
_ "github.com/go-sql-driver/mysql" _ "github.com/go-sql-driver/mysql"
_ "github.com/lib/pq" _ "github.com/lib/pq"
) )

View File

@ -20,9 +20,9 @@ import (
"path" "path"
"strings" "strings"
beeLogger "github.com/gadelkareem/bee/logger" beeLogger "github.com/beego/bee/logger"
"github.com/gadelkareem/bee/logger/colors" "github.com/beego/bee/logger/colors"
"github.com/gadelkareem/bee/utils" "github.com/beego/bee/utils"
) )
func GenerateController(cname, currpath string) { func GenerateController(cname, currpath string) {

View File

@ -24,9 +24,9 @@ import (
"path" "path"
"strings" "strings"
beeLogger "github.com/gadelkareem/bee/logger" beeLogger "github.com/beego/bee/logger"
"github.com/gadelkareem/bee/logger/colors" "github.com/beego/bee/logger/colors"
"github.com/gadelkareem/bee/utils" "github.com/beego/bee/utils"
_ "github.com/go-sql-driver/mysql" _ "github.com/go-sql-driver/mysql"
_ "github.com/lib/pq" _ "github.com/lib/pq"
) )

View File

@ -21,9 +21,9 @@ import (
"strings" "strings"
"time" "time"
"github.com/gadelkareem/bee/logger" "github.com/beego/bee/logger"
"github.com/gadelkareem/bee/logger/colors" "github.com/beego/bee/logger/colors"
"github.com/gadelkareem/bee/utils" "github.com/beego/bee/utils"
) )
const ( const (

View File

@ -21,9 +21,9 @@ import (
"path" "path"
"strings" "strings"
beeLogger "github.com/gadelkareem/bee/logger" beeLogger "github.com/beego/bee/logger"
"github.com/gadelkareem/bee/logger/colors" "github.com/beego/bee/logger/colors"
"github.com/gadelkareem/bee/utils" "github.com/beego/bee/utils"
) )
func GenerateModel(mname, fields, currpath string) { func GenerateModel(mname, fields, currpath string) {

View File

@ -3,9 +3,9 @@ package generate
import ( import (
"strings" "strings"
"github.com/gadelkareem/bee/cmd/commands/migrate" "github.com/beego/bee/cmd/commands/migrate"
beeLogger "github.com/gadelkareem/bee/logger" beeLogger "github.com/beego/bee/logger"
"github.com/gadelkareem/bee/utils" "github.com/beego/bee/utils"
) )
func GenerateScaffold(sname, fields, currpath, driver, conn string) { func GenerateScaffold(sname, fields, currpath, driver, conn string) {

View File

@ -19,9 +19,9 @@ import (
"os" "os"
"path" "path"
beeLogger "github.com/gadelkareem/bee/logger" beeLogger "github.com/beego/bee/logger"
"github.com/gadelkareem/bee/logger/colors" "github.com/beego/bee/logger/colors"
"github.com/gadelkareem/bee/utils" "github.com/beego/bee/utils"
) )
// recipe // recipe

View File

@ -36,8 +36,8 @@ import (
"github.com/astaxie/beego/swagger" "github.com/astaxie/beego/swagger"
"github.com/astaxie/beego/utils" "github.com/astaxie/beego/utils"
beeLogger "github.com/gadelkareem/bee/logger" beeLogger "github.com/beego/bee/logger"
bu "github.com/gadelkareem/bee/utils" bu "github.com/beego/bee/utils"
) )
const ( const (

2
go.mod
View File

@ -1,4 +1,4 @@
module github.com/gadelkareem/bee module github.com/beego/bee
go 1.14 go 1.14

View File

@ -1,3 +1,3 @@
github.com/gadelkareem/bee/cmd/commands/run/*.go:S1024 github.com/beego/bee/cmd/commands/run/*.go:S1024
github.com/gadelkareem/bee/cmd/commands/dlv/*.go:S1024 github.com/beego/bee/cmd/commands/dlv/*.go:S1024
github.com/gadelkareem/bee/utils/*.go:S1026 github.com/beego/bee/utils/*.go:S1026

View File

@ -24,7 +24,7 @@ import (
"text/template" "text/template"
"time" "time"
"github.com/gadelkareem/bee/logger/colors" "github.com/beego/bee/logger/colors"
) )
var errInvalidLogLevel = errors.New("logger: invalid log level") var errInvalidLogLevel = errors.New("logger: invalid log level")

10
main.go
View File

@ -18,11 +18,11 @@ import (
"log" "log"
"os" "os"
"github.com/gadelkareem/bee/cmd" "github.com/beego/bee/cmd"
"github.com/gadelkareem/bee/cmd/commands" "github.com/beego/bee/cmd/commands"
"github.com/gadelkareem/bee/config" "github.com/beego/bee/config"
"github.com/gadelkareem/bee/generate/swaggergen" "github.com/beego/bee/generate/swaggergen"
"github.com/gadelkareem/bee/utils" "github.com/beego/bee/utils"
) )
var ( var (

View File

@ -1 +1 @@
github.com/gadelkareem/bee/generate/swaggergen/*.go:SA1024 github.com/beego/bee/generate/swaggergen/*.go:SA1024

View File

@ -21,7 +21,7 @@ import (
"runtime" "runtime"
"github.com/gadelkareem/bee/config" "github.com/beego/bee/config"
) )
const appName = "Beego" const appName = "Beego"

View File

@ -29,8 +29,8 @@ import (
"time" "time"
"unicode" "unicode"
beeLogger "github.com/gadelkareem/bee/logger" beeLogger "github.com/beego/bee/logger"
"github.com/gadelkareem/bee/logger/colors" "github.com/beego/bee/logger/colors"
) )
// Go is a basic promise implementation: it wraps calls a function in a goroutine // Go is a basic promise implementation: it wraps calls a function in a goroutine