Skip to content

HTTPS clone URL

Subversion checkout URL

You can clone with HTTPS or Subversion.

Download ZIP

Comparing changes

Choose two branches to see what's changed or to start a new pull request. If you need to, you can also compare across forks.

Open a pull request

Create a new pull request by comparing changes across two branches. If you need to, you can also compare across forks.
base: 35fa31bb5c
...
compare: 9920754100
Checking mergeability… Don't worry, you can still create the pull request.
  • 3 commits
  • 10 files changed
  • 0 commit comments
  • 1 contributor
View
1  .gitignore
@@ -4,3 +4,4 @@
coverage
rdoc
pkg
+gemfiles/*.lock
View
2  .rvmrc
@@ -1,6 +1,6 @@
export rvm_gemset_create_on_use_flag=1
rvm_gemset_create_on_use_flag=1
-rvm ruby-1.8.7-p334@tartarus
+rvm ruby-1.9.3-p125@tartarus
if ! command -v bundle ; then
printf "The rubygem 'bundler' is not installed, installing it now.\n"
View
3  Gemfile
@@ -9,5 +9,6 @@ gem "appraisal"
gem 'rspec', '~> 2.9.0'
gem "rspec-rails"
-gem 'rcov'
+gem 'simplecov'
+gem 'simplecov-rcov'
gem "sqlite3", :platform => [:ruby, :mswin, :mingw]
View
10 Gemfile.lock
@@ -77,7 +77,6 @@ GEM
rdoc (~> 3.4)
thor (~> 0.14.6)
rake (0.9.2.2)
- rcov (0.9.9)
rdoc (3.12)
json (~> 1.4)
rspec (2.9.0)
@@ -93,6 +92,12 @@ GEM
activesupport (>= 3.0)
railties (>= 3.0)
rspec (~> 2.9.0)
+ simplecov (0.6.1)
+ multi_json (~> 1.0)
+ simplecov-html (~> 0.5.3)
+ simplecov-html (0.5.3)
+ simplecov-rcov (0.2.3)
+ simplecov (>= 0.4.1)
sprockets (2.1.2)
hike (~> 1.2)
rack (~> 1.0)
@@ -113,9 +118,10 @@ DEPENDENCIES
appraisal
json (~> 1.6.0)
rails (~> 3.2.0)
- rcov
rspec (~> 2.9.0)
rspec-rails
+ simplecov
+ simplecov-rcov
sqlite3
tartarus!
will_paginate (>= 3.0.0)
View
3  gemfiles/rails3-0.gemfile
@@ -7,7 +7,8 @@ gem "json", "~> 1.6.0"
gem "appraisal"
gem "rspec", "~> 2.9.0"
gem "rspec-rails"
-gem "rcov"
+gem "simplecov"
+gem "simplecov-rcov"
gem "sqlite3", :platform=>[:ruby, :mswin, :mingw]
gem "rails", "~> 3.0.0"
View
112 gemfiles/rails3-0.gemfile.lock
@@ -1,112 +0,0 @@
-PATH
- remote: /home/brian/Projects/tartarus
- specs:
- tartarus (2.0.4)
- json (~> 1.6.0)
- rails (>= 3.0.0)
- will_paginate (~> 3.0.0)
-
-GEM
- remote: http://rubygems.org/
- specs:
- abstract (1.0.0)
- actionmailer (3.0.12)
- actionpack (= 3.0.12)
- mail (~> 2.2.19)
- actionpack (3.0.12)
- activemodel (= 3.0.12)
- activesupport (= 3.0.12)
- builder (~> 2.1.2)
- erubis (~> 2.6.6)
- i18n (~> 0.5.0)
- rack (~> 1.2.5)
- rack-mount (~> 0.6.14)
- rack-test (~> 0.5.7)
- tzinfo (~> 0.3.23)
- activemodel (3.0.12)
- activesupport (= 3.0.12)
- builder (~> 2.1.2)
- i18n (~> 0.5.0)
- activerecord (3.0.12)
- activemodel (= 3.0.12)
- activesupport (= 3.0.12)
- arel (~> 2.0.10)
- tzinfo (~> 0.3.23)
- activeresource (3.0.12)
- activemodel (= 3.0.12)
- activesupport (= 3.0.12)
- activesupport (3.0.12)
- appraisal (0.4.1)
- bundler
- rake
- arel (2.0.10)
- builder (2.1.2)
- diff-lcs (1.1.3)
- erubis (2.6.6)
- abstract (>= 1.0.0)
- i18n (0.5.0)
- json (1.6.5)
- mail (2.2.19)
- activesupport (>= 2.3.6)
- i18n (>= 0.4.0)
- mime-types (~> 1.16)
- treetop (~> 1.4.8)
- mime-types (1.18)
- polyglot (0.3.3)
- rack (1.2.5)
- rack-mount (0.6.14)
- rack (>= 1.0.0)
- rack-test (0.5.7)
- rack (>= 1.0)
- rails (3.0.12)
- actionmailer (= 3.0.12)
- actionpack (= 3.0.12)
- activerecord (= 3.0.12)
- activeresource (= 3.0.12)
- activesupport (= 3.0.12)
- bundler (~> 1.0)
- railties (= 3.0.12)
- railties (3.0.12)
- actionpack (= 3.0.12)
- activesupport (= 3.0.12)
- rake (>= 0.8.7)
- rdoc (~> 3.4)
- thor (~> 0.14.4)
- rake (0.9.2.2)
- rcov (1.0.0)
- rdoc (3.12)
- json (~> 1.4)
- rspec (2.9.0)
- rspec-core (~> 2.9.0)
- rspec-expectations (~> 2.9.0)
- rspec-mocks (~> 2.9.0)
- rspec-core (2.9.0)
- rspec-expectations (2.9.0)
- diff-lcs (~> 1.1.3)
- rspec-mocks (2.9.0)
- rspec-rails (2.9.0)
- actionpack (>= 3.0)
- activesupport (>= 3.0)
- railties (>= 3.0)
- rspec (~> 2.9.0)
- sqlite3 (1.3.5)
- thor (0.14.6)
- treetop (1.4.10)
- polyglot
- polyglot (>= 0.3.1)
- tzinfo (0.3.32)
- will_paginate (3.0.3)
-
-PLATFORMS
- ruby
-
-DEPENDENCIES
- appraisal
- json (~> 1.6.0)
- rails (~> 3.0.0)
- rcov
- rspec (~> 2.9.0)
- rspec-rails
- sqlite3
- tartarus!
- will_paginate (>= 3.0.0)
View
3  gemfiles/rails3-1.gemfile
@@ -7,7 +7,8 @@ gem "json", "~> 1.6.0"
gem "appraisal"
gem "rspec", "~> 2.9.0"
gem "rspec-rails"
-gem "rcov"
+gem "simplecov"
+gem "simplecov-rcov"
gem "sqlite3", :platform=>[:ruby, :mswin, :mingw]
gem "rails", "~> 3.1.0"
View
123 gemfiles/rails3-1.gemfile.lock
@@ -1,123 +0,0 @@
-PATH
- remote: /home/brian/Projects/tartarus
- specs:
- tartarus (2.0.4)
- json (~> 1.6.0)
- rails (>= 3.0.0)
- will_paginate (~> 3.0.0)
-
-GEM
- remote: http://rubygems.org/
- specs:
- actionmailer (3.1.4)
- actionpack (= 3.1.4)
- mail (~> 2.3.0)
- actionpack (3.1.4)
- activemodel (= 3.1.4)
- activesupport (= 3.1.4)
- builder (~> 3.0.0)
- erubis (~> 2.7.0)
- i18n (~> 0.6)
- rack (~> 1.3.6)
- rack-cache (~> 1.1)
- rack-mount (~> 0.8.2)
- rack-test (~> 0.6.1)
- sprockets (~> 2.0.3)
- activemodel (3.1.4)
- activesupport (= 3.1.4)
- builder (~> 3.0.0)
- i18n (~> 0.6)
- activerecord (3.1.4)
- activemodel (= 3.1.4)
- activesupport (= 3.1.4)
- arel (~> 2.2.3)
- tzinfo (~> 0.3.29)
- activeresource (3.1.4)
- activemodel (= 3.1.4)
- activesupport (= 3.1.4)
- activesupport (3.1.4)
- multi_json (~> 1.0)
- appraisal (0.4.1)
- bundler
- rake
- arel (2.2.3)
- builder (3.0.0)
- diff-lcs (1.1.3)
- erubis (2.7.0)
- hike (1.2.1)
- i18n (0.6.0)
- json (1.6.5)
- mail (2.3.3)
- i18n (>= 0.4.0)
- mime-types (~> 1.16)
- treetop (~> 1.4.8)
- mime-types (1.18)
- multi_json (1.1.0)
- polyglot (0.3.3)
- rack (1.3.6)
- rack-cache (1.2)
- rack (>= 0.4)
- rack-mount (0.8.3)
- rack (>= 1.0.0)
- rack-ssl (1.3.2)
- rack
- rack-test (0.6.1)
- rack (>= 1.0)
- rails (3.1.4)
- actionmailer (= 3.1.4)
- actionpack (= 3.1.4)
- activerecord (= 3.1.4)
- activeresource (= 3.1.4)
- activesupport (= 3.1.4)
- bundler (~> 1.0)
- railties (= 3.1.4)
- railties (3.1.4)
- actionpack (= 3.1.4)
- activesupport (= 3.1.4)
- rack-ssl (~> 1.3.2)
- rake (>= 0.8.7)
- rdoc (~> 3.4)
- thor (~> 0.14.6)
- rake (0.9.2.2)
- rcov (1.0.0)
- rdoc (3.12)
- json (~> 1.4)
- rspec (2.9.0)
- rspec-core (~> 2.9.0)
- rspec-expectations (~> 2.9.0)
- rspec-mocks (~> 2.9.0)
- rspec-core (2.9.0)
- rspec-expectations (2.9.0)
- diff-lcs (~> 1.1.3)
- rspec-mocks (2.9.0)
- rspec-rails (2.9.0)
- actionpack (>= 3.0)
- activesupport (>= 3.0)
- railties (>= 3.0)
- rspec (~> 2.9.0)
- sprockets (2.0.3)
- hike (~> 1.2)
- rack (~> 1.0)
- tilt (~> 1.1, != 1.3.0)
- sqlite3 (1.3.5)
- thor (0.14.6)
- tilt (1.3.3)
- treetop (1.4.10)
- polyglot
- polyglot (>= 0.3.1)
- tzinfo (0.3.32)
- will_paginate (3.0.3)
-
-PLATFORMS
- ruby
-
-DEPENDENCIES
- appraisal
- json (~> 1.6.0)
- rails (~> 3.1.0)
- rcov
- rspec (~> 2.9.0)
- rspec-rails
- sqlite3
- tartarus!
- will_paginate (>= 3.0.0)
View
3  gemfiles/rails3-2.gemfile
@@ -7,7 +7,8 @@ gem "json", "~> 1.6.0"
gem "appraisal"
gem "rspec", "~> 2.9.0"
gem "rspec-rails"
-gem "rcov"
+gem "simplecov"
+gem "simplecov-rcov"
gem "sqlite3", :platform=>[:ruby, :mswin, :mingw]
gem "rails", "~> 3.2.0"
View
121 gemfiles/rails3-2.gemfile.lock
@@ -1,121 +0,0 @@
-PATH
- remote: /home/brian/Projects/tartarus
- specs:
- tartarus (2.0.4)
- json (~> 1.6.0)
- rails (>= 3.0.0)
- will_paginate (~> 3.0.0)
-
-GEM
- remote: http://rubygems.org/
- specs:
- actionmailer (3.2.2)
- actionpack (= 3.2.2)
- mail (~> 2.4.0)
- actionpack (3.2.2)
- activemodel (= 3.2.2)
- activesupport (= 3.2.2)
- builder (~> 3.0.0)
- erubis (~> 2.7.0)
- journey (~> 1.0.1)
- rack (~> 1.4.0)
- rack-cache (~> 1.1)
- rack-test (~> 0.6.1)
- sprockets (~> 2.1.2)
- activemodel (3.2.2)
- activesupport (= 3.2.2)
- builder (~> 3.0.0)
- activerecord (3.2.2)
- activemodel (= 3.2.2)
- activesupport (= 3.2.2)
- arel (~> 3.0.2)
- tzinfo (~> 0.3.29)
- activeresource (3.2.2)
- activemodel (= 3.2.2)
- activesupport (= 3.2.2)
- activesupport (3.2.2)
- i18n (~> 0.6)
- multi_json (~> 1.0)
- appraisal (0.4.1)
- bundler
- rake
- arel (3.0.2)
- builder (3.0.0)
- diff-lcs (1.1.3)
- erubis (2.7.0)
- hike (1.2.1)
- i18n (0.6.0)
- journey (1.0.3)
- json (1.6.5)
- mail (2.4.4)
- i18n (>= 0.4.0)
- mime-types (~> 1.16)
- treetop (~> 1.4.8)
- mime-types (1.18)
- multi_json (1.1.0)
- polyglot (0.3.3)
- rack (1.4.1)
- rack-cache (1.2)
- rack (>= 0.4)
- rack-ssl (1.3.2)
- rack
- rack-test (0.6.1)
- rack (>= 1.0)
- rails (3.2.2)
- actionmailer (= 3.2.2)
- actionpack (= 3.2.2)
- activerecord (= 3.2.2)
- activeresource (= 3.2.2)
- activesupport (= 3.2.2)
- bundler (~> 1.0)
- railties (= 3.2.2)
- railties (3.2.2)
- actionpack (= 3.2.2)
- activesupport (= 3.2.2)
- rack-ssl (~> 1.3.2)
- rake (>= 0.8.7)
- rdoc (~> 3.4)
- thor (~> 0.14.6)
- rake (0.9.2.2)
- rcov (1.0.0)
- rdoc (3.12)
- json (~> 1.4)
- rspec (2.9.0)
- rspec-core (~> 2.9.0)
- rspec-expectations (~> 2.9.0)
- rspec-mocks (~> 2.9.0)
- rspec-core (2.9.0)
- rspec-expectations (2.9.0)
- diff-lcs (~> 1.1.3)
- rspec-mocks (2.9.0)
- rspec-rails (2.9.0)
- actionpack (>= 3.0)
- activesupport (>= 3.0)
- railties (>= 3.0)
- rspec (~> 2.9.0)
- sprockets (2.1.2)
- hike (~> 1.2)
- rack (~> 1.0)
- tilt (~> 1.1, != 1.3.0)
- sqlite3 (1.3.5)
- thor (0.14.6)
- tilt (1.3.3)
- treetop (1.4.10)
- polyglot
- polyglot (>= 0.3.1)
- tzinfo (0.3.32)
- will_paginate (3.0.3)
-
-PLATFORMS
- ruby
-
-DEPENDENCIES
- appraisal
- json (~> 1.6.0)
- rails (~> 3.2.0)
- rcov
- rspec (~> 2.9.0)
- rspec-rails
- sqlite3
- tartarus!
- will_paginate (>= 3.0.0)

No commit comments for this range

Something went wrong with that request. Please try again.