ampedxx-yrpc 0.1.4 → 0.1.6
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/.gitignore +2 -0
- data/.idea/.rakeTasks +1 -1
- data/.idea/misc.xml +3 -0
- data/.idea/workspace.xml +412 -53
- data/.idea/yrpc.iml +0 -3
- data/lib/yrpc/helpers/autoload.rb +8 -7
- data/lib/yrpc/version.rb +1 -1
- metadata +2 -3
- data/.idea/inspectionProfiles/Project_Default.xml +0 -6
checksums.yaml
CHANGED
|
@@ -1,7 +1,7 @@
|
|
|
1
1
|
---
|
|
2
2
|
SHA1:
|
|
3
|
-
metadata.gz:
|
|
4
|
-
data.tar.gz:
|
|
3
|
+
metadata.gz: 4ecbc430ebcb57e75a5363e21199587bf51fcd76
|
|
4
|
+
data.tar.gz: 37d26c382f6a542bf64d435c92be522e7c3a9571
|
|
5
5
|
SHA512:
|
|
6
|
-
metadata.gz:
|
|
7
|
-
data.tar.gz:
|
|
6
|
+
metadata.gz: 321c5c0d936dc49d6a0c34c83c2b0149d828cb018a5627d616f784fa9b3d90dbf01f189bd7d8cad7d51c7aa1ad09e7734a1b7190b091cf0197d43a29bf81c2b5
|
|
7
|
+
data.tar.gz: eb98acd4c5f3abf18edcf17cc91cb9c382eda80aaab306e9c5ac6276524aa959fb25aaf5e64ba3e9e99d31dd0ddc992a7c4ee7fa5dfebf53538133cb4ebd7f9c
|
data/.gitignore
CHANGED
data/.idea/.rakeTasks
CHANGED
|
@@ -4,4 +4,4 @@ You are allowed to:
|
|
|
4
4
|
1. Remove rake task
|
|
5
5
|
2. Add existing rake tasks
|
|
6
6
|
To add existing rake tasks automatically delete this file and reload the project.
|
|
7
|
-
--><RakeGroup description="" fullCmd="" taksId="rake" /></Settings>
|
|
7
|
+
--><RakeGroup description="" fullCmd="" taksId="rake"><RakeTask description="Build ampedxx-yrpc-0.1.6.gem into the pkg directory" fullCmd="build" taksId="build" /><RakeTask description="Remove any temporary products" fullCmd="clean" taksId="clean" /><RakeTask description="Remove any generated files" fullCmd="clobber" taksId="clobber" /><RakeTask description="Build and install ampedxx-yrpc-0.1.6.gem into system gems" fullCmd="install" taksId="install" /><RakeGroup description="" fullCmd="" taksId="install"><RakeTask description="Build and install ampedxx-yrpc-0.1.6.gem into system gems without network access" fullCmd="install:local" taksId="local" /></RakeGroup><RakeTask description="Create tag v0.1.6 and build and push ampedxx-yrpc-0.1.6.gem to rubygems.org" fullCmd="release[remote]" taksId="release[remote]" /><RakeTask description="Run RSpec code examples" fullCmd="spec" taksId="spec" /><RakeTask description="" fullCmd="default" taksId="default" /><RakeTask description="" fullCmd="release" taksId="release" /><RakeGroup description="" fullCmd="" taksId="release"><RakeTask description="" fullCmd="release:guard_clean" taksId="guard_clean" /><RakeTask description="" fullCmd="release:rubygem_push" taksId="rubygem_push" /><RakeTask description="" fullCmd="release:source_control_push" taksId="source_control_push" /></RakeGroup></RakeGroup></Settings>
|
data/.idea/misc.xml
CHANGED
|
@@ -1,4 +1,7 @@
|
|
|
1
1
|
<?xml version="1.0" encoding="UTF-8"?>
|
|
2
2
|
<project version="4">
|
|
3
|
+
<component name="JavaScriptSettings">
|
|
4
|
+
<option name="languageLevel" value="ES6" />
|
|
5
|
+
</component>
|
|
3
6
|
<component name="ProjectRootManager" version="2" project-jdk-name="RVM: ruby-2.3.1" project-jdk-type="RUBY_SDK" />
|
|
4
7
|
</project>
|
data/.idea/workspace.xml
CHANGED
|
@@ -1,7 +1,15 @@
|
|
|
1
1
|
<?xml version="1.0" encoding="UTF-8"?>
|
|
2
2
|
<project version="4">
|
|
3
3
|
<component name="ChangeListManager">
|
|
4
|
+
<<<<<<< HEAD
|
|
4
5
|
<list default="true" id="02e2ec4d-ca67-4b03-9858-19be219d43ba" name="Default" comment="" />
|
|
6
|
+
=======
|
|
7
|
+
<list default="true" id="02e2ec4d-ca67-4b03-9858-19be219d43ba" name="Default" comment="">
|
|
8
|
+
<change beforePath="$PROJECT_DIR$/.idea/workspace.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/workspace.xml" afterDir="false" />
|
|
9
|
+
<change beforePath="$PROJECT_DIR$/.idea/yrpc.iml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/yrpc.iml" afterDir="false" />
|
|
10
|
+
<change beforePath="$PROJECT_DIR$/lib/yrpc/helpers/autoload.rb" beforeDir="false" afterPath="$PROJECT_DIR$/lib/yrpc/helpers/autoload.rb" afterDir="false" />
|
|
11
|
+
</list>
|
|
12
|
+
>>>>>>> ca7db938feed1e073c1384610a8e00dfe32459b9
|
|
5
13
|
<ignored path="yrpc.iws" />
|
|
6
14
|
<ignored path=".idea/workspace.xml" />
|
|
7
15
|
<ignored path=".idea/dataSources.local.xml" />
|
|
@@ -23,62 +31,56 @@
|
|
|
23
31
|
</component>
|
|
24
32
|
<component name="FileEditorManager">
|
|
25
33
|
<leaf SIDE_TABS_SIZE_LIMIT_KEY="300">
|
|
34
|
+
<<<<<<< HEAD
|
|
26
35
|
<file leaf-file-name="configuration.rb" pinned="false" current-in-tab="false">
|
|
27
36
|
<entry file="file://$PROJECT_DIR$/lib/yrpc/configuration.rb">
|
|
28
37
|
<provider selected="true" editor-type-id="text-editor">
|
|
29
|
-
<state relative-caret-position="
|
|
30
|
-
<caret line="
|
|
38
|
+
<state relative-caret-position="858">
|
|
39
|
+
<caret line="39" column="22" lean-forward="false" selection-start-line="39" selection-start-column="22" selection-end-line="39" selection-end-column="22" />
|
|
31
40
|
<folding />
|
|
32
|
-
|
|
33
|
-
|
|
34
|
-
|
|
35
|
-
</file>
|
|
36
|
-
<file leaf-file-name="yrpc.rb" pinned="false" current-in-tab="false">
|
|
37
|
-
<entry file="file://$PROJECT_DIR$/lib/yrpc.rb">
|
|
38
|
-
<provider selected="true" editor-type-id="text-editor">
|
|
39
|
-
<state relative-caret-position="481">
|
|
40
|
-
<caret line="24" column="0" lean-forward="false" selection-start-line="24" selection-start-column="0" selection-end-line="24" selection-end-column="0" />
|
|
41
|
-
<folding />
|
|
42
|
-
</state>
|
|
43
|
-
</provider>
|
|
44
|
-
</entry>
|
|
45
|
-
</file>
|
|
46
|
-
<file leaf-file-name="console" pinned="false" current-in-tab="false">
|
|
47
|
-
<entry file="file://$PROJECT_DIR$/bin/console">
|
|
41
|
+
=======
|
|
42
|
+
<file leaf-file-name="client.rb" pinned="false" current-in-tab="false">
|
|
43
|
+
<entry file="file://$PROJECT_DIR$/lib/yrpc/client.rb">
|
|
48
44
|
<provider selected="true" editor-type-id="text-editor">
|
|
49
|
-
<state relative-caret-position="
|
|
50
|
-
<caret line="
|
|
51
|
-
|
|
52
|
-
</state>
|
|
53
|
-
</provider>
|
|
54
|
-
</entry>
|
|
55
|
-
</file>
|
|
56
|
-
<file leaf-file-name="Gemfile" pinned="false" current-in-tab="false">
|
|
57
|
-
<entry file="file://$PROJECT_DIR$/Gemfile">
|
|
58
|
-
<provider selected="true" editor-type-id="text-editor">
|
|
59
|
-
<state relative-caret-position="154">
|
|
60
|
-
<caret line="7" column="14" lean-forward="false" selection-start-line="7" selection-start-column="14" selection-end-line="7" selection-end-column="14" />
|
|
61
|
-
<folding />
|
|
45
|
+
<state relative-caret-position="390">
|
|
46
|
+
<caret line="26" column="7" selection-start-line="26" selection-start-column="7" selection-end-line="26" selection-end-column="7" />
|
|
47
|
+
>>>>>>> ca7db938feed1e073c1384610a8e00dfe32459b9
|
|
62
48
|
</state>
|
|
63
49
|
</provider>
|
|
64
50
|
</entry>
|
|
65
51
|
</file>
|
|
52
|
+
<<<<<<< HEAD
|
|
66
53
|
<file leaf-file-name="yrpc.gemspec" pinned="false" current-in-tab="true">
|
|
67
54
|
<entry file="file://$PROJECT_DIR$/yrpc.gemspec">
|
|
68
55
|
<provider selected="true" editor-type-id="text-editor">
|
|
69
|
-
<state relative-caret-position="
|
|
70
|
-
<caret line="
|
|
56
|
+
<state relative-caret-position="330">
|
|
57
|
+
<caret line="15" column="31" lean-forward="false" selection-start-line="15" selection-start-column="31" selection-end-line="15" selection-end-column="31" />
|
|
71
58
|
<folding />
|
|
59
|
+
=======
|
|
60
|
+
<file leaf-file-name="autoload.rb" pinned="false" current-in-tab="true">
|
|
61
|
+
<entry file="file://$PROJECT_DIR$/lib/yrpc/helpers/autoload.rb">
|
|
62
|
+
<provider selected="true" editor-type-id="text-editor">
|
|
63
|
+
<state relative-caret-position="45">
|
|
64
|
+
<caret line="3" column="11" selection-start-line="3" selection-start-column="11" selection-end-line="3" selection-end-column="11" />
|
|
65
|
+
>>>>>>> ca7db938feed1e073c1384610a8e00dfe32459b9
|
|
72
66
|
</state>
|
|
73
67
|
</provider>
|
|
74
68
|
</entry>
|
|
75
69
|
</file>
|
|
76
|
-
|
|
77
|
-
|
|
70
|
+
<<<<<<< HEAD
|
|
71
|
+
<file leaf-file-name="version.rb" pinned="false" current-in-tab="false">
|
|
72
|
+
<entry file="file://$PROJECT_DIR$/lib/yrpc/version.rb">
|
|
78
73
|
<provider selected="true" editor-type-id="text-editor">
|
|
79
74
|
<state relative-caret-position="22">
|
|
80
75
|
<caret line="1" column="18" lean-forward="false" selection-start-line="1" selection-start-column="18" selection-end-line="1" selection-end-column="18" />
|
|
81
76
|
<folding />
|
|
77
|
+
=======
|
|
78
|
+
<file leaf-file-name="yrpc.gemspec" pinned="false" current-in-tab="false">
|
|
79
|
+
<entry file="file://$PROJECT_DIR$/yrpc.gemspec">
|
|
80
|
+
<provider selected="true" editor-type-id="text-editor">
|
|
81
|
+
<state relative-caret-position="480">
|
|
82
|
+
<caret line="32" column="54" selection-start-line="32" selection-start-column="54" selection-end-line="32" selection-end-column="54" />
|
|
83
|
+
>>>>>>> ca7db938feed1e073c1384610a8e00dfe32459b9
|
|
82
84
|
</state>
|
|
83
85
|
</provider>
|
|
84
86
|
</entry>
|
|
@@ -105,7 +107,10 @@
|
|
|
105
107
|
<option value="$PROJECT_DIR$/lib/yrpc/interceptors/register.rb" />
|
|
106
108
|
<option value="$PROJECT_DIR$/lib/yrpc/service.rb" />
|
|
107
109
|
<option value="$PROJECT_DIR$/bin/yrpc" />
|
|
110
|
+
<<<<<<< HEAD
|
|
111
|
+
=======
|
|
108
112
|
<option value="$PROJECT_DIR$/lib/yrpc/version.rb" />
|
|
113
|
+
>>>>>>> ca7db938feed1e073c1384610a8e00dfe32459b9
|
|
109
114
|
<option value="$PROJECT_DIR$/bin/yrpc-cli" />
|
|
110
115
|
<option value="$PROJECT_DIR$/lib/yrpc/interceptors/base.rb" />
|
|
111
116
|
<option value="$PROJECT_DIR$/lib/yrpc/interceptors/server_interceptor.rb" />
|
|
@@ -119,11 +124,19 @@
|
|
|
119
124
|
<option value="$PROJECT_DIR$/lib/yrpc.rb" />
|
|
120
125
|
<option value="$PROJECT_DIR$/lib/yrpc/configuration.rb" />
|
|
121
126
|
<option value="$PROJECT_DIR$/lib/yrpc/server.rb" />
|
|
127
|
+
<<<<<<< HEAD
|
|
122
128
|
<option value="$PROJECT_DIR$/lib/yrpc/helpers/autoload.rb" />
|
|
123
129
|
<option value="$PROJECT_DIR$/lib/yrpc/controllers/response.rb" />
|
|
124
130
|
<option value="$PROJECT_DIR$/lib/yrpc/controllers/service_binder.rb" />
|
|
125
131
|
<option value="$PROJECT_DIR$/Gemfile" />
|
|
126
132
|
<option value="$PROJECT_DIR$/yrpc.gemspec" />
|
|
133
|
+
<option value="$PROJECT_DIR$/lib/yrpc/version.rb" />
|
|
134
|
+
=======
|
|
135
|
+
<option value="$PROJECT_DIR$/yrpc.gemspec" />
|
|
136
|
+
<option value="$PROJECT_DIR$/lib/yrpc/controllers/response.rb" />
|
|
137
|
+
<option value="$PROJECT_DIR$/lib/yrpc/controllers/service_binder.rb" />
|
|
138
|
+
<option value="$PROJECT_DIR$/lib/yrpc/helpers/autoload.rb" />
|
|
139
|
+
>>>>>>> ca7db938feed1e073c1384610a8e00dfe32459b9
|
|
127
140
|
</list>
|
|
128
141
|
</option>
|
|
129
142
|
</component>
|
|
@@ -133,8 +146,9 @@
|
|
|
133
146
|
<detection-done>true</detection-done>
|
|
134
147
|
<sorting>DEFINITION_ORDER</sorting>
|
|
135
148
|
</component>
|
|
149
|
+
<<<<<<< HEAD
|
|
136
150
|
<component name="ProjectFrameBounds">
|
|
137
|
-
<option name="x" value="
|
|
151
|
+
<option name="x" value="26" />
|
|
138
152
|
<option name="y" value="23" />
|
|
139
153
|
<option name="width" value="1614" />
|
|
140
154
|
<option name="height" value="948" />
|
|
@@ -151,10 +165,26 @@
|
|
|
151
165
|
<autoscrollFromSource />
|
|
152
166
|
<sortByType />
|
|
153
167
|
<manualOrder />
|
|
168
|
+
=======
|
|
169
|
+
<component name="NodePackageJsonFileManager">
|
|
170
|
+
<packageJsonPaths />
|
|
171
|
+
</component>
|
|
172
|
+
<component name="ProjectFrameBounds">
|
|
173
|
+
<option name="y" value="23" />
|
|
174
|
+
<option name="width" value="1440" />
|
|
175
|
+
<option name="height" value="822" />
|
|
176
|
+
</component>
|
|
177
|
+
<component name="ProjectView">
|
|
178
|
+
<navigator proportions="" version="1">
|
|
179
|
+
>>>>>>> ca7db938feed1e073c1384610a8e00dfe32459b9
|
|
154
180
|
<foldersAlwaysOnTop value="true" />
|
|
155
181
|
</navigator>
|
|
156
182
|
<panes>
|
|
157
183
|
<pane id="Scope" />
|
|
184
|
+
<<<<<<< HEAD
|
|
185
|
+
<pane id="Scratches" />
|
|
186
|
+
=======
|
|
187
|
+
>>>>>>> ca7db938feed1e073c1384610a8e00dfe32459b9
|
|
158
188
|
<pane id="ProjectPane">
|
|
159
189
|
<subPane>
|
|
160
190
|
<expand>
|
|
@@ -165,13 +195,36 @@
|
|
|
165
195
|
<path>
|
|
166
196
|
<item name="yrpc" type="b2602c69:ProjectViewProjectNode" />
|
|
167
197
|
<item name="yrpc" type="462c0819:PsiDirectoryNode" />
|
|
198
|
+
<<<<<<< HEAD
|
|
168
199
|
<item name="bin" type="462c0819:PsiDirectoryNode" />
|
|
200
|
+
=======
|
|
201
|
+
<item name="lib" type="462c0819:PsiDirectoryNode" />
|
|
202
|
+
>>>>>>> ca7db938feed1e073c1384610a8e00dfe32459b9
|
|
203
|
+
</path>
|
|
204
|
+
<path>
|
|
205
|
+
<item name="yrpc" type="b2602c69:ProjectViewProjectNode" />
|
|
206
|
+
<item name="yrpc" type="462c0819:PsiDirectoryNode" />
|
|
207
|
+
<item name="lib" type="462c0819:PsiDirectoryNode" />
|
|
208
|
+
<<<<<<< HEAD
|
|
209
|
+
</path>
|
|
210
|
+
<path>
|
|
211
|
+
<item name="yrpc" type="b2602c69:ProjectViewProjectNode" />
|
|
212
|
+
<item name="External Libraries" type="cb654da1:ExternalLibrariesNode" />
|
|
213
|
+
=======
|
|
214
|
+
<item name="yrpc" type="462c0819:PsiDirectoryNode" />
|
|
215
|
+
</path>
|
|
216
|
+
<path>
|
|
217
|
+
<item name="yrpc" type="b2602c69:ProjectViewProjectNode" />
|
|
218
|
+
<item name="yrpc" type="462c0819:PsiDirectoryNode" />
|
|
219
|
+
<item name="lib" type="462c0819:PsiDirectoryNode" />
|
|
220
|
+
<item name="yrpc" type="462c0819:PsiDirectoryNode" />
|
|
221
|
+
<item name="helpers" type="462c0819:PsiDirectoryNode" />
|
|
222
|
+
>>>>>>> ca7db938feed1e073c1384610a8e00dfe32459b9
|
|
169
223
|
</path>
|
|
170
224
|
</expand>
|
|
171
225
|
<select />
|
|
172
226
|
</subPane>
|
|
173
227
|
</pane>
|
|
174
|
-
<pane id="Scratches" />
|
|
175
228
|
</panes>
|
|
176
229
|
</component>
|
|
177
230
|
<component name="PropertiesComponent">
|
|
@@ -200,6 +253,7 @@
|
|
|
200
253
|
</list>
|
|
201
254
|
</option>
|
|
202
255
|
</component>
|
|
256
|
+
<<<<<<< HEAD
|
|
203
257
|
<component name="RunManager" selected="Ruby.yrpc">
|
|
204
258
|
<configuration default="true" type="js.build_tools.gulp" factoryName="Gulp.js">
|
|
205
259
|
<node-interpreter>project</node-interpreter>
|
|
@@ -330,6 +384,9 @@
|
|
|
330
384
|
<envs />
|
|
331
385
|
<method />
|
|
332
386
|
</configuration>
|
|
387
|
+
=======
|
|
388
|
+
<component name="RunManager">
|
|
389
|
+
>>>>>>> ca7db938feed1e073c1384610a8e00dfe32459b9
|
|
333
390
|
<configuration name="yrpc" type="RubyRunConfigurationType" factoryName="Ruby" temporary="true">
|
|
334
391
|
<module name="yrpc" />
|
|
335
392
|
<RUBY_RUN_CONFIG NAME="RUBY_ARGS" VALUE="-e $stdout.sync=true;$stderr.sync=true;load($0=ARGV.shift)" />
|
|
@@ -337,10 +394,16 @@
|
|
|
337
394
|
<RUBY_RUN_CONFIG NAME="SHOULD_USE_SDK" VALUE="false" />
|
|
338
395
|
<RUBY_RUN_CONFIG NAME="ALTERN_SDK_NAME" VALUE="" />
|
|
339
396
|
<RUBY_RUN_CONFIG NAME="myPassParentEnvs" VALUE="true" />
|
|
397
|
+
<<<<<<< HEAD
|
|
340
398
|
<envs />
|
|
341
399
|
<EXTENSION ID="BundlerRunConfigurationExtension" bundleExecEnabled="true" />
|
|
342
400
|
<EXTENSION ID="JRubyRunConfigurationExtension" NailgunExecEnabled="false" />
|
|
343
401
|
<EXTENSION ID="RubyCoverageRunConfigurationExtension" enabled="false" sample_coverage="true" track_test_folders="true" runner="rcov">
|
|
402
|
+
=======
|
|
403
|
+
<EXTENSION ID="BundlerRunConfigurationExtension" bundleExecEnabled="true" />
|
|
404
|
+
<EXTENSION ID="JRubyRunConfigurationExtension" NailgunExecEnabled="false" />
|
|
405
|
+
<EXTENSION ID="RubyCoverageRunConfigurationExtension" track_test_folders="true" runner="rcov">
|
|
406
|
+
>>>>>>> ca7db938feed1e073c1384610a8e00dfe32459b9
|
|
344
407
|
<COVERAGE_PATTERN ENABLED="true">
|
|
345
408
|
<PATTERN REGEXPS="/.rvm/" INCLUDED="false" />
|
|
346
409
|
</COVERAGE_PATTERN>
|
|
@@ -348,6 +411,7 @@
|
|
|
348
411
|
<RUBY_RUN_CONFIG NAME="SCRIPT_PATH" VALUE="$MODULE_DIR$/lib/yrpc.rb" />
|
|
349
412
|
<RUBY_RUN_CONFIG NAME="SCRIPT_ARGS" VALUE="" />
|
|
350
413
|
</configuration>
|
|
414
|
+
<<<<<<< HEAD
|
|
351
415
|
<recent_temporary>
|
|
352
416
|
<list size="1">
|
|
353
417
|
<item index="0" class="java.lang.String" itemvalue="Ruby.yrpc" />
|
|
@@ -358,6 +422,23 @@
|
|
|
358
422
|
<option name="remove_strategy" value="false" />
|
|
359
423
|
</component>
|
|
360
424
|
<component name="SpringUtil" SPRING_PRE_LOADER_OPTION="false" />
|
|
425
|
+
=======
|
|
426
|
+
<configuration default="true" type="js.build_tools.gulp" factoryName="Gulp.js">
|
|
427
|
+
<node-interpreter>project</node-interpreter>
|
|
428
|
+
<node-options />
|
|
429
|
+
<gulpfile />
|
|
430
|
+
<tasks />
|
|
431
|
+
<arguments />
|
|
432
|
+
<envs />
|
|
433
|
+
</configuration>
|
|
434
|
+
<recent_temporary>
|
|
435
|
+
<list>
|
|
436
|
+
<item itemvalue="Ruby.yrpc" />
|
|
437
|
+
</list>
|
|
438
|
+
</recent_temporary>
|
|
439
|
+
</component>
|
|
440
|
+
<component name="SpringUtil" SPRING_PRE_LOADER_OPTION="true" />
|
|
441
|
+
>>>>>>> ca7db938feed1e073c1384610a8e00dfe32459b9
|
|
361
442
|
<component name="SvnConfiguration">
|
|
362
443
|
<configuration />
|
|
363
444
|
</component>
|
|
@@ -373,29 +454,39 @@
|
|
|
373
454
|
<workItem from="1523840760162" duration="5943000" />
|
|
374
455
|
<workItem from="1524108216859" duration="1593000" />
|
|
375
456
|
<workItem from="1524208605755" duration="899000" />
|
|
457
|
+
<<<<<<< HEAD
|
|
376
458
|
<workItem from="1526452353734" duration="2499000" />
|
|
377
459
|
<workItem from="1528269533806" duration="8000" />
|
|
378
460
|
<workItem from="1528336719873" duration="892000" />
|
|
379
461
|
<workItem from="1528338206952" duration="1888000" />
|
|
380
462
|
<workItem from="1528352272898" duration="279000" />
|
|
381
|
-
<workItem from="1528358958154" duration="
|
|
463
|
+
<workItem from="1528358958154" duration="2457000" />
|
|
464
|
+
<workItem from="1529894693130" duration="1941000" />
|
|
465
|
+
<workItem from="1529988973992" duration="965000" />
|
|
466
|
+
=======
|
|
467
|
+
<workItem from="1526452353734" duration="3337000" />
|
|
468
|
+
<workItem from="1526549212564" duration="151000" />
|
|
469
|
+
<workItem from="1529980433193" duration="1463000" />
|
|
470
|
+
<workItem from="1529991223589" duration="284000" />
|
|
471
|
+
>>>>>>> ca7db938feed1e073c1384610a8e00dfe32459b9
|
|
382
472
|
</task>
|
|
383
473
|
<servers />
|
|
384
474
|
</component>
|
|
385
475
|
<component name="TimeTrackingManager">
|
|
386
|
-
|
|
476
|
+
<<<<<<< HEAD
|
|
477
|
+
<option name="totallyTimeSpent" value="73936000" />
|
|
387
478
|
</component>
|
|
388
479
|
<component name="ToolWindowManager">
|
|
389
|
-
<frame x="
|
|
480
|
+
<frame x="26" y="23" width="1614" height="948" extended-state="0" />
|
|
390
481
|
<layout>
|
|
391
|
-
<window_info id="Project" active="false" anchor="left" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="true" show_stripe_button="true" weight="0.
|
|
482
|
+
<window_info id="Project" active="false" anchor="left" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="true" show_stripe_button="true" weight="0.28689566" sideWeight="0.5" order="0" side_tool="false" content_ui="tabs" />
|
|
392
483
|
<window_info id="TODO" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.33" sideWeight="0.5" order="6" side_tool="false" content_ui="tabs" />
|
|
393
484
|
<window_info id="Event Log" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.32942554" sideWeight="0.50763357" order="7" side_tool="true" content_ui="tabs" />
|
|
394
485
|
<window_info id="Database" active="false" anchor="right" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.33" sideWeight="0.5" order="3" side_tool="false" content_ui="tabs" />
|
|
395
486
|
<window_info id="Run" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.32936507" sideWeight="0.49713877" order="2" side_tool="false" content_ui="tabs" />
|
|
396
487
|
<window_info id="Version Control" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.33" sideWeight="0.5" order="7" side_tool="false" content_ui="tabs" />
|
|
397
488
|
<window_info id="Structure" active="false" anchor="left" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.25" sideWeight="0.5" order="1" side_tool="false" content_ui="tabs" />
|
|
398
|
-
<window_info id="Terminal" active="true" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="true" show_stripe_button="true" weight="0.
|
|
489
|
+
<window_info id="Terminal" active="true" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="true" show_stripe_button="true" weight="0.3059789" sideWeight="0.4923664" order="7" side_tool="false" content_ui="tabs" />
|
|
399
490
|
<window_info id="Debug" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.4" sideWeight="0.5" order="3" side_tool="false" content_ui="tabs" />
|
|
400
491
|
<window_info id="Favorites" active="false" anchor="left" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.33" sideWeight="0.5" order="2" side_tool="true" content_ui="tabs" />
|
|
401
492
|
<window_info id="Cvs" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.25" sideWeight="0.5" order="4" side_tool="false" content_ui="tabs" />
|
|
@@ -406,6 +497,34 @@
|
|
|
406
497
|
<window_info id="Hierarchy" active="false" anchor="right" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.25" sideWeight="0.5" order="2" side_tool="false" content_ui="combo" />
|
|
407
498
|
<window_info id="Find" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="true" show_stripe_button="true" weight="0.32804233" sideWeight="0.4914163" order="1" side_tool="false" content_ui="tabs" />
|
|
408
499
|
<window_info id="Ant Build" active="false" anchor="right" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.25" sideWeight="0.5" order="1" side_tool="false" content_ui="tabs" />
|
|
500
|
+
=======
|
|
501
|
+
<option name="totallyTimeSpent" value="67329000" />
|
|
502
|
+
</component>
|
|
503
|
+
<component name="ToolWindowManager">
|
|
504
|
+
<frame x="0" y="23" width="1440" height="822" extended-state="0" />
|
|
505
|
+
<editor active="true" />
|
|
506
|
+
<layout>
|
|
507
|
+
<window_info content_ui="combo" id="Project" order="0" visible="true" weight="0.27825466" />
|
|
508
|
+
<window_info anchor="bottom" id="TODO" order="6" />
|
|
509
|
+
<window_info active="true" anchor="bottom" id="Messages" order="7" sideWeight="0.49713877" visible="true" weight="0.32936507" />
|
|
510
|
+
<window_info anchor="bottom" id="Docker" order="7" show_stripe_button="false" />
|
|
511
|
+
<window_info anchor="bottom" id="Event Log" order="7" sideWeight="0.50858366" side_tool="true" weight="0.32804233" />
|
|
512
|
+
<window_info anchor="right" id="Database" order="3" />
|
|
513
|
+
<window_info anchor="bottom" id="Database Changes" order="7" show_stripe_button="false" />
|
|
514
|
+
<window_info anchor="bottom" id="Version Control" order="7" />
|
|
515
|
+
<window_info id="Structure" order="1" side_tool="true" weight="0.25" />
|
|
516
|
+
<window_info anchor="bottom" id="Terminal" order="7" />
|
|
517
|
+
<window_info id="Favorites" order="2" side_tool="true" />
|
|
518
|
+
<window_info anchor="right" content_ui="combo" id="Hierarchy" order="2" weight="0.25" />
|
|
519
|
+
<window_info anchor="bottom" id="Inspection" order="5" weight="0.4" />
|
|
520
|
+
<window_info anchor="right" id="Commander" internal_type="SLIDING" order="0" type="SLIDING" weight="0.4" />
|
|
521
|
+
<window_info anchor="right" id="Ant Build" order="1" weight="0.25" />
|
|
522
|
+
<window_info anchor="bottom" id="Run" order="2" sideWeight="0.49713877" weight="0.32936507" />
|
|
523
|
+
<window_info anchor="bottom" id="Debug" order="3" weight="0.4" />
|
|
524
|
+
<window_info anchor="bottom" id="Message" order="0" />
|
|
525
|
+
<window_info anchor="bottom" id="Cvs" order="4" weight="0.25" />
|
|
526
|
+
<window_info anchor="bottom" id="Find" order="1" sideWeight="0.4914163" visible="true" weight="0.32804233" />
|
|
527
|
+
>>>>>>> ca7db938feed1e073c1384610a8e00dfe32459b9
|
|
409
528
|
</layout>
|
|
410
529
|
</component>
|
|
411
530
|
<component name="TypeScriptGeneratedFilesManager">
|
|
@@ -422,6 +541,7 @@
|
|
|
422
541
|
<component name="VcsContentAnnotationSettings">
|
|
423
542
|
<option name="myLimit" value="2678400000" />
|
|
424
543
|
</component>
|
|
544
|
+
<<<<<<< HEAD
|
|
425
545
|
<component name="XDebuggerManager">
|
|
426
546
|
<breakpoint-manager />
|
|
427
547
|
<watches-manager />
|
|
@@ -438,171 +558,295 @@
|
|
|
438
558
|
<provider selected="true" editor-type-id="text-editor">
|
|
439
559
|
<state relative-caret-position="525">
|
|
440
560
|
<caret line="35" column="43" lean-forward="false" selection-start-line="35" selection-start-column="43" selection-end-line="35" selection-end-column="43" />
|
|
561
|
+
=======
|
|
562
|
+
<component name="editorHistoryManager">
|
|
563
|
+
<entry file="file://$PROJECT_DIR$/lib/yrpc/controllers/request.rb">
|
|
564
|
+
<provider selected="true" editor-type-id="text-editor">
|
|
565
|
+
<state relative-caret-position="915">
|
|
566
|
+
<caret line="61" column="9" selection-start-line="61" selection-start-column="9" selection-end-line="61" selection-end-column="9" />
|
|
567
|
+
</state>
|
|
568
|
+
</provider>
|
|
569
|
+
</entry>
|
|
570
|
+
<entry file="file://$PROJECT_DIR$/lib/yrpc/executor/executor.rb">
|
|
571
|
+
<provider selected="true" editor-type-id="text-editor">
|
|
572
|
+
<state relative-caret-position="150">
|
|
573
|
+
<caret line="10" selection-start-line="10" selection-end-line="10" />
|
|
574
|
+
</state>
|
|
575
|
+
</provider>
|
|
576
|
+
</entry>
|
|
577
|
+
<entry file="file://$PROJECT_DIR$/Gemfile">
|
|
578
|
+
<provider selected="true" editor-type-id="text-editor">
|
|
579
|
+
<state relative-caret-position="75">
|
|
580
|
+
<caret line="5" column="7" selection-start-line="5" selection-start-column="7" selection-end-line="5" selection-end-column="7" />
|
|
581
|
+
</state>
|
|
582
|
+
</provider>
|
|
583
|
+
</entry>
|
|
584
|
+
<entry file="file://$PROJECT_DIR$/yrpc.gemspec">
|
|
585
|
+
<provider selected="true" editor-type-id="text-editor" />
|
|
586
|
+
</entry>
|
|
587
|
+
<entry file="file://$PROJECT_DIR$/lib/yrpc/controllers/base.rb">
|
|
588
|
+
<provider selected="true" editor-type-id="text-editor">
|
|
589
|
+
<state relative-caret-position="525">
|
|
590
|
+
<caret line="35" column="43" selection-start-line="35" selection-start-column="43" selection-end-line="35" selection-end-column="43" />
|
|
591
|
+
>>>>>>> ca7db938feed1e073c1384610a8e00dfe32459b9
|
|
441
592
|
</state>
|
|
442
593
|
</provider>
|
|
443
594
|
</entry>
|
|
444
595
|
<entry file="file://$PROJECT_DIR$/lib/yrpc.rb">
|
|
445
596
|
<provider selected="true" editor-type-id="text-editor">
|
|
446
597
|
<state relative-caret-position="360">
|
|
598
|
+
<<<<<<< HEAD
|
|
447
599
|
<caret line="24" column="0" lean-forward="false" selection-start-line="24" selection-start-column="0" selection-end-line="24" selection-end-column="0" />
|
|
600
|
+
=======
|
|
601
|
+
<caret line="24" selection-start-line="24" selection-end-line="24" />
|
|
602
|
+
>>>>>>> ca7db938feed1e073c1384610a8e00dfe32459b9
|
|
448
603
|
</state>
|
|
449
604
|
</provider>
|
|
450
605
|
</entry>
|
|
451
606
|
<entry file="file://$PROJECT_DIR$/lib/yrpc/helpers/autoload.rb">
|
|
452
607
|
<provider selected="true" editor-type-id="text-editor">
|
|
453
608
|
<state relative-caret-position="60">
|
|
609
|
+
<<<<<<< HEAD
|
|
454
610
|
<caret line="4" column="94" lean-forward="false" selection-start-line="4" selection-start-column="94" selection-end-line="4" selection-end-column="94" />
|
|
611
|
+
=======
|
|
612
|
+
<caret line="4" column="94" selection-start-line="4" selection-start-column="94" selection-end-line="4" selection-end-column="94" />
|
|
613
|
+
>>>>>>> ca7db938feed1e073c1384610a8e00dfe32459b9
|
|
455
614
|
</state>
|
|
456
615
|
</provider>
|
|
457
616
|
</entry>
|
|
458
617
|
<entry file="file://$PROJECT_DIR$/lib/yrpc/controllers/service_binder.rb">
|
|
459
618
|
<provider selected="true" editor-type-id="text-editor">
|
|
460
619
|
<state relative-caret-position="525">
|
|
620
|
+
<<<<<<< HEAD
|
|
461
621
|
<caret line="35" column="8" lean-forward="false" selection-start-line="35" selection-start-column="8" selection-end-line="35" selection-end-column="8" />
|
|
622
|
+
=======
|
|
623
|
+
<caret line="35" column="8" selection-start-line="35" selection-start-column="8" selection-end-line="35" selection-end-column="8" />
|
|
624
|
+
>>>>>>> ca7db938feed1e073c1384610a8e00dfe32459b9
|
|
462
625
|
</state>
|
|
463
626
|
</provider>
|
|
464
627
|
</entry>
|
|
465
628
|
<entry file="file://$PROJECT_DIR$/lib/yrpc/outbound/request_context.rb">
|
|
466
629
|
<provider selected="true" editor-type-id="text-editor">
|
|
467
630
|
<state relative-caret-position="225">
|
|
631
|
+
<<<<<<< HEAD
|
|
468
632
|
<caret line="15" column="11" lean-forward="false" selection-start-line="15" selection-start-column="11" selection-end-line="15" selection-end-column="11" />
|
|
633
|
+
=======
|
|
634
|
+
<caret line="15" column="11" selection-start-line="15" selection-start-column="11" selection-end-line="15" selection-end-column="11" />
|
|
635
|
+
>>>>>>> ca7db938feed1e073c1384610a8e00dfe32459b9
|
|
469
636
|
</state>
|
|
470
637
|
</provider>
|
|
471
638
|
</entry>
|
|
472
639
|
<entry file="file://$PROJECT_DIR$/lib/yrpc/interceptors/client_interceptor.rb">
|
|
473
640
|
<provider selected="true" editor-type-id="text-editor">
|
|
474
641
|
<state relative-caret-position="465">
|
|
642
|
+
<<<<<<< HEAD
|
|
475
643
|
<caret line="31" column="7" lean-forward="false" selection-start-line="31" selection-start-column="7" selection-end-line="31" selection-end-column="13" />
|
|
644
|
+
=======
|
|
645
|
+
<caret line="31" column="7" selection-start-line="31" selection-start-column="7" selection-end-line="31" selection-end-column="13" />
|
|
646
|
+
>>>>>>> ca7db938feed1e073c1384610a8e00dfe32459b9
|
|
476
647
|
</state>
|
|
477
648
|
</provider>
|
|
478
649
|
</entry>
|
|
479
650
|
<entry file="file://$PROJECT_DIR$/lib/yrpc/server.rb">
|
|
480
651
|
<provider selected="true" editor-type-id="text-editor">
|
|
481
652
|
<state relative-caret-position="225">
|
|
653
|
+
<<<<<<< HEAD
|
|
482
654
|
<caret line="15" column="22" lean-forward="false" selection-start-line="15" selection-start-column="22" selection-end-line="15" selection-end-column="22" />
|
|
655
|
+
=======
|
|
656
|
+
<caret line="15" column="22" selection-start-line="15" selection-start-column="22" selection-end-line="15" selection-end-column="22" />
|
|
657
|
+
>>>>>>> ca7db938feed1e073c1384610a8e00dfe32459b9
|
|
483
658
|
</state>
|
|
484
659
|
</provider>
|
|
485
660
|
</entry>
|
|
486
661
|
<entry file="file://$PROJECT_DIR$/lib/yrpc/configuration.rb">
|
|
487
662
|
<provider selected="true" editor-type-id="text-editor">
|
|
488
663
|
<state relative-caret-position="135">
|
|
664
|
+
<<<<<<< HEAD
|
|
489
665
|
<caret line="9" column="31" lean-forward="false" selection-start-line="9" selection-start-column="31" selection-end-line="9" selection-end-column="42" />
|
|
666
|
+
=======
|
|
667
|
+
<caret line="9" column="31" selection-start-line="9" selection-start-column="31" selection-end-line="9" selection-end-column="42" />
|
|
668
|
+
>>>>>>> ca7db938feed1e073c1384610a8e00dfe32459b9
|
|
490
669
|
</state>
|
|
491
670
|
</provider>
|
|
492
671
|
</entry>
|
|
493
672
|
<entry file="file://$PROJECT_DIR$/lib/yrpc/controllers/request.rb">
|
|
494
673
|
<provider selected="true" editor-type-id="text-editor">
|
|
495
674
|
<state relative-caret-position="915">
|
|
675
|
+
<<<<<<< HEAD
|
|
496
676
|
<caret line="61" column="9" lean-forward="false" selection-start-line="61" selection-start-column="9" selection-end-line="61" selection-end-column="9" />
|
|
677
|
+
=======
|
|
678
|
+
<caret line="61" column="9" selection-start-line="61" selection-start-column="9" selection-end-line="61" selection-end-column="9" />
|
|
679
|
+
>>>>>>> ca7db938feed1e073c1384610a8e00dfe32459b9
|
|
497
680
|
</state>
|
|
498
681
|
</provider>
|
|
499
682
|
</entry>
|
|
500
683
|
<entry file="file://$PROJECT_DIR$/lib/yrpc/executor/executor.rb">
|
|
501
684
|
<provider selected="true" editor-type-id="text-editor">
|
|
502
685
|
<state relative-caret-position="285">
|
|
686
|
+
<<<<<<< HEAD
|
|
503
687
|
<caret line="19" column="13" lean-forward="false" selection-start-line="19" selection-start-column="13" selection-end-line="19" selection-end-column="13" />
|
|
688
|
+
=======
|
|
689
|
+
<caret line="19" column="13" selection-start-line="19" selection-start-column="13" selection-end-line="19" selection-end-column="13" />
|
|
690
|
+
>>>>>>> ca7db938feed1e073c1384610a8e00dfe32459b9
|
|
504
691
|
</state>
|
|
505
692
|
</provider>
|
|
506
693
|
</entry>
|
|
507
694
|
<entry file="file://$PROJECT_DIR$/lib/yrpc/controllers/base.rb">
|
|
508
695
|
<provider selected="true" editor-type-id="text-editor">
|
|
509
696
|
<state relative-caret-position="255">
|
|
697
|
+
<<<<<<< HEAD
|
|
510
698
|
<caret line="17" column="9" lean-forward="false" selection-start-line="17" selection-start-column="9" selection-end-line="17" selection-end-column="9" />
|
|
699
|
+
=======
|
|
700
|
+
<caret line="17" column="9" selection-start-line="17" selection-start-column="9" selection-end-line="17" selection-end-column="9" />
|
|
701
|
+
>>>>>>> ca7db938feed1e073c1384610a8e00dfe32459b9
|
|
511
702
|
</state>
|
|
512
703
|
</provider>
|
|
513
704
|
</entry>
|
|
514
705
|
<entry file="file://$PROJECT_DIR$/lib/yrpc.rb">
|
|
515
706
|
<provider selected="true" editor-type-id="text-editor">
|
|
516
707
|
<state relative-caret-position="360">
|
|
708
|
+
<<<<<<< HEAD
|
|
517
709
|
<caret line="24" column="0" lean-forward="false" selection-start-line="24" selection-start-column="0" selection-end-line="24" selection-end-column="0" />
|
|
710
|
+
=======
|
|
711
|
+
<caret line="24" selection-start-line="24" selection-end-line="24" />
|
|
712
|
+
>>>>>>> ca7db938feed1e073c1384610a8e00dfe32459b9
|
|
518
713
|
</state>
|
|
519
714
|
</provider>
|
|
520
715
|
</entry>
|
|
521
716
|
<entry file="file://$PROJECT_DIR$/lib/yrpc/helpers/autoload.rb">
|
|
717
|
+
<<<<<<< HEAD
|
|
522
718
|
<provider selected="true" editor-type-id="text-editor">
|
|
523
719
|
<state relative-caret-position="0">
|
|
524
720
|
<caret line="0" column="0" lean-forward="false" selection-start-line="0" selection-start-column="0" selection-end-line="0" selection-end-column="0" />
|
|
525
721
|
</state>
|
|
526
722
|
</provider>
|
|
723
|
+
=======
|
|
724
|
+
<provider selected="true" editor-type-id="text-editor" />
|
|
725
|
+
>>>>>>> ca7db938feed1e073c1384610a8e00dfe32459b9
|
|
527
726
|
</entry>
|
|
528
727
|
<entry file="file://$PROJECT_DIR$/lib/yrpc/client.rb">
|
|
529
728
|
<provider selected="true" editor-type-id="text-editor">
|
|
530
729
|
<state relative-caret-position="765">
|
|
730
|
+
<<<<<<< HEAD
|
|
531
731
|
<caret line="51" column="55" lean-forward="false" selection-start-line="51" selection-start-column="5" selection-end-line="51" selection-end-column="55" />
|
|
732
|
+
=======
|
|
733
|
+
<caret line="51" column="55" selection-start-line="51" selection-start-column="5" selection-end-line="51" selection-end-column="55" />
|
|
734
|
+
>>>>>>> ca7db938feed1e073c1384610a8e00dfe32459b9
|
|
532
735
|
</state>
|
|
533
736
|
</provider>
|
|
534
737
|
</entry>
|
|
535
738
|
<entry file="file://$PROJECT_DIR$/lib/yrpc/controllers/service_binder.rb">
|
|
536
739
|
<provider selected="true" editor-type-id="text-editor">
|
|
537
740
|
<state relative-caret-position="525">
|
|
741
|
+
<<<<<<< HEAD
|
|
538
742
|
<caret line="35" column="8" lean-forward="false" selection-start-line="35" selection-start-column="8" selection-end-line="35" selection-end-column="8" />
|
|
743
|
+
=======
|
|
744
|
+
<caret line="35" column="8" selection-start-line="35" selection-start-column="8" selection-end-line="35" selection-end-column="8" />
|
|
745
|
+
>>>>>>> ca7db938feed1e073c1384610a8e00dfe32459b9
|
|
539
746
|
</state>
|
|
540
747
|
</provider>
|
|
541
748
|
</entry>
|
|
542
749
|
<entry file="file://$PROJECT_DIR$/lib/yrpc/interceptors/register.rb">
|
|
543
750
|
<provider selected="true" editor-type-id="text-editor">
|
|
544
751
|
<state relative-caret-position="375">
|
|
752
|
+
<<<<<<< HEAD
|
|
545
753
|
<caret line="25" column="7" lean-forward="false" selection-start-line="25" selection-start-column="7" selection-end-line="25" selection-end-column="7" />
|
|
754
|
+
=======
|
|
755
|
+
<caret line="25" column="7" selection-start-line="25" selection-start-column="7" selection-end-line="25" selection-end-column="7" />
|
|
756
|
+
>>>>>>> ca7db938feed1e073c1384610a8e00dfe32459b9
|
|
546
757
|
</state>
|
|
547
758
|
</provider>
|
|
548
759
|
</entry>
|
|
549
760
|
<entry file="file://$PROJECT_DIR$/lib/yrpc/interceptors/base.rb">
|
|
550
761
|
<provider selected="true" editor-type-id="text-editor">
|
|
551
762
|
<state relative-caret-position="210">
|
|
763
|
+
<<<<<<< HEAD
|
|
552
764
|
<caret line="14" column="9" lean-forward="false" selection-start-line="14" selection-start-column="9" selection-end-line="14" selection-end-column="9" />
|
|
765
|
+
=======
|
|
766
|
+
<caret line="14" column="9" selection-start-line="14" selection-start-column="9" selection-end-line="14" selection-end-column="9" />
|
|
767
|
+
>>>>>>> ca7db938feed1e073c1384610a8e00dfe32459b9
|
|
553
768
|
</state>
|
|
554
769
|
</provider>
|
|
555
770
|
</entry>
|
|
556
771
|
<entry file="file://$PROJECT_DIR$/lib/yrpc/executor/executor.rb">
|
|
557
772
|
<provider selected="true" editor-type-id="text-editor">
|
|
558
773
|
<state relative-caret-position="120">
|
|
774
|
+
<<<<<<< HEAD
|
|
559
775
|
<caret line="8" column="7" lean-forward="false" selection-start-line="8" selection-start-column="7" selection-end-line="8" selection-end-column="7" />
|
|
776
|
+
=======
|
|
777
|
+
<caret line="8" column="7" selection-start-line="8" selection-start-column="7" selection-end-line="8" selection-end-column="7" />
|
|
778
|
+
>>>>>>> ca7db938feed1e073c1384610a8e00dfe32459b9
|
|
560
779
|
</state>
|
|
561
780
|
</provider>
|
|
562
781
|
</entry>
|
|
563
782
|
<entry file="file://$PROJECT_DIR$/lib/yrpc/configuration.rb">
|
|
783
|
+
<<<<<<< HEAD
|
|
564
784
|
<provider selected="true" editor-type-id="text-editor">
|
|
565
785
|
<state relative-caret-position="0">
|
|
566
786
|
<caret line="0" column="0" lean-forward="false" selection-start-line="0" selection-start-column="0" selection-end-line="0" selection-end-column="0" />
|
|
567
787
|
</state>
|
|
568
788
|
</provider>
|
|
789
|
+
=======
|
|
790
|
+
<provider selected="true" editor-type-id="text-editor" />
|
|
791
|
+
>>>>>>> ca7db938feed1e073c1384610a8e00dfe32459b9
|
|
569
792
|
</entry>
|
|
570
793
|
<entry file="file://$PROJECT_DIR$/lib/yrpc/interceptors/active_record.rb">
|
|
571
794
|
<provider selected="true" editor-type-id="text-editor">
|
|
572
795
|
<state relative-caret-position="285">
|
|
796
|
+
<<<<<<< HEAD
|
|
573
797
|
<caret line="19" column="19" lean-forward="false" selection-start-line="19" selection-start-column="19" selection-end-line="19" selection-end-column="19" />
|
|
798
|
+
=======
|
|
799
|
+
<caret line="19" column="19" selection-start-line="19" selection-start-column="19" selection-end-line="19" selection-end-column="19" />
|
|
800
|
+
>>>>>>> ca7db938feed1e073c1384610a8e00dfe32459b9
|
|
574
801
|
</state>
|
|
575
802
|
</provider>
|
|
576
803
|
</entry>
|
|
577
804
|
<entry file="file://$PROJECT_DIR$/lib/yrpc/error/response_error.rb">
|
|
578
805
|
<provider selected="true" editor-type-id="text-editor">
|
|
579
806
|
<state relative-caret-position="15">
|
|
807
|
+
<<<<<<< HEAD
|
|
580
808
|
<caret line="1" column="14" lean-forward="false" selection-start-line="1" selection-start-column="14" selection-end-line="1" selection-end-column="14" />
|
|
809
|
+
=======
|
|
810
|
+
<caret line="1" column="14" selection-start-line="1" selection-start-column="14" selection-end-line="1" selection-end-column="14" />
|
|
811
|
+
>>>>>>> ca7db938feed1e073c1384610a8e00dfe32459b9
|
|
581
812
|
</state>
|
|
582
813
|
</provider>
|
|
583
814
|
</entry>
|
|
584
815
|
<entry file="file://$PROJECT_DIR$/lib/yrpc.rb">
|
|
585
816
|
<provider selected="true" editor-type-id="text-editor">
|
|
586
817
|
<state relative-caret-position="210">
|
|
818
|
+
<<<<<<< HEAD
|
|
587
819
|
<caret line="14" column="36" lean-forward="false" selection-start-line="14" selection-start-column="36" selection-end-line="14" selection-end-column="36" />
|
|
820
|
+
=======
|
|
821
|
+
<caret line="14" column="36" selection-start-line="14" selection-start-column="36" selection-end-line="14" selection-end-column="36" />
|
|
822
|
+
>>>>>>> ca7db938feed1e073c1384610a8e00dfe32459b9
|
|
588
823
|
</state>
|
|
589
824
|
</provider>
|
|
590
825
|
</entry>
|
|
591
826
|
<entry file="file://$PROJECT_DIR$/bin/yrpc-cli">
|
|
592
827
|
<provider selected="true" editor-type-id="text-editor">
|
|
593
828
|
<state relative-caret-position="240">
|
|
829
|
+
<<<<<<< HEAD
|
|
594
830
|
<caret line="16" column="0" lean-forward="false" selection-start-line="16" selection-start-column="0" selection-end-line="16" selection-end-column="0" />
|
|
831
|
+
=======
|
|
832
|
+
<caret line="16" selection-start-line="16" selection-end-line="16" />
|
|
833
|
+
>>>>>>> ca7db938feed1e073c1384610a8e00dfe32459b9
|
|
595
834
|
</state>
|
|
596
835
|
</provider>
|
|
597
836
|
</entry>
|
|
598
837
|
<entry file="file://$APPLICATION_HOME_DIR$/rubystubs23/condition_variable.rb">
|
|
599
838
|
<provider selected="true" editor-type-id="text-editor">
|
|
600
839
|
<state relative-caret-position="294">
|
|
840
|
+
<<<<<<< HEAD
|
|
601
841
|
<caret line="31" column="6" lean-forward="false" selection-start-line="31" selection-start-column="6" selection-end-line="31" selection-end-column="6" />
|
|
842
|
+
=======
|
|
843
|
+
<caret line="31" column="6" selection-start-line="31" selection-start-column="6" selection-end-line="31" selection-end-column="6" />
|
|
844
|
+
>>>>>>> ca7db938feed1e073c1384610a8e00dfe32459b9
|
|
602
845
|
</state>
|
|
603
846
|
</provider>
|
|
604
847
|
</entry>
|
|
605
848
|
<entry file="file://$PROJECT_DIR$/bin/setup">
|
|
849
|
+
<<<<<<< HEAD
|
|
606
850
|
<provider selected="true" editor-type-id="text-editor">
|
|
607
851
|
<state relative-caret-position="0">
|
|
608
852
|
<caret line="0" column="0" lean-forward="false" selection-start-line="0" selection-start-column="0" selection-end-line="0" selection-end-column="0" />
|
|
@@ -610,52 +854,78 @@
|
|
|
610
854
|
</provider>
|
|
611
855
|
</entry>
|
|
612
856
|
<entry file="file://$PROJECT_DIR$/bin/yrpc" />
|
|
857
|
+
=======
|
|
858
|
+
<provider selected="true" editor-type-id="text-editor" />
|
|
859
|
+
</entry>
|
|
860
|
+
<entry file="file://$PROJECT_DIR$/bin/yrpc" />
|
|
613
861
|
<entry file="file://$PROJECT_DIR$/lib/yrpc/version.rb">
|
|
614
862
|
<provider selected="true" editor-type-id="text-editor">
|
|
615
863
|
<state relative-caret-position="15">
|
|
616
|
-
<caret line="1" column="18"
|
|
864
|
+
<caret line="1" column="18" selection-start-line="1" selection-start-column="18" selection-end-line="1" selection-end-column="18" />
|
|
617
865
|
</state>
|
|
618
866
|
</provider>
|
|
619
867
|
</entry>
|
|
868
|
+
>>>>>>> ca7db938feed1e073c1384610a8e00dfe32459b9
|
|
620
869
|
<entry file="file://$PROJECT_DIR$/lib/yrpc/interceptors/server_interceptor.rb" />
|
|
621
870
|
<entry file="file://$PROJECT_DIR$/lib/yrpc/error/response_error.rb">
|
|
622
871
|
<provider selected="true" editor-type-id="text-editor">
|
|
623
872
|
<state relative-caret-position="15">
|
|
873
|
+
<<<<<<< HEAD
|
|
624
874
|
<caret line="1" column="14" lean-forward="false" selection-start-line="1" selection-start-column="14" selection-end-line="1" selection-end-column="14" />
|
|
875
|
+
=======
|
|
876
|
+
<caret line="1" column="14" selection-start-line="1" selection-start-column="14" selection-end-line="1" selection-end-column="14" />
|
|
877
|
+
>>>>>>> ca7db938feed1e073c1384610a8e00dfe32459b9
|
|
625
878
|
</state>
|
|
626
879
|
</provider>
|
|
627
880
|
</entry>
|
|
628
881
|
<entry file="file://$PROJECT_DIR$/lib/yrpc/interceptors/active_record.rb">
|
|
629
882
|
<provider selected="true" editor-type-id="text-editor">
|
|
630
883
|
<state relative-caret-position="285">
|
|
884
|
+
<<<<<<< HEAD
|
|
631
885
|
<caret line="19" column="19" lean-forward="false" selection-start-line="19" selection-start-column="19" selection-end-line="19" selection-end-column="19" />
|
|
886
|
+
=======
|
|
887
|
+
<caret line="19" column="19" selection-start-line="19" selection-start-column="19" selection-end-line="19" selection-end-column="19" />
|
|
888
|
+
>>>>>>> ca7db938feed1e073c1384610a8e00dfe32459b9
|
|
632
889
|
</state>
|
|
633
890
|
</provider>
|
|
634
891
|
</entry>
|
|
635
892
|
<entry file="file://$PROJECT_DIR$/bin/yrpc-cli">
|
|
636
893
|
<provider selected="true" editor-type-id="text-editor">
|
|
637
894
|
<state relative-caret-position="240">
|
|
895
|
+
<<<<<<< HEAD
|
|
638
896
|
<caret line="16" column="0" lean-forward="false" selection-start-line="16" selection-start-column="0" selection-end-line="16" selection-end-column="0" />
|
|
897
|
+
=======
|
|
898
|
+
<caret line="16" selection-start-line="16" selection-end-line="16" />
|
|
899
|
+
>>>>>>> ca7db938feed1e073c1384610a8e00dfe32459b9
|
|
639
900
|
</state>
|
|
640
901
|
</provider>
|
|
641
902
|
</entry>
|
|
642
903
|
<entry file="file://$PROJECT_DIR$/lib/yrpc/interceptors/base.rb">
|
|
643
904
|
<provider selected="true" editor-type-id="text-editor">
|
|
644
905
|
<state relative-caret-position="210">
|
|
906
|
+
<<<<<<< HEAD
|
|
645
907
|
<caret line="14" column="9" lean-forward="false" selection-start-line="14" selection-start-column="9" selection-end-line="14" selection-end-column="9" />
|
|
908
|
+
=======
|
|
909
|
+
<caret line="14" column="9" selection-start-line="14" selection-start-column="9" selection-end-line="14" selection-end-column="9" />
|
|
910
|
+
>>>>>>> ca7db938feed1e073c1384610a8e00dfe32459b9
|
|
646
911
|
</state>
|
|
647
912
|
</provider>
|
|
648
913
|
</entry>
|
|
649
914
|
<entry file="file://$PROJECT_DIR$/lib/yrpc/interceptors/register.rb">
|
|
650
915
|
<provider selected="true" editor-type-id="text-editor">
|
|
651
916
|
<state relative-caret-position="375">
|
|
917
|
+
<<<<<<< HEAD
|
|
652
918
|
<caret line="25" column="7" lean-forward="false" selection-start-line="25" selection-start-column="7" selection-end-line="25" selection-end-column="7" />
|
|
919
|
+
=======
|
|
920
|
+
<caret line="25" column="7" selection-start-line="25" selection-start-column="7" selection-end-line="25" selection-end-column="7" />
|
|
921
|
+
>>>>>>> ca7db938feed1e073c1384610a8e00dfe32459b9
|
|
653
922
|
</state>
|
|
654
923
|
</provider>
|
|
655
924
|
</entry>
|
|
656
925
|
<entry file="file://$PROJECT_DIR$/lib/yrpc/interceptors/client_interceptor.rb">
|
|
657
926
|
<provider selected="true" editor-type-id="text-editor">
|
|
658
927
|
<state relative-caret-position="465">
|
|
928
|
+
<<<<<<< HEAD
|
|
659
929
|
<caret line="31" column="7" lean-forward="false" selection-start-line="31" selection-start-column="7" selection-end-line="31" selection-end-column="13" />
|
|
660
930
|
</state>
|
|
661
931
|
</provider>
|
|
@@ -678,19 +948,34 @@
|
|
|
678
948
|
<provider selected="true" editor-type-id="text-editor">
|
|
679
949
|
<state relative-caret-position="375">
|
|
680
950
|
<caret line="26" column="7" lean-forward="false" selection-start-line="26" selection-start-column="7" selection-end-line="26" selection-end-column="7" />
|
|
951
|
+
=======
|
|
952
|
+
<caret line="31" column="7" selection-start-line="31" selection-start-column="7" selection-end-line="31" selection-end-column="13" />
|
|
953
|
+
</state>
|
|
954
|
+
</provider>
|
|
955
|
+
</entry>
|
|
956
|
+
<entry file="file://$PROJECT_DIR$/lib/yrpc/configuration.rb">
|
|
957
|
+
<provider selected="true" editor-type-id="text-editor">
|
|
958
|
+
<state relative-caret-position="135">
|
|
959
|
+
<caret line="9" column="31" selection-start-line="9" selection-start-column="31" selection-end-line="9" selection-end-column="42" />
|
|
960
|
+
>>>>>>> ca7db938feed1e073c1384610a8e00dfe32459b9
|
|
681
961
|
</state>
|
|
682
962
|
</provider>
|
|
683
963
|
</entry>
|
|
684
964
|
<entry file="file://$PROJECT_DIR$/lib/yrpc/server.rb">
|
|
685
965
|
<provider selected="true" editor-type-id="text-editor">
|
|
686
966
|
<state relative-caret-position="210">
|
|
967
|
+
<<<<<<< HEAD
|
|
687
968
|
<caret line="15" column="22" lean-forward="false" selection-start-line="15" selection-start-column="22" selection-end-line="15" selection-end-column="22" />
|
|
969
|
+
=======
|
|
970
|
+
<caret line="15" column="22" selection-start-line="15" selection-start-column="22" selection-end-line="15" selection-end-column="22" />
|
|
971
|
+
>>>>>>> ca7db938feed1e073c1384610a8e00dfe32459b9
|
|
688
972
|
</state>
|
|
689
973
|
</provider>
|
|
690
974
|
</entry>
|
|
691
975
|
<entry file="file://$PROJECT_DIR$/lib/yrpc/controllers/request.rb">
|
|
692
976
|
<provider selected="true" editor-type-id="text-editor">
|
|
693
977
|
<state relative-caret-position="450">
|
|
978
|
+
<<<<<<< HEAD
|
|
694
979
|
<caret line="61" column="9" lean-forward="false" selection-start-line="61" selection-start-column="9" selection-end-line="61" selection-end-column="9" />
|
|
695
980
|
</state>
|
|
696
981
|
</provider>
|
|
@@ -699,12 +984,16 @@
|
|
|
699
984
|
<provider selected="true" editor-type-id="text-editor">
|
|
700
985
|
<state relative-caret-position="150">
|
|
701
986
|
<caret line="10" column="0" lean-forward="false" selection-start-line="10" selection-start-column="0" selection-end-line="10" selection-end-column="0" />
|
|
987
|
+
=======
|
|
988
|
+
<caret line="61" column="9" selection-start-line="61" selection-start-column="9" selection-end-line="61" selection-end-column="9" />
|
|
989
|
+
>>>>>>> ca7db938feed1e073c1384610a8e00dfe32459b9
|
|
702
990
|
</state>
|
|
703
991
|
</provider>
|
|
704
992
|
</entry>
|
|
705
993
|
<entry file="file://$PROJECT_DIR$/lib/yrpc/outbound/request_context.rb">
|
|
706
994
|
<provider selected="true" editor-type-id="text-editor">
|
|
707
995
|
<state relative-caret-position="-420">
|
|
996
|
+
<<<<<<< HEAD
|
|
708
997
|
<caret line="15" column="11" lean-forward="false" selection-start-line="15" selection-start-column="11" selection-end-line="15" selection-end-column="11" />
|
|
709
998
|
</state>
|
|
710
999
|
</provider>
|
|
@@ -734,27 +1023,73 @@
|
|
|
734
1023
|
<provider selected="true" editor-type-id="text-editor">
|
|
735
1024
|
<state relative-caret-position="66">
|
|
736
1025
|
<caret line="3" column="14" lean-forward="false" selection-start-line="3" selection-start-column="14" selection-end-line="3" selection-end-column="14" />
|
|
737
|
-
|
|
1026
|
+
=======
|
|
1027
|
+
<caret line="15" column="11" selection-start-line="15" selection-start-column="11" selection-end-line="15" selection-end-column="11" />
|
|
1028
|
+
</state>
|
|
1029
|
+
</provider>
|
|
1030
|
+
</entry>
|
|
1031
|
+
<entry file="file://$PROJECT_DIR$/lib/yrpc/controllers/base.rb">
|
|
1032
|
+
<provider selected="true" editor-type-id="text-editor">
|
|
1033
|
+
<state relative-caret-position="210">
|
|
1034
|
+
<caret line="15" column="17" selection-start-line="15" selection-start-column="17" selection-end-line="15" selection-end-column="17" />
|
|
1035
|
+
</state>
|
|
1036
|
+
</provider>
|
|
1037
|
+
</entry>
|
|
1038
|
+
<entry file="file://$PROJECT_DIR$/lib/yrpc/controllers/response.rb">
|
|
1039
|
+
<provider selected="true" editor-type-id="text-editor">
|
|
1040
|
+
<state relative-caret-position="1500">
|
|
1041
|
+
<caret line="100" column="7" selection-start-line="100" selection-start-column="7" selection-end-line="100" selection-end-column="7" />
|
|
1042
|
+
</state>
|
|
1043
|
+
</provider>
|
|
1044
|
+
</entry>
|
|
1045
|
+
<entry file="file://$PROJECT_DIR$/Gemfile">
|
|
1046
|
+
<provider selected="true" editor-type-id="text-editor">
|
|
1047
|
+
<state relative-caret-position="75">
|
|
1048
|
+
<caret line="5" column="7" selection-start-line="5" selection-start-column="7" selection-end-line="5" selection-end-column="7" />
|
|
1049
|
+
</state>
|
|
1050
|
+
</provider>
|
|
1051
|
+
</entry>
|
|
1052
|
+
<entry file="file://$PROJECT_DIR$/lib/yrpc/controllers/service_binder.rb">
|
|
1053
|
+
<provider selected="true" editor-type-id="text-editor">
|
|
1054
|
+
<state relative-caret-position="780">
|
|
1055
|
+
<caret line="53" column="24" selection-start-line="53" selection-start-column="24" selection-end-line="53" selection-end-column="24" />
|
|
1056
|
+
>>>>>>> ca7db938feed1e073c1384610a8e00dfe32459b9
|
|
738
1057
|
</state>
|
|
739
1058
|
</provider>
|
|
740
1059
|
</entry>
|
|
741
1060
|
<entry file="file://$PROJECT_DIR$/lib/yrpc.rb">
|
|
742
1061
|
<provider selected="true" editor-type-id="text-editor">
|
|
1062
|
+
<<<<<<< HEAD
|
|
743
1063
|
<state relative-caret-position="481">
|
|
744
1064
|
<caret line="24" column="0" lean-forward="false" selection-start-line="24" selection-start-column="0" selection-end-line="24" selection-end-column="0" />
|
|
1065
|
+
</state>
|
|
1066
|
+
</provider>
|
|
1067
|
+
</entry>
|
|
1068
|
+
<entry file="file://$PROJECT_DIR$/Rakefile">
|
|
1069
|
+
<provider selected="true" editor-type-id="text-editor">
|
|
1070
|
+
<state relative-caret-position="22">
|
|
1071
|
+
<caret line="1" column="18" lean-forward="false" selection-start-line="1" selection-start-column="18" selection-end-line="1" selection-end-column="18" />
|
|
1072
|
+
<folding />
|
|
1073
|
+
</state>
|
|
1074
|
+
</provider>
|
|
1075
|
+
</entry>
|
|
1076
|
+
<entry file="file://$PROJECT_DIR$/Gemfile">
|
|
1077
|
+
<provider selected="true" editor-type-id="text-editor">
|
|
1078
|
+
<state relative-caret-position="154">
|
|
1079
|
+
<caret line="7" column="14" lean-forward="true" selection-start-line="7" selection-start-column="14" selection-end-line="7" selection-end-column="14" />
|
|
745
1080
|
<folding />
|
|
746
1081
|
</state>
|
|
747
1082
|
</provider>
|
|
748
1083
|
</entry>
|
|
749
1084
|
<entry file="file://$PROJECT_DIR$/lib/yrpc/configuration.rb">
|
|
750
1085
|
<provider selected="true" editor-type-id="text-editor">
|
|
751
|
-
<state relative-caret-position="
|
|
752
|
-
<caret line="
|
|
1086
|
+
<state relative-caret-position="858">
|
|
1087
|
+
<caret line="39" column="22" lean-forward="false" selection-start-line="39" selection-start-column="22" selection-end-line="39" selection-end-column="22" />
|
|
753
1088
|
<folding />
|
|
754
1089
|
</state>
|
|
755
1090
|
</provider>
|
|
756
1091
|
</entry>
|
|
757
|
-
<entry file="file://$PROJECT_DIR$/
|
|
1092
|
+
<entry file="file://$PROJECT_DIR$/lib/yrpc/version.rb">
|
|
758
1093
|
<provider selected="true" editor-type-id="text-editor">
|
|
759
1094
|
<state relative-caret-position="22">
|
|
760
1095
|
<caret line="1" column="18" lean-forward="false" selection-start-line="1" selection-start-column="18" selection-end-line="1" selection-end-column="18" />
|
|
@@ -762,19 +1097,43 @@
|
|
|
762
1097
|
</state>
|
|
763
1098
|
</provider>
|
|
764
1099
|
</entry>
|
|
765
|
-
<entry file="file://$PROJECT_DIR$/
|
|
1100
|
+
<entry file="file://$PROJECT_DIR$/yrpc.gemspec">
|
|
766
1101
|
<provider selected="true" editor-type-id="text-editor">
|
|
767
|
-
<state relative-caret-position="
|
|
768
|
-
<caret line="
|
|
1102
|
+
<state relative-caret-position="330">
|
|
1103
|
+
<caret line="15" column="31" lean-forward="false" selection-start-line="15" selection-start-column="31" selection-end-line="15" selection-end-column="31" />
|
|
769
1104
|
<folding />
|
|
1105
|
+
=======
|
|
1106
|
+
<state relative-caret-position="360">
|
|
1107
|
+
<caret line="24" selection-start-line="24" selection-end-line="24" />
|
|
1108
|
+
</state>
|
|
1109
|
+
</provider>
|
|
1110
|
+
</entry>
|
|
1111
|
+
<entry file="file://$PROJECT_DIR$/lib/yrpc/client.rb">
|
|
1112
|
+
<provider selected="true" editor-type-id="text-editor">
|
|
1113
|
+
<state relative-caret-position="390">
|
|
1114
|
+
<caret line="26" column="7" selection-start-line="26" selection-start-column="7" selection-end-line="26" selection-end-column="7" />
|
|
1115
|
+
</state>
|
|
1116
|
+
</provider>
|
|
1117
|
+
</entry>
|
|
1118
|
+
<entry file="file://$PROJECT_DIR$/lib/yrpc/executor/executor.rb">
|
|
1119
|
+
<provider selected="true" editor-type-id="text-editor">
|
|
1120
|
+
<state relative-caret-position="285">
|
|
1121
|
+
<caret line="19" column="13" selection-start-line="19" selection-start-column="13" selection-end-line="19" selection-end-column="13" />
|
|
770
1122
|
</state>
|
|
771
1123
|
</provider>
|
|
772
1124
|
</entry>
|
|
773
1125
|
<entry file="file://$PROJECT_DIR$/yrpc.gemspec">
|
|
774
1126
|
<provider selected="true" editor-type-id="text-editor">
|
|
775
|
-
<state relative-caret-position="
|
|
776
|
-
<caret line="
|
|
777
|
-
|
|
1127
|
+
<state relative-caret-position="480">
|
|
1128
|
+
<caret line="32" column="54" selection-start-line="32" selection-start-column="54" selection-end-line="32" selection-end-column="54" />
|
|
1129
|
+
</state>
|
|
1130
|
+
</provider>
|
|
1131
|
+
</entry>
|
|
1132
|
+
<entry file="file://$PROJECT_DIR$/lib/yrpc/helpers/autoload.rb">
|
|
1133
|
+
<provider selected="true" editor-type-id="text-editor">
|
|
1134
|
+
<state relative-caret-position="45">
|
|
1135
|
+
<caret line="3" column="11" selection-start-line="3" selection-start-column="11" selection-end-line="3" selection-end-column="11" />
|
|
1136
|
+
>>>>>>> ca7db938feed1e073c1384610a8e00dfe32459b9
|
|
778
1137
|
</state>
|
|
779
1138
|
</provider>
|
|
780
1139
|
</entry>
|
data/.idea/yrpc.iml
CHANGED
|
@@ -1,8 +1,5 @@
|
|
|
1
1
|
<?xml version="1.0" encoding="UTF-8"?>
|
|
2
2
|
<module type="RUBY_MODULE" version="4">
|
|
3
|
-
<component name="CompassSettings">
|
|
4
|
-
<option name="compassExecutableFilePath" value="$USER_HOME$/.rvm/gems/ruby-2.3.1/gems/compass-1.0.3/bin/compass" />
|
|
5
|
-
</component>
|
|
6
3
|
<component name="ModuleRunConfigurationManager">
|
|
7
4
|
<shared />
|
|
8
5
|
</component>
|
|
@@ -1,12 +1,13 @@
|
|
|
1
1
|
module Yrpc
|
|
2
2
|
module AutoLoading
|
|
3
|
-
def Object.const_missing name
|
|
4
|
-
|
|
5
|
-
|
|
6
|
-
|
|
7
|
-
|
|
8
|
-
|
|
9
|
-
|
|
3
|
+
# def Object.const_missing name
|
|
4
|
+
# super
|
|
5
|
+
# $LOAD_PATH << File.join("./", "yrpc_app", "controllers") unless $LOAD_PATH.include?("./yrpc_app/controllers")
|
|
6
|
+
# $LOAD_PATH << File.join("./", "yrpc_app", "models") unless $LOAD_PATH.include?("./yrpc_app/models")
|
|
7
|
+
# require Yrpc::Ruler.to_underscore(name.to_s)
|
|
8
|
+
# klass = Object.const_get(name)
|
|
9
|
+
# klass
|
|
10
|
+
# end
|
|
10
11
|
|
|
11
12
|
end
|
|
12
13
|
|
data/lib/yrpc/version.rb
CHANGED
metadata
CHANGED
|
@@ -1,14 +1,14 @@
|
|
|
1
1
|
--- !ruby/object:Gem::Specification
|
|
2
2
|
name: ampedxx-yrpc
|
|
3
3
|
version: !ruby/object:Gem::Version
|
|
4
|
-
version: 0.1.
|
|
4
|
+
version: 0.1.6
|
|
5
5
|
platform: ruby
|
|
6
6
|
authors:
|
|
7
7
|
- icepoint0
|
|
8
8
|
autorequire:
|
|
9
9
|
bindir: bin
|
|
10
10
|
cert_chain: []
|
|
11
|
-
date: 2018-06-
|
|
11
|
+
date: 2018-06-26 00:00:00.000000000 Z
|
|
12
12
|
dependencies:
|
|
13
13
|
- !ruby/object:Gem::Dependency
|
|
14
14
|
name: bundler
|
|
@@ -104,7 +104,6 @@ extra_rdoc_files: []
|
|
|
104
104
|
files:
|
|
105
105
|
- ".gitignore"
|
|
106
106
|
- ".idea/.rakeTasks"
|
|
107
|
-
- ".idea/inspectionProfiles/Project_Default.xml"
|
|
108
107
|
- ".idea/misc.xml"
|
|
109
108
|
- ".idea/modules.xml"
|
|
110
109
|
- ".idea/vcs.xml"
|