rhack 1.3.4 → 1.3.5
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.
- checksums.yaml +4 -4
- data/lib/rhack/curl/global.rb +6 -7
- data/lib/rhack/frame.rb +5 -5
- data/lib/rhack/version.rb +1 -1
- metadata +2 -2
checksums.yaml
CHANGED
@@ -1,7 +1,7 @@
|
|
1
1
|
---
|
2
2
|
SHA1:
|
3
|
-
metadata.gz:
|
4
|
-
data.tar.gz:
|
3
|
+
metadata.gz: e51e8a06fbd8dee107ac2733dd1cf4b384aa00fc
|
4
|
+
data.tar.gz: 050e8aa15646062ad530245a84b6cd21a085db1f
|
5
5
|
SHA512:
|
6
|
-
metadata.gz:
|
7
|
-
data.tar.gz:
|
6
|
+
metadata.gz: eea257f29aafd97cea2745e68782e118c6074b6a78cc2067cdb7425303abad21a9dec0f94656da872a043b5246d0c1211f5241972afb00fd05191c36b523bb56
|
7
|
+
data.tar.gz: 8999cde9bd5a97571dfc05e679c5427cbca70458945fe1fc1b8ecc72073753e6aa7e6e35fd69c06ee08f30f947e27e857e88f9a457b38f0cff9453a15729dbd9
|
data/lib/rhack/curl/global.rb
CHANGED
@@ -2,14 +2,13 @@
|
|
2
2
|
module Curl
|
3
3
|
class << Curl
|
4
4
|
|
5
|
-
def execute(
|
6
|
-
#if unless_allready and status
|
7
|
-
# return L.log "Carier allready executing"
|
8
|
-
#end
|
5
|
+
def execute(raise_errors=false)
|
9
6
|
if @@carier_thread and s = @@carier_thread.status
|
10
7
|
L.log "Carier Thread allready started and has status #{s}"
|
11
8
|
else
|
12
|
-
if s = status(
|
9
|
+
if s = status(raise_errors)
|
10
|
+
L.warn s
|
11
|
+
end
|
13
12
|
L.log(@@carier_thread ? "Resetting Carier thread" : "Setting Carier thread up")
|
14
13
|
@@carier_thread = thread {
|
15
14
|
error = nil
|
@@ -148,7 +147,7 @@ module Curl
|
|
148
147
|
end
|
149
148
|
alias :reload! :reset!
|
150
149
|
|
151
|
-
def status(
|
150
|
+
def status(raise_errors=true)
|
152
151
|
if @@carier_thread and (s = @@carier_thread.status)
|
153
152
|
L.log "Carier Thread responding with status #{s}"
|
154
153
|
s
|
@@ -158,7 +157,7 @@ module Curl
|
|
158
157
|
error = @@carier_thread.value
|
159
158
|
rescue Exception => error
|
160
159
|
L.warn "Carier Thread has raised an exception"
|
161
|
-
if
|
160
|
+
if raise_errors
|
162
161
|
recall!
|
163
162
|
raise error
|
164
163
|
else
|
data/lib/rhack/frame.rb
CHANGED
@@ -128,7 +128,6 @@ module RHACK
|
|
128
128
|
# если установлен, то невозможно прерывание исполнения клавиатурой (продолжит работать, выполняя колбеки, в фоне), и невозможно задавать больше параллельных реквестов, чем разрешено параллельных соединений (просто застрянет)
|
129
129
|
# @ :sync : остановить (Thread#kill) perform-loop после исполнения всех запросов; подразумевает wait=true; при вызове одиночного реквеста подразумевает thread_safe=true
|
130
130
|
# @ :wait : ждать исполнения всех реквестов
|
131
|
-
# @ :raw + :sync : подразумевает save_result=true
|
132
131
|
#
|
133
132
|
# @ [deprecated] :zip, :stream и все опции для result
|
134
133
|
#
|
@@ -269,7 +268,7 @@ module RHACK
|
|
269
268
|
|
270
269
|
opts[:eval] = false if opts[:json] or opts[:hash] or opts[:raw]
|
271
270
|
opts[:load_scripts] = self if opts[:load_scripts]
|
272
|
-
opts[:save_result] = true if opts[:wait] and opts[:raw]
|
271
|
+
#opts[:save_result] = true if opts[:wait] and opts[:raw]
|
273
272
|
|
274
273
|
if orders
|
275
274
|
opts[:thread_safe] = false if @ss.size < orders.size
|
@@ -368,7 +367,6 @@ module RHACK
|
|
368
367
|
if yres == :skip
|
369
368
|
return # DEPRECATED
|
370
369
|
else
|
371
|
-
page.res = yres
|
372
370
|
if opts[:proc_result].is Proc
|
373
371
|
# yres is intermediate result that we should proc
|
374
372
|
page.res = opts[:proc_result].call yres
|
@@ -416,6 +414,8 @@ module RHACK
|
|
416
414
|
RMTools.rw @write_to+'/'+order[-2].sub(/^\w+:\/\//, ''), curl.res.body.xml_to_utf
|
417
415
|
end
|
418
416
|
if opts[:raw]
|
417
|
+
# curl.res уже создан, но
|
418
|
+
# вызываем curl, а не curl.res, чтобы проще было сделать retry, если нужно
|
419
419
|
page.res = block_given? ? yield(curl) : curl.body_str
|
420
420
|
# here +curl.res.body+ becomes empty
|
421
421
|
# curl.res.body.+xml_to_utf+ -- maybe this is problem?
|
@@ -427,11 +427,11 @@ module RHACK
|
|
427
427
|
}
|
428
428
|
# > Carier.requests++
|
429
429
|
unless opts[:wait] and opts[:thread_safe] or opts[:exec] == false
|
430
|
-
Curl.execute :
|
430
|
+
Curl.execute :raise_errors
|
431
431
|
end
|
432
432
|
if opts[:wait]
|
433
433
|
opts[:thread_safe] ? Curl.carier.perform : Curl.wait
|
434
|
-
(callback or :proc_result.in opts) ? page.res : page
|
434
|
+
(callback or opts[:raw] or :proc_result.in opts) ? page.res : page
|
435
435
|
else page
|
436
436
|
end
|
437
437
|
end
|
data/lib/rhack/version.rb
CHANGED
metadata
CHANGED
@@ -1,14 +1,14 @@
|
|
1
1
|
--- !ruby/object:Gem::Specification
|
2
2
|
name: rhack
|
3
3
|
version: !ruby/object:Gem::Version
|
4
|
-
version: 1.3.
|
4
|
+
version: 1.3.5
|
5
5
|
platform: ruby
|
6
6
|
authors:
|
7
7
|
- Sergey Baev
|
8
8
|
autorequire:
|
9
9
|
bindir: bin
|
10
10
|
cert_chain: []
|
11
|
-
date: 2014-12-
|
11
|
+
date: 2014-12-11 00:00:00.000000000 Z
|
12
12
|
dependencies:
|
13
13
|
- !ruby/object:Gem::Dependency
|
14
14
|
name: rmtools
|