esearchy 0.2.0.8 → 0.2.1

data/bin/esearchy

@@ -89,7 +89,8 @@ opts = GetoptLong.new(
   [ '--output','-o', GetoptLong::REQUIRED_ARGUMENT ],
   [ '--yahookey','-y', GetoptLong::REQUIRED_ARGUMENT ],
   [ '--bingkey','-b', GetoptLong::REQUIRED_ARGUMENT ],
-  [ '--maxhits','-m', GetoptLong::REQUIRED_ARGUMENT ]
+  [ '--maxhits','-m', GetoptLong::REQUIRED_ARGUMENT ],
+  [ '--proxy', GetoptLong::REQUIRED_ARGUMENT]
 )
 
 def logo
@@ -156,7 +157,7 @@ def print_(list)
 end
   
 def print_linux(email)
-  if email.match(/#{ESearchy::Search.query.gsub("@","").split('.')[0]}/i)
+  if email.match(/#{ESearchy::Search.query.gsub("*","").gsub("@","").split('.')[0]}/i)
     puts "\033[31m" + email + "\033\[0m"
   else
     puts "\033[32m" + email + "\033\[0m"
@@ -164,7 +165,7 @@ def print_linux(email)
 end
   
 def print_windows(email)
-  if email.match(/#{ESearchy::Search.query.gsub("@","").split('.')[0]}/i)
+  if email.match(/#{ESearchy::Search.query.gsub("*","").gsub("@","").split('.')[0]}/i)
     Wcol.puts(12, email)
   else
     Wcol.puts(2, email)
@@ -373,7 +374,9 @@ opts.each do |opt, arg|
       puts "\t Disables PGP searches.\n"
       puts "--disable-usenet"
       puts "\t Disables Usenet searches.\n\n"
-      puts "Copyright 2009 - FreedomCoder\n"
+      puts "--proxy [127.0.0.1:8080]"
+      puts "\t Setup a proxy.\n"
+      puts "Copyright 2010 - FreedomCoder\n"
       #END OF HELP
       exit(0)
     when '--enable-all' then
@@ -483,6 +486,11 @@ opts.each do |opt, arg|
       @output = Output.new arg
     when '--maxhits' then
       @params[:maxhits] = arg.to_i
+    when '--proxy' then
+      require 'socksify'
+      url, port = arg.split(":")
+      TCPSocket::socks_server = url
+      TCPSocket::socks_port = port.to_i
     else
       puts "Unknown command. Please try again"
       exit(0)

data/lib/esearchy/esearchy.rb

@@ -3,7 +3,7 @@ def D m
 end
 
 module ESearchy
-  VERSION = "0.2.0.8"
+  VERSION = "0.2.1"
   @@log = false
   
   def self.log

data/lib/esearchy/genericengine.rb

@@ -43,15 +43,19 @@ module ESearchy
     
     private
     
-    def get(url, port, querystring = "/", headers = {}, &block)
+    def get(url, port, querystring = "/", headers = {}, limit = 10, &block)
       http = Net::HTTP.new(url,port)
       begin
         http.start do |http|
           request = Net::HTTP::Get.new(querystring, headers)
           response = http.request(request)
           case response
-          when Net::HTTPSuccess, Net::HTTPRedirection
+          when Net::HTTPSuccess
             block.call(response)
+          when Net::HTTPRedirection
+            get(URI.parse(response['location']).host, 
+                URI.parse(response['location']).port,
+                querystring, headers, limit - 1, block)
           else
             return response.error!
           end

metadata

@@ -1,14 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: esearchy
 version: !ruby/object:Gem::Version 
-  hash: 79
+  hash: 21
   prerelease: false
   segments: 
   - 0
   - 2
-  - 0
-  - 8
-  version: 0.2.0.8
+  - 1
+  version: 0.2.1
 platform: ruby
 authors: 
 - Matias P. Brutti
@@ -16,7 +15,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-05-17 00:00:00 -07:00
+date: 2010-06-19 00:00:00 -03:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -83,6 +82,22 @@ dependencies:
         version: 0.2.1
   type: :runtime
   version_requirements: *id004
+- !ruby/object:Gem::Dependency 
+  name: socksify
+  prerelease: false
+  requirement: &id005 !ruby/object:Gem::Requirement 
+    none: false
+    requirements: 
+    - - ">="
+      - !ruby/object:Gem::Version 
+        hash: 17
+        segments: 
+        - 1
+        - 1
+        - 1
+        version: 1.1.1
+  type: :runtime
+  version_requirements: *id005
 description: 
 email: matiasbrutti@gmail.com
 executables: