weel 1.99.145 → 1.99.146
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/weel.rb +4 -7
- data/weel.gemspec +1 -1
- metadata +1 -1
checksums.yaml
CHANGED
|
@@ -1,7 +1,7 @@
|
|
|
1
1
|
---
|
|
2
2
|
SHA256:
|
|
3
|
-
metadata.gz:
|
|
4
|
-
data.tar.gz:
|
|
3
|
+
metadata.gz: 3adf52491902c7f91cc38716851228a7701c6db9823ee61239a15ca3669e4810
|
|
4
|
+
data.tar.gz: 247f4a435c6e669603ef1f1f724f2c2c99f2a9619849b8cb867fa60daffb21c5
|
|
5
5
|
SHA512:
|
|
6
|
-
metadata.gz:
|
|
7
|
-
data.tar.gz:
|
|
6
|
+
metadata.gz: fe8308c46d155aa43736d735c1ff37d49a1907dbe3836b8a0cb00b20215f120a21c4a91ed6b0112c7eed5337e38da06f2a8eadd678a53e1c21a1ea902af1842f
|
|
7
|
+
data.tar.gz: 798a797052a14b030569c34d7bbeb917b5701a7d9e5d4b37b4ffc57ab0be3ae232a56a4cb3aa5aefe226503f59ac074237b1b445a2287386be80509abcaf8951
|
data/lib/weel.rb
CHANGED
|
@@ -357,9 +357,6 @@ class WEEL
|
|
|
357
357
|
def activity_handle(passthrough, parameters); end
|
|
358
358
|
def activity_manipulate_handle(parameters); end
|
|
359
359
|
|
|
360
|
-
def activity_result_value; end
|
|
361
|
-
def activity_result_options; end
|
|
362
|
-
|
|
363
360
|
def activity_stop; end
|
|
364
361
|
def activity_passthrough_value; end
|
|
365
362
|
def activity_uuid; '42424242-cpee-cpee-cpee-424242424242'; end
|
|
@@ -938,8 +935,8 @@ class WEEL
|
|
|
938
935
|
|
|
939
936
|
# with loop if catching Signal::Again
|
|
940
937
|
# handshake call and wait until it finished
|
|
941
|
-
waitingresult = nil
|
|
942
|
-
waitingresult = Thread.current[:continue].wait unless Thread.current[:nolongernecessary] || self.__weel_state == :stopping || self.__weel_state == :finishing || self.__weel_state == :stopped
|
|
938
|
+
waitingresult = activity_result_value = activity_result_options = nil
|
|
939
|
+
waitingresult, activity_result_value, activity_result_options = Thread.current[:continue].wait unless Thread.current[:nolongernecessary] || self.__weel_state == :stopping || self.__weel_state == :finishing || self.__weel_state == :stopped
|
|
943
940
|
|
|
944
941
|
if Thread.current[:nolongernecessary]
|
|
945
942
|
raise Signal::NoLongerNecessary
|
|
@@ -950,7 +947,7 @@ class WEEL
|
|
|
950
947
|
raise Signal::Proceed if wp.passthrough # if stop, but no passthrough, let manipulate happen and then stop
|
|
951
948
|
end
|
|
952
949
|
|
|
953
|
-
next if waitingresult == WEEL::Signal::UpdateAgain && (
|
|
950
|
+
next if waitingresult == WEEL::Signal::UpdateAgain && (activity_result_value.nil? || activity_result_value&.length == 0)
|
|
954
951
|
|
|
955
952
|
code, cmess = if waitingresult == WEEL::Signal::UpdateAgain
|
|
956
953
|
[update, 'update']
|
|
@@ -969,7 +966,7 @@ class WEEL
|
|
|
969
966
|
|
|
970
967
|
# when you throw without parameters, ma contains nil, so we return Signal::Proceed to give ma a meaningful value in other cases
|
|
971
968
|
ma = catch Signal::Again do
|
|
972
|
-
struct = connectionwrapper.manipulate(false,@__weel_lock,@__weel_data,@__weel_endpoints,@__weel_status,Thread.current[:local],connectionwrapper.additional,code,'Activity ' + position.to_s + ' ' + cmess,
|
|
969
|
+
struct = connectionwrapper.manipulate(false,@__weel_lock,@__weel_data,@__weel_endpoints,@__weel_status,Thread.current[:local],connectionwrapper.additional,code,'Activity ' + position.to_s + ' ' + cmess,activity_result_value,activity_result_options)
|
|
973
970
|
Signal::Proceed
|
|
974
971
|
end
|
|
975
972
|
if signal
|
data/weel.gemspec
CHANGED