Skip to content

Commit

Permalink
Merge PR: Conduit v2.0.0 (#69)
Browse files Browse the repository at this point in the history
This is the complete rewrite of Conduit (v2.0.0) with a completely updated architecture and implementation from the ground-up. The conduit firmware library and the conduit frontend interface have also been rewritten. There are still many features to add and many places to polish off, but this has gotten to the point where it's stable and ready to be merged into master!
  • Loading branch information
suyashkumar authored Apr 24, 2018
2 parents b49f348 + 2d83904 commit 05308f7
Show file tree
Hide file tree
Showing 111 changed files with 1,139 additions and 4,116 deletions.
1 change: 1 addition & 0 deletions .dockerignore
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
conduit
6 changes: 6 additions & 0 deletions .env
Original file line number Diff line number Diff line change
@@ -0,0 +1,6 @@
POSTGRES_PASSWORD=postgres123test
PORT=8000
DBConnString=host=db port=5432 user=postgres sslmode=disable dbname=postgres password=postgres123test
CertKey=fullchain.pem
PrivKey=privkey.pem
SigningKey=mytestsigningkey
10 changes: 7 additions & 3 deletions .gitignore
Original file line number Diff line number Diff line change
@@ -1,7 +1,11 @@
.pioenvs
.clang_complete
.gcc-flags.json
server/secret.js
*.swp
go-server/src/routes/secret.go
go-server/src/mqtt/secret.go
vendor/
go-starter
.idea/
logs.txt
postgres_data
conduit

27 changes: 8 additions & 19 deletions .travis.yml
Original file line number Diff line number Diff line change
@@ -1,30 +1,19 @@
language: go
go:
- 1.7.x
go:
- "1.10.x"
- master
addons:
apt:
packages:
- nodejs
- cmake
before_install:
- mkdir ./server/secrets
- echo -e "package secrets\n\nconst SubSecret=\"aaa\"\nconst SECRET=\"aaaa\"\nconst DB_DIAL_URL=\"mongodb://localhost\"" > ./server/secrets/secret.go
- nvm install v6.10.3
- nvm use v6.10.3
- npm cache clean -f
install:
- go get ./server
- go get "github.com/stretchr/testify/assert"
- cd ./web-client
- npm -v
- npm install
- cd ..
script:
- go test -v ./server/tests
- cd server
- go build
- cd ..
- cd ./web-client
- npm run test
- cd ..
install:
- go get -u github.com/golang/dep/cmd/dep
script:
- make
- make test

7 changes: 7 additions & 0 deletions Dockerfile
Original file line number Diff line number Diff line change
@@ -0,0 +1,7 @@
from golang:1.9
WORKDIR /go/src/github.com/suyashkumar/conduit
RUN go get -u github.com/golang/dep/cmd/dep
COPY . .
RUN make
CMD ./conduit

111 changes: 111 additions & 0 deletions Gopkg.lock

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

46 changes: 46 additions & 0 deletions Gopkg.toml
Original file line number Diff line number Diff line change
@@ -0,0 +1,46 @@
# 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]]
name = "github.com/jinzhu/gorm"
version = "1.9.1"

[[constraint]]
name = "github.com/julienschmidt/httprouter"
version = "1.1.0"

[[constraint]]
name = "github.com/rifflock/lfshook"
version = "2.3.0"

[[constraint]]
name = "github.com/sirupsen/logrus"
version = "1.0.4"

[prune]
go-tests = true
unused-packages = true
23 changes: 23 additions & 0 deletions Makefile
Original file line number Diff line number Diff line change
@@ -0,0 +1,23 @@
BINARY = conduit

.PHONY: build
build:
dep ensure
make test
go build -o ${BINARY}

.PHONY: test
test:
go test ./...

.PHONY: run
run:
make build
./${BINARY}

.PHONY: release
release:
glide install
GOOS=linux GOARCH=amd64 go build -o build/${BINARY}-linux-amd64 .;
GOOS=darwin GOARCH=amd64 go build -o build/${BINARY}-darwin-amd64 .;
GOOS=windows GOARCH=amd64 go build -o build/${BINARY}-windows-amd64.exe .;
Loading

0 comments on commit 05308f7

Please sign in to comment.