environment.rb in rubber-1.1.0

- old
+ new

@@ -30,20 +30,22 @@
 
       def known_roles
         roles_dir = File.join(@config_root, "role")
         roles = Dir.entries(roles_dir)
         roles.delete_if {|d| d =~ /(^\..*)/}
+        roles += @items['roles'].keys
+        return roles.compact.uniq
       end
 
       def current_host
         Socket::gethostname.gsub(/\..*/, '')
       end
       
       def current_full_host
         Socket::gethostname
       end
-
+      
       def bind(roles = nil, host = nil)
         BoundEnv.new(@items, roles, host)
       end
 
       # combine old and new into a single value:
@@ -93,9 +95,10 @@
           key = method_id.id2name
           return self[key]
         end
 
         def expand_string(val)
+          rubber_instances = Rubber::Configuration::rubber_instances
           while val =~ /\#\{[^\}]+\}/
             val = eval('%Q{' + val + '}', binding)
           end
           val = true if val =="true"
           val = false if val == "false"
\ No newline at end of file