scrubber-scrubyt 0.4.13 → 0.4.14
This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
|
@@ -123,7 +123,8 @@ module Scrubyt
|
|
|
123
123
|
@@original_host_name ||= @@host_name
|
|
124
124
|
end #end of method store_host_name
|
|
125
125
|
|
|
126
|
-
def self.parse_and_set_proxy(proxy)
|
|
126
|
+
def self.parse_and_set_proxy(proxy)
|
|
127
|
+
@@proxy_user = @@proxy_pass = nil
|
|
127
128
|
if proxy.downcase == 'localhost'
|
|
128
129
|
@@host = 'localhost'
|
|
129
130
|
@@port = proxy.split(':').last
|
|
@@ -131,7 +132,7 @@ module Scrubyt
|
|
|
131
132
|
parts = proxy.split(':')
|
|
132
133
|
if (parts.size > 2)
|
|
133
134
|
user_pass = parts[0].split('@')
|
|
134
|
-
if (
|
|
135
|
+
if (user_pass.size > 1)
|
|
135
136
|
@@proxy_user = user_pass[0]
|
|
136
137
|
@@proxy_pass = user_pass[1]
|
|
137
138
|
else
|
|
@@ -151,7 +152,7 @@ module Scrubyt
|
|
|
151
152
|
end
|
|
152
153
|
end
|
|
153
154
|
Scrubyt.log :ACTION, "[ACTION] Setting proxy: host=<#{@@host}>, port=<#{@@port}>, username=<#{@@proxy_user}, password=<#{@@proxy_pass}>"
|
|
154
|
-
@@agent.set_proxy(@@host, @@port)
|
|
155
|
+
@@agent.set_proxy(@@host, @@port, @@proxy_user, @@proxy_pass)
|
|
155
156
|
end
|
|
156
157
|
|
|
157
158
|
def self.determine_protocol
|
metadata
CHANGED
|
@@ -1,7 +1,7 @@
|
|
|
1
1
|
--- !ruby/object:Gem::Specification
|
|
2
2
|
name: scrubber-scrubyt
|
|
3
3
|
version: !ruby/object:Gem::Version
|
|
4
|
-
version: 0.4.
|
|
4
|
+
version: 0.4.14
|
|
5
5
|
platform: ruby
|
|
6
6
|
authors:
|
|
7
7
|
- Peter Szinek
|
|
@@ -15,6 +15,7 @@ default_executable:
|
|
|
15
15
|
dependencies:
|
|
16
16
|
- !ruby/object:Gem::Dependency
|
|
17
17
|
name: hpricot
|
|
18
|
+
type: :runtime
|
|
18
19
|
version_requirement:
|
|
19
20
|
version_requirements: !ruby/object:Gem::Requirement
|
|
20
21
|
requirements:
|
|
@@ -24,6 +25,7 @@ dependencies:
|
|
|
24
25
|
version:
|
|
25
26
|
- !ruby/object:Gem::Dependency
|
|
26
27
|
name: mechanize
|
|
28
|
+
type: :runtime
|
|
27
29
|
version_requirement:
|
|
28
30
|
version_requirements: !ruby/object:Gem::Requirement
|
|
29
31
|
requirements:
|