Skip to content

Upgrade to newer Ruby, ActiveRecord, RSpec #294

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
swanson merged 9 commits into from
Dec 31, 2013
Merged

Upgrade to newer Ruby, ActiveRecord, RSpec #294

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
9 commits
Select commit Hold shift + click to select a range
f685deb
update to work on ruby 2.1.0
dwaite Dec 26, 2013
5dd9d51
Sort gemfile entries
dwaite Dec 26, 2013
2a80389
Update versions of all except ActiveRecord (due to protected attribut…
dwaite Dec 26, 2013
60342b6
Updated to ActiveRecord 4
dwaite Dec 27, 2013
69ff1ef
Set ruby version to 2.1.0
dwaite Dec 27, 2013
cb3384a
Switch to mainline releases of feedback, feedzirra, sinatra-contrib
dwaite Dec 27, 2013
a7ea550
fix db:migrate
dwaite Dec 27, 2013
0ac32b7
Fix delayed_job usage in Rakefile; switched to the 4.0 stable branch …
dwaite Dec 27, 2013
0b2abe8
update to feedzirra 0.6.0 and nokogiri 1.6.x
dwaite Dec 28, 2013
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
72 changes: 33 additions & 39 deletions Gemfile
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,57 +1,51 @@
ruby "2.1.0"
source "https://rubygems.org"
ruby '1.9.3'

group :production do
gem "unicorn", "~> 4.6.2"
gem "pg", "~> 0.15.1"
gem "pg", "~> 0.17.1"
gem "unicorn", "~> 4.7"
end

group :development do
gem "sqlite3", "~> 1.3.7"
gem "coveralls", "~> 0.6.7", require: false
gem "pry-debugger", "~> 0.2.2"
gem "rspec", "~> 2.13.0"
gem "rspec-html-matchers", "~> 0.4.1"
gem "rack-test", "~> 0.6.2"
gem "shotgun", "~> 0.9"
gem "faker", "~> 1.1.2"
gem "foreman", "~> 0.63.0"
gem "sqlite3", "~> 1.3", ">= 1.3.8"
end

group :test do
gem "coveralls", "~> 0.6.7", require: false
gem "pry-debugger", "~> 0.2.2"
gem "rspec", "~> 2.13.0"
gem "rspec-html-matchers", "~> 0.4.1"
gem "rack-test", "~> 0.6.2"
gem "shotgun", "~> 0.9"
gem "racksh", "~> 1.0.0"
gem "faker", "~> 1.1.2"
group :development, :test do
gem "coveralls", "~> 0.7", require: false
gem "faker", "~> 1.2"
gem "foreman", "~> 0.63.0"
gem "pry-byebug", "~> 1.2"
gem "rack-test", "~> 0.6.2"
gem "rspec", "~> 2.14", ">= 2.14.1"
gem "rspec-html-matchers", "~> 0.4.3"
gem "shotgun", "~> 0.9.0"
end

group :heroku do
gem "excon", "~> 0.25.0"
gem "excon", "~> 0.31.0"
gem "formatador", "~> 0.2.4"
gem "netrc", "~> 0.7.7"
gem "rendezvous", "~> 0.0.2"
end

gem "sinatra", "~> 1.4.2"
gem "activerecord", "~> 3.2.0"
gem "sinatra-activerecord", "~> 1.2.2"
gem "sinatra-flash", "~> 0.3.0"
gem "sinatra-contrib", github: "sinatra/sinatra-contrib"
gem "sinatra-assetpack", "~> 0.2.2", require: "sinatra/assetpack"
gem "i18n", "~> 0.6.4"
gem "rake", "~> 10.0.4"
gem "delayed_job_active_record", "~> 0.4.4"
gem "bcrypt-ruby", "~> 3.0.1"
gem "will_paginate", "~> 3.0.4"
gem "feedzirra", github: "swanson/feedzirra"
gem "activerecord", "~> 4.0"
# need to work around bug in 4.0.1 https://github.com/rails/arel/pull/216
gem 'arel', git: 'git://github.com/rails/arel.git', branch: '4-0-stable'
gem "bcrypt-ruby", "~> 3.1.2"
gem "delayed_job", "~> 4.0"
gem "delayed_job_active_record", "~> 4.0"
gem "feedbag", "~> 0.9.2"
gem "feedzirra", "~> 0.6.0"
gem "highline", "~> 1.6", ">= 1.6.20", require: false
gem "i18n", "~> 0.6.9"
gem "loofah", github: "swanson/loofah"
gem "nokogiri", "~> 1.5.9"
gem "feedbag", github: "dwillis/feedbag"
gem "highline", "~> 1.6.19", require: false
gem "thread", "~> 0.0.8"
gem "racksh", "~> 1.0.0"
gem "nokogiri", "~> 1.6"
gem "racksh", "~> 1.0"
gem "rake", "~> 10.1", ">= 10.1.1"
gem "sinatra", "~> 1.4", ">= 1.4.4"
gem "sinatra-assetpack", "~> 0.3.1", require: "sinatra/assetpack"
gem "sinatra-activerecord", "~> 1.2", ">= 1.2.3"
gem "sinatra-contrib", ">= 1.4.2"
gem "sinatra-flash", "~> 0.3.0"
gem "thread", "~> 0.1.3"
gem "will_paginate", "~> 3.0", ">= 3.0.5"
Loading