clamrb 0.0.2 → 0.0.4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: ee48d033a2f6004ad93b96da388662eb239d01728751b39fe04350d2a1e564ac
-  data.tar.gz: cb0bb2b613050912a5742dcf20c3029a181844e69bbb1303828de32865365984
+  metadata.gz: edae5b1daaf257d6492cf0618dd3ae8f0720de57167e9eaa4c205ba6d314183e
+  data.tar.gz: f04b48f11fdfdaa4ef44d59360a86dff5d7bb1e616e7c7df3d74c18211eaa7de
 SHA512:
-  metadata.gz: 0bd8f61cd8cca53b0c2fd696db4fb6976d620d8a4a38d72b0d66c282b7d9a2a1ae384313b580da93ac8f54256c6ea7495ddbb7ae329a43458aad8e329ce9f422
-  data.tar.gz: f65c82ba6877d67747c90dcf0fa903fcd3f5fdb39405f25e8d06d64de17ffeab5f8ae37a10c351e44c16276c6940998228035084c6c870d31e37e635a44e6c05
+  metadata.gz: 93262571c569c10ed803dca31178db1868529396e83ed606a7b577d355609846692d6090a595c7fd48bd32cc5ddd69af0a061707af3aae586fcf3ff1d0b72f5d
+  data.tar.gz: aa4fad33101cabc1eff5e036d9e75dfa80c5e9895d64bc5151ed3bf9af02cfde07ac1956d638f6256147cabdb72d0a1cc1056d23508321fa51056f1842484daf

data/.gitignore

@@ -3,3 +3,4 @@
 *.gem
 Makefile
 *.log
+tmp

data/.travis.yml

@@ -0,0 +1,13 @@
+language: ruby
+rvm:
+  - 2.0
+  - 2.1
+  - 2.2
+  - 2.3
+  - 2.4
+  - 2.5
+  - 2.6
+before_install:
+  - sudo apt-get install gcc make pkg-config clamav libclamav-dev clamav-freshclam
+  - sudo freshclam
+

data/Gemfile

@@ -1,6 +1,3 @@
 source "https://rubygems.org"
-
-git_source(:github) {|repo_name| "https://github.com/#{repo_name}" }
-
 gemspec
 

data/Gemfile.lock

@@ -0,0 +1,28 @@
+PATH
+  remote: .
+  specs:
+    clamrb (0.0.3)
+      rake-compiler (~> 1.0)
+
+GEM
+  remote: https://rubygems.org/
+  specs:
+    power_assert (2.0.4)
+    rake (13.2.1)
+    rake-compiler (1.2.8)
+      rake
+    test-unit (3.6.2)
+      power_assert
+
+PLATFORMS
+  ruby
+  x86_64-linux-gnu
+
+DEPENDENCIES
+  bundler (~> 2.5)
+  clamrb!
+  rake (>= 12.3.3)
+  test-unit (~> 3.2)
+
+BUNDLED WITH
+   2.5.21

data/LICENSE

@@ -0,0 +1,7 @@
+Copyright Aaron Bedra
+
+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/README.md

@@ -1,4 +1,5 @@
-# clamrb
+# clamrb [![Build Status](https://secure.travis-ci.org/abedra/clamrb.png)](http://travis-ci.org/abedra/clamrb?branch=master) ![Gem](https://img.shields.io/gem/dt/clamrb.svg) [![Gem Version](http://img.shields.io/gem/v/clamrb.svg)](https://rubygems.org/gems/clamrb)
+
 
 This project is a Ruby gem that interfaces with the Clam AV engine using libclamav.
 

data/Rakefile

@@ -1,28 +1,20 @@
 require 'bundler/gem_tasks'
+require 'rake/extensiontask'
 require 'rake/testtask'
 require 'rake/clean'
 require 'rbconfig'
 require 'fileutils'
 
-EXT = RbConfig::CONFIG['DLEXT']
-
-file "lib/clamrb/clamrb.#{EXT}" => Dir.glob('ext/clamrb/*.c') do
-  Dir.chdir('ext/clamrb') do
-    ruby "extconf.rb"
-    sh "make"
-  end
-  FileUtils.mkdir_p('lib/clamrb')
-  cp "ext/clamrb/clamrb.#{EXT}", "lib/clamrb/clamrb.#{EXT}"
+Rake::ExtensionTask.new("clamrb") do |extension|
+  extension.lib_dir = 'lib/clamrb'
 end
 
-task :test => "lib/clamrb/clamrb.#{EXT}"
+task :build => [:clean, :compile]
 
-CLEAN.include("ext/**/*{.o,.log,.#{EXT}")
-CLEAN.include('ext/**/Makefile')
-CLEAN.include("lib/**/*.#{EXT}")
-
-Rake::TestTask.new do |t|
-  t.libs << 'test'
+Rake::TestTask.new(:test => :build) do |t|
+  t.test_files = Dir['**/*_test.rb'].reject do |path|
+    path.include?('vendor')
+  end
 end
 
 task :default => :test

data/clamrb.gemspec

@@ -5,7 +5,7 @@ require "clamrb/version"
 Gem::Specification.new do |s|
   s.name          = 'clamrb'
   s.version       = Clamrb::VERSION
-  s.date          = '2018-11-23'
+  s.date          = '2024-10-04'
   s.licenses      = ['MIT']
   s.summary       = 'Ruby interface to Clam AV'
   s.description   = 'Native Ruby extension for running clamav scans'
@@ -14,9 +14,10 @@ Gem::Specification.new do |s|
   s.extensions    = ['ext/clamrb/extconf.rb']
   s.homepage      = 'https://github.com/abedra/clamrb'
   s.require_paths = ["lib"]
-  s.files         = Dir.chdir(File.expand_path('..', __FILE__)) do
-    `git ls-files -z`.split("\x0").reject { |f| f.match(%r{^(test|spec|features)/}) }
-  end
-  s.add_development_dependency "bundler", "~> 1.16"
-  s.add_development_dependency "rake", "~> 10.0"
+  s.files         = %x{git ls-files}.split("\n").reject {|file| file =~ /^(test)/ }
+  s.test_files    = %x{git ls-files}.split("\n").select {|file| file =~ /^(test)/ }
+  s.add_dependency "rake-compiler", "~> 1.0"
+  s.add_development_dependency "bundler", "~> 2.5"
+  s.add_development_dependency "rake", "~> 12.3.3"
+  s.add_development_dependency "test-unit", "~> 3.2"
 end

data/ext/clamrb/clamrb.c

@@ -5,18 +5,14 @@ static void clamav_free(void *engine) {
   cl_engine_free(engine);
 }
 
-VALUE constructor(VALUE self, VALUE filename)
+VALUE constructor(VALUE self)
 {
-  VALUE t_data;
-  const char *dbDir;
-  unsigned int signature;
-
   if (cl_init(CL_INIT_DEFAULT) == CL_SUCCESS) {
     struct cl_engine *engine = cl_engine_new();
-    t_data = Data_Wrap_Struct(self, 0, clamav_free, engine);
-    dbDir = cl_retdbdir();
+    VALUE t_data = Data_Wrap_Struct(self, 0, clamav_free, engine);
+    const char *dbDir = cl_retdbdir();
     printf("Initializing clamav engine from database located at %s\n", dbDir);
-    signature = 0;
+    unsigned int signature = 0;
     if (cl_load(dbDir, engine, &signature, CL_DB_STDOPT) == CL_SUCCESS
         && cl_engine_compile(engine) == CL_SUCCESS) {
       return t_data;
@@ -33,19 +29,18 @@ VALUE constructor(VALUE self, VALUE filename)
 VALUE scan(VALUE self, VALUE filename)
 {
   struct cl_engine *engine;
-  const char *name;
-  long unsigned int scanned;
-  int ret;
-  VALUE clamrb;
-  VALUE clamrb_result;
 
   Data_Get_Struct(self, struct cl_engine, engine);
-  name = NULL;
-  scanned = 0;
-  ret = cl_scanfile(StringValueCStr(filename), &name, &scanned, engine, CL_SCAN_STDOPT);
+  const char *name = NULL;
+  long unsigned int scanned = 0;
+  struct cl_scan_options scanoptions;
+  memset(&scanoptions, 0, sizeof(struct cl_scan_options));
+  scanoptions.parse |= -0;
+  scanoptions.general |= CL_SCAN_GENERAL_ALLMATCHES;
+  int ret = cl_scanfile(StringValueCStr(filename), &name, &scanned, engine, &scanoptions);
 
-  clamrb = rb_const_get(rb_cObject, rb_intern("Clamrb"));
-  clamrb_result = rb_const_get(clamrb, rb_intern("Result"));
+  VALUE clamrb = rb_const_get(rb_cObject, rb_intern("Clamrb"));
+  VALUE clamrb_result = rb_const_get(clamrb, rb_intern("Result"));
 
   switch (ret) {
   case CL_VIRUS:
@@ -55,10 +50,10 @@ VALUE scan(VALUE self, VALUE filename)
 
   case CL_CLEAN:
     return rb_funcall(clamrb_result, rb_intern("new"), 1,
-		      ID2SYM(rb_intern("clean")));
+                      ID2SYM(rb_intern("clean")));
   default:
     return rb_funcall(clamrb_result, rb_intern("new"), 1,
-		      ID2SYM(rb_intern("unknown")));
+                      ID2SYM(rb_intern("unknown")));
   }
 }
 
@@ -67,4 +62,5 @@ void Init_clamrb(void)
   VALUE klass = rb_define_class("Clamrb", rb_cObject);
   rb_define_singleton_method(klass, "new", constructor, 0);
   rb_define_method(klass, "scan", scan, 1);
+  rb_undef_alloc_func(klass);
 }

data/ext/clamrb/extconf.rb

@@ -1,3 +1,4 @@
 require 'mkmf'
+$CFLAGS = "--std=c99 -Wall"
 have_library("clamav")
 create_makefile('clamrb/clamrb')

data/lib/clamrb/version.rb

@@ -1,3 +1,3 @@
-module Clamrb
-  VERSION = "0.0.2"
+class Clamrb
+  VERSION = "0.0.4"
 end

data/lib/clamrb.rb

@@ -1,2 +1,3 @@
 require 'clamrb/clamrb'
 require 'clamrb/result'
+require 'clamrb/version'

data/test/clamrb_test.rb

@@ -0,0 +1,27 @@
+require 'test/unit'
+require 'clamrb'
+
+class ClamrbTest < Test::Unit::TestCase
+  @@clamrb = Clamrb.new
+
+  def test_clean_file
+    result = @@clamrb.scan "test/files/foo.txt"
+    assert_equal(:clean, result.status)
+    assert_equal(nil, result.identifier)
+    assert_true(result.safe?)
+  end
+
+  def test_unknown_file
+    result = @@clamrb.scan "test/files/missing.txt"
+    assert_equal(:unknown, result.status)
+    assert_equal(nil, result.identifier)
+    assert_true(result.error?)
+  end
+
+  def test_infected_file
+    result = @@clamrb.scan "test/files/eicar.txt"
+    assert_equal(:infected, result.status)
+    assert_equal("Eicar-Signature", result.identifier)
+    assert_true(result.virus?)
+  end
+end

data/test/files/eicar.txt

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

data/test/files/foo.txt

@@ -0,0 +1 @@
+Clean file

metadata

@@ -1,43 +1,71 @@
 --- !ruby/object:Gem::Specification
 name: clamrb
 version: !ruby/object:Gem::Version
-  version: 0.0.2
+  version: 0.0.4
 platform: ruby
 authors:
 - Aaron Bedra
-autorequire: 
+autorequire:
 bindir: bin
 cert_chain: []
-date: 2018-11-23 00:00:00.000000000 Z
+date: 2024-10-04 00:00:00.000000000 Z
 dependencies:
+- !ruby/object:Gem::Dependency
+  name: rake-compiler
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '1.0'
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '1.0'
 - !ruby/object:Gem::Dependency
   name: bundler
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '1.16'
+        version: '2.5'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '1.16'
+        version: '2.5'
 - !ruby/object:Gem::Dependency
   name: rake
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '10.0'
+        version: 12.3.3
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: 12.3.3
+- !ruby/object:Gem::Dependency
+  name: test-unit
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '3.2'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '10.0'
+        version: '3.2'
 description: Native Ruby extension for running clamav scans
 email: aaron@aaronbedra.com
 executables: []
@@ -46,7 +74,10 @@ extensions:
 extra_rdoc_files: []
 files:
 - ".gitignore"
+- ".travis.yml"
 - Gemfile
+- Gemfile.lock
+- LICENSE
 - README.md
 - Rakefile
 - clamrb.gemspec
@@ -58,11 +89,14 @@ files:
 - lib/clamrb.rb
 - lib/clamrb/result.rb
 - lib/clamrb/version.rb
+- test/clamrb_test.rb
+- test/files/eicar.txt
+- test/files/foo.txt
 homepage: https://github.com/abedra/clamrb
 licenses:
 - MIT
 metadata: {}
-post_install_message: 
+post_install_message:
 rdoc_options: []
 require_paths:
 - lib
@@ -77,9 +111,11 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubyforge_project: 
-rubygems_version: 2.7.8
-signing_key: 
+rubygems_version: 3.4.20
+signing_key:
 specification_version: 4
 summary: Ruby interface to Clam AV
-test_files: []
+test_files:
+- test/clamrb_test.rb
+- test/files/eicar.txt
+- test/files/foo.txt