Merge remote-tracking branch 'origin/develop'

.gitmodules

@@ -0,0 +1,3 @@
+[submodule "Kitura-CI"]
+	path = Kitura-CI
+	url = https://github.com/IBM-Swift/Kitura-CI.git

.travis.yml

@@ -0,0 +1,31 @@
+# Travis CI build file for Kitura-redis.
+# Kitura runs on OS X and Linux (Ubuntu v15.10).
+
+# whitelist (branches that should be built)
+branches:
+  only:
+    - master
+    - develop
+
+notifications:
+  slack: ibmswift:RHkwcHYh4kkYVRVzm9nZk5TF
+
+matrix:
+  include:
+    - os: linux
+      services: docker
+      sudo: required
+    - os: osx
+      osx_image: xcode7.2
+      sudo: required
+
+before_install:
+  - git submodule init
+  - git submodule update
+  - cd Kitura-CI && git checkout $TRAVIS_BRANCH && cd $TRAVIS_BUILD_DIR
+
+script:
+  - echo ">> Let's build and test the '$TRAVIS_BRANCH' branch for Kitura-redis."
+  - if [[ "$TRAVIS_OS_NAME" == "linux" ]]; then ./Kitura-CI/run_kitura_ubuntu_container.sh $TRAVIS_BRANCH $TRAVIS_BUILD_DIR Kitura-redis ; fi
+  - if [[ "$TRAVIS_OS_NAME" == "osx" ]]; then ./Kitura-CI/build_kitura_package.sh ; fi
+  - echo ">> Build and tests completed. See above for status."

Package.swift

@@ -20,6 +20,6 @@ let package = Package(
     name: "SwiftRedis",
     dependencies: [
         .Package(url: "https://github.com/IBM-Swift/Kitura-hiredis.git", versions: Version(0,2,0)..<Version(0,3,0)),
-        .Package(url: "https://github.com/IBM-Swift/Kitura-sys.git", versions: Version(0,2,0)..<Version(0,3,0)),
+        .Package(url: "https://github.com/IBM-Swift/Kitura-sys.git", versions: Version(0,3,0)..<Version(0,4,0)),
     ]
 )

README.md

@@ -1,6 +1,22 @@
-# Kitura-redis
-Swift Redis library
+# KituraRedis
 
-This is a Swift interface for interacting with a Redis database using [Hiredis](https://github.com/redis/hiredis).
+[![Build Status](https://travis-ci.org/IBM-Swift/Kitura-redis.svg?branch=master)](https://travis-ci.org/IBM-Swift/Kitura-redis)
+[![Build Status](https://travis-ci.org/IBM-Swift/Kitura-redis.svg?branch=develop)](https://travis-ci.org/IBM-Swift/Kitura-redis)
+
+***Swift Redis library***
+
+KituraRedis is a Swift library for interacting with a Redis database using [Hiredis](https://github.com/redis/hiredis).
 
 It is dependent on the [Kitura-sys](https://github.com/IBM-Swift/Kitura-sys) module.
+
+## Build:
+
+  - `swift build -Xcc -fblocks -Xswiftc -I/usr/local/include -Xlinker -L/usr/local/lib` (Mac OS X)
+  - `swift build -Xcc -fblocks` (Linux)
+
+## Running Tests:
+
+  - `swift test`
+
+## Usage:
+(Todo)