ceedling 0.15.3 → 0.15.4

data/lib/ceedling/dependinator.rb

@@ -4,7 +4,7 @@ class Dependinator
   constructor :configurator, :project_config_manager, :test_includes_extractor, :file_path_utils, :rake_wrapper, :file_wrapper
 
   def touch_force_rebuild_files
-    @file_wrapper.touch( @configurator.project_test_force_rebuild_filepath ) 
+    @file_wrapper.touch( @configurator.project_test_force_rebuild_filepath )
     @file_wrapper.touch( @configurator.project_release_force_rebuild_filepath ) if (@configurator.project_release_build)
   end
 
@@ -16,9 +16,8 @@ class Dependinator
 
 
   def enhance_release_file_dependencies(files)
-    files.each do |filepath| 
+    files.each do |filepath|
       @rake_wrapper[filepath].enhance( [@configurator.project_release_force_rebuild_filepath] ) if (@project_config_manager.release_config_changed)
-      @rake_wrapper[filepath].enhance( [@configurator.ceedling_build_info_filepath] )
     end
   end
 
@@ -32,14 +31,12 @@ class Dependinator
 
   def enhance_runner_dependencies(runner_filepath)
     @rake_wrapper[runner_filepath].enhance( [@configurator.project_test_force_rebuild_filepath] ) if (@project_config_manager.test_config_changed)
-    @rake_wrapper[runner_filepath].enhance( [@configurator.ceedling_build_info_filepath] )    
   end
-  
+
 
   def enhance_shallow_include_lists_dependencies(include_lists)
     include_lists.each do |include_list_filepath|
       @rake_wrapper[include_list_filepath].enhance( [@configurator.project_test_force_rebuild_filepath] ) if (@project_config_manager.test_config_changed)
-      @rake_wrapper[include_list_filepath].enhance( [@configurator.ceedling_build_info_filepath] )
     end
   end
 
@@ -47,7 +44,6 @@ class Dependinator
   def enhance_preprocesed_file_dependencies(files)
     files.each do |filepath|
       @rake_wrapper[filepath].enhance( [@configurator.project_test_force_rebuild_filepath] ) if (@project_config_manager.test_config_changed)
-      @rake_wrapper[filepath].enhance( [@configurator.ceedling_build_info_filepath] )
     end
   end
 
@@ -57,7 +53,6 @@ class Dependinator
     mocks_list.each do |mock_filepath|
       @rake_wrapper[mock_filepath].enhance( [@configurator.project_test_force_rebuild_filepath] ) if (@project_config_manager.test_config_changed)
       @rake_wrapper[mock_filepath].enhance( [@configurator.cmock_unity_helper] )                  if (@configurator.cmock_unity_helper)
-      @rake_wrapper[mock_filepath].enhance( [@configurator.ceedling_build_info_filepath] )
       @rake_wrapper[mock_filepath].enhance( [@configurator.cmock_build_info_filepath] )
     end
   end
@@ -66,7 +61,6 @@ class Dependinator
   def enhance_dependencies_dependencies(dependencies)
     dependencies.each do |dependencies_filepath|
       @rake_wrapper[dependencies_filepath].enhance( [@configurator.project_test_force_rebuild_filepath] ) if (@project_config_manager.test_config_changed)
-      @rake_wrapper[dependencies_filepath].enhance( [@configurator.ceedling_build_info_filepath] )
     end
   end
 
@@ -74,14 +68,12 @@ class Dependinator
   def enhance_test_build_object_dependencies(objects)
     objects.each do |object_filepath|
       @rake_wrapper[object_filepath].enhance( [@configurator.project_test_force_rebuild_filepath] ) if (@project_config_manager.test_config_changed)
-      @rake_wrapper[object_filepath].enhance( [@configurator.ceedling_build_info_filepath] )
     end
   end
-  
+
 
   def enhance_results_dependencies(result_filepath)
     @rake_wrapper[result_filepath].enhance( [@configurator.project_test_force_rebuild_filepath] ) if (@project_config_manager.test_config_changed)
-    @rake_wrapper[result_filepath].enhance( [@configurator.ceedling_build_info_filepath] )    
   end
 
 

data/lib/ceedling/tasks_base.rake

@@ -1,38 +1,36 @@
 require 'ceedling/constants'
 require 'ceedling/file_path_utils'
-
+require 'ceedling/version'
 
 desc "Display build environment version info."
 task :version do
-  tools = [
-      ['  Ceedling', CEEDLING_ROOT],
+  puts "  Ceedling:: #{Ceedling::VERSION::Ceedling}"
+
+  [
       ['CException', File.join( CEEDLING_VENDOR, CEXCEPTION_ROOT_PATH)],
       ['     CMock', File.join( CEEDLING_VENDOR, CMOCK_ROOT_PATH)],
       ['     Unity', File.join( CEEDLING_VENDOR, UNITY_ROOT_PATH)],
-    ]
-  
-  tools.each do |tool|
+  ].each do |tool|
     name      = tool[0]
     base_path = tool[1]
-    
+
     version_string = @ceedling[:file_wrapper].read( File.join(base_path, 'release', 'version.info') ).strip
     build_string   = @ceedling[:file_wrapper].read( File.join(base_path, 'release', 'build.info') ).strip
     puts "#{name}:: #{version_string.empty? ? '#.#.' : (version_string + '.')}#{build_string.empty? ? '?' : build_string}"
   end
 end
 
-
 desc "Set verbose output (silent:[#{Verbosity::SILENT}] - obnoxious:[#{Verbosity::OBNOXIOUS}])."
 task :verbosity, :level do |t, args|
   verbosity_level = args.level.to_i
-  
+
   if (PROJECT_USE_MOCKS)
     # don't store verbosity level in setupinator's config hash, use a copy;
     # otherwise, the input configuration will change and trigger entire project rebuilds
     hash = @ceedling[:setupinator].config_hash[:cmock].clone
     hash[:verbosity] = verbosity_level
 
-    @ceedling[:cmock_builder].manufacture( hash )  
+    @ceedling[:cmock_builder].manufacture( hash )
   end
 
   @ceedling[:configurator].project_verbosity = verbosity_level
@@ -41,13 +39,11 @@ task :verbosity, :level do |t, args|
   verbose( ((verbosity_level >= Verbosity::OBNOXIOUS) ? true : false) )
 end
 
-
 desc "Enable logging"
 task :logging do
   @ceedling[:configurator].project_logging = true
 end
 
-
 # non advertised debug task
 task :debug do
   Rake::Task[:verbosity].invoke(Verbosity::DEBUG)
@@ -55,14 +51,12 @@ task :debug do
   @ceedling[:configurator].project_debug = true
 end
 
-
 # non advertised sanity checking task
 task :sanity_checks, :level do |t, args|
   check_level = args.level.to_i
   @ceedling[:configurator].sanity_checks = check_level
 end
 
-
 # list expanded environment variables
 if (not ENVIRONMENT.empty?)
 desc "List all configured environment variables."
@@ -72,11 +66,10 @@ task :environment do
       name = key.to_s.upcase
       puts " - #{name}: \"#{env[key]}\""
     end
-  end  
+  end
 end
 end
 
-
 namespace :options do
 
   COLLECTION_PROJECT_OPTIONS.each do |option_path|

data/lib/ceedling/version.rb

@@ -2,7 +2,7 @@
 module Ceedling
   module Version
     # @private
-    GEM = "0.15.3"
+    GEM = "0.15.4"
 
     # @private
     CEEDLING = GEM

data/spec/ceedling_spec.rb

@@ -10,7 +10,7 @@ describe 'Ceedling' do
       # execute method
       location = Ceedling.location
       # validate results
-      location.should == ceedling_path
+      expect(location).to eq(ceedling_path)
     end
   end
 
@@ -23,7 +23,7 @@ describe 'Ceedling' do
       # execute method
       location = Ceedling.load_path
       # validate results
-      location.should == load_path
+      expect(location).to eq(load_path)
     end
   end
 
@@ -36,7 +36,7 @@ describe 'Ceedling' do
       # execute method
       location = Ceedling.rakefile
       # validate results
-      location.should == rakefile_path
+      expect(location).to eq(rakefile_path)
     end
   end
 
@@ -51,7 +51,7 @@ describe 'Ceedling' do
       # execute method
       Ceedling.load_project
       # validate results
-      ENV['CEEDLING_MAIN_PROJECT_FILE'].should == './project.yml'
+      expect(ENV['CEEDLING_MAIN_PROJECT_FILE']).to eq('./project.yml')
     end
 
     it 'should load the project with the specified yaml file' do
@@ -64,7 +64,7 @@ describe 'Ceedling' do
       # execute method
       Ceedling.load_project(config: './foo.yml')
       # validate results
-      ENV['CEEDLING_MAIN_PROJECT_FILE'].should == './foo.yml'
+      expect(ENV['CEEDLING_MAIN_PROJECT_FILE']).to eq('./foo.yml')
     end
 
     it 'should load the project with the yaml file specified by the existing environment variable' do
@@ -77,7 +77,7 @@ describe 'Ceedling' do
       # execute method
       Ceedling.load_project
       # validate results
-      ENV['CEEDLING_MAIN_PROJECT_FILE'].should == './bar.yml'
+      expect(ENV['CEEDLING_MAIN_PROJECT_FILE']).to eq('./bar.yml')
     end
 
     it 'should load the project with the specified plugins enabled' do
@@ -96,7 +96,7 @@ describe 'Ceedling' do
       Ceedling.load_project( config:  './foo.yml',
                              plugins: ['foo'])
       # validate results
-      ENV['CEEDLING_MAIN_PROJECT_FILE'].should == './foo.yml'
+      expect(ENV['CEEDLING_MAIN_PROJECT_FILE']).to eq('./foo.yml')
     end
 
     it 'should set the project root if the root key is provided' do
@@ -112,8 +112,8 @@ describe 'Ceedling' do
       Ceedling.load_project( config:  './foo.yml',
                              root:    './')
       # validate results
-      ENV['CEEDLING_MAIN_PROJECT_FILE'].should == './foo.yml'
-      PROJECT_ROOT.should == './'
+      expect(ENV['CEEDLING_MAIN_PROJECT_FILE']).to eq('./foo.yml')
+      expect(PROJECT_ROOT).to eq('./')
     end
   end
 
@@ -130,8 +130,8 @@ describe 'Ceedling' do
       # execute method
       Ceedling.register_plugin('foo')
       # validate results
-      DEFAULT_CEEDLING_CONFIG[:plugins][:enabled].should    == ["foo"]
-      DEFAULT_CEEDLING_CONFIG[:plugins][:load_paths].should == ["dummy/path"]
+      expect(DEFAULT_CEEDLING_CONFIG[:plugins][:enabled]).to eq ["foo"]
+      expect(DEFAULT_CEEDLING_CONFIG[:plugins][:load_paths]).to eq(["dummy/path"])
     end
 
     it 'should register a plugin with an alternative prefix' do
@@ -146,8 +146,8 @@ describe 'Ceedling' do
       # execute method
       Ceedling.register_plugin('foo','prefix-')
       # validate results
-      DEFAULT_CEEDLING_CONFIG[:plugins][:enabled].should    == ["foo"]
-      DEFAULT_CEEDLING_CONFIG[:plugins][:load_paths].should == ["dummy/path"]
+      expect(DEFAULT_CEEDLING_CONFIG[:plugins][:enabled]).to eq(["foo"])
+      expect(DEFAULT_CEEDLING_CONFIG[:plugins][:load_paths]).to eq(["dummy/path"])
     end
   end
 end

data/spec/par_map_spec.rb

@@ -1,6 +1,6 @@
 require 'ceedling/par_map'
 
-def short_task_should(n) 
+def short_task_should(n)
   done_count = 0
   par_map(n, [0.01] * (n - 1) + [0] * 10) do |seconds|
     sleep(seconds)
@@ -18,14 +18,14 @@ describe "par_map" do
   end
 
   it "should run shorter tasks while larger tasks are blocking (with 3 threads)" do
-    short_task_should(3) 
+    short_task_should(3)
   end
 
   it "should run shorter tasks while larger tasks are blocking (with 4 threads)" do
     short_task_should(4)
-  end 
+  end
 
-  #the following two tests are still slightly nondeterministic and may occasionally 
+  #the following two tests are still slightly nondeterministic and may occasionally
   #  show false positives (though we think we've gotten it pretty stable)
   it "should collide if multiple threads are used" do
     is_running = false
@@ -40,18 +40,18 @@ describe "par_map" do
       sleep(0.01 * x)
       is_running = false
     end
-    collision.should be true
+    expect(collision).to eq true
   end
 
   it "should be serial if only one thread is used" do
     is_running = false
     par_map(1, (1..5).to_a) do |x|
-      is_running.should be false
+      expect(is_running).to eq false
       is_running = true
       sleep(0.01 * x)
       is_running = false
     end
   end
 
-  
-end
+
+end

data/spec/preprocessinator_extractor_spec.rb

@@ -32,9 +32,9 @@ describe PreprocessinatorExtractor do
         'some_additional_awesome_want_text();',
       ]
 
-      File.should_receive(:readlines).with(file_path).and_return( input_str )
+      expect(File).to receive(:readlines).with(file_path).and_return( input_str )
 
-      subject.extract_base_file_from_preprocessed_expansion(file_path).should == expect_str
+      expect(subject.extract_base_file_from_preprocessed_expansion(file_path)).to eq expect_str
     end
 
     # These were originally hinted at by the old test, but we don't see anything

data/spec/preprocessinator_includes_handler_spec.rb

@@ -27,8 +27,8 @@ describe PreprocessinatorIncludesHandler do
       # create test state/variables
       # mocks/stubs/expected calls
       inc_list_double = double('inc-list-double')
-      @file_path_utils.should_receive(:form_preprocessed_includes_list_filepath).with('some_source_file.c').and_return(inc_list_double)
-      @task_invoker.should_receive(:invoke_test_shallow_include_lists).with( [inc_list_double] )
+      expect(@file_path_utils).to receive(:form_preprocessed_includes_list_filepath).with('some_source_file.c').and_return(inc_list_double)
+      expect(@task_invoker).to receive(:invoke_test_shallow_include_lists).with( [inc_list_double] )
       # execute method
       subject.invoke_shallow_includes_list('some_source_file.c')
       # validate results
@@ -39,23 +39,23 @@ describe PreprocessinatorIncludesHandler do
     it 'should return an annotated dependency rule generated by the preprocessor' do
       # create test state/variables
       # mocks/stubs/expected calls
-      @file_path_utils.should_receive(:form_temp_path).with('some_source_file.c','_').and_return('_some_source_file.c')
+      expect(@file_path_utils).to receive(:form_temp_path).with('some_source_file.c','_').and_return('_some_source_file.c')
       contents_double = double('contents-double')
-      @file_wrapper.should_receive(:read).with('some_source_file.c').and_return(contents_double)
-      contents_double.should_receive(:gsub!).with(/^\s*#include\s+[\"<]\s*(\S+)\s*[\">]/, "#include \"\\1\"\n#include \"@@@@\\1\"")
-      @file_wrapper.should_receive(:write).with('_some_source_file.c', contents_double)
-      @configurator.should_receive(:tools_test_includes_preprocessor).and_return('cpp')
+      expect(@file_wrapper).to receive(:read).with('some_source_file.c').and_return(contents_double)
+      expect(contents_double).to receive(:gsub!).with(/^\s*#include\s+[\"<]\s*(\S+)\s*[\">]/, "#include \"\\1\"\n#include \"@@@@\\1\"")
+      expect(@file_wrapper).to receive(:write).with('_some_source_file.c', contents_double)
+      expect(@configurator).to receive(:tools_test_includes_preprocessor).and_return('cpp')
       command_double = double('command-double')
-      @tool_executor.should_receive(:build_command_line).with('cpp', '_some_source_file.c').and_return(command_double)
-      command_double.should_receive(:[]).with(:line).and_return('cpp')
-      command_double.should_receive(:[]).with(:options).and_return(['arg1','arg2'])
+      expect(@tool_executor).to receive(:build_command_line).with('cpp', '_some_source_file.c').and_return(command_double)
+      expect(command_double).to receive(:[]).with(:line).and_return('cpp')
+      expect(command_double).to receive(:[]).with(:options).and_return(['arg1','arg2'])
       output_double = double('output-double')
-      @tool_executor.should_receive(:exec).with('cpp',['arg1','arg2']).and_return(output_double)
-      output_double.should_receive(:[]).with(:output).and_return('make-rule')
+      expect(@tool_executor).to receive(:exec).with('cpp',['arg1','arg2']).and_return(output_double)
+      expect(output_double).to receive(:[]).with(:output).and_return('make-rule')
       # execute method
       results = subject.form_shallow_dependencies_rule('some_source_file.c')
       # validate results
-      results.should == 'make-rule'
+      expect(results).to eq 'make-rule'
     end
   end
 
@@ -63,7 +63,7 @@ describe PreprocessinatorIncludesHandler do
     it 'should return the list of direct dependencies for the given test file' do
       # create test state/variables
       # mocks/stubs/expected calls
-      @configurator.should_receive(:extension_header).and_return('.h')
+      expect(@configurator).to receive(:extension_header).and_return('.h')
       # execute method
       results = subject.extract_shallow_includes(%q{
         _test_DUMMY.o: Build/temp/_test_DUMMY.c \
@@ -75,7 +75,7 @@ describe PreprocessinatorIncludesHandler do
           @@@@some_other_lib/some_header2.h
       })
       # validate results
-      results.should == ['some_header1.h',
+      expect(results).to eq ['some_header1.h',
                          'some_lib/some_header2.h',
                          'some_other_lib/some_header2.h']
     end
@@ -83,7 +83,7 @@ describe PreprocessinatorIncludesHandler do
   it 'should return the list of direct dependencies for the given test file' do
       # create test state/variables
       # mocks/stubs/expected calls
-      @configurator.should_receive(:extension_header).and_return('.h')
+      expect(@configurator).to receive(:extension_header).and_return('.h')
       # execute method
       results = subject.extract_shallow_includes(%q{
         _test_DUMMY.o: Build/temp/_test_DUMMY.c \
@@ -95,7 +95,7 @@ describe PreprocessinatorIncludesHandler do
           @@@@some_other_lib/some_header2.h
       })
       # validate results
-      results.should == ['some_header1.h',
+      expect(results).to eq ['some_header1.h',
                          'some_lib/some_header2.h',
                          'some_other_lib/some_header2.h']
     end
@@ -103,7 +103,7 @@ describe PreprocessinatorIncludesHandler do
     it 'should correctly handle path separators' do
       # create test state/variables
       # mocks/stubs/expected calls
-      @configurator.should_receive(:extension_header).and_return('.h')
+      expect(@configurator).to receive(:extension_header).and_return('.h')
       # execute method
       results = subject.extract_shallow_includes(%q{
         _test_DUMMY.o: Build/temp/_test_DUMMY.c \
@@ -117,7 +117,7 @@ describe PreprocessinatorIncludesHandler do
           @@@@some_other_lib/some_header2.h
       })
       # validate results
-      results.should == ['some_header1.h',
+      expect(results).to eq ['some_header1.h',
                          'some_lib/some_header2.h',
                          'some_lib1/some_lib/some_header2.h',
                          'some_other_lib/some_header2.h']
@@ -126,7 +126,7 @@ describe PreprocessinatorIncludesHandler do
     it 'exclude annotated headers with no matching "real" header' do
       # create test state/variables
       # mocks/stubs/expected calls
-      @configurator.should_receive(:extension_header).and_return('.h')
+      expect(@configurator).to receive(:extension_header).and_return('.h')
       # execute method
       results = subject.extract_shallow_includes(%q{
         _test_DUMMY.o: Build/temp/_test_DUMMY.c \
@@ -135,13 +135,13 @@ describe PreprocessinatorIncludesHandler do
           @@@@some_lib/some_header2.h
       })
       # validate results
-      results.should == ['some_header1.h']
+      expect(results).to eq ['some_header1.h']
     end
 
     it 'should correctly filter secondary dependencies' do
       # create test state/variables
       # mocks/stubs/expected calls
-      @configurator.should_receive(:extension_header).and_return('.h')
+      expect(@configurator).to receive(:extension_header).and_return('.h')
       # execute method
       results = subject.extract_shallow_includes(%q{
         _test_DUMMY.o: Build/temp/_test_DUMMY.c \
@@ -156,7 +156,7 @@ describe PreprocessinatorIncludesHandler do
           @@@@some_other_lib/some_header2.h
       })
       # validate results
-      results.should == ['some_header1.h',
+      expect(results).to eq ['some_header1.h',
                          'some_lib/some_header2.h',
                          'some_other_lib/some_header2.h']
     end
@@ -166,7 +166,7 @@ describe PreprocessinatorIncludesHandler do
     it 'should invoke the rake task which will build included files' do
       # create test state/variables
       # mocks/stubs/expected calls
-      @yaml_wrapper.should_receive(:dump).with('some_source_file.c', [])
+      expect(@yaml_wrapper).to receive(:dump).with('some_source_file.c', [])
       # execute method
       subject.write_shallow_includes_list('some_source_file.c', [])
       # validate results