ceedling 0.15.4 → 0.15.5

data/lib/ceedling/defaults.rb

@@ -42,24 +42,30 @@ DEFAULT_TEST_FIXTURE_TOOL = {
   :arguments => [].freeze
   }
 
+
+
 DEFAULT_TEST_INCLUDES_PREPROCESSOR_TOOL = {
-  :executable => FilePathUtils.os_executable_ext('gcc').freeze,
+  # :executable => FilePathUtils.os_executable_ext('cpp').freeze, # disabled for OSX clang
+  :executable => FilePathUtils.os_executable_ext('gcc').freeze, # OSX clang
   :name => 'default_test_includes_preprocessor'.freeze,
   :stderr_redirect => StdErrRedirect::NONE.freeze,
   :background_exec => BackgroundExec::NONE.freeze,
   :optional => false.freeze,
   :arguments => [
-    '-E'.freeze,
+    '-E'.freeze, # OSX clang
     '-MM'.freeze,
     '-MG'.freeze,
     # avoid some possibility of deep system lib header file complications by omitting vendor paths
     # if cpp is run on *nix system, escape spaces in paths; if cpp on windows just use the paths collection as is
-    {"-I\"$\"" => "{SystemWrapper.windows? ? COLLECTION_PATHS_TEST_SUPPORT_SOURCE_INCLUDE : COLLECTION_PATHS_TEST_SUPPORT_SOURCE_INCLUDE.map{|path| path.gsub(\/ \/, \'\\\\ \') }}"}.freeze,
+    # {"-I\"$\"" => "{SystemWrapper.windows? ? COLLECTION_PATHS_TEST_SUPPORT_SOURCE_INCLUDE : COLLECTION_PATHS_TEST_SUPPORT_SOURCE_INCLUDE.map{|path| path.gsub(\/ \/, \'\\\\ \') }}"}.freeze,
+    {"-I$" => 'COLLECTION_PATHS_TEST_SUPPORT_SOURCE_INCLUDE_VENDOR'}.freeze,
+    {"-I$" => 'COLLECTION_PATHS_TEST_TOOLCHAIN_INCLUDE'}.freeze,
     {"-D$" => 'COLLECTION_DEFINES_TEST_AND_VENDOR'}.freeze,
     {"-D$" => 'DEFINES_TEST_PREPROCESS'}.freeze,
-    "-DGNU_COMPILER".freeze,
+    # "-DGNU_PREPROCESSOR".freeze,
+    "-DGNU_COMPILER".freeze, # OSX clang
     '-w'.freeze,
-    '-nostdinc'.freeze,
+    # '-nostdinc'.freeze,
     "\"${1}\"".freeze
     ].freeze
   }
@@ -76,19 +82,13 @@ DEFAULT_TEST_FILE_PREPROCESSOR_TOOL = {
     {"-I\"$\"" => 'COLLECTION_PATHS_TEST_TOOLCHAIN_INCLUDE'}.freeze,
     {"-D$" => 'COLLECTION_DEFINES_TEST_AND_VENDOR'}.freeze,
     {"-D$" => 'DEFINES_TEST_PREPROCESS'}.freeze,
-    "-DGNU_PREPROCESSOR".freeze,
+    "-DGNU_COMPILER".freeze,
+    # '-nostdinc'.freeze,
     "\"${1}\"".freeze,
     "-o \"${2}\"".freeze
     ].freeze
   }
 
-# Disable the -MD flag for OSX LLVM Clang, since unsupported
-if RUBY_PLATFORM =~ /darwin/ && `gcc --version 2> /dev/null` =~ /Apple LLVM version .* \(clang/m # OSX w/LLVM Clang
-  MD_FLAG = '' # Clang doesn't support the -MD flag
-else
-  MD_FLAG = '-MD'
-end
-
 DEFAULT_TEST_DEPENDENCIES_GENERATOR_TOOL = {
   :executable => FilePathUtils.os_executable_ext('gcc').freeze,
   :name => 'default_test_dependencies_generator'.freeze,
@@ -96,17 +96,19 @@ DEFAULT_TEST_DEPENDENCIES_GENERATOR_TOOL = {
   :background_exec => BackgroundExec::NONE.freeze,
   :optional => false.freeze,
   :arguments => [
+    '-E'.freeze,
     {"-I\"$\"" => 'COLLECTION_PATHS_TEST_SUPPORT_SOURCE_INCLUDE_VENDOR'}.freeze,
     {"-I\"$\"" => 'COLLECTION_PATHS_TEST_TOOLCHAIN_INCLUDE'}.freeze,
     {"-D$" => 'COLLECTION_DEFINES_TEST_AND_VENDOR'}.freeze,
     {"-D$" => 'DEFINES_TEST_PREPROCESS'}.freeze,
-    "-DGNU_PREPROCESSOR".freeze,
+    "-DGNU_COMPILER".freeze,
     "-MT \"${3}\"".freeze,
     '-MM'.freeze,
-    MD_FLAG,
+    # '-MD'.freeze, # OSX clang
     '-MG'.freeze,
     "-MF \"${2}\"".freeze,
     "-c \"${1}\"".freeze,
+    # '-nostdinc'.freeze,
     ].freeze
   }
 
@@ -117,17 +119,19 @@ DEFAULT_RELEASE_DEPENDENCIES_GENERATOR_TOOL = {
   :background_exec => BackgroundExec::NONE.freeze,
   :optional => false.freeze,
   :arguments => [
+    '-E'.freeze,
     {"-I\"$\"" => 'COLLECTION_PATHS_SOURCE_INCLUDE_VENDOR'}.freeze,
     {"-I\"$\"" => 'COLLECTION_PATHS_RELEASE_TOOLCHAIN_INCLUDE'}.freeze,
     {"-D$" => 'COLLECTION_DEFINES_RELEASE_AND_VENDOR'}.freeze,
     {"-D$" => 'DEFINES_RELEASE_PREPROCESS'}.freeze,
-    "-DGNU_PREPROCESSOR".freeze,
+    "-DGNU_COMPILER".freeze,
     "-MT \"${3}\"".freeze,
     '-MM'.freeze,
-    MD_FLAG,
+    # '-MD'.freeze, # OSX clang
     '-MG'.freeze,
     "-MF \"${2}\"".freeze,
     "-c \"${1}\"".freeze,
+    # '-nostdinc'.freeze,
     ].freeze
   }
 

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,8 +16,9 @@ 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
 
@@ -31,12 +32,14 @@ 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
 
@@ -44,6 +47,7 @@ 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
 
@@ -53,6 +57,7 @@ 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
@@ -61,6 +66,7 @@ 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
 
@@ -68,12 +74,14 @@ 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/generator.rb

@@ -66,11 +66,9 @@ class Generator
 
     @streaminator.stdout_puts("Generating runner for #{module_name}...", Verbosity::NORMAL)
 
-    test_file_includes = [] # Empty list for now, since apparently unused
-
     # build runner file
     begin
-      @generator_test_runner.generate(module_name, runner_filepath, test_cases, mock_list, test_file_includes)
+      @generator_test_runner.generate(module_name, runner_filepath, test_cases, mock_list, [])
     rescue
       raise
     ensure

data/lib/ceedling/generator_test_runner.rb

@@ -52,13 +52,13 @@ class GeneratorTestRunner
     return tests_and_line_numbers
   end
 
-  def generate(module_name, runner_filepath, test_cases, mock_list, test_file_includes=[])
+  def generate(module_name, runner_filepath, test_cases, mock_list, mock_includes)
     require 'generate_test_runner.rb'
     @test_runner_generator ||= UnityTestRunnerGenerator.new( @configurator.get_runner_config )
     @test_runner_generator.generate( module_name,
                                      runner_filepath,
                                      test_cases,
                                      mock_list,
-                                     test_file_includes)
+                                     mock_includes)
   end
 end

data/lib/ceedling/tasks_base.rake

@@ -1,36 +1,38 @@
 require 'ceedling/constants'
 require 'ceedling/file_path_utils'
-require 'ceedling/version'
+
 
 desc "Display build environment version info."
 task :version do
-  puts "  Ceedling:: #{Ceedling::VERSION::Ceedling}"
-
-  [
+  tools = [
+      ['  Ceedling', CEEDLING_ROOT],
       ['CException', File.join( CEEDLING_VENDOR, CEXCEPTION_ROOT_PATH)],
       ['     CMock', File.join( CEEDLING_VENDOR, CMOCK_ROOT_PATH)],
       ['     Unity', File.join( CEEDLING_VENDOR, UNITY_ROOT_PATH)],
-  ].each do |tool|
+    ]
+  
+  tools.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
@@ -39,11 +41,13 @@ 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)
@@ -51,12 +55,14 @@ 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."
@@ -66,10 +72,11 @@ 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.4"
+    GEM = "0.15.5"
 
     # @private
     CEEDLING = GEM

data/lib/ceedling/version.rb.erb

@@ -0,0 +1,16 @@
+# @private
+module Ceedling
+  module Version
+    # @private
+    GEM = "0.15.5"
+
+    # @private
+    CEEDLING = "<%= versions["CEEDLING"] %>"
+    # @private
+    CEXCEPTION = "<%= versions["CEXCEPTION"] %>"
+    # @private
+    CMOCK = "<%= versions["CMOCK"] %>"
+    # @private
+    UNITY = "<%= versions["UNITY"] %>"
+  end
+end

data/release/build.info

@@ -0,0 +1,2 @@
+226
+

data/release/version.info

@@ -0,0 +1 @@
+0.15.1

data/spec/ceedling_spec.rb

@@ -10,7 +10,7 @@ describe 'Ceedling' do
       # execute method
       location = Ceedling.location
       # validate results
-      expect(location).to eq(ceedling_path)
+      location.should == ceedling_path
     end
   end
 
@@ -23,7 +23,7 @@ describe 'Ceedling' do
       # execute method
       location = Ceedling.load_path
       # validate results
-      expect(location).to eq(load_path)
+      location.should == load_path
     end
   end
 
@@ -36,7 +36,7 @@ describe 'Ceedling' do
       # execute method
       location = Ceedling.rakefile
       # validate results
-      expect(location).to eq(rakefile_path)
+      location.should == rakefile_path
     end
   end
 
@@ -47,11 +47,11 @@ describe 'Ceedling' do
       rakefile_path = File.join(File.dirname(__FILE__), '..').gsub('spec','lib')
       rakefile_path = File.join( rakefile_path, 'lib', 'ceedling', 'rakefile.rb' )
       # mocks/stubs/expected calls
-      expect(Ceedling).to receive(:load).with(rakefile_path)
+      Ceedling.should_receive(:load).with(rakefile_path)
       # execute method
       Ceedling.load_project
       # validate results
-      expect(ENV['CEEDLING_MAIN_PROJECT_FILE']).to eq('./project.yml')
+      ENV['CEEDLING_MAIN_PROJECT_FILE'].should == './project.yml'
     end
 
     it 'should load the project with the specified yaml file' do
@@ -60,11 +60,11 @@ describe 'Ceedling' do
       rakefile_path = File.join(File.dirname(__FILE__), '..').gsub('spec','lib')
       rakefile_path = File.join( rakefile_path, 'lib', 'ceedling', 'rakefile.rb' )
       # mocks/stubs/expected calls
-      expect(Ceedling).to receive(:load).with(rakefile_path)
+      Ceedling.should_receive(:load).with(rakefile_path)
       # execute method
       Ceedling.load_project(config: './foo.yml')
       # validate results
-      expect(ENV['CEEDLING_MAIN_PROJECT_FILE']).to eq('./foo.yml')
+      ENV['CEEDLING_MAIN_PROJECT_FILE'].should == './foo.yml'
     end
 
     it 'should load the project with the yaml file specified by the existing environment variable' do
@@ -73,11 +73,11 @@ describe 'Ceedling' do
       rakefile_path = File.join(File.dirname(__FILE__), '..').gsub('spec','lib')
       rakefile_path = File.join( rakefile_path, 'lib', 'ceedling', 'rakefile.rb' )
       # mocks/stubs/expected calls
-      expect(Ceedling).to receive(:load).with(rakefile_path)
+      Ceedling.should_receive(:load).with(rakefile_path)
       # execute method
       Ceedling.load_project
       # validate results
-      expect(ENV['CEEDLING_MAIN_PROJECT_FILE']).to eq('./bar.yml')
+      ENV['CEEDLING_MAIN_PROJECT_FILE'].should == './bar.yml'
     end
 
     it 'should load the project with the specified plugins enabled' do
@@ -88,15 +88,15 @@ describe 'Ceedling' do
       rakefile_path = File.join(File.dirname(__FILE__), '..').gsub('spec','lib')
       rakefile_path = File.join( rakefile_path, 'lib', 'ceedling', 'rakefile.rb' )
       # mocks/stubs/expected calls
-      expect(Gem::Specification).to receive(:find_by_name).with('ceedling-foo').and_return(spec_double)
-      expect(spec_double).to receive(:gem_dir).and_return('dummy/path')
-      expect(Ceedling).to receive(:require).with('ceedling/defaults')
-      expect(Ceedling).to receive(:load).with(rakefile_path)
+      Gem::Specification.should_receive(:find_by_name).with('ceedling-foo').and_return(spec_double)
+      spec_double.should_receive(:gem_dir).and_return('dummy/path')
+      Ceedling.should_receive(:require).with('ceedling/defaults')
+      Ceedling.should_receive(:load).with(rakefile_path)
       # execute method
       Ceedling.load_project( config:  './foo.yml',
                              plugins: ['foo'])
       # validate results
-      expect(ENV['CEEDLING_MAIN_PROJECT_FILE']).to eq('./foo.yml')
+      ENV['CEEDLING_MAIN_PROJECT_FILE'].should == './foo.yml'
     end
 
     it 'should set the project root if the root key is provided' do
@@ -107,13 +107,13 @@ describe 'Ceedling' do
       rakefile_path = File.join(File.dirname(__FILE__), '..').gsub('spec','lib')
       rakefile_path = File.join( rakefile_path, 'lib', 'ceedling', 'rakefile.rb' )
       # mocks/stubs/expected calls
-      expect(Ceedling).to receive(:load).with(rakefile_path)
+      Ceedling.should_receive(:load).with(rakefile_path)
       # execute method
       Ceedling.load_project( config:  './foo.yml',
                              root:    './')
       # validate results
-      expect(ENV['CEEDLING_MAIN_PROJECT_FILE']).to eq('./foo.yml')
-      expect(PROJECT_ROOT).to eq('./')
+      ENV['CEEDLING_MAIN_PROJECT_FILE'].should == './foo.yml'
+      PROJECT_ROOT.should == './'
     end
   end
 
@@ -124,14 +124,14 @@ describe 'Ceedling' do
       DEFAULT_CEEDLING_CONFIG[:plugins][:load_paths].clear()
       spec_double = double('spec-double')
       # mocks/stubs/expected calls
-      expect(Gem::Specification).to receive(:find_by_name).with('ceedling-foo').and_return(spec_double)
-      expect(spec_double).to receive(:gem_dir).and_return('dummy/path')
-      expect(Ceedling).to receive(:require).with('ceedling/defaults')
+      Gem::Specification.should_receive(:find_by_name).with('ceedling-foo').and_return(spec_double)
+      spec_double.should_receive(:gem_dir).and_return('dummy/path')
+      Ceedling.should_receive(:require).with('ceedling/defaults')
       # execute method
       Ceedling.register_plugin('foo')
       # validate results
-      expect(DEFAULT_CEEDLING_CONFIG[:plugins][:enabled]).to eq ["foo"]
-      expect(DEFAULT_CEEDLING_CONFIG[:plugins][:load_paths]).to eq(["dummy/path"])
+      DEFAULT_CEEDLING_CONFIG[:plugins][:enabled].should    == ["foo"]
+      DEFAULT_CEEDLING_CONFIG[:plugins][:load_paths].should == ["dummy/path"]
     end
 
     it 'should register a plugin with an alternative prefix' do
@@ -140,14 +140,14 @@ describe 'Ceedling' do
       DEFAULT_CEEDLING_CONFIG[:plugins][:load_paths].clear()
       spec_double = double('spec-double')
       # mocks/stubs/expected calls
-      expect(Gem::Specification).to receive(:find_by_name).with('prefix-foo').and_return(spec_double)
-      expect(spec_double).to receive(:gem_dir).and_return('dummy/path')
-      expect(Ceedling).to receive(:require).with('ceedling/defaults')
+      Gem::Specification.should_receive(:find_by_name).with('prefix-foo').and_return(spec_double)
+      spec_double.should_receive(:gem_dir).and_return('dummy/path')
+      Ceedling.should_receive(:require).with('ceedling/defaults')
       # execute method
       Ceedling.register_plugin('foo','prefix-')
       # validate results
-      expect(DEFAULT_CEEDLING_CONFIG[:plugins][:enabled]).to eq(["foo"])
-      expect(DEFAULT_CEEDLING_CONFIG[:plugins][:load_paths]).to eq(["dummy/path"])
+      DEFAULT_CEEDLING_CONFIG[:plugins][:enabled].should    == ["foo"]
+      DEFAULT_CEEDLING_CONFIG[:plugins][:load_paths].should == ["dummy/path"]
     end
   end
 end