Skip to content

Commit 1e40d93

Browse files
committed
[project] Refactor configuration method names
1 parent 2c43d91 commit 1e40d93

10 files changed

+72
-72
lines changed

bin/slather

+1-1
Original file line numberDiff line numberDiff line change
@@ -45,7 +45,7 @@ Clamp do
4545
setup_scheme
4646
setup_binary_file
4747

48-
project.configure_from_yml
48+
project.configure
4949

5050
post
5151

lib/slather/project.rb

+21-21
Original file line numberDiff line numberDiff line change
@@ -166,40 +166,40 @@ def self.yml
166166
@yml ||= File.exist?(yml_filename) ? YAML.load_file(yml_filename) : {}
167167
end
168168

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
180180
end
181181

182-
def configure_build_directory_from_yml
182+
def configure_build_directory
183183
self.build_directory ||= self.class.yml["build_directory"] || derived_data_path
184184
end
185185

186-
def configure_source_directory_from_yml
186+
def configure_source_directory
187187
self.source_directory ||= self.class.yml["source_directory"] if self.class.yml["source_directory"]
188188
end
189189

190-
def configure_output_directory_from_yml
190+
def configure_output_directory
191191
self.output_directory ||= self.class.yml["output_directory"] if self.class.yml["output_directory"]
192192
end
193193

194-
def configure_ignore_list_from_yml
194+
def configure_ignore_list
195195
self.ignore_list ||= [(self.class.yml["ignore"] || [])].flatten
196196
end
197197

198-
def configure_ci_service_from_yml
198+
def configure_ci_service
199199
self.ci_service ||= (self.class.yml["ci_service"] || :travis_ci)
200200
end
201201

202-
def configure_input_format_from_yml
202+
def configure_input_format
203203
self.input_format ||= self.class.yml["input_format"] || input_format
204204
end
205205

@@ -215,19 +215,19 @@ def input_format=(format)
215215
end
216216
end
217217

218-
def configure_scheme_from_yml
218+
def configure_scheme
219219
self.scheme ||= self.class.yml["scheme"] if self.class.yml["scheme"]
220220
end
221221

222222
def ci_service=(service)
223223
@ci_service = service && service.to_sym
224224
end
225225

226-
def configure_coverage_service_from_yml
226+
def configure_coverage_service
227227
self.coverage_service ||= (self.class.yml["coverage_service"] || :terminal)
228228
end
229229

230-
def configure_coverage_access_token_from_yml
230+
def configure_coverage_access_token
231231
self.coverage_access_token ||= (ENV["COVERAGE_ACCESS_TOKEN"] || self.class.yml["coverage_access_token"] || "")
232232
end
233233

@@ -251,7 +251,7 @@ def coverage_service=(service)
251251
@coverage_service = service
252252
end
253253

254-
def configure_binary_file_from_yml
254+
def configure_binary_file
255255
if self.input_format == "profdata"
256256
self.binary_file ||= self.class.yml["binary_file"] || find_binary_file
257257
end

spec/slather/coverage_file_spec.rb

+1-1
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@
55
let(:fixtures_project) do
66
project = Slather::Project.open(FIXTURES_PROJECT_PATH)
77
project.build_directory = TEMP_DERIVED_DATA_PATH
8-
project.send(:configure_from_yml)
8+
project.send(:configure)
99
project.stub(:input_format).and_return("gcov")
1010
project
1111
end

spec/slather/coverage_service/cobertura_xml_spec.rb

+1-1
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@
88
proj.build_directory = TEMP_DERIVED_DATA_PATH
99
proj.input_format = "gcov"
1010
proj.coverage_service = "cobertura_xml"
11-
proj.configure_from_yml
11+
proj.configure
1212
proj
1313
end
1414

spec/slather/coverage_service/coveralls_spec.rb

+2-2
Original file line numberDiff line numberDiff line change
@@ -27,7 +27,7 @@
2727
context "#gcov file format" do
2828
before(:each) {
2929
fixtures_project.stub(:input_format).and_return("gcov")
30-
fixtures_project.send(:configure_from_yml)
30+
fixtures_project.send(:configure)
3131
}
3232

3333
describe '#coveralls_coverage_data' do
@@ -132,7 +132,7 @@
132132
context "#profdata file format" do
133133
before(:each) {
134134
fixtures_project.stub(:input_format).and_return("profdata")
135-
fixtures_project.send(:configure_from_yml)
135+
fixtures_project.send(:configure)
136136
}
137137

138138
describe '#coveralls_coverage_data' do

spec/slather/coverage_service/gutter_json_spec.rb

+1-1
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@
88
proj.build_directory = TEMP_DERIVED_DATA_PATH
99
proj.input_format = "gcov"
1010
proj.coverage_service = "gutter_json"
11-
proj.configure_from_yml
11+
proj.configure
1212
proj
1313
end
1414

spec/slather/coverage_service/hardcover_spec.rb

+1-1
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@
77
proj.build_directory = TEMP_DERIVED_DATA_PATH
88
proj.input_format = "gcov"
99
proj.coverage_service = "hardcover"
10-
proj.configure_from_yml
10+
proj.configure
1111
proj
1212
end
1313

spec/slather/coverage_service/html_output_spec.rb

+2-2
Original file line numberDiff line numberDiff line change
@@ -49,7 +49,7 @@ def extract_header_title(doc)
4949

5050
before(:each) {
5151
fixtures_project.stub(:input_format).and_return("gcov")
52-
fixtures_project.send(:configure_from_yml)
52+
fixtures_project.send(:configure)
5353
}
5454

5555
it "should create all coverage as static html files" do
@@ -189,7 +189,7 @@ def extract_cov_data(doc)
189189

190190
before(:each) {
191191
fixtures_project.stub(:input_format).and_return("profdata")
192-
fixtures_project.send(:configure_from_yml)
192+
fixtures_project.send(:configure)
193193
}
194194

195195
it "should create a valid report when using profdata format" do

spec/slather/coverage_service/simple_output_spec.rb

+1-1
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@
66
proj = Slather::Project.open(FIXTURES_PROJECT_PATH)
77
proj.build_directory = TEMP_DERIVED_DATA_PATH
88
proj.input_format = "gcov"
9-
proj.configure_from_yml
9+
proj.configure
1010
proj
1111
end
1212

0 commit comments

Comments
 (0)