clamd 0.0.1 → 1.0.0

data/.rspec

@@ -0,0 +1,2 @@
+--color
+--format documentation

data/Gemfile

@@ -1 +1,3 @@
 source 'https://rubygems.org'
+gemspec
+gem 'rspec'

data/README.md

@@ -1,8 +1,6 @@
 # Clamd
 
-Ruby gem to speak with Clamd daemon
-
-NOTE: Still under development
+Ruby client to interact with ClamAV daemon
 
 ## Installation
 
@@ -14,76 +12,97 @@ And then execute:
 
     $ bundle
 
-Or install it yourself as:
+Install clamd directly
 
     $ gem install clamd
 
 ## Configuration
 
-Refer the below code to configure the Clamd gem
-    
-    Clamd.configure do |config|
-      config.host = "localhost" #mandatory
-      config.port = 9321 #mandatory
-      config.open_timeout = 5 #optional
-      config.read_timeout = 20 #optional
-      config.chunk_size = 10240 #optional
-    end  
+Clamd by default connects to 9321 port in localhost. You can also configure the
+host, port, open_timeout(seconds), read_timeout(seconds) and chunk_size(bytes).
+Refer the following code to configure Clamd.
+
+    Client.configure do |config|
+      config.host = 'localhost'
+      config.port = 9321
+      config.open_timeout = 5
+      config.read_timeout = 20
+      config.chunk_size = 102400
+    end
 
 ## Usage
 
-To check ClamAV version
+    @clamd = Clamd::Client.new
 
-    Clamd.version
+### PING
 
-Response will be like below
+    @clamd.ping
+    =>"PONG"
 
-    =>"ClamAV 0.97.5/15468/Wed Oct 17 01:13:58 2012\n"
+### RELOAD
 
-To check Clamd is alive or not.
+    @clamd.reload
+    =>"RELOADING"
 
-    Clamd.ping
+### SHUTDOWN
 
-Response from Clamd daemon will be "PONG" if it is alive
+    @clamd.shutdown
+    => true
 
-    =>"PONG"
+### SCAN
 
-To reload Clamd virus signature database
+    @clamd.scan("/file/path")
+    =>"/file/path: OK"
 
-    Clamd.reload
+### CONTSCAN
 
-Response from Clamd daemon will be "RELOADING"
+    @clamd.contscan("/file/path")
+    =>"/file/path: OK"
 
-    =>"RELOADING"
+### MULTISCAN
+
+    @clamd.multiscan("/file/path")
+    =>"/file/path: OK"
 
-To shutdown Clamd daemon
+### INSTREAM
 
-    Clamd.shutdown
+    @clamd.instream("/file/path/to/stream/to/clamd")
+    =>"stream: OK"
 
-Response will be blank if shutdown success
+### STATS
 
-    =>""
+    @clamd.stats
+    => "POOLS: 1STATE: VALID PRIMARYTHREADS: live 1  idle 0 max 12 idle-timeout 30QUEUE: 0 items"
 
-To scan a file
+### VERSION
 
-    Clamd.scan("/file/path")
-    =>"/file/path: OK"
+    @clamd.version
+    => "ClamAV 0.97.8/18237/Sat Dec 14 11:13:16 2013"
 
-To use CONTSCAN facility of Clamd
+### Connecting multiple ClamdAV daemon
 
-    Clamd.contscan("/file/path")
-    =>"/file/path: OK"
+You can also connect to multiple ClamdAV daemon running on different machine at
+the same time.
 
-To use MULTISCAN facility of Clamd
+    @clamd1 = Clamd::Client.new(host: '192.16.20.11', port: 9321)
+    @clamd2 = Clamd::Client.new(host: '172.16.50.21', port: 8321)
 
-    Clamd.multiscan("/file/path")
-    =>"/file/path: OK"
+    @clamd1.ping
+    => "PONG"
 
-To use INSTREAM facility of Clamd
+    @clamd2.ping
+    => "PONG"
 
-    Clamd.instream("/file/path/to/stream/to/clamd")
-    =>"stream: OK"
-    
-To know Clamd scan queue status
+## License
+
+Clamd is released under the [MIT License](http://www.opensource.org/licenses/MIT).
+
+## Code Status
+
+[![Code Climate](https://codeclimate.com/github/soundarapandian/clamd.png)](https://codeclimate.com/github/soundarapandian/clamd)
+
+## Test
+
+Run spec
 
-    Clamd.stats
+    rspec spec/

data/bin/clamdc

@@ -0,0 +1,9 @@
+#!/usr/bin/env ruby
+
+$:.unshift File.expand_path('../lib', File.dirname(__FILE__))
+
+require 'irb'
+require 'clamd'
+
+ARGV.clear
+IRB.start

data/clamd.gemspec

@@ -1,19 +1,17 @@
 # -*- encoding: utf-8 -*-
-lib = File.expand_path('../lib', __FILE__)
-$LOAD_PATH.unshift(lib) unless $LOAD_PATH.include?(lib)
-require 'clamd/version'
+require File.expand_path('../lib/clamd/version', __FILE__)
 
 Gem::Specification.new do |gem|
-  gem.name          = "clamd"
+  gem.name          = 'clamd'
   gem.version       = Clamd::VERSION
-  gem.authors       = ["soundarapandian rathinasamy"]
-  gem.email         = ["soundar.rathinasamy@gmail.com"]
+  gem.authors       = ['Soundarapandian Rathinasamy']
+  gem.email         = ['soundar.rathinasamy@gmail.com']
   gem.description   = %q{Ruby gem to interact with ClamAV daemon(Clamd)}
-  gem.summary       = %q{Clamd gem enables you to feed the simple VERSION command to 
+  gem.summary       = %q{Clamd gem enables you to feed the simple VERSION command to
                          complex INSTREAM command to ClamAV antivirus daemon(Clamd)}
-  gem.homepage      = "https://github.com/soundarapandian/clamd"
-
+  gem.homepage      = 'https://github.com/soundarapandian/clamd'
+  gem.license       = 'MIT'
   gem.files         = `git ls-files`.split($/)
   gem.test_files    = gem.files.grep(%r{^(test|spec|features)/})
-  gem.require_paths = ["lib"]
+  gem.require_paths = ['lib']
 end

data/lib/clamd.rb

@@ -1,7 +1,35 @@
-require "clamd/command"
+require "clamd/client"
 require "clamd/configuration"
 require "clamd/version"
 
 module Clamd
-  extend Command
+  ##
+  # Used to configure the Clamd globally
+  #
+  # Usage:
+  #
+  #    Clamd.configure do |config|
+  #      config.host = 'localhost'
+  #      config.port = 9321
+  #      config.open_timeout = 5
+  #      config.read_timeout = 10
+  #      config.chunk_size = 10240
+  #    end
+  def self.configure
+    @configuration ||= Configuration.new
+
+    yield(@configuration) if block_given?
+
+    @configuration
+  end
+
+  ##
+  # Gets current configuration details of Clamd
+
+  def self.configuration
+    @configuration
+  end
+
+  # Configure defaults
+  configure
 end

data/lib/clamd/client.rb

@@ -0,0 +1,179 @@
+require 'timeout'
+require 'clamd/socket_manager'
+
+module Clamd
+  ##
+  # == Class that interacts with ClamdAV daemon
+  #
+  # Clamd::Client is responsible for interacting with ClamdAV daemon.
+  #
+  # For example you can connect ClamdAV daemon as given below
+  #
+  #    clamd = Clamd::Client.new
+  #    clamd.ping
+  #
+  # In the above example the ClamdAV daemon details will be get from the
+  # Clamd::Configuration
+  #
+  # You can also override the globla Clamd::Configuration as given below
+  #
+  #    clamd = Clamd::Client.new(host: '172.15.20.11', port: 8321)
+  #    clamd.ping
+
+  class Client
+    attr_accessor :host, :port, :open_timeout, :read_timeout, :chunk_size
+
+    ##
+    # Supported ClamdAV daemon commands
+
+    COMMAND = {
+      ping:       'PING',
+      version:    'VERSION',
+      reload:     'RELOAD',
+      shutdown:   'SHUTDOWN',
+      scan:       'SCAN',
+      contscan:   'CONTSCAN',
+      multiscan:  'MULTISCAN',
+      instream:   'zINSTREAM\0',
+      stats:      'zSTATS\0'
+    }.freeze
+
+    include SocketManager
+
+    def initialize(options = {})
+      self.host = options[:host] || Clamd.configuration.host
+      self.port = options[:port] || Clamd.configuration.port
+      self.open_timeout = options[:open_timeout] || Clamd.configuration.open_timeout
+      self.read_timeout = options[:read_timeout] || Clamd.configuration.read_timeout
+      self.chunk_size = options[:chunk_size] || Clamd.configuration.chunk_size
+    end
+
+    ##
+    # Method used to feed PING command to ClamdAV daemon
+    #
+    # Usage:
+    #
+    #    clamd = Clamd::Client.new
+    #    clamd.ping
+    def ping
+      exec(COMMAND[:ping])
+    end
+
+    ##
+    # Method used to feed VERSION command to ClamdAV daemon
+    #
+    # Usage:
+    #
+    #    clamd = Clamd::Client.new
+    #    clamd.version
+
+    def version
+      exec(COMMAND[:version])
+    end
+
+    ##
+    # Method used to feed RELOAD command to ClamdAV daemon
+    #
+    # Usage:
+    #
+    #    clamd = Clamd::Client.new
+    #    clamd.reload
+
+    def reload
+      exec(COMMAND[:reload])
+    end
+
+    ##
+    # Method used to feed SHUTDOWN command to ClamdAV daemon
+    #
+    # Usage:
+    #
+    #    clamd = Clamd::Client.new
+    #    clamd.shutdown
+    #
+    # Return value: +true+ on success +false+ on failure
+
+    def shutdown
+      exec(COMMAND[:shutdown])
+
+      ping =~ /^ERROR: Connection refused.*$/ ? true : false
+    end
+
+    ##
+    # Method used to feed SCAN command to ClamdAV daemon
+    #
+    # Usage:
+    #
+    #    clamd = Clamd::Client.new
+    #    clamd.scan('/home/soundar/documents/doc.pdf') (file)
+    #    clamd.scan('/home/soundar/documents') (directory)
+
+    def scan(path)
+      exec(COMMAND[:scan], path)
+    end
+
+    ##
+    # Method used to feed CONTSCAN command to ClamdAV daemon
+    #
+    # Usage:
+    #
+    #    clamd = Clamd::Client.new
+    #    clamd.contscan('/home/soundar/documents/doc.pdf') (file)
+    #    clamd.contscan('/home/soundar/documents') (directory)
+
+    def contscan(path)
+      exec(COMMAND[:contscan], path)
+    end
+
+    ##
+    # Method used to feed MULTISCAN command to ClamdAV daemon
+    #
+    # Usage:
+    #
+    #    clamd = Clamd::Client.new
+    #    clamd.multiscan('/home/soundar/documents/doc.pdf') # file
+    #    clamd.multiscan('/home/soundar/documents') # directory
+
+    def multiscan(path)
+      exec(COMMAND[:multiscan], path)
+    end
+
+    ##
+    # Method used to feed INSTREAM command to ClamdAV daemon
+    #
+    # Usage:
+    #
+    #    clamd = Clamd::Client.new
+    #    clamd.instream('/home/soundar/documents/doc.pdf') # file
+
+    def instream(path)
+      exec(COMMAND[:instream], path)
+    end
+
+    ##
+    # Method used to feed STATS command to ClamdAV daemon
+    #
+    # Usage:
+    #
+    #    clamd = Clamd::Client.new
+    #    clamd.stats
+
+    def stats
+      exec(COMMAND[:stats])
+    end
+
+    private
+
+      def exec(command, path=nil)
+        begin
+          socket = Timeout::timeout(open_timeout) { open_socket(host, port) }
+          write_socket(socket, command, path)
+          Timeout::timeout(read_timeout) { read_socket(socket, command) }
+        rescue Exception => e
+          "ERROR: #{e.message.gsub('ERROR', '')}"
+        ensure
+          close_socket(socket) if socket
+        end
+      end
+  end
+end

data/lib/clamd/configuration.rb

@@ -1,35 +1,24 @@
 module Clamd
   class Configuration
     attr_accessor :host, :port, :open_timeout, :read_timeout, :chunk_size
-    DEFAULT_CONFIGURATION = { :open_timeout => 5, :read_timeout => 30, :chunk_size => 10240 } 
 
-    def initialize
-      @open_timeout = DEFAULT_CONFIGURATION[:open_timeout] 
-      @read_timeout = DEFAULT_CONFIGURATION[:read_timeout]
-      @chunk_size = DEFAULT_CONFIGURATION[:chunk_size]
-    end
-  end
-
-  def self.configure
-    @configuration ||= Configuration.new
-    yield(@configuration) if block_given?
-    missing = []
-    missing << "host" unless @configuration.host
-    missing << "port" unless @configuration.port
-    raise ConfigurationError,
-      "Missing configuration: #{missing.join(",")}" unless missing.empty?
-    @configuration
-  end
+    ##
+    # Default configuration for Clamd
 
-  def self.configuration
-    return unless @configuration
-    @configuration
-  end
+    DEFAULTS = {
+      host: 'localhost',
+      port: 9321,
+      open_timeout: 5,
+      read_timeout: 30,
+      chunk_size: 10240
+    }
 
-  def self.configured?
-    return true if configuration
-    false
+    def initialize
+      self.host = DEFAULTS[:host]
+      self.port = DEFAULTS[:port]
+      self.open_timeout = DEFAULTS[:open_timeout]
+      self.read_timeout = DEFAULTS[:read_timeout]
+      self.chunk_size = DEFAULTS[:chunk_size]
+    end
   end
-  
-  class ConfigurationError < StandardError;end
 end

data/lib/clamd/socket_manager.rb

@@ -0,0 +1,87 @@
+require 'socket'
+
+module Clamd
+  module SocketManager
+    ##
+    # Opens socket for the given +host+ and +port+
+
+    def open_socket(host, port)
+      TCPSocket.open(host, port)
+    end
+
+    ##
+    # Closes the given socket
+
+    def close_socket(socket)
+      socket.close
+    end
+
+    ##
+    # Reads the response for the given command from the socket
+
+    def read_socket(socket, command)
+      socket.recv(clamd_response_size(command)).gsub(/(\u0000)|(\n)/, "").strip
+    end
+
+    ##
+    # Writes the command to the given sicket
+
+    def write_socket(socket, command, path)
+      if path && command != 'zINSTREAM\0'
+        socket.write("#{command} #{path}")
+      else
+        socket.write(command)
+      end
+      stream_to_clamd(socket, path) if command == 'zINSTREAM\0'
+    end
+
+    ##
+    # Determines the number of bytes to be read for the command
+
+    def clamd_response_size(command)
+      case command
+      when 'PING'
+        4
+      when 'RELOAD'
+        9
+      when 'SHUTDOWN'
+        1
+      else
+        1024
+      end
+    end
+
+    ##
+    # Streams file content to the ClamAV daemon
+
+    def stream_to_clamd(socket, path)
+      begin
+        file = File.open(path, "rb")
+        bytes = file.read(chunk_size)
+
+        while bytes
+          write_chunk(socket, bytes)
+          bytes = file.read(chunk_size)
+        end
+        stop_streaming(socket)
+      ensure
+        file.close if file
+      end
+    end
+
+    ##
+    # Writes the size of chunk(bytes), chunk(bytes) to the socket
+
+    def write_chunk(socket, chunk)
+      socket.write([chunk.size].pack("N"))
+      socket.write(chunk)
+    end
+
+    ##
+    # Stops streaming to ClamAV daemon
+
+    def stop_streaming(socket)
+      socket.write([0].pack("N"))
+    end
+  end
+end

data/lib/clamd/version.rb

@@ -1,3 +1,3 @@
 module Clamd
-  VERSION = "0.0.1"
+  VERSION = "1.0.0"
 end

data/spec/fixtures/virus

@@ -0,0 +1 @@
+X5O!P%@AP[4\PZX54(P^)7CC)7}$EICAR-STANDARD-ANTIVIRUS-TEST-FILE!$H+H*

data/spec/lib/clamd/client_spec.rb

@@ -0,0 +1,67 @@
+require 'spec_helper'
+
+describe Clamd::Client do
+  let(:client) {described_class.new}
+  let(:file_path) {File.expand_path(File.join(File.dirname(__FILE__), '..', '..', 'fixtures', 'clamdoc.pdf'))}
+  let(:directory_path) {File.expand_path(File.join(File.dirname(__FILE__), '..', '..', 'fixtures', 'documents'))}
+  let(:file_with_virus_path) {File.expand_path(File.join(File.dirname(__FILE__), '..', '..', 'fixtures', 'virus'))}
+
+  shared_examples 'virus scanner' do |mode|
+    it 'scans the given file' do
+      expect(client.send(mode, file_path)).to match(/^.*: OK$/)
+    end
+
+    it 'scans the given directory' do
+      expect(client.send(mode, directory_path)).to match(/^.*: OK$/)
+    end
+
+    it "reports virus if found" do
+      expect(client.send(mode, file_with_virus_path)).to match(/^.*: (.+?) FOUND$/)
+    end
+  end
+
+  describe '#ping' do
+    it 'gets PONG if ClamAV daemon alive' do
+      expect(client.ping).to eq('PONG')
+    end
+  end
+
+  describe '#version' do
+    it 'gets version of the ClamAV' do
+      expect(client.version).to match(/^ClamAV \d+.\d+.\d+/)
+    end
+  end
+
+  describe '#reload' do
+    it 'reloads ClamAV virus signature database' do
+      expect(client.reload).to eq('RELOADING')
+    end
+  end
+
+  describe '#scan' do
+    include_examples 'virus scanner', 'scan'
+  end
+
+  describe '#multiscan' do
+    include_examples 'virus scanner', 'multiscan'
+  end
+
+  describe '#contscan' do
+    include_examples 'virus scanner', 'contscan'
+  end
+
+  it 'supports to connect multiple ClamAV daemon with different configuration' do
+    clamd1 = described_class.new(host: 'localhost')
+    clamd2 = described_class.new(host: '127.0.0.1')
+
+    expect(clamd1.ping).to eq('PONG')
+    expect(clamd2.ping).to eq('PONG')
+  end
+
+  it 'reads global configuration if not specified for current client' do
+    clamd = described_class.new
+
+    expect(clamd.host).to eq('localhost')
+    expect(clamd.port).to eq(9321)
+  end
+end

data/spec/spec_helper.rb

@@ -0,0 +1,15 @@
+require 'rubygems'
+require 'bundler/setup'
+require 'clamd'
+
+RSpec.configure do |config|
+  config.treat_symbols_as_metadata_keys_with_true_values = true
+  config.run_all_when_everything_filtered = true
+  config.filter_run :focus
+
+  # Run specs in random order to surface order dependencies. If you find an
+  # order dependency and want to debug it, you can fix the order by providing
+  # the seed, which is printed after each run.
+  #     --seed 1234
+  config.order = 'random'
+end

metadata

@@ -1,15 +1,15 @@
 --- !ruby/object:Gem::Specification
 name: clamd
 version: !ruby/object:Gem::Version
-  version: 0.0.1
+  version: 1.0.0
   prerelease: 
 platform: ruby
 authors:
-- soundarapandian rathinasamy
+- Soundarapandian Rathinasamy
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-10-16 00:00:00.000000000 Z
+date: 2013-12-19 00:00:00.000000000 Z
 dependencies: []
 description: Ruby gem to interact with ClamAV daemon(Clamd)
 email:
@@ -19,19 +19,25 @@ extensions: []
 extra_rdoc_files: []
 files:
 - .gitignore
+- .rspec
 - Gemfile
-- LICENSE.txt
 - README.md
-- Rakefile
+- bin/clamdc
 - clamd.gemspec
 - lib/clamd.rb
-- lib/clamd/command.rb
+- lib/clamd/client.rb
 - lib/clamd/configuration.rb
-- lib/clamd/instream_helper.rb
-- lib/clamd/socket_utility.rb
+- lib/clamd/socket_manager.rb
 - lib/clamd/version.rb
+- spec/fixtures/clamdoc.pdf
+- spec/fixtures/documents/clamdoc.pdf
+- spec/fixtures/documents/clamdoc1.pdf
+- spec/fixtures/virus
+- spec/lib/clamd/client_spec.rb
+- spec/spec_helper.rb
 homepage: https://github.com/soundarapandian/clamd
-licenses: []
+licenses:
+- MIT
 post_install_message: 
 rdoc_options: []
 require_paths:
@@ -50,9 +56,15 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 1.8.24
+rubygems_version: 1.8.25
 signing_key: 
 specification_version: 3
-summary: Clamd gem enables you to feed the simple VERSION command to  complex INSTREAM
+summary: Clamd gem enables you to feed the simple VERSION command to complex INSTREAM
   command to ClamAV antivirus daemon(Clamd)
-test_files: []
+test_files:
+- spec/fixtures/clamdoc.pdf
+- spec/fixtures/documents/clamdoc.pdf
+- spec/fixtures/documents/clamdoc1.pdf
+- spec/fixtures/virus
+- spec/lib/clamd/client_spec.rb
+- spec/spec_helper.rb

data/LICENSE.txt

@@ -1,22 +0,0 @@
-Copyright (c) 2012 soundarapandian rathinasamy
-
-MIT License
-
-Permission is hereby granted, free of charge, to any person obtaining
-a copy of this software and associated documentation files (the
-"Software"), to deal in the Software without restriction, including
-without limitation the rights to use, copy, modify, merge, publish,
-distribute, sublicense, and/or sell copies of the Software, and to
-permit persons to whom the Software is furnished to do so, subject to
-the following conditions:
-
-The above copyright notice and this permission notice shall be
-included in all copies or substantial portions of the Software.
-
-THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
-EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
-MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
-NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE
-LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION
-OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
-WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.

data/Rakefile

@@ -1 +0,0 @@
-require "bundler/gem_tasks"

data/lib/clamd/command.rb

@@ -1,100 +0,0 @@
-require 'timeout'
-require 'clamd/socket_utility'
-require 'clamd/instream_helper'
-
-module Clamd
-  module Command
-    COMMAND = {
-      :ping => "PING",
-      :version => "VERSION",
-      :reload => "RELOAD",
-      :shutdown => "SHUTDOWN",
-      :scan => "SCAN",
-      :contscan => "CONTSCAN",
-      :multiscan => "MULTISCAN",
-      :instream => "zINSTREAM\0",
-      :stats => "zSTATS\0" }.freeze
-
-    include SocketUtility
-    include InstreamHelper
-
-    def exec(command, path=nil)
-      begin
-        return "ERROR: Please configure Clamd first" unless Clamd.configured?
-        socket = Timeout::timeout(Clamd.configuration.open_timeout) { open_socket }
-        write_socket(socket, command, path)
-        Timeout::timeout(Clamd.configuration.read_timeout) { read_socket(socket, command) }
-      rescue Errno::ECONNREFUSED
-        "ERROR: Failed to connect to Clamd daemon"
-      rescue Errno::ECONNRESET, Errno::ECONNABORTED, Errno::EPIPE
-        "ERROR: Connection with Clamd daemon closed unexpectedly"
-      rescue Timeout::Error
-        "ERROR: Timeout error occurred"
-      ensure
-        close_socket(socket) if socket
-      end
-    end
-    
-    def read_socket(socket, command)
-      socket.recv(clamd_response_size(command)).gsub(/(\u0000)|(\n)/, "")
-    end
-
-    def write_socket(socket, command, path)
-      if path && command != COMMAND[:instream]
-        socket.write("#{command} #{path}")
-      else
-        socket.write(command)
-      end
-      stream_to_clamd(socket, path) if command == COMMAND[:instream]
-    end
-
-    def clamd_response_size(command)
-      case command
-      when COMMAND[:ping]
-        4
-      when COMMAND[:reload]
-        9
-      when COMMAND[:shutdown]
-        1
-      else
-        1024
-      end
-    end
-
-    def ping
-      exec(COMMAND[:ping])
-    end
-
-    def version
-      exec(COMMAND[:version])
-    end
-
-    def reload
-      exec(COMMAND[:reload])
-    end
-
-    def shutdown
-      exec(COMMAND[:shutdown])
-    end
-
-    def scan(path)
-      exec(COMMAND[:scan], path)
-    end
-
-    def contscan(path)
-      exec(COMMAND[:contscan], path)
-    end
-
-    def multiscan(path)
-      exec(COMMAND[:multiscan], path)
-    end
-
-    def instream(path)
-      exec(COMMAND[:instream], path)
-    end
-
-    def stats
-      exec(COMMAND[:stats])
-    end
-  end
-end

data/lib/clamd/instream_helper.rb

@@ -1,26 +0,0 @@
-module Clamd
-  module InstreamHelper
-    def stream_to_clamd(socket, path)
-      begin
-        file = File.open(path, "rb")
-        read = file.read(Clamd.configuration.chunk_size)
-        while read
-          write_chunk(socket, read)
-          read = file.read(10240)
-        end
-        stop_streaming(socket)
-      ensure
-        file.close if file
-      end
-    end
-
-    def write_chunk(socket, chunk)
-      socket.write([chunk.size].pack("N"))
-      socket.write(chunk)
-    end
-
-    def stop_streaming(socket)
-      socket.write([0].pack("N"))
-    end
-  end
-end

data/lib/clamd/socket_utility.rb

@@ -1,13 +0,0 @@
-require 'socket'
-
-module Clamd
-  module SocketUtility
-    def open_socket
-      TCPSocket.open(Clamd.configuration.host, Clamd.configuration.port)
-    end
-
-    def close_socket(socket)
-      socket.close
-    end
-  end
-end