clamby 1.6.10 → 1.6.11

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: f3e1a92dd3ace58588a950da63a979a45dd4634006417a4bdfd8b37e5cda339a
-  data.tar.gz: 1988703846a4fe4b53049a897b036bf8e1a279faa0c6eb3f52d7b931417f213a
+  metadata.gz: 9ca9e1bf2cd0a67bd5f3c3cbc6aea39a701367e226e492745321c8d3a8effa16
+  data.tar.gz: 8a30ce332afc500e9cdf7df61f6c47ec70c6dc623b979f8eea278f4c705d1200
 SHA512:
-  metadata.gz: 2b82f110ca83c57a33f9ba542d77623ab0eb66fa658f2df2f6346d72ed80d456352524b385b4ccabf2c51f5f7f8e2c4a66ddea213b8454148efc240274e375f7
-  data.tar.gz: c7288c6c4e8f32756a1334d2a94d7543c3172fe1f001715f88bba7fbc86b99e350b1290bbfbd7ea68ba464cb67e9e2ec25cc361c2c1e91a3450310000d73060b
+  metadata.gz: 92c449f7160ccdaa1148cfb5b48b823c9066714f314dd2fd56fa8e63f5b814d029fd3b9e5c255dff458d79420f0845284f16aeefce6ec7435af8fce9cd9f8eb1
+  data.tar.gz: 7ff6dd7d2dacf22db992af2eec9fc34238d1a2100572787fe5fde63dfb067e7e0523452a2cf36709f7d44b8e4c973b58b03bf889e10c94491b6c3abe68a7fa7f

data/.github/workflows/ruby-ci.yml

@@ -7,8 +7,7 @@ jobs:
     runs-on: ubuntu-latest
     strategy:
       matrix:
-        ruby-version: ['2.6.10', '2.7.8']
-        # ruby-version: ['2.6.10', '2.7.8', '3.0.6', '3.1.4', '3.2.2']
+        ruby-version: ['2.6.10', '2.7.8', '3.0.6', '3.1.4', '3.2.2', '3.3.0']
         gemfile: ['Gemfile']
 
     steps:

data/lib/clamby/command.rb

@@ -12,6 +12,11 @@ module Clamby
       return 'clamscan'
     end
 
+    # $CHILD_STATUS maybe nil if the execution itself (not the client process)
+    def self.scan_status
+      $CHILD_STATUS && $CHILD_STATUS.exitstatus
+    end
+
     # Perform a ClamAV scan on the given path.
     def self.scan(path)
       return nil unless file_exists?(path)
@@ -28,9 +33,7 @@ module Clamby
 
       new.run scan_executable, *args
 
-      # $CHILD_STATUS maybe nil if the execution itself (not the client process)
-      # fails
-      case $CHILD_STATUS && $CHILD_STATUS.exitstatus
+      case self.scan_status
       when 0
         return false
       when nil, 2
@@ -38,7 +41,7 @@ module Clamby
         if Clamby.config[:error_clamscan_client_error] && Clamby.config[:daemonize]
           raise Clamby::ClamscanClientError.new("Clamscan client error")
         end
- 
+
         # returns true to maintain legacy behavior
         return true
       else

data/lib/clamby/version.rb

@@ -1,3 +1,3 @@
 module Clamby
-  VERSION = "1.6.10"
+  VERSION = "1.6.11"
 end

data/spec/clamby_spec.rb

@@ -94,7 +94,10 @@ describe Clamby do
     }
 
     context 'when false' do
-      before { Clamby.configure(error_clamscan_client_error: false) }
+      before do
+        Clamby.configure(error_clamscan_client_error: false)
+        allow(Clamby::Command).to receive(:scan_status).and_return(2)
+      end
 
       it 'virus? returns true when the daemonized client exits with status 2' do
         Clamby.configure(daemonize: true)
@@ -107,7 +110,10 @@ describe Clamby do
     end
 
     context 'when true' do
-      before { Clamby.configure(error_clamscan_client_error: true) }
+      before do
+        Clamby.configure(error_clamscan_client_error: true)
+        allow(Clamby::Command).to receive(:scan_status).and_return(2)
+      end
 
       it 'virus? raises when the daemonized client exits with status 2' do
         Clamby.configure(daemonize: true)

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: clamby
 version: !ruby/object:Gem::Version
-  version: 1.6.10
+  version: 1.6.11
 platform: ruby
 authors:
 - kobaltz
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2023-09-25 00:00:00.000000000 Z
+date: 2024-03-03 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -101,7 +101,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.4.19
+rubygems_version: 3.5.6
 signing_key:
 specification_version: 4
 summary: Scan file uploads with ClamAV