Merge branch 'master' into add_keep_events_for_to_agents

.travis.yml

@@ -1,8 +1,18 @@
 language: ruby
 bundler_args: --without development production
 rvm:
+  - 2.0.0
+  - 2.1.0
   - 1.9.3
 before_script:
   - mysql -e 'create database huginn_test;'
   - bundle exec rake db:migrate db:test:prepare
 script: "bundle exec rake"
+notifications:
+  irc:
+    channels:
+      - "chat.freenode.net#huginn"
+    template:
+      - "%{repository}#%{build_number} (%{branch} - %{commit} : %{author}): %{message}"
+      - "Change view : %{compare_url}"
+      - "Build details : %{build_url}"

Gemfile

@@ -11,8 +11,8 @@ gem 'json', '>= 1.7.7'
 gem 'jsonpath'
 gem 'twilio-ruby'
 
-gem 'delayed_job', :git => 'https://github.com/wok/delayed_job' # Until the YAML issues are fixed in master.
-gem 'delayed_job_active_record', "~> 0.3.3" # newer was giving a strange MySQL error
+gem 'delayed_job'
+gem 'delayed_job_active_record'#, "~> 0.3.3" # newer was giving a strange MySQL error
 gem "daemons"
 # gem "delayed_job_web"
 
@@ -53,4 +53,5 @@ group :development, :test do
   gem 'rr'
   gem 'webmock', :require => false
   gem 'rake'
+  gem 'coveralls', :require => false
 end

Gemfile.lock

@@ -1,10 +1,3 @@
-GIT
-  remote: https://github.com/wok/delayed_job
-  revision: d1f53b489a13146f6b2ac27ef26b2e2dc6ae558c
-  specs:
-    delayed_job (3.0.4)
-      activesupport (~> 3.0)
-
 GEM
   remote: https://rubygems.org/
   specs:
@@ -36,7 +29,7 @@ GEM
       i18n (= 0.6.1)
       multi_json (~> 1.0)
     addressable (2.3.5)
-    arel (3.0.2)
+    arel (3.0.3)
     bcrypt-ruby (3.1.1)
     bootstrap-kaminari-views (0.0.2)
       kaminari (>= 0.13)
@@ -51,18 +44,27 @@ GEM
       execjs
     coffee-script-source (1.6.3)
     cookiejar (0.3.0)
+    coveralls (0.7.0)
+      multi_json (~> 1.3)
+      rest-client
+      simplecov (>= 0.7)
+      term-ansicolor
+      thor
     crack (0.4.1)
       safe_yaml (~> 0.9.0)
     daemons (1.1.9)
-    delayed_job_active_record (0.3.3)
-      activerecord (>= 2.1.0, < 4)
-      delayed_job (~> 3.0)
+    delayed_job (4.0.0)
+      activesupport (>= 3.0, < 4.1)
+    delayed_job_active_record (4.0.0)
+      activerecord (>= 3.0, < 4.1)
+      delayed_job (>= 3.0, < 4.1)
     devise (3.0.0)
       bcrypt-ruby (~> 3.0)
       orm_adapter (~> 0.1)
       railties (>= 3.2.6, < 5)
       warden (~> 1.2.3)
     diff-lcs (1.2.4)
+    docile (1.1.1)
     dotenv (0.9.0)
     dotenv-rails (0.9.0)
       dotenv (= 0.9.0)
@@ -202,15 +204,23 @@ GEM
     shoulda-matchers (2.2.0)
       activesupport (>= 3.0.0)
     simple_oauth (0.1.9)
+    simplecov (0.8.2)
+      docile (~> 1.1.0)
+      multi_json
+      simplecov-html (~> 0.8.0)
+    simplecov-html (0.8.0)
     slop (3.4.5)
     sprockets (2.2.2)
       hike (~> 1.2)
       multi_json (~> 1.0)
       rack (~> 1.0)
       tilt (~> 1.1, != 1.3.0)
     system_timer (1.2.4)
+    term-ansicolor (1.2.2)
+      tins (~> 0.8)
     thor (0.18.1)
     tilt (1.4.1)
+    tins (0.13.1)
     treetop (1.4.15)
       polyglot
       polyglot (>= 0.3.1)
@@ -253,9 +263,10 @@ PLATFORMS
 DEPENDENCIES
   bootstrap-kaminari-views
   coffee-rails (~> 3.2.1)
+  coveralls
   daemons
-  delayed_job!
-  delayed_job_active_record (~> 0.3.3)
+  delayed_job
+  delayed_job_active_record
   devise
   dotenv-rails
   em-http-request

README.md

@@ -18,7 +18,7 @@ Huginn is a system for building agents that perform automated tasks for you onli
 * Track your location over time
 * Create Amazon Mechanical Turk tasks as the input, or output, of events
 
-Follow [@tectonic](https://twitter.com/tectonic) for updates as Huginn evolves, and join us in \#huginn on Freenode IRC to discuss the project.
+Follow [@tectonic](https://twitter.com/tectonic) for updates as Huginn evolves, and join us in [our IRC channel](https://kiwiirc.com/client/irc.freenode.net/?nick=huginn-user|?#huginn) (\#huginn on Freenode) to discuss the project.
 
 ## Examples
 
@@ -47,6 +47,8 @@ If you just want to play around, you can simply clone this repository, then perf
 * Run `foreman start`, visit [http://localhost:3000/][localhost], and login with the username of `admin` and the password of `password`.
 * Setup some Agents!
 
+Note: by default, emails are not sent in the `development` Rails environment, which is what you just setup.  If you'd like to enable emails when playing with Huginn locally, edit `config.action_mailer.perform_deliveries` in `config/environments/development.rb`.
+
 If you need more detailed instructions, see the [Novice setup guide][novice-setup-guide].
 
 [localhost]: http://localhost:3000/
@@ -111,7 +113,5 @@ Huginn is a work in progress and is hopefully just getting started.  Please get
 
 Please fork, add specs, and send pull requests!
 
-[![Build Status](https://travis-ci.org/cantino/huginn.png)](https://travis-ci.org/cantino/huginn) [![Code Climate](https://codeclimate.com/github/cantino/huginn.png)](https://codeclimate.com/github/cantino/huginn)
-
-[![Bitdeli Badge](https://d2weczhvl823v0.cloudfront.net/cantino/huginn/trend.png)](https://bitdeli.com/free "Bitdeli Badge")
+[![Build Status](https://travis-ci.org/cantino/huginn.png)](https://travis-ci.org/cantino/huginn) [![Coverage Status](https://coveralls.io/repos/cantino/huginn/badge.png)](https://coveralls.io/r/cantino/huginn) [![Bitdeli Badge](https://d2weczhvl823v0.cloudfront.net/cantino/huginn/trend.png)](https://bitdeli.com/free "Bitdeli Badge")
 

spec/spec_helper.rb

@@ -1,5 +1,9 @@
 # This file is copied to spec/ when you run 'rails generate rspec:install'
 ENV["RAILS_ENV"] ||= 'test'
+
+require 'coveralls'
+Coveralls.wear!('rails')
+
 require File.expand_path("../../config/environment", __FILE__)
 require 'rspec/rails'
 require 'rspec/autorun'