autoproj 1.8.2.rc3 → 1.8.2.rc4

data/lib/autoproj/manifest.rb

@@ -366,8 +366,17 @@ module Autoproj
         end
         definitions = { 'HOME' => ENV['HOME'] }.merge(definitions)
 
-        data = data.gsub /\$(\w+)/ do |constant_name|
-            constant_name = constant_name[1..-1]
+        data = data.gsub /(.|^)\$(\w+)/ do |constant_name|
+            prefix = constant_name[0, 1]
+            if prefix == "\\"
+                next(constant_name[1..-1])
+            end
+            if prefix == "$"
+                prefix, constant_name = "", constant_name[1..-1]
+            else
+                constant_name = constant_name[2..-1]
+            end
+
             if !(value = definitions[constant_name])
                 if !(value = Autoproj.user_config(constant_name))
                     if !block_given? || !(value = yield(constant_name))
@@ -375,11 +384,15 @@ module Autoproj
                     end
                 end
             end
-            value
+            "#{prefix}#{value}"
         end
         data
     end
 
+    # Expand constants within +value+
+    #
+    # The list of constants is given in +definitions+. It raises ConfigError if
+    # some values are not found
     def self.expand(value, definitions = Hash.new)
         if value.respond_to?(:to_hash)
             value.dup.each do |name, definition|

data/lib/autoproj/version.rb

@@ -1,3 +1,3 @@
 module Autoproj
-    VERSION = "1.8.2.rc3"
+    VERSION = "1.8.2.rc4"
 end

data/test/test_manifest.rb

@@ -1,6 +1,7 @@
 $LOAD_PATH.unshift File.expand_path('../lib', File.dirname(__FILE__))
 require 'test/unit'
 require 'autoproj'
+require 'flexmock/test_unit'
 require 'set'
 
 class TC_Manifest < Test::Unit::TestCase
@@ -34,7 +35,22 @@ class TC_Manifest < Test::Unit::TestCase
         end
     end
 
-    def test_update_sources
+    def test_single_expansion_uses_provided_definitions
+        flexmock(Autoproj).should_receive(:user_config).never
+        assert_equal "a_variable=val", Autoproj.single_expansion("a_variable=$CONST", 'CONST' => 'val')
+        assert_equal "val", Autoproj.single_expansion("$CONST", 'CONST' => 'val')
+    end
+
+    def test_single_expansion_uses_user_config
+        flexmock(Autoproj).should_receive(:user_config).with("CONST").and_return("val")
+        assert_equal "a_variable=val", Autoproj.single_expansion("a_variable=$CONST", Hash.new)
+        assert_equal "val", Autoproj.single_expansion("$CONST", Hash.new)
+    end
+
+    def test_single_expansion_handle_quoted_dollar_sign
+        flexmock(Autoproj).should_receive(:user_config).with("CONST").and_return("val")
+        assert_equal "a_variable=$CONST", Autoproj.single_expansion("a_variable=\\$CONST", Hash.new)
+        assert_equal "$CONST", Autoproj.single_expansion("\\$CONST", Hash.new)
     end
 end
 

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: autoproj
 version: !ruby/object:Gem::Version
-  version: 1.8.2.rc3
+  version: 1.8.2.rc4
   prerelease: 6
 platform: ruby
 authors:
@@ -9,11 +9,11 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-10-18 00:00:00.000000000 Z
+date: 2012-10-19 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: autobuild
-  requirement: &5581420 !ruby/object:Gem::Requirement
+  requirement: &11665920 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -21,10 +21,10 @@ dependencies:
         version: 1.6.0.rc1
   type: :runtime
   prerelease: false
-  version_requirements: *5581420
+  version_requirements: *11665920
 - !ruby/object:Gem::Dependency
   name: utilrb
-  requirement: &5579600 !ruby/object:Gem::Requirement
+  requirement: &11664080 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -32,10 +32,10 @@ dependencies:
         version: 1.6.0
   type: :runtime
   prerelease: false
-  version_requirements: *5579600
+  version_requirements: *11664080
 - !ruby/object:Gem::Dependency
   name: highline
-  requirement: &5577880 !ruby/object:Gem::Requirement
+  requirement: &11662380 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -43,10 +43,10 @@ dependencies:
         version: 1.5.0
   type: :runtime
   prerelease: false
-  version_requirements: *5577880
+  version_requirements: *11662380
 - !ruby/object:Gem::Dependency
   name: rdoc
-  requirement: &5576660 !ruby/object:Gem::Requirement
+  requirement: &11661100 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -54,10 +54,10 @@ dependencies:
         version: '3.10'
   type: :development
   prerelease: false
-  version_requirements: *5576660
+  version_requirements: *11661100
 - !ruby/object:Gem::Dependency
   name: hoe
-  requirement: &5574700 !ruby/object:Gem::Requirement
+  requirement: &11659100 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -65,7 +65,7 @@ dependencies:
         version: '3.1'
   type: :development
   prerelease: false
-  version_requirements: *5574700
+  version_requirements: *11659100
 description: autoproj is a manager for sets of software packages. It allows the user
   to import and build packages from source, still using the underlying distribution's
   native package manager for software that is available on it.