sockit 1.1.1 → 1.2.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 6c121958f45f2d643ce189f5b7931eda37cea135
-  data.tar.gz: 04bfee78cc8309658de13c3f6dd9f8b8a313e2bc
+  metadata.gz: d4cb03123797163d6a7b4a0277a607497eb0cd9c
+  data.tar.gz: 4af7863f1723de14a2d0acd54eea61bf1b5038bd
 SHA512:
-  metadata.gz: b90163e36c436a4424aef2e6236e3d1f54628897931c79e69d3f67bf0905bdb7c452407c2deddcc0153e8c329c379b965551fa610faaa4c4d1ff51c3f1e83f68
-  data.tar.gz: 9facd1457c32dcc3f7474f74e845a489b91d3822fe3db1bb4063b10c83760df351d0300e2f4a5bf580143bb712ca41e47b9aafb7167063cce8d8e05eb238b6fe
+  metadata.gz: 7e6d1428f0ac8cab895403bc04f93ee6ec4db8b4906eb146e44b943c55c01d558c041f9a634f000bc3bf13f3d044751a93e56c11461e81356ac3698ecc3e1a40
+  data.tar.gz: d380d476862b6fc0d1edf78af829a2785ee37f54e3e6c7112ad265b8c42b7dbab59063f27641e40e7146757eef2fdc427d1569d5721f5f3f9f875b999efb04be

data/lib/sockit/connection.rb

@@ -2,9 +2,9 @@ module Sockit
   module Connection
 
     def direct_connect(socket, remote_host, remote_port, local_host=nil, local_port=nil)
-      log(:yellow, "Directly connecting to #{remote_host}:#{remote_port}")
+      Sockit.enabled? and log(:yellow, "Directly connecting to #{remote_host}:#{remote_port}")
       socket.__send__(:initialize_tcp, remote_host, remote_port, local_host=nil, local_port=nil)
-      log(:green, "Connected to #{remote_host}:#{remote_port}")
+      Sockit.enabled? and log(:green, "Connected to #{remote_host}:#{remote_port}")
     end
 
     def connect(socket, host, port)

data/lib/sockit/support.rb

@@ -18,7 +18,7 @@ module Sockit
     end
 
     def connect_via_socks?(host)
-      (is_configured? && !config.ignore.flatten.include?(host))
+      (is_configured? && !config.ignore.flatten.any?{ |ignored_host| host =~ /#{ignored_host}/ }
     end
 
     def is_socks_v5?

data/lib/sockit/version.rb

@@ -21,7 +21,7 @@
 module Sockit
 
   unless const_defined?(:VERSION)
-    VERSION = "1.1.1"
+    VERSION = "1.2.0"
   end
 
 end

data/lib/sockit.rb

@@ -69,6 +69,18 @@ module Sockit
     end
   end
 
+  def enabled
+    @@enabled ||= false
+  end
+
+  def enable
+    @@enabled = true
+  end
+
+  def disable
+    @@enabled = false
+  end
+
   extend Sockit::V5::Authentication
   extend Sockit::V5::Connection
   extend Sockit::V5::Support
@@ -83,8 +95,9 @@ end
 class TCPSocket
 
   alias :initialize_tcp :initialize
+
   def initialize(remote_host, remote_port, local_host=nil, local_port=nil)
-    if Sockit.connect_via_socks?(remote_host)
+    if Sockit.enabled? && Sockit.connect_via_socks?(remote_host)
       initialize_tcp(Sockit.config.host, Sockit.config.port)
       Sockit.perform_v5_authenticate(self) if Sockit.is_socks_v5?
       Sockit.connect(self, remote_host, remote_port)
@@ -92,4 +105,5 @@ class TCPSocket
       Sockit.direct_connect(self, remote_host, remote_port, local_host, local_port)
     end
   end
+
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: sockit
 version: !ruby/object:Gem::Version
-  version: 1.1.1
+  version: 1.2.0
 platform: ruby
 authors:
 - Zachary Patten
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-04-08 00:00:00.000000000 Z
+date: 2017-02-25 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: codeclimate-test-reporter