riptables 1.0.0 → 1.0.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 6163673be40ac8debc91fbbb58b934d622a0551b
-  data.tar.gz: 834420f08005d80abf266219d82445f9187b42cb
+  metadata.gz: 188cb2ed7bb522ea47cd1c2fde51ff290b258f68
+  data.tar.gz: 269aaf5101ca29be6afa53f288527384f4840ae3
 SHA512:
-  metadata.gz: ffcca219d8afdab19f25844fa2e6352cd49f5149e7254fc70c691864db89c7698a4d7950639b9a93900165544cfe5bfb0b65901903352f1b3fa7d19eaaa71153
-  data.tar.gz: 97b4c44f8ec3b26978c6cf7e3bca149a7dfa79277f4f77db1e627beacf47f84b25e123444b427653e94bd8e1d087e6264a6a60ce26f48942e739ad7007b4c5e0
+  metadata.gz: 95f7cd9e5d4a41434d2976e3ec5332aceb239196a2ceb75c9161d06726a05c0000f04b2e5abb92a3a0821b12fb0bbf1cd09b948e2b9afe970cf1efe5a08e7c3e
+  data.tar.gz: 71146751cebabb763760533c9adf4e810b67f364c54d281a564ff4b999d4f18f4e54c513b2db4d36895cf1f707ac08b3ef602b8a88357049b306d33fec1328f9

data/README.md

@@ -116,6 +116,17 @@ both and cannot currently be different depending on IP version.
 The `riptables` command is used to generate your iptables-save files. These can
 then be used with `iptables-restore`.
 
+### Installing
+
+* Ensure you have Ruby 2.0 or higher installed.
+* Ensure you have RubyGems install.
+
+```text
+gem install riptables
+```
+
+### Usage
+
 ```text
 $ riptables
 ```

data/bin/riptables

@@ -1,6 +1,6 @@
 #!/usr/bin/env ruby
 $:.unshift(File.expand_path('../../lib', __FILE__))
-require 'riptables'
+
 require 'optparse'
 
 options = {}
@@ -21,8 +21,9 @@ OptionParser.new do |opts|
 end.parse!
 
 begin
-  Riptables.load_from_file(load_path)
-  Riptables.tables.each do |table|
+  require 'riptables/base'
+  base = Riptables::Base.load_from_file(load_path)
+  base.tables.each do |table|
     puts table.export(options).to_savefile(ipv)
   end
 rescue Riptables::Error => e

data/lib/riptables/base.rb

@@ -0,0 +1,29 @@
+require 'riptables/error'
+require 'riptables/dsl/base'
+
+module Riptables
+  class Base
+
+    attr_reader :tables
+
+    def initialize(&block)
+      @tables = []
+      dsl.instance_eval(&block) if block_given?
+    end
+
+    def dsl
+      @dsl ||= DSL::Base.new(self)
+    end
+
+    def self.load_from_file(file)
+      if File.file?(file)
+        base = Base.new
+        base.dsl.instance_eval(File.read(file), file)
+        base
+      else
+        raise Error, "File not found at `#{file}`"
+      end
+    end
+
+  end
+end

data/lib/riptables/dsl/base.rb

@@ -0,0 +1,20 @@
+require 'riptables/dsl/base'
+require 'riptables/table'
+
+module Riptables
+  module DSL
+    class Base < Global
+
+      def initialize(base, &block)
+        @base = base
+      end
+
+      def table(name, &block)
+        table = Riptables::Table.new(@base, name)
+        table.dsl.instance_eval(&block)
+        @base.tables << table
+      end
+
+    end
+  end
+end

data/lib/riptables/table.rb

@@ -5,10 +5,12 @@ require 'riptables/table_export'
 module Riptables
   class Table
 
+    attr_reader :base
     attr_reader :name
     attr_reader :chains
 
-    def initialize(name)
+    def initialize(base, name)
+      @base = base
       @name = name
       @chains = {}
     end

data/lib/riptables/version.rb

@@ -1,3 +1,3 @@
 module Riptables
-  VERSION = '1.0.0'
+  VERSION = '1.0.1'
 end

data/lib/riptables.rb

@@ -1,26 +1 @@
-require 'riptables/dsl/root'
-require 'riptables/error'
-
-module Riptables
-
-  # 
-  # Store all tables configured
-  #
-  def self.tables
-    @tables ||= []
-  end
-
-  #
-  # Parse a given file
-  #
-  def self.load_from_file(file)
-    if File.file?(file)
-      dsl = DSL::Root.new
-      dsl.instance_eval(File.read(file), file)
-      true
-    else
-      raise Error, "File not found at `#{file}`"
-    end
-  end
-
-end
+require 'riptables/base'

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: riptables
 version: !ruby/object:Gem::Version
-  version: 1.0.0
+  version: 1.0.1
 platform: ruby
 authors:
 - Adam Cooke
@@ -22,10 +22,11 @@ files:
 - README.md
 - bin/riptables
 - lib/riptables.rb
+- lib/riptables/base.rb
 - lib/riptables/chain.rb
 - lib/riptables/condition.rb
+- lib/riptables/dsl/base.rb
 - lib/riptables/dsl/global.rb
-- lib/riptables/dsl/root.rb
 - lib/riptables/dsl/rule.rb
 - lib/riptables/dsl/table.rb
 - lib/riptables/error.rb

data/lib/riptables/dsl/root.rb

@@ -1,19 +0,0 @@
-require 'riptables/dsl/global'
-require 'riptables/table'
-
-module Riptables
-  module DSL
-    class Root < Global
-
-      #
-      # Rules within a given table
-      #
-      def table(name, &block)
-        table = Riptables::Table.new(name)
-        table.dsl.instance_eval(&block)
-        Riptables.tables << table
-      end
-
-    end
-  end
-end