clamby 1.6.0 → 1.6.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 60db11bed3aec851cb64fe6f5ed12b18dc516f5f4af58942306bd4af347ea5ec
-  data.tar.gz: 1e8aaf3f10c123cc8babc1aced65ebc2434cf18a75dff3c89f1d62cbdb7b3480
+  metadata.gz: cc73965f059691dd46a23b5d0fd7ba7d6e5d1103859bfe68124780c12ca56639
+  data.tar.gz: f666ead4b14e3dc024ed92ca6842928cc4256d424df0ff25299a7c5eb3c5762f
 SHA512:
-  metadata.gz: 68b181d6a6e70063bcdef925521af068510ddc6cb2a1091048de176d220a01de8643ce6ad7b466e35dd8bda023a7b1d68f2636913bdfb89c05b69197b6545d77
-  data.tar.gz: fa6c2040053c6ee41ea2a909041cb5bf9987c047203233b5a1ec8c8463ac4580612dc0227fd69e55a93d13aa8ec6533c84f94a5be1aeebbd67ab5905b1822d2b
+  metadata.gz: dcdb2f76042a1cd6751095e30201d635adf0e847defeaeb4d61b174a52ea6c355e4afa567e4770df388b9a2ee79e8c5ef0826486adc46e9ea21d308b4ebc83c8
+  data.tar.gz: 65beb709c82e4cce7804fe696bbc71d81b6951a2c38cf22ea6c1e2bd42536b55ede204c06a1b78cbba10fe778ef7db0d6b436ec02a80c0e6cafc0b0238bce8f7

data/.travis.yml

@@ -1,6 +1,6 @@
 language: ruby
 before_install:
-  - gem install bundler -v '>= 1.5.3'
+  - gem install bundler -v '1.17.3'
   - gem install rake
   - gem install rspec
 rvm:
@@ -8,6 +8,7 @@ rvm:
   - 2.1.1
   - 2.3.4
   - 2.4.1
+  - 2.5.3
 install: 
  - sudo apt-get install clamav
  - sudo freshclam

data/CHANGELOG.md

@@ -1,3 +1,6 @@
+# v1.6.1
+ - [broder](https://github.com/kobaltz/clamby/commits?author=broder) - Fixed issue with detecting clamdscan version when using custom config file
+
 # v1.6.0
  - When checking version, use the executable configuration.
 

data/lib/clamby/command.rb

@@ -21,7 +21,6 @@ module Clamby
       if Clamby.config[:daemonize]
         args << '--fdpass' if Clamby.config[:fdpass]
         args << '--stream' if Clamby.config[:stream]
-        args << "--config-file=#{Clamby.config[:config_file]}" if Clamby.config[:config_file]
       end
 
       new.run scan_executable, *args
@@ -74,6 +73,7 @@ module Clamby
 
     def default_args
       args = []
+      args << "--config-file=#{Clamby.config[:config_file]}" if Clamby.config[:daemonize] && Clamby.config[:config_file]
       args << '--quiet' if Clamby.config[:output_level] == 'low'
       args << '--verbose' if Clamby.config[:output_level] == 'high'
       args

data/lib/clamby/version.rb

@@ -1,3 +1,3 @@
 module Clamby
-  VERSION = "1.6.0"
+  VERSION = "1.6.1"
 end

data/spec/clamby/command_spec.rb

@@ -34,7 +34,7 @@ describe Clamby::Command do
 
     describe 'passing file descriptor' do
       it 'does not include fdpass in the command by default' do
-        Clamby.configure(fdpass: false)
+        Clamby.configure
         expect(runner).to receive(:run).with('clamscan', good_path, '--no-summary')
         allow(described_class).to receive(:new).and_return(runner)
 
@@ -60,7 +60,7 @@ describe Clamby::Command do
 
     describe 'streaming files to clamd' do
       it 'does not include stream in the command by default' do
-        Clamby.configure(stream: false)
+        Clamby.configure
         expect(runner).to receive(:run).with('clamscan', good_path, '--no-summary')
         allow(described_class).to receive(:new).and_return(runner)
 
@@ -86,32 +86,24 @@ describe Clamby::Command do
 
     describe 'specifying config-file' do
       it 'does not include the parameter in the clamscan command by default' do
-        Clamby.configure(daemonize: false, stream: false, fdpass: false)
-        expect(runner).to receive(:run).with('clamscan', good_path, '--no-summary')
-        allow(described_class).to receive(:new).and_return(runner)
+        Clamby.configure
 
-        described_class.scan(good_path)
+        expect(described_class.new.send(:default_args)).not_to include(a_string_matching(/--config-file/))
       end
       it 'does not include the parameter in the clamdscan command by default' do
-        Clamby.configure(daemonize: true, stream: false, fdpass: false)
-        expect(runner).to receive(:run).with('clamdscan', good_path, '--no-summary')
-        allow(described_class).to receive(:new).and_return(runner)
+        Clamby.configure(daemonize: true)
 
-        described_class.scan(good_path)
+        expect(described_class.new.send(:default_args)).not_to include(a_string_matching(/--config-file/))
       end
       it 'omits the parameter when invoking clamscan if it is set' do
-        Clamby.configure(daemonize: false, stream: false, fdpass: false, config_file: 'clamd.conf')
-        expect(runner).to receive(:run).with('clamscan', good_path, '--no-summary')
-        allow(described_class).to receive(:new).and_return(runner)
+        Clamby.configure(daemonize: false, config_file: 'clamd.conf')
 
-        described_class.scan(good_path)
+        expect(described_class.new.send(:default_args)).not_to include('--config-file=clamd.conf')
       end
       it 'passes the parameter when invoking clamdscan if it is set' do
-        Clamby.configure(daemonize: true, stream: false, fdpass: false, config_file: 'clamd.conf')
-        expect(runner).to receive(:run).with('clamdscan', good_path, '--no-summary', '--config-file=clamd.conf')
-        allow(described_class).to receive(:new).and_return(runner)
+        Clamby.configure(daemonize: true, config_file: 'clamd.conf')
 
-        described_class.scan(good_path)
+        expect(described_class.new.send(:default_args)).to include('--config-file=clamd.conf')
       end
     end
 

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: clamby
 version: !ruby/object:Gem::Version
-  version: 1.6.0
+  version: 1.6.1
 platform: ruby
 authors:
 - kobaltz
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2018-12-03 00:00:00.000000000 Z
+date: 2019-01-10 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -101,8 +101,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubyforge_project: 
-rubygems_version: 2.7.7
+rubygems_version: 3.0.2
 signing_key: 
 specification_version: 4
 summary: Scan file uploads with ClamAV