ceedling 0.24.0 → 0.25.0

data/vendor/unity/auto/generate_module.rb

@@ -10,6 +10,7 @@
 
 require 'rubygems'
 require 'fileutils'
+require 'pathname'
 
 #TEMPLATE_TST
 TEMPLATE_TST ||= %q[#include "unity.h"
@@ -35,7 +36,8 @@ TEMPLATE_SRC ||= %q[%2$s#include "%1$s.h"
 
 #TEMPLATE_INC
 TEMPLATE_INC ||= %q[#ifndef _%3$s_H
-#define _%3$s_H%2$s
+#define _%3$s_H
+%2$s
 
 #endif // _%3$s_H
 ]
@@ -65,19 +67,20 @@ class UnityModuleGenerator
 
     #Built in patterns
     @patterns = { 'src' => {''         => { :inc => [] } },
-                  'dh'  => {'Driver'   => { :inc => ['%1$sHardware.h'] },
+                  'test'=> {''         => { :inc => [] } },
+                  'dh'  => {'Driver'   => { :inc => [create_filename('%1$s','Hardware.h')] },
                             'Hardware' => { :inc => [] }
                            },
-                  'dih' => {'Driver'   => { :inc => ['%1$sHardware.h', '%1$sInterrupt.h'] },
-                            'Interrupt'=> { :inc => ['%1$sHardware.h'] },
+                  'dih' => {'Driver'   => { :inc => [create_filename('%1$s','Hardware.h'), create_filename('%1$s','Interrupt.h')] },
+                            'Interrupt'=> { :inc => [create_filename('%1$s','Hardware.h')] },
                             'Hardware' => { :inc => [] }
                            },
                   'mch' => {'Model'    => { :inc => [] },
-                            'Conductor'=> { :inc => ['%1$sModel.h', '%1$sHardware.h'] },
+                            'Conductor'=> { :inc => [create_filename('%1$s','Model.h'), create_filename('%1$s','Hardware.h')] },
                             'Hardware' => { :inc => [] }
                            },
                   'mvp' => {'Model'    => { :inc => [] },
-                            'Presenter'=> { :inc => ['%1$sModel.h', '%1$sView.h'] },
+                            'Presenter'=> { :inc => [create_filename('%1$s','Model.h'), create_filename('%1$s','View.h')] },
                             'View'     => { :inc => [] }
                            }
                 }
@@ -96,6 +99,7 @@ class UnityModuleGenerator
       :update_svn      => false,
       :boilerplates    => {},
       :test_prefix     => 'Test',
+      :mock_prefix     => 'Mock',
     }
   end
 
@@ -113,30 +117,42 @@ class UnityModuleGenerator
 
   ############################
   def files_to_operate_on(module_name, pattern=nil)
+    #strip any leading path information from the module name and save for later
+    subfolder = File.dirname(module_name)
+    module_name = File.basename(module_name)
+
     #create triad definition
     prefix = @options[:test_prefix] || 'Test'
-    triad = [ { :ext => '.c', :path => @options[:path_src],        :template => TEMPLATE_SRC, :inc => :src, :boilerplate => @options[:boilerplates][:src] },
-              { :ext => '.h', :path => @options[:path_inc],        :template => TEMPLATE_INC, :inc => :inc, :boilerplate => @options[:boilerplates][:inc] },
-              { :ext => '.c', :path => @options[:path_tst]+prefix, :template => TEMPLATE_TST, :inc => :tst, :boilerplate => @options[:boilerplates][:tst] },
+    triad = [ { :ext => '.c', :path => @options[:path_src], :prefix => "",     :template => TEMPLATE_SRC, :inc => :src, :boilerplate => @options[:boilerplates][:src] },
+              { :ext => '.h', :path => @options[:path_inc], :prefix => "",     :template => TEMPLATE_INC, :inc => :inc, :boilerplate => @options[:boilerplates][:inc] },
+              { :ext => '.c', :path => @options[:path_tst], :prefix => prefix, :template => TEMPLATE_TST, :inc => :tst, :boilerplate => @options[:boilerplates][:tst] },
             ]
 
     #prepare the pattern for use
-    patterns = @patterns[(pattern || @options[:pattern] || 'src').downcase]
+    pattern = (pattern || @options[:pattern] || 'src').downcase
+    patterns = @patterns[pattern]
     raise "ERROR: The design pattern '#{pattern}' specified isn't one that I recognize!" if patterns.nil?
 
+    #single file patterns (currently just 'test') can reject the other parts of the triad
+    if (pattern == 'test')
+      triad.reject!{|v| v[:inc] != :tst }
+    end
+
     # Assemble the path/names of the files we need to work with.
     files = []
-    triad.each do |triad|
+    triad.each do |cfg|
       patterns.each_pair do |pattern_file, pattern_traits|
+        submodule_name = create_filename(module_name, pattern_file)
+        filename = cfg[:prefix] + submodule_name + cfg[:ext]
         files << {
-          :path => "#{triad[:path]}#{module_name}#{pattern_file}#{triad[:ext]}",
-          :name => "#{module_name}#{pattern_file}",
-          :template => triad[:template],
-          :boilerplate => triad[:boilerplate],
-          :includes => case(triad[:inc])
-                         when :src then @options[:includes][:src] | pattern_traits[:inc].map{|f| f % [module_name]}
-                         when :inc then @options[:includes][:inc]
-                         when :tst then @options[:includes][:tst] | pattern_traits[:inc].map{|f| "Mock#{f}"% [module_name]}
+          :path => (Pathname.new("#{cfg[:path]}#{subfolder}") + filename).cleanpath,
+          :name => submodule_name,
+          :template => cfg[:template],
+          :boilerplate => cfg[:boilerplate],
+          :includes => case(cfg[:inc])
+                         when :src then (@options[:includes][:src] || []) | pattern_traits[:inc].map{|f| f % [module_name]}
+                         when :inc then (@options[:includes][:inc] || [])
+                         when :tst then (@options[:includes][:tst] || []) | pattern_traits[:inc].map{|f| "#{@options[:mock_prefix]}#{f}" % [module_name]}
                        end
         }
       end
@@ -145,6 +161,27 @@ class UnityModuleGenerator
     return files
   end
 
+  ############################
+  def create_filename(part1, part2="")
+    if part2.empty?
+      case(@options[:naming])
+      when 'bumpy' then part1
+      when 'camel' then part1
+      when 'snake' then part1.downcase
+      when 'caps'  then part1.upcase
+      else              part1.downcase
+      end
+    else
+      case(@options[:naming])
+      when 'bumpy' then part1 + part2
+      when 'camel' then part1 + part2
+      when 'snake' then part1.downcase + "_" + part2.downcase
+      when 'caps'  then part1.upcase + "_" + part2.upcase
+      else              part1.downcase + "_" + part2.downcase
+      end
+    end
+  end
+
   ############################
   def generate(module_name, pattern=nil)
 
@@ -157,8 +194,9 @@ class UnityModuleGenerator
 
     # Create Source Modules
     files.each_with_index do |file, i|
+      FileUtils.mkdir_p(File.dirname(file[:path]), :verbose => false) # Create the path first if necessary.
       File.open(file[:path], 'w') do |f|
-        f.write(file[:boilerplate] % [file[:name]]) unless file[:boilerplate].nil?
+        f.write("#{file[:boilerplate]}\n" % [file[:name]]) unless file[:boilerplate].nil?
         f.write(file[:template] % [ file[:name],
                                     file[:includes].map{|f| "#include \"#{f}\"\n"}.join,
                                     file[:name].upcase ]
@@ -210,13 +248,14 @@ if ($0 == __FILE__)
   # Parse the command line parameters.
   ARGV.each do |arg|
     case(arg)
-      when /^-d/      then destroy = true
-      when /^-u/      then options[:update_svn] = true
-      when /^-p(\w+)/ then options[:pattern] = $1
-      when /^-s(.+)/  then options[:path_src] = $1
-      when /^-i(.+)/  then options[:path_inc] = $1
-      when /^-t(.+)/  then options[:path_tst] = $1
-      when /^-y(.+)/  then options = UnityModuleGenerator.grab_config($1)
+      when /^-d/            then destroy = true
+      when /^-u/            then options[:update_svn] = true
+      when /^-p\"?(\w+)\"?/ then options[:pattern] = $1
+      when /^-s\"?(.+)\"?/  then options[:path_src] = $1
+      when /^-i\"?(.+)\"?/  then options[:path_inc] = $1
+      when /^-t\"?(.+)\"?/  then options[:path_tst] = $1
+      when /^-n\"?(.+)\"?/  then options[:naming] = $1
+      when /^-y\"?(.+)\"?/  then options = UnityModuleGenerator.grab_config($1)
       when /^(\w+)/
         raise "ERROR: You can't have more than one Module name specified!" unless module_name.nil?
         module_name = arg
@@ -234,12 +273,18 @@ if ($0 == __FILE__)
            "  -s\"../src\"  sets the path to output source to '../src'   (DEFAULT ../src)",
            "  -t\"C:/test\" sets the path to output source to 'C:/test'  (DEFAULT ../test)",
            "  -p\"MCH\"     sets the output pattern to MCH.",
-           "              dh  - driver hardware.",
-           "              dih - driver interrupt hardware.",
-           "              mch - model conductor hardware.",
-           "              mvp - model view presenter.",
-           "              src - just a single source module. (DEFAULT)",
+           "              dh   - driver hardware.",
+           "              dih  - driver interrupt hardware.",
+           "              mch  - model conductor hardware.",
+           "              mvp  - model view presenter.",
+           "              src  - just a source module, header and test. (DEFAULT)",
+           "              test - just a test file.",
            "  -d          destroy module instead of creating it.",
+           "  -n\"camel\"   sets the file naming convention.",
+           "              bumpy - BumpyCaseFilenames.",
+           "              camel - camelCaseFilenames.",
+           "              snake - snake_case_filenames. (DEFAULT)",
+           "              caps  - CAPS_CASE_FILENAMES.",
            "  -u          update subversion too (requires subversion command line)",
            "  -y\"my.yml\"  selects a different yaml config file for module generation",
            "" ].join("\n")
@@ -254,5 +299,3 @@ if ($0 == __FILE__)
   end
 
 end
-
-

data/vendor/unity/extras/fixture/src/unity_fixture.c

@@ -9,7 +9,7 @@
 #include "unity_fixture.h"
 #include "unity_internals.h"
 
-struct _UnityFixture UnityFixture;
+struct UNITY_FIXTURE_T UnityFixture;
 
 /* If you decide to use the function pointer approach.
  * Build with -D UNITY_OUTPUT_CHAR=outputChar and include <stdio.h>

data/vendor/unity/extras/fixture/src/unity_fixture_internals.h

@@ -13,14 +13,14 @@ extern "C"
 {
 #endif
 
-struct _UnityFixture
+struct UNITY_FIXTURE_T
 {
     int Verbose;
     unsigned int RepeatCount;
     const char* NameFilter;
     const char* GroupFilter;
 };
-extern struct _UnityFixture UnityFixture;
+extern struct UNITY_FIXTURE_T UnityFixture;
 
 typedef void unityfunction(void);
 void UnityTestRunner(unityfunction* setup,

data/vendor/unity/extras/fixture/test/unity_fixture_Test.c

@@ -138,8 +138,8 @@ TEST(UnityFixture, FreeNULLSafety)
 
 TEST(UnityFixture, ConcludeTestIncrementsFailCount)
 {
-    _U_UINT savedFails = Unity.TestFailures;
-    _U_UINT savedIgnores = Unity.TestIgnores;
+    UNITY_UINT savedFails = Unity.TestFailures;
+    UNITY_UINT savedIgnores = Unity.TestIgnores;
     UnityOutputCharSpy_Enable(1);
     Unity.CurrentTestFailed = 1;
     UnityConcludeFixtureTest(); /* Resets TestFailed for this test to pass */
@@ -301,7 +301,7 @@ TEST(UnityCommandOptions, GroupOrNameFilterWithoutStringFails)
 
 TEST(UnityCommandOptions, GroupFilterReallyFilters)
 {
-    _U_UINT saved = Unity.NumberOfTests;
+    UNITY_UINT saved = Unity.NumberOfTests;
     TEST_ASSERT_EQUAL(0, UnityGetCommandLineOptions(4, unknownCommand));
     UnityIgnoreTest(NULL, "non-matching", NULL);
     TEST_ASSERT_EQUAL(saved, Unity.NumberOfTests);