freewifi 0.2.2 → 0.2.3

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.
Files changed (10) hide show
  1. checksums.yaml +4 -4
  2. data/.idea/freewifi.iml +1 -1
  3. data/.idea/runConfigurations/get_iwag_data.xml +21 -0
  4. data/.idea/workspace.xml +173 -105
  5. data/lib/freewifi.rb +5 -3
  6. data/lib/freewifi/cisco/iwag/get_iwag_data.rb +4 -12
  7. data/lib/freewifi/cisco/iwag/iwag_database_worker.rb +4 -0
  8. data/lib/freewifi/general/wifi_portal_procedures.rb +11 -8
  9. data/lib/freewifi/version.rb +1 -1
  10. metadata +3 -2
checksums.yaml CHANGED
@@ -1,7 +1,7 @@
1
1
  ---
2
2
  SHA1:
3
- metadata.gz: 100fb9531a597e99f24be5924cfded3db21bd0ab
4
- data.tar.gz: 7f521430b11c168d0cc51769f3d2016000c080ce
3
+ metadata.gz: f31fde467b95b97d53c09380a4d42dadac4d223c
4
+ data.tar.gz: ec699c7a6ff1fd70f86992f0a494b9e4833fce7b
5
5
  SHA512:
6
- metadata.gz: 6eb2ac4551ff52265b17108af3b16993589580f33cb056b882120970df0c5ceb4c4cfb0a0116e70d7a0fe422e4f857ce111f2fd49ce9a37f8763ded75a82f92d
7
- data.tar.gz: 4fca917d29cb5a415cbc9a942caadd86adee567369790d87cb412074f4447950ee01cc12917d702c7701436b3b7788cd2fa0c69cb91ccebe0c3f97cdb0ef809c
6
+ metadata.gz: 775736eb6b660db0e101c7544bad31e4645144b8095e53e4a241eb3953b913c10dac20b7a040deecee26862e797ef8df2839e6dc37c0b4776551ee3c43c4ff07
7
+ data.tar.gz: cb6b74aab3eec231a6e9c61903a9ddefd39af9f22e677957e3a35cb841b17991bac96bae7d5b6026385cbe8cd2acf3d55789811117187d74611d16edd24b72b2
data/.idea/freewifi.iml CHANGED
@@ -96,7 +96,7 @@
96
96
  <RUBY_RUN_CONFIG NAME="SCRIPT_ARGS" VALUE="" />
97
97
  <method />
98
98
  </configuration>
99
- <configuration default="false" name="get_iwag_data" type="RubyRunConfigurationType" factoryName="Ruby" temporary="true">
99
+ <configuration default="false" name="get_iwag_data" type="RubyRunConfigurationType" factoryName="Ruby">
100
100
  <module name="freewifi" />
101
101
  <RUBY_RUN_CONFIG NAME="RUBY_ARGS" VALUE="-e $stdout.sync=true;$stderr.sync=true;load($0=ARGV.shift)" />
102
102
  <RUBY_RUN_CONFIG NAME="WORK DIR" VALUE="$MODULE_DIR$/lib/freewifi/cisco/iwag" />
data/.idea/runConfigurations/get_iwag_data.xml ADDED
@@ -0,0 +1,21 @@
1
+ <component name="ProjectRunConfigurationManager">
2
+ <configuration default="false" name="get_iwag_data" type="RubyRunConfigurationType" factoryName="Ruby">
3
+ <module name="freewifi" />
4
+ <RUBY_RUN_CONFIG NAME="RUBY_ARGS" VALUE="-e $stdout.sync=true;$stderr.sync=true;load($0=ARGV.shift)" />
5
+ <RUBY_RUN_CONFIG NAME="WORK DIR" VALUE="$MODULE_DIR$/lib/freewifi/cisco/iwag" />
6
+ <RUBY_RUN_CONFIG NAME="SHOULD_USE_SDK" VALUE="false" />
7
+ <RUBY_RUN_CONFIG NAME="ALTERN_SDK_NAME" VALUE="" />
8
+ <RUBY_RUN_CONFIG NAME="myPassParentEnvs" VALUE="true" />
9
+ <envs />
10
+ <EXTENSION ID="BundlerRunConfigurationExtension" bundleExecEnabled="true" />
11
+ <EXTENSION ID="JRubyRunConfigurationExtension" NailgunExecEnabled="false" />
12
+ <EXTENSION ID="RubyCoverageRunConfigurationExtension" enabled="false" sample_coverage="true" track_test_folders="true" runner="rcov">
13
+ <COVERAGE_PATTERN ENABLED="true">
14
+ <PATTERN REGEXPS="/.rvm/" INCLUDED="false" />
15
+ </COVERAGE_PATTERN>
16
+ </EXTENSION>
17
+ <RUBY_RUN_CONFIG NAME="SCRIPT_PATH" VALUE="$MODULE_DIR$/lib/freewifi/cisco/iwag/get_iwag_data.rb" />
18
+ <RUBY_RUN_CONFIG NAME="SCRIPT_ARGS" VALUE="" />
19
+ <method />
20
+ </configuration>
21
+ </component>
data/.idea/workspace.xml CHANGED
@@ -1,5 +1,8 @@
1
1
  <?xml version="1.0" encoding="UTF-8"?>
2
2
  <project version="4">
3
+ <component name="AnalysisUIOptions">
4
+ <option name="ANALYZE_TEST_SOURCES" value="false" />
5
+ </component>
3
6
  <component name="ChangeListManager">
4
7
  <list default="true" id="02df4d6c-c448-427d-afde-92139fadec23" name="Default" comment="">
5
8
  <change type="NEW" beforePath="" afterPath="$PROJECT_DIR$/.gitignore" />
@@ -7,6 +10,7 @@
7
10
  <change type="NEW" beforePath="" afterPath="$PROJECT_DIR$/.idea/inspectionProfiles/Project_Default.xml" />
8
11
  <change type="NEW" beforePath="" afterPath="$PROJECT_DIR$/.idea/misc.xml" />
9
12
  <change type="NEW" beforePath="" afterPath="$PROJECT_DIR$/.idea/modules.xml" />
13
+ <change type="NEW" beforePath="" afterPath="$PROJECT_DIR$/.idea/runConfigurations/get_iwag_data.xml" />
10
14
  <change type="NEW" beforePath="" afterPath="$PROJECT_DIR$/.idea/vcs.xml" />
11
15
  <change type="NEW" beforePath="" afterPath="$PROJECT_DIR$/.idea/workspace.xml" />
12
16
  <change type="NEW" beforePath="" afterPath="$PROJECT_DIR$/.travis.yml" />
@@ -49,7 +53,7 @@
49
53
  <component name="ChangesViewManager" flattened_view="false" />
50
54
  <component name="CoverageDataManager">
51
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" />
52
- <SUITE FILE_PATH="coverage/freewifi@test_helper.coverage" NAME="test_helper Coverage Results" MODIFIED="1600377923678" 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@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" />
53
57
  <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" />
54
58
  <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" />
55
59
  <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" />
@@ -61,28 +65,38 @@
61
65
  <file leaf-file-name="freewifi.rb" pinned="false" current-in-tab="false">
62
66
  <entry file="file://$PROJECT_DIR$/lib/freewifi.rb">
63
67
  <provider selected="true" editor-type-id="text-editor">
64
- <state relative-caret-position="316">
65
- <caret line="68" column="32" lean-forward="false" selection-start-line="68" selection-start-column="32" selection-end-line="68" selection-end-column="32" />
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" />
66
70
  <folding />
67
71
  </state>
68
72
  </provider>
69
73
  </entry>
70
74
  </file>
71
- <file leaf-file-name="version.rb" pinned="false" current-in-tab="true">
72
- <entry file="file://$PROJECT_DIR$/lib/freewifi/version.rb">
75
+ <file leaf-file-name="test.rb" pinned="false" current-in-tab="false">
76
+ <entry file="file://$PROJECT_DIR$/test/test.rb">
73
77
  <provider selected="true" editor-type-id="text-editor">
74
- <state relative-caret-position="45">
75
- <caret line="3" column="0" lean-forward="true" selection-start-line="3" selection-start-column="0" selection-end-line="3" selection-end-column="0" />
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" />
76
80
  <folding />
77
81
  </state>
78
82
  </provider>
79
83
  </entry>
80
84
  </file>
81
- <file leaf-file-name="wifi_portal_procedures.rb" pinned="false" current-in-tab="false">
82
- <entry file="file://$PROJECT_DIR$/lib/freewifi/general/wifi_portal_procedures.rb">
85
+ <file leaf-file-name="test_helper.rb" pinned="false" current-in-tab="false">
86
+ <entry file="file://$PROJECT_DIR$/test/test_helper.rb">
87
+ <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" />
90
+ <folding />
91
+ </state>
92
+ </provider>
93
+ </entry>
94
+ </file>
95
+ <file leaf-file-name="version.rb" pinned="false" current-in-tab="true">
96
+ <entry file="file://$PROJECT_DIR$/lib/freewifi/version.rb">
83
97
  <provider selected="true" editor-type-id="text-editor">
84
- <state relative-caret-position="327">
85
- <caret line="42" column="35" lean-forward="false" selection-start-line="42" selection-start-column="35" selection-end-line="42" selection-end-column="35" />
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" />
86
100
  <folding />
87
101
  </state>
88
102
  </provider>
@@ -91,28 +105,48 @@
91
105
  <file leaf-file-name="get_iwag_data.rb" pinned="false" current-in-tab="false">
92
106
  <entry file="file://$PROJECT_DIR$/lib/freewifi/cisco/iwag/get_iwag_data.rb">
93
107
  <provider selected="true" editor-type-id="text-editor">
94
- <state relative-caret-position="362">
95
- <caret line="94" column="46" lean-forward="false" selection-start-line="94" selection-start-column="46" selection-end-line="94" selection-end-column="46" />
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" />
96
110
  <folding />
97
111
  </state>
98
112
  </provider>
99
113
  </entry>
100
114
  </file>
101
- <file leaf-file-name="test.rb" pinned="false" current-in-tab="false">
102
- <entry file="file://$PROJECT_DIR$/test/test.rb">
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">
103
117
  <provider selected="true" editor-type-id="text-editor">
104
- <state relative-caret-position="75">
105
- <caret line="5" column="22" lean-forward="false" selection-start-line="5" selection-start-column="22" selection-end-line="5" selection-end-column="22" />
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" />
106
120
  <folding />
107
121
  </state>
108
122
  </provider>
109
123
  </entry>
110
124
  </file>
111
- <file leaf-file-name="test_helper.rb" pinned="false" current-in-tab="false">
112
- <entry file="file://$PROJECT_DIR$/test/test_helper.rb">
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">
113
127
  <provider selected="true" editor-type-id="text-editor">
114
- <state relative-caret-position="337">
115
- <caret line="84" column="46" lean-forward="true" selection-start-line="84" selection-start-column="46" selection-end-line="84" selection-end-column="46" />
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" />
130
+ <folding />
131
+ </state>
132
+ </provider>
133
+ </entry>
134
+ </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">
137
+ <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" />
140
+ <folding />
141
+ </state>
142
+ </provider>
143
+ </entry>
144
+ </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">
147
+ <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" />
116
150
  <folding />
117
151
  </state>
118
152
  </provider>
@@ -147,8 +181,9 @@
147
181
  <option value="$PROJECT_DIR$/lib/freewifi/mikrotik/automation/get_data_ssh_fun.rb" />
148
182
  <option value="$PROJECT_DIR$/lib/freewifi/cisco/iwag/iwag_database_worker.rb" />
149
183
  <option value="$PROJECT_DIR$/lib/freewifi/cisco/iwag/get_iwag_data.rb" />
150
- <option value="$PROJECT_DIR$/lib/freewifi.rb" />
151
184
  <option value="$PROJECT_DIR$/lib/freewifi/general/wifi_portal_procedures.rb" />
185
+ <option value="$PROJECT_DIR$/lib/freewifi.rb" />
186
+ <option value="$PROJECT_DIR$/test/freewifi_test.rb" />
152
187
  <option value="$PROJECT_DIR$/test/test_helper.rb" />
153
188
  <option value="$PROJECT_DIR$/lib/freewifi/version.rb" />
154
189
  </list>
@@ -179,7 +214,7 @@
179
214
  <foldersAlwaysOnTop value="true" />
180
215
  </navigator>
181
216
  <panes>
182
- <pane id="Scratches" />
217
+ <pane id="Scope" />
183
218
  <pane id="ProjectPane">
184
219
  <subPane>
185
220
  <PATH>
@@ -260,6 +295,54 @@
260
295
  <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
261
296
  </PATH_ELEMENT>
262
297
  </PATH>
298
+ <PATH>
299
+ <PATH_ELEMENT>
300
+ <option name="myItemId" value="freewifi" />
301
+ <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.ProjectViewProjectNode" />
302
+ </PATH_ELEMENT>
303
+ <PATH_ELEMENT>
304
+ <option name="myItemId" value="freewifi" />
305
+ <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
306
+ </PATH_ELEMENT>
307
+ <PATH_ELEMENT>
308
+ <option name="myItemId" value="lib" />
309
+ <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
310
+ </PATH_ELEMENT>
311
+ <PATH_ELEMENT>
312
+ <option name="myItemId" value="freewifi" />
313
+ <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
314
+ </PATH_ELEMENT>
315
+ <PATH_ELEMENT>
316
+ <option name="myItemId" value="database" />
317
+ <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
318
+ </PATH_ELEMENT>
319
+ <PATH_ELEMENT>
320
+ <option name="myItemId" value="mysql" />
321
+ <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
322
+ </PATH_ELEMENT>
323
+ </PATH>
324
+ <PATH>
325
+ <PATH_ELEMENT>
326
+ <option name="myItemId" value="freewifi" />
327
+ <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.ProjectViewProjectNode" />
328
+ </PATH_ELEMENT>
329
+ <PATH_ELEMENT>
330
+ <option name="myItemId" value="freewifi" />
331
+ <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
332
+ </PATH_ELEMENT>
333
+ <PATH_ELEMENT>
334
+ <option name="myItemId" value="lib" />
335
+ <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
336
+ </PATH_ELEMENT>
337
+ <PATH_ELEMENT>
338
+ <option name="myItemId" value="freewifi" />
339
+ <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
340
+ </PATH_ELEMENT>
341
+ <PATH_ELEMENT>
342
+ <option name="myItemId" value="database" />
343
+ <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
344
+ </PATH_ELEMENT>
345
+ </PATH>
263
346
  <PATH>
264
347
  <PATH_ELEMENT>
265
348
  <option name="myItemId" value="freewifi" />
@@ -307,6 +390,10 @@
307
390
  <option name="myItemId" value="cisco" />
308
391
  <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
309
392
  </PATH_ELEMENT>
393
+ <PATH_ELEMENT>
394
+ <option name="myItemId" value="any" />
395
+ <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
396
+ </PATH_ELEMENT>
310
397
  </PATH>
311
398
  <PATH>
312
399
  <PATH_ELEMENT>
@@ -332,7 +419,7 @@
332
419
  </PATH>
333
420
  </subPane>
334
421
  </pane>
335
- <pane id="Scope" />
422
+ <pane id="Scratches" />
336
423
  </panes>
337
424
  </component>
338
425
  <component name="PropertiesComponent">
@@ -341,6 +428,7 @@
341
428
  <property name="settings.editor.selected.configurable" value="org.jetbrains.plugins.ruby.settings.RubyActiveModuleSdkConfigurable" />
342
429
  <property name="project.settings.patched" value="true" />
343
430
  <property name="FullScreen" value="true" />
431
+ <property name="run.code.analysis.last.selected.profile" value="pProject Default" />
344
432
  </component>
345
433
  <component name="RecentsManager">
346
434
  <key name="MoveFile.RECENT_KEYS">
@@ -361,25 +449,6 @@
361
449
  </option>
362
450
  </component>
363
451
  <component name="RunManager" selected="Ruby.test_helper">
364
- <configuration default="false" name="get_iwag_data" type="RubyRunConfigurationType" factoryName="Ruby" temporary="true">
365
- <module name="freewifi" />
366
- <RUBY_RUN_CONFIG NAME="RUBY_ARGS" VALUE="-e $stdout.sync=true;$stderr.sync=true;load($0=ARGV.shift)" />
367
- <RUBY_RUN_CONFIG NAME="WORK DIR" VALUE="$MODULE_DIR$/lib/freewifi/cisco/iwag" />
368
- <RUBY_RUN_CONFIG NAME="SHOULD_USE_SDK" VALUE="false" />
369
- <RUBY_RUN_CONFIG NAME="ALTERN_SDK_NAME" VALUE="" />
370
- <RUBY_RUN_CONFIG NAME="myPassParentEnvs" VALUE="true" />
371
- <envs />
372
- <EXTENSION ID="BundlerRunConfigurationExtension" bundleExecEnabled="true" />
373
- <EXTENSION ID="JRubyRunConfigurationExtension" NailgunExecEnabled="false" />
374
- <EXTENSION ID="RubyCoverageRunConfigurationExtension" enabled="false" sample_coverage="true" track_test_folders="true" runner="rcov">
375
- <COVERAGE_PATTERN ENABLED="true">
376
- <PATTERN REGEXPS="/.rvm/" INCLUDED="false" />
377
- </COVERAGE_PATTERN>
378
- </EXTENSION>
379
- <RUBY_RUN_CONFIG NAME="SCRIPT_PATH" VALUE="$MODULE_DIR$/lib/freewifi/cisco/iwag/get_iwag_data.rb" />
380
- <RUBY_RUN_CONFIG NAME="SCRIPT_ARGS" VALUE="" />
381
- <method />
382
- </configuration>
383
452
  <configuration default="true" type="CucumberRunConfigurationType" factoryName="Cucumber">
384
453
  <predefined_log_file id="RUBY_CUCUMBER" enabled="true" />
385
454
  <module name="" />
@@ -531,11 +600,6 @@
531
600
  <item index="4" class="java.lang.String" itemvalue="Ruby.wifi_portal_procedures" />
532
601
  <item index="5" class="java.lang.String" itemvalue="Ruby.get_iwag_data" />
533
602
  </list>
534
- <recent_temporary>
535
- <list size="1">
536
- <item index="0" class="java.lang.String" itemvalue="Ruby.get_iwag_data" />
537
- </list>
538
- </recent_temporary>
539
603
  </component>
540
604
  <component name="ShelveChangesManager" show_recycled="false">
541
605
  <option name="remove_strategy" value="false" />
@@ -575,21 +639,25 @@
575
639
  <workItem from="1590439173325" duration="1040000" />
576
640
  <workItem from="1590829321571" duration="371000" />
577
641
  <workItem from="1591252934951" duration="3869000" />
578
- <workItem from="1600375108678" duration="2779000" />
642
+ <workItem from="1600375108678" duration="4825000" />
643
+ <workItem from="1600421249458" duration="2414000" />
644
+ <workItem from="1600623801343" duration="1557000" />
579
645
  </task>
580
646
  <servers />
581
647
  </component>
582
648
  <component name="TimeTrackingManager">
583
- <option name="totallyTimeSpent" value="97052000" />
649
+ <option name="totallyTimeSpent" value="103069000" />
584
650
  </component>
585
651
  <component name="ToolWindowManager">
586
652
  <frame x="0" y="0" width="1440" height="900" extended-state="6" />
587
653
  <editor active="true" />
588
654
  <layout>
589
- <window_info id="Project" active="false" anchor="left" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="true" show_stripe_button="true" weight="0.27038628" sideWeight="0.5" order="0" side_tool="false" content_ui="combo" />
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" />
590
656
  <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" />
591
657
  <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" />
592
659
  <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
+ <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" />
593
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" />
594
662
  <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" />
595
663
  <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" />
@@ -601,7 +669,6 @@
601
669
  <window_info id="Commander" active="false" anchor="right" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.4" sideWeight="0.5" order="0" side_tool="false" content_ui="tabs" />
602
670
  <window_info id="Inspection" 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="5" side_tool="false" content_ui="tabs" />
603
671
  <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" />
604
- <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" />
605
672
  <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" />
606
673
  </layout>
607
674
  </component>
@@ -843,20 +910,6 @@
843
910
  </state>
844
911
  </provider>
845
912
  </entry>
846
- <entry file="file://$PROJECT_DIR$/lib/freewifi/database/mysql/database_methods_wifi.rb">
847
- <provider selected="true" editor-type-id="text-editor">
848
- <state relative-caret-position="-314">
849
- <caret line="15" column="23" lean-forward="false" selection-start-line="15" selection-start-column="23" selection-end-line="15" selection-end-column="23" />
850
- </state>
851
- </provider>
852
- </entry>
853
- <entry file="file://$PROJECT_DIR$/lib/freewifi/cisco/any/cisco_schemes_conf_gen.rb">
854
- <provider selected="true" editor-type-id="text-editor">
855
- <state relative-caret-position="120">
856
- <caret line="8" column="0" lean-forward="true" selection-start-line="8" selection-start-column="0" selection-end-line="8" selection-end-column="0" />
857
- </state>
858
- </provider>
859
- </entry>
860
913
  <entry file="file://$PROJECT_DIR$/lib/freewifi/config.rb">
861
914
  <provider selected="true" editor-type-id="text-editor">
862
915
  <state relative-caret-position="30">
@@ -878,13 +931,6 @@
878
931
  </state>
879
932
  </provider>
880
933
  </entry>
881
- <entry file="file://$PROJECT_DIR$/lib/freewifi/mikrotik/newhub_mtik_ssh.rb">
882
- <provider selected="true" editor-type-id="text-editor">
883
- <state relative-caret-position="746">
884
- <caret line="274" column="13" lean-forward="true" selection-start-line="274" selection-start-column="13" selection-end-line="274" selection-end-column="13" />
885
- </state>
886
- </provider>
887
- </entry>
888
934
  <entry file="file://$PROJECT_DIR$/lib/freewifi/mikrotik/schemes_conf_gen.rb">
889
935
  <provider selected="true" editor-type-id="text-editor">
890
936
  <state relative-caret-position="450">
@@ -899,90 +945,112 @@
899
945
  </state>
900
946
  </provider>
901
947
  </entry>
902
- <entry file="file://$PROJECT_DIR$/lib/freewifi/cisco/iwag/iwag_database_worker.rb">
948
+ <entry file="file://$PROJECT_DIR$/freewifi.gemspec">
903
949
  <provider selected="true" editor-type-id="text-editor">
904
- <state relative-caret-position="195">
905
- <caret line="13" column="4" lean-forward="true" selection-start-line="13" selection-start-column="4" selection-end-line="13" selection-end-column="4" />
906
- <folding />
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" />
907
952
  </state>
908
953
  </provider>
909
954
  </entry>
910
- <entry file="file://$PROJECT_DIR$/lib/freewifi/cisco/iwag/iwag_telnet_connector.rb">
955
+ <entry file="file://$PROJECT_DIR$/lib/freewifi/mikrotik/automation/get_data_ssh_fun.rb">
911
956
  <provider selected="true" editor-type-id="text-editor">
912
- <state relative-caret-position="-426">
913
- <caret line="4" column="17" lean-forward="false" selection-start-line="4" selection-start-column="17" selection-end-line="4" selection-end-column="17" />
914
- <folding />
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" />
915
959
  </state>
916
960
  </provider>
917
961
  </entry>
918
- <entry file="file://$PROJECT_DIR$/freewifi.gemspec">
962
+ <entry file="file://$PROJECT_DIR$/test/test.rb">
919
963
  <provider selected="true" editor-type-id="text-editor">
920
- <state relative-caret-position="476">
921
- <caret line="32" column="49" lean-forward="false" selection-start-line="32" selection-start-column="49" selection-end-line="32" selection-end-column="49" />
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" />
922
966
  <folding />
923
967
  </state>
924
968
  </provider>
925
969
  </entry>
926
- <entry file="file://$PROJECT_DIR$/lib/freewifi/mikrotik/automation/get_data_ssh_fun.rb">
970
+ <entry file="file://$PROJECT_DIR$/lib/freewifi.rb">
927
971
  <provider selected="true" editor-type-id="text-editor">
928
- <state relative-caret-position="30">
929
- <caret line="2" column="0" lean-forward="false" selection-start-line="2" selection-start-column="0" selection-end-line="2" selection-end-column="0" />
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" />
930
974
  <folding />
931
975
  </state>
932
976
  </provider>
933
977
  </entry>
934
978
  <entry file="file://$PROJECT_DIR$/test/freewifi_test.rb">
935
979
  <provider selected="true" editor-type-id="text-editor">
936
- <state relative-caret-position="0">
937
- <caret line="0" column="0" lean-forward="false" selection-start-line="0" selection-start-column="0" selection-end-line="0" selection-end-column="0" />
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" />
938
982
  <folding />
939
983
  </state>
940
984
  </provider>
941
985
  </entry>
942
- <entry file="file://$PROJECT_DIR$/test/test.rb">
986
+ <entry file="file://$PROJECT_DIR$/lib/freewifi/mikrotik/newhub_mtik_ssh.rb">
943
987
  <provider selected="true" editor-type-id="text-editor">
944
- <state relative-caret-position="75">
945
- <caret line="5" column="22" lean-forward="false" selection-start-line="5" selection-start-column="22" selection-end-line="5" selection-end-column="22" />
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" />
990
+ <folding />
991
+ </state>
992
+ </provider>
993
+ </entry>
994
+ <entry file="file://$PROJECT_DIR$/lib/freewifi/cisco/any/cisco_schemes_conf_gen.rb">
995
+ <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" />
946
998
  <folding />
947
999
  </state>
948
1000
  </provider>
949
1001
  </entry>
950
1002
  <entry file="file://$PROJECT_DIR$/lib/freewifi/cisco/iwag/get_iwag_data.rb">
951
1003
  <provider selected="true" editor-type-id="text-editor">
952
- <state relative-caret-position="362">
953
- <caret line="94" column="46" lean-forward="false" selection-start-line="94" selection-start-column="46" selection-end-line="94" selection-end-column="46" />
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" />
954
1006
  <folding />
955
1007
  </state>
956
1008
  </provider>
957
1009
  </entry>
958
- <entry file="file://$PROJECT_DIR$/lib/freewifi/general/wifi_portal_procedures.rb">
1010
+ <entry file="file://$PROJECT_DIR$/lib/freewifi/cisco/iwag/iwag_database_worker.rb">
959
1011
  <provider selected="true" editor-type-id="text-editor">
960
- <state relative-caret-position="327">
961
- <caret line="42" column="35" lean-forward="false" selection-start-line="42" selection-start-column="35" selection-end-line="42" selection-end-column="35" />
1012
+ <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" />
962
1014
  <folding />
963
1015
  </state>
964
1016
  </provider>
965
1017
  </entry>
966
- <entry file="file://$PROJECT_DIR$/test/test_helper.rb">
1018
+ <entry file="file://$PROJECT_DIR$/lib/freewifi/cisco/iwag/iwag_telnet_connector.rb">
967
1019
  <provider selected="true" editor-type-id="text-editor">
968
- <state relative-caret-position="337">
969
- <caret line="84" column="46" lean-forward="true" selection-start-line="84" selection-start-column="46" selection-end-line="84" selection-end-column="46" />
1020
+ <state relative-caret-position="1335">
1021
+ <caret line="89" column="93" lean-forward="false" selection-start-line="89" selection-start-column="93" selection-end-line="89" selection-end-column="93" />
970
1022
  <folding />
971
1023
  </state>
972
1024
  </provider>
973
1025
  </entry>
974
- <entry file="file://$PROJECT_DIR$/lib/freewifi.rb">
1026
+ <entry file="file://$PROJECT_DIR$/lib/freewifi/database/mysql/database_methods_wifi.rb">
975
1027
  <provider selected="true" editor-type-id="text-editor">
976
- <state relative-caret-position="316">
977
- <caret line="68" column="32" lean-forward="false" selection-start-line="68" selection-start-column="32" selection-end-line="68" selection-end-column="32" />
1028
+ <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" />
1030
+ <folding />
1031
+ </state>
1032
+ </provider>
1033
+ </entry>
1034
+ <entry file="file://$PROJECT_DIR$/lib/freewifi/general/wifi_portal_procedures.rb">
1035
+ <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" />
1038
+ <folding />
1039
+ </state>
1040
+ </provider>
1041
+ </entry>
1042
+ <entry file="file://$PROJECT_DIR$/test/test_helper.rb">
1043
+ <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" />
978
1046
  <folding />
979
1047
  </state>
980
1048
  </provider>
981
1049
  </entry>
982
1050
  <entry file="file://$PROJECT_DIR$/lib/freewifi/version.rb">
983
1051
  <provider selected="true" editor-type-id="text-editor">
984
- <state relative-caret-position="45">
985
- <caret line="3" column="0" lean-forward="true" selection-start-line="3" selection-start-column="0" selection-end-line="3" selection-end-column="0" />
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" />
986
1054
  <folding />
987
1055
  </state>
988
1056
  </provider>
data/lib/freewifi.rb CHANGED
@@ -86,8 +86,6 @@ module Freewifi_1
86
86
  @hub_vip = hub_vip
87
87
  @ap_admin_password = ap_admin_password
88
88
  @capsman_ip_wifi = capsman_ip_wifi
89
-
90
-
91
89
  end
92
90
 
93
91
 
@@ -302,7 +300,9 @@ class PortalFwifi_1
302
300
  telegram_chat_id,
303
301
  iwag2_host,
304
302
  iwag2_username,
305
- iwag2_password
303
+ iwag2_password,
304
+ iwag1_port=22,
305
+ iwag2_port=22
306
306
  )
307
307
 
308
308
  @general_procedures = WiFiPortal_1.new(apigw_wsdl,
@@ -313,6 +313,7 @@ class PortalFwifi_1
313
313
  iwag1_host,
314
314
  iwag_username,
315
315
  iwag_password,
316
+ iwag1_port,
316
317
  mtik_control_ips_get,
317
318
  mtik_user,
318
319
  mtik_password,
@@ -323,6 +324,7 @@ class PortalFwifi_1
323
324
  iwag2_host,
324
325
  iwag2_username,
325
326
  iwag2_password,
327
+ iwag2_port
326
328
  )
327
329
  @mtik_control_ips_get = mtik_control_ips_get
328
330
  @mtik_user = mtik_user
data/lib/freewifi/cisco/iwag/get_iwag_data.rb CHANGED
@@ -2,12 +2,13 @@ require 'net/ssh'
2
2
 
3
3
  class IwagRequester
4
4
 
5
- attr_accessor :iwag_host, :iwag_login, :iwag_password
5
+ attr_accessor :iwag_host, :iwag_login, :iwag_password, :iwag_port
6
6
 
7
- def initialize(iwag_host, iwag_login, iwag_password)
7
+ def initialize(iwag_host, iwag_login, iwag_password, iwag_port)
8
8
  @iwag_host = iwag_host
9
9
  @iwag_login = iwag_login
10
10
  @iwag_password = iwag_password
11
+ @iwag_port = iwag_port
11
12
  end
12
13
 
13
14
  def mac_parse(mac)
@@ -28,7 +29,7 @@ class IwagRequester
28
29
  hostname = "Unknown"
29
30
  ssid = "Unknown"
30
31
  iwag_thr = Thread.new do
31
- Net::SSH.start(iwag_host, iwag_login, :password => iwag_password) do |session|
32
+ Net::SSH.start(iwag_host, iwag_login, :password => iwag_password, :port=>iwag_port) do |session|
32
33
  answ_bind = session.exec!("show ip dhcp binding #{bind_ip}")
33
34
  regexp_main = /\d{1,3}.\d{1,3}.\d{1,3}.\d{1,3}\s{1,20}(\w{2,4}.\w{2,4}.\w{2,4}.\w{2,4})|\d{1,3}.\d{1,3}.\d{1,3}.\d{1,3}\s{1,20}(\w{4}.\w{4}.\w{4})/
34
35
  #regexp_main = /\r\n(\d{1,3}.\d{1,3}.\d{1,3}.\d{1,3})\s+(\S{13,18})\s+Sep 18 2020 07:44 PM\s+Automatic\s+Active\s+Tunnel201\r\n/
@@ -88,12 +89,3 @@ class IwagRequester
88
89
  end
89
90
 
90
91
  end
91
-
92
-
93
- hhh = IwagRequester.new("172.24.223.149", "soapgw2", "eb5Swd8Yhq2Snd3eD")
94
-
95
- p hhh.iwag_get_dhcp_binding_ssh("100.75.15.127")
96
-
97
-
98
-
99
-
data/lib/freewifi/cisco/iwag/iwag_database_worker.rb CHANGED
@@ -15,6 +15,10 @@ class IwagDbCache
15
15
  end
16
16
 
17
17
 
18
+ def insert_new_cache()
19
+
20
+ end
21
+
18
22
 
19
23
  end
20
24
 
data/lib/freewifi/general/wifi_portal_procedures.rb CHANGED
@@ -29,8 +29,9 @@ class WiFiPortal_1
29
29
  apigw_wsse_aut_log,
30
30
  apigw_wsse_aut_pass,
31
31
  iwag1_host,
32
- iwag_username,
33
- iwag_password,
32
+ iwag1_username,
33
+ iwag1_password,
34
+ iwag1_port,
34
35
  mtik_control_ips_get,
35
36
  mtik_user,
36
37
  mtik_password,
@@ -40,8 +41,10 @@ class WiFiPortal_1
40
41
  hua_wlc_password,
41
42
  iwag2_host,
42
43
  iwag2_username,
43
- iwag2_password)
44
- @iwag_telnet_connector = CSRtelnet_1.new(iwag1_host, iwag_username, iwag_password)
44
+ iwag2_password,
45
+ iwag2_port
46
+ )
47
+ @iwag_telnet_connector = CSRtelnet_1.new(iwag1_host, iwag1_username, iwag1_password)
45
48
  @ard_api_gw_connector_wifi = Savon.client do
46
49
  #ssl_verify_mode :none
47
50
  wsdl apigw_wsdl
@@ -53,15 +56,15 @@ class WiFiPortal_1
53
56
  end
54
57
 
55
58
  @iwag1_host = iwag1_host
56
- @iwag_username = iwag_username
57
- @iwag_password = iwag_password
59
+ @iwag_username = iwag1_username
60
+ @iwag_password = iwag1_password
58
61
 
59
62
  @mtik_api_connector = NEWhubWifiApi_1.new(mtik_control_ips_get, mtik_user, mtik_password)
60
63
 
61
64
  @hua_controller_connector = HuaWifi_1.new(hua_wlc_1_ip, hua_wlc_2_ip, hua_wlc_login, hua_wlc_password)
62
65
 
63
- @iwag_connector1 = IwagRequester.new(iwag1_host, iwag_username, iwag_password)
64
- @iwag_connector2 = IwagRequester.new(iwag2_host, iwag2_username, iwag2_password)
66
+ @iwag_connector1 = IwagRequester.new(iwag1_host, iwag1_username, iwag1_password, iwag1_port)
67
+ @iwag_connector2 = IwagRequester.new(iwag2_host, iwag2_username, iwag2_password, iwag2_port)
65
68
 
66
69
  end
67
70
 
data/lib/freewifi/version.rb CHANGED
@@ -1,3 +1,3 @@
1
1
  module Freewifi_1
2
- VERSION = "0.2.2"
2
+ VERSION = "0.2.3"
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.2
4
+ version: 0.2.3
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-17 00:00:00.000000000 Z
11
+ date: 2020-09-20 00:00:00.000000000 Z
12
12
  dependencies:
13
13
  - !ruby/object:Gem::Dependency
14
14
  name: bundler
@@ -204,6 +204,7 @@ files:
204
204
  - ".idea/inspectionProfiles/Project_Default.xml"
205
205
  - ".idea/misc.xml"
206
206
  - ".idea/modules.xml"
207
+ - ".idea/runConfigurations/get_iwag_data.xml"
207
208
  - ".idea/vcs.xml"
208
209
  - ".idea/workspace.xml"
209
210
  - ".travis.yml"