sagan_crafter 0.3.0 → 0.4.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 0a1b504c92f2ab3809f4b21923a1320f9d2e6dc3
-  data.tar.gz: 2d72d3a051d6a190a4b4470e6196b75ad7733d84
+  metadata.gz: f1d7bb24c4114f2d7c6d33e69d7408d1eeb77a07
+  data.tar.gz: 58ab491faa2df6568dbe94a1953e37af47d39311
 SHA512:
-  metadata.gz: bbf70fe464fcbfc296c4936411e5632486b1aaa29222fe8fe9122b9b0f9cf6f9af6892144d9f971a062feeacc8794c9b12e75330ae6819cc5061cb3ad30966a1
-  data.tar.gz: 39e7666c657d3d417e8ebf44fa33e5a4aea9f589008dde47f11d1c3cb713c75e7954e08b68c880ce68d3a7f15b792587208bbae814571837abea82d7a09b379e
+  metadata.gz: a72b348e2adf6bd76c338916b977079c4a8acb2275918771bf0f86a98b7b9a91d1fb8ee819ae2545b85c1d57dd149a380524f585efd904a929941e3475b77bb6
+  data.tar.gz: 56ff929ce63782ad216b8bff3c134709fb2c4650833edf0bf0aa605e0009e221c9968bdce63f40d43f53e3c2aa32020a2d91d3920ae5a09bd8c7e3c7a8b4fe81

data/lib/sagan_crafter/backends/sqlite.rb

@@ -17,16 +17,21 @@ module SaganCrafter
 
       attr_reader :rule_collection
 
-      def initialize(factory)
-        @db = connect(SaganCrafter::Settings.sql_file_location)
+      def initialize(factory, existing_db_connection = nil)
+        if existing_db_connection
+          @db = existing_db_connection
+        else
+          @db = connect(SaganCrafter::Settings.sql_file_location)
+        end
         @factory = factory
         @db.results_as_hash = true
         @rule_collection = []
       end
 
       def size
-        count = db.get_first_value("select count(DISTINCT name) from #{SaganCrafter::Settings.sql_table_name}")
-        puts "#{}count(*): #{count}"
+        count = @db.get_first_value("select count(DISTINCT name) from #{SaganCrafter::Settings.sql_table_name}")
+        puts "count(*): #{count}" if SaganCrafter::Settings.verbose
+        count
       end
 
       def validate!

data/lib/sagan_crafter/main.rb

@@ -3,5 +3,6 @@ module SaganCrafter
     class CustomError < StandardError; end
     class UnknownDBSchemaError < StandardError; end
     class UnknownFactoryError < StandardError; end
+    class TemplateError < StandardError; end
 
 end

data/lib/sagan_crafter/ruleset.rb

@@ -2,9 +2,10 @@ module SaganCrafter
   class Ruleset
     attr_reader :rules
 
-    def initialize(rule_sources)
+    def initialize(rule_sources, existing_connection=nil)
       @rules_builders = []
       @rules = []
+      @connection = existing_connection
       rule_sources.each do |source|
         @rules << new_rule_source(source)
       end
@@ -15,12 +16,16 @@ module SaganCrafter
       @rules.to_s
     end
 
+    def new_rule_source(source)
+      raise TemplateError, "new_rule_source called on template class Ruleset"
+    end
+
   end
 
   class FQDNRuleset < Ruleset
     def new_rule_source(source)
       puts "#[sagan-crafter] #{self.class} - #{source}" if SaganCrafter::Settings.verbose
-      printer = SaganCrafter::Backends::SQLite.new(SaganCrafter::Factory::FQDNlogger.new )
+      printer = SaganCrafter::Backends::SQLite.new(SaganCrafter::Factory::FQDNlogger.new, @connection)
       printer.validate!
       return printer.build
     end
@@ -29,7 +34,7 @@ module SaganCrafter
   class IPRuleset < Ruleset
     def new_rule_source(source)
       puts "#[sagan-crafter] #{self.class} - #{source}" if SaganCrafter::Settings.verbose
-      printer = SaganCrafter::Backends::SQLite.new(SaganCrafter::Factory::IPlogger.new )
+      printer = SaganCrafter::Backends::SQLite.new(SaganCrafter::Factory::IPlogger.new, @connection)
       printer.validate!
       return printer.build
     end

data/lib/sagan_crafter/version.rb

@@ -1,3 +1,3 @@
 module SaganCrafter
-  VERSION = "0.3.0"
+  VERSION = "0.4.0"
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: sagan_crafter
 version: !ruby/object:Gem::Version
-  version: 0.3.0
+  version: 0.4.0
 platform: ruby
 authors:
 - shadowbq