diff options
| author | Azul <azul@riseup.net> | 2014-01-06 07:47:28 +0100 |
|---|---|---|
| committer | Azul <azul@riseup.net> | 2014-02-04 11:46:57 +0100 |
| commit | 53b2a1f1f750a48939e69278297d69dbc6b213ad (patch) | |
| tree | c239d9f75a4474365402e554d306336c33d7a8ab | |
| parent | 41b99f4aec6ac6431531a380c65d4933c740fa67 (diff) | |
try to get require rubygems to work on travis
| -rw-r--r-- | .travis.yml | 4 | ||||
| -rwxr-xr-x | bin/tapicero | 4 | ||||
| -rw-r--r-- | test/config.yaml | 2 | ||||
| -rw-r--r-- | test/config/config.yaml | 5 | ||||
| -rw-r--r-- | test/setup_couch.sh | 4 |
5 files changed, 8 insertions, 11 deletions
diff --git a/.travis.yml b/.travis.yml index 69f79e6..ecbf265 100644 --- a/.travis.yml +++ b/.travis.yml @@ -1,8 +1,10 @@ +rvm: + - "1.9.3" services: - couchdb notifications: email: false before_script: - "/bin/bash test/setup_couch.sh" - - "bin/tapicero start test/config.yaml" + - "bundle exec bin/tapicero start test/config.yaml" - "cat /tmp/test-tapicero.log" diff --git a/bin/tapicero b/bin/tapicero index c20a114..f72b0db 100755 --- a/bin/tapicero +++ b/bin/tapicero @@ -1,10 +1,10 @@ -#!/usr/bin/ruby +#!/usr/bin/env ruby -require 'pathname' # # Tapicero Daemon # +require 'pathname' BASE_DIR = Pathname.new(__FILE__).realpath + '../..' begin diff --git a/test/config.yaml b/test/config.yaml index 6719eb4..599df4a 100644 --- a/test/config.yaml +++ b/test/config.yaml @@ -9,7 +9,7 @@ connection: port: 5984 username: anna password: secret - prefix: "test" + prefix: "tapicero-test" suffix: "" # file to store the last processed user record in so we can resume after diff --git a/test/config/config.yaml b/test/config/config.yaml deleted file mode 100644 index ee10fe6..0000000 --- a/test/config/config.yaml +++ /dev/null @@ -1,5 +0,0 @@ -# -# testing configuration options -# - -db_prefix: "tapicero_test-" diff --git a/test/setup_couch.sh b/test/setup_couch.sh index 026c15c..ae28758 100644 --- a/test/setup_couch.sh +++ b/test/setup_couch.sh @@ -6,8 +6,8 @@ curl -X GET $HOST echo "creating unprivileged user :" curl -HContent-Type:application/json -XPUT $HOST/_users/org.couchdb.user:me --data-binary '{"_id": "org.couchdb.user:me","name": "me","roles": [],"type": "user","password": "pwd"}' echo "creating database to watch:" -curl -X PUT $HOST/test-users +curl -X PUT $HOST/tapicero-test-users echo "restricting database access :" -curl -X PUT $HOST/test-users/_security -Hcontent-type:application/json --data-binary '{"admins":{"names":[],"roles":[]},"members":{"names":["me"],"roles":[]}}' +curl -X PUT $HOST/tapicero-test-users/_security -Hcontent-type:application/json --data-binary '{"admins":{"names":[],"roles":[]},"members":{"names":["me"],"roles":[]}}' echo "adding admin :" curl -X PUT $HOST/_config/admins/anna -d '"secret"' |