Update bundle and focus on Rails pre-release.

metaskills · Mar 5, 2013 · 9eae38a · 9eae38a
1 parent 5dec982
commit 9eae38a
Show file tree

Hide file tree

Showing 11 changed files with 73 additions and 78 deletions.
diff --git a/.travis.yml b/.travis.yml
@@ -1,7 +1,7 @@
 rvm:
  - 1.8.7
  - 1.9.3
- - ruby-head
+ - 2.0.0
 gemfile:
  - gemfiles/rails30.gemfile
  - gemfiles/rails31.gemfile

diff --git a/Appraisals b/Appraisals
@@ -12,6 +12,6 @@ appraise 'rails32' do
 end
 
 appraise 'rails40' do
- gem 'rails', :github => 'rails/rails'
+ gem 'rails', '~> 4.0.0.beta'
 end
 
diff --git a/Gemfile b/Gemfile
@@ -1,4 +1,4 @@
-source :rubygems
+source 'https://rubygems.org'
 
 gemspec
 
diff --git a/gemfiles/rails30.gemfile b/gemfiles/rails30.gemfile
@@ -1,6 +1,6 @@
 # This file was generated by Appraisal
 
-source :rubygems
+source "https://rubygems.org"
 
 gem "rails", "~> 3.0.0"
 

diff --git a/gemfiles/rails30.gemfile.lock b/gemfiles/rails30.gemfile.lock
@@ -6,7 +6,7 @@ PATH
  rails (>= 3.0)
 
 GEM
- remote: http:https://rubygems.org/
+ remote: https:https://rubygems.org/
  specs:
  abstract (1.0.0)
  actionmailer (3.0.20)
@@ -50,7 +50,7 @@ GEM
  mime-types (~> 1.16)
  treetop (~> 1.4.8)
  mime-types (1.21)
- minitest (4.6.0)
+ minitest (4.6.2)
  minitest-emoji (1.0.0)
  polyglot (0.3.3)
  rack (1.2.8)
@@ -73,14 +73,14 @@ GEM
  rdoc (~> 3.4)
  thor (~> 0.14.4)
  rake (10.0.3)
- rdoc (3.12.1)
+ rdoc (3.12.2)
  json (~> 1.4)
  sqlite3 (1.3.7)
  thor (0.14.6)
  treetop (1.4.12)
  polyglot
  polyglot (>= 0.3.1)
- tzinfo (0.3.35)
+ tzinfo (0.3.36)
 
 PLATFORMS
  ruby

diff --git a/gemfiles/rails31.gemfile b/gemfiles/rails31.gemfile
@@ -1,6 +1,6 @@
 # This file was generated by Appraisal
 
-source :rubygems
+source "https://rubygems.org"
 
 gem "rails", "~> 3.1.0"
 

diff --git a/gemfiles/rails31.gemfile.lock b/gemfiles/rails31.gemfile.lock
@@ -6,7 +6,7 @@ PATH
  rails (>= 3.0)
 
 GEM
- remote: http:https://rubygems.org/
+ remote: https:https://rubygems.org/
  specs:
  actionmailer (3.1.10)
  actionpack (= 3.1.10)
@@ -43,14 +43,14 @@ GEM
  builder (3.0.4)
  erubis (2.7.0)
  hike (1.2.1)
- i18n (0.6.1)
+ i18n (0.6.4)
  json (1.7.7)
  mail (2.3.3)
  i18n (>= 0.4.0)
  mime-types (~> 1.16)
  treetop (~> 1.4.8)
  mime-types (1.21)
- minitest (4.6.0)
+ minitest (4.6.2)
  minitest-emoji (1.0.0)
  multi_json (1.2.0)
  polyglot (0.3.3)
@@ -79,19 +79,19 @@ GEM
  rdoc (~> 3.4)
  thor (~> 0.14.6)
  rake (10.0.3)
- rdoc (3.12.1)
+ rdoc (3.12.2)
  json (~> 1.4)
  sprockets (2.0.4)
  hike (~> 1.2)
  rack (~> 1.0)
  tilt (~> 1.1, != 1.3.0)
  sqlite3 (1.3.7)
  thor (0.14.6)
- tilt (1.3.3)
+ tilt (1.3.4)
  treetop (1.4.12)
  polyglot
  polyglot (>= 0.3.1)
- tzinfo (0.3.35)
+ tzinfo (0.3.36)
 
 PLATFORMS
  ruby

diff --git a/gemfiles/rails32.gemfile b/gemfiles/rails32.gemfile
@@ -1,6 +1,6 @@
 # This file was generated by Appraisal
 
-source :rubygems
+source "https://rubygems.org"
 
 gem "rails", "~> 3.2.0"
 

diff --git a/gemfiles/rails32.gemfile.lock b/gemfiles/rails32.gemfile.lock
@@ -6,7 +6,7 @@ PATH
  rails (>= 3.0)
 
 GEM
- remote: http:https://rubygems.org/
+ remote: https:https://rubygems.org/
  specs:
  actionmailer (3.2.12)
  actionpack (= 3.2.12)
@@ -42,17 +42,17 @@ GEM
  builder (3.0.4)
  erubis (2.7.0)
  hike (1.2.1)
- i18n (0.6.1)
+ i18n (0.6.4)
  journey (1.0.4)
  json (1.7.7)
  mail (2.4.4)
  i18n (>= 0.4.0)
  mime-types (~> 1.16)
  treetop (~> 1.4.8)
  mime-types (1.21)
- minitest (4.6.0)
+ minitest (4.6.2)
  minitest-emoji (1.0.0)
- multi_json (1.6.0)
+ multi_json (1.6.1)
  polyglot (0.3.3)
  rack (1.4.5)
  rack-cache (1.2)
@@ -77,7 +77,7 @@ GEM
  rdoc (~> 3.4)
  thor (>= 0.14.6, < 2.0)
  rake (10.0.3)
- rdoc (3.12.1)
+ rdoc (3.12.2)
  json (~> 1.4)
  sprockets (2.2.2)
  hike (~> 1.2)
@@ -86,11 +86,11 @@ GEM
  tilt (~> 1.1, != 1.3.0)
  sqlite3 (1.3.7)
  thor (0.17.0)
- tilt (1.3.3)
+ tilt (1.3.4)
  treetop (1.4.12)
  polyglot
  polyglot (>= 0.3.1)
- tzinfo (0.3.35)
+ tzinfo (0.3.36)
 
 PLATFORMS
  ruby

diff --git a/gemfiles/rails40.gemfile b/gemfiles/rails40.gemfile
@@ -1,7 +1,7 @@
 # This file was generated by Appraisal
 
-source :rubygems
+source "https://rubygems.org"
 
-gem "rails", :github=>"rails/rails"
+gem "rails", "~> 4.0.0.beta"
 
 gemspec :path=>"../"
diff --git a/gemfiles/rails40.gemfile.lock b/gemfiles/rails40.gemfile.lock
@@ -1,45 +1,3 @@
-GIT
- remote: git:https://github.com/rails/rails.git
- revision: f8c8ad56c8a1cb48c6535fd8e248dcb9049e0aa3
- specs:
- actionmailer (4.0.0.beta)
- actionpack (= 4.0.0.beta)
- mail (~> 2.5.3)
- actionpack (4.0.0.beta)
- activesupport (= 4.0.0.beta)
- builder (~> 3.1.0)
- erubis (~> 2.7.0)
- rack (~> 1.5.2)
- rack-test (~> 0.6.1)
- activemodel (4.0.0.beta)
- activesupport (= 4.0.0.beta)
- builder (~> 3.1.0)
- activerecord (4.0.0.beta)
- activemodel (= 4.0.0.beta)
- activerecord-deprecated_finders (~> 0.0.3)
- activesupport (= 4.0.0.beta)
- arel (~> 3.0.2)
- activesupport (4.0.0.beta)
- i18n (~> 0.6)
- minitest (~> 4.1)
- multi_json (~> 1.3)
- thread_safe (~> 0.1)
- tzinfo (~> 0.3.33)
- rails (4.0.0.beta)
- actionmailer (= 4.0.0.beta)
- actionpack (= 4.0.0.beta)
- activerecord (= 4.0.0.beta)
- activesupport (= 4.0.0.beta)
- bundler (>= 1.2.2, < 2.0)
- railties (= 4.0.0.beta)
- sprockets-rails (~> 2.0.0.rc1)
- railties (4.0.0.beta)
- actionpack (= 4.0.0.beta)
- activesupport (= 4.0.0.beta)
- rake (>= 0.8.7)
- rdoc (~> 3.4)
- thor (>= 0.17.0, < 2.0)
-
 PATH
  remote: /Users/kencollins/Repositories/minitest-spec-rails
  specs:
@@ -48,52 +6,89 @@ PATH
  rails (>= 3.0)
 
 GEM
- remote: http:https://rubygems.org/
+ remote: https:https://rubygems.org/
  specs:
+ actionmailer (4.0.0.beta1)
+ actionpack (= 4.0.0.beta1)
+ mail (~> 2.5.3)
+ actionpack (4.0.0.beta1)
+ activesupport (= 4.0.0.beta1)
+ builder (~> 3.1.0)
+ erubis (~> 2.7.0)
+ rack (~> 1.5.2)
+ rack-test (~> 0.6.2)
+ activemodel (4.0.0.beta1)
+ activesupport (= 4.0.0.beta1)
+ builder (~> 3.1.0)
+ activerecord (4.0.0.beta1)
+ activemodel (= 4.0.0.beta1)
+ activerecord-deprecated_finders (~> 0.0.3)
+ activesupport (= 4.0.0.beta1)
+ arel (~> 4.0.0.beta1)
  activerecord-deprecated_finders (0.0.3)
+ activesupport (4.0.0.beta1)
+ i18n (~> 0.6.2)
+ minitest (~> 4.2)
+ multi_json (~> 1.3)
+ thread_safe (~> 0.1)
+ tzinfo (~> 0.3.33)
  appraisal (0.5.1)
  bundler
  rake
- arel (3.0.2)
+ arel (4.0.0.beta1)
  atomic (1.0.1)
  builder (3.1.4)
  erubis (2.7.0)
  hike (1.2.1)
- i18n (0.6.1)
+ i18n (0.6.4)
  json (1.7.7)
  mail (2.5.3)
  i18n (>= 0.4.0)
  mime-types (~> 1.16)
  treetop (~> 1.4.8)
  mime-types (1.21)
- minitest (4.6.0)
+ minitest (4.6.2)
  minitest-emoji (1.0.0)
- multi_json (1.6.0)
+ multi_json (1.6.1)
  polyglot (0.3.3)
  rack (1.5.2)
  rack-test (0.6.2)
  rack (>= 1.0)
+ rails (4.0.0.beta1)
+ actionmailer (= 4.0.0.beta1)
+ actionpack (= 4.0.0.beta1)
+ activerecord (= 4.0.0.beta1)
+ activesupport (= 4.0.0.beta1)
+ bundler (>= 1.3.0, < 2.0)
+ railties (= 4.0.0.beta1)
+ sprockets-rails (~> 2.0.0.rc3)
+ railties (4.0.0.beta1)
+ actionpack (= 4.0.0.beta1)
+ activesupport (= 4.0.0.beta1)
+ rake (>= 0.8.7)
+ rdoc (~> 3.4)
+ thor (>= 0.17.0, < 2.0)
  rake (10.0.3)
- rdoc (3.12.1)
+ rdoc (3.12.2)
  json (~> 1.4)
- sprockets (2.8.2)
+ sprockets (2.9.0)
  hike (~> 1.2)
  multi_json (~> 1.0)
  rack (~> 1.0)
  tilt (~> 1.1, != 1.3.0)
- sprockets-rails (2.0.0.rc2)
+ sprockets-rails (2.0.0.rc3)
  actionpack (>= 3.0)
  activesupport (>= 3.0)
  sprockets (~> 2.8)
  sqlite3 (1.3.7)
  thor (0.17.0)
  thread_safe (0.1.0)
  atomic
- tilt (1.3.3)
+ tilt (1.3.4)
  treetop (1.4.12)
  polyglot
  polyglot (>= 0.3.1)
- tzinfo (0.3.35)
+ tzinfo (0.3.36)
 
 PLATFORMS
  ruby
@@ -102,6 +97,6 @@ DEPENDENCIES
  appraisal
  minitest-emoji
  minitest-spec-rails!
- rails!
+ rails (~> 4.0.0.beta)
  rake
  sqlite3