diff --git a/Gemfile.lock b/Gemfile.lock index 17529a1..df0ec21 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -1,11 +1,10 @@ GIT remote: git://github.com/turn-project/turn.git - revision: 660c7431a3a412c1c89417d9bd44f9e88c707a78 + revision: 8ef637f0806217a3ad39f8f9742808dc37f57a33 specs: - turn (0.9.7) + turn (1.0.0) ansi (>= 1.1) - bundler (>= 1.3) - minitest (~> 4) + minitest (~> 5) PATH remote: . @@ -17,89 +16,91 @@ PATH GEM remote: https://rubygems.org/ specs: - actionmailer (4.0.5) - actionpack (= 4.0.5) - mail (~> 2.5.4) - actionpack (4.0.5) - activesupport (= 4.0.5) - builder (~> 3.1.0) - erubis (~> 2.7.0) + actionmailer (4.1.16) + actionpack (= 4.1.16) + actionview (= 4.1.16) + mail (~> 2.5, >= 2.5.4) + actionpack (4.1.16) + actionview (= 4.1.16) + activesupport (= 4.1.16) rack (~> 1.5.2) rack-test (~> 0.6.2) - activemodel (4.0.5) - activesupport (= 4.0.5) - builder (~> 3.1.0) - activerecord (4.0.5) - activemodel (= 4.0.5) - activerecord-deprecated_finders (~> 1.0.2) - activesupport (= 4.0.5) - arel (~> 4.0.0) - activerecord-deprecated_finders (1.0.3) - activesupport (4.0.5) + actionview (4.1.16) + activesupport (= 4.1.16) + builder (~> 3.1) + erubis (~> 2.7.0) + activemodel (4.1.16) + activesupport (= 4.1.16) + builder (~> 3.1) + activerecord (4.1.16) + activemodel (= 4.1.16) + activesupport (= 4.1.16) + arel (~> 5.0.0) + activesupport (4.1.16) i18n (~> 0.6, >= 0.6.9) - minitest (~> 4.2) - multi_json (~> 1.3) + json (~> 1.7, >= 1.7.7) + minitest (~> 5.1) thread_safe (~> 0.1) - tzinfo (~> 0.3.37) - ansi (1.4.3) - arel (4.0.2) - builder (3.1.4) + tzinfo (~> 1.1) + ansi (1.5.0) + arel (5.0.1.20140414130214) + builder (3.2.3) + concurrent-ruby (1.1.5) erubis (2.7.0) - factory_girl (4.4.0) + factory_girl (4.9.0) activesupport (>= 3.0.0) - factory_girl_rails (4.4.1) - factory_girl (~> 4.4.0) + factory_girl_rails (4.9.0) + factory_girl (~> 4.9.0) railties (>= 3.0.0) fakeweb (1.3.0) - hike (1.2.3) - httparty (0.14.0) + httparty (0.16.4) + mime-types (~> 3.0) multi_xml (>= 0.5.2) - i18n (0.6.9) - mail (2.5.4) - mime-types (~> 1.16) - treetop (~> 1.4.8) + i18n (0.9.5) + concurrent-ruby (~> 1.0) + json (1.8.6) + mail (2.7.1) + mini_mime (>= 0.1.1) metaclass (0.0.4) - mime-types (1.25.1) - minitest (4.7.5) + mime-types (3.2.2) + mime-types-data (~> 3.2015) + mime-types-data (3.2019.0331) + mini_mime (1.0.1) + minitest (5.11.3) mocha (0.14.0) metaclass (~> 0.0.1) - multi_json (1.10.1) multi_xml (0.6.0) - polyglot (0.3.4) - rack (1.5.2) - rack-test (0.6.2) + rack (1.5.5) + rack-test (0.6.3) rack (>= 1.0) - rails (4.0.5) - actionmailer (= 4.0.5) - actionpack (= 4.0.5) - activerecord (= 4.0.5) - activesupport (= 4.0.5) + rails (4.1.16) + actionmailer (= 4.1.16) + actionpack (= 4.1.16) + actionview (= 4.1.16) + activemodel (= 4.1.16) + activerecord (= 4.1.16) + activesupport (= 4.1.16) bundler (>= 1.3.0, < 2.0) - railties (= 4.0.5) - sprockets-rails (~> 2.0.0) - railties (4.0.5) - actionpack (= 4.0.5) - activesupport (= 4.0.5) + railties (= 4.1.16) + sprockets-rails (~> 2.0) + railties (4.1.16) + actionpack (= 4.1.16) + activesupport (= 4.1.16) rake (>= 0.8.7) thor (>= 0.18.1, < 2.0) - rake (10.3.2) - sprockets (2.12.1) - hike (~> 1.2) - multi_json (~> 1.0) - rack (~> 1.0) - tilt (~> 1.1, != 1.3.0) - sprockets-rails (2.0.1) + rake (12.3.2) + sprockets (3.7.2) + concurrent-ruby (~> 1.0) + rack (> 1, < 3) + sprockets-rails (2.3.3) actionpack (>= 3.0) activesupport (>= 3.0) - sprockets (~> 2.8) - thor (0.19.1) - thread_safe (0.3.3) - tilt (1.4.1) - timecop (0.3.5) - treetop (1.4.15) - polyglot - polyglot (>= 0.3.1) - tzinfo (0.3.39) + sprockets (>= 2.8, < 4.0) + thor (0.20.3) + thread_safe (0.3.6) + timecop (0.9.1) + tzinfo (1.2.5) + thread_safe (~> 0.1) PLATFORMS ruby @@ -110,7 +111,8 @@ DEPENDENCIES factory_girl_rails (~> 4.2) fakeweb (~> 1.3.0) mocha (~> 0.4) - rails + rack (~> 1.5.4) + rails (~> 4.1.16) rake timecop turn! diff --git a/dolly.gemspec b/dolly.gemspec index 2deec6d..d09bed6 100644 --- a/dolly.gemspec +++ b/dolly.gemspec @@ -24,8 +24,9 @@ Gem::Specification.new do |spec| #TODO: Change tests to run independent of rails #removing the need for raisl at all. - spec.add_development_dependency "rails" + spec.add_development_dependency "rails", "~> 4.1.16" spec.add_development_dependency "bundler", "~> 1.3" + spec.add_development_dependency "rack", "~> 1.5.4" spec.add_development_dependency "rake" spec.add_development_dependency "fakeweb", "~> 1.3.0" spec.add_development_dependency "factory_girl_rails", "~> 4.2"