Bumped bundle

bsm · Jun 4, 2014 · 49d258c · 49d258c
1 parent 1a7b01b
commit 49d258c
Show file tree

Hide file tree

Showing 7 changed files with 109 additions and 89 deletions.
diff --git a/.travis.yml b/.travis.yml
@@ -1,6 +1,6 @@
 rvm:
-  - 1.9.3
   - 2.0.0
+  - 2.1.1
 gemfile:
   - Gemfile
   - Gemfile.activerecord-3.2.x

diff --git a/Gemfile.activerecord-3.0.x.lock b/Gemfile.activerecord-3.0.x.lock
@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    attribute-defaults (0.5.0)
+    attribute-defaults (0.6.0)
       activerecord (>= 3.0.0)
 
 GEM
@@ -19,19 +19,23 @@ GEM
     activesupport (3.0.20)
     arel (2.0.10)
     builder (2.1.2)
-    diff-lcs (1.2.4)
-    i18n (0.5.0)
-    rake (10.1.0)
-    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)
-      diff-lcs (>= 1.1.3, < 2.0)
-    rspec-mocks (2.13.1)
-    sqlite3 (1.3.7)
-    tzinfo (0.3.37)
+    diff-lcs (1.2.5)
+    i18n (0.5.4)
+    rake (10.3.2)
+    rspec (3.0.0)
+      rspec-core (~> 3.0.0)
+      rspec-expectations (~> 3.0.0)
+      rspec-mocks (~> 3.0.0)
+    rspec-core (3.0.0)
+      rspec-support (~> 3.0.0)
+    rspec-expectations (3.0.0)
+      diff-lcs (>= 1.2.0, < 2.0)
+      rspec-support (~> 3.0.0)
+    rspec-mocks (3.0.0)
+      rspec-support (~> 3.0.0)
+    rspec-support (3.0.0)
+    sqlite3 (1.3.9)
+    tzinfo (0.3.39)
 
 PLATFORMS
   ruby

diff --git a/Gemfile.activerecord-3.1.x.lock b/Gemfile.activerecord-3.1.x.lock
@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    attribute-defaults (0.5.0)
+    attribute-defaults (0.6.0)
       activerecord (>= 3.0.0)
 
 GEM
@@ -20,20 +20,24 @@ GEM
       multi_json (~> 1.0)
     arel (2.2.3)
     builder (3.0.4)
-    diff-lcs (1.2.4)
-    i18n (0.6.4)
-    multi_json (1.7.7)
-    rake (10.1.0)
-    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)
-      diff-lcs (>= 1.1.3, < 2.0)
-    rspec-mocks (2.13.1)
-    sqlite3 (1.3.7)
-    tzinfo (0.3.37)
+    diff-lcs (1.2.5)
+    i18n (0.6.9)
+    multi_json (1.10.1)
+    rake (10.3.2)
+    rspec (3.0.0)
+      rspec-core (~> 3.0.0)
+      rspec-expectations (~> 3.0.0)
+      rspec-mocks (~> 3.0.0)
+    rspec-core (3.0.0)
+      rspec-support (~> 3.0.0)
+    rspec-expectations (3.0.0)
+      diff-lcs (>= 1.2.0, < 2.0)
+      rspec-support (~> 3.0.0)
+    rspec-mocks (3.0.0)
+      rspec-support (~> 3.0.0)
+    rspec-support (3.0.0)
+    sqlite3 (1.3.9)
+    tzinfo (0.3.39)
 
 PLATFORMS
   ruby

diff --git a/Gemfile.activerecord-3.2.x.lock b/Gemfile.activerecord-3.2.x.lock
@@ -1,39 +1,43 @@
 PATH
   remote: .
   specs:
-    attribute-defaults (0.5.0)
+    attribute-defaults (0.6.0)
       activerecord (>= 3.0.0)
 
 GEM
   remote: http://rubygems.org/
   specs:
-    activemodel (3.2.13)
-      activesupport (= 3.2.13)
+    activemodel (3.2.18)
+      activesupport (= 3.2.18)
       builder (~> 3.0.0)
-    activerecord (3.2.13)
-      activemodel (= 3.2.13)
-      activesupport (= 3.2.13)
+    activerecord (3.2.18)
+      activemodel (= 3.2.18)
+      activesupport (= 3.2.18)
       arel (~> 3.0.2)
       tzinfo (~> 0.3.29)
-    activesupport (3.2.13)
-      i18n (= 0.6.1)
+    activesupport (3.2.18)
+      i18n (~> 0.6, >= 0.6.4)
       multi_json (~> 1.0)
-    arel (3.0.2)
+    arel (3.0.3)
     builder (3.0.4)
-    diff-lcs (1.2.4)
-    i18n (0.6.1)
-    multi_json (1.7.7)
-    rake (10.1.0)
-    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)
-      diff-lcs (>= 1.1.3, < 2.0)
-    rspec-mocks (2.13.1)
-    sqlite3 (1.3.7)
-    tzinfo (0.3.37)
+    diff-lcs (1.2.5)
+    i18n (0.6.9)
+    multi_json (1.10.1)
+    rake (10.3.2)
+    rspec (3.0.0)
+      rspec-core (~> 3.0.0)
+      rspec-expectations (~> 3.0.0)
+      rspec-mocks (~> 3.0.0)
+    rspec-core (3.0.0)
+      rspec-support (~> 3.0.0)
+    rspec-expectations (3.0.0)
+      diff-lcs (>= 1.2.0, < 2.0)
+      rspec-support (~> 3.0.0)
+    rspec-mocks (3.0.0)
+      rspec-support (~> 3.0.0)
+    rspec-support (3.0.0)
+    sqlite3 (1.3.9)
+    tzinfo (0.3.39)
 
 PLATFORMS
   ruby

diff --git a/Gemfile.lock b/Gemfile.lock
@@ -7,43 +7,44 @@ PATH
 GEM
   remote: http://rubygems.org/
   specs:
-    activemodel (4.0.0)
-      activesupport (= 4.0.0)
-      builder (~> 3.1.0)
-    activerecord (4.0.0)
-      activemodel (= 4.0.0)
-      activerecord-deprecated_finders (~> 1.0.2)
-      activesupport (= 4.0.0)
-      arel (~> 4.0.0)
-    activerecord-deprecated_finders (1.0.3)
-    activesupport (4.0.0)
-      i18n (~> 0.6, >= 0.6.4)
-      minitest (~> 4.2)
-      multi_json (~> 1.3)
+    activemodel (4.1.1)
+      activesupport (= 4.1.1)
+      builder (~> 3.1)
+    activerecord (4.1.1)
+      activemodel (= 4.1.1)
+      activesupport (= 4.1.1)
+      arel (~> 5.0.0)
+    activesupport (4.1.1)
+      i18n (~> 0.6, >= 0.6.9)
+      json (~> 1.7, >= 1.7.7)
+      minitest (~> 5.1)
+      thread_safe (~> 0.1)
+      tzinfo (~> 1.1)
+    arel (5.0.1.20140414130214)
+    builder (3.2.2)
+    diff-lcs (1.2.5)
+    i18n (0.6.9)
+    json (1.8.1)
+    minitest (5.3.4)
+    protected_attributes (1.0.7)
+      activemodel (>= 4.0.1, < 5.0)
+    rake (10.3.2)
+    rspec (3.0.0)
+      rspec-core (~> 3.0.0)
+      rspec-expectations (~> 3.0.0)
+      rspec-mocks (~> 3.0.0)
+    rspec-core (3.0.0)
+      rspec-support (~> 3.0.0)
+    rspec-expectations (3.0.0)
+      diff-lcs (>= 1.2.0, < 2.0)
+      rspec-support (~> 3.0.0)
+    rspec-mocks (3.0.0)
+      rspec-support (~> 3.0.0)
+    rspec-support (3.0.0)
+    sqlite3 (1.3.9)
+    thread_safe (0.3.4)
+    tzinfo (1.2.1)
       thread_safe (~> 0.1)
-      tzinfo (~> 0.3.37)
-    arel (4.0.0)
-    atomic (1.1.10)
-    builder (3.1.4)
-    diff-lcs (1.2.4)
-    i18n (0.6.4)
-    minitest (4.7.5)
-    multi_json (1.7.7)
-    protected_attributes (1.0.2)
-      activemodel (>= 4.0.0.beta, < 5.0)
-    rake (10.1.0)
-    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)
-      diff-lcs (>= 1.1.3, < 2.0)
-    rspec-mocks (2.13.1)
-    sqlite3 (1.3.7)
-    thread_safe (0.1.0)
-      atomic
-    tzinfo (0.3.37)
 
 PLATFORMS
   ruby

diff --git a/Rakefile b/Rakefile
@@ -1,6 +1,7 @@
 require 'rake'
 require 'rspec/mocks/version'
 require 'rspec/core/rake_task'
+require 'bundler/gem_tasks'
 
 RSpec::Core::RakeTask.new(:spec)
 

diff --git a/spec/spec_helper.rb b/spec/spec_helper.rb
@@ -49,3 +49,9 @@ class Baz < ActiveRecord::Base
   self.table_name = 'foos'
   attr_defaults :description => "Please set ...", :age => { :default => 18, :persisted => false }, :locale => proc { 'en-US' }
 end
+
+RSpec.configure do |c|
+  c.expect_with :rspec do |c|
+    c.syntax = [:expect, :should]
+  end
+end