Merge pull request #8 from maurer/no-rpc

Removing RPC

.gitignore

@@ -1,3 +1,4 @@
 *.agdai
 *~
 .*.sw?
+target

.travis.yml

@@ -1,21 +1,9 @@
 language: rust
-rust: 1.0.0
 addons:
   postgresql: 9.3
-
-before_install:
-  - yes | sudo add-apt-repository ppa:ubuntu-toolchain-r/test
-  - sudo apt-get update
-install:
-  - sudo apt-get install g++-4.8 gcc-4.8 git
-  - git clone https://github.com/kentonv/capnproto.git
-  - export CC=gcc-4.8
-  - export CXX=g++-4.8
-  - cd capnproto/c++
-  - ./setup-autotools.sh
-  - autoreconf -i
-  - ./configure && make -j5 && sudo make install && cd ../..
-
+before_script:
+  - createuser -U postgres -ld holmes
+  - psql -c "ALTER USER holmes UNENCRYPTED PASSWORD 'holmes'" -U postgres
 after_success:
   - sudo apt-get install libcurl4-openssl-dev libelf-dev libdw-dev
   - wget https://github.com/SimonKagstrom/kcov/archive/master.tar.gz

Cargo.toml

@@ -3,23 +3,13 @@
 name = "holmes"
 version = "0.0.1"
 authors = [ "Matthew Maurer <maurer@matthewmaurer.org>" ]
-build = "build.rs"
 license = "MIT"
 description = "Holmes Inference System"
 repository = "https://github.com/maurer/holmes"
 
-[[bin]]
-
-name = "holmes"
-
-[build-dependencies]
-capnpc = "0.2.3"
-
 [dependencies]
-capnp = "0.2.4"
-capnp-rpc = "0.2.3"
-postgres = "0.9"
-postgres_array = "0.5"
+postgres = { features = [ "unix_socket" ] }
+postgres_array = "*"
 rustc-serialize = "*"
 getopts = "*"
 

README.md

@@ -1,23 +1,19 @@
 # Holmes
 
-[![Build Status](https://travis-ci.org/BinaryAnalysisPlatform/holmes.svg?branch=master)](https://travis-ci.org/BinaryAnalysisPlatform/holmes)
-[![Coverage Status](https://coveralls.io/repos/BinaryAnalysisPlatform/holmes/badge.svg)](https://coveralls.io/r/BinaryAnalysisPlatform/holmes)
+[![Build Status](https://travis-ci.org/maurer/holmes.svg?branch=master)](https://travis-ci.org/maurer/holmes)
+[![Coverage Status](https://coveralls.io/repos/maurer/holmes/badge.svg)](https://coveralls.io/r/maurer/holmes)
 
 
 A system for integrating multiple analyses using a logic language.
 
 ## Requirements
-* **Rust** - Holmes is developed against [Rust 1.0.0](https://static.rust-lang.org/dist/rust-1.0.0-x86_64-unknown-linux-gnu.tar.gz).
+* **Rust** - Holmes is developed against [Rust 1.5.0](https://static.rust-lang.org/dist/rust-1.5.0-x86_64-unknown-linux-gnu.tar.gz).
 
 * **PostgreSQL** - Holmes uses **PostgreSQL** to back its datastore.
   I develop against 9.4, and test against 9.3 on [Travis](https://travis-ci.org/maurer/holmes).
   However, there should not be a strong version dependency, and other versions will likely work.
   Other backing stores may become available in the future.
 
-* **Cap'n Proto** - Holmes uses [Cap'n Proto](https://capnproto.org/) to provide RPC and capability support.
-  I develop and test against the latest git master of [Cap'n Proto](https://github.com/sandstorm-io/capnproto).
-  It should still work with the latest [release](https://capnproto.org/capnproto-c++-0.5.1.tar.gz), but this is not the dev/test environment.
-
 * **Linux/X86_64** - This is not an explicit dependency.
   To the best of my knowledge, all tools I am using work on OSX/Windows and I am not using any architecture specific hacks.
   However, I am not developing on other architectures/OSes, nor will I be testing on them until things are much more feature complete.

package.nix

@@ -0,0 +1,9 @@
+{ rustPlatform, openssl, capnproto, which, postgresql }:
+with rustPlatform;
+
+buildRustPackage rec {
+  name = "holmes";
+  src  = ./.;
+  buildInputs = [ openssl capnproto which postgresql ];
+  depsSha256 = "";
+}