facter 1.6.1 → 1.6.2

data/lib/facter/iphostnumber.rb

@@ -10,20 +10,20 @@
 #
 
 Facter.add(:iphostnumber) do
-    confine :kernel => :darwin, :kernelrelease => "R6"
-    setcode do
-        %x{/usr/sbin/scutil --get LocalHostName}
-    end
+  confine :kernel => :darwin, :kernelrelease => "R6"
+  setcode do
+    %x{/usr/sbin/scutil --get LocalHostName}
+  end
 end
 Facter.add(:iphostnumber) do
-    confine :kernel => :darwin, :kernelrelease => "R6"
-    setcode do
-        ether = nil
-        output = %x{/sbin/ifconfig}
+  confine :kernel => :darwin, :kernelrelease => "R6"
+  setcode do
+    ether = nil
+    output = %x{/sbin/ifconfig}
 
-        output =~ /HWaddr (\w\w:\w\w:\w\w:\w\w:\w\w:\w\w)/
-        ether = $1
+    output =~ /HWaddr (\w\w:\w\w:\w\w:\w\w:\w\w:\w\w)/
+    ether = $1
 
-        ether
-    end
+    ether
+  end
 end

data/lib/facter/kernel.rb

@@ -10,13 +10,13 @@
 #
 
 Facter.add(:kernel) do
-    setcode do
-        require 'facter/util/config'
+  setcode do
+    require 'facter/util/config'
 
-        if Facter::Util::Config.is_windows?
-            'windows'
-        else
-            Facter::Util::Resolution.exec("uname -s")
-        end
+    if Facter::Util::Config.is_windows?
+      'windows'
+    else
+      Facter::Util::Resolution.exec("uname -s")
     end
+  end
 end

data/lib/facter/kernelmajversion.rb

@@ -9,7 +9,7 @@
 #
 
 Facter.add("kernelmajversion") do
-    setcode do
-        Facter.value(:kernelversion).split('.')[0..1].join('.')
-    end
+  setcode do
+    Facter.value(:kernelversion).split('.')[0..1].join('.')
+  end
 end

data/lib/facter/kernelrelease.rb

@@ -12,23 +12,23 @@
 #
 
 Facter.add(:kernelrelease) do
-    setcode 'uname -r'
+  setcode 'uname -r'
 end
 
 Facter.add(:kernelrelease) do
-    confine :kernel => :aix
-    setcode 'oslevel -s'
+  confine :kernel => :aix
+  setcode 'oslevel -s'
 end
 
 Facter.add(:kernelrelease) do
-    confine :kernel => %{windows}
-    setcode do
-        require 'facter/util/wmi'
-        version = ""
-        Facter::Util::WMI.execquery("SELECT Version from Win32_OperatingSystem").each do |ole|
-            version = "#{ole.Version}"
-            break
-        end
-        version
+  confine :kernel => %{windows}
+  setcode do
+    require 'facter/util/wmi'
+    version = ""
+    Facter::Util::WMI.execquery("SELECT Version from Win32_OperatingSystem").each do |ole|
+      version = "#{ole.Version}"
+      break
     end
+    version
+  end
 end

data/lib/facter/kernelversion.rb

@@ -11,12 +11,12 @@
 #
 
 Facter.add("kernelversion") do
-    setcode do
-        Facter['kernelrelease'].value.split('-')[0]
-    end
+  setcode do
+    Facter['kernelrelease'].value.split('-')[0]
+  end
 end
 
 Facter.add("kernelversion") do
-    confine :kernel => :sunos
-    setcode 'uname -v'
+  confine :kernel => :sunos
+  setcode 'uname -v'
 end

data/lib/facter/lsb.rb

@@ -20,20 +20,20 @@
    "LSBDistDescription" => %r{^Description:\t(.*)$},
    "LSBDistCodeName"    => %r{^Codename:\t(.*)$}
 }.each do |fact, pattern|
-    Facter.add(fact) do
-        confine :kernel => [ :linux, :"gnu/kfreebsd" ]
-        setcode do
-            unless defined?(lsbdata) and defined?(lsbtime) and (Time.now.to_i - lsbtime.to_i < 5)
-                type = nil
-                lsbtime = Time.now
-                lsbdata = Facter::Util::Resolution.exec('lsb_release -a 2>/dev/null')
-            end
+  Facter.add(fact) do
+    confine :kernel => [ :linux, :"gnu/kfreebsd" ]
+    setcode do
+      unless defined?(lsbdata) and defined?(lsbtime) and (Time.now.to_i - lsbtime.to_i < 5)
+        type = nil
+        lsbtime = Time.now
+        lsbdata = Facter::Util::Resolution.exec('lsb_release -a 2>/dev/null')
+      end
 
-            if pattern.match(lsbdata)
-                $1
-            else
-                nil
-            end
-        end
+      if pattern.match(lsbdata)
+        $1
+      else
+        nil
+      end
     end
+  end
 end

data/lib/facter/lsbmajdistrelease.rb

@@ -15,13 +15,13 @@
 require 'facter'
 
 Facter.add("lsbmajdistrelease") do
-    confine :operatingsystem => %w{Linux Fedora RedHat CentOS Scientific SLC SuSE SLES Debian Ubuntu Gentoo OEL OracleLinux OVS GNU/kFreeBSD}
-    setcode do
-        if /(\d*)\./i =~ Facter.value(:lsbdistrelease)
-            result=$1
-        else
-            result=Facter.value(:lsbdistrelease)
-        end
-        result
+  confine :operatingsystem => %w{Linux Fedora RedHat CentOS Scientific SLC SuSE SLES Debian Ubuntu Gentoo OEL OracleLinux OVS GNU/kFreeBSD}
+  setcode do
+    if /(\d*)\./i =~ Facter.value(:lsbdistrelease)
+      result=$1
+    else
+      result=Facter.value(:lsbdistrelease)
     end
+    result
+  end
 end

data/lib/facter/macaddress.rb

@@ -10,69 +10,69 @@
 require 'facter/util/macaddress'
 
 Facter.add(:macaddress) do
-    confine :operatingsystem => %w{Solaris Linux Fedora RedHat CentOS Scientific SLC SuSE SLES Debian Gentoo Ubuntu OEL OracleLinux OVS GNU/kFreeBSD}
-    setcode do
-        ether = []
-        output = Facter::Util::Resolution.exec("/sbin/ifconfig -a")
-        output.each_line do |s|
-            ether.push($1) if s =~ /(?:ether|HWaddr) (\w{1,2}:\w{1,2}:\w{1,2}:\w{1,2}:\w{1,2}:\w{1,2})/
-        end
-        Facter::Util::Macaddress.standardize(ether[0])
+  confine :operatingsystem => %w{Solaris Linux Fedora RedHat CentOS Scientific SLC SuSE SLES Debian Gentoo Ubuntu OEL OracleLinux OVS GNU/kFreeBSD}
+  setcode do
+    ether = []
+    output = Facter::Util::Resolution.exec("/sbin/ifconfig -a")
+    output.each_line do |s|
+      ether.push($1) if s =~ /(?:ether|HWaddr) (\w{1,2}:\w{1,2}:\w{1,2}:\w{1,2}:\w{1,2}:\w{1,2})/
     end
+    Facter::Util::Macaddress.standardize(ether[0])
+  end
 end
 
 Facter.add(:macaddress) do
-    confine :operatingsystem => "Solaris"
-    setcode do
-        ether = []
-        output = Facter::Util::Resolution.exec("/usr/bin/netstat -np")
-        output.each_line do |s|
-            ether.push($1) if s =~ /(?:SPLA)\s+(\w{2}:\w{2}:\w{2}:\w{2}:\w{2}:\w{2})/
-        end
-        Facter::Util::Macaddress.standardize(ether[0])
+  confine :operatingsystem => "Solaris"
+  setcode do
+    ether = []
+    output = Facter::Util::Resolution.exec("/usr/bin/netstat -np")
+    output.each_line do |s|
+      ether.push($1) if s =~ /(?:SPLA)\s+(\w{2}:\w{2}:\w{2}:\w{2}:\w{2}:\w{2})/
     end
+    Facter::Util::Macaddress.standardize(ether[0])
+  end
 end
 
 Facter.add(:macaddress) do
-    confine :operatingsystem => %w{FreeBSD OpenBSD}
-    setcode do
+  confine :operatingsystem => %w{FreeBSD OpenBSD DragonFly}
+  setcode do
     ether = []
-        output = Facter::Util::Resolution.exec("/sbin/ifconfig")
-        output.each_line do |s|
-            if s =~ /(?:ether|lladdr)\s+(\w\w:\w\w:\w\w:\w\w:\w\w:\w\w)/
-                ether.push($1)
-            end
-        end
-        Facter::Util::Macaddress.standardize(ether[0])
+    output = Facter::Util::Resolution.exec("/sbin/ifconfig")
+    output.each_line do |s|
+      if s =~ /(?:ether|lladdr)\s+(\w\w:\w\w:\w\w:\w\w:\w\w:\w\w)/
+        ether.push($1)
+      end
     end
+    Facter::Util::Macaddress.standardize(ether[0])
+  end
 end
 
 Facter.add(:macaddress) do
-    confine :kernel => :darwin
-    setcode { Facter::Util::Macaddress::Darwin.macaddress }
+  confine :kernel => :darwin
+  setcode { Facter::Util::Macaddress::Darwin.macaddress }
 end
 
 Facter.add(:macaddress) do
-    confine :kernel => %w{AIX}
-    setcode do
-        ether = []
-        ip = nil
-        output = %x{/usr/sbin/ifconfig -a}
-        output.each_line do |str|
-            if str =~ /([a-z]+\d+): flags=/
-                devname = $1
-                unless devname =~ /lo0/
-                    output2 = %x{/usr/bin/entstat #{devname}}
-                    output2.each_line do |str2|
-                        if str2 =~ /^Hardware Address: (\w{1,2}:\w{1,2}:\w{1,2}:\w{1,2}:\w{1,2}:\w{1,2})/
-                            ether.push($1)
-                        end
-                    end
-                end
+  confine :kernel => %w{AIX}
+  setcode do
+    ether = []
+    ip = nil
+    output = %x{/usr/sbin/ifconfig -a}
+    output.each_line do |str|
+      if str =~ /([a-z]+\d+): flags=/
+        devname = $1
+        unless devname =~ /lo0/
+          output2 = %x{/usr/bin/entstat #{devname}}
+          output2.each_line do |str2|
+            if str2 =~ /^Hardware Address: (\w{1,2}:\w{1,2}:\w{1,2}:\w{1,2}:\w{1,2}:\w{1,2})/
+              ether.push($1)
             end
+          end
         end
-        Facter::Util::Macaddress.standardize(ether[0])
+      end
     end
+    Facter::Util::Macaddress.standardize(ether[0])
+  end
 end
 
 Facter.add(:macaddress) do

data/lib/facter/macosx.rb

@@ -27,30 +27,30 @@
 require 'facter/util/macosx'
 
 if Facter.value(:kernel) == "Darwin"
-    Facter::Util::Macosx.hardware_overview.each do |fact, value|
-        Facter.add("sp_#{fact}") do
-            confine :kernel => :darwin
-            setcode do
-                value.to_s
-            end
-        end
+  Facter::Util::Macosx.hardware_overview.each do |fact, value|
+    Facter.add("sp_#{fact}") do
+      confine :kernel => :darwin
+      setcode do
+        value.to_s
+      end
     end
+  end
 
-    Facter::Util::Macosx.os_overview.each do |fact, value|
-        Facter.add("sp_#{fact}") do
-            confine :kernel => :darwin
-            setcode do
-                value.to_s
-            end
-        end
+  Facter::Util::Macosx.os_overview.each do |fact, value|
+    Facter.add("sp_#{fact}") do
+      confine :kernel => :darwin
+      setcode do
+        value.to_s
+      end
     end
+  end
 
-    Facter::Util::Macosx.sw_vers.each do |fact, value|
-        Facter.add(fact) do
-            confine :kernel => :darwin
-            setcode do
-                value
-            end
-        end
+  Facter::Util::Macosx.sw_vers.each do |fact, value|
+    Facter.add(fact) do
+      confine :kernel => :darwin
+      setcode do
+        value
+      end
     end
+  end
 end

data/lib/facter/manufacturer.rb

@@ -19,39 +19,39 @@
 require 'facter/util/manufacturer'
 
 if Facter.value(:kernel) == "OpenBSD"
-    mfg_keys = {
-        'hw.vendor'   => 'manufacturer',
-        'hw.product'  => 'productname',
-        'hw.serialno' => 'serialnumber'
-    }
+  mfg_keys = {
+    'hw.vendor'   => 'manufacturer',
+    'hw.product'  => 'productname',
+    'hw.serialno' => 'serialnumber'
+  }
 
-    Facter::Manufacturer.sysctl_find_system_info(mfg_keys)
+  Facter::Manufacturer.sysctl_find_system_info(mfg_keys)
 elsif Facter.value(:kernel) == "Darwin" 
-    mfg_keys = {
-        'hw.model'   => 'productname'
-    }
-    Facter::Manufacturer.sysctl_find_system_info(mfg_keys)
+  mfg_keys = {
+    'hw.model'   => 'productname'
+  }
+  Facter::Manufacturer.sysctl_find_system_info(mfg_keys)
 elsif Facter.value(:kernel) == "SunOS" and Facter.value(:hardwareisa) == "sparc"
-    Facter::Manufacturer.prtdiag_sparc_find_system_info()
+  Facter::Manufacturer.prtdiag_sparc_find_system_info()
 elsif Facter.value(:kernel) == "windows"
-    win32_keys = {
-        'manufacturer' => ['Manufacturer', 'Bios'],
-        'serialNumber' => ['Serialnumber', 'Bios'],
-        'productname'  => ['Name', 'ComputerSystemProduct']
-    }
-    Facter::Manufacturer.win32_find_system_info(win32_keys)
+  win32_keys = {
+    'manufacturer' => ['Manufacturer', 'Bios'],
+    'serialNumber' => ['Serialnumber', 'Bios'],
+    'productname'  => ['Name', 'ComputerSystemProduct']
+  }
+  Facter::Manufacturer.win32_find_system_info(win32_keys)
 else
-    query = {
-        '[Ss]ystem [Ii]nformation' => [
-            { 'Manufacturer:'      => 'manufacturer' },
-            { 'Product(?: Name)?:' => 'productname' },
-            { 'Serial Number:'     => 'serialnumber' }
-        ],
-        '(Chassis Information|system enclosure or chassis)' => [
-            { '(?:Chassis )?Type:' => 'type' }
-        ]
-    }
+  query = {
+    '[Ss]ystem [Ii]nformation' => [
+      { 'Manufacturer:'    => 'manufacturer' },
+      { 'Product(?: Name)?:' => 'productname' },
+      { 'Serial Number:'   => 'serialnumber' }
+    ],
+    '(Chassis Information|system enclosure or chassis)' => [
+      { '(?:Chassis )?Type:' => 'type' }
+    ]
+  }
 
-    Facter::Manufacturer.dmi_find_system_info(query)
+  Facter::Manufacturer.dmi_find_system_info(query)
 end
 

data/lib/facter/memory.rb

@@ -29,182 +29,180 @@ require 'facter/util/memory'
     :SwapSize   => "SwapTotal",
     :SwapFree   => "SwapFree"
 }.each do |fact, name|
-    Facter.add(fact) do
-        confine :kernel => [ :linux, :"gnu/kfreebsd" ]
-        setcode do
-            Facter::Memory.meminfo_number(name)
-        end
+  Facter.add(fact) do
+    confine :kernel => [ :linux, :"gnu/kfreebsd" ]
+    setcode do
+      Facter::Memory.meminfo_number(name)
     end
+  end
 end
 
 Facter.add("SwapSize") do
-    confine :kernel => :Darwin
-    setcode do
+  confine :kernel => :Darwin
+  setcode do
     swap = Facter::Util::Resolution.exec('sysctl vm.swapusage')
     swaptotal = 0
     if swap =~ /total = (\S+)/ then swaptotal = $1; end
-      swaptotal
-    end
+    swaptotal
+  end
 end
 
 Facter.add("SwapFree") do
-    confine :kernel => :Darwin
-    setcode do
+  confine :kernel => :Darwin
+  setcode do
     swap = Facter::Util::Resolution.exec('sysctl vm.swapusage')
     swapfree = 0
     if swap =~ /free = (\S+)/ then swapfree = $1; end
-      swapfree
-    end
+    swapfree
+  end
 end
 
 Facter.add("SwapEncrypted") do
-    confine :kernel => :Darwin
-    setcode do
+  confine :kernel => :Darwin
+  setcode do
     swap = Facter::Util::Resolution.exec('sysctl vm.swapusage')
     encrypted = false
     if swap =~ /\(encrypted\)/ then encrypted = true; end
-      encrypted
-    end
+    encrypted
+  end
 end
 
 if Facter.value(:kernel) == "AIX" and Facter.value(:id) == "root"
-    swap = Facter::Util::Resolution.exec('swap -l')
-    swapfree, swaptotal = 0, 0
-    swap.each_line do |dev|
-      if dev =~ /^\/\S+\s.*\s+(\S+)MB\s+(\S+)MB/
-        swaptotal += $1.to_i
-        swapfree  += $2.to_i
-      end
+  swap = Facter::Util::Resolution.exec('swap -l')
+  swapfree, swaptotal = 0, 0
+  swap.each_line do |dev|
+    if dev =~ /^\/\S+\s.*\s+(\S+)MB\s+(\S+)MB/
+      swaptotal += $1.to_i
+      swapfree  += $2.to_i
     end
+  end
 
-    Facter.add("SwapSize") do
-        confine :kernel => :aix
-        setcode do
-            Facter::Memory.scale_number(swaptotal.to_f,"MB")
-        end
+  Facter.add("SwapSize") do
+    confine :kernel => :aix
+    setcode do
+      Facter::Memory.scale_number(swaptotal.to_f,"MB")
     end
+  end
 
-    Facter.add("SwapFree") do
-        confine :kernel => :aix
-        setcode do
-            Facter::Memory.scale_number(swapfree.to_f,"MB")
-        end
+  Facter.add("SwapFree") do
+    confine :kernel => :aix
+    setcode do
+      Facter::Memory.scale_number(swapfree.to_f,"MB")
     end
+  end
 end
 
 if Facter.value(:kernel) == "OpenBSD"
-    swap = Facter::Util::Resolution.exec('swapctl -l | sed 1d')
-    swapfree, swaptotal = 0, 0
-    swap.each_line do |dev|
-        if dev =~ /^\S+\s+(\S+)\s+\S+\s+(\S+)\s+.*$/
-            swaptotal += $1.to_i
-            swapfree  += $2.to_i
-        end
-    end
+  swap = Facter::Util::Resolution.exec('swapctl -s')
+  swapfree, swaptotal = 0, 0
+  if swap =~ /^total: (\d+)k bytes allocated = \d+k used, (\d+)k available$/
+    swaptotal = $1.to_i
+    swapfree  = $2.to_i
+  end
 
-    Facter.add("SwapSize") do
-        confine :kernel => :openbsd
-        setcode do
-            Facter::Memory.scale_number(swaptotal.to_f,"kB")
-        end
+  Facter.add("SwapSize") do
+    confine :kernel => :openbsd
+    setcode do
+      Facter::Memory.scale_number(swaptotal.to_f,"kB")
     end
+  end
 
-    Facter.add("SwapFree") do
-        confine :kernel => :openbsd
-        setcode do
-            Facter::Memory.scale_number(swapfree.to_f,"kB")
-        end
+  Facter.add("SwapFree") do
+    confine :kernel => :openbsd
+    setcode do
+      Facter::Memory.scale_number(swapfree.to_f,"kB")
     end
+  end
 
-    Facter::Memory.vmstat_find_free_memory()
+  Facter::Memory.vmstat_find_free_memory()
 
-    Facter.add("MemoryTotal") do
-        confine :kernel => :openbsd
-        memtotal = Facter::Util::Resolution.exec("sysctl hw.physmem | cut -d'=' -f2")
-        setcode do
-            Facter::Memory.scale_number(memtotal.to_f,"")
-        end
+  Facter.add("MemoryTotal") do
+    confine :kernel => :openbsd
+    memtotal = Facter::Util::Resolution.exec("sysctl hw.physmem | cut -d'=' -f2")
+    setcode do
+      Facter::Memory.scale_number(memtotal.to_f,"")
     end
+  end
 end
 
 if Facter.value(:kernel) == "Darwin"
-    swap = Facter::Util::Resolution.exec('sysctl vm.swapusage')
-    swapfree, swaptotal = 0, 0
-    unless swap.empty?
-        # Parse the line:
-        # vm.swapusage: total = 128.00M  used = 0.37M  free = 127.63M  (encrypted)
-        if swap =~ /total\s=\s(\S+)\s+used\s=\s(\S+)\s+free\s=\s(\S+)\s/
-            swaptotal += $1.to_i
-            swapfree  += $3.to_i
-        end
+  swap = Facter::Util::Resolution.exec('sysctl vm.swapusage')
+  swapfree, swaptotal = 0, 0
+  unless swap.empty?
+    # Parse the line:
+    # vm.swapusage: total = 128.00M  used = 0.37M  free = 127.63M  (encrypted)
+    if swap =~ /total\s=\s(\S+)\s+used\s=\s(\S+)\s+free\s=\s(\S+)\s/
+      swaptotal += $1.to_i
+      swapfree  += $3.to_i
     end
+  end
 
-    Facter.add("SwapSize") do
-        confine :kernel => :Darwin
-        setcode do
-            Facter::Memory.scale_number(swaptotal.to_f,"MB")
-        end
+  Facter.add("SwapSize") do
+    confine :kernel => :Darwin
+    setcode do
+      Facter::Memory.scale_number(swaptotal.to_f,"MB")
     end
+  end
 
-    Facter.add("SwapFree") do
-        confine :kernel => :Darwin
-        setcode do
-            Facter::Memory.scale_number(swapfree.to_f,"MB")
-        end
+  Facter.add("SwapFree") do
+    confine :kernel => :Darwin
+    setcode do
+      Facter::Memory.scale_number(swapfree.to_f,"MB")
     end
+  end
 
-    Facter::Memory.vmstat_darwin_find_free_memory()
+  Facter::Memory.vmstat_darwin_find_free_memory()
 
-    Facter.add("MemoryTotal") do
-        confine :kernel => :Darwin
-        memtotal = Facter::Util::Resolution.exec("sysctl hw.memsize | cut -d':' -f2")
-        setcode do
-            Facter::Memory.scale_number(memtotal.to_f,"")
-        end
+  Facter.add("MemoryTotal") do
+    confine :kernel => :Darwin
+    memtotal = Facter::Util::Resolution.exec("sysctl hw.memsize | cut -d':' -f2")
+    setcode do
+      Facter::Memory.scale_number(memtotal.to_f,"")
     end
+  end
 end
 
 if Facter.value(:kernel) == "SunOS"
-    swap = Facter::Util::Resolution.exec('/usr/sbin/swap -l')
-    swapfree, swaptotal = 0, 0
-    swap.each_line do |dev|
-        if dev =~ /^\/\S+\s.*\s+(\d+)\s+(\d+)$/
-            swaptotal += $1.to_i / 2
-            swapfree  += $2.to_i / 2
-        end
+  swap = Facter::Util::Resolution.exec('/usr/sbin/swap -l')
+  swapfree, swaptotal = 0, 0
+  swap.each_line do |dev|
+    if dev =~ /^\/\S+\s.*\s+(\d+)\s+(\d+)$/
+      swaptotal += $1.to_i / 2
+      swapfree  += $2.to_i / 2
     end
+  end
 
-    Facter.add("SwapSize") do
-        confine :kernel => :sunos
-        setcode do
-            Facter::Memory.scale_number(swaptotal.to_f,"kB")
-        end
+  Facter.add("SwapSize") do
+    confine :kernel => :sunos
+    setcode do
+      Facter::Memory.scale_number(swaptotal.to_f,"kB")
     end
+  end
 
-    Facter.add("SwapFree") do
-        confine :kernel => :sunos
-        setcode do
-            Facter::Memory.scale_number(swapfree.to_f,"kB")
-        end
+  Facter.add("SwapFree") do
+    confine :kernel => :sunos
+    setcode do
+      Facter::Memory.scale_number(swapfree.to_f,"kB")
     end
+  end
 
-    # Total memory size available from prtconf
-    pconf = Facter::Util::Resolution.exec('/usr/sbin/prtconf')
-    phymem = ""
-    pconf.each_line do |line|
-        if line =~ /^Memory size:\s+(\d+) Megabytes/
-            phymem = $1
-        end
+  # Total memory size available from prtconf
+  pconf = Facter::Util::Resolution.exec('/usr/sbin/prtconf 2>/dev/null')
+  phymem = ""
+  pconf.each_line do |line|
+    if line =~ /^Memory size:\s+(\d+) Megabytes/
+      phymem = $1
     end
+  end
 
-    Facter.add("MemorySize") do
-        confine :kernel => :sunos
-        setcode do
-            Facter::Memory.scale_number(phymem.to_f,"MB")
-        end
+  Facter.add("MemorySize") do
+    confine :kernel => :sunos
+    setcode do
+      Facter::Memory.scale_number(phymem.to_f,"MB")
     end
+  end
 
-    Facter::Memory.vmstat_find_free_memory()
+  Facter::Memory.vmstat_find_free_memory()
 end
 
 if Facter.value(:kernel) == "windows"
@@ -234,3 +232,33 @@ if Facter.value(:kernel) == "windows"
     end
   end
 end
+
+Facter.add("SwapSize") do
+  confine :kernel => :dragonfly
+  setcode do
+    page_size = Facter::Util::Resolution.exec("/sbin/sysctl -n hw.pagesize").to_f
+    swaptotal = Facter::Util::Resolution.exec("/sbin/sysctl -n vm.swap_size").to_f * page_size
+    Facter::Memory.scale_number(swaptotal.to_f,"")
+  end
+end
+
+Facter.add("SwapFree") do
+  confine :kernel => :dragonfly
+  setcode do
+    page_size = Facter::Util::Resolution.exec("/sbin/sysctl -n hw.pagesize").to_f
+    swaptotal = Facter::Util::Resolution.exec("/sbin/sysctl -n vm.swap_size").to_f * page_size
+    swap_anon_use = Facter::Util::Resolution.exec("/sbin/sysctl -n vm.swap_anon_use").to_f * page_size
+    swap_cache_use = Facter::Util::Resolution.exec("/sbin/sysctl -n vm.swap_cache_use").to_f * page_size
+    swapfree = swaptotal - swap_anon_use - swap_cache_use
+    Facter::Memory.scale_number(swapfree.to_f,"")
+  end
+end
+
+Facter.add("MemoryTotal") do
+  confine :kernel => :dragonfly
+  setcode do
+    Facter::Memory.vmstat_find_free_memory()
+    memtotal = Facter::Util::Resolution.exec("sysctl -n hw.physmem")
+    Facter::Memory.scale_number(memtotal.to_f,"")
+  end
+end