+ First off, thanks for taking the time to contribute! 🎉👍 +
+ ++ The following is a set of guidelines for contributing to neo-local. Please use + your best judgement when following them, and feel free to propose changes to this + document in a pull request. +
+ +## Git Flow + +This project follows the [Git Flow](https://jeffkreeftmeijer.com/git-flow/) +branching workflow for managing features, hotfixes and releases. + +Please have a read first of Jeff Kreeftmeijer +[blog post](https://jeffkreeftmeijer.com/git-flow/) which does a great job of +describing it. + +After cloning the repo locally, create a new feature branch: + +``` +git checkout -b feat/my-awesome-feature develop +``` + +When ready push your changes from this branch to remove (Github) and create a +new pull request against the **develop** branch. \ No newline at end of file diff --git a/VERSION b/VERSION index 2774f85..142464b 100644 --- a/VERSION +++ b/VERSION @@ -1 +1 @@ -0.10.0 \ No newline at end of file +0.11.0 \ No newline at end of file diff --git a/cli/commands/index.go b/cli/commands/index.go index 36b4ccb..c2e1c48 100644 --- a/cli/commands/index.go +++ b/cli/commands/index.go @@ -8,8 +8,10 @@ import ( // the CLI. func GenerateCommandsIndex() []cli.Command { start := NewStart() + status := NewStatus() return []cli.Command{ start.ToCommand(), + status.ToCommand(), } } diff --git a/cli/commands/status.go b/cli/commands/status.go new file mode 100644 index 0000000..0f75c8c --- /dev/null +++ b/cli/commands/status.go @@ -0,0 +1,89 @@ +package commands + +import ( + "errors" + "fmt" + "log" + "strings" + + "github.com/CityOfZion/neo-local/cli/services" + "github.com/CityOfZion/neo-local/cli/stack" + "github.com/urfave/cli" + + "github.com/docker/docker/api/types" + "github.com/docker/docker/client" + "golang.org/x/net/context" +) + +type ( + // Status is the CLI command for checking the status of containers in the + // development environment. + Status struct{} +) + +// NewStatus creates a new Status. +func NewStatus() Status { + return Status{} +} + +// ToCommand generates the CLI command struct. +func (s Status) ToCommand() cli.Command { + return cli.Command{ + Action: s.action(), + Aliases: []string{"ps"}, + Flags: s.flags(), + Name: "status", + Usage: "Output overall health of network", + } +} + +func (s Status) action() func(c *cli.Context) error { + return func(c *cli.Context) error { + ctx := context.Background() + cli, err := client.NewEnvClient() + if err != nil { + return errors.New("Unable to create Docker client") + } + + ok := services.CheckDockerRunning(ctx, cli) + if !ok { + return errors.New("Docker is not running") + } + + services := stack.Services() + runningContainers, err := cli.ContainerList(ctx, types.ContainerListOptions{}) + if err != nil { + return err + } + + for _, container := range runningContainers { + containerName := "" + for _, name := range container.Names { + if strings.Contains(name, "coz_neo-local_") { // TODO: this string should be a const. + fmt.Println(name) + containerName = name + break + } + } + + if containerName == "" { + continue + } + + for _, service := range services { + if strings.Contains(containerName, service.ContainerName()) { + log.Printf( + "%s in '%s' state", service.Image, container.State, + ) + break + } + } + } + + return nil + } +} + +func (s Status) flags() []cli.Flag { + return []cli.Flag{} +} diff --git a/cli/main.go b/cli/main.go index 5925495..6a3bb55 100644 --- a/cli/main.go +++ b/cli/main.go @@ -12,7 +12,7 @@ import ( const ( copyright = "MIT" - description = "Quickly setup a local environment for NEO smart contract development" + description = "Personal blockchain for NEO dApp development!" ) var ( diff --git a/cli/services/docker.go b/cli/services/docker.go index bc59a91..449d90c 100644 --- a/cli/services/docker.go +++ b/cli/services/docker.go @@ -49,6 +49,6 @@ func dockerImageNames() []string { "cityofzion/neo-python:v0.8.1", "postgres:10.5", "registry.gitlab.com/cityofzion/neo-scan/api:latest", - "registry.gitlab.com/cityofzion/neo-scan/sync:latest" + "registry.gitlab.com/cityofzion/neo-scan/sync:latest", } } diff --git a/scripts/travis.sh b/scripts/travis.sh index 1fbaaf6..271356c 100755 --- a/scripts/travis.sh +++ b/scripts/travis.sh @@ -5,10 +5,9 @@ version=$(cat ./VERSION) set -e -if [[ $TRAVIS_BRANCH == 'master' || $TRAVIS_TAG == $version ]] +if [[ $TRAVIS_BRANCH == release/* ]] then - make integration-tests -else make check-version - make integration-tests fi + +make integration-tests