Skip to content
This repository has been archived by the owner on Aug 21, 2019. It is now read-only.

Commit

Permalink
[#147552449] upgrade Ruby to 2.3 (#9)
Browse files Browse the repository at this point in the history
- add pessimistic version constraints to Gemfile
  • Loading branch information
MothOnMars authored and noremmie committed Sep 1, 2017
1 parent 6313ef9 commit 82d732a
Show file tree
Hide file tree
Showing 4 changed files with 123 additions and 106 deletions.
2 changes: 1 addition & 1 deletion .ruby-version
Original file line number Diff line number Diff line change
@@ -1 +1 @@
ruby-2.1
ruby-2.3.4
2 changes: 1 addition & 1 deletion .travis.yml
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
bundler_args: --without development
language: ruby
rvm:
- 2.1.0
- 2.3.4
before_install:
- curl -O https://download.elasticsearch.org/elasticsearch/elasticsearch/elasticsearch-1.4.4.deb && sudo dpkg -i elasticsearch-1.4.4.deb && true
- 'echo ''script.disable_dynamic: false'' | sudo tee --append /etc/elasticsearch/elasticsearch.yml'
Expand Down
49 changes: 25 additions & 24 deletions Gemfile
Original file line number Diff line number Diff line change
@@ -1,34 +1,35 @@
source 'https://rubygems.org'

gem 'rails', '3.2.22.1'
gem 'rails-api'
gem 'nokogiri'
gem 'tire'
gem 'tire-contrib'
gem 'oj'
gem 'faraday_middleware'
gem 'net-http-persistent'
gem 'airbrake'
gem 'rack-contrib'
gem 'jbuilder'
gem 'rack-cors'
gem 'rails', '3.2.22.5'
gem 'rails-api', '~> 0.1.0'
gem 'nokogiri', '~> 1.8.0'
gem 'tire', '~> 0.6.2' #deprecated in 2013
gem 'tire-contrib', '~> 0.1.2'
gem 'oj', '~> 3.1.3'
gem 'faraday_middleware', '~> 0.9.0'
gem 'net-http-persistent', '~> 2.8'
gem 'airbrake', '~> 3.1.12'
gem 'rack-contrib', '~> 1.1.0'
gem 'jbuilder', '~> 1.4.1'
gem 'rack-cors', '~> 0.3.1'
gem 'us_states', '~> 0.1.1', git: 'https://github.com/GSA/us_states.git'
gem 'newrelic_rpm', '~> 3.6.3.104'

gem 'us_states', :git => 'git://github.com/GSA/us_states.git'

gem 'rspec'

gem 'newrelic_rpm'
# Temporarily limiting rake version:
# #http://stackoverflow.com/questions/35893584/nomethoderror-undefined-method-last-comment-after-upgrading-to-rake-11
gem 'rake', '~> 10.0'

group :development, :test do
gem 'rspec-rails'
gem 'thin'
gem 'rspec-rails', '~> 2.99.0'
gem 'thin', '~> 1.7.1'
end

gem 'capistrano', group: :development
gem 'coveralls', require: false
gem 'capistrano', '~> 2.15.4', group: :development
gem 'coveralls', '~> 0.7.0', require: false

group :test do
gem 'shoulda-matchers'
gem 'simplecov', :require => false
gem 'simplecov-rcov', :require => false
gem 'shoulda-matchers', '~> 2.7.0'
gem 'simplecov', '~> 0.8.2', :require => false
gem 'simplecov-rcov', '~> 0.2.3', :require => false
gem 'test-unit', '~> 3.0'
end
176 changes: 96 additions & 80 deletions Gemfile.lock
Original file line number Diff line number Diff line change
@@ -1,44 +1,44 @@
GIT
remote: git://github.com/GSA/us_states.git
remote: https://github.com/GSA/us_states.git
revision: 7a9728471aabf6df0a1521e2dbeadc09a1df4979
specs:
us_states (0.1.1)

GEM
remote: https://rubygems.org/
specs:
actionmailer (3.2.22.1)
actionpack (= 3.2.22.1)
actionmailer (3.2.22.5)
actionpack (= 3.2.22.5)
mail (~> 2.5.4)
actionpack (3.2.22.1)
activemodel (= 3.2.22.1)
activesupport (= 3.2.22.1)
actionpack (3.2.22.5)
activemodel (= 3.2.22.5)
activesupport (= 3.2.22.5)
builder (~> 3.0.0)
erubis (~> 2.7.0)
journey (~> 1.0.4)
rack (~> 1.4.5)
rack-cache (~> 1.2)
rack-test (~> 0.6.1)
sprockets (~> 2.2.1)
activemodel (3.2.22.1)
activesupport (= 3.2.22.1)
activemodel (3.2.22.5)
activesupport (= 3.2.22.5)
builder (~> 3.0.0)
activerecord (3.2.22.1)
activemodel (= 3.2.22.1)
activesupport (= 3.2.22.1)
activerecord (3.2.22.5)
activemodel (= 3.2.22.5)
activesupport (= 3.2.22.5)
arel (~> 3.0.2)
tzinfo (~> 0.3.29)
activeresource (3.2.22.1)
activemodel (= 3.2.22.1)
activesupport (= 3.2.22.1)
activesupport (3.2.22.1)
activeresource (3.2.22.5)
activemodel (= 3.2.22.5)
activesupport (= 3.2.22.5)
activesupport (3.2.22.5)
i18n (~> 0.6, >= 0.6.4)
multi_json (~> 1.0)
airbrake (3.1.12)
activesupport
builder
json
ansi (1.4.3)
ansi (1.5.0)
arel (3.0.3)
builder (3.0.4)
capistrano (2.15.4)
Expand All @@ -53,29 +53,34 @@ GEM
simplecov (>= 0.7)
term-ansicolor
thor
daemons (1.1.9)
diff-lcs (1.2.4)
daemons (1.2.4)
diff-lcs (1.3)
docile (1.1.3)
domain_name (0.5.20170404)
unf (>= 0.0.5, < 1.0.0)
erubis (2.7.0)
eventmachine (1.0.3)
eventmachine (1.2.3)
faraday (0.8.7)
multipart-post (~> 1.1)
faraday_middleware (0.9.0)
faraday (>= 0.7.4, < 0.9)
hashr (0.0.22)
highline (1.6.19)
hike (1.2.3)
i18n (0.7.0)
http-cookie (1.0.3)
domain_name (~> 0.5)
i18n (0.8.4)
jbuilder (1.4.1)
activesupport (>= 3.0.0)
multi_json (>= 1.2.0)
journey (1.0.4)
json (1.8.3)
mail (2.5.4)
json (1.8.6)
mail (2.5.5)
mime-types (~> 1.16)
treetop (~> 1.4.8)
mime-types (1.25.1)
multi_json (1.11.2)
mini_portile2 (2.2.0)
multi_json (1.12.1)
multipart-post (1.2.0)
net-http-persistent (2.8)
net-scp (1.1.1)
Expand All @@ -85,12 +90,15 @@ GEM
net-ssh (2.6.7)
net-ssh-gateway (1.2.0)
net-ssh (>= 2.6.5)
netrc (0.11.0)
newrelic_rpm (3.6.3.104)
nokogiri (1.5.9)
oj (2.0.14)
nokogiri (1.8.0)
mini_portile2 (~> 2.2.0)
oj (3.1.3)
polyglot (0.3.5)
power_assert (1.0.2)
rack (1.4.7)
rack-cache (1.5.1)
rack-cache (1.7.0)
rack (>= 0.4)
rack-contrib (1.1.0)
rack (>= 0.9.1)
Expand All @@ -99,46 +107,48 @@ GEM
rack
rack-test (0.6.3)
rack (>= 1.0)
rails (3.2.22.1)
actionmailer (= 3.2.22.1)
actionpack (= 3.2.22.1)
activerecord (= 3.2.22.1)
activeresource (= 3.2.22.1)
activesupport (= 3.2.22.1)
rails (3.2.22.5)
actionmailer (= 3.2.22.5)
actionpack (= 3.2.22.5)
activerecord (= 3.2.22.5)
activeresource (= 3.2.22.5)
activesupport (= 3.2.22.5)
bundler (~> 1.0)
railties (= 3.2.22.1)
railties (= 3.2.22.5)
rails-api (0.1.0)
actionpack (>= 3.2.11)
railties (>= 3.2.11)
tzinfo (~> 0.3.31)
railties (3.2.22.1)
actionpack (= 3.2.22.1)
activesupport (= 3.2.22.1)
railties (3.2.22.5)
actionpack (= 3.2.22.5)
activesupport (= 3.2.22.5)
rack-ssl (~> 1.3.2)
rake (>= 0.8.7)
rdoc (~> 3.4)
thor (>= 0.14.6, < 2.0)
rake (10.5.0)
rdoc (3.12.2)
json (~> 1.4)
rest-client (1.6.7)
mime-types (>= 1.16)
rspec (2.13.0)
rspec-core (~> 2.13.0)
rspec-expectations (~> 2.13.0)
rspec-mocks (~> 2.13.0)
rspec-core (2.13.1)
rspec-expectations (2.13.0)
rest-client (1.8.0)
http-cookie (>= 1.0.2, < 2.0)
mime-types (>= 1.16, < 3.0)
netrc (~> 0.7)
rspec-collection_matchers (1.1.3)
rspec-expectations (>= 2.99.0.beta1)
rspec-core (2.99.2)
rspec-expectations (2.99.2)
diff-lcs (>= 1.1.3, < 2.0)
rspec-mocks (2.13.1)
rspec-rails (2.13.2)
rspec-mocks (2.99.4)
rspec-rails (2.99.0)
actionpack (>= 3.0)
activemodel (>= 3.0)
activesupport (>= 3.0)
railties (>= 3.0)
rspec-core (~> 2.13.0)
rspec-expectations (~> 2.13.0)
rspec-mocks (~> 2.13.0)
shoulda-matchers (2.1.0)
rspec-collection_matchers
rspec-core (~> 2.99.0)
rspec-expectations (~> 2.99.0)
rspec-mocks (~> 2.99.0)
shoulda-matchers (2.7.0)
activesupport (>= 3.0.0)
simplecov (0.8.2)
docile (~> 1.1.0)
Expand All @@ -154,14 +164,16 @@ GEM
tilt (~> 1.1, != 1.3.0)
term-ansicolor (1.2.2)
tins (~> 0.8)
thin (1.5.1)
daemons (>= 1.0.9)
eventmachine (>= 0.12.6)
rack (>= 1.0.0)
thor (0.19.1)
test-unit (3.2.4)
power_assert
thin (1.7.1)
daemons (~> 1.0, >= 1.0.9)
eventmachine (~> 1.0, >= 1.0.4)
rack (>= 1, < 3)
thor (0.19.4)
tilt (1.4.1)
tins (0.13.2)
tire (0.5.8)
tire (0.6.2)
activemodel (>= 3.0)
activesupport
ansi
Expand All @@ -174,34 +186,38 @@ GEM
treetop (1.4.15)
polyglot
polyglot (>= 0.3.1)
tzinfo (0.3.46)
tzinfo (0.3.53)
unf (0.1.4)
unf_ext
unf_ext (0.0.7.4)

PLATFORMS
ruby

DEPENDENCIES
airbrake
capistrano
coveralls
faraday_middleware
jbuilder
net-http-persistent
newrelic_rpm
nokogiri
oj
rack-contrib
rack-cors
rails (= 3.2.22.1)
rails-api
rspec
rspec-rails
shoulda-matchers
simplecov
simplecov-rcov
thin
tire
tire-contrib
us_states!
airbrake (~> 3.1.12)
capistrano (~> 2.15.4)
coveralls (~> 0.7.0)
faraday_middleware (~> 0.9.0)
jbuilder (~> 1.4.1)
net-http-persistent (~> 2.8)
newrelic_rpm (~> 3.6.3.104)
nokogiri (~> 1.8.0)
oj (~> 3.1.3)
rack-contrib (~> 1.1.0)
rack-cors (~> 0.3.1)
rails (= 3.2.22.5)
rails-api (~> 0.1.0)
rake (~> 10.0)
rspec-rails (~> 2.99.0)
shoulda-matchers (~> 2.7.0)
simplecov (~> 0.8.2)
simplecov-rcov (~> 0.2.3)
test-unit (~> 3.0)
thin (~> 1.7.1)
tire (~> 0.6.2)
tire-contrib (~> 0.1.2)
us_states (~> 0.1.1)!

BUNDLED WITH
1.11.2
1.15.1

0 comments on commit 82d732a

Please sign in to comment.