Merge pull request #70 from tvpartytonight/PA-5966

Stop using legacy facts

Author: joshcooper

lib/puppet/provider/cron/crontab.rb

@@ -13,7 +13,7 @@
   text_line :environment, match: %r{^\s*\w+\s*=}
 
   def self.filetype
-    tabname = case Facter.value(:osfamily)
+    tabname = case Facter.value('os.family')
               when 'Solaris'
                 :suntab
               when 'AIX'
@@ -261,7 +261,7 @@ def user
     @property_hash[:user] || @property_hash[:target]
   end
 
-  CRONTAB_DIR = case Facter.value('osfamily')
+  CRONTAB_DIR = case Facter.value('os.family')
                 when 'Debian', 'HP-UX', 'Solaris'
                   '/var/spool/cron/crontabs'
                 when %r{BSD}

lib/puppet/provider/cron/filetype.rb

@@ -67,7 +67,7 @@ def read
       # Remove a specific @path's cron tab.
       def remove
         cmd = "#{cmdbase} -r"
-        if ['Darwin', 'FreeBSD', 'DragonFly'].include?(Facter.value('operatingsystem'))
+        if ['Darwin', 'FreeBSD', 'DragonFly'].include?(Facter.value('os.name'))
           cmd = "/bin/echo yes | #{cmd}"
         end
 
@@ -96,7 +96,7 @@ def write(text)
       # Only add the -u flag when the @path is different.  Fedora apparently
       # does not think I should be allowed to set the @path to my own user name
       def cmdbase
-        return 'crontab' if @uid == Puppet::Util::SUIDManager.uid || Facter.value(:operatingsystem) == 'HP-UX'
+        return 'crontab' if @uid == Puppet::Util::SUIDManager.uid || Facter.value('os.name') == 'HP-UX'
 
         "crontab -u #{@path}"
       end

spec/unit/provider/cron/parsed_spec.rb

@@ -63,17 +63,17 @@
 
   describe 'when determining the correct filetype' do
     it 'uses the suntab filetype on Solaris' do
-      allow(Facter).to receive(:value).with(:osfamily).and_return 'Solaris'
+      allow(Facter).to receive(:value).with('os.family').and_return 'Solaris'
       expect(described_class.filetype).to eq(Puppet::Provider::Cron::FileType::FileTypeSuntab)
     end
 
     it 'uses the aixtab filetype on AIX' do
-      allow(Facter).to receive(:value).with(:osfamily).and_return 'AIX'
+      allow(Facter).to receive(:value).with('os.family').and_return 'AIX'
       expect(described_class.filetype).to eq(Puppet::Provider::Cron::FileType::FileTypeAixtab)
     end
 
     it 'uses the crontab filetype on other platforms' do
-      allow(Facter).to receive(:value).with(:osfamily).and_return 'Not a real operating system family'
+      allow(Facter).to receive(:value).with('os.family').and_return 'Not a real operating system family'
       expect(described_class.filetype).to eq(Puppet::Provider::Cron::FileType::FileTypeCrontab)
     end
   end
@@ -187,8 +187,8 @@
 
     describe 'on linux' do
       before(:each) do
-        allow(Facter).to receive(:value).with(:osfamily).and_return 'Linux'
-        allow(Facter).to receive(:value).with(:operatingsystem)
+        allow(Facter).to receive(:value).with('os.family').and_return 'Linux'
+        allow(Facter).to receive(:value).with('os.name')
       end
 
       it 'contains no resources for a user who has no crontab' do