@@ -166,40 +166,40 @@ def self.yml
166
166
@yml ||= File . exist? ( yml_filename ) ? YAML . load_file ( yml_filename ) : { }
167
167
end
168
168
169
- def configure_from_yml
170
- configure_build_directory_from_yml
171
- configure_ignore_list_from_yml
172
- configure_ci_service_from_yml
173
- configure_coverage_access_token_from_yml
174
- configure_coverage_service_from_yml
175
- configure_source_directory_from_yml
176
- configure_output_directory_from_yml
177
- configure_input_format_from_yml
178
- configure_scheme_from_yml
179
- configure_binary_file_from_yml
169
+ def configure
170
+ configure_build_directory
171
+ configure_ignore_list
172
+ configure_ci_service
173
+ configure_coverage_access_token
174
+ configure_coverage_service
175
+ configure_source_directory
176
+ configure_output_directory
177
+ configure_input_format
178
+ configure_scheme
179
+ configure_binary_file
180
180
end
181
181
182
- def configure_build_directory_from_yml
182
+ def configure_build_directory
183
183
self . build_directory ||= self . class . yml [ "build_directory" ] || derived_data_path
184
184
end
185
185
186
- def configure_source_directory_from_yml
186
+ def configure_source_directory
187
187
self . source_directory ||= self . class . yml [ "source_directory" ] if self . class . yml [ "source_directory" ]
188
188
end
189
189
190
- def configure_output_directory_from_yml
190
+ def configure_output_directory
191
191
self . output_directory ||= self . class . yml [ "output_directory" ] if self . class . yml [ "output_directory" ]
192
192
end
193
193
194
- def configure_ignore_list_from_yml
194
+ def configure_ignore_list
195
195
self . ignore_list ||= [ ( self . class . yml [ "ignore" ] || [ ] ) ] . flatten
196
196
end
197
197
198
- def configure_ci_service_from_yml
198
+ def configure_ci_service
199
199
self . ci_service ||= ( self . class . yml [ "ci_service" ] || :travis_ci )
200
200
end
201
201
202
- def configure_input_format_from_yml
202
+ def configure_input_format
203
203
self . input_format ||= self . class . yml [ "input_format" ] || input_format
204
204
end
205
205
@@ -215,19 +215,19 @@ def input_format=(format)
215
215
end
216
216
end
217
217
218
- def configure_scheme_from_yml
218
+ def configure_scheme
219
219
self . scheme ||= self . class . yml [ "scheme" ] if self . class . yml [ "scheme" ]
220
220
end
221
221
222
222
def ci_service = ( service )
223
223
@ci_service = service && service . to_sym
224
224
end
225
225
226
- def configure_coverage_service_from_yml
226
+ def configure_coverage_service
227
227
self . coverage_service ||= ( self . class . yml [ "coverage_service" ] || :terminal )
228
228
end
229
229
230
- def configure_coverage_access_token_from_yml
230
+ def configure_coverage_access_token
231
231
self . coverage_access_token ||= ( ENV [ "COVERAGE_ACCESS_TOKEN" ] || self . class . yml [ "coverage_access_token" ] || "" )
232
232
end
233
233
@@ -251,7 +251,7 @@ def coverage_service=(service)
251
251
@coverage_service = service
252
252
end
253
253
254
- def configure_binary_file_from_yml
254
+ def configure_binary_file
255
255
if self . input_format == "profdata"
256
256
self . binary_file ||= self . class . yml [ "binary_file" ] || find_binary_file
257
257
end
0 commit comments