Merge remote branch 'bploetz/master' into multiple_versioning_strategies

Conflicts:
	lib/versionist/versioning_strategy/base.rb

.travis.yml

@@ -6,6 +6,18 @@ rvm:
   - jruby-18mode
   - jruby-19mode
   - ree
+jdk:
+  - oraclejdk7
+matrix:
+  exclude:
+    - rvm 1.8.7
+      jdk: oraclejdk7
+    - rvm 1.9.2
+      jdk: oraclejdk7
+    - rvm 1.9.3
+      jdk: oraclejdk7
+    - rvm ree
+      jdk: oraclejdk7
 gemfile:
   - gemfiles/Rails-3.0
   - gemfiles/Rails-3.1

gemfiles/Rails-3.0.lock

@@ -1,40 +1,40 @@
 PATH
-  remote: /Users/bploetz/workspace/versionist
+  remote: /Volumes/Extra/htdocs/versionist
   specs:
-    versionist (0.2.3)
+    versionist (0.3.1)
       rails (~> 3.0)
       yard (~> 0.7)
 
 GEM
   remote: http://rubygems.org/
   specs:
     abstract (1.0.0)
-    actionmailer (3.0.15)
-      actionpack (= 3.0.15)
+    actionmailer (3.0.16)
+      actionpack (= 3.0.16)
       mail (~> 2.2.19)
-    actionpack (3.0.15)
-      activemodel (= 3.0.15)
-      activesupport (= 3.0.15)
+    actionpack (3.0.16)
+      activemodel (= 3.0.16)
+      activesupport (= 3.0.16)
       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.15)
-      activesupport (= 3.0.15)
+    activemodel (3.0.16)
+      activesupport (= 3.0.16)
       builder (~> 2.1.2)
       i18n (~> 0.5.0)
-    activerecord (3.0.15)
-      activemodel (= 3.0.15)
-      activesupport (= 3.0.15)
+    activerecord (3.0.16)
+      activemodel (= 3.0.16)
+      activesupport (= 3.0.16)
       arel (~> 2.0.10)
       tzinfo (~> 0.3.23)
-    activeresource (3.0.15)
-      activemodel (= 3.0.15)
-      activesupport (= 3.0.15)
-    activesupport (3.0.15)
+    activeresource (3.0.16)
+      activemodel (= 3.0.16)
+      activesupport (= 3.0.16)
+    activesupport (3.0.16)
     arel (2.0.10)
     awesome_print (1.0.2)
     builder (2.1.2)
@@ -45,7 +45,7 @@ GEM
       rails (>= 3.0, < 4.0)
       rspec-rails
     i18n (0.5.0)
-    json (1.7.3)
+    json (1.7.4)
     mail (2.2.19)
       activesupport (>= 2.3.6)
       i18n (>= 0.4.0)
@@ -59,17 +59,17 @@ GEM
       rack (>= 1.0.0)
     rack-test (0.5.7)
       rack (>= 1.0)
-    rails (3.0.15)
-      actionmailer (= 3.0.15)
-      actionpack (= 3.0.15)
-      activerecord (= 3.0.15)
-      activeresource (= 3.0.15)
-      activesupport (= 3.0.15)
+    rails (3.0.16)
+      actionmailer (= 3.0.16)
+      actionpack (= 3.0.16)
+      activerecord (= 3.0.16)
+      activeresource (= 3.0.16)
+      activesupport (= 3.0.16)
       bundler (~> 1.0)
-      railties (= 3.0.15)
-    railties (3.0.15)
-      actionpack (= 3.0.15)
-      activesupport (= 3.0.15)
+      railties (= 3.0.16)
+    railties (3.0.16)
+      actionpack (= 3.0.16)
+      activesupport (= 3.0.16)
       rake (>= 0.8.7)
       rdoc (~> 3.4)
       thor (~> 0.14.4)

gemfiles/Rails-3.1.lock

@@ -1,19 +1,19 @@
 PATH
-  remote: /Users/bploetz/workspace/versionist
+  remote: /Volumes/Extra/htdocs/versionist
   specs:
-    versionist (0.2.3)
+    versionist (0.3.1)
       rails (~> 3.0)
       yard (~> 0.7)
 
 GEM
   remote: http://rubygems.org/
   specs:
-    actionmailer (3.1.6)
-      actionpack (= 3.1.6)
+    actionmailer (3.1.7)
+      actionpack (= 3.1.7)
       mail (~> 2.3.3)
-    actionpack (3.1.6)
-      activemodel (= 3.1.6)
-      activesupport (= 3.1.6)
+    actionpack (3.1.7)
+      activemodel (= 3.1.7)
+      activesupport (= 3.1.7)
       builder (~> 3.0.0)
       erubis (~> 2.7.0)
       i18n (~> 0.6)
@@ -22,19 +22,19 @@ GEM
       rack-mount (~> 0.8.2)
       rack-test (~> 0.6.1)
       sprockets (~> 2.0.4)
-    activemodel (3.1.6)
-      activesupport (= 3.1.6)
+    activemodel (3.1.7)
+      activesupport (= 3.1.7)
       builder (~> 3.0.0)
       i18n (~> 0.6)
-    activerecord (3.1.6)
-      activemodel (= 3.1.6)
-      activesupport (= 3.1.6)
+    activerecord (3.1.7)
+      activemodel (= 3.1.7)
+      activesupport (= 3.1.7)
       arel (~> 2.2.3)
       tzinfo (~> 0.3.29)
-    activeresource (3.1.6)
-      activemodel (= 3.1.6)
-      activesupport (= 3.1.6)
-    activesupport (3.1.6)
+    activeresource (3.1.7)
+      activemodel (= 3.1.7)
+      activesupport (= 3.1.7)
+    activesupport (3.1.7)
       multi_json (>= 1.0, < 1.3)
     arel (2.2.3)
     awesome_print (1.0.2)
@@ -46,7 +46,7 @@ GEM
       rspec-rails
     hike (1.2.1)
     i18n (0.6.0)
-    json (1.7.3)
+    json (1.7.4)
     mail (2.3.3)
       i18n (>= 0.4.0)
       mime-types (~> 1.16)
@@ -63,17 +63,17 @@ GEM
       rack
     rack-test (0.6.1)
       rack (>= 1.0)
-    rails (3.1.6)
-      actionmailer (= 3.1.6)
-      actionpack (= 3.1.6)
-      activerecord (= 3.1.6)
-      activeresource (= 3.1.6)
-      activesupport (= 3.1.6)
+    rails (3.1.7)
+      actionmailer (= 3.1.7)
+      actionpack (= 3.1.7)
+      activerecord (= 3.1.7)
+      activeresource (= 3.1.7)
+      activesupport (= 3.1.7)
       bundler (~> 1.0)
-      railties (= 3.1.6)
-    railties (3.1.6)
-      actionpack (= 3.1.6)
-      activesupport (= 3.1.6)
+      railties (= 3.1.7)
+    railties (3.1.7)
+      actionpack (= 3.1.7)
+      activesupport (= 3.1.7)
       rack-ssl (~> 1.3.2)
       rake (>= 0.8.7)
       rdoc (~> 3.4)

gemfiles/Rails-3.2.lock

@@ -1,38 +1,38 @@
 PATH
-  remote: /Users/bploetz/workspace/versionist
+  remote: /Volumes/Extra/htdocs/versionist
   specs:
-    versionist (0.2.3)
+    versionist (0.3.1)
       rails (~> 3.0)
       yard (~> 0.7)
 
 GEM
   remote: http://rubygems.org/
   specs:
-    actionmailer (3.2.6)
-      actionpack (= 3.2.6)
+    actionmailer (3.2.7)
+      actionpack (= 3.2.7)
       mail (~> 2.4.4)
-    actionpack (3.2.6)
-      activemodel (= 3.2.6)
-      activesupport (= 3.2.6)
+    actionpack (3.2.7)
+      activemodel (= 3.2.7)
+      activesupport (= 3.2.7)
       builder (~> 3.0.0)
       erubis (~> 2.7.0)
-      journey (~> 1.0.1)
+      journey (~> 1.0.4)
       rack (~> 1.4.0)
       rack-cache (~> 1.2)
       rack-test (~> 0.6.1)
       sprockets (~> 2.1.3)
-    activemodel (3.2.6)
-      activesupport (= 3.2.6)
+    activemodel (3.2.7)
+      activesupport (= 3.2.7)
       builder (~> 3.0.0)
-    activerecord (3.2.6)
-      activemodel (= 3.2.6)
-      activesupport (= 3.2.6)
+    activerecord (3.2.7)
+      activemodel (= 3.2.7)
+      activesupport (= 3.2.7)
       arel (~> 3.0.2)
       tzinfo (~> 0.3.29)
-    activeresource (3.2.6)
-      activemodel (= 3.2.6)
-      activesupport (= 3.2.6)
-    activesupport (3.2.6)
+    activeresource (3.2.7)
+      activemodel (= 3.2.7)
+      activesupport (= 3.2.7)
+    activesupport (3.2.7)
       i18n (~> 0.6)
       multi_json (~> 1.0)
     arel (3.0.2)
@@ -46,7 +46,7 @@ GEM
     hike (1.2.1)
     i18n (0.6.0)
     journey (1.0.4)
-    json (1.7.3)
+    json (1.7.4)
     mail (2.4.4)
       i18n (>= 0.4.0)
       mime-types (~> 1.16)
@@ -61,17 +61,17 @@ GEM
       rack
     rack-test (0.6.1)
       rack (>= 1.0)
-    rails (3.2.6)
-      actionmailer (= 3.2.6)
-      actionpack (= 3.2.6)
-      activerecord (= 3.2.6)
-      activeresource (= 3.2.6)
-      activesupport (= 3.2.6)
+    rails (3.2.7)
+      actionmailer (= 3.2.7)
+      actionpack (= 3.2.7)
+      activerecord (= 3.2.7)
+      activeresource (= 3.2.7)
+      activesupport (= 3.2.7)
       bundler (~> 1.0)
-      railties (= 3.2.6)
-    railties (3.2.6)
-      actionpack (= 3.2.6)
-      activesupport (= 3.2.6)
+      railties (= 3.2.7)
+    railties (3.2.7)
+      actionpack (= 3.2.7)
+      activesupport (= 3.2.7)
       rack-ssl (~> 1.3.2)
       rake (>= 0.8.7)
       rdoc (~> 3.4)