lib/puffy/puppet.rb in puffy-0.1.0 vs lib/puffy/puppet.rb in puffy-0.2.0

@@ -13,12 +13,12 @@
       @path = path
       @parser = parser
 
       @formatters = [
         Puffy::Formatters::Pf::Ruleset.new,
-        Puffy::Formatters::Netfilter4::Ruleset.new,
-        Puffy::Formatters::Netfilter6::Ruleset.new,
+        Puffy::Formatters::Iptables4::Ruleset.new,
+        Puffy::Formatters::Iptables6::Ruleset.new,
       ]
     end
 
     # Saves rules to disk
     #
@@ -27,13 +27,11 @@
       each_fragment do |fragment_name, fragment_content|
         FileUtils.mkdir_p(File.dirname(fragment_name))
 
         next unless fragment_changed?(fragment_name, fragment_content)
 
-        File.open(fragment_name, 'w') do |f|
-          f.write(fragment_content)
-        end
+        File.write(fragment_name, fragment_content)
       end
     end
 
     # Show differences between saved and generated rules
     #
@@ -65,9 +63,9 @@
     end
 
     def fragment_changed?(fragment_name, fragment_content)
       return true unless File.exist?(fragment_name)
 
-      File.read(fragment_name).split("\n").reject { |l| l =~ /^#/ } != fragment_content.split("\n").reject { |l| l =~ /^#/ }
+      File.read(fragment_name).split("\n").grep_v(/^#/) != fragment_content.split("\n").grep_v(/^#/)
     end
   end
 end