Permalink
Browse files

cleanup

Signed-off-by: Peter Edge <peter.edge@gmail.com>
  • Loading branch information...
peter-edge committed Apr 15, 2016
1 parent 0b4827f commit 25f73d151507a0fa497c2c99e136d7829fe844b5
Showing with 10 additions and 17 deletions.
  1. +2 −2 Dockerfile.openflights-dev
  2. +1 −2 LICENSE
  3. +0 −4 api_server.go
  4. +4 −4 circle.yml
  5. +1 −3 client.go
  6. +2 −2 cmd/openflights/main.go
@@ -1,8 +1,8 @@
FROM golang:1.5.2
FROM golang:1.6.1
MAINTAINER peter.edge@gmail.com

RUN \
curl -sSL https://get.docker.com/builds/Linux/x86_64/docker-1.9.1 > /bin/docker && \
curl -sSL https://get.docker.com/builds/Linux/x86_64/docker-1.11.0 > /bin/docker && \
chmod +x /bin/docker
RUN mkdir -p /go/src/go.pedge.io/openflights
ADD . /go/src/go.pedge.io/openflights/
@@ -1,6 +1,6 @@
The MIT License (MIT)

Copyright (c) 2015 Peter Edge
Copyright (c) 2015-2016 Peter Edge

Permission is hereby granted, free of charge, to any person obtaining a copy
of this software and associated documentation files (the "Software"), to deal
@@ -19,4 +19,3 @@ AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
SOFTWARE.

@@ -5,10 +5,6 @@ import (
"golang.org/x/net/context"
)

var (
emptyInstance = &google_protobuf.Empty{}
)

type apiServer struct {
client Client
}
@@ -1,8 +1,8 @@
dependencies:
override:
- mkdir -p "${GOPATH}/src/go.pedge.io/openflights"
- rsync -azC --delete ./ "${GOPATH}/src/go.pedge.io/openflights/"
- make -C "${GOPATH}/src/go.pedge.io/openflights" testdeps
- mkdir -p "$(echo $GOPATH | cut -f 1 -d :)/src/go.pedge.io/openflights"
- rsync -azC --delete ./ "$(echo $GOPATH | cut -f 1 -d :)/src/go.pedge.io/openflights/"
- make -C "$(echo $GOPATH | cut -f 1 -d :)/src/go.pedge.io/openflights" testdeps
test:
override:
- make -C "${GOPATH}/src/go.pedge.io/openflights" test
- make -C "$(echo $GOPATH | cut -f 1 -d :)/src/go.pedge.io/openflights" test
@@ -15,9 +15,7 @@ type client struct {
}

func newClient(apiClient APIClient) *client {
return &client{
apiClient,
}
return &client{apiClient}
}

func (c *client) GetAllAirports() (<-chan *Airport, chan<- bool, <-chan error, error) {
@@ -9,7 +9,7 @@ import (
"github.com/kr/pretty"
"github.com/spf13/cobra"
"github.com/spf13/pflag"
"go.pedge.io/env"
"go.pedge.io/lion/env"
"go.pedge.io/openflights"
"go.pedge.io/pkg/cobra"
"google.golang.org/grpc"
@@ -20,7 +20,7 @@ type appEnv struct {
}

func main() {
env.Main(do, &appEnv{})
envlion.Main(do, &appEnv{})
}

func do(appEnvObj interface{}) error {

0 comments on commit 25f73d1

Please sign in to comment.