facter 1.6.1 → 1.6.2

data/lib/facter.rb

@@ -15,233 +15,233 @@
 # limitations under the License.
 
 module Facter
-    # This is just so the other classes have the constant.
-    module Util; end
-
-    require 'facter/util/fact'
-    require 'facter/util/collection'
-
-    include Comparable
-    include Enumerable
-
-    FACTERVERSION = '1.6.1'
-    # = Facter
-    # Functions as a hash of 'facts' you might care about about your
-    # system, such as mac address, IP address, Video card, etc.
-    # returns them dynamically
-
-    # == Synopsis
-    #
-    # Generally, treat <tt>Facter</tt> as a hash:
-    # == Example
-    # require 'facter'
-    # puts Facter['operatingsystem']
-    #
-
-    # Set LANG to force i18n to C
-    #
-    ENV['LANG'] = 'C'
-
-    GREEN = ""
-    RESET = ""
-    @@debug = 0
-    @@timing = 0
-    @@messages = {}
-
-    # module methods
-
-    def self.collection
-        unless defined?(@collection) and @collection
-            @collection = Facter::Util::Collection.new
-        end
-        @collection
-    end
-
-    # Return the version of the library.
-    def self.version
-        return FACTERVERSION
-    end
-
-    # Add some debugging
-    def self.debug(string)
-        if string.nil?
-            return
-        end
-        if self.debugging?
-            puts GREEN + string + RESET
-        end
-    end
-
-    def self.debugging?
-        @@debug != 0
-    end
-
-    # show the timing information
-    def self.show_time(string)
-        puts "#{GREEN}#{string}#{RESET}" if string and Facter.timing?
-    end
-
-    def self.timing?
-        @@timing != 0
-    end
-
-    # Return a fact object by name.  If you use this, you still have to call
-    # 'value' on it to retrieve the actual value.
-    def self.[](name)
-        collection.fact(name)
-    end
-
-    class << self
-        [:fact, :flush, :list, :value].each do |method|
-            define_method(method) do |*args|
-                collection.send(method, *args)
-            end
-        end
-
-        [:list, :to_hash].each do |method|
-            define_method(method) do |*args|
-                collection.load_all
-                collection.send(method, *args)
-            end
-        end
-    end
-
-
-    # Add a resolution mechanism for a named fact.  This does not distinguish
-    # between adding a new fact and adding a new way to resolve a fact.
-    def self.add(name, options = {}, &block)
-        collection.add(name, options, &block)
-    end
-
-    def self.each
-        # Make sure all facts are loaded.
+  # This is just so the other classes have the constant.
+  module Util; end
+
+  require 'facter/util/fact'
+  require 'facter/util/collection'
+
+  include Comparable
+  include Enumerable
+
+  FACTERVERSION = '1.6.2'
+  # = Facter
+  # Functions as a hash of 'facts' you might care about about your
+  # system, such as mac address, IP address, Video card, etc.
+  # returns them dynamically
+
+  # == Synopsis
+  #
+  # Generally, treat <tt>Facter</tt> as a hash:
+  # == Example
+  # require 'facter'
+  # puts Facter['operatingsystem']
+  #
+
+  # Set LANG to force i18n to C
+  #
+  ENV['LANG'] = 'C'
+
+  GREEN = ""
+  RESET = ""
+  @@debug = 0
+  @@timing = 0
+  @@messages = {}
+
+  # module methods
+
+  def self.collection
+    unless defined?(@collection) and @collection
+      @collection = Facter::Util::Collection.new
+    end
+    @collection
+  end
+
+  # Return the version of the library.
+  def self.version
+    return FACTERVERSION
+  end
+
+  # Add some debugging
+  def self.debug(string)
+    if string.nil?
+      return
+    end
+    if self.debugging?
+      puts GREEN + string + RESET
+    end
+  end
+
+  def self.debugging?
+    @@debug != 0
+  end
+
+  # show the timing information
+  def self.show_time(string)
+    puts "#{GREEN}#{string}#{RESET}" if string and Facter.timing?
+  end
+
+  def self.timing?
+    @@timing != 0
+  end
+
+  # Return a fact object by name.  If you use this, you still have to call
+  # 'value' on it to retrieve the actual value.
+  def self.[](name)
+    collection.fact(name)
+  end
+
+  class << self
+    [:fact, :flush, :list, :value].each do |method|
+      define_method(method) do |*args|
+        collection.send(method, *args)
+      end
+    end
+
+    [:list, :to_hash].each do |method|
+      define_method(method) do |*args|
         collection.load_all
-
-        collection.each do |*args|
-            yield(*args)
-        end
-    end
-
-    class << self
-        # Allow users to call fact names directly on the Facter class,
-        # either retrieving the value or comparing it to an existing value.
-        def method_missing(name, *args)
-            question = false
-            if name.to_s =~ /\?$/
-                question = true
-                name = name.to_s.sub(/\?$/,'')
+        collection.send(method, *args)
+      end
+    end
+  end
+
+
+  # Add a resolution mechanism for a named fact.  This does not distinguish
+  # between adding a new fact and adding a new way to resolve a fact.
+  def self.add(name, options = {}, &block)
+    collection.add(name, options, &block)
+  end
+
+  def self.each
+    # Make sure all facts are loaded.
+    collection.load_all
+
+    collection.each do |*args|
+      yield(*args)
+    end
+  end
+
+  class << self
+    # Allow users to call fact names directly on the Facter class,
+    # either retrieving the value or comparing it to an existing value.
+    def method_missing(name, *args)
+      question = false
+      if name.to_s =~ /\?$/
+        question = true
+        name = name.to_s.sub(/\?$/,'')
+      end
+
+      if fact = collection.fact(name)
+        if question
+          value = fact.value.downcase
+          args.each do |arg|
+            if arg.to_s.downcase == value
+              return true
             end
+          end
 
-            if fact = collection.fact(name)
-                if question
-                    value = fact.value.downcase
-                    args.each do |arg|
-                        if arg.to_s.downcase == value
-                            return true
-                        end
-                    end
-
-                    # If we got this far, there was no match.
-                    return false
-                else
-                    return fact.value
-                end
-            else
-                # Else, fail like a normal missing method.
-                raise NoMethodError, "Could not find fact '%s'" % name
-            end
+          # If we got this far, there was no match.
+          return false
+        else
+          return fact.value
         end
-    end
-
-    # Clear all facts.  Mostly used for testing.
-    def self.clear
-        Facter.flush
-        Facter.reset
-    end
-
-    # Clear all messages. Used only in testing. Can't add to self.clear
-    # because we don't want to warn multiple times for items that are warnonce'd
-    def self.clear_messages
-        @@messages.clear
-    end
-
-    # Set debugging on or off.
-    def self.debugging(bit)
-        if bit
-            case bit
-            when TrueClass; @@debug = 1
-            when FalseClass; @@debug = 0
-            when Fixnum
-                if bit > 0
-                    @@debug = 1
-                else
-                    @@debug = 0
-                end
-            when String;
-                if bit.downcase == 'off'
-                    @@debug = 0
-                else
-                    @@debug = 1
-                end
-            else
-                @@debug = 0
-            end
+      else
+        # Else, fail like a normal missing method.
+        raise NoMethodError, "Could not find fact '%s'" % name
+      end
+    end
+  end
+
+  # Clear all facts.  Mostly used for testing.
+  def self.clear
+    Facter.flush
+    Facter.reset
+  end
+
+  # Clear all messages. Used only in testing. Can't add to self.clear
+  # because we don't want to warn multiple times for items that are warnonce'd
+  def self.clear_messages
+    @@messages.clear
+  end
+
+  # Set debugging on or off.
+  def self.debugging(bit)
+    if bit
+      case bit
+      when TrueClass; @@debug = 1
+      when FalseClass; @@debug = 0
+      when Fixnum
+        if bit > 0
+          @@debug = 1
         else
-            @@debug = 0
+          @@debug = 0
         end
-    end
-
-    # Set timing on or off.
-    def self.timing(bit)
-        if bit
-            case bit
-            when TrueClass; @@timing = 1
-            when Fixnum
-                if bit > 0
-                    @@timing = 1
-                else
-                    @@timing = 0
-                end
-            end
+      when String;
+        if bit.downcase == 'off'
+          @@debug = 0
         else
-            @@timing = 0
+          @@debug = 1
         end
-    end
-
-    def self.warn(msg)
-        if Facter.debugging? and msg and not msg.empty?
-            msg = [msg] unless msg.respond_to? :each
-            msg.each { |line| Kernel.warn line }
+      else
+        @@debug = 0
+      end
+    else
+      @@debug = 0
+    end
+  end
+
+  # Set timing on or off.
+  def self.timing(bit)
+    if bit
+      case bit
+      when TrueClass; @@timing = 1
+      when Fixnum
+        if bit > 0
+          @@timing = 1
+        else
+          @@timing = 0
         end
+      end
+    else
+      @@timing = 0
     end
+  end
 
-    # Warn once.
-    def self.warnonce(msg)
-        if msg and not msg.empty? and @@messages[msg].nil?
-            @@messages[msg] = true
-            Kernel.warn(msg)
-        end
+  def self.warn(msg)
+    if Facter.debugging? and msg and not msg.empty?
+      msg = [msg] unless msg.respond_to? :each
+      msg.each { |line| Kernel.warn line }
     end
+  end
 
-    # Remove them all.
-    def self.reset
-        @collection = nil
+  # Warn once.
+  def self.warnonce(msg)
+    if msg and not msg.empty? and @@messages[msg].nil?
+      @@messages[msg] = true
+      Kernel.warn(msg)
     end
+  end
 
-    # Load all of the default facts, and then everything from disk.
-    def self.loadfacts
-        collection.load_all
-    end
+  # Remove them all.
+  def self.reset
+    @collection = nil
+  end
 
-    @search_path = []
+  # Load all of the default facts, and then everything from disk.
+  def self.loadfacts
+    collection.load_all
+  end
 
-    # Register a directory to search through.
-    def self.search(*dirs)
-        @search_path += dirs
-    end
+  @search_path = []
 
-    # Return our registered search directories.
-    def self.search_path
-        @search_path.dup
-    end
+  # Register a directory to search through.
+  def self.search(*dirs)
+    @search_path += dirs
+  end
+
+  # Return our registered search directories.
+  def self.search_path
+    @search_path.dup
+  end
 end

data/lib/facter/Cfkey.rb

@@ -14,29 +14,29 @@
 ##
 
 Facter.add(:Cfkey) do
-    setcode do
-        value = nil
-        ["/usr/local/etc/cfkey.pub",
-            "/etc/cfkey.pub",
-            "/var/cfng/keys/localhost.pub",
-            "/var/cfengine/ppkeys/localhost.pub",
-            "/var/lib/cfengine/ppkeys/localhost.pub",
-            "/var/lib/cfengine2/ppkeys/localhost.pub"
-        ].each do |file|
-            if FileTest.file?(file)
-                File.open(file) { |openfile|
-                    value = openfile.readlines.reject { |line|
-                        line =~ /PUBLIC KEY/
-                    }.collect { |line|
-                        line.chomp
-                    }.join("")
-                }
-            end
-            if value
-                break
-            end
-        end
-
-        value
+  setcode do
+    value = nil
+    ["/usr/local/etc/cfkey.pub",
+      "/etc/cfkey.pub",
+      "/var/cfng/keys/localhost.pub",
+      "/var/cfengine/ppkeys/localhost.pub",
+      "/var/lib/cfengine/ppkeys/localhost.pub",
+      "/var/lib/cfengine2/ppkeys/localhost.pub"
+    ].each do |file|
+      if FileTest.file?(file)
+        File.open(file) { |openfile|
+          value = openfile.readlines.reject { |line|
+            line =~ /PUBLIC KEY/
+          }.collect { |line|
+            line.chomp
+          }.join("")
+        }
+      end
+      if value
+        break
+      end
     end
+
+    value
+  end
 end