dev 1.0.192 → 1.0.193

data/lib/dev/Dep.rb

@@ -25,7 +25,7 @@ class Dep < Hash
   def initialize(hash)
     hash.each { |name,value| self[name]=value }
   end
-  
+
   def get_rel_dir
     return Dev::Environment.expand_string_variables(self[:dir]) unless self[:dir].nil?
     uri=Dev::Environment.expand_string_variables(self[:uri])

data/lib/dev/Deps.rb

@@ -6,6 +6,7 @@ class Deps < Hash
 	  if !v.nil? && v.kind_of?(Hash)
 	    v[:dir]=get_dir(v) if !v.has_key?(:dir)
 		v[:rev]=get_rev(v) if !v.has_key?(:rev) && !get_rev(v).nil?
+		v[:uri]=get_uri(v)
 	  end
 	}
   end
@@ -20,11 +21,22 @@ class Deps < Hash
   end
 
   def get_rev(h)
-    if(h.has_key?(:uri) && h[:uri].include?('@'))
+    if(h.has_key?(:uri) && h[:uri].include?('@') && !h[:uri].include?("@REV"))
 	  return h[:uri].split('@')[1]
 	end
+	if(h.has_key?(:dir) && h[:dir].include?('@') && !h[:dir].include?("@REV"))
+	  return h[:dir].split('@')[1]
+	end
 	nil
   end
 
+  def get_uri(h)
+    uri=h[:uri]
+	if(uri.include?("@REV") && h.has_key?(:rev) && !h[:rev].nil?)
+	  uri=uri.gsub("@REV","@#{h[:rev]}")
+	end
+	return uri
+  end
+
 end # class Deps
 end # module Dev

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: dev
 version: !ruby/object:Gem::Version
-  version: 1.0.192
+  version: 1.0.193
   prerelease: 
 platform: ruby
 authors: