ruby-nessus 1.0.0 → 1.0.1

data/.gitignore

@@ -8,4 +8,5 @@ tmp/*
 *.swp
 *~
 *.gemspec
-*.gem
+*.gem
+*.rbc

data/README.rdoc

@@ -20,6 +20,8 @@ The below example illustrates how easy it really is to iterate of result data.
   require 'ruby-nessus'
 
   Nessus::Parse.new("example_v1.nessus", :version => 1) do |scan|
+  # OR: Nessus::Parse.new("example_v2.nessus") do |scan|   <-- Ruby-Nessus will figured out the correct Nessus file version.
+  
     puts scan.title                     # The Nessus Report Title.
     puts scan.runtime                   # The Scan Runtime. #=> 2 hours 23 minutes 12 seconds
     puts scan.host_count                # Host Count.
@@ -60,7 +62,7 @@ You also have the ability to search for particular hostnames. In the near future
 
 There are a bunch of convenient methods (maybe more then needed) added to make reporting a bit easier to produce quickly from a raw scan file. If you do not pass :version as an option it will default to the 2.0 .nessus schema.
 
-  Nessus::Parse.new("example_v2.nessus", :version => 2) do |scan|
+  Nessus::Parse.new("example_v2.nessus") do |scan|
 
     puts scan.event_percentage_for('low', true) #=> 8%
 
@@ -94,6 +96,62 @@ There are a bunch of convenient methods (maybe more then needed) added to make r
 
   end
   
+Ruby-Nessus also ships with a POC CLI application for the lib called 'recess':
+  
+  Recess 0.1.1
+  usage: recess FILE [OPTIONS]
+      -f, --file FILE                  The .nessus file to parse.
+      -h, --help                       This help summary page.
+      -v, --version                    Recess Version.
+      
+Below is example output generated by recess:
+  
+  $> recess examples/example_v2.nessus 
+  Recess - Ruby-Nessus CLI
+  Version: 0.1.1
+
+  -> SCAN Metadata: 
+
+  	Scan Title: Ruby-Nessus
+  	Policy Title: Ruby-Nessus
+
+  -> SCAN Statistics: 
+
+  	Host Count: 2
+  	Open Port Count: 51
+  	TCP Count: 38
+  	UDP Count: 11
+  	ICMP Count: 1
+
+  -> EVENT Statistics: 
+
+  	Informational Severity Count: 19
+  	Low Severity Count: 47
+  	Medium Severity Count: 3
+  	High Severity Count: 0
+  	Total Event Count: 50
+
+
+  	Low Event Percentage: 94
+  	Medium Event Percentage: 6
+  	High Event Percentage: 0
+
+  -> HOSTS: 
+
+  	Hostname: snorby.org
+  		- IP Address:: 173.45.230.150
+  		- Informational Count: 12
+  		- Low Count: 34
+  		- Medium Count: 1
+  		- High Count: 0
+
+  	Hostname: scanme.insecure.org
+  		- IP Address:: 64.13.134.52
+  		- Informational Count: 7
+  		- Low Count: 13
+  		- Medium Count: 2
+  		- High Count: 0
+  
 == Requirements
 * Ruby 1.8 or 1.9
 * Nokogiri http://github.com/tenderlove/nokogiri

data/Rakefile

@@ -1,23 +1,48 @@
 require 'rubygems'
 require 'rake'
 
-require './tasks/spec.rb'
-require './tasks/yard.rb'
+require './lib/ruby-nessus/version.rb'
 
 begin
   require 'jeweler'
   Jeweler::Tasks.new do |gem|
     gem.name = "ruby-nessus"
+    gem.version = Nessus::VERSION
     gem.summary = "Ruby-Nessus is a ruby interface for the popular Nessus vulnerability scanner."
     gem.description = "Ruby-Nessus aims to deliver an easy yet powerful interface for interacting and manipulating Nessus scan results and configurations."
     gem.email = "dustin.webber@gmail.com"
     gem.homepage = "http://github.com/mephux/ruby-nessus"
     gem.authors = ["Dustin Willis Webber"]
     gem.add_dependency "nokogiri", ">= 1.4.0"
+    gem.add_dependency "rainbow", ">= 1.0.4"
     gem.add_development_dependency "rspec", ">= 1.2.9"
     gem.add_development_dependency "yard", ">=0.2.3.5"
   end
   Jeweler::GemcutterTasks.new
 rescue LoadError
   puts "Jeweler (or a dependency) not available. Install it with: sudo gem install jeweler"
-end
+end
+
+require 'spec/rake/spectask'
+ 
+desc "Run all specifications"
+Spec::Rake::SpecTask.new(:spec) do |t|
+  t.libs += ['lib', 'spec']
+  t.spec_opts = ['--colour', '--format', 'specdoc']
+end
+ 
+task :test => :spec
+task :default => :spec
+
+lib_dir = File.expand_path(File.join(File.dirname(__FILE__),'..','lib'))
+unless $LOAD_PATH.include?(lib_dir)
+  $LOAD_PATH.unshift(lib_dir)
+end
+ 
+require 'yard'
+ 
+YARD::Rake::YardocTask.new do |t|
+
+end
+ 
+task :docs => :yardoc

data/{tasks/yard.rb → bin/recess}

@@ -1,12 +1,11 @@
+#!/usr/bin/env ruby
+
 lib_dir = File.expand_path(File.join(File.dirname(__FILE__),'..','lib'))
 unless $LOAD_PATH.include?(lib_dir)
-  $LOAD_PATH.unshift(lib_dir)
+  $LOAD_PATH << lib_dir
 end
- 
-require 'yard'
- 
-YARD::Rake::YardocTask.new do |t|
 
-end
+require 'ruby-nessus/cli'
+require 'ruby-nessus/version'
  
-task :docs => :yardoc
+Nessus::CLI.run

data/examples/example.rb

@@ -6,65 +6,36 @@ require 'ruby-nessus'
 
 # Ruby-Nessus Example
 
-Nessus::Parse.new('example_v2.nessus', :version => 2) do |scan|  
-  
-  # puts scan.title
-  # puts scan.policy_title
-  # puts scan.policy_notes
-  # 
-  # puts scan.total_event_count(true)
-  # 
-  # puts scan.tcp_count
-  # puts scan.udp_count
-  # puts scan.icmp_count
-  # 
-  # puts scan.informational_severity_count
-  # puts scan.high_severity_count
-  # puts scan.medium_severity_count
-  # puts scan.low_severity_count
-  
-  # scan.find_by_hostname('snorby') do |host|
-  #   
-  #   puts host.hostname
-  #   puts host.ip
-  #   
-  #   puts host.ports.inspect
-  #     
-  #   host.medium_severity_events do |event|
-  #     puts event.family
-  #     
-  #     puts event.synopsis
-  #     
-  #     puts event.links.inspect
-  #   end
-  #   
-  # end
-  
+Nessus::Parse.new('example_v1.nessus') do |scan|  
   
   scan.each_host do |host|
-  
     puts host.ip
     puts host.hostname
     puts host.os_name
-    puts host.event_percentage_for('icmp', true)
-  
-    puts "\n"
+    puts host.runtime
     
+    #puts host.mac_addr
+    # puts host.event_percentage_for('icmp', true)
+    # puts host.ports.inspect
+    #   
+    # puts "\n"
+    # 
     host.each_event do |event|
       
-      next if event.informational?
-      
       puts "=> #{event.name}" if event.name
-      
+      # puts event.synopsis if event.synopsis
+      # puts "\n"
+      # puts event.output
+      # puts "\n"
       # puts event.patch_publication_date.pretty if event.patch_publication_data
       # puts event.see_also unless event.see_also.empty?
       # puts event.synopsis if event.synopsis
       # puts event.solution if event.solution
       
     end
-    
-    puts "\n"
-    puts "\n"
+    # 
+    # puts "\n"
+    # puts "\n"
     
     
   end

data/lib/ruby-nessus.rb

@@ -1,2 +1,3 @@
 # Ruby-Nessus Files
 require 'ruby-nessus/nessus'
+require 'ruby-nessus/version'

data/lib/ruby-nessus/Version1/event.rb

@@ -4,8 +4,6 @@ module Nessus
   module Version1
     
     class Event
-      # Event
-      attr_reader :event
 
       # Return the total event count for a given host.
       # @return [Integer]

data/lib/ruby-nessus/Version1/host.rb

@@ -1,12 +1,9 @@
 module Nessus
   module Version1
-    
+
     class Host
       include Enumerable
 
-      # Host
-      attr_reader :host
-
       # Creates A New Host Object
       # @param [Object] Host Object
       # @example
@@ -15,6 +12,10 @@ module Nessus
         @host = host
       end
 
+      def to_s
+        "#{ip}"
+      end
+
       # Return the Host Object hostname.
       # @return [String]
       #   The Host Object Hostname
@@ -57,11 +58,9 @@ module Nessus
       # @example
       #   scan.scan_run_time #=> '2 hours 5 minutes and 16 seconds'
       def scan_runtime
-        h = ("#{Time.parse(scan_stop_time.to_s).strftime('%H').to_i - Time.parse(scan_start_time.to_s).strftime('%H').to_i}").gsub('-', '')
-        m = ("#{Time.parse(scan_stop_time.to_s).strftime('%M').to_i - Time.parse(scan_start_time.to_s).strftime('%M').to_i}").gsub('-', '')
-        s = ("#{Time.parse(scan_stop_time.to_s).strftime('%S').to_i - Time.parse(scan_start_time.to_s).strftime('%S').to_i}").gsub('-', '')
-        return "#{h} hours #{m} minutes and #{s} seconds"
+        get_runtime
       end
+      alias runtime scan_runtime
 
       # Return the Host Netbios Name.
       # @return [String]
@@ -253,8 +252,22 @@ module Nessus
         Enumerator.new(self,:each_event).to_a
       end
 
+
+      private
+
+        def get_runtime
+          if scan_start_time && scan_stop_time
+            h = ("#{Time.parse(scan_stop_time.to_s).strftime('%H').to_i - Time.parse(scan_start_time.to_s).strftime('%H').to_i}").gsub('-', '')
+            m = ("#{Time.parse(scan_stop_time.to_s).strftime('%M').to_i - Time.parse(scan_start_time.to_s).strftime('%M').to_i}").gsub('-', '')
+            s = ("#{Time.parse(scan_stop_time.to_s).strftime('%S').to_i - Time.parse(scan_start_time.to_s).strftime('%S').to_i}").gsub('-', '')
+            return "#{h} hours #{m} minutes and #{s} seconds"
+          else
+            false
+          end
+        end
+
     end
-    
+
   end
 
 end

data/lib/ruby-nessus/Version1/version1.rb

@@ -28,12 +28,15 @@ module Nessus
       #     scan.report_name
       #   end
       #
-      def initialize(file)
-        @file = File.open(file)
-        @xml = Nokogiri::XML.parse(@file.read)
+      def initialize(xml)
+        @xml = xml
         raise "Error: Not A Version 1.0 .Nessus file." unless @xml.at('NessusClientData')
       end
 
+      def version
+        1
+      end
+
       #
       # Return the nessus report title.
       #
@@ -297,7 +300,7 @@ module Nessus
       def total_event_count
         count_severity[:all].to_i
       end
-      
+
       #
       # Return the Total severity count.
       #

data/lib/ruby-nessus/Version2/event.rb

@@ -4,8 +4,6 @@ module Nessus
   module Version2
 
     class Event
-      # Event
-      attr_reader :event
 
       def initialize(event)
         @event = event

data/lib/ruby-nessus/Version2/host.rb

@@ -4,9 +4,6 @@ module Nessus
     class Host
       include Enumerable
 
-      # Host
-      attr_reader :host
-
       #
       # Creates A New Host Object
       #
@@ -19,6 +16,10 @@ module Nessus
         @host = host
       end
 
+      def to_s
+        "#{ip}"
+      end
+
       #
       # Return the Host Object hostname.
       #
@@ -29,7 +30,9 @@ module Nessus
       #   host.hostname #=> "example.com"
       #
       def hostname
-        @hostname ||= @host.at('tag[name=host-fqdn]').inner_text
+        if (host = @host.at('tag[name=host-fqdn]'))
+          host.inner_text
+        end
       end
       alias name hostname
       alias fqdn hostname
@@ -45,7 +48,9 @@ module Nessus
       #   host.ip #=> "127.0.0.1"
       #
       def ip
-        @ip ||= @host.at('tag[name=host-ip]').inner_text
+        if (ip = @host.at('tag[name=host-ip]'))
+          ip.inner_text
+        end
       end
 
       #
@@ -58,10 +63,10 @@ module Nessus
       #   scan.scan_start_time #=> 'Fri Nov 11 23:36:54 1985'
       #
       def start_time
-        if @host.at('tag[name=HOST_START]').inner_text.blank?
-          return false
+        if (start_time = @host.at('tag[name=HOST_START]'))
+          DateTime.strptime(start_time.inner_text, fmt='%a %b %d %H:%M:%S %Y')
         else
-          @host_scan_start_time = DateTime.strptime(@host.at('tag[name=HOST_START]').inner_text, fmt='%a %b %d %H:%M:%S %Y')
+          false
         end
       end
 
@@ -75,10 +80,10 @@ module Nessus
       #   scan.scan_start_time #=> 'Fri Nov 11 23:36:54 1985'
       #
       def stop_time
-        if @host.at('tag[name=HOST_END]').inner_text.blank?
-          return false
+        if (stop_time = @host.at('tag[name=HOST_END]'))
+          DateTime.strptime(stop_time.inner_text, fmt='%a %b %d %H:%M:%S %Y')
         else
-          @host_scan_stop_time = DateTime.strptime(@host.at('tag[name=HOST_END]').inner_text, fmt='%a %b %d %H:%M:%S %Y')
+          false
         end
       end
 
@@ -92,11 +97,9 @@ module Nessus
       #   scan.scan_run_time #=> '2 hours 5 minutes and 16 seconds'
       #
       def runtime
-        h = ("#{Time.parse(stop_time.to_s).strftime('%H').to_i - Time.parse(start_time.to_s).strftime('%H').to_i}").gsub('-', '')
-        m = ("#{Time.parse(stop_time.to_s).strftime('%M').to_i - Time.parse(start_time.to_s).strftime('%M').to_i}").gsub('-', '')
-        s = ("#{Time.parse(stop_time.to_s).strftime('%S').to_i - Time.parse(start_time.to_s).strftime('%S').to_i}").gsub('-', '')
-        return "#{h} hours #{m} minutes and #{s} seconds"
+        get_runtime
       end
+      alias scan_runtime runtime
 
       #
       # Return the Host Netbios Name.
@@ -108,7 +111,9 @@ module Nessus
       #   host.netbios_name #=> "SOMENAME4243"
       #
       def netbios_name
-        @netbios_name ||= @host.at('tag[name=netbios-name]').inner_text
+        if (netbios = @host.at('tag[name=netbios-name]'))
+          netbios.inner_text
+        end
       end
 
       #
@@ -121,7 +126,9 @@ module Nessus
       #   host.mac_addr #=> "00:11:22:33:44:55"
       #
       def mac_addr
-        @mac_addr ||= @host.at('tag[name=mac-addr]').inner_text
+        if (mac_addr = @host.at('tag[name=mac-addr]'))
+          mac_addr.inner_text
+        end
       end
       alias mac_address mac_addr
 
@@ -135,7 +142,9 @@ module Nessus
       #   host.dns_name #=> "Microsoft Windows 2000, Microsoft Windows Server 2003"
       #
       def os_name
-        @os_name ||= @host.at('tag[name=operating-system]').inner_text
+        if (os_name = @host.at('tag[name=operating-system]'))
+          os_name.inner_text
+        end
       end
       alias os os_name
       alias operating_system os_name
@@ -244,7 +253,7 @@ module Nessus
 
         @medium_severity_events.each(&block)
       end
-      
+
       def medium_severity
         Enumerator.new(self,:medium_severity_events).to_a
       end
@@ -479,9 +488,20 @@ module Nessus
           raise "Error: #{type} is not an acceptable severity. Possible options include: all, tdp, udp, icmp, high, medium and low."
         end
       end
-      
+
       private
 
+        def get_runtime
+          if stop_time && start_time
+            h = ("#{Time.parse(stop_time.to_s).strftime('%H').to_i - Time.parse(start_time.to_s).strftime('%H').to_i}").gsub('-', '')
+            m = ("#{Time.parse(stop_time.to_s).strftime('%M').to_i - Time.parse(start_time.to_s).strftime('%M').to_i}").gsub('-', '')
+            s = ("#{Time.parse(stop_time.to_s).strftime('%S').to_i - Time.parse(start_time.to_s).strftime('%S').to_i}").gsub('-', '')
+            return "#{h} hours #{m} minutes and #{s} seconds"
+          else
+            false
+          end
+        end
+
         def host_stats
 
           unless @host_stats
@@ -510,14 +530,14 @@ module Nessus
             end
 
             @host_stats = {:open_ports => @open_ports,
-                      :tcp => @tcp,
-                      :udp => @udp,
-                      :icmp => @icmp,
-                      :informational => @informational,
-                      :low => @low,
-                      :medium => @medium,
-                      :high => @high,
-                      :all => (@low + @medium + @high)}
+                           :tcp => @tcp,
+                           :udp => @udp,
+                           :icmp => @icmp,
+                           :informational => @informational,
+                           :low => @low,
+                           :medium => @medium,
+                           :high => @high,
+                           :all => (@low + @medium + @high)}
 
           end
           @host_stats

data/lib/ruby-nessus/Version2/version2.rb

@@ -27,12 +27,16 @@ module Nessus
       #     scan.report_name
       #   end
       #
-      def initialize(file)
-        @file = File.open(file)
-        @xml = Nokogiri::XML.parse(@file.read)
+      def initialize(xml)
+        @xml = xml
         raise "Error: Not A Version 2.0 .Nessus file." unless @xml.at('NessusClientData_v2')
       end
-
+      
+      
+      def version
+        2
+      end
+      
       #
       # Return the nessus report title.
       #

data/lib/ruby-nessus/cli.rb

@@ -0,0 +1,128 @@
+require 'rubygems'
+require 'ruby-nessus/nessus'
+require 'ruby-nessus/log'
+require 'optparse'
+
+require 'pp'
+
+module Nessus
+
+  class CLI
+
+    def initialize
+      @file = nil
+      @nessus_version = nil
+      @args = []
+    end
+
+    def CLI.run
+      self.new.run(*ARGV)
+    end
+
+    def run(*args)
+      optparse(*args)
+
+      Log.it "Recess - Ruby-Nessus CLI"
+      Log.it "Version: #{Nessus::VERSION}"
+      Log.it
+
+      Nessus::Parse.new("#{@file}") do |scan|
+
+        Log.h1 "SCAN Metadata"
+        Log.it
+        Log.h2 "Scan Title", scan.title
+        Log.h2 "Policy Title", scan.policy_title
+        Log.it
+        Log.h1 "SCAN Statistics"
+        Log.it
+        Log.h2 "Host Count", scan.host_count
+        Log.h2 "Open Port Count", scan.open_ports_count
+        
+        unless scan.version == 1
+          Log.h2 "TCP Count", scan.tcp_count
+          Log.h2 "UDP Count", scan.udp_count
+          Log.h2 "ICMP Count", scan.icmp_count
+        end
+        
+        Log.it
+        Log.h1 "EVENT Statistics"
+        Log.it
+        
+        unless scan.version == 1
+          Log.informational "Informational Severity Count", scan.informational_severity_count
+        end
+        Log.low "Low Severity Count", scan.low_severity_count
+        Log.medium "Medium Severity Count", scan.medium_severity_count
+        Log.high "High Severity Count", scan.high_severity_count
+        Log.h3 "Total Event Count", scan.total_event_count
+        Log.break
+        Log.it! "Low Event Percentage: #{scan.event_percentage_for('low', true)}"
+        Log.it! "Medium Event Percentage: #{scan.event_percentage_for('medium', true)}"
+        Log.it! "High Event Percentage: #{scan.event_percentage_for('high', true)}"
+        Log.it
+        
+        Log.h1 "HOSTS"
+        Log.it
+        
+        scan.each_host do |host|
+          Log.h2 "Hostname", host.hostname
+          Log.h5 "IP Address:", host.ip
+          Log.h5 "Informational Count", host.informational_severity_count
+          Log.h5 "Low Count", host.low_severity_count
+          Log.h5 "Medium Count", host.medium_severity_count
+          Log.h5 "High Count", host.high_severity_count
+          Log.it
+        end 
+
+        Log.end
+
+      end
+
+    end
+
+    protected
+
+      def optparse(*args)
+        opts = OptionParser.new
+        opts.program_name = "recess"
+        opts.banner = "Recess #{Nessus::VERSION}"
+        opts.separator "usage: recess FILE [OPTIONS]"
+
+        opts.on('-f','--file FILE','The .nessus file to parse.') do |file|
+          @file = file
+        end
+
+        opts.on('-f','--file FILE','The .nessus file to parse.') do |file|
+          @file = file
+        end
+
+        opts.on('-h','--help','This help summary page.') do |help|
+          Log.it opts
+          Log.it
+          exit -1
+        end
+        
+        opts.on('-v','--version','Recess Version.') do |version|
+          Log.it Nessus::VERSION
+          Log.it
+          exit -1
+        end
+
+        begin
+          @args = opts.parse!(args)
+          @file ||= @args[0]
+          if @file.nil?
+            Log.it opts
+            Log.it
+            exit -1
+          end
+        rescue  => e
+          Log.error e.message
+          Log.it opts
+          Log.it
+          exit -1
+        end
+      end
+
+  end
+end

data/lib/ruby-nessus/log.rb

@@ -0,0 +1,82 @@
+require 'rainbow'
+module Nessus
+  
+  class Log
+    
+    #
+    # Formatting
+    #
+    def self.it(msg=nil)
+      STDERR.puts "#{msg}"
+    end
+    
+    def self.it!(msg=nil)
+      STDERR.puts "\t#{msg}"
+    end
+    
+    def self.break
+      STDERR.puts "\t"
+      STDERR.puts ""
+    end
+    
+    def self.end
+      STDERR.puts "\n\n"
+    end
+    
+    #
+    # Headers
+    #
+    def self.h1(title, msg=nil)
+      STDERR.puts "-> #{title}: ".foreground(:green).bright + "#{msg}"
+    end
+    
+    def self.h2(title, msg=nil)
+      STDERR.puts "\t#{title}: ".foreground(:blue).bright + "#{msg}"
+    end
+    
+    def self.h3(title, msg=nil)
+      STDERR.puts "\t#{title}: " + "#{msg}".foreground(:blue).underline
+    end
+    
+    def self.h4(msg=nil)
+      STDERR.puts "\t\t- #{msg}"
+    end
+    
+    def self.h5(title, msg=nil)
+      STDERR.puts "\t\t- #{title}: #{msg}"
+    end
+    
+    #
+    # Errors
+    #
+    def self.error(msg=nil)
+      STDERR.puts "ERROR: ".foreground(:red).bright + "#{msg}"
+    end
+    
+    def self.warn(msg=nil)
+      STDERR.puts "WARNING: ".foreground(:yellow).bright + "#{msg}"
+    end
+    
+    def self.info(msg=nil)
+      STDERR.puts "INFO: ".foreground(:green).bright + "#{msg}"
+    end 
+    
+    #
+    # Event Severities
+    #
+    def self.informational(title, msg=nil)
+      STDERR.puts "\t#{title}: ".foreground(:magenta).bright + "#{msg}"
+    end
+    def self.low(title, msg=nil)
+      STDERR.puts "\t#{title}: ".foreground(:green) + "#{msg}"
+    end
+    def self.medium(title, msg=nil)
+      STDERR.puts "\t#{title}: ".foreground(:yellow).bright + "#{msg}"
+    end
+    def self.high(title, msg=nil)
+      STDERR.puts "\t#{title}: ".foreground(:red).bright + "#{msg}"
+    end
+    
+  end
+  
+end

data/lib/ruby-nessus/parse.rb

@@ -1,7 +1,9 @@
+require 'ruby-nessus/log'
 require 'ruby-nessus/Version1/version1'
 require 'ruby-nessus/Version2/version2'
 
 require 'nokogiri'
+require 'date'
 require 'enumerator'
 require 'time'
 
@@ -9,27 +11,31 @@ module Nessus
 
   class Parse
 
-    def initialize(file, attributes={}, &block)
-      @file = file
-      @version = attributes[:version] || 2
+    def initialize(file, options={}, &block)
+      @file = File.open(file)
+      @version = options[:version]
+      @xml = Nokogiri::XML.parse(@file.read)
 
-      case @version
-      
-      when 1
-        @file.each do |file|
-          block.call(Version1::XML.new(file)) if block
-        end
-      when 2
-        @file.each do |file|
-          block.call(Version2::XML.new(file)) if block
+      if @version
+        case @version
+          when 1
+            block.call(Version1::XML.new(@xml)) if block
+          when 2
+            block.call(Version2::XML.new(@xml)) if block
+          else
+            raise "Error: Supported .Nessus Version are 1 and 2."
         end
       else
-        raise "Error: Supported .Nessus Version are 1 and 2."
+        if @xml.at('NessusClientData')
+          block.call(Version1::XML.new(@xml)) if block
+        elsif @xml.at('NessusClientData_v2')
+          block.call(Version2::XML.new(@xml)) if block
+        else
+          raise "Error: Supported .Nessus Version are 1 and 2."
+        end
       end
-      
-    end
 
-    
+    end
 
   end
 end

data/lib/ruby-nessus/version.rb

@@ -0,0 +1,3 @@
+module Nessus
+  VERSION = '1.0.1'
+end

data/spec/helpers/xml.rb

@@ -1,4 +1,6 @@
 module Helpers
-  DOT_NESSUS_V1 = File.join(File.dirname(__FILE__),'example_v1.nessus')
-  DOT_NESSUS_V2 = File.join(File.dirname(__FILE__),'example_v2.nessus')
+  v1 = File.join(File.dirname(__FILE__),'example_v1.nessus')
+  v2 = File.join(File.dirname(__FILE__),'example_v2.nessus')
+  DOT_NESSUS_V1 = Nokogiri::XML.parse(File.open(v1).read)
+  DOT_NESSUS_V2 = Nokogiri::XML.parse(File.open(v2).read)
 end

data/spec/ruby-nessus_spec.rb

@@ -1 +1,9 @@
+require 'ruby-nessus/version'
+ 
 require 'spec_helper'
+ 
+describe Nessus do
+  it "should define a VERSION constant" do
+    Nessus.should be_const_defined('VERSION')
+  end
+end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: ruby-nessus
 version: !ruby/object:Gem::Version 
-  version: 1.0.0
+  version: 1.0.1
 platform: ruby
 authors: 
 - Dustin Willis Webber
@@ -9,8 +9,8 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2009-12-14 00:00:00 -06:00
-default_executable: 
+date: 2010-03-29 00:00:00 -04:00
+default_executable: recess
 dependencies: 
 - !ruby/object:Gem::Dependency 
   name: nokogiri
@@ -22,6 +22,16 @@ dependencies:
       - !ruby/object:Gem::Version 
         version: 1.4.0
     version: 
+- !ruby/object:Gem::Dependency 
+  name: rainbow
+  type: :runtime
+  version_requirement: 
+  version_requirements: !ruby/object:Gem::Requirement 
+    requirements: 
+    - - ">="
+      - !ruby/object:Gem::Version 
+        version: 1.0.4
+    version: 
 - !ruby/object:Gem::Dependency 
   name: rspec
   type: :development
@@ -44,8 +54,8 @@ dependencies:
     version: 
 description: Ruby-Nessus aims to deliver an easy yet powerful interface for interacting and manipulating Nessus scan results and configurations.
 email: dustin.webber@gmail.com
-executables: []
-
+executables: 
+- recess
 extensions: []
 
 extra_rdoc_files: 
@@ -56,7 +66,7 @@ files:
 - LICENSE
 - README.rdoc
 - Rakefile
-- VERSION
+- bin/recess
 - examples/example.rb
 - examples/example_v1.nessus
 - examples/example_v2.nessus
@@ -70,9 +80,12 @@ files:
 - lib/ruby-nessus/Version2/host.rb
 - lib/ruby-nessus/Version2/port.rb
 - lib/ruby-nessus/Version2/version2.rb
+- lib/ruby-nessus/cli.rb
 - lib/ruby-nessus/core_ext/helpers.rb
+- lib/ruby-nessus/log.rb
 - lib/ruby-nessus/nessus.rb
 - lib/ruby-nessus/parse.rb
+- lib/ruby-nessus/version.rb
 - spec/Version1/event_spec.rb
 - spec/Version1/host_spec.rb
 - spec/Version1/scan_spec.rb
@@ -84,8 +97,6 @@ files:
 - spec/helpers/xml.rb
 - spec/ruby-nessus_spec.rb
 - spec/spec_helper.rb
-- tasks/spec.rb
-- tasks/yard.rb
 has_rdoc: true
 homepage: http://github.com/mephux/ruby-nessus
 licenses: []

data/VERSION

@@ -1 +0,0 @@
-1.0.0

data/tasks/spec.rb

@@ -1,10 +0,0 @@
-require 'spec/rake/spectask'
- 
-desc "Run all specifications"
-Spec::Rake::SpecTask.new(:spec) do |t|
-  t.libs += ['lib', 'spec']
-  t.spec_opts = ['--colour', '--format', 'specdoc']
-end
- 
-task :test => :spec
-task :default => :spec