lib/bundler/definition.rb in bundler-1.0.10 vs lib/bundler/definition.rb in bundler-1.0.11
- old
+ new
@@ -223,11 +223,11 @@
out << "\n"
out << "DEPENDENCIES\n"
handled = []
dependencies.
- sort_by { |d| d.name }.
+ sort_by { |d| d.to_s }.
each do |dep|
next if handled.include?(dep.name)
out << dep.to_lock
handled << dep.name
end
@@ -365,11 +365,13 @@
other = s.source.specs[s].first
# If the spec is no longer in the path source, unlock it. This
# commonly happens if the version changed in the gemspec
next unless other
+
+ deps2 = other.dependencies.select { |d| d.type != :development }
# If the dependencies of the path source have changed, unlock it
- next unless s.dependencies.sort == other.dependencies.sort
+ next unless s.dependencies.sort == deps2.sort
end
converged << s
end