scandb 0.1.1 → 0.1.2

data/History.txt

@@ -1,3 +1,11 @@
+=== 0.1.2 / 2008-10-19
+
+* Have ScanDB use it's own DataMapper Repository name-space to avoid
+  conflicts with other DataMapper libraries.
+* Bug fix for Runner.command_line, where it was not setting up the DataMapper
+  repository.
+* Minor performance improvement for Nmap.import_xml.
+
 === 0.1.1 / 2008-08-17
 
 * Added a work-around to DataMappers current problem with lazy-loading

data/Manifest.txt

@@ -17,6 +17,7 @@ lib/scandb/os_match.rb
 lib/scandb/os_match_guess.rb
 lib/scandb/host_name.rb
 lib/scandb/host.rb
+lib/scandb/persistence.rb
 lib/scandb/nmap.rb
 lib/scandb/runner.rb
 lib/scandb/scandb.rb

data/README.txt

@@ -1,6 +1,7 @@
 = ScanDB
 
-* http://rubyforge.org/projects/scandb/
+* http://scandb.rubyforge.org/
+* Postmodern Modulus III (postmodern.mod3 at gmail.com)
 
 == DESCRIPTION:
 

data/Rakefile

@@ -7,6 +7,7 @@ require './lib/scandb/version.rb'
 Hoe.new('scandb', ScanDB::VERSION) do |p|
   p.rubyforge_name = 'scandb'
   p.developer('Postmodern Modulus III', 'postmodern.mod3@gmail.com')
+  p.remote_rdoc_dir = ''
   p.extra_deps = [
     ['do_sqlite3', '>=0.9.3'],
     ['dm-core', '>=0.9.3'],

data/lib/scandb/database.rb

@@ -39,15 +39,15 @@ module ScanDB
     # Database configuration file
     CONFIG_FILE = File.join(Config::PATH,'database.yml')
 
-    # Default database configuration
-    DEFAULT_CONFIG = "sqlite3://" + File.join(Config::PATH,'scandb.db')
-
     # Default log path
     DEFAULT_LOG_PATH = File.join(Config::PATH,'scandb.log')
 
     # Default log level
     DEFAULT_LOG_LEVEL = :info
 
+    # Default database configuration
+    DEFAULT_CONFIG = "sqlite3://" + File.join(Config::PATH,'scandb.db')
+
     #
     # Returns the Database configuration that is stored in the
     # +CONFIG_FILE+. Defaults to +DEFAULT_CONFIG+ if +CONFIG_FILE+ does not
@@ -103,7 +103,7 @@ module ScanDB
     #
     def Database.setup(configuration=Database.config,&block)
       Database.setup_log
-      DataMapper.setup(:default, configuration)
+      DataMapper.setup(Model::REPOSITORY_NAME, configuration)
 
       block.call if block
 
@@ -118,10 +118,8 @@ module ScanDB
         model.relationships.each_value { |r| r.child_key if r.child_model == model }
       end
 
-      DataMapper.auto_upgrade!
+      DataMapper.auto_upgrade!(Model::REPOSITORY_NAME)
       return nil
     end
-
-    Database.setup
   end
 end

data/lib/scandb/model.rb

@@ -21,6 +21,8 @@
 #++
 #
 
+require 'scandb/database'
+
 require 'dm-core'
 require 'dm-serializer'
 
@@ -28,11 +30,18 @@ module ScanDB
   module Model
     include DataMapper::Types
 
+    # Name of the DataMapper repository
+    REPOSITORY_NAME = :scandb
+
     def self.included(base)
       base.module_eval do
         include DataMapper::Resource
         include DataMapper::AutoMigrations
 
+        def self.default_repository_name
+          Model::REPOSITORY_NAME
+        end
+
         property :id, Serial
       end
     end

data/lib/scandb/nmap.rb

@@ -40,7 +40,7 @@ module ScanDB
     #
     def Nmap.import_xml(path,&block)
       doc = XML::Document.file(path)
-      hosts = []
+      host_count = 0
 
       doc.find("/nmaprun/host[status[@state='up']]").each do |host|
         ip = host.find_first("address[@addr and @addrtype='ipv4']")['addr']
@@ -98,12 +98,12 @@ module ScanDB
         end
 
         new_host.save
+        host_count += 1
 
         block.call(new_host) if block
-        hosts << new_host
       end
 
-      return hosts
+      return host_count
     end
   end
 end

data/lib/scandb/persistence.rb

@@ -0,0 +1,28 @@
+#
+#--
+# ScanDB - A library for importing and analyzing information generated by
+# various network scanning utilities.
+#
+# Copyright (c) 2008 Hal Brodigan (postmodern.mod3 at gmail.com)
+#
+# This program is free software; you can redistribute it and/or modify
+# it under the terms of the GNU General Public License as published by
+# the Free Software Foundation; either version 2 of the License, or
+# (at your option) any later version.
+#
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+# GNU General Public License for more details.
+#
+# You should have received a copy of the GNU General Public License along
+# with this program; if not, write to the Free Software Foundation, Inc.,
+# 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
+#++
+#
+
+require 'scandb/database'
+
+module ScanDB
+  Database.setup
+end

data/lib/scandb/runner.rb

@@ -98,18 +98,24 @@ module ScanDB
 
       opts.parse!(args)
 
+      Database.setup(options.database || Database.config)
+
       if options.import
         case options.import
         when :nmap then
-          hosts = Nmap.import_xml(options.import_file)
+          hosts = Nmap.import_xml(options.import_file) do |host|
+            if options.verbose
+              puts ">>> Imported #{host.ip}"
+            end
+          end
 
-          case hosts.length
+          case hosts
           when 0
             puts "No hosts where imported."
           when 1
-            puts "Imported #{hosts.length} host."
+            puts "Imported #{hosts} host."
           else
-            puts "Imported #{hosts.length} hosts."
+            puts "Imported #{hosts} hosts."
           end
         end
       else

data/lib/scandb/version.rb

@@ -23,5 +23,5 @@
 
 module ScanDB
   # ScanDB version
-  VERSION = '0.1.1'
+  VERSION = '0.1.2'
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: scandb
 version: !ruby/object:Gem::Version 
-  version: 0.1.1
+  version: 0.1.2
 platform: ruby
 authors: 
 - Postmodern Modulus III
@@ -9,7 +9,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2008-08-17 00:00:00 -07:00
+date: 2008-10-19 00:00:00 -07:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -70,7 +70,7 @@ dependencies:
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
-        version: 1.7.0
+        version: 1.8.0
     version: 
 description: ScanDB is a library for importing and analyzing information generated by various network scanning utilities.
 email: 
@@ -103,13 +103,14 @@ files:
 - lib/scandb/os_match_guess.rb
 - lib/scandb/host_name.rb
 - lib/scandb/host.rb
+- lib/scandb/persistence.rb
 - lib/scandb/nmap.rb
 - lib/scandb/runner.rb
 - lib/scandb/scandb.rb
 - lib/scandb/version.rb
 - lib/scandb.rb
 has_rdoc: true
-homepage: http://rubyforge.org/projects/scandb/
+homepage: http://scandb.rubyforge.org/
 post_install_message: 
 rdoc_options: 
 - --main
@@ -131,7 +132,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
 requirements: []
 
 rubyforge_project: scandb
-rubygems_version: 1.2.0
+rubygems_version: 1.3.0
 signing_key: 
 specification_version: 2
 summary: ScanDB is a library for importing and analyzing information generated by various network scanning utilities.