Merge pull request #23 from opus-codium/netfilter-to-iptables

Rename Netfilter classes to Iptables

README.md

@@ -7,7 +7,7 @@
 
 ## Features
 
-* Generate rules for [Netfilter](http://www.netfilter.org/) and [PF](http://www.openbsd.org/faq/pf/) (extensible);
+* Generate rules for [iptables](http://www.netfilter.org/) and [PF](http://www.openbsd.org/faq/pf/) (extensible);
 * IPv6 and IPv4 support;
 * Define the configuration of multiple *nodes* in a single file;
 * Define *services* as group of rules to mix-in in *nodes* rules definitions;

features/generate.feature

@@ -20,15 +20,15 @@ Feature: Generate firewall rules
     """
 
   Scenario: Generate IPv4 firewall rules for a Linux node
-    When I successfully run `puffy generate -f Netfilter4 network.puffy example.com`
+    When I successfully run `puffy generate -f Iptables4 network.puffy example.com`
     Then the stdout should contain:
     """
     -A INPUT -m conntrack --ctstate NEW -p tcp --dport 80 -j ACCEPT
     -A INPUT -m conntrack --ctstate NEW -p tcp --dport 443 -j ACCEPT
     """
 
   Scenario: Generate IPv6 firewall rules for a Linux node
-    When I successfully run `puffy generate -f Netfilter6 network.puffy example.com`
+    When I successfully run `puffy generate -f Iptables6 network.puffy example.com`
     Then the stdout should contain:
     """
     -A INPUT -m conntrack --ctstate NEW -p tcp --dport 80 -j ACCEPT

lib/puffy/formatters/iptables4.rb

@@ -2,7 +2,7 @@
 
 module Puffy
   module Formatters
-    module Netfilter4 # :nodoc:
+    module Iptables4 # :nodoc:
       # IPv4 Iptables implementation of a Puffy Ruleset formatter.
       class Ruleset < Puffy::Formatters::Iptables::Ruleset # :nodoc:
         # Return an IPv4 Iptables String representation of the provided +rules+ Puffy::Rule with the +policy+ policy.

lib/puffy/formatters/iptables6.rb

@@ -2,7 +2,7 @@
 
 module Puffy
   module Formatters
-    module Netfilter6 # :nodoc:
+    module Iptables6 # :nodoc:
       # IPv6 Iptables implementation of a Puffy Ruleset formatter.
       class Ruleset < Puffy::Formatters::Iptables::Ruleset # :nodoc:
         # Return an IPv6 Iptables String representation of the provided +rules+ Puffy::Rule with the +policy+ policy.

lib/puffy/puppet.rb

@@ -15,8 +15,8 @@ def initialize(path, 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