simple_whatweb 0.3.0 → 0.4.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: dc8a116eb5a0ba92f6c846d78124f349204dd2716da9d04f968bc0b9a2e0856e
-  data.tar.gz: caf26d9f9c8ba4f3bf91b0968d1bb188b3535a06be57889e612756e91711a2e0
+  metadata.gz: e379339998ec6d96d736a6fc0224913cca8b7bc04811a820e7b5488073bf2c73
+  data.tar.gz: 5c7d9ef2327082b1e252accf95159a57352f5518b6f013b97f89af5064d3e0b1
 SHA512:
-  metadata.gz: c1398c10d4ac8a6cd4549ebe90e0da52a7fb025dc0c537dbdb05c42589c75579deee78ee9547467fd4274fb5f126948a9c97cab7b912fa76f0261309d3373045
-  data.tar.gz: b0822fe238bc0664bdaf74501c3ac0fb188ec56bb03313866be5f36323c0ab5482f73825496a1fab050d403ca6e57266b552117cf141b23e50c0914efaff4b57
+  metadata.gz: a58bcaa3e6073c54cfd14e97eb8a3bd40f383f878ebcb1c51e620f4dd86b06680fa440b3fb4f9043e2dc156d587fa1270ef2c9050d07667932630fd169ae01d2
+  data.tar.gz: 2dc32cc469fd26d264d86f84da39fd793a0e6f1fefe84a5ec47ba2b65f1b66cedef93d7f3e413d5f64d21079dc09375ab2fe16302581a95e0da847fd0523ae08

data/SimpleWhatWeb.gemspec

@@ -26,8 +26,8 @@ Gem::Specification.new do |spec|
 
   spec.add_development_dependency "bundler", "~> 1.16"
   spec.add_development_dependency "coveralls", "~> 0.8"
-  spec.add_development_dependency "rake", "~> 10.0"
-  spec.add_development_dependency "rspec", "~> 3.0"
+  spec.add_development_dependency "rake", "~> 12.3"
+  spec.add_development_dependency "rspec", "~> 3.8"
   spec.add_development_dependency "vcr", "~> 4.0"
   spec.add_development_dependency "webmock", "~> 3.4"
 
@@ -35,4 +35,5 @@ Gem::Specification.new do |spec|
   spec.add_dependency "oga", "~> 2.15"
   spec.add_dependency "require_all", "~> 2.0"
   spec.add_dependency "thor", "~> 0.19"
+  spec.add_dependency "thread", "~> 0.2.2"
 end

data/exe/whatweb

@@ -1,4 +1,7 @@
 #!/usr/bin/env ruby
+# frozen_string_literal: true
+
+$LOAD_PATH.unshift("#{__dir__}/../lib")
 
 require "whatweb"
 

data/lib/whatweb.rb

@@ -13,4 +13,39 @@ require "whatweb/matcher"
 require "whatweb/plugin"
 require "whatweb/cli"
 
-module WhatWeb; end
+require "thread/pool"
+
+module WhatWeb
+  def self.execute_plugins(url, options = {})
+    user_agent = options[:user_agent] || "WhatWeb/#{VERSION}"
+    is_aggressive = options[:is_aggressive] || false
+    max_threads = options[:max_threads] || 10
+
+    plugins = PluginManager.instance.load_plugins
+    target = Target.new(url, user_agent: user_agent)
+
+    pool = Thread.pool(max_threads)
+    results = {}
+    plugins.each do |name, plugin|
+      pool.process do
+        result = plugin.execute(target, is_aggressive)
+        results[name] = result unless result.empty?
+      end
+    end
+    pool.shutdown
+    results
+  end
+
+  def self.plugin_names
+    plugins = PluginManager.instance.load_plugins
+    plugins.map do |name, plugin|
+      {
+        name: name,
+        author: plugin.author.encode("UTF-8"),
+        description: plugin.description.encode("UTF-8"),
+        website: plugin.website,
+        version: plugin.version
+      }
+    end
+  end
+end

data/lib/whatweb/cli.rb

@@ -3,17 +3,21 @@
 require "json"
 require "thor"
 
+require "thread/pool"
+
 module WhatWeb
   class CLI < Thor
     desc "scan URL", "Scan against a given URL"
-    method_options aggressive: :boolean, default: false
-    method_options user_agent: :string
+    method_option :aggressive, type: :boolean, default: false
+    method_option :user_agent, type: :string
+    method_option :max_threads, type: :numeric, default: 10
     def scan(url)
       user_agent = options[:user_agent]
       is_aggressive = options[:aggressive]
+      max_threads = options[:max_threads]
 
       with_error_handling do
-        hash = execute_plugins(url, user_agent: user_agent, is_aggressive: is_aggressive)
+        hash = WhatWeb.execute_plugins(url, user_agent: user_agent, is_aggressive: is_aggressive, max_threads: max_threads)
         puts hash.to_json
       end
     end
@@ -21,39 +25,11 @@ module WhatWeb
     desc "list_plugins", "List all plugins"
     def list_plugins
       with_error_handling do
-        puts plugin_names.to_json
+        puts WhatWeb.plugin_names.to_json
       end
     end
 
     no_commands do
-      def execute_plugins(url, options = {})
-        user_agent = options[:user_agent]
-        is_aggressive = options[:is_aggressive]
-
-        plugins = PluginManager.instance.load_plugins
-        target = Target.new(url, user_agent: user_agent)
-
-        results = {}
-        plugins.each do |name, plugin|
-          result = plugin.execute(target, is_aggressive)
-          results[name] = result unless result.empty?
-        end
-        results
-      end
-
-      def plugin_names
-        plugins = PluginManager.instance.load_plugins
-        plugins.map do |name, plugin|
-          {
-            name: name,
-            author: plugin.author.encode("UTF-8"),
-            description: plugin.description.encode("UTF-8"),
-            website: plugin.website,
-            version: plugin.version
-          }
-        end
-      end
-
       def with_error_handling
         yield
       rescue StandardError => e

data/lib/whatweb/version.rb

@@ -1,5 +1,5 @@
 # frozen_string_literal: true
 
 module WhatWeb
-  VERSION = "0.3.0"
+  VERSION = "0.4.0"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: simple_whatweb
 version: !ruby/object:Gem::Version
-  version: 0.3.0
+  version: 0.4.0
 platform: ruby
 authors:
 - Manabu Niseki
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2018-09-02 00:00:00.000000000 Z
+date: 2018-09-11 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -44,28 +44,28 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '10.0'
+        version: '12.3'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '10.0'
+        version: '12.3'
 - !ruby/object:Gem::Dependency
   name: rspec
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '3.0'
+        version: '3.8'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '3.0'
+        version: '3.8'
 - !ruby/object:Gem::Dependency
   name: vcr
   requirement: !ruby/object:Gem::Requirement
@@ -150,6 +150,20 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: '0.19'
+- !ruby/object:Gem::Dependency
+  name: thread
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: 0.2.2
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: 0.2.2
 description: Simplified ver. of WhatWeb.
 email:
 - manabu.niseki@gmail.com