grim/convey

rename the Default runner to Convey

2018-01-14, Gary Kramlich
55357dedb9f4
Parents 309efdf0a7b1
Children 8a0a6ab1310e
rename the Default runner to Convey
3 files changed, 53 insertions(+), 53 deletions(-)
  • +1 -1
    main.go
  • +52 -0
    runners/convey.go
  • +0 -52
    runners/default.go
    • --- a/main.go Sun Jan 14 20:31:34 2018 -0600
    +++ b/main.go Sun Jan 14 20:36:38 2018 -0600
    @@ -110,7 +110,7 @@
    case "config":
    return &runners.ShowConfig{}
    default:
    - return &runners.Default{}
    + return &runners.Convey{}
    }
    }
    --- /dev/null Thu Jan 01 00:00:00 1970 +0000
    +++ b/runners/convey.go Sun Jan 14 20:36:38 2018 -0600
    @@ -0,0 +1,52 @@
    +// Convey
    +// Copyright 2016-2018 Gary Kramlich <grim@reaperworld.com>
    +//
    +// This program is free software: you can redistribute it and/or modify
    +// it under the terms of the GNU General Public License as published by
    +// the Free Software Foundation, either version 3 of the License, or
    +// (at your option) any later version.
    +//
    +// This program is distributed in the hope that it will be useful,
    +// but WITHOUT ANY WARRANTY; without even the implied warranty of
    +// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
    +// GNU General Public License for more details.
    +//
    +// You should have received a copy of the GNU General Public License
    +// along with this program. If not, see <http://www.gnu.org/licenses/>.
    +
    +package runners
    +
    +import (
    + "bitbucket.org/rw_grim/convey/config"
    + "bitbucket.org/rw_grim/convey/logging"
    + "bitbucket.org/rw_grim/convey/state"
    +)
    +
    +// Convey is the normal Convey Runner.
    +type Convey struct{}
    +
    +// Run runs the Convey Runner.
    +func (c *Convey) Run(cfg *config.Config, plans []string, env []string, st *state.State) int {
    + logger := logging.NewAdapter("convey-runner")
    + /* now look for the plan */
    + for _, planName := range plans {
    + if plan, found := cfg.Plans[planName]; found {
    + err := plan.Valid()
    + if err != nil {
    + logger.Errorf("%s", err)
    + return 1
    + }
    +
    + err = plan.Execute(planName, cfg.Tasks, cfg.Environment, st)
    + if err != nil {
    + logger.Errorf("%s", err)
    + return 1
    + }
    + } else {
    + logger.Fatalf("plan %s not found", planName)
    + return 1
    + }
    + }
    +
    + return 0
    +}
    --- a/runners/default.go Sun Jan 14 20:31:34 2018 -0600
    +++ /dev/null Thu Jan 01 00:00:00 1970 +0000
    @@ -1,52 +0,0 @@
    -// Convey
    -// Copyright 2016-2018 Gary Kramlich <grim@reaperworld.com>
    -//
    -// This program is free software: you can redistribute it and/or modify
    -// it under the terms of the GNU General Public License as published by
    -// the Free Software Foundation, either version 3 of the License, or
    -// (at your option) any later version.
    -//
    -// This program is distributed in the hope that it will be useful,
    -// but WITHOUT ANY WARRANTY; without even the implied warranty of
    -// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
    -// GNU General Public License for more details.
    -//
    -// You should have received a copy of the GNU General Public License
    -// along with this program. If not, see <http://www.gnu.org/licenses/>.
    -
    -package runners
    -
    -import (
    - "bitbucket.org/rw_grim/convey/config"
    - "bitbucket.org/rw_grim/convey/logging"
    - "bitbucket.org/rw_grim/convey/state"
    -)
    -
    -// Default is the normal Convey Runner.
    -type Default struct{}
    -
    -// Run runs the Convey Runner.
    -func (d *Default) Run(cfg *config.Config, plans []string, env []string, st *state.State) int {
    - logger := logging.NewAdapter("convey-runner")
    - /* now look for the plan */
    - for _, planName := range plans {
    - if plan, found := cfg.Plans[planName]; found {
    - err := plan.Valid()
    - if err != nil {
    - logger.Errorf("%s", err)
    - return 1
    - }
    -
    - err = plan.Execute(planName, cfg.Tasks, cfg.Environment, st)
    - if err != nil {
    - logger.Errorf("%s", err)
    - return 1
    - }
    - } else {
    - logger.Fatalf("plan %s not found", planName)
    - return 1
    - }
    - }
    -
    - return 0
    -}