5985 - 1.1.0 regex incompatible with 0.4.9

Send fact matches with the surrounding /'s and deal with them
in our has_fact? method to deal with the new format

lib/mcollective/util.rb

@@ -62,6 +62,13 @@ def self.has_fact?(fact, value, operator)
             fact = Facts.get_fact(fact).clone
 
             if operator == '=~'
+                # to maintain backward compat we send the value
+                # as /.../ which is what 1.0.x needed.  this strips
+                # off the /'s wich is what we need here
+                if value =~ /^\/(.+)\/$/
+                    value = $1
+                end
+
                 return true if fact.match(Regexp.new(value))
 
             elsif operator == "=="
@@ -163,7 +170,7 @@ def self.parse_fact_string(fact)
             elsif fact =~ /^([^ ]+?)[ ]*(<=|>=|<|>|!=|==|=~)[ ]*(.+)/
                 return {:fact => $1, :value => $3, :operator => $2 }
             elsif fact =~ /^(.+?)[ ]*=[ ]*\/(.+)\/$/
-                return {:fact => $1, :value => $2, :operator => '=~' }
+                return {:fact => $1, :value => "/#{$2}/", :operator => '=~' }
             elsif fact =~ /^([^= ]+?)[ ]*=[ ]*(.+)/
                 return {:fact => $1, :value => $2, :operator => '==' }
             end

spec/unit/util_spec.rb

@@ -39,8 +39,8 @@ module MCollective
 
         describe "#parse_fact_string" do
             it "should parse old style regex fact matches" do
-                Util.parse_fact_string("foo=/bar/").should == {:fact => "foo", :value => "bar", :operator => "=~"}
-                Util.parse_fact_string("foo = /bar/").should == {:fact => "foo", :value => "bar", :operator => "=~"}
+                Util.parse_fact_string("foo=/bar/").should == {:fact => "foo", :value => "/bar/", :operator => "=~"}
+                Util.parse_fact_string("foo = /bar/").should == {:fact => "foo", :value => "/bar/", :operator => "=~"}
             end
 
             it "should parse old style equality" do

website/changelog.md

@@ -11,6 +11,7 @@ title: Changelog
 
 |Date|Description|Ticket|
 |----|-----------|------|
+|2011/01/30|Fix backward compatibility with old foo=/bar/ style fact searches|5985|
 |2011/01/30|Documentation update to reflect correct default identity behavior|6073|
 |2011/01/29|Let the YAML file force fact reloads when the files update|6057|
 |2011/01/29|Add the ability for fact plugins to force fact invalidation|6057|