ceedling 0.15.3 → 0.15.4

data/spec/spec_helper.rb

@@ -1,9 +1,9 @@
 require 'require_all'
 require 'constructor'
 
-#RSpec.configure do |configuration|
-#  configuration.mock_with :rr
-#end
+RSpec.configure do |config|
+  config.raise_errors_for_deprecations!
+end
 
 here = File.dirname(__FILE__)
 

data/spec/spec_system_helper.rb

@@ -124,10 +124,10 @@ module CeedlingTestCases
   def can_create_projects
     @c.with_context do
       Dir.chdir @proj_name do
-        File.exists?("project.yml").should == true
-        File.exists?("rakefile.rb").should == true
-        File.exists?("src").should == true
-        File.exists?("test").should == true
+        expect(File.exists?("project.yml")).to eq true
+        expect(File.exists?("rakefile.rb")).to eq true
+        expect(File.exists?("src")).to eq true
+        expect(File.exists?("test")).to eq true
       end
     end
   end
@@ -135,7 +135,7 @@ module CeedlingTestCases
   def contains_a_vendor_directory
     @c.with_context do
       Dir.chdir @proj_name do
-        File.exists?("vendor/ceedling").should == true
+        expect(File.exists?("vendor/ceedling")).to eq true
       end
     end
   end
@@ -143,7 +143,7 @@ module CeedlingTestCases
   def does_not_contain_a_vendor_directory
     @c.with_context do
       Dir.chdir @proj_name do
-        File.exists?("vendor/ceedling").should == false
+        expect(File.exists?("vendor/ceedling")).to eq false
       end
     end
   end
@@ -151,7 +151,7 @@ module CeedlingTestCases
   def contains_documentation
     @c.with_context do
       Dir.chdir @proj_name do
-        Dir["vendor/ceedling/docs/*.pdf"].length.should == 4
+        expect(Dir["vendor/ceedling/docs/*.pdf"].length).to eq 4
       end
     end
   end
@@ -159,8 +159,8 @@ module CeedlingTestCases
   def does_not_contain_documentation
     @c.with_context do
       Dir.chdir @proj_name do
-        File.exists?("vendor/ceedling/docs").should be_false
-        Dir["vendor/ceedling/**/*.pdf"].length.should == 0
+        expect(File.exists?("vendor/ceedling/docs")).to eq false
+        expect(Dir["vendor/ceedling/**/*.pdf"].length).to eq 0
       end
     end
   end
@@ -173,9 +173,9 @@ module CeedlingTestCases
         FileUtils.cp test_asset_path("test_example_file.c"), 'test'
 
         output = `bundle exec ruby -S rake test:all 2>&1`
-        output.should match(/TESTED:\s+2/)
-        output.should match(/PASSED:\s+1/)
-        output.should match(/IGNORED:\s+0/)
+        expect(output).to match(/TESTED:\s+2/)
+        expect(output).to match(/PASSED:\s+1/)
+        expect(output).to match(/IGNORED:\s+0/)
       end
     end
   end
@@ -185,7 +185,7 @@ module CeedlingTestCases
       Dir.chdir @proj_name do
         `bundle exec ruby -S rake module:create[ponies] 2>&1`
         output = `bundle exec ruby -S rake test:all 2>&1`
-        output.should match(/IGNORED:\s+1/)
+        expect(output).to match(/IGNORED:\s+1/)
       end
     end
   end

data/spec/system/deployment_spec.rb

@@ -64,9 +64,9 @@ describe "Ceedling" do
     end
 
     it "should list out all the examples" do
-      @output.should match(/blinky/)
-      @output.should match(/temp_sensor/)
-      @output.lines.to_a.length.should == 3
+      expect(@output).to match(/blinky/)
+      expect(@output).to match(/temp_sensor/)
+      expect(@output.lines.to_a.length).to eq 3
     end
   end
 
@@ -75,7 +75,7 @@ describe "Ceedling" do
       before do
         @c.with_context do
           output = `bundle exec ruby -S ceedling example temp_sensor 2>&1`
-          output.should match(/created!/)
+          expect(output).to match(/created!/)
         end
       end
 
@@ -83,8 +83,8 @@ describe "Ceedling" do
         @c.with_context do
           Dir.chdir "temp_sensor" do
             @output = `bundle exec ruby -S rake test:all`
-            @output.should match(/TESTED:\s+47/)
-            @output.should match(/PASSED:\s+47/)
+            expect(@output).to match(/TESTED:\s+47/)
+            expect(@output).to match(/PASSED:\s+47/)
           end
         end
       end
@@ -98,7 +98,7 @@ describe "Ceedling" do
     #   before do
     #     @c.with_context do
     #       output = `bundle exec ruby -S ceedling example blinky 2>&1`
-    #       output.should match(/created!/)
+    #       expect(output).to match(/created!/)
     #     end
     #   end
     #
@@ -106,8 +106,8 @@ describe "Ceedling" do
     #     @c.with_context do
     #       Dir.chdir "blinky" do
     #         @output = `bundle exec ruby -S rake test:all`
-    #         @output.should match(/TESTED:\s+7/)
-    #         @output.should match(/PASSED:\s+7/)
+    #         expect(@output).to match(/TESTED:\s+7/)
+    #         expect(@output).to match(/PASSED:\s+7/)
     #       end
     #     end
     #   end

data/test_graveyard/unit/busted/configurator_builder_test.rb

@@ -19,13 +19,13 @@ class ConfiguratorBuilderTest < Test::Unit::TestCase
 
   should "insert tool names into tools config from their config hash key names" do
     in_hash = {
-      :tools => { 
+      :tools => {
         :thinger => {:executable => '/bin/thinger', :arguments => ['-E']},
         :zinger => {:executable => 'zinger', :arguments => ['-option', '-flag']}
     }}
-    
+
     @builder.populate_tool_names(in_hash)
-    
+
     assert_equal('thinger', in_hash[:tools][:thinger][:name])
     assert_equal('/bin/thinger', in_hash[:tools][:thinger][:executable])
     assert_equal(['-E'], in_hash[:tools][:thinger][:arguments])
@@ -33,13 +33,13 @@ class ConfiguratorBuilderTest < Test::Unit::TestCase
     assert_equal('zinger', in_hash[:tools][:zinger][:name])
     assert_equal('zinger', in_hash[:tools][:zinger][:executable])
     assert_equal(['-option', '-flag'], in_hash[:tools][:zinger][:arguments])
-    
+
   end
 
   ############# flattenify #############
-    
+
   should "flattenify keys and values contained in yaml and not blow up on empty top-level entries" do
-    
+
     config = %Q{
       ---
       :project:
@@ -65,23 +65,23 @@ class ConfiguratorBuilderTest < Test::Unit::TestCase
       ...
       }.left_margin
     hash = @builder.flattenify( YAML.load(config) )
-    
+
     assert_equal(hash[:project_name], 'App')
     assert_equal(hash[:project_dirs], ['.', 'gui', '../common/modules/'])
-    
+
     assert_equal(hash[:extension_obj], '.o')
     assert_equal(hash[:extension_bin], '.out')
     assert_equal(hash[:extension_dep], '.d')
-    
+
     assert_equal(hash[:cmock_mock_path], 'build/tests/mocks/')
-    assert_equal(hash[:cmock_plugins], ['cexception', 'ignore'])    
+    assert_equal(hash[:cmock_plugins], ['cexception', 'ignore'])
   end
 
   ############# defaults #############
 
   should "populate all defaults for unspecified entries in config hash" do
     # pass in blank configuration and ensure all defaults populated
-    assert_equal(DEFAULT_CEEDLING_CONFIG, @builder.populate_defaults({}))    
+    assert_equal(DEFAULT_CEEDLING_CONFIG, @builder.populate_defaults({}))
   end
 
   should "not default any entry in input config hash that's already been set to something" do
@@ -96,7 +96,7 @@ class ConfiguratorBuilderTest < Test::Unit::TestCase
 
       :paths_support => ['path/support'],
       :paths_include => ['path/include'],
-                     
+
       :defines_test => ['TEST_DEFINE'],
       :defines_source => ['SOURCE_DEFINE'],
 
@@ -107,46 +107,46 @@ class ConfiguratorBuilderTest < Test::Unit::TestCase
       :extension_testpass => '.p',
       :extension_testfail => '.f',
       :extension_dependencies => '.dep',
-  
+
       :unity_int_width => 16,
       :unity_exclude_float => true,
-      :unity_float_type => 'double',    
+      :unity_float_type => 'double',
       :unity_float_precision => '0.0000001f',
-                                          
+
       :test_runner_includes => ['Common.h'],
       :test_runner_file_suffix => '_walker',
-      
+
       :tools_includes_preprocessor  => {:name => 'doohicky', :executable => 'exe', :arguments => []},
       :tools_file_preprocessor      => {:name => 'doohicky', :executable => 'exe', :arguments => []},
       :tools_dependencies_generator => {:name => 'doohicky', :executable => 'exe', :arguments => []},
     }
-    
+
     assert_equal(in_hash, @builder.populate_defaults(in_hash))
   end
 
   should "merge complex/nested values within default values" do
-    in_hash = { 
+    in_hash = {
       :tools_file_preprocessor => {:executable => '/bin/app'},
       :tools_dependencies_generator => {:arguments => ['-option', '-flag']}
     }
-    
+
     out_hash = @builder.populate_defaults(in_hash)
-    
+
     # default executable has been overwritten but default arguments remain
     assert_equal('/bin/app', out_hash[:tools_file_preprocessor][:executable])
     assert_equal(DEFAULT_FILE_PREPROCESSOR_TOOL[:arguments], out_hash[:tools_file_preprocessor][:arguments])
-    
+
     # default arguments have been overwritten but default executable remains
     assert_equal(DEFAULT_DEPENDENCIES_GENERATOR_TOOL[:executable], out_hash[:tools_dependencies_generator][:executable])
-    assert_equal(['-option', '-flag'], out_hash[:tools_dependencies_generator][:arguments])    
+    assert_equal(['-option', '-flag'], out_hash[:tools_dependencies_generator][:arguments])
   end
 
   should "preserve in defaulted configuration anything in input that's not a handled default" do
-    in_hash = { 
+    in_hash = {
       :yo => 'mama',
       :be => 'all you can be'
     }
-    
+
     assert_equal(DEFAULT_CEEDLING_CONFIG.merge(in_hash), @builder.populate_defaults(in_hash))
   end
 
@@ -179,7 +179,7 @@ class ConfiguratorBuilderTest < Test::Unit::TestCase
     out_hash = @builder.set_build_paths(in_hash)
 
     assert_equal(expected_build_paths.sort, out_hash[:project_build_paths].sort)
-    
+
     assert_equal(expected_build_paths[0], out_hash[:project_test_runners_path])
     assert_equal(expected_build_paths[1], out_hash[:project_test_results_path])
     assert_equal(expected_build_paths[2], out_hash[:project_test_build_output_path])
@@ -201,9 +201,9 @@ class ConfiguratorBuilderTest < Test::Unit::TestCase
         'files/build/tests/artifacts',
         'files/build/release/out',
         'files/build/release/artifacts',]
-  
+
     out_hash = @builder.set_build_paths(in_hash)
-  
+
     assert_equal(expected_build_paths.sort, out_hash[:project_build_paths].sort)
 
     assert_equal(expected_build_paths[0], out_hash[:project_test_runners_path])
@@ -228,9 +228,9 @@ class ConfiguratorBuilderTest < Test::Unit::TestCase
         'files/build/tests/artifacts',
         'files/build/release/out',
         'files/build/release/artifacts',]
-  
+
     out_hash = @builder.set_build_paths(in_hash)
-  
+
     assert_equal(expected_build_paths.sort, out_hash[:project_build_paths].sort)
 
     assert_equal(expected_build_paths[0], out_hash[:project_test_runners_path])
@@ -256,9 +256,9 @@ class ConfiguratorBuilderTest < Test::Unit::TestCase
         'files/build/tests/artifacts',
         'files/build/release/out',
         'files/build/release/artifacts',]
-  
+
     out_hash = @builder.set_build_paths(in_hash)
-  
+
     assert_equal(expected_build_paths.sort, out_hash[:project_build_paths].sort)
 
     assert_equal(expected_build_paths[0], out_hash[:project_test_runners_path])
@@ -280,7 +280,7 @@ class ConfiguratorBuilderTest < Test::Unit::TestCase
        "#{CEEDLING_LIB}tasks.rake",
        "#{CEEDLING_LIB}tasks_filesystem.rake"].sort,
       out_hash[:project_rakefile_component_files].sort)
-    
+
     in_hash = {:project_use_mocks => true}
     out_hash = @builder.set_rakefile_components(in_hash)
     assert_equal(
@@ -298,7 +298,7 @@ class ConfiguratorBuilderTest < Test::Unit::TestCase
        "#{CEEDLING_LIB}rules_preprocess.rake",
        "#{CEEDLING_LIB}tasks_filesystem.rake"].sort,
       out_hash[:project_rakefile_component_files].sort)
-    
+
     in_hash = {:project_use_deep_dependencies => true}
     out_hash = @builder.set_rakefile_components(in_hash)
     assert_equal(
@@ -325,13 +325,13 @@ class ConfiguratorBuilderTest < Test::Unit::TestCase
   should "collect all source and test include paths without optional mocks and exception paths" do
     in_hash = {
         :project_use_exceptions => false,
-        :project_use_mocks => false,        
+        :project_use_mocks => false,
         :paths_test => ['files/tests'],
         :paths_support => ['files/tests/support'],
         :paths_source => ['files/source'],
         :paths_include => ['files/source/include'],
         }
-        
+
     expected_include_paths = ['files/source', 'files/source/include', 'files/tests', 'files/tests/support', "#{CEEDLING_VENDOR}unity/src"]
 
     out_hash = @builder.collect_test_and_source_include_paths(in_hash)
@@ -342,13 +342,13 @@ class ConfiguratorBuilderTest < Test::Unit::TestCase
   should "collect all source and test include paths without optional mocks paths but with exception path" do
     in_hash = {
         :project_use_exceptions => true,
-        :project_use_mocks => false,        
+        :project_use_mocks => false,
         :paths_test => ['files/tests'],
         :paths_support => ['files/tests/support'],
         :paths_source => ['files/source'],
         :paths_include => ['files/source/include'],
         }
-        
+
     expected_include_paths = ['files/source', 'files/source/include', 'files/tests', 'files/tests/support', "#{CEEDLING_VENDOR}unity/src", "#{CEEDLING_VENDOR}c_exception/lib"]
 
     out_hash = @builder.collect_test_and_source_include_paths(in_hash)
@@ -366,7 +366,7 @@ class ConfiguratorBuilderTest < Test::Unit::TestCase
         :paths_source => ['files/source'],
         :paths_include => ['files/source/include'],
         }
-        
+
     expected_include_paths = ['files/source', 'files/source/include', 'files/tests', 'files/tests/support', "#{CEEDLING_VENDOR}unity/src", 'files/build/mocks']
 
     out_hash = @builder.collect_test_and_source_include_paths(in_hash)
@@ -384,7 +384,7 @@ class ConfiguratorBuilderTest < Test::Unit::TestCase
         :paths_source => ['files/source'],
         :paths_include => ['files/source/include'],
         }
-        
+
     expected_include_paths = ['files/source', 'files/source/include', 'files/tests', 'files/tests/support', "#{CEEDLING_VENDOR}unity/src", "#{CEEDLING_VENDOR}c_exception/lib", 'files/build/mocks']
 
     out_hash = @builder.collect_test_and_source_include_paths(in_hash)
@@ -397,13 +397,13 @@ class ConfiguratorBuilderTest < Test::Unit::TestCase
   should "collect all source and test paths without optional mocks and exception paths" do
     in_hash = {
         :project_use_exceptions => false,
-        :project_use_mocks => false,        
+        :project_use_mocks => false,
         :paths_test => ['files/tests'],
         :paths_support => ['files/tests/support'],
         :paths_source => ['files/source'],
         :project_test_runners_path => 'files/build/runners',
         }
-        
+
     expected_paths = ['files/tests', 'files/tests/support', 'files/source', 'files/build/runners', "#{CEEDLING_VENDOR}unity/src"]
 
     out_hash = @builder.collect_test_and_source_paths(in_hash)
@@ -414,14 +414,14 @@ class ConfiguratorBuilderTest < Test::Unit::TestCase
   should "collect all source and test paths with optional mocks path but without exception path" do
     in_hash = {
         :project_use_exceptions => false,
-        :project_use_mocks => true,        
+        :project_use_mocks => true,
         :paths_test => ['files/tests'],
         :paths_support => ['files/tests/support'],
         :paths_source => ['files/source'],
         :project_test_runners_path => 'files/build/runners',
         :cmock_mock_path => 'files/build/mocks',
         }
-        
+
     expected_paths = ['files/tests', 'files/tests/support', 'files/source', 'files/build/runners', 'files/build/mocks', "#{CEEDLING_VENDOR}unity/src"]
 
     out_hash = @builder.collect_test_and_source_paths(in_hash)
@@ -438,7 +438,7 @@ class ConfiguratorBuilderTest < Test::Unit::TestCase
         :paths_source => ['files/source'],
         :project_test_runners_path => 'files/build/runners',
         }
-        
+
     expected_paths = ['files/tests', 'files/tests/support', 'files/source', 'files/build/runners', "#{CEEDLING_VENDOR}c_exception/lib", "#{CEEDLING_VENDOR}unity/src"]
 
     out_hash = @builder.collect_test_and_source_paths(in_hash)
@@ -456,27 +456,27 @@ class ConfiguratorBuilderTest < Test::Unit::TestCase
         :project_test_runners_path => 'files/build/runners',
         :cmock_mock_path => 'files/build/mocks',
         }
-        
+
     expected_paths = ['files/tests', 'files/tests/support', 'files/source', 'files/build/runners', 'files/build/mocks', "#{CEEDLING_VENDOR}c_exception/lib", "#{CEEDLING_VENDOR}unity/src"]
 
     out_hash = @builder.collect_test_and_source_paths(in_hash)
 
     assert_equal(expected_paths.sort, out_hash[:paths_test_and_source].sort)
   end
-  
+
   ############# all tests #############
-  
+
   should "collect all tests" do
     in_hash = {
       :paths_test => ['tests/main', 'tests/other/**'],
       :project_test_file_prefix => 'Test',
       :extension_source => '.c'}
-    
+
     @file_wrapper.expects.instantiate_file_list.returns(@file_list)
-    
+
     @file_list.expects.include('tests/main/Test*.c')
     @file_list.expects.include('tests/other/**/Test*.c')
-    
+
     assert_equal({:collection_all_tests => @file_list}, @builder.collect_tests(in_hash))
   end
 
@@ -486,12 +486,12 @@ class ConfiguratorBuilderTest < Test::Unit::TestCase
     in_hash = {
       :paths_source => ['files/source', 'files/modules/**'],
       :extension_source => '.c'}
-    
+
     @file_wrapper.expects.instantiate_file_list.returns(@file_list)
-    
+
     @file_list.expects.include('files/source/*.c')
     @file_list.expects.include('files/modules/**/*.c')
-    
+
     assert_equal({:collection_all_source => @file_list}, @builder.collect_source(in_hash))
   end
 
@@ -503,14 +503,14 @@ class ConfiguratorBuilderTest < Test::Unit::TestCase
       :paths_include => ['files/source/include'],
       :paths_source => ['files/source', 'files/modules/**'],
       :extension_header => '.h'}
-    
+
     @file_wrapper.expects.instantiate_file_list.returns(@file_list)
-    
+
     @file_list.expects.include('files/test/support/**/*.h')
     @file_list.expects.include('files/source/*.h')
     @file_list.expects.include('files/modules/**/*.h')
     @file_list.expects.include('files/source/include/*.h')
-    
+
     assert_equal({:collection_all_headers => @file_list}, @builder.collect_headers(in_hash))
   end
 
@@ -519,25 +519,23 @@ class ConfiguratorBuilderTest < Test::Unit::TestCase
   should "collect environment source files plus project file but no user project file" do
     @project_config_manager.expects.main_project_filepath.returns('/home/project/config/project.yaml')
     @project_config_manager.expects.user_project_filepath.returns('')
-    
+
     out_hash = @builder.collect_code_generation_dependencies
-    
+
     assert_equal(
-      ["#{CEEDLING_RELEASE}build.info",
-       "#{CEEDLING_VENDOR}cmock/release/build.info",
+      ["#{CEEDLING_VENDOR}cmock/release/build.info",
        '/home/project/config/project.yaml'].sort,
       out_hash[:collection_code_generation_dependencies].sort)
   end
 
-  should "collect environment source files plus project file and user project file" do    
+  should "collect environment source files plus project file and user project file" do
     @project_config_manager.expects.main_project_filepath.returns('/home/project/config/project.yaml')
     @project_config_manager.expects.user_project_filepath.returns('/home/project/config/user.yaml')
-    
+
     out_hash = @builder.collect_code_generation_dependencies
-    
+
     assert_equal(
-      ["#{CEEDLING_RELEASE}build.info",
-       "#{CEEDLING_VENDOR}cmock/release/build.info",
+      ["#{CEEDLING_VENDOR}cmock/release/build.info",
        '/home/project/config/project.yaml',
        '/home/project/config/user.yaml'].sort,
       out_hash[:collection_code_generation_dependencies].sort)
@@ -546,7 +544,7 @@ class ConfiguratorBuilderTest < Test::Unit::TestCase
   ############# expand path globs #############
 
   should "inspect each element of paths in config hash and expand any and all globs into a collection" do
-    
+
     create_mocks(:paths_collection1, :paths_collection2, :paths_collection3)
     in_hash = {
       :path_dummy => [],
@@ -555,17 +553,17 @@ class ConfiguratorBuilderTest < Test::Unit::TestCase
       :paths_to_destruction => ['paths/sin', 'paths/avarice'],
       :whatever => 'blah blah blah',
       }
-    
+
     @file_system_utils.expects.collect_paths(['oh', 'yeah']).returns(@paths_collection1)
     @file_system_utils.expects.collect_paths(['files/source', 'files/modules/**']).returns(@paths_collection2)
     @file_system_utils.expects.collect_paths(['paths/sin', 'paths/avarice']).returns(@paths_collection3)
-    
+
     out_hash = @builder.expand_all_path_globs(in_hash)
 
     assert_equal(@paths_collection1, out_hash[:collection_paths_custom])
     assert_equal(@paths_collection2, out_hash[:collection_paths_source])
-    assert_equal(@paths_collection3, out_hash[:collection_paths_to_destruction])    
+    assert_equal(@paths_collection3, out_hash[:collection_paths_to_destruction])
   end
-  
+
 end