virus_scan_service 0.2.0 → 0.2.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: daf6e55eaf62680d1be8e694764b1605bbaac01c
-  data.tar.gz: 460699cfe3f4ce7c704713e2040616da23bd9662
+  metadata.gz: 1c57649e24aa21b5e7cbf130bafe516fb73a8b53
+  data.tar.gz: 84d882db0f9cbbe6ac838e3d54db99910565ad62
 SHA512:
-  metadata.gz: a1c3f1286168df5211767b88e439c2fdc5cfd345a22ae43deb48af8cc50eb760fe07082516e3dab69ccfd74bce75e50d41db48716f581a8841b47d493852d97e
-  data.tar.gz: 0d21601261ad671eae88513d8e5fd88d7945daba6faf3793c18bf7733650a92d72d60776c5db49070995b51eaa44ed1258cc2eec6005b3bcf8363ab23ab04b53
+  metadata.gz: 8b8bae196bbe4b932d29be63416f34ddebf91228dc571a8fd82712edd709ab89a070ca4914a911245f59a6c834c627135ebae8847f974b5129429d80f628fb7b
+  data.tar.gz: e93715bc824c704f765dd9ee4da8a804adb29f3cc037710db4cf96950b7304b4742b341a5b2d848e4bb698e8c9b5dfcfb661dc9f5244231e608be821619dcb0e

data/lib/virus_scan_service/kaspersky_runner.rb

@@ -1,5 +1,6 @@
 require_relative 'kaspersky_runner/linux_executor'
 require_relative 'kaspersky_runner/windows_executor'
+require 'fileutils'
 
 module VirusScanService
   class KasperskyRunner
@@ -23,12 +24,12 @@ module VirusScanService
       begin
         pull_file
         begin
-          ensure_no_scan_log_exist
+          empty_scan_log
           scan_file
           set_result
         ensure
           remove_file
-          archive_scan_log if File.exist?(scan_log_path)
+          archive_scan_log if File.size?(scan_log_path) # Exists & non-empty
         end
       rescue URI::InvalidURIError, RequestNotSuccessful
         set_result_download_error
@@ -45,7 +46,7 @@ module VirusScanService
         .new('/tmp')
         .join('scans')
         .tap do |path|
-          FileUtils.mkdir_p(path)
+          ::FileUtils.mkdir_p(path)
         end
     end
 
@@ -54,14 +55,14 @@ module VirusScanService
         .new('/tmp')
         .join('scans')
         .tap do |path|
-          FileUtils.mkdir_p(path)
+          ::FileUtils.mkdir_p(path)
         end
     end
 
     private
     def archive_scan_log
       archive_name = "#{File.basename(scan_log_path.to_s, '.*')}_#{timestamp_builder.call}.log"
-      FileUtils.mv(scan_log_path, archive_folder.join(archive_name))
+      ::FileUtils.mv(scan_log_path, archive_folder.join(archive_name))
     end
 
     def remove_file
@@ -76,15 +77,15 @@ module VirusScanService
         #
         #   if File.exist?(scan_folder.join(filename))
         #
-        # wont help to determin if file was removed by kaspersky
+        # won't help to determine if file was removed by kaspersky
         #
         # That's why this captures if exception matches Permission deny @ unlink_internal
         raise e unless e.to_s.match('unlink_internal')
       end
     end
 
-    def ensure_no_scan_log_exist
-      FileUtils.rm scan_log_path if File.exist?(scan_log_path)
+    def empty_scan_log
+      File.open(scan_log_path, 'w') {}
     end
 
     def set_result

data/lib/virus_scan_service/version.rb

@@ -1,3 +1,3 @@
 module VirusScanService
-  VERSION = "0.2.0"
+  VERSION = "0.2.1"
 end

data/spec/kaspersky_runner_spec.rb

@@ -69,7 +69,7 @@ RSpec.describe VirusScanService::KasperskyRunner do
       end
 
       before do
-        expect(runner).to receive(:ensure_no_scan_log_exist).and_call_original
+        expect(runner).to receive(:empty_scan_log).and_call_original
       end
 
       context '' do
@@ -155,11 +155,11 @@ RSpec.describe VirusScanService::KasperskyRunner do
     end
   end
 
-  describe 'private #ensure_no_scan_log_exist' do
+  describe 'private #empty_scan_log' do
     it 'should existing scan log before scan begin' do
       FileUtils.cp(scan_log, 'spec/tmp/kaspersky_test.log') # pre-existing scan
-      runner.send(:ensure_no_scan_log_exist)
-      expect(File.exist?('spec/tmp/kaspersky_test.log')).to be false
+      runner.send(:empty_scan_log)
+      expect(File.size('spec/tmp/kaspersky_test.log')).to eq 0
     end
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: virus_scan_service
 version: !ruby/object:Gem::Version
-  version: 0.2.0
+  version: 0.2.1
 platform: ruby
 authors:
 - Tomas Valent
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-07-25 00:00:00.000000000 Z
+date: 2016-08-05 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler