aboutsummaryrefslogtreecommitdiffstats
path: root/lib/bundler/flex/lockfile_parser.rb
diff options
context:
space:
mode:
authorCarlhuda <carlhuda@engineyard.com>2010-04-20 17:27:00 -0700
committerCarlhuda <carlhuda@engineyard.com>2010-04-20 17:27:00 -0700
commit4bfff00e3bfc24c92c2a4e24ed08ad4e40942db2 (patch)
tree6af8cca0c46bce5697b95b46c78940c56092d1ae /lib/bundler/flex/lockfile_parser.rb
parente00a48b5fc049488822657924aa8314a77a7dd6f (diff)
downloadbundler-4bfff00e3bfc24c92c2a4e24ed08ad4e40942db2.tar.gz
Be smart about handling changed Gemfiles
Diffstat (limited to 'lib/bundler/flex/lockfile_parser.rb')
-rw-r--r--lib/bundler/flex/lockfile_parser.rb4
1 files changed, 2 insertions, 2 deletions
diff --git a/lib/bundler/flex/lockfile_parser.rb b/lib/bundler/flex/lockfile_parser.rb
index f2501497..c04521ae 100644
--- a/lib/bundler/flex/lockfile_parser.rb
+++ b/lib/bundler/flex/lockfile_parser.rb
@@ -43,7 +43,7 @@ module Bundler
TYPES[type].from_lock(source, options)
end
- NAME_VERSION = '(.*?)(?: \((.*)\))?'
+ NAME_VERSION = '(?! )(.*?)(?: \((.*)\))?:?'
def parse_dependencies(line)
if line =~ %r{^ {2}#{NAME_VERSION}$}
@@ -62,7 +62,7 @@ module Bundler
@specs << @current
else
line =~ %r{^ {4}#{NAME_VERSION}$}
- @current.dependencies << Gem::Dependency.new(name, version)
+ @current.dependencies << Gem::Dependency.new($1, $2)
end
end