clamby 1.1.0 → 1.2.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: bc2d255f725e2d898512f707dfe9c6c3d064771d
-  data.tar.gz: 7d64e8cbb7ecf414827211f863e07b43eb2a65ac
+  metadata.gz: 3e9d5666b0aa8c0173ee6cc55ce51ffb7a651080
+  data.tar.gz: 4fe92a7a06170042068c2f632b1736877c84b261
 SHA512:
-  metadata.gz: 83da29cd8e1bf8361ee4e37796dbcd687ab4eaf8cb12cf16eca3c5a77201de41d228ddc0985737e94947e7a02c7e463cae91d307028c99be518690366abae1a0
-  data.tar.gz: 970f9ac1d977842b31a2d819a85e34aef0f7b7942a666694753fc33353e590039ee40abc61a2f834b5d4add02e2fa71f9048e9b4a1a794d32c8f4c577c787daf
+  metadata.gz: 969f3a0091ac774b8e1f9f52926e7ff59533c8aa68ba0574290e9640d927433228a5d27c13b672ecb4edb35b0252799c52fb63cc08647b20866a99933b49b48e
+  data.tar.gz: 0f4cae4fcda52a48c438b0a7ac8720df80fd0add365861f6f7f1ca5d7b2c9ef91fdc17dca78edd5291ba7bf6a5c069ab7a5dea3fe3b840d3193553943887309f

data/CHANGELOG.md

@@ -1,6 +1,6 @@
 #v1.10
  - Changed `scan()` to `safe?()`
- - Added virus?()
+ - Added `virus?()`
  - Added/Changed `rspec` to accomodate new/changed functionality
 
 #v1.0.5
@@ -53,4 +53,4 @@ Clamby.configure({
    :error_file_virus => false
 })
 
-```
+```

data/README.md

@@ -4,7 +4,7 @@
 [![Build Status](https://travis-ci.org/kobaltz/clamby.png?branch=master)](https://travis-ci.org/kobaltz/clamby)
 
 
-This gem depends on the `clamscan` and `freshclam` daemons to be installed already.
+This gem depends on the [clamscan](http://www.clamav.net/) and `freshclam` daemons to be installed already.
 
 If you have a file upload on your site and you do not scan the files for viruses then you not only compromise your software, but also the users of the software and their files. This gem's function is to simply scan a given file.
 
@@ -95,7 +95,7 @@ To update the virus database, open a terminal and enter the following command:
 
 `sudo freshclam`
 
-To automate this update you can set up a cron job. I'll show how to update the virus database every day at 8:57 PM. 
+To automate this update you can set up a cron job. I'll show how to update the virus database every day at 8:57 PM.
 
 You need to modify the crontab for the root user.
 
@@ -116,3 +116,5 @@ Permission is hereby granted, free of charge, to any person obtaining a copy of
 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.
+
+ClamAV is licensed under [GNU GPL](http://www.gnu.org/licenses/gpl.html). The ClamAV software is NOT distributed nor modified with this gem.

data/lib/clamby.rb

@@ -4,6 +4,7 @@ module Clamby
 
   @config = {
     :check => true,
+    :daemonize => false,
     :error_clamscan_missing => true,
     :error_file_missing => true,
     :error_file_virus => false
@@ -16,77 +17,41 @@ module Clamby
   end
 
   def self.safe?(path)
-    if self.scanner_exists?
-      if file_exists?(path)
-        scanner = system("clamscan #{path} --no-summary")
-        if scanner
-          return true
-        elsif not scanner
-          if @config[:error_file_virus]
-            raise Exceptions::VirusDetected.new("VIRUS DETECTED on #{Time.now}: #{path}")
-          else
-            puts "VIRUS DETECTED on #{Time.now}: #{path}"
-            return false
-          end
-        end
-      else
-        return nil
-      end
-    else
-      return nil
-    end
+    value =  virus?(path)
+    return nil if value.nil?
+    ! value
   end
 
   def self.virus?(path)
-    if self.scanner_exists?
-      if file_exists?(path)
-        scanner = system("clamscan #{path} --no-summary")
-        if scanner
-          return false
-        elsif not scanner
-          if @config[:error_file_virus]
-            raise Exceptions::VirusDetected.new("VIRUS DETECTED on #{Time.now}: #{path}")
-          else
-            puts "VIRUS DETECTED on #{Time.now}: #{path}"
-            return true
-          end
-        end
-      else
-        return nil
-      end
-    else
-      return nil
-    end
+    return nil unless scanner_exists?
+    return nil unless file_exists?(path)
+    scanner = system("#{clamd_executable_name} #{path} --no-summary")
+
+    return false if scanner
+    return true unless @config[:error_file_virus]
+
+    raise Exceptions::VirusDetected.new("VIRUS DETECTED on #{Time.now}: #{path}")
   end
 
   def self.scanner_exists?
-    if @config[:check]
-      scanner = system('clamscan -V')
-      if not scanner
-        if @config[:error_clamscan_missing]
-          raise Exceptions::ClamscanMissing.new("Clamscan application not found. Check your installation and path.")
-        else
-          puts "CLAMSCAN NOT FOUND"
-          return false
-        end
-      else
-        return true
-      end
-    else
-      return true
-    end
+    return true unless @config[:check]
+    scanner = system('#{clamd_executable_name} -V')
+
+    return true if scanner
+    return false unless @config[:error_clamdscan_missing]
+
+    raise Exceptions::clamdscanMissing.new("#{clamd_executable_name} application not found. Check your installation and path.")
   end
 
   def self.file_exists?(path)
-    if File.file?(path)
-      return true
+    return false if path.nil?
+    return true if File.file?(path)
+
+    if @config[:error_file_missing]
+      raise Exceptions::FileNotFound.new("File not found: #{path}")
     else
-      if @config[:error_file_missing]
-        raise Exceptions::FileNotFound.new("File not found: #{path}")
-      else
-        puts "FILE NOT FOUND on #{Time.now}: #{path}"
-        return false
-      end
+      puts "FILE NOT FOUND on #{Time.now}: #{path}"
+      return false
     end
   end
 
@@ -97,4 +62,12 @@ module Clamby
   def self.config
     @config
   end
+
+  def self.clamd_executable_name(daemonize: false)
+    daemonize? ? "clamdscan" : "clamscan"
+  end
+
+  def self.daemonize?
+    !! @config[:daemonize]
+  end
 end

data/lib/clamby/version.rb

@@ -1,3 +1,3 @@
 module Clamby
-  VERSION = "1.1.0"
+  VERSION = "1.2.1"
 end

data/spec/clamby_spec.rb

@@ -30,7 +30,14 @@ describe Clamby do
   end
 
   it "should scan file as dangerous" do
-    `wget http://www.eicar.org/download/eicar.com`
+     `which wget`
+
+     if $?.success?
+      `wget http://www.eicar.org/download/eicar.com`
+     else
+      `curl http://www.eicar.org/download/eicar.com > eicar.com`
+    end
+    `chmod 644 eicar.com`
     Clamby.configure({:error_file_virus => true})
     expect{Clamby.safe?('eicar.com')}.to raise_exception(Exceptions::VirusDetected)
     expect{Clamby.virus?('eicar.com')}.to raise_exception(Exceptions::VirusDetected)
@@ -39,4 +46,4 @@ describe Clamby do
     expect(Clamby.virus?('eicar.com')).to be true
     File.delete('eicar.com')
   end
-end
+end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: clamby
 version: !ruby/object:Gem::Version
-  version: 1.1.0
+  version: 1.2.1
 platform: ruby
 authors:
 - kobaltz
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-03-11 00:00:00.000000000 Z
+date: 2015-11-03 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -97,7 +97,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.2.2
+rubygems_version: 2.4.5
 signing_key: 
 specification_version: 4
 summary: Scan file uploads with ClamAV