Главная Обзор Помощь
Зарегистрироваться Войти
J1X
/
huginn
Следить 2
В избранное 0
Ответвить 0

Просмотр исходного кода
Merge branch 'master' into add_keep_events_for_to_agents

Andrew Cantino лет %!s(int64=11): %!d(string=назад)
Родитель
c4c1a53942 bdc1f3f038
Сommit
b3304a78ca
5 измененных файлов с 45 добавлено и 19 удалено
Показать статистику Diff
  1. 10 0
      .travis.yml
  2. 3 2
      Gemfile
  3. 24 13
      Gemfile.lock
  4. 4 4
      README.md
  5. 4 0
      spec/spec_helper.rb

+ 10 - 0
.travis.yml
Просмотреть файл 

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

+ 3 - 2
Gemfile
Просмотреть файл 

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

+ 24 - 13
Gemfile.lock
Просмотреть файл 

@@ -1,10 +1,3 @@
1 
-GIT
2 
-  remote: https://github.com/wok/delayed_job
3 
-  revision: d1f53b489a13146f6b2ac27ef26b2e2dc6ae558c
4 
-  specs:
5 
-    delayed_job (3.0.4)
6 
-      activesupport (~> 3.0)
7 
-
8 1 
 GEM
9 2 
   remote: https://rubygems.org/
10 3 
   specs:
 
@@ -36,7 +29,7 @@ GEM
36 29 
       i18n (= 0.6.1)
37 30 
       multi_json (~> 1.0)
38 31 
     addressable (2.3.5)
39 
-    arel (3.0.2)
32 
+    arel (3.0.3)
40 33 
     bcrypt-ruby (3.1.1)
41 34 
     bootstrap-kaminari-views (0.0.2)
42 35 
       kaminari (>= 0.13)
 
@@ -51,18 +44,27 @@ GEM
51 44 
       execjs
52 45 
     coffee-script-source (1.6.3)
53 46 
     cookiejar (0.3.0)
47 
+    coveralls (0.7.0)
48 
+      multi_json (~> 1.3)
49 
+      rest-client
50 
+      simplecov (>= 0.7)
51 
+      term-ansicolor
52 
+      thor
54 53 
     crack (0.4.1)
55 54 
       safe_yaml (~> 0.9.0)
56 55 
     daemons (1.1.9)
57 
-    delayed_job_active_record (0.3.3)
58 
-      activerecord (>= 2.1.0, < 4)
59 
-      delayed_job (~> 3.0)
56 
+    delayed_job (4.0.0)
57 
+      activesupport (>= 3.0, < 4.1)
58 
+    delayed_job_active_record (4.0.0)
59 
+      activerecord (>= 3.0, < 4.1)
60 
+      delayed_job (>= 3.0, < 4.1)
60 61 
     devise (3.0.0)
61 62 
       bcrypt-ruby (~> 3.0)
62 63 
       orm_adapter (~> 0.1)
63 64 
       railties (>= 3.2.6, < 5)
64 65 
       warden (~> 1.2.3)
65 66 
     diff-lcs (1.2.4)
67 
+    docile (1.1.1)
66 68 
     dotenv (0.9.0)
67 69 
     dotenv-rails (0.9.0)
68 70 
       dotenv (= 0.9.0)
 
@@ -202,6 +204,11 @@ GEM
202 204 
     shoulda-matchers (2.2.0)
203 205 
       activesupport (>= 3.0.0)
204 206 
     simple_oauth (0.1.9)
207 
+    simplecov (0.8.2)
208 
+      docile (~> 1.1.0)
209 
+      multi_json
210 
+      simplecov-html (~> 0.8.0)
211 
+    simplecov-html (0.8.0)
205 212 
     slop (3.4.5)
206 213 
     sprockets (2.2.2)
207 214 
       hike (~> 1.2)
 
@@ -209,8 +216,11 @@ GEM
209 216 
       rack (~> 1.0)
210 217 
       tilt (~> 1.1, != 1.3.0)
211 218 
     system_timer (1.2.4)
219 
+    term-ansicolor (1.2.2)
220 
+      tins (~> 0.8)
212 221 
     thor (0.18.1)
213 222 
     tilt (1.4.1)
223 
+    tins (0.13.1)
214 224 
     treetop (1.4.15)
215 225 
       polyglot
216 226 
       polyglot (>= 0.3.1)
 
@@ -253,9 +263,10 @@ PLATFORMS
253 263 
 DEPENDENCIES
254 264 
   bootstrap-kaminari-views
255 265 
   coffee-rails (~> 3.2.1)
266 
+  coveralls
256 267 
   daemons
257 
-  delayed_job!
258 
-  delayed_job_active_record (~> 0.3.3)
268 
+  delayed_job
269 
+  delayed_job_active_record
259 270 
   devise
260 271 
   dotenv-rails
261 272 
   em-http-request

+ 4 - 4
README.md
Просмотреть файл 

@@ -18,7 +18,7 @@ Huginn is a system for building agents that perform automated tasks for you onli
18 18 
 * Track your location over time
19 19 
 * Create Amazon Mechanical Turk tasks as the input, or output, of events
20 20
21 
-Follow [@tectonic](https://twitter.com/tectonic) for updates as Huginn evolves, and join us in \#huginn on Freenode IRC to discuss the project.
21 
+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.
22 22
23 23 
 ## Examples
24 24 
 
@@ -47,6 +47,8 @@ If you just want to play around, you can simply clone this repository, then perf
47 47 
 * Run `foreman start`, visit [http://localhost:3000/][localhost], and login with the username of `admin` and the password of `password`.
48 48 
 * Setup some Agents!
49 49
50 
+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`.
51 
+
50 52 
 If you need more detailed instructions, see the [Novice setup guide][novice-setup-guide].
51 53
52 54 
 [localhost]: http://localhost:3000/
 
@@ -111,7 +113,5 @@ Huginn is a work in progress and is hopefully just getting started.  Please get
111 113
112 114 
 Please fork, add specs, and send pull requests!
113 115
114 
-[![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)
115 
-
116 
-[![Bitdeli Badge](https://d2weczhvl823v0.cloudfront.net/cantino/huginn/trend.png)](https://bitdeli.com/free "Bitdeli Badge")
116 
+[![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")
117 117

+ 4 - 0
spec/spec_helper.rb
Просмотреть файл 

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