Skip to content

Commit 5fbeb10

Browse files
committed
Update gems and configs to Rails5
1 parent 7e79d57 commit 5fbeb10

17 files changed

+221
-183
lines changed

.travis.yml

Lines changed: 5 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -24,18 +24,17 @@ matrix:
2424
- env: DOCKER_IMAGE=cantino/huginn DOCKERFILE=docker/multi-process/Dockerfile
2525
- env: RSPEC_TASK=spec:features
2626
include:
27-
- rvm: 2.3.0
27+
- rvm: 2.3.1
2828
env: DATABASE_ADAPTER=mysql2 DOCKER_IMAGE=cantino/huginn-single-process DOCKERFILE=docker/single-process/Dockerfile
29-
- rvm: 2.3.0
29+
- rvm: 2.3.1
3030
env: DATABASE_ADAPTER=mysql2 DOCKER_IMAGE=cantino/huginn DOCKERFILE=docker/multi-process/Dockerfile
31-
- rvm: 2.3.0
31+
- rvm: 2.3.1
3232
env: RSPEC_TASK=spec:features DATABASE_ADAPTER=mysql2
33-
- rvm: 2.3.0
33+
- rvm: 2.3.1
3434
env: RSPEC_TASK=spec:features DATABASE_ADAPTER=postgresql DATABASE_USERNAME=postgres
3535
rvm:
36-
- 2.1
3736
- 2.2
38-
- 2.3.0
37+
- 2.3.1
3938
cache: bundler
4039
bundler_args: --without development production
4140
before_install:

Gemfile

Lines changed: 17 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -38,19 +38,20 @@ gem 'slack-notifier', '~> 1.0.0' # SlackAgent
3838
gem 'hypdf', '~> 1.0.10' # PDFInfoAgent
3939

4040
# Weibo Agents
41-
gem 'weibo_2', github: 'cantino/weibo_2', branch: 'master'
41+
# FIXME needs to loosen omniauth dependency
42+
#gem 'weibo_2', github: 'cantino/weibo_2', branch: 'master'
4243

4344
# GoogleCalendarPublishAgent
4445
gem "google-api-client", require: 'google/api_client'
4546

4647
# Twitter Agents
4748
gem 'twitter', '~> 5.14.0' # Must to be loaded before cantino-twitter-stream.
4849
gem 'twitter-stream', github: 'cantino/twitter-stream', branch: 'huginn'
49-
gem 'omniauth-twitter'
50+
gem 'omniauth-twitter', '~> 1.2.1'
5051

5152
# Tumblr Agents
5253
gem 'tumblr_client', github: 'tumblr/tumblr_client', branch: 'master' # '>= 0.8.5'
53-
gem 'omniauth-tumblr'
54+
gem 'omniauth-tumblr', '~> 1.2'
5455

5556
# Dropbox Agents
5657
gem 'dropbox-api'
@@ -71,7 +72,7 @@ gem 'aws-sdk-core', '~> 2.2.15'
7172

7273
# Optional Services.
7374
gem 'omniauth-37signals' # BasecampAgent
74-
gem 'omniauth-wunderlist', github: 'wunderlist/omniauth-wunderlist', ref: 'd0910d0396107b9302aa1bc50e74bb140990ccb8'
75+
gem 'omniauth-wunderlist'
7576

7677
# Bundler <1.5 does not recognize :x64_mingw as a valid platform name.
7778
# Unfortunately, it can't self-update because it errors when encountering :x64_mingw.
@@ -83,11 +84,11 @@ end
8384
gem 'ace-rails-ap', '~> 2.0.1'
8485
gem 'bootstrap-kaminari-views', '~> 0.0.3'
8586
gem 'bundler', '>= 1.5.0'
86-
gem 'coffee-rails', '~> 4.1.1'
87+
gem 'coffee-rails', '~> 4.2'
8788
gem 'daemons', '~> 1.1.9'
8889
gem 'delayed_job', '~> 4.1.0'
8990
gem 'delayed_job_active_record', github: 'collectiveidea/delayed_job_active_record', branch: 'master'
90-
gem 'devise', '~> 3.5.4'
91+
gem 'devise','~> 4.2.0'
9192
gem 'em-http-request', '~> 1.1.2'
9293
gem 'faraday', '~> 0.9.0'
9394
gem 'faraday_middleware', github: 'lostisland/faraday_middleware', branch: 'master' # '>= 0.10.1'
@@ -100,7 +101,7 @@ gem 'geokit', '~> 1.8.4'
100101
gem 'geokit-rails', '~> 2.0.1'
101102
gem 'httparty', '~> 0.13'
102103
gem 'httmultiparty', '~> 0.3.16'
103-
gem 'jquery-rails', '~> 3.1.3'
104+
gem 'jquery-rails', '~> 4.2.1'
104105
gem 'huginn_agent', '~> 0.4.0'
105106
gem 'json', '~> 1.8.1'
106107
gem 'jsonpathv2', '~> 0.0.8'
@@ -110,8 +111,8 @@ gem 'liquid', '~> 3.0.3'
110111
gem 'mini_magick'
111112
gem 'multi_xml'
112113
gem 'nokogiri', '1.6.8'
113-
gem 'omniauth'
114-
gem 'rails', '4.2.7.1'
114+
gem 'omniauth', '~> 1.3.1'
115+
gem 'rails', '~> 5.0.0.1'
115116
gem 'rufus-scheduler', '~> 3.0.8', require: false
116117
gem 'sass-rails', '~> 5.0.6'
117118
gem 'select2-rails', '~> 3.5.4'
@@ -124,12 +125,12 @@ gem 'uglifier', '~> 2.7.2'
124125
group :development do
125126
gem 'better_errors', '~> 1.1'
126127
gem 'binding_of_caller'
127-
gem 'quiet_assets'
128128
gem 'guard', '~> 2.13.0'
129129
gem 'guard-livereload', '~> 2.5.1'
130130
gem 'guard-rspec', '~> 4.6.4'
131131
gem 'rack-livereload', '~> 0.3.16'
132-
gem 'letter_opener_web'
132+
gem 'letter_opener_web', '~> 1.3.0'
133+
gem 'web-console'
133134

134135
gem 'capistrano', '~> 3.4.0'
135136
gem 'capistrano-rails', '~> 1.1'
@@ -138,6 +139,7 @@ group :development do
138139
if_true(ENV['SPRING']) do
139140
gem 'spring-commands-rspec', '~> 1.0.4'
140141
gem 'spring', '~> 1.6.3'
142+
gem 'spring-watcher-listen', '~> 2.0.0'
141143
end
142144

143145
group :test do
@@ -150,8 +152,9 @@ group :development do
150152
gem 'rr'
151153
gem 'rspec', '~> 3.5'
152154
gem 'rspec-collection_matchers', '~> 1.1.0'
153-
gem 'rspec-rails', '~> 3.5.1'
154-
gem 'rspec-html-matchers', '~> 0.7'
155+
gem 'rspec-rails', '~> 3.5.2'
156+
gem 'rspec-html-matchers', '~> 0.8'
157+
gem 'rails-controller-testing'
155158
gem 'shoulda-matchers'
156159
gem 'vcr'
157160
gem 'webmock', '~> 1.17.4', require: false
@@ -160,8 +163,7 @@ group :development do
160163
end
161164

162165
group :production do
163-
gem 'rack', '> 1.5.0'
164-
gem 'unicorn', '~> 4.9.0'
166+
gem 'unicorn', '~> 5.1.0'
165167
end
166168

167169
# Platform requirements.

0 commit comments

Comments
 (0)