Regex Tweak

.coveragerc

@@ -3,4 +3,6 @@ omit =
     will/tests/*
     .tox/*
     setup.py
-    *.egg/*
+    *.egg/*
+    venv/*
+    site-packages/*

.gitignore

@@ -52,4 +52,7 @@ redis-stable/
 redis-stable.tar.gz
 
 # Profiling files
-will_profiles/*
+will_profiles/*
+.python-version
+
+docker/.docker/.buildNodeID

.travis.yml

@@ -1,8 +1,23 @@
 language: python
 sudo: false
-
+services:
+    - docker
+before_install:
+  - sudo apt-get update
+  - sudo apt-get install -y libffi-dev libxml2-dev
 install:
-    - pip install -U tox
-
-script: 
-    - tox
+- pip install -U tox
+- pip install -r will/requirements/dev.txt
+script:
+- tox
+- export CTAG="-$TRAVIS_COMMIT"
+# - "fab docker_build"
+# deploy:
+#   skip_cleanup: true
+#   provider: script
+#   script: "fab docker_deploy"
+#   on:
+#     branch: master
+env:
+  matrix:
+    secure: SWBr2Ih6+vT0iX5CxqPT8ICmtFUcIk7MRfh21DnsGKpumz60mgRPnb+aMxagSDWrF0btGyI3vfD8nYEv6Vv+WDDCbeJCG3xExsIusiflaM1Vqo1OcUGlO55jQm1WtNub7SmiMSH8EY5GFFNfFn7CmSmU1xaM0p5q8Y0OTbZpku8=

AUTHORS

@@ -21,7 +21,7 @@ Adam Papai, https://github.com/woohgit
 Jessamyn Smith, https://github.com/jessamynsmith
 Brandon Sturgeon, https://github.com/brandonsturgeon
 Ryan Murfitt, https://github.com/puug
-Piotr 'keNzi' Czajkowski, http://www.videotesty.pl/
+Piotr 'keNzi' Czajkowski, http://www.videotesty.pl
 Dmitri Muntean, https://github.com/dmuntean
 Ben lau, Mashery, https://github.com/netjunki
 Evan Borgstrom, https://github.com/borgstrom
@@ -42,5 +42,15 @@ Regner Blok-Andersen, https://github.com/Regner
 danbourke, https://github.com/danbourke
 Jose Cueto, https://github.com/pepedocs
 Derek Adair, https://github.com/derek-adair
-Antony Gelberg, https://github.com/antgel/
+Antony Gelberg, https://github.com/antgel
+Jeppe Toustrup, https://github.com/Tenzer
 bykof, https://github.com/bykof/
+Mike Love, https://github.com/mike-love
+Roy Zheng, https://github.com/wontonst
+acommasplice, https://github.com/acommasplice
+TaunoTinits, https://github.com/TaunoTinits
+ostracon, https://github.com/ostracon
+mattcl, https://github.com/mattcl
+Ahmed Osman, https://github.com/Ashex 
+Boris Peterbarg, https://github.com/reist
+unicolet, https://github.com/unicolet

MANIFEST.in

@@ -2,4 +2,7 @@ include README.md AUTHORS LICENSE
 include *.txt
 include *.md
 include *.py
+include requirements/*.txt
 recursive-include will/templates *
+recursive-include will/requirements *
+recursive-include will/scripts *

README.md

@@ -4,7 +4,7 @@
 
 Meet Will.
 
-Will is the friendliest, easiest-to-teach bot you've ever used.  He works on hipchat, in rooms and 1-1 chats.
+Will is the friendliest, easiest-to-teach bot you've ever used.  He works on Slack, Hipchat, Rocket.chat, and more - so you can build your bot without platform lock-in.
 
 He makes teaching your chat bot this simple:
 
@@ -14,12 +14,11 @@ def say_hello(self, message):
     self.say("oh, hello!")
 ```
 
-The hipchat Will was first built by [Steven Skoczen](http://stevenskoczen.com) while in the Greenkahuna Skunkworks (now defunct), was extended by [Ink and Feet](https://inkandfeet.com), and has been [contributed to by lots of awesome people](http://skoczen.github.io/will/improve/#the-shoulders-of-giants).
+The first version of Will was built by [Steven Skoczen](http://stevenskoczen.com) while in the Greenkahuna Skunkworks (now defunct), was extended by [Ink and Feet](https://inkandfeet.com) and has been [contributed to by lots of awesome people](http://skoczen.github.io/will/improve/#the-shoulders-of-giants).
 
 Will has docs, including a quickstart and lots of screenshots at:
 **[http://skoczen.github.io/will/](http://skoczen.github.io/will)** 
 
-Check them out!
-
+If you've been using Will 0.x or 1.x, and are wondering how to upgrade to 2.x, [here's our friendly guide](http://skoczen.github.io/will/upgrading_to_2/). :) 
 
-**Big Update:** I've just posted the [roadmap and future direction](https://github.com/skoczen/will/issues/257) for will.  Your thoughts are welcome!!
+Check them out!

circle.yml

@@ -1,8 +1,10 @@
 dependencies:
   pre:
-    - pip install -r requirements.dev.txt
+    - pip install -r requirements.txt; pip install -r requirements/dev.txt
 test:
   override:
     - /home/ubuntu/will/will/scripts/test_run.sh
+    - rm -rf .eggs
     - coverage run -m nose
+    - tox
     - flake8

config.py

@@ -0,0 +1 @@
+will/scripts/config.py.dist

docker/.gitignore

@@ -0,0 +1 @@
+*.mike-love