lib/bundler/ruby_version.rb in bundler-1.10.6 vs lib/bundler/ruby_version.rb in bundler-1.11.0.pre.1

@@ -30,33 +30,31 @@
 
       output
     end
 
     def ==(other)
-      version          == other.version &&
-        engine         == other.engine &&
+      version == other.version &&
+        engine == other.engine &&
         engine_version == other.engine_version &&
-        patchlevel     == other.patchlevel
+        patchlevel == other.patchlevel
     end
 
     # Returns a tuple of these things:
     #   [diff, this, other]
     #   The priority of attributes are
     #   1. engine
     #   2. ruby_version
     #   3. engine_version
     def diff(other)
       if engine != other.engine && @input_engine
-        [ :engine, engine, other.engine ]
+        [:engine, engine, other.engine]
       elsif version != other.version
-        [ :version, version, other.version ]
+        [:version, version, other.version]
       elsif engine_version != other.engine_version && @input_engine
-        [ :engine_version, engine_version, other.engine_version ]
+        [:engine_version, engine_version, other.engine_version]
       elsif patchlevel != other.patchlevel && @patchlevel
-        [ :patchlevel, patchlevel, other.patchlevel ]
-      else
-        nil
+        [:patchlevel, patchlevel, other.patchlevel]
       end
     end
 
     def host
       @host ||= [
@@ -104,10 +102,9 @@
         Rubinius::VERSION.dup
       when "jruby"
         JRUBY_VERSION.dup
       else
         raise BundlerError, "RUBY_ENGINE value #{RUBY_ENGINE} is not recognized"
-        nil
       end
     end
 
     def patchlevel
       RUBY_PATCHLEVEL.to_s