lib/facter/util/confine.rb in facter-1.5.4 vs lib/facter/util/confine.rb in facter-1.5.5

@@ -1,24 +1,22 @@
 # A restricting tag for fact resolution mechanisms.  The tag must be true
 # for the resolution mechanism to be suitable.
+
+require 'facter/util/values'
+
 class Facter::Util::Confine
     attr_accessor :fact, :values
 
+    include Facter::Util::Values
+
     # Add the restriction.  Requires the fact name, an operator, and the value
     # we're comparing to.
     def initialize(fact, *values)
         raise ArgumentError, "The fact name must be provided" unless fact
         raise ArgumentError, "One or more values must be provided" if values.empty?
-        fact = fact.to_s if fact.is_a? Symbol
         @fact = fact
-        @values = values.collect do |value|
-            if value.is_a? String
-                value
-            else
-                value.to_s
-            end
-        end
+        @values = values
     end
 
     def to_s
         return "'%s' '%s'" % [@fact, @values.join(",")]
     end
@@ -27,15 +25,17 @@
     def true?
         unless fact = Facter[@fact]
             Facter.debug "No fact for %s" % @fact
             return false
         end
-        value = fact.value
+        value = convert(fact.value)
 
         return false if value.nil?
 
-        @values.each { |v|
-            return true if value.downcase == v.downcase
-        }
+        @values.each do |v|
+            v = convert(v)
+            next unless v.class == value.class
+            return true if value == v
+        end
         return false
     end
 end