freewifi 0.2.3 → 0.2.4

Sign up to get free protection for your applications and to get access to all the features.
Files changed (15) hide show
  1. checksums.yaml +4 -4
  2. data/.idea/freewifi.iml +20 -1
  3. data/.idea/workspace.xml +251 -154
  4. data/Gemfile +1 -1
  5. data/freewifi.gemspec +23 -23
  6. data/lib/freewifi.rb +23 -22
  7. data/lib/freewifi/additional/additional_functions.rb +1 -1
  8. data/lib/freewifi/cisco/iwag/iwag_telnet_connector.rb +3 -3
  9. data/lib/freewifi/config.rb +1 -1
  10. data/lib/freewifi/general/wifi_portal_procedures.rb +1 -1
  11. data/lib/freewifi/mikrotik/newhub_mtik_api.rb +1 -3
  12. data/lib/freewifi/mikrotik/newhub_mtik_ssh.rb +11 -11
  13. data/lib/freewifi/mikrotik/schemes_conf_gen.rb +2 -2
  14. data/lib/freewifi/version.rb +1 -1
  15. metadata +2 -2
checksums.yaml CHANGED
@@ -1,7 +1,7 @@
1
1
  ---
2
2
  SHA1:
3
- metadata.gz: f31fde467b95b97d53c09380a4d42dadac4d223c
4
- data.tar.gz: ec699c7a6ff1fd70f86992f0a494b9e4833fce7b
3
+ metadata.gz: 04aa565effe9e910c64f32c7721d394a7f8c08b8
4
+ data.tar.gz: b991a95c72cc3313c96ccd8354fc069a5f921201
5
5
  SHA512:
6
- metadata.gz: 775736eb6b660db0e101c7544bad31e4645144b8095e53e4a241eb3953b913c10dac20b7a040deecee26862e797ef8df2839e6dc37c0b4776551ee3c43c4ff07
7
- data.tar.gz: cb6b74aab3eec231a6e9c61903a9ddefd39af9f22e677957e3a35cb841b17991bac96bae7d5b6026385cbe8cd2acf3d55789811117187d74611d16edd24b72b2
6
+ metadata.gz: ea020736c3880f59123c516fe6f6f94139f1865fb91d373de6069b24b0fa63151b5b78b706066556a65e2bcae746d5de41b6cc1772c4b08eab5068a4661aea89
7
+ data.tar.gz: 9293a16aa70c434dea568a44d5c623ca41c250d2407ac75f789f1291b40918a99db16559f51de51e869b7721f77d7d0cc2877274f42cfa9485332b7002b3a642
data/.idea/freewifi.iml CHANGED
@@ -115,6 +115,25 @@
115
115
  <RUBY_RUN_CONFIG NAME="SCRIPT_ARGS" VALUE="" />
116
116
  <method />
117
117
  </configuration>
118
+ <configuration default="false" name="sql_delete_not_necc" type="RubyRunConfigurationType" factoryName="Ruby">
119
+ <module name="freewifi" />
120
+ <RUBY_RUN_CONFIG NAME="RUBY_ARGS" VALUE="-e $stdout.sync=true;$stderr.sync=true;load($0=ARGV.shift)" />
121
+ <RUBY_RUN_CONFIG NAME="WORK DIR" VALUE="$MODULE_DIR$/test" />
122
+ <RUBY_RUN_CONFIG NAME="SHOULD_USE_SDK" VALUE="false" />
123
+ <RUBY_RUN_CONFIG NAME="ALTERN_SDK_NAME" VALUE="" />
124
+ <RUBY_RUN_CONFIG NAME="myPassParentEnvs" VALUE="true" />
125
+ <envs />
126
+ <EXTENSION ID="BundlerRunConfigurationExtension" bundleExecEnabled="true" />
127
+ <EXTENSION ID="JRubyRunConfigurationExtension" NailgunExecEnabled="false" />
128
+ <EXTENSION ID="RubyCoverageRunConfigurationExtension" enabled="false" sample_coverage="true" track_test_folders="true" runner="rcov">
129
+ <COVERAGE_PATTERN ENABLED="true">
130
+ <PATTERN REGEXPS="/.rvm/" INCLUDED="false" />
131
+ </COVERAGE_PATTERN>
132
+ </EXTENSION>
133
+ <RUBY_RUN_CONFIG NAME="SCRIPT_PATH" VALUE="$MODULE_DIR$/test/sql_delete_not_necc.rb" />
134
+ <RUBY_RUN_CONFIG NAME="SCRIPT_ARGS" VALUE="" />
135
+ <method />
136
+ </configuration>
118
137
  </component>
119
138
  <component name="NewModuleRootManager">
120
139
  <content url="file://$MODULE_DIR$" />
@@ -130,7 +149,7 @@
130
149
  <orderEntry type="library" scope="PROVIDED" name="ipaddr (v1.2.2, RVM: ruby-2.4.1) [gem]" level="application" />
131
150
  <orderEntry type="library" scope="PROVIDED" name="json (v2.3.0, RVM: ruby-2.4.1) [gem]" level="application" />
132
151
  <orderEntry type="library" scope="PROVIDED" name="mini_portile2 (v2.4.0, RVM: ruby-2.4.1) [gem]" level="application" />
133
- <orderEntry type="library" scope="PROVIDED" name="minitest (v5.14.1, RVM: ruby-2.4.1) [gem]" level="application" />
152
+ <orderEntry type="library" scope="PROVIDED" name="minitest (v5.14.2, RVM: ruby-2.4.1) [gem]" level="application" />
134
153
  <orderEntry type="library" scope="PROVIDED" name="mongo (v2.11.4, RVM: ruby-2.4.1) [gem]" level="application" />
135
154
  <orderEntry type="library" scope="PROVIDED" name="mtik (v4.0.3, RVM: ruby-2.4.1) [gem]" level="application" />
136
155
  <orderEntry type="library" scope="PROVIDED" name="mysql2 (v0.5.3, RVM: ruby-2.4.1) [gem]" level="application" />
data/.idea/workspace.xml CHANGED
@@ -53,7 +53,8 @@
53
53
  <component name="ChangesViewManager" flattened_view="false" />
54
54
  <component name="CoverageDataManager">
55
55
  <SUITE FILE_PATH="coverage/freewifi@additional_functions.coverage" NAME="additional_functions Coverage Results" MODIFIED="1588023723762" SOURCE_PROVIDER="com.intellij.coverage.DefaultCoverageFileProvider" RUNNER="rcov" COVERAGE_BY_TEST_ENABLED="true" COVERAGE_TRACING_ENABLED="false" WORKING_DIRECTORY="$PROJECT_DIR$/lib/freewifi/additional" MODULE_NAME="freewifi" />
56
- <SUITE FILE_PATH="coverage/freewifi@test_helper.coverage" NAME="test_helper Coverage Results" MODIFIED="1600625305477" SOURCE_PROVIDER="com.intellij.coverage.DefaultCoverageFileProvider" RUNNER="rcov" COVERAGE_BY_TEST_ENABLED="true" COVERAGE_TRACING_ENABLED="false" WORKING_DIRECTORY="$PROJECT_DIR$/test" MODULE_NAME="freewifi" />
56
+ <SUITE FILE_PATH="coverage/freewifi@sql_delete_not_necc.coverage" NAME="sql_delete_not_necc Coverage Results" MODIFIED="1600631885005" SOURCE_PROVIDER="com.intellij.coverage.DefaultCoverageFileProvider" RUNNER="rcov" COVERAGE_BY_TEST_ENABLED="true" COVERAGE_TRACING_ENABLED="false" WORKING_DIRECTORY="$PROJECT_DIR$/test" MODULE_NAME="freewifi" />
57
+ <SUITE FILE_PATH="coverage/freewifi@test_helper.coverage" NAME="test_helper Coverage Results" MODIFIED="1609550235519" SOURCE_PROVIDER="com.intellij.coverage.DefaultCoverageFileProvider" RUNNER="rcov" COVERAGE_BY_TEST_ENABLED="true" COVERAGE_TRACING_ENABLED="false" WORKING_DIRECTORY="$PROJECT_DIR$/test" MODULE_NAME="freewifi" />
57
58
  <SUITE FILE_PATH="coverage/freewifi@test.coverage" NAME="test Coverage Results" MODIFIED="1587924491650" SOURCE_PROVIDER="com.intellij.coverage.DefaultCoverageFileProvider" RUNNER="rcov" COVERAGE_BY_TEST_ENABLED="true" COVERAGE_TRACING_ENABLED="false" WORKING_DIRECTORY="$PROJECT_DIR$/test" MODULE_NAME="freewifi" />
58
59
  <SUITE FILE_PATH="coverage/freewifi@wifi_portal_procedures.coverage" NAME="wifi_portal_procedures Coverage Results" MODIFIED="1588069407762" SOURCE_PROVIDER="com.intellij.coverage.DefaultCoverageFileProvider" RUNNER="rcov" COVERAGE_BY_TEST_ENABLED="true" COVERAGE_TRACING_ENABLED="false" WORKING_DIRECTORY="$PROJECT_DIR$/lib/freewifi/general" MODULE_NAME="freewifi" />
59
60
  <SUITE FILE_PATH="coverage/freewifi@get_iwag_data.coverage" NAME="get_iwag_data Coverage Results" MODIFIED="1600377682284" SOURCE_PROVIDER="com.intellij.coverage.DefaultCoverageFileProvider" RUNNER="rcov" COVERAGE_BY_TEST_ENABLED="true" COVERAGE_TRACING_ENABLED="false" WORKING_DIRECTORY="$PROJECT_DIR$/lib/freewifi/cisco/iwag" MODULE_NAME="freewifi" />
@@ -65,88 +66,98 @@
65
66
  <file leaf-file-name="freewifi.rb" pinned="false" current-in-tab="false">
66
67
  <entry file="file://$PROJECT_DIR$/lib/freewifi.rb">
67
68
  <provider selected="true" editor-type-id="text-editor">
68
- <state relative-caret-position="148">
69
- <caret line="376" column="56" lean-forward="false" selection-start-line="376" selection-start-column="44" selection-end-line="376" selection-end-column="67" />
69
+ <state relative-caret-position="205">
70
+ <caret line="251" column="7" lean-forward="true" selection-start-line="251" selection-start-column="7" selection-end-line="251" selection-end-column="7" />
70
71
  <folding />
71
72
  </state>
72
73
  </provider>
73
74
  </entry>
74
75
  </file>
75
- <file leaf-file-name="test.rb" pinned="false" current-in-tab="false">
76
- <entry file="file://$PROJECT_DIR$/test/test.rb">
76
+ <file leaf-file-name="test_helper.rb" pinned="false" current-in-tab="false">
77
+ <entry file="file://$PROJECT_DIR$/test/test_helper.rb">
77
78
  <provider selected="true" editor-type-id="text-editor">
78
- <state relative-caret-position="75">
79
- <caret line="5" column="22" lean-forward="false" selection-start-line="5" selection-start-column="22" selection-end-line="5" selection-end-column="22" />
79
+ <state relative-caret-position="145">
80
+ <caret line="25" column="18" lean-forward="false" selection-start-line="25" selection-start-column="18" selection-end-line="25" selection-end-column="18" />
80
81
  <folding />
81
82
  </state>
82
83
  </provider>
83
84
  </entry>
84
85
  </file>
85
- <file leaf-file-name="test_helper.rb" pinned="false" current-in-tab="false">
86
- <entry file="file://$PROJECT_DIR$/test/test_helper.rb">
86
+ <file leaf-file-name="wifi_portal_procedures.rb" pinned="false" current-in-tab="false">
87
+ <entry file="file://$PROJECT_DIR$/lib/freewifi/general/wifi_portal_procedures.rb">
87
88
  <provider selected="true" editor-type-id="text-editor">
88
- <state relative-caret-position="337">
89
- <caret line="73" column="11" lean-forward="false" selection-start-line="73" selection-start-column="11" selection-end-line="73" selection-end-column="11" />
89
+ <state relative-caret-position="145">
90
+ <caret line="127" column="100" lean-forward="false" selection-start-line="127" selection-start-column="100" selection-end-line="127" selection-end-column="100" />
90
91
  <folding />
91
92
  </state>
92
93
  </provider>
93
94
  </entry>
94
95
  </file>
95
- <file leaf-file-name="version.rb" pinned="false" current-in-tab="true">
96
- <entry file="file://$PROJECT_DIR$/lib/freewifi/version.rb">
96
+ <file leaf-file-name="iwag_telnet_connector.rb" pinned="false" current-in-tab="false">
97
+ <entry file="file://$PROJECT_DIR$/lib/freewifi/cisco/iwag/iwag_telnet_connector.rb">
97
98
  <provider selected="true" editor-type-id="text-editor">
98
- <state relative-caret-position="15">
99
- <caret line="1" column="18" lean-forward="false" selection-start-line="1" selection-start-column="18" selection-end-line="1" selection-end-column="18" />
99
+ <state relative-caret-position="145">
100
+ <caret line="89" column="93" lean-forward="false" selection-start-line="89" selection-start-column="93" selection-end-line="89" selection-end-column="93" />
100
101
  <folding />
101
102
  </state>
102
103
  </provider>
103
104
  </entry>
104
105
  </file>
105
- <file leaf-file-name="get_iwag_data.rb" pinned="false" current-in-tab="false">
106
- <entry file="file://$PROJECT_DIR$/lib/freewifi/cisco/iwag/get_iwag_data.rb">
106
+ <file leaf-file-name="newhub_mtik_api.rb" pinned="false" current-in-tab="false">
107
+ <entry file="file://$PROJECT_DIR$/lib/freewifi/mikrotik/newhub_mtik_api.rb">
107
108
  <provider selected="true" editor-type-id="text-editor">
108
- <state relative-caret-position="-593">
109
- <caret line="25" column="6" lean-forward="false" selection-start-line="25" selection-start-column="6" selection-end-line="25" selection-end-column="6" />
109
+ <state relative-caret-position="731">
110
+ <caret line="93" column="0" lean-forward="false" selection-start-line="93" selection-start-column="0" selection-end-line="93" selection-end-column="0" />
110
111
  <folding />
111
112
  </state>
112
113
  </provider>
113
114
  </entry>
114
115
  </file>
115
- <file leaf-file-name="iwag_database_worker.rb" pinned="false" current-in-tab="false">
116
- <entry file="file://$PROJECT_DIR$/lib/freewifi/cisco/iwag/iwag_database_worker.rb">
116
+ <file leaf-file-name="version.rb" pinned="false" current-in-tab="true">
117
+ <entry file="file://$PROJECT_DIR$/lib/freewifi/version.rb">
117
118
  <provider selected="true" editor-type-id="text-editor">
118
- <state relative-caret-position="195">
119
- <caret line="13" column="0" lean-forward="true" selection-start-line="13" selection-start-column="0" selection-end-line="13" selection-end-column="0" />
119
+ <state relative-caret-position="45">
120
+ <caret line="3" column="0" lean-forward="false" selection-start-line="3" selection-start-column="0" selection-end-line="3" selection-end-column="0" />
120
121
  <folding />
121
122
  </state>
122
123
  </provider>
123
124
  </entry>
124
125
  </file>
125
- <file leaf-file-name="iwag_telnet_connector.rb" pinned="false" current-in-tab="false">
126
- <entry file="file://$PROJECT_DIR$/lib/freewifi/cisco/iwag/iwag_telnet_connector.rb">
126
+ <file leaf-file-name="config.rb" pinned="false" current-in-tab="false">
127
+ <entry file="file://$PROJECT_DIR$/lib/freewifi/config.rb">
127
128
  <provider selected="true" editor-type-id="text-editor">
128
- <state relative-caret-position="1335">
129
- <caret line="89" column="93" lean-forward="false" selection-start-line="89" selection-start-column="93" selection-end-line="89" selection-end-column="93" />
129
+ <state relative-caret-position="15">
130
+ <caret line="1" column="22" lean-forward="false" selection-start-line="1" selection-start-column="22" selection-end-line="1" selection-end-column="22" />
130
131
  <folding />
131
132
  </state>
132
133
  </provider>
133
134
  </entry>
134
135
  </file>
135
- <file leaf-file-name="database_methods_wifi.rb" pinned="false" current-in-tab="false">
136
- <entry file="file://$PROJECT_DIR$/lib/freewifi/database/mysql/database_methods_wifi.rb">
136
+ <file leaf-file-name="freewifi_test.rb" pinned="false" current-in-tab="false">
137
+ <entry file="file://$PROJECT_DIR$/test/freewifi_test.rb">
137
138
  <provider selected="true" editor-type-id="text-editor">
138
- <state relative-caret-position="15">
139
- <caret line="15" column="23" lean-forward="false" selection-start-line="15" selection-start-column="23" selection-end-line="15" selection-end-column="23" />
139
+ <state relative-caret-position="0">
140
+ <caret line="0" column="21" lean-forward="false" selection-start-line="0" selection-start-column="21" selection-end-line="0" selection-end-column="21" />
140
141
  <folding />
141
142
  </state>
142
143
  </provider>
143
144
  </entry>
144
145
  </file>
145
- <file leaf-file-name="wifi_portal_procedures.rb" pinned="false" current-in-tab="false">
146
- <entry file="file://$PROJECT_DIR$/lib/freewifi/general/wifi_portal_procedures.rb">
146
+ <file leaf-file-name="test.rb" pinned="false" current-in-tab="false">
147
+ <entry file="file://$PROJECT_DIR$/test/test.rb">
147
148
  <provider selected="true" editor-type-id="text-editor">
148
- <state relative-caret-position="1126">
149
- <caret line="127" column="100" lean-forward="false" selection-start-line="127" selection-start-column="100" selection-end-line="127" selection-end-column="100" />
149
+ <state relative-caret-position="45">
150
+ <caret line="3" column="14" lean-forward="false" selection-start-line="3" selection-start-column="14" selection-end-line="3" selection-end-column="14" />
151
+ <folding />
152
+ </state>
153
+ </provider>
154
+ </entry>
155
+ </file>
156
+ <file leaf-file-name="additional_functions.rb" pinned="false" current-in-tab="false">
157
+ <entry file="file://$PROJECT_DIR$/lib/freewifi/additional/additional_functions.rb">
158
+ <provider selected="true" editor-type-id="text-editor">
159
+ <state relative-caret-position="30">
160
+ <caret line="2" column="0" lean-forward="true" selection-start-line="2" selection-start-column="0" selection-end-line="2" selection-end-column="0" />
150
161
  <folding />
151
162
  </state>
152
163
  </provider>
@@ -168,24 +179,26 @@
168
179
  <option value="$PROJECT_DIR$/lib/freewifi/mikrotik/hewhub_mtik_ssh.rb" />
169
180
  <option value="$PROJECT_DIR$/lib/freewifi/cisco/cisco_schemes_conf_gen.rb" />
170
181
  <option value="$PROJECT_DIR$/lib/freewifi/params.rb" />
171
- <option value="$PROJECT_DIR$/lib/freewifi/mikrotik/schemes_conf_gen.rb" />
172
- <option value="$PROJECT_DIR$/freewifi.gemspec" />
173
182
  <option value="$PROJECT_DIR$/lib/freewifi/huawei/hua_controller_class.rb" />
174
- <option value="$PROJECT_DIR$/lib/freewifi/additional/additional_functions.rb" />
175
183
  <option value="$PROJECT_DIR$/lib/freewifi/database/mongo/mongoconnector.rb" />
176
- <option value="$PROJECT_DIR$/lib/freewifi/mikrotik/newhub_mtik_ssh.rb" />
177
- <option value="$PROJECT_DIR$/lib/freewifi/cisco/iwag/iwag_telnet_connector.rb" />
178
- <option value="$PROJECT_DIR$/lib/freewifi/mikrotik/newhub_mtik_api.rb" />
179
184
  <option value="$PROJECT_DIR$/lib/freewifi/cisco/any/cisco_schemes_conf_gen.rb" />
180
- <option value="$PROJECT_DIR$/lib/freewifi/config.rb" />
181
185
  <option value="$PROJECT_DIR$/lib/freewifi/mikrotik/automation/get_data_ssh_fun.rb" />
182
186
  <option value="$PROJECT_DIR$/lib/freewifi/cisco/iwag/iwag_database_worker.rb" />
183
187
  <option value="$PROJECT_DIR$/lib/freewifi/cisco/iwag/get_iwag_data.rb" />
188
+ <option value="$PROJECT_DIR$/test/sql_delete_not_necc.rb" />
189
+ <option value="$PROJECT_DIR$/lib/freewifi/version.rb" />
190
+ <option value="$PROJECT_DIR$/lib/freewifi/mikrotik/schemes_conf_gen.rb" />
191
+ <option value="$PROJECT_DIR$/freewifi.gemspec" />
192
+ <option value="$PROJECT_DIR$/Gemfile" />
193
+ <option value="$PROJECT_DIR$/lib/freewifi/mikrotik/newhub_mtik_ssh.rb" />
184
194
  <option value="$PROJECT_DIR$/lib/freewifi/general/wifi_portal_procedures.rb" />
185
- <option value="$PROJECT_DIR$/lib/freewifi.rb" />
195
+ <option value="$PROJECT_DIR$/lib/freewifi/cisco/iwag/iwag_telnet_connector.rb" />
196
+ <option value="$PROJECT_DIR$/lib/freewifi/additional/additional_functions.rb" />
197
+ <option value="$PROJECT_DIR$/lib/freewifi/config.rb" />
186
198
  <option value="$PROJECT_DIR$/test/freewifi_test.rb" />
199
+ <option value="$PROJECT_DIR$/lib/freewifi/mikrotik/newhub_mtik_api.rb" />
200
+ <option value="$PROJECT_DIR$/lib/freewifi.rb" />
187
201
  <option value="$PROJECT_DIR$/test/test_helper.rb" />
188
- <option value="$PROJECT_DIR$/lib/freewifi/version.rb" />
189
202
  </list>
190
203
  </option>
191
204
  </component>
@@ -196,8 +209,9 @@
196
209
  <sorting>DEFINITION_ORDER</sorting>
197
210
  </component>
198
211
  <component name="ProjectFrameBounds">
212
+ <option name="y" value="25" />
199
213
  <option name="width" value="1440" />
200
- <option name="height" value="900" />
214
+ <option name="height" value="817" />
201
215
  </component>
202
216
  <component name="ProjectView">
203
217
  <navigator currentView="ProjectPane" proportions="" version="1">
@@ -214,7 +228,6 @@
214
228
  <foldersAlwaysOnTop value="true" />
215
229
  </navigator>
216
230
  <panes>
217
- <pane id="Scope" />
218
231
  <pane id="ProjectPane">
219
232
  <subPane>
220
233
  <PATH>
@@ -273,6 +286,76 @@
273
286
  <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
274
287
  </PATH_ELEMENT>
275
288
  </PATH>
289
+ <PATH>
290
+ <PATH_ELEMENT>
291
+ <option name="myItemId" value="freewifi" />
292
+ <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.ProjectViewProjectNode" />
293
+ </PATH_ELEMENT>
294
+ <PATH_ELEMENT>
295
+ <option name="myItemId" value="freewifi" />
296
+ <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
297
+ </PATH_ELEMENT>
298
+ <PATH_ELEMENT>
299
+ <option name="myItemId" value="lib" />
300
+ <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
301
+ </PATH_ELEMENT>
302
+ <PATH_ELEMENT>
303
+ <option name="myItemId" value="freewifi" />
304
+ <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
305
+ </PATH_ELEMENT>
306
+ <PATH_ELEMENT>
307
+ <option name="myItemId" value="mikrotik" />
308
+ <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
309
+ </PATH_ELEMENT>
310
+ </PATH>
311
+ <PATH>
312
+ <PATH_ELEMENT>
313
+ <option name="myItemId" value="freewifi" />
314
+ <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.ProjectViewProjectNode" />
315
+ </PATH_ELEMENT>
316
+ <PATH_ELEMENT>
317
+ <option name="myItemId" value="freewifi" />
318
+ <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
319
+ </PATH_ELEMENT>
320
+ <PATH_ELEMENT>
321
+ <option name="myItemId" value="lib" />
322
+ <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
323
+ </PATH_ELEMENT>
324
+ <PATH_ELEMENT>
325
+ <option name="myItemId" value="freewifi" />
326
+ <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
327
+ </PATH_ELEMENT>
328
+ <PATH_ELEMENT>
329
+ <option name="myItemId" value="mikrotik" />
330
+ <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
331
+ </PATH_ELEMENT>
332
+ <PATH_ELEMENT>
333
+ <option name="myItemId" value="automation" />
334
+ <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
335
+ </PATH_ELEMENT>
336
+ </PATH>
337
+ <PATH>
338
+ <PATH_ELEMENT>
339
+ <option name="myItemId" value="freewifi" />
340
+ <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.ProjectViewProjectNode" />
341
+ </PATH_ELEMENT>
342
+ <PATH_ELEMENT>
343
+ <option name="myItemId" value="freewifi" />
344
+ <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
345
+ </PATH_ELEMENT>
346
+ <PATH_ELEMENT>
347
+ <option name="myItemId" value="lib" />
348
+ <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
349
+ </PATH_ELEMENT>
350
+ <PATH_ELEMENT>
351
+ <option name="myItemId" value="freewifi" />
352
+ <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
353
+ </PATH_ELEMENT>
354
+ <PATH_ELEMENT>
355
+ <option name="myItemId" value="huawei" />
356
+ <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
357
+ </PATH_ELEMENT>
358
+ </PATH>
276
359
  <PATH>
277
360
  <PATH_ELEMENT>
278
361
  <option name="myItemId" value="freewifi" />
@@ -420,6 +503,7 @@
420
503
  </subPane>
421
504
  </pane>
422
505
  <pane id="Scratches" />
506
+ <pane id="Scope" />
423
507
  </panes>
424
508
  </component>
425
509
  <component name="PropertiesComponent">
@@ -427,7 +511,6 @@
427
511
  <property name="last_opened_file_path" value="$PROJECT_DIR$" />
428
512
  <property name="settings.editor.selected.configurable" value="org.jetbrains.plugins.ruby.settings.RubyActiveModuleSdkConfigurable" />
429
513
  <property name="project.settings.patched" value="true" />
430
- <property name="FullScreen" value="true" />
431
514
  <property name="run.code.analysis.last.selected.profile" value="pProject Default" />
432
515
  </component>
433
516
  <component name="RecentsManager">
@@ -592,13 +675,14 @@
592
675
  <envs />
593
676
  <method />
594
677
  </configuration>
595
- <list size="6">
678
+ <list size="7">
596
679
  <item index="0" class="java.lang.String" itemvalue="Ruby.test_helper" />
597
680
  <item index="1" class="java.lang.String" itemvalue="Ruby.newhub_mtik_ssh" />
598
681
  <item index="2" class="java.lang.String" itemvalue="Ruby.test" />
599
682
  <item index="3" class="java.lang.String" itemvalue="Ruby.additional_functions" />
600
683
  <item index="4" class="java.lang.String" itemvalue="Ruby.wifi_portal_procedures" />
601
684
  <item index="5" class="java.lang.String" itemvalue="Ruby.get_iwag_data" />
685
+ <item index="6" class="java.lang.String" itemvalue="Ruby.sql_delete_not_necc" />
602
686
  </list>
603
687
  </component>
604
688
  <component name="ShelveChangesManager" show_recycled="false">
@@ -641,24 +725,28 @@
641
725
  <workItem from="1591252934951" duration="3869000" />
642
726
  <workItem from="1600375108678" duration="4825000" />
643
727
  <workItem from="1600421249458" duration="2414000" />
644
- <workItem from="1600623801343" duration="1557000" />
728
+ <workItem from="1600623801343" duration="3831000" />
729
+ <workItem from="1601137888490" duration="380000" />
730
+ <workItem from="1609549885666" duration="1154000" />
731
+ <workItem from="1609748280931" duration="1338000" />
732
+ <workItem from="1609750498357" duration="1127000" />
645
733
  </task>
646
734
  <servers />
647
735
  </component>
648
736
  <component name="TimeTrackingManager">
649
- <option name="totallyTimeSpent" value="103069000" />
737
+ <option name="totallyTimeSpent" value="109342000" />
650
738
  </component>
651
739
  <component name="ToolWindowManager">
652
- <frame x="0" y="0" width="1440" height="900" extended-state="6" />
740
+ <frame x="0" y="25" width="1440" height="817" extended-state="0" />
653
741
  <editor active="true" />
654
742
  <layout>
655
- <window_info id="Project" active="false" anchor="left" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="true" show_stripe_button="true" weight="0.27753934" sideWeight="0.5" order="0" side_tool="false" content_ui="combo" />
743
+ <window_info id="Project" active="false" anchor="left" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="true" show_stripe_button="true" weight="0.16666667" sideWeight="0.5" order="0" side_tool="false" content_ui="combo" />
656
744
  <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" />
657
745
  <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.33" sideWeight="0.5" order="7" side_tool="true" content_ui="tabs" />
658
- <window_info id="Inspection Results" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.329602" sideWeight="0.5" order="-1" side_tool="false" content_ui="tabs" />
746
+ <window_info id="Inspection Results" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="true" show_stripe_button="true" weight="0.32900432" sideWeight="0.5" order="8" side_tool="false" content_ui="tabs" />
659
747
  <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" />
660
748
  <window_info id="Find" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.329602" sideWeight="0.5" order="1" side_tool="false" content_ui="tabs" />
661
- <window_info id="Run" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="true" show_stripe_button="true" weight="0.35945272" sideWeight="0.5" order="2" side_tool="false" content_ui="tabs" />
749
+ <window_info id="Run" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.35945272" sideWeight="0.5" order="2" side_tool="false" content_ui="tabs" />
662
750
  <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" />
663
751
  <window_info id="Structure" active="false" anchor="left" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.24964234" sideWeight="0.5" order="1" side_tool="false" content_ui="tabs" />
664
752
  <window_info id="Terminal" 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" />
@@ -683,27 +771,6 @@
683
771
  <watches-manager />
684
772
  </component>
685
773
  <component name="editorHistoryManager">
686
- <entry file="file://$PROJECT_DIR$/lib/freewifi/mikrotik/newhub_mtik_ssh.rb">
687
- <provider selected="true" editor-type-id="text-editor">
688
- <state relative-caret-position="360">
689
- <caret line="24" column="0" lean-forward="false" selection-start-line="24" selection-start-column="0" selection-end-line="24" selection-end-column="0" />
690
- </state>
691
- </provider>
692
- </entry>
693
- <entry file="file://$PROJECT_DIR$/test/test_helper.rb">
694
- <provider selected="true" editor-type-id="text-editor">
695
- <state relative-caret-position="270">
696
- <caret line="18" column="0" lean-forward="false" selection-start-line="18" selection-start-column="0" selection-end-line="18" selection-end-column="0" />
697
- </state>
698
- </provider>
699
- </entry>
700
- <entry file="file://$PROJECT_DIR$/lib/freewifi/mikrotik/getsubscribermikrotik.rb">
701
- <provider selected="true" editor-type-id="text-editor">
702
- <state relative-caret-position="0">
703
- <caret line="0" column="0" lean-forward="false" selection-start-line="0" selection-start-column="0" selection-end-line="0" selection-end-column="0" />
704
- </state>
705
- </provider>
706
- </entry>
707
774
  <entry file="file://$PROJECT_DIR$/freewifi.gemspec">
708
775
  <provider selected="true" editor-type-id="text-editor">
709
776
  <state relative-caret-position="405">
@@ -840,13 +907,6 @@
840
907
  </state>
841
908
  </provider>
842
909
  </entry>
843
- <entry file="file://$PROJECT_DIR$/Rakefile">
844
- <provider selected="true" editor-type-id="text-editor">
845
- <state relative-caret-position="150">
846
- <caret line="10" column="0" lean-forward="false" selection-start-line="10" selection-start-column="0" selection-end-line="10" selection-end-column="0" />
847
- </state>
848
- </provider>
849
- </entry>
850
910
  <entry file="file://$PROJECT_DIR$/.gitignore">
851
911
  <provider selected="true" editor-type-id="text-editor">
852
912
  <state relative-caret-position="0">
@@ -854,13 +914,6 @@
854
914
  </state>
855
915
  </provider>
856
916
  </entry>
857
- <entry file="file://$PROJECT_DIR$/Gemfile">
858
- <provider selected="true" editor-type-id="text-editor">
859
- <state relative-caret-position="0">
860
- <caret line="0" column="0" lean-forward="false" selection-start-line="0" selection-start-column="0" selection-end-line="0" selection-end-column="0" />
861
- </state>
862
- </provider>
863
- </entry>
864
917
  <entry file="file://$USER_HOME$/.rvm/gems/ruby-2.4.1/gems/net-ssh-4.0.1/lib/net/ssh/prompt.rb">
865
918
  <provider selected="true" editor-type-id="text-editor">
866
919
  <state relative-caret-position="170">
@@ -875,20 +928,6 @@
875
928
  </state>
876
929
  </provider>
877
930
  </entry>
878
- <entry file="file://$PROJECT_DIR$/lib/freewifi/params.rb">
879
- <provider selected="true" editor-type-id="text-editor">
880
- <state relative-caret-position="482">
881
- <caret line="4" column="0" lean-forward="false" selection-start-line="4" selection-start-column="0" selection-end-line="4" selection-end-column="0" />
882
- </state>
883
- </provider>
884
- </entry>
885
- <entry file="file://$PROJECT_DIR$/lib/freewifi/huawei/hua_controller_class.rb">
886
- <provider selected="true" editor-type-id="text-editor">
887
- <state relative-caret-position="1560">
888
- <caret line="104" column="78" lean-forward="false" selection-start-line="104" selection-start-column="78" selection-end-line="104" selection-end-column="78" />
889
- </state>
890
- </provider>
891
- </entry>
892
931
  <entry file="file://$USER_HOME$/.rvm/gems/ruby-2.4.1/gems/mongo-2.11.4/lib/mongo/client.rb">
893
932
  <provider selected="true" editor-type-id="text-editor">
894
933
  <state relative-caret-position="243">
@@ -903,106 +942,108 @@
903
942
  </state>
904
943
  </provider>
905
944
  </entry>
906
- <entry file="file://$PROJECT_DIR$/lib/freewifi/additional/additional_functions.rb">
945
+ <entry file="file://$PROJECT_DIR$/lib/freewifi/database/mongo/mongoconnector.rb">
907
946
  <provider selected="true" editor-type-id="text-editor">
908
- <state relative-caret-position="-486">
909
- <caret line="6" column="13" lean-forward="true" selection-start-line="6" selection-start-column="13" selection-end-line="6" selection-end-column="25" />
947
+ <state relative-caret-position="15">
948
+ <caret line="35" column="28" lean-forward="false" selection-start-line="35" selection-start-column="28" selection-end-line="35" selection-end-column="28" />
910
949
  </state>
911
950
  </provider>
912
951
  </entry>
913
- <entry file="file://$PROJECT_DIR$/lib/freewifi/config.rb">
952
+ <entry file="file://$PROJECT_DIR$/lib/freewifi/mikrotik/automation/get_data_ssh_fun.rb">
914
953
  <provider selected="true" editor-type-id="text-editor">
915
954
  <state relative-caret-position="30">
916
955
  <caret line="2" column="0" lean-forward="false" selection-start-line="2" selection-start-column="0" selection-end-line="2" selection-end-column="0" />
917
956
  </state>
918
957
  </provider>
919
958
  </entry>
920
- <entry file="file://$PROJECT_DIR$/lib/freewifi/mikrotik/newhub_mtik_api.rb">
959
+ <entry file="file://$PROJECT_DIR$/lib/freewifi/cisco/any/cisco_schemes_conf_gen.rb">
921
960
  <provider selected="true" editor-type-id="text-editor">
922
- <state relative-caret-position="180">
923
- <caret line="12" column="0" lean-forward="false" selection-start-line="12" selection-start-column="0" selection-end-line="12" selection-end-column="0" />
961
+ <state relative-caret-position="120">
962
+ <caret line="8" column="0" lean-forward="true" selection-start-line="8" selection-start-column="0" selection-end-line="8" selection-end-column="0" />
924
963
  </state>
925
964
  </provider>
926
965
  </entry>
927
- <entry file="file://$PROJECT_DIR$/lib/freewifi/mikrotik/getsubscribermikrotik.rb">
966
+ <entry file="file://$PROJECT_DIR$/test/sql_delete_not_necc.rb">
928
967
  <provider selected="true" editor-type-id="text-editor">
929
- <state relative-caret-position="0">
930
- <caret line="0" column="0" lean-forward="false" selection-start-line="0" selection-start-column="0" selection-end-line="0" selection-end-column="0" />
968
+ <state relative-caret-position="90">
969
+ <caret line="6" column="0" lean-forward="false" selection-start-line="6" selection-start-column="0" selection-end-line="6" selection-end-column="0" />
931
970
  </state>
932
971
  </provider>
933
972
  </entry>
934
- <entry file="file://$PROJECT_DIR$/lib/freewifi/mikrotik/schemes_conf_gen.rb">
973
+ <entry file="file://$PROJECT_DIR$/lib/freewifi/cisco/iwag/get_iwag_data.rb">
935
974
  <provider selected="true" editor-type-id="text-editor">
936
- <state relative-caret-position="450">
937
- <caret line="30" column="5" lean-forward="false" selection-start-line="30" selection-start-column="5" selection-end-line="30" selection-end-column="5" />
975
+ <state relative-caret-position="375">
976
+ <caret line="25" column="6" lean-forward="false" selection-start-line="25" selection-start-column="6" selection-end-line="25" selection-end-column="6" />
938
977
  </state>
939
978
  </provider>
940
979
  </entry>
941
- <entry file="file://$PROJECT_DIR$/lib/freewifi/database/mongo/mongoconnector.rb">
980
+ <entry file="file://$PROJECT_DIR$/lib/freewifi/database/mysql/database_methods_wifi.rb">
942
981
  <provider selected="true" editor-type-id="text-editor">
943
- <state relative-caret-position="15">
944
- <caret line="35" column="28" lean-forward="false" selection-start-line="35" selection-start-column="28" selection-end-line="35" selection-end-column="28" />
982
+ <state relative-caret-position="225">
983
+ <caret line="15" column="23" lean-forward="false" selection-start-line="15" selection-start-column="23" selection-end-line="15" selection-end-column="23" />
945
984
  </state>
946
985
  </provider>
947
986
  </entry>
948
- <entry file="file://$PROJECT_DIR$/freewifi.gemspec">
987
+ <entry file="file://$PROJECT_DIR$/lib/freewifi/params.rb">
949
988
  <provider selected="true" editor-type-id="text-editor">
950
- <state relative-caret-position="476">
951
- <caret line="32" column="49" lean-forward="false" selection-start-line="32" selection-start-column="49" selection-end-line="32" selection-end-column="49" />
989
+ <state relative-caret-position="60">
990
+ <caret line="4" column="0" lean-forward="false" selection-start-line="4" selection-start-column="0" selection-end-line="4" selection-end-column="0" />
991
+ <folding />
952
992
  </state>
953
993
  </provider>
954
994
  </entry>
955
- <entry file="file://$PROJECT_DIR$/lib/freewifi/mikrotik/automation/get_data_ssh_fun.rb">
995
+ <entry file="file://$PROJECT_DIR$/lib/freewifi/mikrotik/schemes_conf_gen.rb">
956
996
  <provider selected="true" editor-type-id="text-editor">
957
- <state relative-caret-position="30">
958
- <caret line="2" column="0" lean-forward="false" selection-start-line="2" selection-start-column="0" selection-end-line="2" selection-end-column="0" />
997
+ <state relative-caret-position="341">
998
+ <caret line="30" column="5" lean-forward="true" selection-start-line="30" selection-start-column="5" selection-end-line="30" selection-end-column="5" />
999
+ <folding />
959
1000
  </state>
960
1001
  </provider>
961
1002
  </entry>
962
- <entry file="file://$PROJECT_DIR$/test/test.rb">
1003
+ <entry file="file://$PROJECT_DIR$/freewifi.gemspec">
963
1004
  <provider selected="true" editor-type-id="text-editor">
964
- <state relative-caret-position="75">
965
- <caret line="5" column="22" lean-forward="false" selection-start-line="5" selection-start-column="22" selection-end-line="5" selection-end-column="22" />
1005
+ <state relative-caret-position="461">
1006
+ <caret line="31" column="0" lean-forward="true" selection-start-line="31" selection-start-column="0" selection-end-line="31" selection-end-column="0" />
966
1007
  <folding />
967
1008
  </state>
968
1009
  </provider>
969
1010
  </entry>
970
- <entry file="file://$PROJECT_DIR$/lib/freewifi.rb">
1011
+ <entry file="file://$PROJECT_DIR$/Gemfile">
971
1012
  <provider selected="true" editor-type-id="text-editor">
972
- <state relative-caret-position="148">
973
- <caret line="376" column="56" lean-forward="false" selection-start-line="376" selection-start-column="44" selection-end-line="376" selection-end-column="67" />
1013
+ <state relative-caret-position="90">
1014
+ <caret line="6" column="0" lean-forward="true" selection-start-line="6" selection-start-column="0" selection-end-line="6" selection-end-column="0" />
974
1015
  <folding />
975
1016
  </state>
976
1017
  </provider>
977
1018
  </entry>
978
- <entry file="file://$PROJECT_DIR$/test/freewifi_test.rb">
1019
+ <entry file="file://$PROJECT_DIR$/Gemfile.lock">
979
1020
  <provider selected="true" editor-type-id="text-editor">
980
- <state relative-caret-position="150">
981
- <caret line="10" column="3" lean-forward="true" selection-start-line="10" selection-start-column="3" selection-end-line="10" selection-end-column="3" />
1021
+ <state relative-caret-position="0">
1022
+ <caret line="0" column="0" lean-forward="false" selection-start-line="0" selection-start-column="0" selection-end-line="0" selection-end-column="0" />
982
1023
  <folding />
983
1024
  </state>
984
1025
  </provider>
985
1026
  </entry>
986
- <entry file="file://$PROJECT_DIR$/lib/freewifi/mikrotik/newhub_mtik_ssh.rb">
1027
+ <entry file="file://$PROJECT_DIR$/LICENSE.txt">
987
1028
  <provider selected="true" editor-type-id="text-editor">
988
- <state relative-caret-position="106">
989
- <caret line="316" column="39" lean-forward="false" selection-start-line="316" selection-start-column="39" selection-end-line="316" selection-end-column="39" />
1029
+ <state relative-caret-position="0">
1030
+ <caret line="0" column="0" lean-forward="false" selection-start-line="0" selection-start-column="0" selection-end-line="0" selection-end-column="0" />
990
1031
  <folding />
991
1032
  </state>
992
1033
  </provider>
993
1034
  </entry>
994
- <entry file="file://$PROJECT_DIR$/lib/freewifi/cisco/any/cisco_schemes_conf_gen.rb">
1035
+ <entry file="file://$PROJECT_DIR$/Rakefile">
995
1036
  <provider selected="true" editor-type-id="text-editor">
996
- <state relative-caret-position="120">
997
- <caret line="8" column="0" lean-forward="true" selection-start-line="8" selection-start-column="0" selection-end-line="8" selection-end-column="0" />
1037
+ <state relative-caret-position="150">
1038
+ <caret line="10" column="0" lean-forward="false" selection-start-line="10" selection-start-column="0" selection-end-line="10" selection-end-column="0" />
998
1039
  <folding />
999
1040
  </state>
1000
1041
  </provider>
1001
1042
  </entry>
1002
- <entry file="file://$PROJECT_DIR$/lib/freewifi/cisco/iwag/get_iwag_data.rb">
1043
+ <entry file="file://$PROJECT_DIR$/lib/freewifi/huawei/hua_controller_class.rb">
1003
1044
  <provider selected="true" editor-type-id="text-editor">
1004
- <state relative-caret-position="-593">
1005
- <caret line="25" column="6" lean-forward="false" selection-start-line="25" selection-start-column="6" selection-end-line="25" selection-end-column="6" />
1045
+ <state relative-caret-position="746">
1046
+ <caret line="104" column="78" lean-forward="false" selection-start-line="104" selection-start-column="78" selection-end-line="104" selection-end-column="78" />
1006
1047
  <folding />
1007
1048
  </state>
1008
1049
  </provider>
@@ -1010,47 +1051,103 @@
1010
1051
  <entry file="file://$PROJECT_DIR$/lib/freewifi/cisco/iwag/iwag_database_worker.rb">
1011
1052
  <provider selected="true" editor-type-id="text-editor">
1012
1053
  <state relative-caret-position="195">
1013
- <caret line="13" column="0" lean-forward="true" selection-start-line="13" selection-start-column="0" selection-end-line="13" selection-end-column="0" />
1054
+ <caret line="13" column="0" lean-forward="false" selection-start-line="13" selection-start-column="0" selection-end-line="13" selection-end-column="0" />
1055
+ <folding />
1056
+ </state>
1057
+ </provider>
1058
+ </entry>
1059
+ <entry file="file://$PROJECT_DIR$/lib/freewifi/mikrotik/getsubscribermikrotik.rb">
1060
+ <provider selected="true" editor-type-id="text-editor">
1061
+ <state relative-caret-position="0">
1062
+ <caret line="0" column="0" lean-forward="false" selection-start-line="0" selection-start-column="0" selection-end-line="0" selection-end-column="0" />
1063
+ <folding />
1064
+ </state>
1065
+ </provider>
1066
+ </entry>
1067
+ <entry file="file://$PROJECT_DIR$/lib/freewifi/mikrotik/newhub_mtik_ssh.rb">
1068
+ <provider selected="true" editor-type-id="text-editor">
1069
+ <state relative-caret-position="145">
1070
+ <caret line="44" column="33" lean-forward="false" selection-start-line="44" selection-start-column="33" selection-end-line="44" selection-end-column="33" />
1014
1071
  <folding />
1015
1072
  </state>
1016
1073
  </provider>
1017
1074
  </entry>
1018
1075
  <entry file="file://$PROJECT_DIR$/lib/freewifi/cisco/iwag/iwag_telnet_connector.rb">
1019
1076
  <provider selected="true" editor-type-id="text-editor">
1020
- <state relative-caret-position="1335">
1077
+ <state relative-caret-position="145">
1021
1078
  <caret line="89" column="93" lean-forward="false" selection-start-line="89" selection-start-column="93" selection-end-line="89" selection-end-column="93" />
1022
1079
  <folding />
1023
1080
  </state>
1024
1081
  </provider>
1025
1082
  </entry>
1026
- <entry file="file://$PROJECT_DIR$/lib/freewifi/database/mysql/database_methods_wifi.rb">
1083
+ <entry file="file://$PROJECT_DIR$/lib/freewifi/general/wifi_portal_procedures.rb">
1084
+ <provider selected="true" editor-type-id="text-editor">
1085
+ <state relative-caret-position="145">
1086
+ <caret line="127" column="100" lean-forward="false" selection-start-line="127" selection-start-column="100" selection-end-line="127" selection-end-column="100" />
1087
+ <folding />
1088
+ </state>
1089
+ </provider>
1090
+ </entry>
1091
+ <entry file="file://$PROJECT_DIR$/lib/freewifi/config.rb">
1027
1092
  <provider selected="true" editor-type-id="text-editor">
1028
1093
  <state relative-caret-position="15">
1029
- <caret line="15" column="23" lean-forward="false" selection-start-line="15" selection-start-column="23" selection-end-line="15" selection-end-column="23" />
1094
+ <caret line="1" column="22" lean-forward="false" selection-start-line="1" selection-start-column="22" selection-end-line="1" selection-end-column="22" />
1030
1095
  <folding />
1031
1096
  </state>
1032
1097
  </provider>
1033
1098
  </entry>
1034
- <entry file="file://$PROJECT_DIR$/lib/freewifi/general/wifi_portal_procedures.rb">
1099
+ <entry file="file://$PROJECT_DIR$/test/freewifi_test.rb">
1035
1100
  <provider selected="true" editor-type-id="text-editor">
1036
- <state relative-caret-position="1126">
1037
- <caret line="127" column="100" lean-forward="false" selection-start-line="127" selection-start-column="100" selection-end-line="127" selection-end-column="100" />
1101
+ <state relative-caret-position="0">
1102
+ <caret line="0" column="21" lean-forward="false" selection-start-line="0" selection-start-column="21" selection-end-line="0" selection-end-column="21" />
1103
+ <folding />
1104
+ </state>
1105
+ </provider>
1106
+ </entry>
1107
+ <entry file="file://$PROJECT_DIR$/test/test.rb">
1108
+ <provider selected="true" editor-type-id="text-editor">
1109
+ <state relative-caret-position="45">
1110
+ <caret line="3" column="14" lean-forward="false" selection-start-line="3" selection-start-column="14" selection-end-line="3" selection-end-column="14" />
1111
+ <folding />
1112
+ </state>
1113
+ </provider>
1114
+ </entry>
1115
+ <entry file="file://$PROJECT_DIR$/lib/freewifi/mikrotik/newhub_mtik_api.rb">
1116
+ <provider selected="true" editor-type-id="text-editor">
1117
+ <state relative-caret-position="731">
1118
+ <caret line="93" column="0" lean-forward="false" selection-start-line="93" selection-start-column="0" selection-end-line="93" selection-end-column="0" />
1038
1119
  <folding />
1039
1120
  </state>
1040
1121
  </provider>
1041
1122
  </entry>
1042
1123
  <entry file="file://$PROJECT_DIR$/test/test_helper.rb">
1043
1124
  <provider selected="true" editor-type-id="text-editor">
1044
- <state relative-caret-position="337">
1045
- <caret line="73" column="11" lean-forward="false" selection-start-line="73" selection-start-column="11" selection-end-line="73" selection-end-column="11" />
1125
+ <state relative-caret-position="145">
1126
+ <caret line="25" column="18" lean-forward="false" selection-start-line="25" selection-start-column="18" selection-end-line="25" selection-end-column="18" />
1127
+ <folding />
1128
+ </state>
1129
+ </provider>
1130
+ </entry>
1131
+ <entry file="file://$PROJECT_DIR$/lib/freewifi/additional/additional_functions.rb">
1132
+ <provider selected="true" editor-type-id="text-editor">
1133
+ <state relative-caret-position="30">
1134
+ <caret line="2" column="0" lean-forward="true" selection-start-line="2" selection-start-column="0" selection-end-line="2" selection-end-column="0" />
1135
+ <folding />
1136
+ </state>
1137
+ </provider>
1138
+ </entry>
1139
+ <entry file="file://$PROJECT_DIR$/lib/freewifi.rb">
1140
+ <provider selected="true" editor-type-id="text-editor">
1141
+ <state relative-caret-position="205">
1142
+ <caret line="251" column="7" lean-forward="true" selection-start-line="251" selection-start-column="7" selection-end-line="251" selection-end-column="7" />
1046
1143
  <folding />
1047
1144
  </state>
1048
1145
  </provider>
1049
1146
  </entry>
1050
1147
  <entry file="file://$PROJECT_DIR$/lib/freewifi/version.rb">
1051
1148
  <provider selected="true" editor-type-id="text-editor">
1052
- <state relative-caret-position="15">
1053
- <caret line="1" column="18" lean-forward="false" selection-start-line="1" selection-start-column="18" selection-end-line="1" selection-end-column="18" />
1149
+ <state relative-caret-position="45">
1150
+ <caret line="3" column="0" lean-forward="false" selection-start-line="3" selection-start-column="0" selection-end-line="3" selection-end-column="0" />
1054
1151
  <folding />
1055
1152
  </state>
1056
1153
  </provider>
data/Gemfile CHANGED
@@ -1,4 +1,4 @@
1
- source "https://rubygems.org"
1
+ source 'https://rubygems.org'
2
2
 
3
3
  git_source(:github) {|repo_name| "https://github.com/#{repo_name}" }
4
4
 
data/freewifi.gemspec CHANGED
@@ -4,43 +4,43 @@ $LOAD_PATH.unshift(lib) unless $LOAD_PATH.include?(lib)
4
4
  require "freewifi/version"
5
5
 
6
6
  Gem::Specification.new do |spec|
7
- spec.name = "freewifi"
7
+ spec.name = 'freewifi'
8
8
  spec.version = Freewifi_1::VERSION
9
- spec.authors = ["Dzmitry Buynovskiy"]
10
- spec.email = ["imperituro.ard@gmail.com"]
9
+ spec.authors = ['Dzmitry Buynovskiy']
10
+ spec.email = ['imperituro.ard@gmail.com']
11
11
 
12
12
  spec.summary = %q{gem for Public WiFi}
13
13
  spec.description = %q{description for my gem}
14
- spec.homepage = "https://rubygems.org/gems/freewifi"
15
- spec.license = "MIT"
14
+ spec.homepage = 'https://rubygems.org/gems/freewifi'
15
+ spec.license = 'MIT'
16
16
 
17
17
  # Prevent pushing this gem to RubyGems.org. To allow pushes either set the 'allowed_push_host'
18
18
  # to allow pushing to a single host or delete this section to allow pushing to any host.
19
19
  if spec.respond_to?(:metadata)
20
- spec.metadata["allowed_push_host"] = "https://rubygems.org/"
20
+ spec.metadata['allowed_push_host'] = 'https://rubygems.org/'
21
21
  else
22
- raise "RubyGems 2.0 or newer is required to protect against " \
23
- "public gem pushes."
22
+ raise 'RubyGems 2.0 or newer is required to protect against ' \
23
+ 'public gem pushes.'
24
24
  end
25
25
 
26
26
  spec.files = `git ls-files -z`.split("\x0").reject do |f|
27
27
  f.match(%r{^(test|spec|features)/})
28
28
  end
29
- spec.bindir = "exe"
29
+ spec.bindir = 'exe'
30
30
  spec.executables = spec.files.grep(%r{^exe/}) { |f| File.basename(f) }
31
- spec.require_paths = ["lib"]
31
+ spec.require_paths = ['lib']
32
32
 
33
- spec.add_development_dependency "bundler", "2.1.4"
34
- spec.add_development_dependency "rake", "13.0.1"
35
- spec.add_development_dependency "minitest", "~> 5.0"
36
- spec.add_development_dependency "net-ssh", '4.0.1'
37
- spec.add_development_dependency "json", "2.3.0"
38
- spec.add_development_dependency "ipaddr", "1.2.2"
39
- spec.add_development_dependency "date", "3.0.0"
40
- spec.add_development_dependency "mysql2", "0.5.3"
41
- spec.add_development_dependency "mongo", "2.11.4"
42
- spec.add_development_dependency "translit", "0.1.5"
43
- spec.add_development_dependency "savon", "2.12.0"
44
- spec.add_development_dependency "net-telnet", "0.2.0"
45
- spec.add_development_dependency "mtik", "4.0.3"
33
+ spec.add_development_dependency 'bundler', '2.1.4'
34
+ spec.add_development_dependency 'rake', '13.0.1'
35
+ spec.add_development_dependency 'minitest', '~> 5.0'
36
+ spec.add_development_dependency 'net-ssh', '4.0.1'
37
+ spec.add_development_dependency 'json', '2.3.0'
38
+ spec.add_development_dependency 'ipaddr', '1.2.2'
39
+ spec.add_development_dependency 'date', '3.0.0'
40
+ spec.add_development_dependency 'mysql2', '0.5.3'
41
+ spec.add_development_dependency 'mongo', '2.11.4'
42
+ spec.add_development_dependency 'translit', '0.1.5'
43
+ spec.add_development_dependency 'savon', '2.12.0'
44
+ spec.add_development_dependency 'net-telnet', '0.2.0'
45
+ spec.add_development_dependency 'mtik', '4.0.3'
46
46
  end
data/lib/freewifi.rb CHANGED
@@ -1,10 +1,10 @@
1
1
  #$LOAD_PATH.unshift File.expand_path("../freewifi", __dir__)
2
- $LOAD_PATH.unshift File.expand_path("../mikrotik", __dir__)
3
- $LOAD_PATH.unshift File.expand_path("../database/mysql", __dir__)
4
- $LOAD_PATH.unshift File.expand_path("../database/mongo", __dir__)
5
- $LOAD_PATH.unshift File.expand_path("../additional", __dir__)
6
- $LOAD_PATH.unshift File.expand_path("../general", __dir__)
7
- $LOAD_PATH.unshift File.expand_path("../huawei", __dir__)
2
+ $LOAD_PATH.unshift File.expand_path('../mikrotik', __dir__)
3
+ $LOAD_PATH.unshift File.expand_path('../database/mysql', __dir__)
4
+ $LOAD_PATH.unshift File.expand_path('../database/mongo', __dir__)
5
+ $LOAD_PATH.unshift File.expand_path('../additional', __dir__)
6
+ $LOAD_PATH.unshift File.expand_path('../general', __dir__)
7
+ $LOAD_PATH.unshift File.expand_path('../huawei', __dir__)
8
8
 
9
9
  require "freewifi/version"
10
10
  require "freewifi/params"
@@ -135,7 +135,7 @@ module Freewifi_1
135
135
  :subscribers_contacts => subscribers_contacts,
136
136
  :wifi_ssid => wifi_ssid,
137
137
  :portalstyle => portalstyle,
138
- :ap => "MikroTik",
138
+ :ap => 'MikroTik',
139
139
  :ap_serial_number => ap_serial_number,
140
140
  :ap_model => ap_model,
141
141
  :description => description,
@@ -146,7 +146,7 @@ module Freewifi_1
146
146
  }
147
147
 
148
148
  mongo_response = mongo_connector_wifi_1.data_ap_auto_created_insert_1(data)
149
- if mongo_response[:code]==200
149
+ if mongo_response[:code] == 200
150
150
 
151
151
  newcapsman1 = NEWhubWifi_1.new
152
152
  threads_1 = []
@@ -157,27 +157,27 @@ module Freewifi_1
157
157
 
158
158
  input_intern_data = {:wifi_ssid_processed => wifi_ssid_processed, :company_name_processed => company_name_processed, :capsman => capsman}
159
159
 
160
- mongo_connector_wifi_1.audit_logger_wifi_1("add_mikrotik_ap_mobile_1", remote_ip, input_intern_data, nil, real_ip, subscriber_ip)
160
+ mongo_connector_wifi_1.audit_logger_wifi_1('add_mikrotik_ap_mobile_1', remote_ip, input_intern_data, nil, real_ip, subscriber_ip)
161
161
 
162
162
  newcapsman1.set_capsman_config_1(wifi_ssid_processed, capsman, capsman_user, capsman_password, sim_ipaddress, company_name_processed)
163
163
  end
164
164
  end
165
165
  threads_1.each(&:join)
166
166
 
167
- output_params = {:code => 200, :result => "Request completed successfully", :body => {:tunnel_id => tunnel_addition[:body][:eoip_tunnel_id], :tunnel_name => tunnel_addition[:body][:eoip_tunnel_name]}}
167
+ output_params = {:code => 200, :result => 'Request completed successfully', :body => {:tunnel_id => tunnel_addition[:body][:eoip_tunnel_id], :tunnel_name => tunnel_addition[:body][:eoip_tunnel_name]}}
168
168
  else
169
- output_params = {:code => 400, :result => "Something wrong with insertion to mongo"}
169
+ output_params = {:code => 400, :result => 'Something wrong with insertion to mongo'}
170
170
  end
171
171
  else
172
172
  output_params = {:code => 401, :result => tunnel_addition[:result]}
173
173
  end
174
174
  else
175
- output_params = {:code => 202, :result => "AP exists", :body => {:tunnel_id => ap_state[:tunnel_id].to_s}}
175
+ output_params = {:code => 202, :result => 'AP exists', :body => {:tunnel_id => ap_state[:tunnel_id].to_s}}
176
176
  end
177
177
  rescue
178
- output_params = {:code => 507, :result => "Unknown SDK error"}
178
+ output_params = {:code => 507, :result => 'Unknown SDK error'}
179
179
  end
180
- mongo_connector_wifi_1.audit_logger_wifi_1("add_mikrotik_ap_mobile_1", remote_ip, input_params, output_params, real_ip, subscriber_ip)
180
+ mongo_connector_wifi_1.audit_logger_wifi_1('add_mikrotik_ap_mobile_1', remote_ip, input_params, output_params, real_ip, subscriber_ip)
181
181
  #additional_func.printer_texter({:input_params => input_params, :output_params => output_params, :procedure => "add_mikrotik_ap_mobile", :file => "freewifi.rb"}, "info")
182
182
  output_params
183
183
  end
@@ -211,9 +211,9 @@ module Freewifi_1
211
211
  output_params = {:code => res[:code], :result => res[:result], :body => {:ap_configuration => conf_1}}
212
212
 
213
213
  rescue
214
- output_params = {:code => 507, :result => "Unknown SDK error"}
214
+ output_params = {:code => 507, :result => 'Unknown SDK error'}
215
215
  end
216
- mongo_connector_wifi_1.audit_logger_wifi_1("mtik_sch1_config_gen_1", remote_ip, input_params, conf_1, real_ip, subscriber_ip)
216
+ mongo_connector_wifi_1.audit_logger_wifi_1('mtik_sch1_config_gen_1', remote_ip, input_params, conf_1, real_ip, subscriber_ip)
217
217
  output_params
218
218
  end
219
219
 
@@ -243,10 +243,11 @@ module Freewifi_1
243
243
  def test()
244
244
  newcapsman1 = NEWhubWifi_1.new
245
245
 
246
+ capsman_ip = ['1.1.1.1']
246
247
  threads = []
247
248
  capsman_ip.each do |capsman|
248
249
  threads << Thread.new do
249
- newcapsman1.set_capsman_config_1("test_ss", capsman, capsman_user, capsman_password, "172.25.208.14", "test_company")
250
+ newcapsman1.set_capsman_config_1('test_ss', capsman, capsman_user, capsman_password, '172.25.208.14', 'test_company')
250
251
  end
251
252
  end
252
253
  threads.each(&:join)
@@ -347,18 +348,18 @@ class PortalFwifi_1
347
348
  resp_procedure = general_procedures.get_subs_info_return_1(ipaddress)
348
349
  output_params = resp_procedure
349
350
  rescue
350
- output_params = {:code => 507, :result => "Unknown SDK error"}
351
+ output_params = {:code => 507, :result => 'Unknown SDK error'}
351
352
  end
352
353
  end
353
354
  subs_info_ret_1_thr1.join
354
355
 
355
356
  subs_info_ret_1_thr2 = Thread.new do
356
357
  begin
357
- p "mongo"
358
+ p 'mongo'
358
359
  #mongo_connector_wifi_1 = MongoWifiCl_1.new(mongo_ip, mongo_port, mongo_database)
359
360
  #mongo_connector_wifi_1.audit_logger_wifi_portal_1("wifi_get_subs_info_return_1", remote_ip, input_params, output_params, real_ip)
360
361
  rescue
361
- additional_func_wifi_1.printer_texter_wifi_1({:input_params => input_params, :output_params => {:result => "mongo failed"}, :procedure => "wifi_get_subs_info_return_1", :file => "freewifi.rb"}, "debug")
362
+ additional_func_wifi_1.printer_texter_wifi_1({:input_params => input_params, :output_params => {:result => 'mongo failed'}, :procedure => 'wifi_get_subs_info_return_1', :file => 'freewifi.rb'}, 'debug')
362
363
  additional_func_wifi_1.telegram_message_1("{:function => \"wifi_get_subs_info_return_1\", :result => \"failed communicate with mongo database\", :sdk => \"freewifi\"}", telegram_api_url, telegram_chat_id)
363
364
  end
364
365
  end
@@ -377,7 +378,7 @@ class PortalFwifi_1
377
378
  resp_procedure = general_procedures.get_subs_info_ret_ssh_1(ipaddress)
378
379
  output_params = resp_procedure
379
380
  rescue
380
- output_params = {:code => 507, :result => "Unknown SDK error"}
381
+ output_params = {:code => 507, :result => 'Unknown SDK error'}
381
382
  end
382
383
  end
383
384
  subs_info_ret_1_thr1.join
@@ -388,7 +389,7 @@ class PortalFwifi_1
388
389
  #mongo_connector_wifi_1 = MongoWifiCl_1.new(mongo_ip, mongo_port, mongo_database)
389
390
  #mongo_connector_wifi_1.audit_logger_wifi_portal_1("wifi_get_subs_info_return_1", remote_ip, input_params, output_params, real_ip)
390
391
  rescue
391
- additional_func_wifi_1.printer_texter_wifi_1({:input_params => input_params, :output_params => {:result => "mongo failed"}, :procedure => "wifi_get_subs_info_return_1", :file => "freewifi.rb"}, "debug")
392
+ additional_func_wifi_1.printer_texter_wifi_1({:input_params => input_params, :output_params => {:result => "mongo failed"}, :procedure => "wifi_get_subs_info_return_1", :file => 'freewifi.rb'}, "debug")
392
393
  additional_func_wifi_1.telegram_message_1("{:function => \"wifi_get_subs_info_return_1\", :result => \"failed communicate with mongo database\", :sdk => \"freewifi\"}", telegram_api_url, telegram_chat_id)
393
394
  end
394
395
  end
data/lib/freewifi/additional/additional_functions.rb CHANGED
@@ -27,7 +27,7 @@ class InternalFunc_1
27
27
  :body => {:telegram_resp => JSON.parse(body.to_s),
28
28
  :description => "Telegram message to telegram_chat_id: #{telegram_chat_id.to_s}"}}
29
29
  rescue
30
- return {:code => 507, :result => "Unknown SDK error"}
30
+ return {:code => 507, :result => 'Unknown SDK error'}
31
31
  end
32
32
  end
33
33
 
data/lib/freewifi/cisco/iwag/iwag_telnet_connector.rb CHANGED
@@ -19,7 +19,7 @@ class CSRtelnet_1
19
19
  #begin
20
20
 
21
21
  dump =""
22
- connection = Net::Telnet.new( "Host" => iwag1_host, "Timeout" => false, "Prompt" => /.*\#/ ) { |str| }
22
+ connection = Net::Telnet.new( "Host" => iwag1_host, "Timeout" => false, "Prompt" => /.*#/ ) { |str| }
23
23
  connection.login({ "Name" => iwag_username, "Password" => iwag_password, "LoginPrompt" => /Username:/ }) { |str| }
24
24
  connection.cmd("show ip dhcp binding #{ipaddress}") {
25
25
  |c|
@@ -69,7 +69,7 @@ class CSRtelnet_1
69
69
 
70
70
  dump =""
71
71
  begin
72
- connection = Net::Telnet.new("Host" => host_iwag, "Timeout" => false, "Prompt" => /.*\#/) {|str| print str}
72
+ connection = Net::Telnet.new("Host" => host_iwag, "Timeout" => false, "Prompt" => /.*#/) {|str| print str}
73
73
  connection.login({"Name" => username_iwag, "Password" => password_iwag, "LoginPrompt" => /Username:/}) {|str| print str}
74
74
  connection.cmd("show ip dhcp binding #{ipaddress}") {
75
75
  |c|
@@ -87,7 +87,7 @@ class CSRtelnet_1
87
87
  end
88
88
  rescue
89
89
  begin
90
- connection = Net::Telnet.new("Host" => host_iwag, "Timeout" => false, "Prompt" => /.*\#/) {|str| print str}
90
+ connection = Net::Telnet.new("Host" => host_iwag, "Timeout" => false, "Prompt" => /.*#/) {|str| print str}
91
91
  connection.login({"Name" => username_iwag, "Password" => password_iwag, "LoginPrompt" => /Username:/}) {|str| print str}
92
92
  connection.cmd("show ip dhcp binding #{ipaddress}") {
93
93
  |c|
data/lib/freewifi/config.rb CHANGED
@@ -1,5 +1,5 @@
1
1
  module Freewifi_1
2
- LOGLEVEL_1 = "debug"
2
+ LOGLEVEL_1 = 'debug'
3
3
 
4
4
  end
5
5
 
data/lib/freewifi/general/wifi_portal_procedures.rb CHANGED
@@ -125,7 +125,7 @@ class WiFiPortal_1
125
125
  begin
126
126
 
127
127
  dump =""
128
- connection = Net::Telnet.new("Host" => "172.24.247.183", "Timeout" => false, "Prompt" => /.*\#/) {|str|}
128
+ connection = Net::Telnet.new("Host" => "172.24.247.183", "Timeout" => false, "Prompt" => /.*#/) {|str|}
129
129
  connection.login({"Name" => iwag_username, "Password" => iwag_password, "LoginPrompt" => /Username:/}) {|str|}
130
130
  connection.cmd("show ip dhcp binding #{ipaddress}") {
131
131
  |c|
data/lib/freewifi/mikrotik/newhub_mtik_api.rb CHANGED
@@ -90,9 +90,7 @@ def get_info_subs_from_mik_1(subs_mac, controllers_ip)
90
90
  end
91
91
 
92
92
  #endregion
93
- answ = subscribers_mac+ "---" + access_point + "---" + ssid_ap + "---" + tx_rate_set + "---"+ tx_rate + "---"+ rx_rate + "---"+ rx_signal + "---"+ uptime + "---"+ packets + "---"+ bytes
94
-
95
- answ
93
+ subscribers_mac+ "---" + access_point + "---" + ssid_ap + "---" + tx_rate_set + "---"+ tx_rate + "---"+ rx_rate + "---"+ rx_signal + "---"+ uptime + "---"+ packets + "---"+ bytes
96
94
 
97
95
  end
98
96
 
data/lib/freewifi/mikrotik/newhub_mtik_ssh.rb CHANGED
@@ -25,7 +25,7 @@ class NEWhubWifi_1
25
25
  #result = ssh.exec!("/interface eoip print where tunnel-id=#{tunnel_id}")
26
26
  #p result
27
27
  result = ssh.exec!("/interface eoip print where tunnel-id=#{tunnel_id}")
28
- regimsi = /\s+name=\"(.+)\"\s+/
28
+ regimsi = /\s+name="(.+)"\s+/
29
29
  m1 = regimsi.match(result)[1]
30
30
  sleep 0.2
31
31
  result2 = ssh.exec!("/interface bridge port remove [/interface bridge port find interface=#{m1}]")
@@ -42,7 +42,7 @@ class NEWhubWifi_1
42
42
  begin
43
43
  Net::SSH.start(hub2, user_hub, :password => password_hub) do |ssh|
44
44
  result = ssh.exec!("/interface eoip print where tunnel-id=#{tunnel_id}")
45
- regimsi = /\s+name=\"(.+)\"\s+/
45
+ regimsi = /\s+name="(.+)"\s+/
46
46
  m1 = regimsi.match(result)[1]
47
47
  sleep 0.2
48
48
  result2 = ssh.exec!("/interface bridge port remove [/interface bridge port find interface=#{m1}]")
@@ -222,12 +222,12 @@ class NEWhubWifi_1
222
222
  end
223
223
  end
224
224
  end
225
- output_params = {:code => 200, :result => "check_pool_range_includes_1: Request processed", :body => {:result => res}}
225
+ output_params = {:code => 200, :result => 'check_pool_range_includes_1: Request processed', :body => {:result => res}}
226
226
  rescue
227
- output_params = {:code => 507, :result => "check_pool_range_includes_1: Unknown SDK error"}
227
+ output_params = {:code => 507, :result => 'check_pool_range_includes_1: Unknown SDK error'}
228
228
  end
229
229
 
230
- additional_func_wifi_1.printer_texter_wifi_1({:input_params => input_params, :output_params => output_params, :procedure => "check_pool_range_includes_1", :file => "freewifi/mikrotik/newhub_mtik_ssh.rb", :sdk => "freewifi"}, "debug")
230
+ additional_func_wifi_1.printer_texter_wifi_1({:input_params => input_params, :output_params => output_params, :procedure => 'check_pool_range_includes_1', :file => 'freewifi/mikrotik/newhub_mtik_ssh.rb', :sdk => 'freewifi'}, 'debug')
231
231
  output_params
232
232
  end
233
233
 
@@ -245,7 +245,7 @@ class NEWhubWifi_1
245
245
 
246
246
  command_provisioning_24ghz = "/caps-man provisioning add hw-supported-modes=b,g,gn ip-address-ranges=#{ap_ip} action=create-dynamic-enabled place-before=30 master-configuration=#{conf_24ghz_name} name-format=identity"
247
247
 
248
- command_provisioning_5ghz = "/caps-man provisioning add hw-supported-modes=a,ac,an ip-address-ranges=#{ap_ip} action=create-dynamic-enabled place-before=30 master-configuration=#{conf_24ghz_name} name-format=identity"
248
+ command_provisioning_5ghz = "/caps-man provisioning add hw-supported-modes=a,ac,an ip-address-ranges=#{ap_ip} action=create-dynamic-enabled place-before=30 master-configuration=#{conf_5ghz_name} name-format=identity"
249
249
 
250
250
  Net::SSH.start(capsman1, capsman_user1, :password => capsman_pass1) do |ssh|
251
251
  result = ssh.exec!(command_conf_24ghz)
@@ -270,8 +270,8 @@ class NEWhubWifi_1
270
270
  result = ssh.exec!(command)
271
271
  s1 = result.split("\r\n\r\n")
272
272
  for a in s1
273
- a1 = a.gsub("\r\n", "")
274
- a2 = a1.gsub(", ", ",")
273
+ a1 = a.gsub("\r\n", '')
274
+ a2 = a1.gsub(', ', ',')
275
275
  reg_addr_range = / (\d) .+ ip-address-ranges=(\d{1,3}.+\.\d{1,3}|\d{1,3}.+\.\d{1,3}\/\d{1,2})\s+/
276
276
  m1 = a2.scan(reg_addr_range)
277
277
  num = m1[0][0]
@@ -280,7 +280,7 @@ class NEWhubWifi_1
280
280
  final_provision_old << triplet
281
281
  exists_check = self.check_pool_range_includes_1(triplet[1], ap_ip)
282
282
 
283
- if exists_check[:body][:result] != "exists"
283
+ if exists_check[:body][:result] != 'exists'
284
284
  #self.capsman_set_ip_range_1(capsman1, capsman_user1, capsman_pass1, ap_ip)
285
285
  #set data to capsman
286
286
  rewrite_ip_command = "/caps-man provisioning set numbers=#{triplet[0]} ip-address-ranges=#{triplet[1]},#{ap_ip}"
@@ -314,7 +314,7 @@ class NEWhubWifi_1
314
314
  else
315
315
  p result
316
316
  conf_names = []
317
- reg_config_name = /name=\"(\S+)\"/
317
+ reg_config_name = /name="(\S+)"/
318
318
  m1 = result.scan(reg_config_name)
319
319
  for a1 in m1
320
320
  if a1[0] != []
@@ -326,7 +326,7 @@ class NEWhubWifi_1
326
326
  end
327
327
  end
328
328
  rescue
329
- output_params = {:code => 507, :result => "set_capsman_config_1: Unknown SDK error"}
329
+ output_params = {:code => 507, :result => 'set_capsman_config_1: Unknown SDK error'}
330
330
  end
331
331
 
332
332
  additional_func_wifi_1.printer_texter_wifi_1({:input_params => input_params, :output_params => output_params, :procedure => "set_capsman_config_1", :file => "freewifi/mikrotik/newhub_mtik_ssh.rb", :sdk => "freewifi"}, "debug")
data/lib/freewifi/mikrotik/schemes_conf_gen.rb CHANGED
@@ -15,9 +15,9 @@ class MtikSchemesGen_1
15
15
 
16
16
  [
17
17
  "/system identity set name=#{hostname}",
18
- "/interface bridge add name=bridge_tunnel",
18
+ '/interface bridge add name=bridge_tunnel',
19
19
  "/interface eoip add remote-address=#{hub_vip.to_s} tunnel-id=#{tunnel_id.to_s} name=tunnel_to_hub",
20
- "/interface bridge port add interface=tunnel_to_hub bridge=bridge_tunnel",
20
+ '/interface bridge port add interface=tunnel_to_hub bridge=bridge_tunnel',
21
21
  "/interface bridge port add interface=wlan1 bridge=bridge_tunnel",
22
22
  "/interface wireless set wlan1 mode=ap-bridge ssid=#{ap_ssid} disabled=no name=wireless_public_interface frequency=2442",
23
23
  "/interface ppp-client set ppp-out1 apn=vpn pin=1111 disabled=no",
data/lib/freewifi/version.rb CHANGED
@@ -1,3 +1,3 @@
1
1
  module Freewifi_1
2
- VERSION = "0.2.3"
2
+ VERSION = '0.2.4'
3
3
  end
metadata CHANGED
@@ -1,14 +1,14 @@
1
1
  --- !ruby/object:Gem::Specification
2
2
  name: freewifi
3
3
  version: !ruby/object:Gem::Version
4
- version: 0.2.3
4
+ version: 0.2.4
5
5
  platform: ruby
6
6
  authors:
7
7
  - Dzmitry Buynovskiy
8
8
  autorequire:
9
9
  bindir: exe
10
10
  cert_chain: []
11
- date: 2020-09-20 00:00:00.000000000 Z
11
+ date: 2021-01-04 00:00:00.000000000 Z
12
12
  dependencies:
13
13
  - !ruby/object:Gem::Dependency
14
14
  name: bundler