From d87ba10d3ba9c0a1af89c66002381b68bd24b1af Mon Sep 17 00:00:00 2001 From: Joe Ferris Date: Fri, 9 Sep 2011 11:39:28 -0400 Subject: [PATCH] Updated dependencies and fixed deprecation warnings --- Gemfile | 2 +- Gemfile.lock | 156 ++++++++++++----------- Rakefile | 5 +- features/step_definitions/rails_steps.rb | 18 +++ gemfiles/2.3.gemfile | 12 +- gemfiles/2.3.gemfile.lock | 6 +- gemfiles/3.0.gemfile | 12 +- gemfiles/3.0.gemfile.lock | 4 +- 8 files changed, 121 insertions(+), 94 deletions(-) diff --git a/Gemfile b/Gemfile index e5ce49a..c1a0b1f 100644 --- a/Gemfile +++ b/Gemfile @@ -1,5 +1,6 @@ source "http://rubygems.org" +gem "json" gem "rails", "~> 3.0.3" gem "sqlite3-ruby", :require => false gem "rspec", "~> 2.3" @@ -12,7 +13,6 @@ gem "sinatra", :require => false gem "yard", :require => false gem "aruba", "~> 0.3.2" gem "ruby-debug" -gem "json" gem "thin" gem "i18n" gem "appraisal", :require => false diff --git a/Gemfile.lock b/Gemfile.lock index da62af0..41809db 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -2,67 +2,67 @@ GEM remote: http://rubygems.org/ specs: abstract (1.0.0) - actionmailer (3.0.3) - actionpack (= 3.0.3) - mail (~> 2.2.9) - actionpack (3.0.3) - activemodel (= 3.0.3) - activesupport (= 3.0.3) + actionmailer (3.0.10) + actionpack (= 3.0.10) + mail (~> 2.2.19) + actionpack (3.0.10) + activemodel (= 3.0.10) + activesupport (= 3.0.10) builder (~> 2.1.2) erubis (~> 2.6.6) - i18n (~> 0.4) + i18n (~> 0.5.0) rack (~> 1.2.1) - rack-mount (~> 0.6.13) - rack-test (~> 0.5.6) + rack-mount (~> 0.6.14) + rack-test (~> 0.5.7) tzinfo (~> 0.3.23) - activemodel (3.0.3) - activesupport (= 3.0.3) + activemodel (3.0.10) + activesupport (= 3.0.10) builder (~> 2.1.2) - i18n (~> 0.4) - activerecord (3.0.3) - activemodel (= 3.0.3) - activesupport (= 3.0.3) - arel (~> 2.0.2) + i18n (~> 0.5.0) + activerecord (3.0.10) + activemodel (= 3.0.10) + activesupport (= 3.0.10) + arel (~> 2.0.10) tzinfo (~> 0.3.23) - activeresource (3.0.3) - activemodel (= 3.0.3) - activesupport (= 3.0.3) - activesupport (3.0.3) - addressable (2.2.2) - appraisal (0.1) + activeresource (3.0.10) + activemodel (= 3.0.10) + activesupport (= 3.0.10) + activesupport (3.0.10) + addressable (2.2.6) + appraisal (0.3.8) bundler rake - arel (2.0.6) - aruba (0.3.2) - childprocess (~> 0.1.6) - cucumber (~> 0.10.0) - rspec (~> 2.3.0) + arel (2.0.10) + aruba (0.3.7) + childprocess (>= 0.1.9) + cucumber (>= 0.10.5) + rspec (>= 2.6.0) bourne (1.0) mocha (= 0.9.8) builder (2.1.2) - childprocess (0.1.6) - ffi (~> 0.6.3) - columnize (0.3.2) + childprocess (0.2.2) + ffi (~> 1.0.6) + columnize (0.3.4) crack (0.1.8) - cucumber (0.10.0) + cucumber (0.10.7) builder (>= 2.1.2) - diff-lcs (~> 1.1.2) - gherkin (~> 2.3.2) - json (~> 1.4.6) - term-ansicolor (~> 1.0.5) - daemons (1.1.0) - diff-lcs (1.1.2) + diff-lcs (>= 1.1.2) + gherkin (~> 2.4.0) + json (>= 1.4.6) + term-ansicolor (>= 1.0.5) + daemons (1.1.4) + diff-lcs (1.1.3) erubis (2.6.6) abstract (>= 1.0.0) eventmachine (0.12.10) - ffi (0.6.3) - rake (>= 0.8.7) - gherkin (2.3.3) - json (~> 1.4.6) + ffi (1.0.9) + gherkin (2.4.18) + json (>= 1.4.6) i18n (0.5.0) - json (1.4.6) - linecache (0.43) - mail (2.2.14) + json (1.5.4) + linecache (0.46) + rbx-require-relative (> 0.0.4) + mail (2.2.19) activesupport (>= 2.3.6) i18n (>= 0.4.0) mime-types (~> 1.16) @@ -70,34 +70,37 @@ GEM mime-types (1.16) mocha (0.9.8) rake - polyglot (0.3.1) - rack (1.2.1) - rack-mount (0.6.13) + polyglot (0.3.2) + rack (1.2.3) + rack-mount (0.6.14) rack (>= 1.0.0) rack-test (0.5.7) rack (>= 1.0) - rails (3.0.3) - actionmailer (= 3.0.3) - actionpack (= 3.0.3) - activerecord (= 3.0.3) - activeresource (= 3.0.3) - activesupport (= 3.0.3) + rails (3.0.10) + actionmailer (= 3.0.10) + actionpack (= 3.0.10) + activerecord (= 3.0.10) + activeresource (= 3.0.10) + activesupport (= 3.0.10) bundler (~> 1.0) - railties (= 3.0.3) - railties (3.0.3) - actionpack (= 3.0.3) - activesupport (= 3.0.3) + railties (= 3.0.10) + railties (3.0.10) + actionpack (= 3.0.10) + activesupport (= 3.0.10) rake (>= 0.8.7) + rdoc (~> 3.4) thor (~> 0.14.4) rake (0.9.2) - rspec (2.3.0) - rspec-core (~> 2.3.0) - rspec-expectations (~> 2.3.0) - rspec-mocks (~> 2.3.0) - rspec-core (2.3.1) - rspec-expectations (2.3.0) + rbx-require-relative (0.0.5) + rdoc (3.9.4) + rspec (2.6.0) + rspec-core (~> 2.6.0) + rspec-expectations (~> 2.6.0) + rspec-mocks (~> 2.6.0) + rspec-core (2.6.4) + rspec-expectations (2.6.0) diff-lcs (~> 1.1.2) - rspec-mocks (2.3.0) + rspec-mocks (2.6.0) ruby-debug (0.10.4) columnize (>= 0.1) ruby-debug-base (~> 0.10.4.0) @@ -105,24 +108,27 @@ GEM linecache (>= 0.3) sham_rack (1.3.3) rack - sinatra (1.1.2) + sinatra (1.2.6) rack (~> 1.1) - tilt (~> 1.2) - sqlite3-ruby (1.3.2) - term-ansicolor (1.0.5) - thin (1.2.7) + tilt (< 2.0, >= 1.2.2) + sqlite3 (1.3.4) + sqlite3-ruby (1.3.3) + sqlite3 (>= 1.3.3) + term-ansicolor (1.0.6) + thin (1.2.11) daemons (>= 1.0.9) eventmachine (>= 0.12.6) rack (>= 1.0.0) thor (0.14.6) - tilt (1.2.1) - treetop (1.4.9) + tilt (1.3.3) + treetop (1.4.10) + polyglot polyglot (>= 0.3.1) - tzinfo (0.3.23) - webmock (1.6.1) - addressable (>= 2.2.2) + tzinfo (0.3.29) + webmock (1.7.6) + addressable (> 2.2.5, ~> 2.2) crack (>= 0.1.7) - yard (0.6.4) + yard (0.7.2) PLATFORMS ruby diff --git a/Rakefile b/Rakefile index 201ddcc..3d72e46 100644 --- a/Rakefile +++ b/Rakefile @@ -3,8 +3,7 @@ require 'bundler/setup' require 'appraisal' require 'rake' require 'rake/testtask' -require 'rake/rdoctask' -require 'rake/gempackagetask' +require 'rubygems/package_task' require 'cucumber/rake/task' require 'rspec/core/rake_task' require 'yard' @@ -31,7 +30,7 @@ YARD::Rake::YardocTask.new do |t| end eval("$specification = begin; #{IO.read('copycopter_client.gemspec')}; end") -Rake::GemPackageTask.new($specification) do |package| +Gem::PackageTask.new($specification) do |package| package.need_zip = true package.need_tar = true end diff --git a/features/step_definitions/rails_steps.rb b/features/step_definitions/rails_steps.rb index 5e8572b..9e31602 100644 --- a/features/step_definitions/rails_steps.rb +++ b/features/step_definitions/rails_steps.rb @@ -15,6 +15,8 @@ gem "sinatra" gem "json" GEMS + + When %{I remove lines containing "rjs" from "config/environments/development.rb"} end end @@ -142,6 +144,22 @@ end end +When /^I remove lines containing "([^"]*)" from "([^"]*)"$/ do |content, filename| + in_current_dir do + result = "" + File.open(filename, "r") do |file| + file.each_line do |line| + result << line unless line.include?(content) + end + end + + File.open(filename, "w") do |file| + file.write(result) + end + end +end + + After do RailsServer.stop end diff --git a/gemfiles/2.3.gemfile b/gemfiles/2.3.gemfile index 2a96b0a..cdb67df 100644 --- a/gemfiles/2.3.gemfile +++ b/gemfiles/2.3.gemfile @@ -1,19 +1,21 @@ # This file was generated by Appraisal source "http://rubygems.org" + gem "ruby-debug" gem "rails", "~> 2.3" -gem "sqlite3-ruby", {:require=>false} +gem "sqlite3-ruby", :require=>false gem "rake", "0.9.2" gem "bourne" gem "sham_rack" gem "rspec", "~> 2.3" -gem "yard", {:require=>false} +gem "yard", :require=>false gem "aruba", "~> 0.3.2" gem "thin" -gem "sinatra", {:require=>false} gem "json" +gem "sinatra", :require=>false gem "cucumber", "~> 0.10.0" gem "i18n" -gem "appraisal", {:require=>false} -gem "webmock" \ No newline at end of file +gem "appraisal", :require=>false +gem "webmock" + diff --git a/gemfiles/2.3.gemfile.lock b/gemfiles/2.3.gemfile.lock index c306e8c..d6f4984 100644 --- a/gemfiles/2.3.gemfile.lock +++ b/gemfiles/2.3.gemfile.lock @@ -36,7 +36,7 @@ GEM diff-lcs (1.1.3) eventmachine (0.12.10) ffi (1.0.9) - gherkin (2.4.16) + gherkin (2.4.18) json (>= 1.4.6) i18n (0.6.0) json (1.5.4) @@ -81,8 +81,8 @@ GEM eventmachine (>= 0.12.6) rack (>= 1.0.0) tilt (1.3.3) - webmock (1.7.5) - addressable (~> 2.2, > 2.2.5) + webmock (1.7.6) + addressable (> 2.2.5, ~> 2.2) crack (>= 0.1.7) yard (0.7.2) diff --git a/gemfiles/3.0.gemfile b/gemfiles/3.0.gemfile index 24c7bbc..9897661 100644 --- a/gemfiles/3.0.gemfile +++ b/gemfiles/3.0.gemfile @@ -1,19 +1,21 @@ # This file was generated by Appraisal source "http://rubygems.org" + gem "ruby-debug" gem "rails", "~> 3.0.3" -gem "sqlite3-ruby", {:require=>false} +gem "sqlite3-ruby", :require=>false gem "rake", "0.9.2" gem "bourne" gem "sham_rack" gem "rspec", "~> 2.3" -gem "yard", {:require=>false} +gem "yard", :require=>false gem "aruba", "~> 0.3.2" gem "thin" -gem "sinatra", {:require=>false} gem "json" +gem "sinatra", :require=>false gem "cucumber", "~> 0.10.0" gem "i18n" -gem "appraisal", {:require=>false} -gem "webmock" \ No newline at end of file +gem "appraisal", :require=>false +gem "webmock" + diff --git a/gemfiles/3.0.gemfile.lock b/gemfiles/3.0.gemfile.lock index 4435441..41809db 100644 --- a/gemfiles/3.0.gemfile.lock +++ b/gemfiles/3.0.gemfile.lock @@ -56,7 +56,7 @@ GEM abstract (>= 1.0.0) eventmachine (0.12.10) ffi (1.0.9) - gherkin (2.4.16) + gherkin (2.4.18) json (>= 1.4.6) i18n (0.5.0) json (1.5.4) @@ -125,7 +125,7 @@ GEM polyglot polyglot (>= 0.3.1) tzinfo (0.3.29) - webmock (1.7.5) + webmock (1.7.6) addressable (> 2.2.5, ~> 2.2) crack (>= 0.1.7) yard (0.7.2)