ceedling 0.0.8 → 0.0.12

data/Rakefile

@@ -10,10 +10,22 @@ task :update_tools do
   puts "\nRetrieving ceedling content from SourceForge..."
   rm_rf "temp"
   mkdir "temp"
+
+  libs = [
+    {:path => './vendor/unity'},
+    {:path => './vendor/cmock'},
+    {:path => './vendor/c_exception'},
+    {:path => '.'}
+  ]
   cd "temp" do
-    svn_checkout_command = 'svn co http://ceedling.svn.sourceforge.net/svnroot/ceedling/trunk .'
-    puts svn_checkout_command
-    `#{svn_checkout_command}`
+    sh 'svn co http://ceedling.svn.sourceforge.net/svnroot/ceedling/trunk .'
+    libs.each do |lib|
+      svn_info = `svn info #{lib[:path]}/`
+      lib[:revision] = svn_info.split("\n")[4].match(/ (\d+)/)[1]
+      revision_file = "#{lib[:path]}/release/build.info"
+      puts "Recorded lib revision #{lib[:revision]} in #{revision_file}"
+      File.open(revision_file, 'w'){|f| f.write lib[:revision]}
+    end
     rm_rf Dir["./**/.svn/"], :verbose => false # remove svn artifacts
   end
 

data/examples/temp_sensor/project.yml

@@ -66,6 +66,5 @@
     - vendor/ceedling/plugins
   :enabled:
     - stdout_pretty_tests_report
-    - module_generator
 
 ...

data/lib/ceedling/version.rb

@@ -2,15 +2,15 @@
 module Ceedling
   module Version
     # @private
-    GEM = "0.0.8"
+    GEM = "0.0.12"
 
     # @private
-    CEEDLING = "0.9.186"
+    CEEDLING = "0.9.193"
     # @private
-    CEXCEPTION = "1.2.16"
+    CEXCEPTION = "1.2.17"
     # @private
-    CMOCK = "2.0.212"
+    CMOCK = "2.0.213"
     # @private
-    UNITY = "2.0.118"
+    UNITY = "2.0.134"
   end
 end

data/lib/ceedling/version.rb.erb

@@ -2,7 +2,7 @@
 module Ceedling
   module Version
     # @private
-    GEM = "0.0.8"
+    GEM = "0.0.12"
 
     # @private
     CEEDLING = "<%= versions["CEEDLING"] %>"

data/new_project_template/vendor/ceedling/lib/build_invoker_helper.rb

@@ -0,0 +1,16 @@
+
+class BuildInvokerHelper
+
+  constructor :configurator, :streaminator
+  
+  def process_exception(exception)
+    if (exception.message =~ /Don't know how to build task '(.+)'/i)
+      @streaminator.stderr_puts("ERROR: Rake could not find file referenced in source or test: '#{$1}'.")
+      @streaminator.stderr_puts("Possible stale dependency due to a file name change, etc. Maybe 'clean' task and try again.") if (@configurator.project_use_auxiliary_dependencies)
+      raise ''
+    else
+      raise exception
+    end
+  end
+  
+end

data/new_project_template/vendor/ceedling/lib/configurator.rb

@@ -83,7 +83,7 @@ class Configurator
     # cmock has its own internal defaults handling, but we need to set these specific values
     # so they're present for the build environment to access;
     # note: these need to end up in the hash given to initialize cmock for this to be successful
-    cmock = config[:cmock]
+    cmock = config[:cmock] || {}
 
     # yes, we're duplicating the default mock_prefix in cmock, but it's because we need CMOCK_MOCK_PREFIX always available in Ceedling's environment
     cmock[:mock_prefix] = 'Mock' if (cmock[:mock_prefix].nil?)
@@ -106,7 +106,7 @@ class Configurator
       cmock[:includes].uniq!
     end
 
-    @runner_config = cmock
+    @runner_config = cmock.merge(config[:test_runner] || {})
     @cmock_builder.manufacture(cmock)
   end
   
@@ -234,15 +234,16 @@ class Configurator
 
   def validate(config)
     # collect felonies and go straight to jail
-    raise if (not @configurator_setup.validate_required_sections(config))
+    raise if (not @configurator_setup.validate_required_sections( config ))
     
     # collect all misdemeanors, everybody on probation
     blotter = []
-    blotter << @configurator_setup.validate_required_section_values(config)
-    blotter << @configurator_setup.validate_paths(config)
-    blotter << @configurator_setup.validate_tools(config)
+    blotter << @configurator_setup.validate_required_section_values( config )
+    blotter << @configurator_setup.validate_paths( config )
+    blotter << @configurator_setup.validate_tools( config )
+    blotter << @configurator_setup.validate_plugins( config )
     
-    raise if (blotter.include?(false))
+    raise if (blotter.include?( false ))
   end
     
   

data/new_project_template/vendor/ceedling/lib/configurator_plugins.rb

@@ -3,6 +3,7 @@ require 'constants'
 class ConfiguratorPlugins
 
   constructor :stream_wrapper, :file_wrapper, :system_wrapper
+  attr_reader :rake_plugins, :script_plugins
 
   def setup
     @rake_plugins   = []
@@ -89,15 +90,4 @@ class ConfiguratorPlugins
     return defaults_with_path    
   end
   
-  
-  def validate_plugins(enabled_plugins)
-    missing_plugins = Set.new(enabled_plugins) - Set.new(@rake_plugins) - Set.new(@script_plugins)
-    
-    missing_plugins.each do |plugin|
-      @stream_wrapper.stdout_puts.stderr_puts("ERROR: Ceedling plugin '#{plugin}' contains no rake or ruby class entry point. (Misspelled or missing files?)")
-    end
-    
-    raise if (missing_plugins.size > 0)
-  end
-
 end

data/new_project_template/vendor/ceedling/lib/configurator_setup.rb

@@ -11,7 +11,7 @@ end
 
 class ConfiguratorSetup
   
-  constructor :configurator_builder, :configurator_validator
+  constructor :configurator_builder, :configurator_validator, :configurator_plugins, :stream_wrapper
   
   
   def build_project_config(config, flattened_config)
@@ -107,4 +107,17 @@ class ConfiguratorSetup
     return true
   end
 
+  def validate_plugins(config)
+    missing_plugins = 
+      Set.new( config[:plugins][:enabled] ) - 
+      Set.new( @configurator_plugins.rake_plugins ) - 
+      Set.new( @configurator_plugins.script_plugins )
+    
+    missing_plugins.each do |plugin|
+      @stream_wrapper.stderr_puts("ERROR: Ceedling plugin '#{plugin}' contains no rake or ruby class entry point. (Misspelled or missing files?)")
+    end
+    
+    return ( (missing_plugins.size > 0) ? false : true )
+  end
+
 end

data/new_project_template/vendor/ceedling/lib/generator_test_runner.rb

@@ -58,7 +58,6 @@ class GeneratorTestRunner
     @test_runner_generator.generate( module_name, 
                                      runner_filepath, 
                                      test_cases, 
-                                     @configurator.test_runner_includes, 
                                      mock_list)
   end
 end

data/new_project_template/vendor/ceedling/lib/objects.yml

@@ -79,6 +79,8 @@ configurator_setup:
   compose:
     - configurator_builder
     - configurator_validator
+    - configurator_plugins
+    - stream_wrapper
 
 configurator_plugins:
   compose:
@@ -255,6 +257,7 @@ test_invoker:
   compose:
     - configurator
     - test_invoker_helper
+    - build_invoker_helper
     - streaminator
     - preprocessinator
     - task_invoker
@@ -270,13 +273,13 @@ test_invoker_helper:
     - test_includes_extractor
     - file_finder
     - file_path_utils
-    - streaminator
     - file_wrapper
 
 release_invoker:
   compose:
-    - release_invoker_helper
     - configurator
+    - release_invoker_helper
+    - build_invoker_helper
     - dependinator
     - task_invoker
     - file_path_utils
@@ -286,3 +289,8 @@ release_invoker_helper:
     - configurator
     - dependinator
     - task_invoker
+
+build_invoker_helper:
+  compose:
+    - configurator
+    - streaminator

data/new_project_template/vendor/ceedling/lib/preprocessinator_extractor.rb

@@ -9,15 +9,24 @@ class PreprocessinatorExtractor
     contents = []
     extract = false
 
+    # preprocessing by way of toolchain preprocessor expands macros, eliminates comments, strips out #ifdef code, etc.
+    # however, it also expands in place each #include'd file.
+    # so, we must extract only the lines of the file that belong to the file originally preprocessed
+
+    # iterate through all lines and alternate between extract and ignore modes
+    # all lines between a '#'line containing file name of our filepath and the next '#'line should be extracted
+
     @file_wrapper.readlines(filepath).each do |line|
       if (extract)
-        if (line =~ /^#/)
+        # flip to ignore mode if line begins with '#' except if it's a #pragma line
+        if ((line =~ /^#/) and not (line =~ /#\s*pragma/))
           extract = false
+        # otherwise, extract the line
         else
           contents << line
         end
       end
-      # extract = true if (line =~ /^#.*#{Regexp.escape(File.basename(filepath))}/)
+      # enable extract mode if line matches preprocessor expression for our original file name
       extract = true if (line =~ /^#.*(\s|\/|\\|\")#{Regexp.escape(File.basename(filepath))}/)
     end
 

data/new_project_template/vendor/ceedling/lib/release_invoker.rb

@@ -2,16 +2,20 @@
 
 class ReleaseInvoker
 
-  constructor :configurator, :release_invoker_helper, :dependinator, :task_invoker, :file_path_utils
+  constructor :configurator, :release_invoker_helper, :build_invoker_helper, :dependinator, :task_invoker, :file_path_utils
 
 
   def setup_and_invoke_c_objects(c_files)
     objects = ( @file_path_utils.form_release_build_c_objects_filelist( c_files ) )
 
-    @release_invoker_helper.process_auxiliary_dependencies( @file_path_utils.form_release_dependencies_filelist( c_files ) )
+    begin
+      @release_invoker_helper.process_auxiliary_dependencies( @file_path_utils.form_release_dependencies_filelist( c_files ) )
 
-    @dependinator.enhance_release_file_dependencies( objects )
-    @task_invoker.invoke_release_objects( objects )
+      @dependinator.enhance_release_file_dependencies( objects )
+      @task_invoker.invoke_release_objects( objects )
+    rescue => e
+      @build_invoker_helper.process_exception(e)
+    end
 
     return objects
   end
@@ -20,8 +24,12 @@ class ReleaseInvoker
   def setup_and_invoke_asm_objects(asm_files)
     objects = @file_path_utils.form_release_build_asm_objects_filelist( asm_files )
 
-    @dependinator.enhance_release_file_dependencies( objects )
-    @task_invoker.invoke_release_objects( objects )
+    begin
+      @dependinator.enhance_release_file_dependencies( objects )
+      @task_invoker.invoke_release_objects( objects )
+    rescue => e
+      @build_invoker_helper.process_exception(e)
+    end
     
     return objects
   end

data/new_project_template/vendor/ceedling/lib/test_invoker.rb

@@ -1,12 +1,9 @@
-require 'rubygems'
-require 'rake' # for ext()
-
 
 class TestInvoker
 
   attr_reader :sources, :tests, :mocks
 
-  constructor :configurator, :test_invoker_helper, :streaminator, :preprocessinator, :task_invoker, :dependinator, :project_config_manager, :file_path_utils
+  constructor :configurator, :test_invoker_helper, :build_invoker_helper, :streaminator, :preprocessinator, :task_invoker, :dependinator, :project_config_manager, :file_path_utils
 
   def setup
     @sources = []
@@ -54,7 +51,7 @@ class TestInvoker
         # 3, 2, 1... launch
         @task_invoker.invoke_test_results( results_pass )
       rescue => e
-        @test_invoker_helper.process_exception(e)
+        @build_invoker_helper.process_exception(e)
       end
       
       # store away what's been processed
@@ -63,10 +60,10 @@ class TestInvoker
     end
 
     # post-process collected mock list
-    @mocks.uniq!.freeze
+    @mocks.uniq!
     
     # post-process collected sources list
-    @sources.uniq!.freeze
+    @sources.uniq!
   end
 
 end

data/new_project_template/vendor/ceedling/lib/test_invoker_helper.rb

@@ -4,7 +4,7 @@ require 'rake' # for ext()
 
 class TestInvokerHelper
 
-  constructor :configurator, :task_invoker, :dependinator, :test_includes_extractor, :file_finder, :file_path_utils, :streaminator, :file_wrapper
+  constructor :configurator, :task_invoker, :dependinator, :test_includes_extractor, :file_finder, :file_path_utils, :file_wrapper
 
   def clean_results(results, options)
     @file_wrapper.rm_f( results[:fail] )
@@ -28,14 +28,4 @@ class TestInvokerHelper
     return sources.compact
   end
   
-  def process_exception(exception)
-    if (exception.message =~ /Don't know how to build task '(.+)'/i)
-      @streaminator.stderr_puts("ERROR: Rake could not find file referenced in source or test: '#{$1}'.")
-      @streaminator.stderr_puts("Possible stale dependency due to a file name change, etc. Maybe 'clean' task and try again.") if (@configurator.project_use_auxiliary_dependencies)
-      raise ''
-    else
-      raise exception
-    end
-  end
-  
 end

data/new_project_template/vendor/ceedling/plugins/xml_tests_report/xml_tests_report.rb

@@ -53,7 +53,7 @@ class XmlTestsReport < Plugin
         result[:collection].each do |item|
           filename = File.join( result[:source][:path], result[:source][:file] )
         
-          stream.puts "\t\t<Test id=\"#{@test_counter}\">"
+          stream.puts "\t\t<FailedTest id=\"#{@test_counter}\">"
           stream.puts "\t\t\t<Name>#{filename}::#{item[:test]}</Name>"
   				stream.puts "\t\t\t<FailureType>Assertion</FailureType>"
           stream.puts "\t\t\t<Location>"

data/new_project_template/vendor/ceedling/release/build.info

@@ -1,2 +1 @@
-186
-
+193

data/new_project_template/vendor/ceedling/vendor/c_exception/release/build.info

@@ -1,2 +1 @@
-16
-
+17

data/new_project_template/vendor/ceedling/vendor/cmock/lib/cmock_config.rb

@@ -15,7 +15,7 @@ class CMockConfig
     :strippables              => ['(?:__attribute__\s*\(+.*?\)+)'],
     :attributes               => ['__ramfunc', '__irq', '__fiq', 'register', 'extern'],
     :enforce_strict_ordering  => false,
-    :unity_helper             => false,
+    :unity_helper_path        => false,
     :treat_as                 => {},
     :treat_as_void            => [],
     :memcmp_if_unknown        => true,
@@ -54,6 +54,7 @@ class CMockConfig
         puts "WARNING: :#{opt.to_s} should be an array." unless (options[:verbosity] < 1)
       end
     end
+    options[:unity_helper_path] ||= options[:unity_helper]
     options[:plugins].compact!
     options[:plugins].map! {|p| p.to_sym}
     @options = options
@@ -76,7 +77,7 @@ class CMockConfig
   end
   
   def load_unity_helper
-    return File.new(@options[:unity_helper]).read if (@options[:unity_helper])
+    return File.new(@options[:unity_helper_path]).read if (@options[:unity_helper_path])
     return nil
   end
 

data/new_project_template/vendor/ceedling/vendor/cmock/release/build.info

@@ -1,2 +1 @@
-212
-
+213

data/new_project_template/vendor/ceedling/vendor/unity/auto/generate_test_runner.rb

@@ -31,7 +31,7 @@ class UnityTestRunnerGenerator
 
   def run(input_file, output_file, options=nil)
     tests = []
-    includes = []
+    testfile_includes = []
     used_mocks = []
     
     @options.merge!(options) unless options.nil?
@@ -39,22 +39,22 @@ class UnityTestRunnerGenerator
     
     #pull required data from source file
     File.open(input_file, 'r') do |input|
-      tests      = find_tests(input)
-      includes   = find_includes(input)
-      used_mocks = find_mocks(includes)
+      tests               = find_tests(input)
+      testfile_includes   = find_includes(input)
+      used_mocks          = find_mocks(testfile_includes)
     end
 
     #build runner file
-    generate(input_file, output_file, tests, includes, used_mocks)
+    generate(input_file, output_file, tests, used_mocks)
     
     #determine which files were used to return them
     all_files_used = [input_file, output_file]
-    all_files_used += includes.map {|filename| filename + '.c'} unless includes.empty?
+    all_files_used += testfile_includes.map {|filename| filename + '.c'} unless testfile_includes.empty?
     all_files_used += @options[:includes] unless @options[:includes].empty?
     return all_files_used.uniq
   end
   
-  def generate(input_file, output_file, tests, includes, used_mocks)
+  def generate(input_file, output_file, tests, used_mocks)
     File.open(output_file, 'w') do |output|
       create_header(output, used_mocks)
       create_externs(output, tests, used_mocks)
@@ -155,7 +155,7 @@ class UnityTestRunnerGenerator
     output.puts("extern void setUp(void);")
     output.puts("extern void tearDown(void);")
     tests.each do |test|
-      output.puts("extern void #{test[:test]}(#{test[:call]});")
+      output.puts("extern void #{test[:test]}(#{test[:call] || 'void'});")
     end
     output.puts('')
   end

data/new_project_template/vendor/ceedling/vendor/unity/release/build.info

@@ -1,2 +1 @@
-118
-
+134

data/new_project_template/vendor/ceedling/vendor/unity/src/unity.c

@@ -578,7 +578,102 @@ void UnityAssertFloatsWithin(const _UF delta,
         UNITY_FAIL_AND_BAIL;
     }
 }
+
+#endif //not UNITY_EXCLUDE_FLOAT
+
+//-----------------------------------------------
+#ifndef UNITY_EXCLUDE_DOUBLE
+void UnityAssertEqualDoubleArray(const _UD* expected,
+                                 const _UD* actual,
+                                 const _UU32 num_elements,
+                                 const char* msg,
+                                 const UNITY_LINE_TYPE lineNumber)
+{
+    _UU32 elements = num_elements;
+    const _UD* ptr_expected = expected;
+    const _UD* ptr_actual = actual;
+    _UD diff, tol;
+
+    UNITY_SKIP_EXECUTION;
+  
+    if (elements == 0)
+    {
+        UnityTestResultsFailBegin(lineNumber);
+        UnityPrint(UnityStrPointless);
+        UnityAddMsgIfSpecified(msg);
+        UNITY_FAIL_AND_BAIL;
+    }
+    
+    if (UnityCheckArraysForNull((void*)expected, (void*)actual, lineNumber, msg) == 1)
+        return;
+
+    while (elements--)
+    {
+        diff = *ptr_expected - *ptr_actual;
+        if (diff < 0.0)
+          diff = 0.0 - diff;
+        tol = UNITY_DOUBLE_PRECISION * *ptr_expected;
+        if (tol < 0.0)
+            tol = 0.0 - tol;
+        if (diff > tol)
+        {
+            UnityTestResultsFailBegin(lineNumber);
+            UnityPrint(UnityStrElement);
+            UnityPrintNumberByStyle((num_elements - elements - 1), UNITY_DISPLAY_STYLE_UINT);
+#ifdef UNITY_DOUBLE_VERBOSE
+            UnityPrint(UnityStrExpected);
+            UnityPrintFloat((float)(*ptr_expected));
+            UnityPrint(UnityStrWas);
+            UnityPrintFloat((float)(*ptr_actual));
+#else
+            UnityPrint(UnityStrDelta);
 #endif
+            UnityAddMsgIfSpecified(msg);
+            UNITY_FAIL_AND_BAIL;
+        }
+        ptr_expected++;
+        ptr_actual++;
+    }
+}
+
+//-----------------------------------------------
+void UnityAssertDoublesWithin(const _UD delta,
+                              const _UD expected,
+                              const _UD actual,
+                              const char* msg,
+                              const UNITY_LINE_TYPE lineNumber)
+{
+    _UD diff = actual - expected;
+    _UD pos_delta = delta;
+
+    UNITY_SKIP_EXECUTION;
+  
+    if (diff < 0)
+    {
+        diff = 0.0f - diff;
+    }
+    if (pos_delta < 0)
+    {
+        pos_delta = 0.0f - pos_delta;
+    }
+
+    if (pos_delta < diff)
+    {
+        UnityTestResultsFailBegin(lineNumber);
+#ifdef UNITY_DOUBLE_VERBOSE
+        UnityPrint(UnityStrExpected);
+        UnityPrintFloat((float)expected);
+        UnityPrint(UnityStrWas);
+        UnityPrintFloat((float)actual);
+#else
+        UnityPrint(UnityStrDelta);
+#endif
+        UnityAddMsgIfSpecified(msg);
+        UNITY_FAIL_AND_BAIL;
+    }
+}
+
+#endif // not UNITY_EXCLUDE_DOUBLE
 
 //-----------------------------------------------
 void UnityAssertNumbersWithin( const _U_SINT delta,

data/new_project_template/vendor/ceedling/vendor/unity/src/unity.h

@@ -24,6 +24,11 @@
 //     - define UNITY_FLOAT_PRECISION to specify the precision to use when doing TEST_ASSERT_EQUAL_FLOAT
 //     - define UNITY_FLOAT_TYPE to specify doubles instead of single precision floats
 //     - define UNITY_FLOAT_VERBOSE to print floating point values in errors (uses sprintf)
+//     - define UNITY_INCLUDE_DOUBLE to allow double floating point comparisons
+//     - define UNITY_EXCLUDE_DOUBLE to disallow double floating point comparisons (default)
+//     - define UNITY_DOUBLE_PRECISION to specify the precision to use when doing TEST_ASSERT_EQUAL_DOUBLE
+//     - define UNITY_DOUBLE_TYPE to specify something other than double 
+//     - define UNITY_DOUBLE_VERBOSE to print floating point values in errors (uses sprintf)
 
 // Output
 //     - by default, Unity prints to standard out with putchar.  define UNITY_OUTPUT_CHAR(a) with a different function if desired
@@ -137,6 +142,12 @@
 #define TEST_ASSERT_EQUAL_FLOAT(expected, actual)                                                  UNITY_TEST_ASSERT_EQUAL_FLOAT(expected, actual, __LINE__, NULL)
 #define TEST_ASSERT_EQUAL_FLOAT_ARRAY(expected, actual, num_elements)                              UNITY_TEST_ASSERT_EQUAL_FLOAT_ARRAY(expected, actual, num_elements, __LINE__, NULL)
 
+//Double (If Enabled)
+#define TEST_ASSERT_DOUBLE_WITHIN(delta, expected, actual)                                         UNITY_TEST_ASSERT_DOUBLE_WITHIN(delta, expected, actual, __LINE__, NULL)
+#define TEST_ASSERT_EQUAL_DOUBLE(expected, actual)                                                 UNITY_TEST_ASSERT_EQUAL_DOUBLE(expected, actual, __LINE__, NULL)
+#define TEST_ASSERT_EQUAL_DOUBLE_ARRAY(expected, actual, num_elements)                             UNITY_TEST_ASSERT_EQUAL_DOUBLE_ARRAY(expected, actual, num_elements, __LINE__, NULL)
+
+
 //-------------------------------------------------------
 // Test Asserts (with additional messages)
 //-------------------------------------------------------
@@ -210,4 +221,10 @@
 #define TEST_ASSERT_FLOAT_WITHIN_MESSAGE(delta, expected, actual, message)                         UNITY_TEST_ASSERT_FLOAT_WITHIN(delta, expected, actual, __LINE__, message)
 #define TEST_ASSERT_EQUAL_FLOAT_MESSAGE(expected, actual, message)                                 UNITY_TEST_ASSERT_EQUAL_FLOAT(expected, actual, __LINE__, message)
 #define TEST_ASSERT_EQUAL_FLOAT_ARRAY_MESSAGE(expected, actual, num_elements, message)             UNITY_TEST_ASSERT_EQUAL_FLOAT_ARRAY(expected, actual, num_elements, __LINE__, message)
+
+//Double (If Enabled)
+#define TEST_ASSERT_DOUBLE_WITHIN_MESSAGE(delta, expected, actual, message)                        UNITY_TEST_ASSERT_DOUBLE_WITHIN(delta, expected, actual, __LINE__, message)
+#define TEST_ASSERT_EQUAL_DOUBLE_MESSAGE(expected, actual, message)                                UNITY_TEST_ASSERT_EQUAL_DOUBLE(expected, actual, __LINE__, message)
+#define TEST_ASSERT_EQUAL_DOUBLE_ARRAY_MESSAGE(expected, actual, num_elements, message)            UNITY_TEST_ASSERT_EQUAL_DOUBLE_ARRAY(expected, actual, num_elements, __LINE__, message)
+
 #endif

data/new_project_template/vendor/ceedling/vendor/unity/src/unity_internals.h

@@ -112,6 +112,37 @@ typedef UNITY_FLOAT_TYPE _UF;
     
 #endif
 
+//-------------------------------------------------------
+// Double Float Support
+//-------------------------------------------------------
+
+//unlike FLOAT, we DON'T include by default
+#ifndef UNITY_EXCLUDE_DOUBLE
+#ifndef UNITY_INCLUDE_DOUBLE
+#define UNITY_EXCLUDE_DOUBLE
+#endif
+#endif
+
+#ifdef UNITY_EXCLUDE_DOUBLE 
+
+//No Floating Point Support
+#undef UNITY_DOUBLE_PRECISION
+#undef UNITY_DOUBLE_TYPE
+#undef UNITY_DOUBLE_VERBOSE
+
+#else
+
+//Floating Point Support
+#ifndef UNITY_DOUBLE_PRECISION
+#define UNITY_DOUBLE_PRECISION (1e-12f) 
+#endif
+#ifndef UNITY_DOUBLE_TYPE
+#define UNITY_DOUBLE_TYPE double
+#endif
+typedef UNITY_DOUBLE_TYPE _UD;
+    
+#endif
+
 //-------------------------------------------------------
 // Output Method
 //-------------------------------------------------------
@@ -280,6 +311,20 @@ void UnityAssertEqualFloatArray(const _UF* expected,
                                 const UNITY_LINE_TYPE lineNumber);
 #endif
 
+#ifndef UNITY_EXCLUDE_DOUBLE
+void UnityAssertDoublesWithin(const _UD delta,
+                              const _UD expected,
+                              const _UD actual,
+                              const char* msg,
+                              const UNITY_LINE_TYPE lineNumber);
+
+void UnityAssertEqualDoubleArray(const _UD* expected,
+                                 const _UD* actual,
+                                 const _UU32 num_elements,
+                                 const char* msg,
+                                 const UNITY_LINE_TYPE lineNumber);
+#endif
+
 //-------------------------------------------------------
 // Basic Fail and Ignore
 //-------------------------------------------------------
@@ -352,4 +397,14 @@ void UnityAssertEqualFloatArray(const _UF* expected,
 #define UNITY_TEST_ASSERT_EQUAL_FLOAT_ARRAY(expected, actual, num_elements, line, message)       UnityAssertEqualFloatArray((_UF*)(expected), (_UF*)(actual), (_UU32)(num_elements), (message), (UNITY_LINE_TYPE)line)
 #endif
 
+#ifdef UNITY_EXCLUDE_DOUBLE
+#define UNITY_TEST_ASSERT_DOUBLE_WITHIN(delta, expected, actual, line, message)                  UNITY_TEST_FAIL((UNITY_LINE_TYPE)line, "Unity Double Precision Disabled")
+#define UNITY_TEST_ASSERT_EQUAL_DOUBLE(expected, actual, line, message)                          UNITY_TEST_FAIL((UNITY_LINE_TYPE)line, "Unity Double Precision Disabled")
+#define UNITY_TEST_ASSERT_EQUAL_DOUBLE_ARRAY(expected, actual, num_elements, line, message)      UNITY_TEST_FAIL((UNITY_LINE_TYPE)line, "Unity Double Precision Disabled")
+#else
+#define UNITY_TEST_ASSERT_DOUBLE_WITHIN(delta, expected, actual, line, message)                  UnityAssertDoublesWithin((_UD)(delta), (_UD)(expected), (_UD)(actual), (message), (UNITY_LINE_TYPE)line)
+#define UNITY_TEST_ASSERT_EQUAL_DOUBLE(expected, actual, line, message)                          UNITY_TEST_ASSERT_DOUBLE_WITHIN((_UF)(expected) * (_UD)UNITY_DOUBLE_PRECISION, (_UD)expected, (_UD)actual, (UNITY_LINE_TYPE)line, message)
+#define UNITY_TEST_ASSERT_EQUAL_DOUBLE_ARRAY(expected, actual, num_elements, line, message)      UnityAssertEqualDoubleArray((_UD*)(expected), (_UD*)(actual), (_UU32)(num_elements), (message), (UNITY_LINE_TYPE)line)
+#endif
+
 #endif

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: ceedling
 version: !ruby/object:Gem::Version 
-  hash: 15
+  hash: 7
   prerelease: 
   segments: 
   - 0
   - 0
-  - 8
-  version: 0.0.8
+  - 12
+  version: 0.0.12
 platform: ruby
 authors: 
 - Mike Karlesky, Mark VanderVoord
@@ -17,7 +17,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2011-04-22 00:00:00 -04:00
+date: 2011-05-07 00:00:00 -04:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -169,6 +169,7 @@ files:
 - new_project_template/vendor/ceedling/docs/CMock Summary.pdf
 - new_project_template/vendor/ceedling/docs/Ceedling Packet.pdf
 - new_project_template/vendor/ceedling/docs/Unity Summary.pdf
+- new_project_template/vendor/ceedling/lib/build_invoker_helper.rb
 - new_project_template/vendor/ceedling/lib/cacheinator.rb
 - new_project_template/vendor/ceedling/lib/cacheinator_helper.rb
 - new_project_template/vendor/ceedling/lib/cmock_builder.rb