rest-tor 0.1.5 → 0.1.6

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 5e50d7b404cef945ffc0aaf379acad03d87ec101
-  data.tar.gz: f7107864fc0f7e5f18dc1353b5d9b7363cfc08f9
+  metadata.gz: 392136defab833843bd5a37a571a6e59e312ab10
+  data.tar.gz: cdaeca6e88c8269015156c35964a2cfc38013f31
 SHA512:
-  metadata.gz: 7526c39536f9f345c5df205f295991b28359f6f6070e4611179e98e3a438a8707f0cfe39e1f3a91a767dd35c9a18e3ca3c9d0642b41b78a4094d2a23b52d0ed2
-  data.tar.gz: f7aafdca0a6728767c12b1453645b6eb0fc6e6d7a9c5313ce1e164d50b4da6c647b7de2c71a48ee146e09f658ec20553401904baaed93b3277a928d5a0199d8e
+  metadata.gz: 6d7521af54efeedaffb4cb7e59e6276b77edea2a8042760d59fb5c5543c8712a6c0a46a923be76adc54ef4f9f6ea2cb61101b87a4cfd5c6ba89c8f1a48798a7d
+  data.tar.gz: 04d56a5f7473453a56861a33448a1a0b23fb13f1b2c0d755cea19c2120f78fab09abf4db0fb0ab33322dab95b8f69f71bec30ef85b1c45c0f2d8bc7a3e4481d0

data/CHANGELOG.md

@@ -0,0 +1,5 @@
+## 0.1.6
+
+- Open tor without sleep
+- Tor.init use Multithreading
+- Tor.request allow pass custom proxy

data/lib/rest_tor/tor.rb

@@ -14,9 +14,9 @@ module Tor extend self
 
   def init
     lock("tor:init", expires: 1.minutes) do
-      TOR_COUNT.times do |i|
-        listen(TOR_PORT_START_WITH + i + 1)
-      end
+      threads = []
+      TOR_COUNT.times { |i| threads << Thread.new { listen(TOR_PORT_START_WITH + i + 1) }  }
+      threads.map(&:join)
     end
   end
 
@@ -45,7 +45,7 @@ module Tor extend self
   def request(options={}, &block)
     url     = options[:url]
     mobile  = options[:mobile]
-    proxy   = options[:proxy] == false ? false : true
+    proxy   = options[:proxy]
     raw     = options[:raw].nil? ? true : false
     mode    = options[:mode]    || :default
     method  = options[:method]  || :get
@@ -55,10 +55,14 @@ module Tor extend self
     headers = options[:headers] || options[:header] || {}
     default_header = { 'User-Agent' => mobile ? MOBILE_AGENT : USER_AGENT }
     time, body = Time.now, nil
+    rest    = proxy == false
+
+    hold_tor(mode: mode, rest: rest) do |port, tor|
+
+      proxy  ||= "socks5://127.0.0.1:#{port}" if not rest
+
+      logger.info "Started #{method.to_s.upcase} #{url.inspect} (proxy:#{proxy} | mode:#{mode})"
 
-    hold_tor(mode: mode, rest: !proxy) do |port, tor|
-      logger.info "Started #{method.to_s.upcase} #{url.inspect} (port:#{port || 'rest-client'} | mode:#{mode})"
-      proxy   =  proxy && "socks5://127.0.0.1:#{port}" or nil
       params  = {
         method:   method,
         url:      url,
@@ -118,7 +122,6 @@ module Tor extend self
     tor+= " --CircuitBuildTimeout 5 --KeepalivePeriod 60 --NewCircuitPeriod 15 --NumEntryGuards 8"# make tor faster
     tor+= " --quiet" # unless Rails.env.production?
     system tor
-    sleep 5
     if ip=test(port)
       store.insert(port, ip)
     else

data/lib/rest_tor/version.rb

@@ -1,3 +1,3 @@
 module Tor
-  VERSION = "0.1.5"
+  VERSION = "0.1.6"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: rest-tor
 version: !ruby/object:Gem::Version
-  version: 0.1.5
+  version: 0.1.6
 platform: ruby
 authors:
 - plusor
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2017-12-17 00:00:00.000000000 Z
+date: 2017-12-20 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rest-client
@@ -131,6 +131,7 @@ extra_rdoc_files: []
 files:
 - ".gitignore"
 - ".travis.yml"
+- CHANGELOG.md
 - CODE_OF_CONDUCT.md
 - Gemfile
 - LICENSE.txt