Fix parser with subpaths

naveenhegde22 · Mar 21, 2011 · b45e83e · b45e83e
1 parent 5568da4
commit b45e83e
Show file tree

Hide file tree

Showing 2 changed files with 15 additions and 5 deletions.
diff --git a/lib/rip/environment.rb b/lib/rip/environment.rb
@@ -19,7 +19,11 @@ def self.parse(text)
     end
 
     def to_s
-      "#{name} (#{version})"
+      if path.nil? || path == "/"
+        "#{name} (#{version})"
+      else
+        "#{name} #{path} (#{version})"
+      end
     end
 
     def inspect

diff --git a/lib/rip/parser.rb b/lib/rip/parser.rb
@@ -17,13 +17,19 @@ def parse_package(line)
 
       return nil if line.empty?
 
-      source, tweedle, version, *_ = line.split(' ')
+      args = line.split(' ')
 
       package = {}
-      package[:source] = source
 
-      if version || tweedle
-        package[:version] = version ? "#{tweedle} #{version}" : tweedle
+      package[:source] = args[0]
+
+      if args[1] && args[1] =~ /^\//
+        package[:path]    = args[1]
+        package[:version] = args[2] if args[2]
+      elsif args[1] && args[2]
+        package[:version] = "#{args[1]} #{args[2]}"
+      else
+        package[:version] = args[1] if args[1]
       end
 
       package