cms_scanner 0.6.0 → 0.6.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: ca37ab68087ef1b53d298a9438a57fd56986e347f421ab39cc5966fe8d438683
-  data.tar.gz: 44463983165dfa3b71f5d285d81fe53dff50f443736cd5f136bfe6f9ff60b468
+  metadata.gz: 2efbe8c97431a9002c10f693602e4fb2c84a36177492ef467ecbcd1b520611fb
+  data.tar.gz: 628ae472efbabe63f5e517540d6592f8378e67adc5377f4980e3c80415c93ee6
 SHA512:
-  metadata.gz: 21711ffc321d799fdd866c8f495df55a2de5228dfcb5b4ae0fc4d82ee0c151d1d726ae60038f9c4891923cebd1d48309dc0a82fa5ede9f054622c2b529284b58
-  data.tar.gz: 8208a51454f004bdc72ee7d32a100302877d82f91d6f115a125b0fb7dd5ada0784b4acaf6ed9b454e715f557e23672c20e25e6b2540afc7e6bb4c5caa694af7a
+  metadata.gz: 9195b6c4f061c40c371d570317b39dcd79c041187a41eb6166382b2ff4ca06bce2260a0bdd1aa0d77d1224104b079b91470a4905a5f8cd830845e096f5c92601
+  data.tar.gz: 7e285ca6c2c9df868280f4cf686ca28e8c1acf02b9649021d04f8fca6988f3f8598d9cc12ca70ae36ef975fe9fb27a99b027786e1b93e7ccf7422e48bfa413e0

data/app/controllers/core.rb

@@ -69,7 +69,7 @@ module CMSScanner
       def after_scan
         @stop_time   = Time.now
         @elapsed     = @stop_time - @start_time
-        @used_memory = memory_usage - @start_memory
+        @used_memory = GetProcessMem.new.bytes - @start_memory
 
         output('finished',
                cached_requests: NS.cached_requests,

data/lib/cms_scanner.rb

@@ -6,6 +6,7 @@ require 'nokogiri'
 require 'yajl/json_gem'
 require 'public_suffix'
 require 'addressable/uri'
+require 'get_process_mem'
 require 'ruby-progressbar'
 require 'opt_parse_validator'
 require 'active_support/concern'

data/lib/cms_scanner/helper.rb

@@ -5,8 +5,3 @@ def redirect_output_to_file(file)
   $stdout.reopen(file, 'w')
   $stdout.sync = true
 end
-
-# @return [ Integer ] The memory of the current process in Bytes
-def memory_usage
-  `ps -o rss= -p #{Process.pid}`.to_i * 1024 # ps returns the value in KB
-end

data/lib/cms_scanner/numeric.rb

@@ -6,7 +6,7 @@ class Numeric
   def bytes_to_human
     units = %w[B KB MB GB TB]
     e     = abs.zero? ? abs : (Math.log(abs) / Math.log(1024)).floor
-    s     = format('%.3f', (abs.to_f / 1024**e))
+    s     = format('%<s>.3f', s: (abs.to_f / 1024**e))
 
     s.sub(/\.?0*$/, ' ' + units[e])
   end

data/lib/cms_scanner/scan.rb

@@ -6,7 +6,7 @@ module CMSScanner
     attr_reader :run_error
 
     def initialize
-      NS.start_memory = memory_usage
+      NS.start_memory = GetProcessMem.new.bytes
 
       controllers << NS::Controller::Core.new
 

data/lib/cms_scanner/version.rb

@@ -2,5 +2,5 @@
 
 # Version
 module CMSScanner
-  VERSION = '0.6.0'
+  VERSION = '0.6.1'
 end

metadata

@@ -1,15 +1,29 @@
 --- !ruby/object:Gem::Specification
 name: cms_scanner
 version: !ruby/object:Gem::Version
-  version: 0.6.0
+  version: 0.6.1
 platform: ruby
 authors:
 - WPScanTeam
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2019-09-11 00:00:00.000000000 Z
+date: 2019-10-18 00:00:00.000000000 Z
 dependencies:
+- !ruby/object:Gem::Dependency
+  name: get_process_mem
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: 0.2.4
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: 0.2.4
 - !ruby/object:Gem::Dependency
   name: nokogiri
   requirement: !ruby/object:Gem::Requirement
@@ -114,6 +128,20 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: 1.4.1
+- !ruby/object:Gem::Dependency
+  name: ffi
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '1.11'
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '1.11'
 - !ruby/object:Gem::Dependency
   name: bundler
   requirement: !ruby/object:Gem::Requirement
@@ -148,28 +176,28 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '12.3'
+        version: '13.0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '12.3'
+        version: '13.0'
 - !ruby/object:Gem::Dependency
   name: rspec
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 3.8.0
+        version: 3.9.0
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 3.8.0
+        version: 3.9.0
 - !ruby/object:Gem::Dependency
   name: rspec-its
   requirement: !ruby/object:Gem::Requirement
@@ -190,28 +218,28 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.74.0
+        version: 0.75.0
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.74.0
+        version: 0.75.0
 - !ruby/object:Gem::Dependency
   name: rubocop-performance
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 1.4.0
+        version: 1.5.0
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 1.4.0
+        version: 1.5.0
 - !ruby/object:Gem::Dependency
   name: simplecov
   requirement: !ruby/object:Gem::Requirement