script_executor 1.7.0 → 1.7.1

Sign up to get free protection for your applications and to get access to all the features.
Files changed (12) hide show
  1. checksums.yaml +4 -4
  2. data/.idea/script_executor.iml +14 -14
  3. data/.idea/workspace.xml +154 -133
  4. data/CHANGES +1 -1
  5. data/Gemfile +10 -10
  6. data/Gemfile.lock +4 -4
  7. data/lib/script_executor/scripts_parser.rb +1 -1
  8. data/lib/script_executor/version.rb +1 -1
  9. data/script_executor.gemspec +3 -3
  10. data/spec/scripts_parser_spec.rb +1 -1
  11. data/spec/support/big_script2.sh +82 -0
  12. metadata +15 -13
checksums.yaml CHANGED
@@ -1,7 +1,7 @@
1
1
  ---
2
2
  SHA1:
3
- metadata.gz: 79cad2a58055e9c2892db2123e386cfb75310f4b
4
- data.tar.gz: 78e30e4ec11ad186f32d6c66ccee56fec29cb7fc
3
+ metadata.gz: 4ad7d6d978b58ac38bf18bc60332ed289a96c330
4
+ data.tar.gz: 52c0885b91fe4fccb836d92ca50585e278f09160
5
5
  SHA512:
6
- metadata.gz: 084bcceacbe24f7b80b17eddf02459971f68bc4dba99f735c4e6e17cfb53eb751edd6683b3f1e687613cc905d4e0059b5b912ea66d98ebcb7b666fe8e4653a1f
7
- data.tar.gz: 913c4bd2928ab53368224e803e90f0ca53d36e40c0239d63242c8040ba3873e164a15ddf219c3bc080e9ba87e0ece7dccdf4b4b91853cab26cea34f3d56ce5d5
6
+ metadata.gz: d44c4e67832ccf6ca9c168988ec9f032965a9c6613f2fbbb983714166d7b392db36c0a86aba46bf4a2e72709200697379f50d54bb9e5651ce9b3f552ee1d29e5
7
+ data.tar.gz: 1fbb2d1f216efc03999fa8c03cbff52d4110a57145707a07338b2004ebdf96d3e6b94545e2b9da33a8eb00c7f61dc0c9903ba058635f0d4d2b21ef3c296005c7
data/.idea/script_executor.iml CHANGED
@@ -10,7 +10,7 @@
10
10
  </facet>
11
11
  </component>
12
12
  <component name="ModuleRunConfigurationManager">
13
- <configuration default="false" name="MyExecutable: script_executor" type="RSpecRunConfigurationType" factoryName="RSpec" temporary="true">
13
+ <configuration default="false" name="Run spec 'script_locator_spec': script_executor" type="RSpecRunConfigurationType" factoryName="RSpec" temporary="true">
14
14
  <predefined_log_file id="RUBY_RSPEC" enabled="true" />
15
15
  <module name="script_executor" />
16
16
  <RSPEC_RUN_CONFIG_SETTINGS_ID NAME="RUBY_ARGS" VALUE="-e $stdout.sync=true;$stderr.sync=true;load($0=ARGV.shift)" />
@@ -29,10 +29,10 @@
29
29
  </COVERAGE_PATTERN>
30
30
  </EXTENSION>
31
31
  <RSPEC_RUN_CONFIG_SETTINGS_ID NAME="TESTS_FOLDER_PATH" VALUE="" />
32
- <RSPEC_RUN_CONFIG_SETTINGS_ID NAME="TEST_SCRIPT_PATH" VALUE="$MODULE_DIR$/spec/executable_spec.rb" />
32
+ <RSPEC_RUN_CONFIG_SETTINGS_ID NAME="TEST_SCRIPT_PATH" VALUE="$MODULE_DIR$/spec/script_locator_spec.rb" />
33
33
  <RSPEC_RUN_CONFIG_SETTINGS_ID NAME="SPEC_RUNNER_PATH" VALUE="" />
34
34
  <RSPEC_RUN_CONFIG_SETTINGS_ID NAME="TEST_FILE_MASK" VALUE="**/*_spec.rb" />
35
- <RSPEC_RUN_CONFIG_SETTINGS_ID NAME="SPEC_EXAMPLE_NAME" VALUE="MyExecutable" />
35
+ <RSPEC_RUN_CONFIG_SETTINGS_ID NAME="SPEC_EXAMPLE_NAME" VALUE="" />
36
36
  <RSPEC_RUN_CONFIG_SETTINGS_ID NAME="TEST_TEST_TYPE" VALUE="TEST_SCRIPT" />
37
37
  <RSPEC_RUN_CONFIG_SETTINGS_ID NAME="SPEC_ARGS" VALUE="" />
38
38
  <RSPEC_RUN_CONFIG_SETTINGS_ID NAME="RUNNER_VERSION" VALUE="" />
@@ -43,7 +43,7 @@
43
43
  <RSPEC_RUN_CONFIG_SETTINGS_ID NAME="FULL_BACKTRACE" VALUE="false" />
44
44
  <method />
45
45
  </configuration>
46
- <configuration default="false" name="Run spec 'script_locator_spec': script_executor" type="RSpecRunConfigurationType" factoryName="RSpec" temporary="true">
46
+ <configuration default="false" name="MyScriptLocator#evaluate_script_body locates script inside external file and evaluates it as string: script_executor" type="RSpecRunConfigurationType" factoryName="RSpec" temporary="true">
47
47
  <predefined_log_file id="RUBY_RSPEC" enabled="true" />
48
48
  <module name="script_executor" />
49
49
  <RSPEC_RUN_CONFIG_SETTINGS_ID NAME="RUBY_ARGS" VALUE="-e $stdout.sync=true;$stderr.sync=true;load($0=ARGV.shift)" />
@@ -65,7 +65,7 @@
65
65
  <RSPEC_RUN_CONFIG_SETTINGS_ID NAME="TEST_SCRIPT_PATH" VALUE="$MODULE_DIR$/spec/script_locator_spec.rb" />
66
66
  <RSPEC_RUN_CONFIG_SETTINGS_ID NAME="SPEC_RUNNER_PATH" VALUE="" />
67
67
  <RSPEC_RUN_CONFIG_SETTINGS_ID NAME="TEST_FILE_MASK" VALUE="**/*_spec.rb" />
68
- <RSPEC_RUN_CONFIG_SETTINGS_ID NAME="SPEC_EXAMPLE_NAME" VALUE="" />
68
+ <RSPEC_RUN_CONFIG_SETTINGS_ID NAME="SPEC_EXAMPLE_NAME" VALUE="MyScriptLocator#evaluate_script_body locates script inside external file and evaluates it as string" />
69
69
  <RSPEC_RUN_CONFIG_SETTINGS_ID NAME="TEST_TEST_TYPE" VALUE="TEST_SCRIPT" />
70
70
  <RSPEC_RUN_CONFIG_SETTINGS_ID NAME="SPEC_ARGS" VALUE="" />
71
71
  <RSPEC_RUN_CONFIG_SETTINGS_ID NAME="RUNNER_VERSION" VALUE="" />
@@ -76,7 +76,7 @@
76
76
  <RSPEC_RUN_CONFIG_SETTINGS_ID NAME="FULL_BACKTRACE" VALUE="false" />
77
77
  <method />
78
78
  </configuration>
79
- <configuration default="false" name="MyScriptLocator#evaluate_script_body locates script inside external file and evaluates it as string: script_executor" type="RSpecRunConfigurationType" factoryName="RSpec" temporary="true">
79
+ <configuration default="false" name="Run spec 'executable_spec': script_executor" type="RSpecRunConfigurationType" factoryName="RSpec" temporary="true">
80
80
  <predefined_log_file id="RUBY_RSPEC" enabled="true" />
81
81
  <module name="script_executor" />
82
82
  <RSPEC_RUN_CONFIG_SETTINGS_ID NAME="RUBY_ARGS" VALUE="-e $stdout.sync=true;$stderr.sync=true;load($0=ARGV.shift)" />
@@ -95,10 +95,10 @@
95
95
  </COVERAGE_PATTERN>
96
96
  </EXTENSION>
97
97
  <RSPEC_RUN_CONFIG_SETTINGS_ID NAME="TESTS_FOLDER_PATH" VALUE="" />
98
- <RSPEC_RUN_CONFIG_SETTINGS_ID NAME="TEST_SCRIPT_PATH" VALUE="$MODULE_DIR$/spec/script_locator_spec.rb" />
98
+ <RSPEC_RUN_CONFIG_SETTINGS_ID NAME="TEST_SCRIPT_PATH" VALUE="$MODULE_DIR$/spec/executable_spec.rb" />
99
99
  <RSPEC_RUN_CONFIG_SETTINGS_ID NAME="SPEC_RUNNER_PATH" VALUE="" />
100
100
  <RSPEC_RUN_CONFIG_SETTINGS_ID NAME="TEST_FILE_MASK" VALUE="**/*_spec.rb" />
101
- <RSPEC_RUN_CONFIG_SETTINGS_ID NAME="SPEC_EXAMPLE_NAME" VALUE="MyScriptLocator#evaluate_script_body locates script inside external file and evaluates it as string" />
101
+ <RSPEC_RUN_CONFIG_SETTINGS_ID NAME="SPEC_EXAMPLE_NAME" VALUE="" />
102
102
  <RSPEC_RUN_CONFIG_SETTINGS_ID NAME="TEST_TEST_TYPE" VALUE="TEST_SCRIPT" />
103
103
  <RSPEC_RUN_CONFIG_SETTINGS_ID NAME="SPEC_ARGS" VALUE="" />
104
104
  <RSPEC_RUN_CONFIG_SETTINGS_ID NAME="RUNNER_VERSION" VALUE="" />
@@ -109,7 +109,7 @@
109
109
  <RSPEC_RUN_CONFIG_SETTINGS_ID NAME="FULL_BACKTRACE" VALUE="false" />
110
110
  <method />
111
111
  </configuration>
112
- <configuration default="false" name="Run spec 'executable_spec': script_executor" type="RSpecRunConfigurationType" factoryName="RSpec" temporary="true">
112
+ <configuration default="false" name="BaseProvision#parse parses content from file: script_executor" type="RSpecRunConfigurationType" factoryName="RSpec" temporary="true">
113
113
  <predefined_log_file id="RUBY_RSPEC" enabled="true" />
114
114
  <module name="script_executor" />
115
115
  <RSPEC_RUN_CONFIG_SETTINGS_ID NAME="RUBY_ARGS" VALUE="-e $stdout.sync=true;$stderr.sync=true;load($0=ARGV.shift)" />
@@ -128,10 +128,10 @@
128
128
  </COVERAGE_PATTERN>
129
129
  </EXTENSION>
130
130
  <RSPEC_RUN_CONFIG_SETTINGS_ID NAME="TESTS_FOLDER_PATH" VALUE="" />
131
- <RSPEC_RUN_CONFIG_SETTINGS_ID NAME="TEST_SCRIPT_PATH" VALUE="$MODULE_DIR$/spec/executable_spec.rb" />
131
+ <RSPEC_RUN_CONFIG_SETTINGS_ID NAME="TEST_SCRIPT_PATH" VALUE="$MODULE_DIR$/spec/base_provision_spec.rb" />
132
132
  <RSPEC_RUN_CONFIG_SETTINGS_ID NAME="SPEC_RUNNER_PATH" VALUE="" />
133
133
  <RSPEC_RUN_CONFIG_SETTINGS_ID NAME="TEST_FILE_MASK" VALUE="**/*_spec.rb" />
134
- <RSPEC_RUN_CONFIG_SETTINGS_ID NAME="SPEC_EXAMPLE_NAME" VALUE="" />
134
+ <RSPEC_RUN_CONFIG_SETTINGS_ID NAME="SPEC_EXAMPLE_NAME" VALUE="BaseProvision#parse parses content from file" />
135
135
  <RSPEC_RUN_CONFIG_SETTINGS_ID NAME="TEST_TEST_TYPE" VALUE="TEST_SCRIPT" />
136
136
  <RSPEC_RUN_CONFIG_SETTINGS_ID NAME="SPEC_ARGS" VALUE="" />
137
137
  <RSPEC_RUN_CONFIG_SETTINGS_ID NAME="RUNNER_VERSION" VALUE="" />
@@ -142,7 +142,7 @@
142
142
  <RSPEC_RUN_CONFIG_SETTINGS_ID NAME="FULL_BACKTRACE" VALUE="false" />
143
143
  <method />
144
144
  </configuration>
145
- <configuration default="false" name="BaseProvision#parse parses content from file: script_executor" type="RSpecRunConfigurationType" factoryName="RSpec" temporary="true">
145
+ <configuration default="false" name="ScriptsParser#parse parses content from file: script_executor" type="RSpecRunConfigurationType" factoryName="RSpec" temporary="true">
146
146
  <predefined_log_file id="RUBY_RSPEC" enabled="true" />
147
147
  <module name="script_executor" />
148
148
  <RSPEC_RUN_CONFIG_SETTINGS_ID NAME="RUBY_ARGS" VALUE="-e $stdout.sync=true;$stderr.sync=true;load($0=ARGV.shift)" />
@@ -161,10 +161,10 @@
161
161
  </COVERAGE_PATTERN>
162
162
  </EXTENSION>
163
163
  <RSPEC_RUN_CONFIG_SETTINGS_ID NAME="TESTS_FOLDER_PATH" VALUE="" />
164
- <RSPEC_RUN_CONFIG_SETTINGS_ID NAME="TEST_SCRIPT_PATH" VALUE="$MODULE_DIR$/spec/base_provision_spec.rb" />
164
+ <RSPEC_RUN_CONFIG_SETTINGS_ID NAME="TEST_SCRIPT_PATH" VALUE="$MODULE_DIR$/spec/scripts_parser_spec.rb" />
165
165
  <RSPEC_RUN_CONFIG_SETTINGS_ID NAME="SPEC_RUNNER_PATH" VALUE="" />
166
166
  <RSPEC_RUN_CONFIG_SETTINGS_ID NAME="TEST_FILE_MASK" VALUE="**/*_spec.rb" />
167
- <RSPEC_RUN_CONFIG_SETTINGS_ID NAME="SPEC_EXAMPLE_NAME" VALUE="BaseProvision#parse parses content from file" />
167
+ <RSPEC_RUN_CONFIG_SETTINGS_ID NAME="SPEC_EXAMPLE_NAME" VALUE="ScriptsParser#parse parses content from file" />
168
168
  <RSPEC_RUN_CONFIG_SETTINGS_ID NAME="TEST_TEST_TYPE" VALUE="TEST_SCRIPT" />
169
169
  <RSPEC_RUN_CONFIG_SETTINGS_ID NAME="SPEC_ARGS" VALUE="" />
170
170
  <RSPEC_RUN_CONFIG_SETTINGS_ID NAME="RUNNER_VERSION" VALUE="" />
data/.idea/workspace.xml CHANGED
@@ -1,27 +1,8 @@
1
1
  <?xml version="1.0" encoding="UTF-8"?>
2
2
  <project version="4">
3
3
  <component name="ChangeListManager">
4
- <list default="true" id="6995392e-f204-4557-be32-fd20f300d877" name="Default" comment="bug fix">
5
- <change type="NEW" beforePath="" afterPath="$PROJECT_DIR$/.idea/jsTestFinder.xml" />
6
- <change type="NEW" beforePath="" afterPath="$PROJECT_DIR$/lib/script_executor/scripts_parser.rb" />
7
- <change type="NEW" beforePath="" afterPath="$PROJECT_DIR$/lib/script_executor/scripts_transformer.rb" />
8
- <change type="NEW" beforePath="" afterPath="$PROJECT_DIR$/spec/base_provision_spec.rb" />
9
- <change type="NEW" beforePath="" afterPath="$PROJECT_DIR$/spec/scripts_parser_spec.rb" />
10
- <change type="NEW" beforePath="" afterPath="$PROJECT_DIR$/spec/support/base.conf.json" />
11
- <change type="NEW" beforePath="" afterPath="$PROJECT_DIR$/spec/support/big_script.sh" />
12
- <change type="NEW" beforePath="" afterPath="$PROJECT_DIR$/spec/support/test2.conf" />
13
- <change type="MOVED" beforePath="$PROJECT_DIR$/spec/test.conf" afterPath="$PROJECT_DIR$/spec/support/test.conf" />
4
+ <list default="true" id="6995392e-f204-4557-be32-fd20f300d877" name="Default" comment="">
14
5
  <change type="MODIFICATION" beforePath="$PROJECT_DIR$/.idea/script_executor.iml" afterPath="$PROJECT_DIR$/.idea/script_executor.iml" />
15
- <change type="MODIFICATION" beforePath="$PROJECT_DIR$/.idea/workspace.xml" afterPath="$PROJECT_DIR$/.idea/workspace.xml" />
16
- <change type="MODIFICATION" beforePath="$PROJECT_DIR$/CHANGES" afterPath="$PROJECT_DIR$/CHANGES" />
17
- <change type="MODIFICATION" beforePath="$PROJECT_DIR$/Gemfile" afterPath="$PROJECT_DIR$/Gemfile" />
18
- <change type="MODIFICATION" beforePath="$PROJECT_DIR$/Gemfile.lock" afterPath="$PROJECT_DIR$/Gemfile.lock" />
19
- <change type="MODIFICATION" beforePath="$PROJECT_DIR$/lib/script_executor/base_provision.rb" afterPath="$PROJECT_DIR$/lib/script_executor/base_provision.rb" />
20
- <change type="MODIFICATION" beforePath="$PROJECT_DIR$/lib/script_executor/script_locator.rb" afterPath="$PROJECT_DIR$/lib/script_executor/script_locator.rb" />
21
- <change type="MODIFICATION" beforePath="$PROJECT_DIR$/lib/script_executor/version.rb" afterPath="$PROJECT_DIR$/lib/script_executor/version.rb" />
22
- <change type="MODIFICATION" beforePath="$PROJECT_DIR$/spec/executable_spec.rb" afterPath="$PROJECT_DIR$/spec/executable_spec.rb" />
23
- <change type="MODIFICATION" beforePath="$PROJECT_DIR$/spec/script_locator_spec.rb" afterPath="$PROJECT_DIR$/spec/script_locator_spec.rb" />
24
- <change type="MODIFICATION" beforePath="$PROJECT_DIR$/spec/spec_helper.rb" afterPath="$PROJECT_DIR$/spec/spec_helper.rb" />
25
6
  </list>
26
7
  <ignored path="script_executor.iws" />
27
8
  <ignored path=".idea/workspace.xml" />
@@ -42,8 +23,8 @@
42
23
  <SUITE FILE_PATH="coverage/script_executor@MyScriptLocator_evaluate_script_body_locates_script_inside_external_file_and_evaluates_it_as_string__script_executor.coverage" NAME="MyScriptLocator#evaluate_script_body locates script inside external file and evaluates it as string: script_executor Coverage Results" MODIFIED="1445795101484" SOURCE_PROVIDER="com.intellij.coverage.DefaultCoverageFileProvider" RUNNER="rcov" COVERAGE_BY_TEST_ENABLED="true" COVERAGE_TRACING_ENABLED="false" WORKING_DIRECTORY="$PROJECT_DIR$" MODULE_NAME="script_executor" />
43
24
  <SUITE FILE_PATH="coverage/script_executor@BaseProvision_parse_parses_content_from_file__script_executor.coverage" NAME="BaseProvision#parse parses content from file: script_executor Coverage Results" MODIFIED="1445796298491" SOURCE_PROVIDER="com.intellij.coverage.DefaultCoverageFileProvider" RUNNER="rcov" COVERAGE_BY_TEST_ENABLED="true" COVERAGE_TRACING_ENABLED="false" WORKING_DIRECTORY="$PROJECT_DIR$" MODULE_NAME="script_executor" />
44
25
  <SUITE FILE_PATH="coverage/script_executor@MyScriptLocator_scripts_reads_from_file_completely_if_it_does_not_have___END___tag__script_executor.coverage" NAME="MyScriptLocator#scripts reads from file completely if it does not have __END__ tag: script_executor Coverage Results" MODIFIED="1445709701319" SOURCE_PROVIDER="com.intellij.coverage.DefaultCoverageFileProvider" RUNNER="rcov" COVERAGE_BY_TEST_ENABLED="true" COVERAGE_TRACING_ENABLED="false" WORKING_DIRECTORY="$PROJECT_DIR$" MODULE_NAME="script_executor" />
45
- <SUITE FILE_PATH="coverage/script_executor@ScriptsParser_parse_parses_content_from_file__script_executor.coverage" NAME="ScriptsParser#parse parses content from file: script_executor Coverage Results" MODIFIED="1445794969267" SOURCE_PROVIDER="com.intellij.coverage.DefaultCoverageFileProvider" RUNNER="rcov" COVERAGE_BY_TEST_ENABLED="true" COVERAGE_TRACING_ENABLED="false" WORKING_DIRECTORY="$PROJECT_DIR$" MODULE_NAME="script_executor" />
46
26
  <SUITE FILE_PATH="coverage/script_executor@MyExecutable__script_executor.coverage" NAME="MyExecutable: script_executor Coverage Results" MODIFIED="1445795454515" SOURCE_PROVIDER="com.intellij.coverage.DefaultCoverageFileProvider" RUNNER="rcov" COVERAGE_BY_TEST_ENABLED="true" COVERAGE_TRACING_ENABLED="false" WORKING_DIRECTORY="$PROJECT_DIR$" MODULE_NAME="script_executor" />
27
+ <SUITE FILE_PATH="coverage/script_executor@ScriptsParser_parse_parses_content_from_file__script_executor.coverage" NAME="ScriptsParser#parse parses content from file: script_executor Coverage Results" MODIFIED="1445797720456" SOURCE_PROVIDER="com.intellij.coverage.DefaultCoverageFileProvider" RUNNER="rcov" COVERAGE_BY_TEST_ENABLED="true" COVERAGE_TRACING_ENABLED="false" WORKING_DIRECTORY="$PROJECT_DIR$" MODULE_NAME="script_executor" />
47
28
  <SUITE FILE_PATH="coverage/script_executor@Run_spec__executable_spec___script_executor.coverage" NAME="Run spec 'executable_spec': script_executor Coverage Results" MODIFIED="1445795458696" SOURCE_PROVIDER="com.intellij.coverage.DefaultCoverageFileProvider" RUNNER="rcov" COVERAGE_BY_TEST_ENABLED="true" COVERAGE_TRACING_ENABLED="false" WORKING_DIRECTORY="$PROJECT_DIR$" MODULE_NAME="script_executor" />
48
29
  <SUITE FILE_PATH="coverage/script_executor@MyExecutable_local_execution_should_execute_commands_locally_from__script_parameter__script_executor.coverage" NAME="MyExecutable local execution should execute commands locally from :script parameter: script_executor Coverage Results" MODIFIED="1385833654466" SOURCE_PROVIDER="com.intellij.coverage.DefaultCoverageFileProvider" RUNNER="rcov" COVERAGE_BY_TEST_ENABLED="true" COVERAGE_TRACING_ENABLED="false" WORKING_DIRECTORY="$PROJECT_DIR$" MODULE_NAME="script_executor" />
49
30
  <SUITE FILE_PATH="coverage/script_executor@script_locator_spec.coverage" NAME="script_locator_spec Coverage Results" MODIFIED="1402147217968" SOURCE_PROVIDER="com.intellij.coverage.DefaultCoverageFileProvider" RUNNER="rcov" COVERAGE_BY_TEST_ENABLED="true" COVERAGE_TRACING_ENABLED="false" WORKING_DIRECTORY="$PROJECT_DIR$" MODULE_NAME="script_executor" />
@@ -71,11 +52,11 @@
71
52
  </provider>
72
53
  </entry>
73
54
  </file>
74
- <file leaf-file-name="script_locator.rb" pinned="false" current-in-tab="false">
75
- <entry file="file://$PROJECT_DIR$/lib/script_executor/script_locator.rb">
55
+ <file leaf-file-name="version.rb" pinned="false" current-in-tab="false">
56
+ <entry file="file://$PROJECT_DIR$/lib/script_executor/version.rb">
76
57
  <provider selected="true" editor-type-id="text-editor">
77
58
  <state vertical-scroll-proportion="0.0">
78
- <caret line="43" column="5" selection-start-line="43" selection-start-column="5" selection-end-line="43" selection-end-column="5" />
59
+ <caret line="1" column="18" selection-start-line="1" selection-start-column="18" selection-end-line="1" selection-end-column="18" />
79
60
  <folding />
80
61
  </state>
81
62
  </provider>
@@ -84,8 +65,38 @@
84
65
  <file leaf-file-name="CHANGES" pinned="false" current-in-tab="true">
85
66
  <entry file="file://$PROJECT_DIR$/CHANGES">
86
67
  <provider selected="true" editor-type-id="text-editor">
87
- <state vertical-scroll-proportion="0.7809524">
88
- <caret line="106" column="2" selection-start-line="106" selection-start-column="2" selection-end-line="106" selection-end-column="52" />
68
+ <state vertical-scroll-proportion="2.38">
69
+ <caret line="104" column="23" selection-start-line="104" selection-start-column="23" selection-end-line="104" selection-end-column="23" />
70
+ <folding />
71
+ </state>
72
+ </provider>
73
+ </entry>
74
+ </file>
75
+ <file leaf-file-name="big_script2.sh" pinned="false" current-in-tab="false">
76
+ <entry file="file://$PROJECT_DIR$/spec/support/big_script2.sh">
77
+ <provider selected="true" editor-type-id="text-editor">
78
+ <state vertical-scroll-proportion="0.0">
79
+ <caret line="51" column="0" selection-start-line="51" selection-start-column="0" selection-end-line="51" selection-end-column="61" />
80
+ <folding />
81
+ </state>
82
+ </provider>
83
+ </entry>
84
+ </file>
85
+ <file leaf-file-name="scripts_parser.rb" pinned="false" current-in-tab="false">
86
+ <entry file="file://$PROJECT_DIR$/lib/script_executor/scripts_parser.rb">
87
+ <provider selected="true" editor-type-id="text-editor">
88
+ <state vertical-scroll-proportion="0.0">
89
+ <caret line="24" column="0" selection-start-line="24" selection-start-column="0" selection-end-line="24" selection-end-column="0" />
90
+ <folding />
91
+ </state>
92
+ </provider>
93
+ </entry>
94
+ </file>
95
+ <file leaf-file-name="scripts_parser_spec.rb" pinned="false" current-in-tab="false">
96
+ <entry file="file://$PROJECT_DIR$/spec/scripts_parser_spec.rb">
97
+ <provider selected="true" editor-type-id="text-editor">
98
+ <state vertical-scroll-proportion="0.0">
99
+ <caret line="10" column="0" selection-start-line="10" selection-start-column="0" selection-end-line="10" selection-end-column="0" />
89
100
  <folding />
90
101
  </state>
91
102
  </provider>
@@ -122,18 +133,20 @@
122
133
  <option value="$PROJECT_DIR$/spec/big_script2.sh" />
123
134
  <option value="$PROJECT_DIR$/spec/test.conf" />
124
135
  <option value="$PROJECT_DIR$/spec/test2.conf" />
125
- <option value="$PROJECT_DIR$/lib/script_executor/scripts_parser.rb" />
126
136
  <option value="$PROJECT_DIR$/lib/script_executor/scripts_transformer.rb" />
127
137
  <option value="$PROJECT_DIR$/lib/script_executor/script_locator.rb" />
128
138
  <option value="$PROJECT_DIR$/spec/script_locator_spec.rb" />
129
139
  <option value="$PROJECT_DIR$/spec/executable_spec.rb" />
130
140
  <option value="$PROJECT_DIR$/spec/base_provision_spec.js" />
131
- <option value="$PROJECT_DIR$/spec/scripts_parser_spec.rb" />
132
141
  <option value="$PROJECT_DIR$/spec/support/base.conf.js" />
133
142
  <option value="$PROJECT_DIR$/spec/support/base.conf.json" />
134
- <option value="$PROJECT_DIR$/Gemfile" />
135
143
  <option value="$PROJECT_DIR$/spec/base_provision_spec.rb" />
136
144
  <option value="$PROJECT_DIR$/lib/script_executor/base_provision.rb" />
145
+ <option value="$PROJECT_DIR$/Gemfile.lock" />
146
+ <option value="$PROJECT_DIR$/Gemfile" />
147
+ <option value="$PROJECT_DIR$/spec/support/big_script2.sh" />
148
+ <option value="$PROJECT_DIR$/spec/scripts_parser_spec.rb" />
149
+ <option value="$PROJECT_DIR$/lib/script_executor/scripts_parser.rb" />
137
150
  <option value="$PROJECT_DIR$/lib/script_executor/version.rb" />
138
151
  <option value="$PROJECT_DIR$/CHANGES" />
139
152
  </list>
@@ -178,6 +191,8 @@
178
191
  <foldersAlwaysOnTop value="true" />
179
192
  </navigator>
180
193
  <panes>
194
+ <pane id="Scratches" />
195
+ <pane id="Scope" />
181
196
  <pane id="ProjectPane">
182
197
  <subPane>
183
198
  <PATH>
@@ -382,8 +397,6 @@
382
397
  </PATH>
383
398
  </subPane>
384
399
  </pane>
385
- <pane id="Scratches" />
386
- <pane id="Scope" />
387
400
  </panes>
388
401
  </component>
389
402
  <component name="PropertiesComponent">
@@ -421,8 +434,8 @@
421
434
  <recent name="$PROJECT_DIR$/spec/support" />
422
435
  </key>
423
436
  </component>
424
- <component name="RunManager" selected="RSpec.BaseProvision#parse parses content from file: script_executor">
425
- <configuration default="false" name="MyExecutable: script_executor" type="RSpecRunConfigurationType" factoryName="RSpec" temporary="true">
437
+ <component name="RunManager" selected="RSpec.ScriptsParser#parse parses content from file: script_executor">
438
+ <configuration default="false" name="Run spec 'script_locator_spec': script_executor" type="RSpecRunConfigurationType" factoryName="RSpec" temporary="true">
426
439
  <predefined_log_file id="RUBY_RSPEC" enabled="true" />
427
440
  <module name="script_executor" />
428
441
  <RSPEC_RUN_CONFIG_SETTINGS_ID NAME="RUBY_ARGS" VALUE="-e $stdout.sync=true;$stderr.sync=true;load($0=ARGV.shift)" />
@@ -441,10 +454,10 @@
441
454
  </COVERAGE_PATTERN>
442
455
  </EXTENSION>
443
456
  <RSPEC_RUN_CONFIG_SETTINGS_ID NAME="TESTS_FOLDER_PATH" VALUE="" />
444
- <RSPEC_RUN_CONFIG_SETTINGS_ID NAME="TEST_SCRIPT_PATH" VALUE="$MODULE_DIR$/spec/executable_spec.rb" />
457
+ <RSPEC_RUN_CONFIG_SETTINGS_ID NAME="TEST_SCRIPT_PATH" VALUE="$MODULE_DIR$/spec/script_locator_spec.rb" />
445
458
  <RSPEC_RUN_CONFIG_SETTINGS_ID NAME="SPEC_RUNNER_PATH" VALUE="" />
446
459
  <RSPEC_RUN_CONFIG_SETTINGS_ID NAME="TEST_FILE_MASK" VALUE="**/*_spec.rb" />
447
- <RSPEC_RUN_CONFIG_SETTINGS_ID NAME="SPEC_EXAMPLE_NAME" VALUE="MyExecutable" />
460
+ <RSPEC_RUN_CONFIG_SETTINGS_ID NAME="SPEC_EXAMPLE_NAME" VALUE="" />
448
461
  <RSPEC_RUN_CONFIG_SETTINGS_ID NAME="TEST_TEST_TYPE" VALUE="TEST_SCRIPT" />
449
462
  <RSPEC_RUN_CONFIG_SETTINGS_ID NAME="SPEC_ARGS" VALUE="" />
450
463
  <RSPEC_RUN_CONFIG_SETTINGS_ID NAME="RUNNER_VERSION" VALUE="" />
@@ -455,7 +468,7 @@
455
468
  <RSPEC_RUN_CONFIG_SETTINGS_ID NAME="FULL_BACKTRACE" VALUE="false" />
456
469
  <method />
457
470
  </configuration>
458
- <configuration default="false" name="Run spec 'script_locator_spec': script_executor" type="RSpecRunConfigurationType" factoryName="RSpec" temporary="true">
471
+ <configuration default="false" name="MyScriptLocator#evaluate_script_body locates script inside external file and evaluates it as string: script_executor" type="RSpecRunConfigurationType" factoryName="RSpec" temporary="true">
459
472
  <predefined_log_file id="RUBY_RSPEC" enabled="true" />
460
473
  <module name="script_executor" />
461
474
  <RSPEC_RUN_CONFIG_SETTINGS_ID NAME="RUBY_ARGS" VALUE="-e $stdout.sync=true;$stderr.sync=true;load($0=ARGV.shift)" />
@@ -477,7 +490,7 @@
477
490
  <RSPEC_RUN_CONFIG_SETTINGS_ID NAME="TEST_SCRIPT_PATH" VALUE="$MODULE_DIR$/spec/script_locator_spec.rb" />
478
491
  <RSPEC_RUN_CONFIG_SETTINGS_ID NAME="SPEC_RUNNER_PATH" VALUE="" />
479
492
  <RSPEC_RUN_CONFIG_SETTINGS_ID NAME="TEST_FILE_MASK" VALUE="**/*_spec.rb" />
480
- <RSPEC_RUN_CONFIG_SETTINGS_ID NAME="SPEC_EXAMPLE_NAME" VALUE="" />
493
+ <RSPEC_RUN_CONFIG_SETTINGS_ID NAME="SPEC_EXAMPLE_NAME" VALUE="MyScriptLocator#evaluate_script_body locates script inside external file and evaluates it as string" />
481
494
  <RSPEC_RUN_CONFIG_SETTINGS_ID NAME="TEST_TEST_TYPE" VALUE="TEST_SCRIPT" />
482
495
  <RSPEC_RUN_CONFIG_SETTINGS_ID NAME="SPEC_ARGS" VALUE="" />
483
496
  <RSPEC_RUN_CONFIG_SETTINGS_ID NAME="RUNNER_VERSION" VALUE="" />
@@ -488,7 +501,7 @@
488
501
  <RSPEC_RUN_CONFIG_SETTINGS_ID NAME="FULL_BACKTRACE" VALUE="false" />
489
502
  <method />
490
503
  </configuration>
491
- <configuration default="false" name="MyScriptLocator#evaluate_script_body locates script inside external file and evaluates it as string: script_executor" type="RSpecRunConfigurationType" factoryName="RSpec" temporary="true">
504
+ <configuration default="false" name="Run spec 'executable_spec': script_executor" type="RSpecRunConfigurationType" factoryName="RSpec" temporary="true">
492
505
  <predefined_log_file id="RUBY_RSPEC" enabled="true" />
493
506
  <module name="script_executor" />
494
507
  <RSPEC_RUN_CONFIG_SETTINGS_ID NAME="RUBY_ARGS" VALUE="-e $stdout.sync=true;$stderr.sync=true;load($0=ARGV.shift)" />
@@ -507,10 +520,10 @@
507
520
  </COVERAGE_PATTERN>
508
521
  </EXTENSION>
509
522
  <RSPEC_RUN_CONFIG_SETTINGS_ID NAME="TESTS_FOLDER_PATH" VALUE="" />
510
- <RSPEC_RUN_CONFIG_SETTINGS_ID NAME="TEST_SCRIPT_PATH" VALUE="$MODULE_DIR$/spec/script_locator_spec.rb" />
523
+ <RSPEC_RUN_CONFIG_SETTINGS_ID NAME="TEST_SCRIPT_PATH" VALUE="$MODULE_DIR$/spec/executable_spec.rb" />
511
524
  <RSPEC_RUN_CONFIG_SETTINGS_ID NAME="SPEC_RUNNER_PATH" VALUE="" />
512
525
  <RSPEC_RUN_CONFIG_SETTINGS_ID NAME="TEST_FILE_MASK" VALUE="**/*_spec.rb" />
513
- <RSPEC_RUN_CONFIG_SETTINGS_ID NAME="SPEC_EXAMPLE_NAME" VALUE="MyScriptLocator#evaluate_script_body locates script inside external file and evaluates it as string" />
526
+ <RSPEC_RUN_CONFIG_SETTINGS_ID NAME="SPEC_EXAMPLE_NAME" VALUE="" />
514
527
  <RSPEC_RUN_CONFIG_SETTINGS_ID NAME="TEST_TEST_TYPE" VALUE="TEST_SCRIPT" />
515
528
  <RSPEC_RUN_CONFIG_SETTINGS_ID NAME="SPEC_ARGS" VALUE="" />
516
529
  <RSPEC_RUN_CONFIG_SETTINGS_ID NAME="RUNNER_VERSION" VALUE="" />
@@ -521,7 +534,7 @@
521
534
  <RSPEC_RUN_CONFIG_SETTINGS_ID NAME="FULL_BACKTRACE" VALUE="false" />
522
535
  <method />
523
536
  </configuration>
524
- <configuration default="false" name="Run spec 'executable_spec': script_executor" type="RSpecRunConfigurationType" factoryName="RSpec" temporary="true">
537
+ <configuration default="false" name="BaseProvision#parse parses content from file: script_executor" type="RSpecRunConfigurationType" factoryName="RSpec" temporary="true">
525
538
  <predefined_log_file id="RUBY_RSPEC" enabled="true" />
526
539
  <module name="script_executor" />
527
540
  <RSPEC_RUN_CONFIG_SETTINGS_ID NAME="RUBY_ARGS" VALUE="-e $stdout.sync=true;$stderr.sync=true;load($0=ARGV.shift)" />
@@ -540,10 +553,10 @@
540
553
  </COVERAGE_PATTERN>
541
554
  </EXTENSION>
542
555
  <RSPEC_RUN_CONFIG_SETTINGS_ID NAME="TESTS_FOLDER_PATH" VALUE="" />
543
- <RSPEC_RUN_CONFIG_SETTINGS_ID NAME="TEST_SCRIPT_PATH" VALUE="$MODULE_DIR$/spec/executable_spec.rb" />
556
+ <RSPEC_RUN_CONFIG_SETTINGS_ID NAME="TEST_SCRIPT_PATH" VALUE="$MODULE_DIR$/spec/base_provision_spec.rb" />
544
557
  <RSPEC_RUN_CONFIG_SETTINGS_ID NAME="SPEC_RUNNER_PATH" VALUE="" />
545
558
  <RSPEC_RUN_CONFIG_SETTINGS_ID NAME="TEST_FILE_MASK" VALUE="**/*_spec.rb" />
546
- <RSPEC_RUN_CONFIG_SETTINGS_ID NAME="SPEC_EXAMPLE_NAME" VALUE="" />
559
+ <RSPEC_RUN_CONFIG_SETTINGS_ID NAME="SPEC_EXAMPLE_NAME" VALUE="BaseProvision#parse parses content from file" />
547
560
  <RSPEC_RUN_CONFIG_SETTINGS_ID NAME="TEST_TEST_TYPE" VALUE="TEST_SCRIPT" />
548
561
  <RSPEC_RUN_CONFIG_SETTINGS_ID NAME="SPEC_ARGS" VALUE="" />
549
562
  <RSPEC_RUN_CONFIG_SETTINGS_ID NAME="RUNNER_VERSION" VALUE="" />
@@ -554,7 +567,7 @@
554
567
  <RSPEC_RUN_CONFIG_SETTINGS_ID NAME="FULL_BACKTRACE" VALUE="false" />
555
568
  <method />
556
569
  </configuration>
557
- <configuration default="false" name="BaseProvision#parse parses content from file: script_executor" type="RSpecRunConfigurationType" factoryName="RSpec" temporary="true">
570
+ <configuration default="false" name="ScriptsParser#parse parses content from file: script_executor" type="RSpecRunConfigurationType" factoryName="RSpec" temporary="true">
558
571
  <predefined_log_file id="RUBY_RSPEC" enabled="true" />
559
572
  <module name="script_executor" />
560
573
  <RSPEC_RUN_CONFIG_SETTINGS_ID NAME="RUBY_ARGS" VALUE="-e $stdout.sync=true;$stderr.sync=true;load($0=ARGV.shift)" />
@@ -573,10 +586,10 @@
573
586
  </COVERAGE_PATTERN>
574
587
  </EXTENSION>
575
588
  <RSPEC_RUN_CONFIG_SETTINGS_ID NAME="TESTS_FOLDER_PATH" VALUE="" />
576
- <RSPEC_RUN_CONFIG_SETTINGS_ID NAME="TEST_SCRIPT_PATH" VALUE="$MODULE_DIR$/spec/base_provision_spec.rb" />
589
+ <RSPEC_RUN_CONFIG_SETTINGS_ID NAME="TEST_SCRIPT_PATH" VALUE="$MODULE_DIR$/spec/scripts_parser_spec.rb" />
577
590
  <RSPEC_RUN_CONFIG_SETTINGS_ID NAME="SPEC_RUNNER_PATH" VALUE="" />
578
591
  <RSPEC_RUN_CONFIG_SETTINGS_ID NAME="TEST_FILE_MASK" VALUE="**/*_spec.rb" />
579
- <RSPEC_RUN_CONFIG_SETTINGS_ID NAME="SPEC_EXAMPLE_NAME" VALUE="BaseProvision#parse parses content from file" />
592
+ <RSPEC_RUN_CONFIG_SETTINGS_ID NAME="SPEC_EXAMPLE_NAME" VALUE="ScriptsParser#parse parses content from file" />
580
593
  <RSPEC_RUN_CONFIG_SETTINGS_ID NAME="TEST_TEST_TYPE" VALUE="TEST_SCRIPT" />
581
594
  <RSPEC_RUN_CONFIG_SETTINGS_ID NAME="SPEC_ARGS" VALUE="" />
582
595
  <RSPEC_RUN_CONFIG_SETTINGS_ID NAME="RUNNER_VERSION" VALUE="" />
@@ -766,19 +779,19 @@
766
779
  </configuration>
767
780
  <list size="6">
768
781
  <item index="0" class="java.lang.String" itemvalue="Ruby remote debug.remote" />
769
- <item index="1" class="java.lang.String" itemvalue="RSpec.MyExecutable: script_executor" />
770
- <item index="2" class="java.lang.String" itemvalue="RSpec.Run spec 'script_locator_spec': script_executor" />
771
- <item index="3" class="java.lang.String" itemvalue="RSpec.MyScriptLocator#evaluate_script_body locates script inside external file and evaluates it as string: script_executor" />
772
- <item index="4" class="java.lang.String" itemvalue="RSpec.Run spec 'executable_spec': script_executor" />
773
- <item index="5" class="java.lang.String" itemvalue="RSpec.BaseProvision#parse parses content from file: script_executor" />
782
+ <item index="1" class="java.lang.String" itemvalue="RSpec.Run spec 'script_locator_spec': script_executor" />
783
+ <item index="2" class="java.lang.String" itemvalue="RSpec.MyScriptLocator#evaluate_script_body locates script inside external file and evaluates it as string: script_executor" />
784
+ <item index="3" class="java.lang.String" itemvalue="RSpec.Run spec 'executable_spec': script_executor" />
785
+ <item index="4" class="java.lang.String" itemvalue="RSpec.BaseProvision#parse parses content from file: script_executor" />
786
+ <item index="5" class="java.lang.String" itemvalue="RSpec.ScriptsParser#parse parses content from file: script_executor" />
774
787
  </list>
775
788
  <recent_temporary>
776
789
  <list size="5">
777
- <item index="0" class="java.lang.String" itemvalue="RSpec.BaseProvision#parse parses content from file: script_executor" />
778
- <item index="1" class="java.lang.String" itemvalue="RSpec.Run spec 'executable_spec': script_executor" />
779
- <item index="2" class="java.lang.String" itemvalue="RSpec.MyExecutable: script_executor" />
780
- <item index="3" class="java.lang.String" itemvalue="RSpec.Run spec 'script_locator_spec': script_executor" />
781
- <item index="4" class="java.lang.String" itemvalue="RSpec.MyScriptLocator#evaluate_script_body locates script inside external file and evaluates it as string: script_executor" />
790
+ <item index="0" class="java.lang.String" itemvalue="RSpec.ScriptsParser#parse parses content from file: script_executor" />
791
+ <item index="1" class="java.lang.String" itemvalue="RSpec.BaseProvision#parse parses content from file: script_executor" />
792
+ <item index="2" class="java.lang.String" itemvalue="RSpec.Run spec 'executable_spec': script_executor" />
793
+ <item index="3" class="java.lang.String" itemvalue="RSpec.MyScriptLocator#evaluate_script_body locates script inside external file and evaluates it as string: script_executor" />
794
+ <item index="4" class="java.lang.String" itemvalue="RSpec.Run spec 'script_locator_spec': script_executor" />
782
795
  </list>
783
796
  </recent_temporary>
784
797
  </component>
@@ -896,19 +909,34 @@
896
909
  <option name="project" value="LOCAL" />
897
910
  <updated>1431630275676</updated>
898
911
  </task>
899
- <option name="localTasksCounter" value="18" />
912
+ <task id="LOCAL-00018" summary="Replace simple parsing with parslet-based parsing.">
913
+ <created>1445796545001</created>
914
+ <option name="number" value="00018" />
915
+ <option name="project" value="LOCAL" />
916
+ <updated>1445796545001</updated>
917
+ </task>
918
+ <task id="LOCAL-00019" summary="Replace simple parsing with parslet-based parsing.">
919
+ <created>1445796689284</created>
920
+ <option name="number" value="00019" />
921
+ <option name="project" value="LOCAL" />
922
+ <updated>1445796689284</updated>
923
+ </task>
924
+ <task id="LOCAL-00020" summary="Replace simple parsing with parslet-based parsing.">
925
+ <created>1445796747079</created>
926
+ <option name="number" value="00020" />
927
+ <option name="project" value="LOCAL" />
928
+ <updated>1445796747079</updated>
929
+ </task>
930
+ <task id="LOCAL-00021" summary="Replace simple parsing with parslet-based parsing.">
931
+ <created>1445797755991</created>
932
+ <option name="number" value="00021" />
933
+ <option name="project" value="LOCAL" />
934
+ <updated>1445797755992</updated>
935
+ </task>
936
+ <option name="localTasksCounter" value="22" />
900
937
  <servers />
901
938
  </component>
902
939
  <component name="TestHistory">
903
- <history-entry file="BaseProvision#parse_parses_content_from_file__script_executor - 2015.10.25 at 13h 59m 26s.xml">
904
- <configuration name="BaseProvision#parse parses content from file: script_executor" configurationId="RSpecRunConfigurationType" />
905
- </history-entry>
906
- <history-entry file="BaseProvision#parse_parses_content_from_file__script_executor - 2015.10.25 at 13h 59m 41s.xml">
907
- <configuration name="BaseProvision#parse parses content from file: script_executor" configurationId="RSpecRunConfigurationType" />
908
- </history-entry>
909
- <history-entry file="BaseProvision#parse_parses_content_from_file__script_executor - 2015.10.25 at 14h 00m 26s.xml">
910
- <configuration name="BaseProvision#parse parses content from file: script_executor" configurationId="RSpecRunConfigurationType" />
911
- </history-entry>
912
940
  <history-entry file="BaseProvision#parse_parses_content_from_file__script_executor - 2015.10.25 at 14h 00m 38s.xml">
913
941
  <configuration name="BaseProvision#parse parses content from file: script_executor" configurationId="RSpecRunConfigurationType" />
914
942
  </history-entry>
@@ -930,6 +958,15 @@
930
958
  <history-entry file="BaseProvision#parse_parses_content_from_file__script_executor - 2015.10.25 at 14h 05m 18s.xml">
931
959
  <configuration name="BaseProvision#parse parses content from file: script_executor" configurationId="RSpecRunConfigurationType" />
932
960
  </history-entry>
961
+ <history-entry file="ScriptsParser#parse_parses_content_from_file__script_executor - 2015.10.25 at 14h 27m 13s.xml">
962
+ <configuration name="ScriptsParser#parse parses content from file: script_executor" configurationId="RSpecRunConfigurationType" />
963
+ </history-entry>
964
+ <history-entry file="ScriptsParser#parse_parses_content_from_file__script_executor - 2015.10.25 at 14h 28m 04s.xml">
965
+ <configuration name="ScriptsParser#parse parses content from file: script_executor" configurationId="RSpecRunConfigurationType" />
966
+ </history-entry>
967
+ <history-entry file="ScriptsParser#parse_parses_content_from_file__script_executor - 2015.10.25 at 14h 28m 41s.xml">
968
+ <configuration name="ScriptsParser#parse parses content from file: script_executor" configurationId="RSpecRunConfigurationType" />
969
+ </history-entry>
933
970
  </component>
934
971
  <component name="TodoView">
935
972
  <todo-panel id="selected-file">
@@ -947,14 +984,13 @@
947
984
  <window_info id="TODO" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.3298153" sideWeight="0.5" order="6" side_tool="false" content_ui="tabs" />
948
985
  <window_info id="Messages" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.32822478" sideWeight="0.5" order="7" side_tool="false" content_ui="tabs" />
949
986
  <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" />
950
- <window_info id="Version Control" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="true" show_stripe_button="true" weight="0.5474934" sideWeight="0.5" order="7" side_tool="false" content_ui="tabs" />
987
+ <window_info id="Version Control" active="true" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="true" show_stripe_button="true" weight="0.6332454" sideWeight="0.5" order="7" side_tool="false" content_ui="tabs" />
951
988
  <window_info id="Run" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.48548812" sideWeight="0.5" order="2" side_tool="false" content_ui="tabs" />
952
989
  <window_info id="Terminal" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.39313984" sideWeight="0.5" order="8" side_tool="false" content_ui="tabs" />
953
- <window_info id="Project" active="false" anchor="left" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="true" show_stripe_button="true" weight="0.26710817" sideWeight="0.64040405" order="0" side_tool="false" content_ui="combo" />
990
+ <window_info id="Project" active="false" anchor="left" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="true" show_stripe_button="true" weight="0.27078736" sideWeight="0.64040405" order="0" side_tool="false" content_ui="combo" />
954
991
  <window_info id="Tail" 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="10" side_tool="false" content_ui="tabs" />
955
992
  <window_info id="Dilbert" 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="0" side_tool="false" content_ui="tabs" />
956
993
  <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" />
957
- <window_info id="Find" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.43403694" sideWeight="0.5" order="1" side_tool="false" content_ui="tabs" />
958
994
  <window_info id="Copy/Paste" 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="4" side_tool="false" content_ui="tabs" />
959
995
  <window_info id="Structure" active="false" anchor="left" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.25" sideWeight="0.5" order="1" side_tool="true" content_ui="tabs" />
960
996
  <window_info id="Favorites" active="false" anchor="left" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.33" sideWeight="0.5" order="2" side_tool="true" content_ui="tabs" />
@@ -970,6 +1006,7 @@
970
1006
  <window_info id="Changes" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.34827146" sideWeight="0.9955329" order="7" side_tool="false" content_ui="tabs" />
971
1007
  <window_info id="Heroku" 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="8" side_tool="false" content_ui="tabs" />
972
1008
  <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" />
1009
+ <window_info id="Find" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.43403694" sideWeight="0.5" order="1" side_tool="false" content_ui="tabs" />
973
1010
  </layout>
974
1011
  <layout-to-restore>
975
1012
  <window_info id="Cvs" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.25" sideWeight="0.5" order="5" side_tool="false" content_ui="tabs" />
@@ -1024,7 +1061,8 @@
1024
1061
  <MESSAGE value="Print errors in case of existing errors." />
1025
1062
  <MESSAGE value="Adding new input parameter: output_stream" />
1026
1063
  <MESSAGE value="bug fix" />
1027
- <option name="LAST_COMMIT_MESSAGE" value="bug fix" />
1064
+ <MESSAGE value="Replace simple parsing with parslet-based parsing." />
1065
+ <option name="LAST_COMMIT_MESSAGE" value="Replace simple parsing with parslet-based parsing." />
1028
1066
  </component>
1029
1067
  <component name="XDebuggerManager">
1030
1068
  <breakpoint-manager>
@@ -1065,13 +1103,6 @@
1065
1103
  </option>
1066
1104
  </component>
1067
1105
  <component name="editorHistoryManager">
1068
- <entry file="file://$PROJECT_DIR$/lib/script_executor/script_executor.rb">
1069
- <provider selected="true" editor-type-id="text-editor">
1070
- <state vertical-scroll-proportion="0.0">
1071
- <caret line="0" column="0" selection-start-line="0" selection-start-column="0" selection-end-line="0" selection-end-column="0" />
1072
- </state>
1073
- </provider>
1074
- </entry>
1075
1106
  <entry file="file://$PROJECT_DIR$/lib/script_executor/executable.rb">
1076
1107
  <provider selected="true" editor-type-id="text-editor">
1077
1108
  <state vertical-scroll-proportion="0.0">
@@ -1221,20 +1252,20 @@
1221
1252
  </provider>
1222
1253
  </entry>
1223
1254
  <entry file="file://$PROJECT_DIR$/README.md">
1255
+ <provider editor-type-id="MultiMarkdownFxHtmlEditor">
1256
+ <state />
1257
+ </provider>
1224
1258
  <provider selected="true" editor-type-id="text-editor">
1225
1259
  <state vertical-scroll-proportion="3.1683366">
1226
1260
  <caret line="93" column="24" selection-start-line="93" selection-start-column="24" selection-end-line="93" selection-end-column="24" />
1227
1261
  </state>
1228
1262
  </provider>
1229
- <provider editor-type-id="MultiMarkdownFxHtmlEditor">
1263
+ <provider editor-type-id="MultiMarkdownFxPreviewEditor">
1230
1264
  <state />
1231
1265
  </provider>
1232
1266
  <provider editor-type-id="MarkdownPreviewEditor">
1233
1267
  <state />
1234
1268
  </provider>
1235
- <provider editor-type-id="MultiMarkdownFxPreviewEditor">
1236
- <state />
1237
- </provider>
1238
1269
  </entry>
1239
1270
  <entry file="file://$PROJECT_DIR$/.ruby-version">
1240
1271
  <provider selected="true" editor-type-id="text-editor">
@@ -1243,13 +1274,6 @@
1243
1274
  </state>
1244
1275
  </provider>
1245
1276
  </entry>
1246
- <entry file="file://$PROJECT_DIR$/Gemfile.lock">
1247
- <provider selected="true" editor-type-id="text-editor">
1248
- <state vertical-scroll-proportion="0.24418604">
1249
- <caret line="7" column="28" selection-start-line="7" selection-start-column="28" selection-end-line="7" selection-end-column="28" />
1250
- </state>
1251
- </provider>
1252
- </entry>
1253
1277
  <entry file="file://$PROJECT_DIR$/lib/script_executor/remote_command.rb">
1254
1278
  <provider selected="true" editor-type-id="text-editor">
1255
1279
  <state vertical-scroll-proportion="0.0">
@@ -1270,7 +1294,6 @@
1270
1294
  <provider selected="true" editor-type-id="text-editor">
1271
1295
  <state vertical-scroll-proportion="0.0">
1272
1296
  <caret line="0" column="15" selection-start-line="0" selection-start-column="15" selection-end-line="0" selection-end-column="15" />
1273
- <folding />
1274
1297
  </state>
1275
1298
  </provider>
1276
1299
  </entry>
@@ -1278,7 +1301,6 @@
1278
1301
  <provider selected="true" editor-type-id="text-editor">
1279
1302
  <state vertical-scroll-proportion="0.0">
1280
1303
  <caret line="285" column="4" selection-start-line="285" selection-start-column="4" selection-end-line="285" selection-end-column="36" />
1281
- <folding />
1282
1304
  </state>
1283
1305
  </provider>
1284
1306
  </entry>
@@ -1286,7 +1308,6 @@
1286
1308
  <provider selected="true" editor-type-id="text-editor">
1287
1309
  <state vertical-scroll-proportion="0.0">
1288
1310
  <caret line="1330" column="0" selection-start-line="1330" selection-start-column="0" selection-end-line="1330" selection-end-column="0" />
1289
- <folding />
1290
1311
  </state>
1291
1312
  </provider>
1292
1313
  </entry>
@@ -1294,7 +1315,6 @@
1294
1315
  <provider selected="true" editor-type-id="text-editor">
1295
1316
  <state vertical-scroll-proportion="0.0">
1296
1317
  <caret line="88" column="0" selection-start-line="88" selection-start-column="0" selection-end-line="88" selection-end-column="0" />
1297
- <folding />
1298
1318
  </state>
1299
1319
  </provider>
1300
1320
  </entry>
@@ -1302,7 +1322,6 @@
1302
1322
  <provider selected="true" editor-type-id="text-editor">
1303
1323
  <state vertical-scroll-proportion="0.041436464">
1304
1324
  <caret line="1" column="12" selection-start-line="1" selection-start-column="12" selection-end-line="1" selection-end-column="12" />
1305
- <folding />
1306
1325
  </state>
1307
1326
  </provider>
1308
1327
  </entry>
@@ -1310,7 +1329,6 @@
1310
1329
  <provider selected="true" editor-type-id="text-editor">
1311
1330
  <state vertical-scroll-proportion="0.14962594">
1312
1331
  <caret line="4" column="22" selection-start-line="4" selection-start-column="22" selection-end-line="4" selection-end-column="22" />
1313
- <folding />
1314
1332
  </state>
1315
1333
  </provider>
1316
1334
  </entry>
@@ -1318,7 +1336,6 @@
1318
1336
  <provider selected="true" editor-type-id="text-editor">
1319
1337
  <state vertical-scroll-proportion="0.0">
1320
1338
  <caret line="0" column="40" selection-start-line="0" selection-start-column="40" selection-end-line="0" selection-end-column="40" />
1321
- <folding />
1322
1339
  </state>
1323
1340
  </provider>
1324
1341
  </entry>
@@ -1326,7 +1343,6 @@
1326
1343
  <provider selected="true" editor-type-id="text-editor">
1327
1344
  <state vertical-scroll-proportion="0.0">
1328
1345
  <caret line="186" column="0" selection-start-line="186" selection-start-column="0" selection-end-line="186" selection-end-column="0" />
1329
- <folding />
1330
1346
  </state>
1331
1347
  </provider>
1332
1348
  </entry>
@@ -1334,15 +1350,6 @@
1334
1350
  <provider selected="true" editor-type-id="text-editor">
1335
1351
  <state vertical-scroll-proportion="0.0">
1336
1352
  <caret line="57" column="0" selection-start-line="57" selection-start-column="0" selection-end-line="57" selection-end-column="0" />
1337
- <folding />
1338
- </state>
1339
- </provider>
1340
- </entry>
1341
- <entry file="file://$PROJECT_DIR$/lib/script_executor/scripts_parser.rb">
1342
- <provider selected="true" editor-type-id="text-editor">
1343
- <state vertical-scroll-proportion="0.0">
1344
- <caret line="23" column="0" selection-start-line="23" selection-start-column="0" selection-end-line="23" selection-end-column="0" />
1345
- <folding />
1346
1353
  </state>
1347
1354
  </provider>
1348
1355
  </entry>
@@ -1350,7 +1357,6 @@
1350
1357
  <provider selected="true" editor-type-id="text-editor">
1351
1358
  <state vertical-scroll-proportion="0.0">
1352
1359
  <caret line="15" column="9" selection-start-line="15" selection-start-column="9" selection-end-line="15" selection-end-column="9" />
1353
- <folding />
1354
1360
  </state>
1355
1361
  </provider>
1356
1362
  </entry>
@@ -1358,7 +1364,6 @@
1358
1364
  <provider selected="true" editor-type-id="text-editor">
1359
1365
  <state vertical-scroll-proportion="0.037406486">
1360
1366
  <caret line="2" column="0" selection-start-line="2" selection-start-column="0" selection-end-line="5" selection-end-column="18" />
1361
- <folding />
1362
1367
  </state>
1363
1368
  </provider>
1364
1369
  </entry>
@@ -1366,7 +1371,6 @@
1366
1371
  <provider selected="true" editor-type-id="text-editor">
1367
1372
  <state vertical-scroll-proportion="0.07481297">
1368
1373
  <caret line="2" column="4" selection-start-line="2" selection-start-column="4" selection-end-line="2" selection-end-column="4" />
1369
- <folding />
1370
1374
  </state>
1371
1375
  </provider>
1372
1376
  </entry>
@@ -1374,7 +1378,6 @@
1374
1378
  <provider selected="true" editor-type-id="text-editor">
1375
1379
  <state vertical-scroll-proportion="0.0">
1376
1380
  <caret line="0" column="0" selection-start-line="0" selection-start-column="0" selection-end-line="7" selection-end-column="12" />
1377
- <folding />
1378
1381
  </state>
1379
1382
  </provider>
1380
1383
  </entry>
@@ -1382,7 +1385,6 @@
1382
1385
  <provider selected="true" editor-type-id="text-editor">
1383
1386
  <state vertical-scroll-proportion="0.1388889">
1384
1387
  <caret line="4" column="0" selection-start-line="4" selection-start-column="0" selection-end-line="4" selection-end-column="0" />
1385
- <folding />
1386
1388
  </state>
1387
1389
  </provider>
1388
1390
  </entry>
@@ -1391,32 +1393,43 @@
1391
1393
  <state vertical-scroll-proportion="0.20833333">
1392
1394
  <caret line="6" column="0" selection-start-line="6" selection-start-column="0" selection-end-line="6" selection-end-column="45" />
1393
1395
  <folding>
1394
- <element signature="e#1260#1338#0" expanded="true" />
1396
+ <element signature="e#1260#1338#0" expanded="false" />
1395
1397
  </folding>
1396
1398
  </state>
1397
1399
  </provider>
1398
1400
  </entry>
1399
- <entry file="file://$PROJECT_DIR$/spec/scripts_parser_spec.rb">
1401
+ <entry file="file://$PROJECT_DIR$/spec/support/base.conf.json">
1400
1402
  <provider selected="true" editor-type-id="text-editor">
1401
- <state vertical-scroll-proportion="0.5555556">
1402
- <caret line="16" column="0" selection-start-line="16" selection-start-column="0" selection-end-line="16" selection-end-column="0" />
1403
- <folding />
1403
+ <state vertical-scroll-proportion="0.59681696">
1404
+ <caret line="15" column="1" selection-start-line="15" selection-start-column="1" selection-end-line="15" selection-end-column="1" />
1404
1405
  </state>
1405
1406
  </provider>
1406
1407
  </entry>
1407
- <entry file="file://$PROJECT_DIR$/spec/support/base.conf.json">
1408
+ <entry file="file://$PROJECT_DIR$/spec/base_provision_spec.rb">
1408
1409
  <provider selected="true" editor-type-id="text-editor">
1409
- <state vertical-scroll-proportion="0.59681696">
1410
- <caret line="15" column="1" selection-start-line="15" selection-start-column="1" selection-end-line="15" selection-end-column="1" />
1411
- <folding />
1410
+ <state vertical-scroll-proportion="0.41860464">
1411
+ <caret line="12" column="25" selection-start-line="12" selection-start-column="25" selection-end-line="12" selection-end-column="25" />
1412
1412
  </state>
1413
1413
  </provider>
1414
1414
  </entry>
1415
- <entry file="file://$PROJECT_DIR$/lib/script_executor/version.rb">
1415
+ <entry file="file://$PROJECT_DIR$/Gemfile.lock">
1416
1416
  <provider selected="true" editor-type-id="text-editor">
1417
- <state vertical-scroll-proportion="0.034883723">
1418
- <caret line="1" column="16" selection-start-line="1" selection-start-column="16" selection-end-line="1" selection-end-column="16" />
1419
- <folding />
1417
+ <state vertical-scroll-proportion="0.33333334">
1418
+ <caret line="16" column="9" selection-start-line="16" selection-start-column="4" selection-end-line="16" selection-end-column="9" />
1419
+ </state>
1420
+ </provider>
1421
+ </entry>
1422
+ <entry file="file://$PROJECT_DIR$/Gemfile">
1423
+ <provider selected="true" editor-type-id="text-editor">
1424
+ <state vertical-scroll-proportion="0.85714287">
1425
+ <caret line="18" column="22" selection-start-line="18" selection-start-column="22" selection-end-line="18" selection-end-column="22" />
1426
+ </state>
1427
+ </provider>
1428
+ </entry>
1429
+ <entry file="file://$PROJECT_DIR$/lib/script_executor/script_locator.rb">
1430
+ <provider selected="true" editor-type-id="text-editor">
1431
+ <state vertical-scroll-proportion="2.047619">
1432
+ <caret line="43" column="5" selection-start-line="43" selection-start-column="5" selection-end-line="43" selection-end-column="5" />
1420
1433
  </state>
1421
1434
  </provider>
1422
1435
  </entry>
@@ -1428,34 +1441,42 @@
1428
1441
  </state>
1429
1442
  </provider>
1430
1443
  </entry>
1431
- <entry file="file://$PROJECT_DIR$/Gemfile">
1444
+ <entry file="file://$PROJECT_DIR$/spec/scripts_parser_spec.rb">
1432
1445
  <provider selected="true" editor-type-id="text-editor">
1433
- <state vertical-scroll-proportion="0.41860464">
1434
- <caret line="12" column="26" selection-start-line="12" selection-start-column="26" selection-end-line="12" selection-end-column="26" />
1446
+ <state vertical-scroll-proportion="0.0">
1447
+ <caret line="10" column="0" selection-start-line="10" selection-start-column="0" selection-end-line="10" selection-end-column="0" />
1435
1448
  <folding />
1436
1449
  </state>
1437
1450
  </provider>
1438
1451
  </entry>
1439
- <entry file="file://$PROJECT_DIR$/spec/base_provision_spec.rb">
1452
+ <entry file="file://$PROJECT_DIR$/spec/support/big_script2.sh">
1440
1453
  <provider selected="true" editor-type-id="text-editor">
1441
- <state vertical-scroll-proportion="0.41860464">
1442
- <caret line="12" column="25" selection-start-line="12" selection-start-column="25" selection-end-line="12" selection-end-column="25" />
1454
+ <state vertical-scroll-proportion="0.0">
1455
+ <caret line="51" column="0" selection-start-line="51" selection-start-column="0" selection-end-line="51" selection-end-column="61" />
1443
1456
  <folding />
1444
1457
  </state>
1445
1458
  </provider>
1446
1459
  </entry>
1447
- <entry file="file://$PROJECT_DIR$/lib/script_executor/script_locator.rb">
1460
+ <entry file="file://$PROJECT_DIR$/lib/script_executor/scripts_parser.rb">
1448
1461
  <provider selected="true" editor-type-id="text-editor">
1449
1462
  <state vertical-scroll-proportion="0.0">
1450
- <caret line="43" column="5" selection-start-line="43" selection-start-column="5" selection-end-line="43" selection-end-column="5" />
1463
+ <caret line="24" column="0" selection-start-line="24" selection-start-column="0" selection-end-line="24" selection-end-column="0" />
1464
+ <folding />
1465
+ </state>
1466
+ </provider>
1467
+ </entry>
1468
+ <entry file="file://$PROJECT_DIR$/lib/script_executor/version.rb">
1469
+ <provider selected="true" editor-type-id="text-editor">
1470
+ <state vertical-scroll-proportion="0.0">
1471
+ <caret line="1" column="18" selection-start-line="1" selection-start-column="18" selection-end-line="1" selection-end-column="18" />
1451
1472
  <folding />
1452
1473
  </state>
1453
1474
  </provider>
1454
1475
  </entry>
1455
1476
  <entry file="file://$PROJECT_DIR$/CHANGES">
1456
1477
  <provider selected="true" editor-type-id="text-editor">
1457
- <state vertical-scroll-proportion="0.7809524">
1458
- <caret line="106" column="2" selection-start-line="106" selection-start-column="2" selection-end-line="106" selection-end-column="52" />
1478
+ <state vertical-scroll-proportion="2.38">
1479
+ <caret line="104" column="23" selection-start-line="104" selection-start-column="23" selection-end-line="104" selection-end-column="23" />
1459
1480
  <folding />
1460
1481
  </state>
1461
1482
  </provider>
data/CHANGES CHANGED
@@ -102,6 +102,6 @@
102
102
 
103
103
  * Upgrade net:ssh, small bug fix.
104
104
 
105
- == Version 1.7.0
105
+ == Version 1.7.0, 1.7.1
106
106
 
107
107
  * Replace simple parsing with parslet-based parsing.
data/Gemfile CHANGED
@@ -1,22 +1,22 @@
1
1
  source "https://rubygems.org"
2
2
 
3
3
  group :default do
4
- gem "highline", "~>1.6"
5
- gem "net-ssh", "~>2.9"
6
- gem "text-interpolator", "~>1.1"
7
- gem "json_pure", "~>1.8"
8
- gem "parslet"
9
- gem 'thor'
4
+ gem "highline", "~> 1.6"
5
+ gem "net-ssh", "~> 2.9"
6
+ gem "text-interpolator", "~> 1.1"
7
+ gem "json_pure", "~> 1.8"
8
+ gem "parslet", "~> 1.7"
9
+ gem 'thor', "~> 0.19"
10
10
  end
11
11
 
12
12
  group :development do
13
- gem "gemspec_deps_gen", "~>1.1"
14
- gem "gemcutter", "~>0.7"
15
- gem 'awesome_print'
13
+ gem "gemspec_deps_gen", "~> 1.1"
14
+ gem "gemcutter", "~> 0.7"
15
+ gem 'awesome_print', "~> 1.6"
16
16
  end
17
17
 
18
18
  group :test do
19
- gem "rspec", "~>3.0"
19
+ gem "rspec", "~> 3.3"
20
20
  end
21
21
 
22
22
  # group :debug do
data/Gemfile.lock CHANGED
@@ -34,16 +34,16 @@ PLATFORMS
34
34
  ruby
35
35
 
36
36
  DEPENDENCIES
37
- awesome_print
37
+ awesome_print (~> 1.6)
38
38
  gemcutter (~> 0.7)
39
39
  gemspec_deps_gen (~> 1.1)
40
40
  highline (~> 1.6)
41
41
  json_pure (~> 1.8)
42
42
  net-ssh (~> 2.9)
43
- parslet
44
- rspec (~> 3.0)
43
+ parslet (~> 1.7)
44
+ rspec (~> 3.3)
45
45
  text-interpolator (~> 1.1)
46
- thor
46
+ thor (~> 0.19)
47
47
 
48
48
  BUNDLED WITH
49
49
  1.10.6
data/lib/script_executor/scripts_parser.rb CHANGED
@@ -20,7 +20,7 @@ class ScriptsParser < Parslet::Parser
20
20
  rule(:codeLine) { emptyLines >> codeChars.as(:codeLine) >> newline }
21
21
 
22
22
  rule(:nameChars) { match['\w\d_'].repeat(1) }
23
- rule(:codeChars) { match['(.*)\w\d $_#"<>{}\'\/\.%=!\-+/\*|:'].repeat(1) }
23
+ rule(:codeChars) { match['(.*)\w\d $_#"<>{}\'\/\.%=!\-+/\*|:~@'].repeat(1) }
24
24
 
25
25
  rule(:emptyLines) { emptyLine.repeat }
26
26
  rule(:emptyLine) { spaces >> newline }
data/lib/script_executor/version.rb CHANGED
@@ -1,3 +1,3 @@
1
1
  class ScriptExecutor
2
- VERSION = "1.7.0"
2
+ VERSION = "1.7.1"
3
3
  end
data/script_executor.gemspec CHANGED
@@ -21,11 +21,11 @@ Gem::Specification.new do |spec|
21
21
  spec.add_runtime_dependency "net-ssh", ["~> 2.9"]
22
22
  spec.add_runtime_dependency "text-interpolator", ["~> 1.1"]
23
23
  spec.add_runtime_dependency "json_pure", ["~> 1.8"]
24
- spec.add_runtime_dependency "parslet", [">= 0"]
25
- spec.add_runtime_dependency "thor", [">= 0"]
24
+ spec.add_runtime_dependency "parslet", ["~> 1.7"]
25
+ spec.add_runtime_dependency "thor", ["~> 0.19"]
26
26
  spec.add_development_dependency "gemspec_deps_gen", ["~> 1.1"]
27
27
  spec.add_development_dependency "gemcutter", ["~> 0.7"]
28
- spec.add_development_dependency "awesome_print", [">= 0"]
28
+ spec.add_development_dependency "awesome_print", ["~> 1.6"]
29
29
 
30
30
  end
31
31
 
data/spec/scripts_parser_spec.rb CHANGED
@@ -6,7 +6,7 @@ require 'script_executor/scripts_transformer'
6
6
  describe ScriptsParser do
7
7
  describe "#parse" do
8
8
  it "parses content from file" do
9
- content = File.read('spec/support/big_script.sh')
9
+ content = File.read('spec/support/big_script2.sh')
10
10
  #content = File.read('spec/support/test.conf')
11
11
 
12
12
  parsed_content = subject.parse(content)
data/spec/support/big_script2.sh ADDED
@@ -0,0 +1,82 @@
1
+ #!/bin/sh
2
+
3
+ #######################################
4
+ [chrome]
5
+
6
+ wget -q -O - https://dl-ssl.google.com/linux/linux_signing_key.pub | sudo apt-key add -
7
+
8
+ sudo sh -c 'echo "deb http://dl.google.com/linux/chrome/deb/ stable main" >> /etc/apt/sources.list.d/google.list'
9
+
10
+ sudo apt-get update
11
+
12
+ sudo apt-get install -y google-chrome-stable
13
+
14
+
15
+ #######################################
16
+ [chromedriver]
17
+
18
+ sudo apt-get install -y unzip
19
+
20
+ wget -N http://chromedriver.storage.googleapis.com/2.20/chromedriver_linux64.zip -P ~/Downloads
21
+
22
+ unzip ~/Downloads/chromedriver_linux64.zip -d ~/Downloads
23
+
24
+ chmod +x ~/Downloads/chromedriver
25
+
26
+ sudo mv -f ~/Downloads/chromedriver /usr/local/share/chromedriver
27
+
28
+ sudo ln -s /usr/local/share/chromedriver /usr/local/bin/chromedriver
29
+
30
+ sudo ln -s /usr/local/share/chromedriver /usr/bin/chromedriver
31
+
32
+
33
+ #######################################
34
+ [ffmpeg]
35
+
36
+ sudo apt-get install -y ffmpeg
37
+ sudo apt-get install -y libav-tools
38
+
39
+
40
+ ##############################
41
+ [firefox]
42
+
43
+ sudo apt-get install -y firefox
44
+
45
+
46
+ ##############################
47
+ [project]
48
+ # Installs project
49
+
50
+ sudo sh -c 'echo "source /usr/local/rvm/scripts/rvm" >> ~/.bash_login'
51
+ sudo sh -c 'echo "cd acceptance_demo" >> ~/.bash_login'
52
+ sudo sh -c 'echo "rvm use @acceptance_demo" >> ~/.bash_login'
53
+
54
+ APP_HOME="#{project.home}"
55
+
56
+ cd $APP_HOME
57
+
58
+ source /usr/local/rvm/scripts/rvm
59
+
60
+ rvm use #{project.ruby_version}@#{project.gemset} --create
61
+
62
+ gem install --no-rdoc --no-ri bundler
63
+ gem install --no-rdoc --no-ri rake
64
+
65
+ bundle
66
+
67
+
68
+ ##############################
69
+ [start]
70
+ # Starts tests
71
+
72
+ USER_HOME="#{node.home}"
73
+
74
+ APP_HOME="#{project.home}"
75
+
76
+ cd $APP_HOME
77
+
78
+ source /usr/local/rvm/scripts/rvm
79
+
80
+ rvm use #{project.ruby_version}@#{project.gemset}
81
+
82
+ rake
metadata CHANGED
@@ -1,7 +1,7 @@
1
1
  --- !ruby/object:Gem::Specification
2
2
  name: script_executor
3
3
  version: !ruby/object:Gem::Version
4
- version: 1.7.0
4
+ version: 1.7.1
5
5
  platform: ruby
6
6
  authors:
7
7
  - Alexander Shvets
@@ -70,30 +70,30 @@ dependencies:
70
70
  name: parslet
71
71
  requirement: !ruby/object:Gem::Requirement
72
72
  requirements:
73
- - - ">="
73
+ - - "~>"
74
74
  - !ruby/object:Gem::Version
75
- version: '0'
75
+ version: '1.7'
76
76
  type: :runtime
77
77
  prerelease: false
78
78
  version_requirements: !ruby/object:Gem::Requirement
79
79
  requirements:
80
- - - ">="
80
+ - - "~>"
81
81
  - !ruby/object:Gem::Version
82
- version: '0'
82
+ version: '1.7'
83
83
  - !ruby/object:Gem::Dependency
84
84
  name: thor
85
85
  requirement: !ruby/object:Gem::Requirement
86
86
  requirements:
87
- - - ">="
87
+ - - "~>"
88
88
  - !ruby/object:Gem::Version
89
- version: '0'
89
+ version: '0.19'
90
90
  type: :runtime
91
91
  prerelease: false
92
92
  version_requirements: !ruby/object:Gem::Requirement
93
93
  requirements:
94
- - - ">="
94
+ - - "~>"
95
95
  - !ruby/object:Gem::Version
96
- version: '0'
96
+ version: '0.19'
97
97
  - !ruby/object:Gem::Dependency
98
98
  name: gemspec_deps_gen
99
99
  requirement: !ruby/object:Gem::Requirement
@@ -126,16 +126,16 @@ dependencies:
126
126
  name: awesome_print
127
127
  requirement: !ruby/object:Gem::Requirement
128
128
  requirements:
129
- - - ">="
129
+ - - "~>"
130
130
  - !ruby/object:Gem::Version
131
- version: '0'
131
+ version: '1.6'
132
132
  type: :development
133
133
  prerelease: false
134
134
  version_requirements: !ruby/object:Gem::Requirement
135
135
  requirements:
136
- - - ">="
136
+ - - "~>"
137
137
  - !ruby/object:Gem::Version
138
- version: '0'
138
+ version: '1.6'
139
139
  description: This library helps to execute code, locally or remote over ssh
140
140
  email: alexander.shvets@gmail.com
141
141
  executables: []
@@ -185,6 +185,7 @@ files:
185
185
  - spec/spec_helper.rb
186
186
  - spec/support/base.conf.json
187
187
  - spec/support/big_script.sh
188
+ - spec/support/big_script2.sh
188
189
  - spec/support/test.conf
189
190
  - spec/support/test2.conf
190
191
  homepage: http://github.com/shvets/script_executor
@@ -219,5 +220,6 @@ test_files:
219
220
  - spec/spec_helper.rb
220
221
  - spec/support/base.conf.json
221
222
  - spec/support/big_script.sh
223
+ - spec/support/big_script2.sh
222
224
  - spec/support/test.conf
223
225
  - spec/support/test2.conf