Skip to content

Commit

Permalink
Merge pull request #408 from JohanLorenzo/add-taxonomy
Browse files Browse the repository at this point in the history
  • Loading branch information
JohanLorenzo committed Apr 22, 2016
2 parents 343b570 + a66b424 commit 4036f9e
Show file tree
Hide file tree
Showing 27 changed files with 10,072 additions and 12 deletions.
7 changes: 3 additions & 4 deletions Cargo.lock

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

2 changes: 1 addition & 1 deletion Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@ authentication = []
[dependencies]
foxbox_thinkerbell = { path = "components/thinkerbell/" }
openzwave-adapter = { path = "components/openzwave-adapter/" }
foxbox_taxonomy = { git = "https://github.com/fxbox/taxonomy.git" }
foxbox_taxonomy = { path = "components/taxonomy/" }
foxbox_users = { git = "https://github.com/fxbox/users.git", rev = "1033e08" }
multicast_dns = { git = "https://github.com/fxbox/multicast-dns.git", rev = "a6e4bcc" }
iron-cors = { git = "https://github.com/fxbox/iron-cors.git", rev = "96ede73" }
Expand Down
3 changes: 0 additions & 3 deletions components/openzwave-adapter/.gitignore
Original file line number Diff line number Diff line change
@@ -1,4 +1 @@
target
Cargo.lock
.*.sw*
.cargo
2 changes: 1 addition & 1 deletion components/openzwave-adapter/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -5,6 +5,6 @@ authors = ["Julien Wajsberg <felash@gmail.com>"]

[dependencies]
openzwave-stateful = { git = "https://github.com/fxbox/openzwave-stateful-rust" }
foxbox_taxonomy = { git = "https://github.com/fxbox/taxonomy.git" }
foxbox_taxonomy = { path = "../taxonomy/" }
transformable_channels = "^0.1"
log = "^0.3"
18 changes: 18 additions & 0 deletions components/taxonomy/.travis.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,18 @@
language: rust

addons:
apt:
packages:
- libcurl4-openssl-dev
- libelf-dev
- libdw-dev

script:
- cargo build
# FIXME: We currently execute unit tests twice. Once with and the other time,
# without the dead code in the binary.
- cargo test -- --nocapture
- $TRAVIS_BUILD_DIR/tools/execute-unit-tests-with-coverage

rust:
- nightly-2016-04-10
22 changes: 22 additions & 0 deletions components/taxonomy/Cargo.toml
Original file line number Diff line number Diff line change
@@ -0,0 +1,22 @@
[package]
name = "foxbox_taxonomy"
version = "0.1.2"
authors = ["David Rajchenbach-Teller <dteller@mozilla.com>"]

[dependencies]
chrono = "0.2.19"
clippy = "0.0.63"
#clippy = {git = "https://github.com/Manishearth/rust-clippy.git", rev = "c1c935d"}
lazy_static = "^0.1"
libc = "0.2.9"
log = "0.3"
rusqlite = "0.6.0"
serde = "0.7.0"
serde_json = "0.7.0"
serde_macros = "0.7.0"
string_cache = "^0.2"
sublock = "^0.1"
transformable_channels = "^0.1"

[dev-dependencies]
assert_matches = "1.0.0"
Loading

0 comments on commit 4036f9e

Please sign in to comment.