ryo 0.1.0 → 0.2.0

data/lib/ryo/cli.rb

@@ -4,37 +4,62 @@ module Ryo
   class CLI < Thor
     desc "dir URL", "Discover directories and files belong to a given URL"
     def dir(url)
-      hash = discover(url, dir: true)
+      hash = run_discovery(url, dir: true)
       puts hash.to_json
     end
 
     desc "subdomain URL", "Discover subdomains of a given URL"
     def subdomain(url)
-      hash = discover(url, subdomain: true)
+      hash = run_discovery(url, subdomain: true)
       puts hash.to_json
     end
 
     desc "tech URL", "Discover used technolgies of a given URL"
     def tech(url)
-      hash = discover(url, tech: true)
+      hash = run_discovery(url, tech: true)
       puts hash.to_json
     end
 
     desc "whois URL", "Discover whois information of a given URL"
     def whois(url)
-      hash = discover(url, whois: true)
+      hash = run_discovery(url, whois: true)
+      puts hash.to_json
+    end
+
+    desc "discover URL", "Run discovery plugin(s) against a given URL"
+    method_option :dir, type: :boolean, default: false
+    method_option :subdomain, type: :boolean, default: false
+    method_option :tech, type: :boolean, default: false
+    method_option :whois, type: :boolean, default: false
+    def discovery(url)
+      hash = run_discovery(url, options)
       puts hash.to_json
     end
 
     desc "all URL", "Run all discovery plugins against a given URL"
     def all(url)
-      hash = discover(url, all: true)
+      hash = run_discovery(url, all: true)
       puts hash.to_json
     end
 
     no_commands do
-      def discover(url, options)
+      def validate_url(url)
+        uri = URI.parse(url)
+        raise InvalidURLError unless %w(http https).include?(uri.scheme)
+      end
+
+      def validate_options(options)
+        raise InvalidOptionsError unless options.any? { |_, v| v }
+      end
+
+      def run_discovery(url, options)
+        validate_url(url)
+        validate_options(options)
         Ryo.discover url, options
+      rescue InvalidURLError => _
+        { error: "Please input a valid URL" }
+      rescue InvalidOptionsError => _
+        { error: "Please input at least one option" }
       rescue StandardError => e
         { error: "Warning: #{e}" }
       end

data/lib/ryo/error.rb

@@ -1,3 +1,7 @@
+# frozen_string_literal: true
+
 module Ryo
   class NotFoundError < StandardError; end
-end
+  class InvalidURLError < StandardError; end
+  class InvalidOptionsError < StandardError; end
+end

data/lib/ryo/version.rb

@@ -1,5 +1,5 @@
 # frozen_string_literal: true
 
 module Ryo
-  VERSION = "0.1.0"
+  VERSION = "0.2.0"
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: ryo
 version: !ruby/object:Gem::Version
-  version: 0.1.0
+  version: 0.2.0
 platform: ruby
 authors:
 - Manabu Niseki