Init version vars as nil; use existence check

rubygems · Mar 20, 2015 · d926226 · d926226
1 parent eb99167
commit d926226
Showing 1 changed file with 4 additions and 4 deletions.
diff --git a/lib/bundler/definition.rb b/lib/bundler/definition.rb
@@ -260,15 +260,15 @@ def lock(file)
     # Gemfile.lock. Used in #to_lock.
     def lock_version
       lockfile = @lockfile_contents
-      lock_ver = ""
-      curr_ver = ""
+      lock_ver = nil
+      curr_ver = nil
 
-      if !lockfile.empty? and lockfile.match(/^  \[(.*)\]$/)
+      if lockfile and lockfile.match(/^  \[(.*)\]$/)
         lock_ver = $1
         curr_ver = Bundler::VERSION
       end
 
-      if !lock_ver.empty? and !curr_ver.empty?
+      if lock_ver and curr_ver
         if Gem::Version.new(curr_ver) >= Gem::Version.new(lock_ver)
           ver = curr_ver
         else