deepsecurity 0.0.15 → 0.0.16

data/.yardopts

@@ -1,4 +1,2 @@
 --markup-provider=redcarpet
 --markup=markdown
---no-private
---files lib/deepsecurity/transport_object.rb 

data/bin/dsc

@@ -27,11 +27,11 @@ program_desc 'DeepSecurity command line client'
 
 version Dsc::VERSION
 
-desc 'Enable client debug output. One of debug, info, warn, error or fatal'
+desc "Enable client debug output. (One of #{Dsc::Command.valid_debug_levels_string})"
 arg_name 'debug'
 flag [:d, :debug]
 
-desc 'Deep Security Manager'
+desc 'Deep Security Manager Host'
 arg_name 'hostname'
 flag [:m, :manager]
 
@@ -40,7 +40,7 @@ arg_name 'port'
 default_value '4119'
 flag [:port]
 
-desc 'Tennat'
+desc 'Tenat Name'
 arg_name 'tenat'
 default_value ''
 flag [:t, :tenant]
@@ -54,111 +54,40 @@ desc 'Password'
 arg_name 'password'
 flag [:p, :password]
 
-desc 'Output file'
+desc 'Output filename'
 default_value '--'
 flag [:o, :outfile]
 
-desc 'Show progress'
+desc 'Show progressbar'
 default_value false
 switch [:P]
 
-desc 'host detail'
-# arg_name 'Describe arguments to host_status here'
-command :host_detail do |c|
-
-  c.desc "list"
-  c.command :list do |list|
-
-    list.desc 'fields'
-    list.default_value Dsc::HostDetail.default_fields_string
-    list.flag [:fields]
-
-    list.action do |global_options, options, args|
-      Dsc.output_from_option(global_options[:o]) do |output|
-        Dsc::HostDetail.list(global_options[:m],
-                             global_options[:port].to_i,
-                             global_options[:t],
-                             global_options[:u],
-                             global_options[:p],
-                             :host_filter,
-                             Dsc::HostDetail.fields_from_string(options[:fields]),
-                             output, global_options[:P],
-                             Dsc.debug_level_from_option(global_options[:d]))
-      end
-    end
-  end
-
-  c.desc "schema"
-  c.command :schema do |schema|
-    schema.action do |global_options, options, args|
-      Dsc.output_from_option(global_options[:o]) do |output|
-        Dsc::HostDetail.print_schema(output)
-      end
-    end
-  end
-
+command_class = Dsc::HostDetailCommand
+desc "Access #{command_class.transport_class_string}s"
+command command_class.command_symbol do |c|
+  command_class.define_list_command(c)
+  command_class.define_schema_command(c)
 end
 
-desc 'anti malware events'
-# arg_name 'Describe arguments to host_status here'
-command :anti_malware_events do |c|
-
-  c.desc "list"
-  c.command :list do |list|
-
-    list.desc 'fields'
-    list.default_value Dsc::AntiMalwareEvent.default_fields_string
-    list.flag [:fields]
-
-    list.desc 'time filter'
-    list.long_desc "One of #{Dsc::AntiMalwareEvent.valid_time_filters.keys.join(', ')}"
-    list.default_value "last_day"
-    list.flag [:time_filter]
-
-    list.action do |global_options, options, args|
-      Dsc.output_from_option(global_options[:o]) do |output|
-        Dsc::AntiMalwareEvent.list(global_options[:m],
-                             global_options[:port].to_i,
-                             global_options[:t],
-                             global_options[:u],
-                             global_options[:p],
-                             :host_filter,
-                             Dsc::AntiMalwareEvent.parse_time_filter(options[:time_filter]),
-                             Dsc::AntiMalwareEvent.fields_from_string(options[:fields]),
-                             output, global_options[:P],
-                             Dsc.debug_level_from_option(global_options[:d]))
-      end
-    end
-  end
-
-  c.desc "schema"
-  c.command :schema do |schema|
-    schema.action do |global_options, options, args|
-      Dsc.output_from_option(global_options[:o]) do |output|
-        Dsc::AntiMalwareEvent.print_schema(output)
-      end
-    end
-  end
-
+command_class = Dsc::AntiMalwareEventCommand
+desc "Access #{command_class.transport_class_string}s"
+command command_class.command_symbol do |c|
+  command_class.define_list_command(c)
+  command_class.define_schema_command(c)
 end
 
-desc 'API Version'
+desc 'Display API Version'
 command :api_version do |c|
-
   c.action do |global_options, options, args|
-    Dsc.output_from_option(global_options[:o]) do |output|
-      Dsc.print_api_version(global_options[:m], global_options[:port].to_i, global_options[:t], global_options[:u], global_options[:p], output, Dsc.debug_level_from_option(global_options[:d]))
-    end
+    Dsc::Command.new(global_options).print_api_version(options, args)
   end
 end
 
-desc 'Manager time'
+desc 'Display Manager time'
 command :manager_time do |c|
 
   c.action do |global_options, options, args|
-    Dsc.output_from_option(global_options[:o]) do |output|
-      Dsc.print_manager_time(global_options[:m], global_options[:port].to_i, global_options[:t], global_options[:u], global_options[:p], output, Dsc.debug_level_from_option(global_options[:d]))
-    end
+    Dsc::Command.new(global_options).print_manager_time(options, args)
   end
 end
 

data/deepsecurity.gemspec

@@ -15,16 +15,16 @@ Gem::Specification.new do |gem|
   gem.require_paths = ["lib"]
   gem.version = DeepSecurity::VERSION
 
-  gem.add_dependency "json"
   gem.add_dependency "savon"
   gem.add_dependency "ruby-cache"
 
   gem.add_dependency "gli"
-
-  gem.add_dependency 'yard'
-  # gem.add_dependency 'redcarpet'
-  # gem.add_dependency 'github-markup'
   gem.add_dependency 'progressbar'
+  gem.add_dependency "json"
+
+  gem.add_development_dependency 'yard'
+  gem.add_development_dependency 'redcarpet'
+  gem.add_development_dependency 'github-markup'
 
 end
 

data/lib/deepsecurity/version.rb

@@ -1,3 +1,3 @@
 module DeepSecurity
-  VERSION = "0.0.15"
+  VERSION = "0.0.16"
 end

data/lib/dsc/anti_malware_event_command.rb

@@ -0,0 +1,86 @@
+module Dsc
+
+  class AntiMalwareEventCommand < Command
+
+
+    def self.transport_class
+      DeepSecurity::AntiMalwareEvent
+    end
+
+    def self.default_fields
+      [
+          # DNS name of system
+          :"host.name",
+
+
+          # fully qualified system node
+          :"host.display_name",
+
+          # signature / pattern version used in detection
+          # MISSING
+
+          # datetime the event was generated and/or received OS version
+          :log_date,
+          :start_time,
+          :end_time,
+
+          # system domain or system group
+          # MISSING
+
+          # account logged on during detection
+          # MISSING
+
+          # action taken
+          :scan_action1,
+          :scan_action2,
+          :summary_scan_result,
+
+          # result of action taken
+          :scan_result_action1,
+          :scan_result_action2,
+          # :spyware_items,
+          # :"spyware_items.to_json",
+
+          # name of malware/detection
+          :malware_name,
+          :malware_type,
+
+          # source/path/filename/object of detection
+          :infected_file_path,
+          :infection_source
+
+      ]
+    end
+
+    def list(options, args)
+      fields = parse_fields(options[:fields])
+      time_filter = parse_time_filter(options[:time_filter])
+      output do |output|
+        authenticate do |dsm|
+          progressBar = ProgressBar.new("anti_malware_event", 100) if @show_progress_bar
+          DeepSecurity::Host.all # Make sure that hosts are cached
+          progressBar.set(10) if @show_progress_bar
+          hostFilter = DeepSecurity::HostFilter.all_hosts
+          eventIdFilter = DeepSecurity::IDFilter.greater_than(0)
+          anti_malware_events = DeepSecurity::AntiMalwareEvent.find_all(time_filter, hostFilter, eventIdFilter)
+          progressBar.set(25) if @show_progress_bar
+          csv = CSV.new(output)
+          csv << fields
+          anti_malware_events.each do |anti_malware_event|
+            progressBar.inc(75/anti_malware_events.size) if @show_progress_bar
+            csv << fields.map { |attribute| anti_malware_event.instance_eval(attribute) }
+          end
+          progressBar.finish if @show_progress_bar
+        end
+      end
+    end
+
+    def self.define_list_command(c)
+      super(c) do |list|
+        define_time_filter_argument(list)
+      end
+    end
+
+  end
+
+end

data/lib/dsc/command.rb

@@ -0,0 +1,184 @@
+require "progressbar"
+require "csv"
+
+module Dsc
+
+  class Command
+
+    def self.transport_class
+      nil
+    end
+
+    def self.transport_class_name
+      class_name = transport_class.name.split('::').last || ''
+    end
+
+    def self.transport_class_string
+      transport_class_name.split(/(?=[A-Z])/).join(" ")
+    end
+
+    def self.command_symbol
+      transport_class_name.split(/(?=[A-Z])/).join("_").downcase.to_sym
+    end
+
+    def self.schema
+      transport_class.mappings
+    end
+
+    def initialize(global_options)
+      @hostname = global_options[:m]
+      @port = global_options[:port].to_i
+      @tenant = global_options[:t]
+      @username =global_options[:u]
+      @password = global_options[:p]
+      @show_progress_bar = global_options[:P]
+      @debug_level = debug_level_from_option(global_options[:d])
+      @output = global_options[:o]
+    end
+
+    def self.valid_debug_levels
+      DeepSecurity::LOG_MAPPING.keys
+    end
+
+    def self.valid_debug_levels_string
+      valid_debug_levels.join(", ")
+    end
+
+    def self.default_fields
+      []
+    end
+
+    def self.default_fields_string
+      default_fields.join(",")
+    end
+
+    def self.valid_fields
+      transport_class.defined_attributes.sort
+    end
+
+    def self.valid_fields_string
+      valid_fields.join(", ")
+    end
+
+    def parse_fields(string)
+      fields = string.split(",").map(&:strip)
+      unknown_fields = fields.reject { |each| self.class.transport_class.has_attribute_chain(each) }
+      raise "Unknown field found (#{unknown_fields.join(', ')}) - known fields are: #{self.class.valid_fields.join(', ')}" unless unknown_fields.empty?
+      fields
+    end
+
+    def self.valid_time_filters
+      {
+          :last_hour => DeepSecurity::TimeFilter.last_hour,
+          :last_24_hours => DeepSecurity::TimeFilter.last_24_hours,
+          :last_7_days => DeepSecurity::TimeFilter.last_7_days,
+          :last_day => DeepSecurity::TimeFilter.last_day
+      }
+    end
+
+    def self.valid_time_filters_string
+      valid_time_filters.keys.join(', ')
+    end
+
+    def parse_time_filter(string)
+      filter = self.class.valid_time_filters[string.to_sym]
+      raise "Unknown time filter" if filter.nil?
+      filter
+    end
+
+
+    def debug_level_from_option(option)
+      return nil if option.blank?
+      return option.to_sym if (DeepSecurity::LOG_MAPPING.keys.include?(option.to_sym))
+      :debug
+    end
+
+    def output
+      unless @output == '--'
+        output = File.open(option, 'w')
+      else
+        output = STDOUT
+      end
+      yield output
+      output.close() unless @output == '--'
+    end
+
+    def connect
+      yield DeepSecurity::Manager.server(@hostname, @port, @debug_level)
+    end
+
+    def authenticate
+      connect do |dsm|
+        begin
+          dsm.connect(@tenant, @username, @password)
+          yield dsm
+        rescue DeepSecurity::AuthenticationFailedException => e
+          puts "Authentication failed! #{e.message}"
+        ensure
+          dsm.disconnect()
+        end
+      end
+    end
+
+
+    def print_api_version(options, args)
+      output do |output|
+        authenticate do |dsm|
+          output.puts dsm.api_version()
+        end
+      end
+    end
+
+    def print_manager_time(options, args)
+      output do |output|
+        authenticate do |dsm|
+          output.puts dsm.manager_time()
+        end
+      end
+    end
+
+    def print_schema(options, args)
+      output do |output|
+        schema = self.class.schema()
+        schema.keys.sort.each do |key|
+          output.puts "#{key} (#{schema[key].type_string}): #{schema[key].description}"
+        end
+      end
+    end
+
+    def self.define_list_command(command)
+      command.desc "List #{self.transport_class_string}s"
+      command.command :list do |list|
+        define_fields_argument(list)
+        yield list if block_given?
+        list.action do |global_options, options, args|
+          self.new(global_options).list(options, args)
+        end
+      end
+    end
+
+    def self.define_schema_command(command)
+      command.desc "Show #{self.transport_class_string} schema"
+      command.command :schema do |schema|
+        yield schema if block_given?
+        schema.action do |global_options, options, args|
+          self.new(global_options).print_schema(options, args)
+        end
+      end
+    end
+
+    def self.define_time_filter_argument(command)
+      command.desc "A filter specifying the time interval to query (One of #{self.valid_time_filters_string})"
+      command.default_value "last_day"
+      command.flag [:time_filter]
+    end
+
+    def self.define_fields_argument(command)
+      command.desc "A comma separated list of fields to display. (Available fields: #{self.valid_fields_string})"
+      command.default_value self.default_fields_string
+      command.flag [:fields]
+    end
+
+  end
+
+end

data/lib/dsc/helper.rb

@@ -1,48 +1,6 @@
 module Dsc
 
 
-  def self.output_from_option(option)
-    unless option == '--'
-      output = File.open(option, 'w')
-    else
-      output = STDOUT
-    end
 
-    yield output
-
-    output.close() unless option == '--'
-  end
-
-  def self.debug_level_from_option(option)
-    return nil if option.blank?
-    return option.to_sym if (DeepSecurity::LOG_MAPPING.keys.include?(option.to_sym))
-    :debug
-  end
-
-  def self.dsm_connect(hostname, port, tenat, username, password, debug)
-
-    begin
-      dsm = DeepSecurity::Manager.server(hostname, port, debug)
-      dsm.connect(tenat, username, password)
-      yield dsm
-    rescue DeepSecurity::AuthenticationFailedException => e
-      puts "Authentication failed! #{e.message}"
-    ensure
-      dsm.disconnect()
-    end
-
-  end
-
-  def self.print_api_version(hostname, port, tenat, username, password, output, debug)
-    dsm_connect(hostname, port, tenat, username, password, debug) do |dsm|
-      output.puts dsm.api_version()
-    end
-  end
-
-  def self.print_manager_time(hostname, port, tenat, username, password, output, debug)
-    dsm_connect(hostname, port, tenat, username, password, debug) do |dsm|
-      output.puts dsm.manager_time()
-    end
-  end
 
 end

data/lib/dsc/{host_detail.rb → host_detail_command.rb}

@@ -1,9 +1,6 @@
-require "progressbar"
-require "csv"
-
 module Dsc
 
-  class HostDetail < DscObject
+  class HostDetailCommand < Command
 
 
     def self.transport_class
@@ -33,30 +30,30 @@ module Dsc
           :platform,
           :host_type,
           # system domain or system group
-          :host_group_id
+          :host_group_id,
 
       # last/currently logged on account
       ]
-
-
     end
 
-    def self.list(hostname, port, tenat, username, password, host_filter, fields, output, progress_bar, debug)
-      Dsc.dsm_connect(hostname, port, tenat, username, password, debug) do |dsm|
-        hostFilter = DeepSecurity::HostFilter.all_hosts
-        progressBar = ProgressBar.new("host_status", 100) if progress_bar
-        hostDetails = DeepSecurity::HostDetail.find_all(hostFilter, :low)
-        progressBar.set(25) if progress_bar
-        csv = CSV.new(output)
-        csv << fields
-        hostDetails.each do |hostDetail|
-          progressBar.inc(75/hostDetails.size) if progress_bar
-          csv << fields.map { |attribute| hostDetail.instance_eval(attribute) }
+    def list(options, args)
+      fields = parse_fields(options[:fields])
+      output do |output|
+        authenticate do |dsm|
+          hostFilter = DeepSecurity::HostFilter.all_hosts
+          progressBar = ProgressBar.new("host_status", 100) if @show_progress_bar
+          hostDetails = DeepSecurity::HostDetail.find_all(hostFilter, :low)
+          progressBar.set(25) if @show_progress_bar
+          csv = CSV.new(output)
+          csv << fields
+          hostDetails.each do |hostDetail|
+            progressBar.inc(75/hostDetails.size) if @show_progress_bar
+            csv << fields.map { |attribute| hostDetail.instance_eval(attribute) }
+          end
+          progressBar.finish if @show_progress_bar
         end
-        progressBar.finish if progress_bar
       end
     end
-
   end
 
 end

data/lib/dsc.rb

@@ -1,6 +1,6 @@
 require 'dsc_version'
 require 'dsc/helper'
 
-require "dsc/dsc_object"
-require "dsc/host_detail"
-require "dsc/anti_malware_event"
+require "dsc/command"
+require "dsc/host_detail_command"
+require "dsc/anti_malware_event_command"

data/lib/savon_helper/type_mappings.rb

@@ -28,6 +28,10 @@ module SavonHelper
       logger.error { "#{self.class}##{__method__}() not implemented!" }
     end
 
+    def type_string
+      logger.error { "#{self.class}##{__method__}() not implemented!" }
+    end
+
   end
 
   class ArrayMapping < TypeMapping
@@ -70,7 +74,11 @@ module SavonHelper
 
     def object_klass
        @element_mapping.object_klass
-     end
+    end
+
+    def type_string
+      "Array<#{@element_mapping.type_string}>"
+    end
 
   end
 
@@ -84,6 +92,10 @@ module SavonHelper
       value.to_s
     end
 
+    def type_string
+      "bool"
+    end
+
   end
 
   class DatetimeMapping < TypeMapping
@@ -96,6 +108,10 @@ module SavonHelper
       value.to_datetime.to_s
     end
 
+    def type_string
+      "datetime"
+    end
+
   end
 
   class EnumMapping < TypeMapping
@@ -113,6 +129,10 @@ module SavonHelper
       @enum.key(value)
     end
 
+    def type_string
+      "enum"
+    end
+
   end
 
   class FloatMapping < TypeMapping
@@ -125,6 +145,10 @@ module SavonHelper
       value.to_s
     end
 
+    def type_string
+      "float"
+    end
+
   end
 
   class IntegerMapping < TypeMapping
@@ -137,6 +161,9 @@ module SavonHelper
       value.to_s
     end
 
+    def type_string
+      "int"
+    end
   end
 
   class IPAddressMapping < TypeMapping
@@ -149,6 +176,10 @@ module SavonHelper
       value.to_s
     end
 
+    def type_string
+      "IPAddress"
+    end
+
   end
 
   class ObjectMapping < TypeMapping
@@ -166,6 +197,10 @@ module SavonHelper
       @klass
     end
 
+    def type_string
+      "#{@klass}"
+    end
+
   end
 
   class StringMapping < TypeMapping
@@ -182,6 +217,10 @@ module SavonHelper
       String
     end
 
+    def type_string
+      "String"
+    end
+
   end
 
   class MissingMapping < TypeMapping
@@ -194,6 +233,10 @@ module SavonHelper
       value
     end
 
+    def type_string
+      "MISSING"
+    end
+
   end
 
   class HintMapping < TypeMapping
@@ -207,6 +250,10 @@ module SavonHelper
       @klass
     end
 
+    def type_string
+      "HINT"
+    end
+
   end
 
   def self.define_missing_type_mapping(klass, ivar_name, value, mappings)

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: deepsecurity
 version: !ruby/object:Gem::Version
-  version: 0.0.15
+  version: 0.0.16
   prerelease: 
 platform: ruby
 authors:
@@ -9,10 +9,10 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-03-11 00:00:00.000000000 Z
+date: 2013-03-13 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
-  name: json
+  name: savon
   requirement: !ruby/object:Gem::Requirement
     none: false
     requirements:
@@ -28,7 +28,7 @@ dependencies:
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
-  name: savon
+  name: ruby-cache
   requirement: !ruby/object:Gem::Requirement
     none: false
     requirements:
@@ -44,7 +44,7 @@ dependencies:
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
-  name: ruby-cache
+  name: gli
   requirement: !ruby/object:Gem::Requirement
     none: false
     requirements:
@@ -60,7 +60,7 @@ dependencies:
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
-  name: gli
+  name: progressbar
   requirement: !ruby/object:Gem::Requirement
     none: false
     requirements:
@@ -76,7 +76,7 @@ dependencies:
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
-  name: yard
+  name: json
   requirement: !ruby/object:Gem::Requirement
     none: false
     requirements:
@@ -92,14 +92,46 @@ dependencies:
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
-  name: progressbar
+  name: yard
   requirement: !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
         version: '0'
-  type: :runtime
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
+- !ruby/object:Gem::Dependency
+  name: redcarpet
+  requirement: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
+- !ruby/object:Gem::Dependency
+  name: github-markup
+  requirement: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     none: false
@@ -149,10 +181,10 @@ files:
 - lib/deepsecurity/transport_objects/time_filter.rb
 - lib/deepsecurity/version.rb
 - lib/dsc.rb
-- lib/dsc/anti_malware_event.rb
-- lib/dsc/dsc_object.rb
+- lib/dsc/anti_malware_event_command.rb
+- lib/dsc/command.rb
 - lib/dsc/helper.rb
-- lib/dsc/host_detail.rb
+- lib/dsc/host_detail_command.rb
 - lib/dsc_version.rb
 - lib/savon_helper.rb
 - lib/savon_helper/caching_object.rb

data/lib/dsc/anti_malware_event.rb

@@ -1,101 +0,0 @@
-require "progressbar"
-require "csv"
-
-module Dsc
-
-  class AntiMalwareEvent < DscObject
-
-
-    def self.transport_class
-      DeepSecurity::AntiMalwareEvent
-    end
-
-    def self.default_fields
-      [
-          # DNS name of system
-          :"host.name",
-
-
-          # fully qualified system node
-          :"host.display_name",
-
-          # signature / pattern version used in detection
-          # MISSING
-
-          # datetime the event was generated and/or received OS version
-          :log_date,
-          :start_time,
-          :end_time,
-
-          # system domain or system group
-          # MISSING
-
-          # account logged on during detection
-          # MISSING
-
-          # action taken
-          :scan_action1,
-          :scan_action2,
-          :summary_scan_result,
-
-          # result of action taken
-          :scan_result_action1,
-          :scan_result_action2,
-          # :spyware_items,
-          # :"spyware_items.to_json",
-
-          # name of malware/detection
-          :malware_name,
-          :malware_type,
-
-          # source/path/filename/object of detection
-          :infected_file_path,
-          :infection_source
-
-      ]
-    end
-
-    def self.list(hostname, port, tenat, username, password, host_filter, time_filter, fields, output, progress_bar, debug)
-      Dsc.dsm_connect(hostname, port, tenat, username, password, debug) do |dsm|
-
-        progressBar = ProgressBar.new("anti_malware_event", 100) if progress_bar
-
-        DeepSecurity::Host.all # Make sure that hosts are cached
-        progressBar.set(10) if progress_bar
-
-        hostFilter = DeepSecurity::HostFilter.all_hosts
-        eventIdFilter = DeepSecurity::IDFilter.greater_than(0)
-
-
-        anti_malware_events = DeepSecurity::AntiMalwareEvent.find_all(time_filter, hostFilter, eventIdFilter)
-        progressBar.set(25) if progress_bar
-        csv = CSV.new(output)
-        csv << fields
-        anti_malware_events.each do |anti_malware_event|
-          progressBar.inc(75/anti_malware_events.size) if progress_bar
-
-          csv << fields.map { |attribute| anti_malware_event.instance_eval(attribute) }
-        end
-        progressBar.finish if progress_bar
-      end
-
-    end
-
-    def self.parse_time_filter(string)
-      filter = valid_time_filters[string.to_sym]
-      raise "Unknown time filter" if filter.nil?
-      filter
-    end
-
-    def self.valid_time_filters
-      {
-          :last_hour => DeepSecurity::TimeFilter.last_hour,
-          :last_24_hours => DeepSecurity::TimeFilter.last_24_hours,
-          :last_7_days => DeepSecurity::TimeFilter.last_7_days,
-          :last_day => DeepSecurity::TimeFilter.last_day
-      }
-    end
-
-  end
-
-end

data/lib/dsc/dsc_object.rb

@@ -1,41 +0,0 @@
-module Dsc
-
-  class DscObject
-
-
-    def self.transport_class
-      raise "Subclass responsibility!"
-    end
-
-    def self.default_fields
-      []
-    end
-
-    def self.default_fields_string
-      default_fields.join(",")
-    end
-
-    def self.schema
-      result ={}
-      transport_class.mappings.each { |key, value| result[key] = value.description }
-      result
-    end
-
-    def self.print_schema(output)
-      schema = self.schema()
-      schema.keys.sort.each do |key|
-        output.puts "#{key}: #{schema[key]}"
-      end
-    end
-
-    def self.fields_from_string(string)
-      fields = string.split(",").map(&:strip)
-      unknown_fields = fields.reject { |each| transport_class.has_attribute_chain(each) }
-      raise "Unknown field found (#{unknown_fields.join(', ')}) - known fields are: #{transport_class.defined_attributes.sort.join(', ')}" unless unknown_fields.empty?
-      fields
-    end
-
-
-  end
-
-end