More rubocopy and rspec cleanup.

Author: jgfoster

CHANGELOG.md

@@ -398,7 +398,7 @@ and this project adheres to [Semantic Versioning](http://semver.org/).
 
 ### Fixed
 - Malformed YAML (duplicate unittests section) now has no duplicate section
-- arduino_ci_remote.rb script now has correct arguments in build_for_test_with_configuration
+- arduino_ci_remote.rb script now has correct arguments in build_for_test
 
 
 ## [0.1.8] - 2018-04-03

exe/arduino_ci.rb

@@ -430,10 +430,7 @@ def perform_unit_tests(cpp_library, file_config)
         unittest_name = unittest_path.basename.to_s
         puts "--------------------------------------------------------------------------------"
         attempt_multiline("Unit testing #{unittest_name} with #{gcc_binary} for #{p}") do
-          exe = cpp_library.build_for_test_with_configuration(
-            unittest_path,
-            gcc_binary
-          )
+          exe = cpp_library.build_for_test(unittest_path, gcc_binary)
           puts
           unless exe
             puts "Last command: #{cpp_library.last_cmd}"

lib/arduino_ci/cpp_library.rb

@@ -488,10 +488,9 @@ def test_args(aux_libraries, ci_gcc_config)
     # The dependent libraries configuration is appended with data from library.properties internal to the library under test
     #
     # @param test_file [Pathname] The path to the file containing the unit tests
-    # @param aux_libraries [Array<Pathname>] The external Arduino libraries required by this project
-    # @param ci_gcc_config [Hash] The GCC config object
+    # @param gcc_binary [String] name of a compiler
     # @return [Pathname] path to the compiled test executable
-    def build_for_test_with_configuration(test_file, gcc_binary)
+    def build_for_test(test_file, gcc_binary)
       executable = Pathname.new("#{BUILD_DIR}/#{test_file.basename}.bin").expand_path
       File.delete(executable) if File.exist?(executable)
       arg_sets = ["-std=c++0x", "-o", executable.to_s, "-L#{BUILD_DIR}", "-DARDUINO=100"]
@@ -517,6 +516,7 @@ def build_for_test_with_configuration(test_file, gcc_binary)
     # The dependent libraries configuration is appended with data from library.properties internal to the library under test
     #
     # @param aux_libraries [Array<Pathname>] The external Arduino libraries required by this project
+    # @param gcc_binary [String] name of a compiler
     # @param ci_gcc_config [Hash] The GCC config object
     # @return [Pathname] path to the compiled test executable
     def build_share_library_with_configuration(aux_libraries, gcc_binary, ci_gcc_config)

spec/cpp_library_spec.rb

@@ -45,10 +45,9 @@ def verified_install(backend, path)
         config       = ArduinoCI::CIConfig.default.from_example(cpp_lib_path)
         path         = config.allowable_unittest_files(@cpp_library.test_files).first
         compiler     = config.compilers_to_use.first
-        result       = @cpp_library.build_for_test_with_configuration(path,
-                                                                      [],
-                                                                      compiler,
-                                                                      config.gcc_config("uno"))
+        result       = @cpp_library.build_shared_library(path, [], compiler, config.gcc_config("uno"))
+        expect(result).to be nil
+        result       = @cpp_library.build_for_test(path, compiler)
         expect(result).to be nil
       end
     end
@@ -276,7 +275,9 @@ def verified_install(backend, path)
       expected = path.basename.to_s.include?("good")
       config.compilers_to_use.each do |compiler|
         it "tests #{File.basename(path)} with #{compiler} expecting #{expected}" do
-          exe = @cpp_library.build_for_test_with_configuration(path, [], compiler, config.gcc_config("uno"))
+          exe = @cpp_library.build_shared_library(path, [], compiler, config.gcc_config("uno"))
+          expect(exe).not_to be nil
+          exe = @cpp_library.build_for_test(path, compiler)
           expect(exe).not_to be nil
           expect(@cpp_library.run_test_file(exe)).to eq(expected)
         end

spec/testsomething_unittests_spec.rb

@@ -74,7 +74,8 @@
 
           before(:each) do
             @cpp_library = backend.install_local_library(cpp_lib_path)
-            @exe = @cpp_library.build_for_test_with_configuration(path, [], compiler, config.gcc_config("uno"))
+            @cpp.library.build_shared_library(path, [], compiler, config.gcc_config("uno"))
+            @exe = @cpp_library.build_for_test(path, compiler)
           end
 
           # extra debug for c++ failures