Merge ee3056a into b37f98c

ninoseki · Sep 10, 2018 · 135c5cf · 135c5cf
2 parents b37f98c + ee3056a
commit 135c5cf
Show file tree

Hide file tree

Showing 7 changed files with 12 additions and 10 deletions.
diff --git a/lib/ryo/error.rb b/lib/ryo/error.rb
@@ -1,7 +1,7 @@
 # frozen_string_literal: true
 
 module Ryo
-  class NotFoundError < StandardError; end
-  class InvalidURLError < StandardError; end
   class InvalidOptionsError < StandardError; end
+  class InvalidURLError < StandardError; end
+  class NotFoundError < StandardError; end
 end
diff --git a/lib/ryo/plugin/dir.rb b/lib/ryo/plugin/dir.rb
@@ -1,6 +1,5 @@
 # frozen_string_literal: true
 
-require "thread"
 require "thread/pool"
 
 module Ryo

diff --git a/lib/ryo/plugin/shodan.rb b/lib/ryo/plugin/shodan.rb
@@ -16,11 +16,9 @@ def discover(ip)
       end
 
       def self.discover(ip)
-        begin
-          new.discover(ip)
-        rescue ArgumentError => e
-          { error: e.to_s }
-        end
+        new.discover(ip)
+      rescue ArgumentError => e
+        { error: e.to_s }
       end
     end
   end

diff --git a/lib/ryo/plugin/whois.rb b/lib/ryo/plugin/whois.rb
@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 module Ryo
   module Plugin
     class Whois
@@ -61,4 +63,4 @@ def self.discover(domain)
       end
     end
   end
-end
+end
diff --git a/spec/plugin/shodan_spec.rb b/spec/plugin/shodan_spec.rb
@@ -22,4 +22,4 @@
       end
     end
   end
-end
+end
diff --git a/spec/plugin/subdomain/dnsdumpster_spec.rb b/spec/plugin/subdomain/dnsdumpster_spec.rb
@@ -1,3 +1,4 @@
+# frozen_string_literal: true
 
 RSpec.describe Ryo::Plugin::Subdomain::DNSDumpster, :vcr do
   subject { Ryo::Plugin::Subdomain::DNSDumpster }

diff --git a/spec/plugin/subdomain/subdomain_spec.rb b/spec/plugin/subdomain/subdomain_spec.rb
@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 RSpec.describe Ryo::Plugin::Subdomain, :vcr do
   subject { Ryo::Plugin::Subdomain }
   describe "#discover" do