ceedling 0.21.0 → 0.22.0

data/spec/spec_system_helper.rb

@@ -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`
-        expect(output).to match(/IGNORED:\s+1/)
+        expect(output).to match(/No tests executed/i)
       end
     end
   end

data/vendor/c_exception/release/build.info

@@ -1,2 +1,2 @@
-17
+18
 

data/vendor/c_exception/release/version.info

@@ -1,2 +1,2 @@
-1.3
+1.3.1
 

data/vendor/c_exception/vendor/unity/auto/generate_module.rb

@@ -11,46 +11,8 @@
 require 'rubygems'
 require 'fileutils'
 
-HERE = File.expand_path(File.dirname(__FILE__)) + '/'
-
-#help text when requested
-HELP_TEXT = [ "\nGENERATE MODULE\n-------- ------",
-              "\nUsage: ruby generate_module [options] module_name",
-              "  -i\"include\" sets the path to output headers to 'include' (DEFAULT ../src)",
-              "  -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)",
-              "  -d          destroy module instead of creating it.",
-              "  -u          update subversion too (requires subversion command line)",
-              "  -y\"my.yml\"  selects a different yaml config file for module generation",
-              "" ].join("\n")
-
-#Built in patterns
-PATTERNS = { 'src' => {''         => { :inc => [] } },
-             'dh'  => {'Driver'   => { :inc => ['%1$sHardware.h'] },
-                       'Hardware' => { :inc => [] }
-                      },
-             'dih' => {'Driver'   => { :inc => ['%1$sHardware.h', '%1$sInterrupt.h'] },
-                       'Interrupt'=> { :inc => ['%1$sHardware.h'] },
-                       'Hardware' => { :inc => [] }
-                      },
-             'mch' => {'Model'    => { :inc => [] },
-                       'Conductor'=> { :inc => ['%1$sModel.h', '%1$sHardware.h'] },
-                       'Hardware' => { :inc => [] }
-                      },
-             'mvp' => {'Model'    => { :inc => [] },
-                       'Presenter'=> { :inc => ['%1$sModel.h', '%1$sView.h'] },
-                       'View'     => { :inc => [] }
-                      }
-           }
-
 #TEMPLATE_TST
-TEMPLATE_TST = %q[#include "unity.h"
+TEMPLATE_TST ||= %q[#include "unity.h"
 %2$s#include "%1$s.h"
 
 void setUp(void)
@@ -68,135 +30,229 @@ void test_%1$s_NeedToImplement(void)
 ]
 
 #TEMPLATE_SRC
-TEMPLATE_SRC = %q[%2$s#include "%1$s.h"
+TEMPLATE_SRC ||= %q[%2$s#include "%1$s.h"
 ]
 
 #TEMPLATE_INC
-TEMPLATE_INC = %q[#ifndef _%3$s_H
+TEMPLATE_INC ||= %q[#ifndef _%3$s_H
 #define _%3$s_H%2$s
 
 #endif // _%3$s_H
 ]
 
-# Parse the command line parameters.
-ARGV.each do |arg|
-  case(arg)
-    when /^-d/      then @destroy = true
-    when /^-u/      then @update_svn = true
-    when /^-p(\w+)/ then @pattern = $1
-    when /^-s(.+)/  then @path_src = $1
-    when /^-i(.+)/  then @path_inc = $1
-    when /^-t(.+)/  then @path_tst = $1
-    when /^-y(.+)/  then @yaml_config = $1
-    when /^(\w+)/
-      raise "ERROR: You can't have more than one Module name specified!" unless @module_name.nil?
-      @module_name = arg
-    when /^-(h|-help)/
-      puts HELP_TEXT
-      exit
-    else
-      raise "ERROR: Unknown option specified '#{arg}'"
+class UnityModuleGenerator
+
+  ############################
+  def initialize(options=nil)
+
+    here = File.expand_path(File.dirname(__FILE__)) + '/'
+
+    @options = UnityModuleGenerator.default_options
+    case(options)
+      when NilClass then @options
+      when String   then @options.merge!(UnityModuleGenerator.grab_config(options))
+      when Hash     then @options.merge!(options)
+      else          raise "If you specify arguments, it should be a filename or a hash of options"
+    end
+
+    # Create default file paths if none were provided
+    @options[:path_src] = here + "../src/"    if @options[:path_src].nil?
+    @options[:path_inc] = @options[:path_src] if @options[:path_inc].nil?
+    @options[:path_tst] = here + "../test/"   if @options[:path_tst].nil?
+    @options[:path_src] += '/'                unless (@options[:path_src][-1] == 47)
+    @options[:path_inc] += '/'                unless (@options[:path_inc][-1] == 47)
+    @options[:path_tst] += '/'                unless (@options[:path_tst][-1] == 47)
+
+    #Built in patterns
+    @patterns = { 'src' => {''         => { :inc => [] } },
+                  'dh'  => {'Driver'   => { :inc => ['%1$sHardware.h'] },
+                            'Hardware' => { :inc => [] }
+                           },
+                  'dih' => {'Driver'   => { :inc => ['%1$sHardware.h', '%1$sInterrupt.h'] },
+                            'Interrupt'=> { :inc => ['%1$sHardware.h'] },
+                            'Hardware' => { :inc => [] }
+                           },
+                  'mch' => {'Model'    => { :inc => [] },
+                            'Conductor'=> { :inc => ['%1$sModel.h', '%1$sHardware.h'] },
+                            'Hardware' => { :inc => [] }
+                           },
+                  'mvp' => {'Model'    => { :inc => [] },
+                            'Presenter'=> { :inc => ['%1$sModel.h', '%1$sView.h'] },
+                            'View'     => { :inc => [] }
+                           }
+                }
   end
-end
-raise "ERROR: You must have a Module name specified! (use option -h for help)" if @module_name.nil?
-
-#load yaml file if one was requested
-if @yaml_config
-  require 'yaml'
-  cfg = YAML.load_file(HERE + @yaml_config)[:generate_module]
-  @path_src     = cfg[:defaults][:path_src]   if @path_src.nil?
-  @path_inc     = cfg[:defaults][:path_inc]   if @path_inc.nil?
-  @path_tst     = cfg[:defaults][:path_tst]   if @path_tst.nil?
-  @update_svn   = cfg[:defaults][:update_svn] if @update_svn.nil?
-  @extra_inc    = cfg[:includes]
-  @boilerplates = cfg[:boilerplates]
-else
-  @boilerplates = {}
-end
 
-# Create default file paths if none were provided
-@path_src = HERE + "../src/"  if @path_src.nil?
-@path_inc = @path_src         if @path_inc.nil?
-@path_tst = HERE + "../test/" if @path_tst.nil?
-@path_src += '/'              unless (@path_src[-1] == 47)
-@path_inc += '/'              unless (@path_inc[-1] == 47)
-@path_tst += '/'              unless (@path_tst[-1] == 47)
-@pattern  = 'src'             if @pattern.nil?
-@includes = { :src => [], :inc => [], :tst => [] }
-@includes.merge!(@extra_inc) unless @extra_inc.nil?
-
-#create triad definition
-TRIAD = [ { :ext => '.c', :path => @path_src,        :template => TEMPLATE_SRC, :inc => :src, :boilerplate => @boilerplates[:src] },
-          { :ext => '.h', :path => @path_inc,        :template => TEMPLATE_INC, :inc => :inc, :boilerplate => @boilerplates[:inc] },
-          { :ext => '.c', :path => @path_tst+'Test', :template => TEMPLATE_TST, :inc => :tst, :boilerplate => @boilerplates[:tst] },
-        ]
-
-#prepare the pattern for use
-@patterns = PATTERNS[@pattern.downcase]
-raise "ERROR: The design pattern specified isn't one that I recognize!" if @patterns.nil?
-
-# Assemble the path/names of the files we need to work with.
-files = []
-TRIAD.each do |triad|
-  @patterns.each_pair do |pattern_file, pattern_traits|
-    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 @includes[:src] | pattern_traits[:inc].map{|f| f % [@module_name]}
-                     when :inc then @includes[:inc]
-                     when :tst then @includes[:tst] | pattern_traits[:inc].map{|f| "Mock#{f}"% [@module_name]}
-                   end
+  ############################
+  def self.default_options
+    {
+      :pattern         => "src",
+      :includes        =>
+      {
+          :src         => [],
+          :inc         => [],
+          :tst         => [],
+      },
+      :update_svn      => false,
+      :boilerplates    => {},
+      :test_prefix     => 'Test',
     }
   end
-end
 
-# destroy files if that was what was requested
-if @destroy
-  files.each do |filespec|
-    file = filespec[:path]
-    if File.exist?(file)
-      if @update_svn
-        `svn delete \"#{file}\" --force`
-        puts "File #{file} deleted and removed from source control"
+  ############################
+  def self.grab_config(config_file)
+    options = self.default_options
+    unless (config_file.nil? or config_file.empty?)
+      require 'yaml'
+      yaml_guts = YAML.load_file(config_file)
+      options.merge!(yaml_guts[:unity] || yaml_guts[:cmock])
+      raise "No :unity or :cmock section found in #{config_file}" unless options
+    end
+    return(options)
+  end
+
+  ############################
+  def files_to_operate_on(module_name, pattern=nil)
+    #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] },
+            ]
+
+    #prepare the pattern for use
+    patterns = @patterns[(pattern || @options[:pattern] || 'src').downcase]
+    raise "ERROR: The design pattern '#{pattern}' specified isn't one that I recognize!" if patterns.nil?
+
+    # Assemble the path/names of the files we need to work with.
+    files = []
+    triad.each do |triad|
+      patterns.each_pair do |pattern_file, pattern_traits|
+        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]}
+                       end
+        }
+      end
+    end
+
+    return files
+  end
+
+  ############################
+  def generate(module_name, pattern=nil)
+
+    files = files_to_operate_on(module_name, pattern)
+
+    #Abort if any module already exists
+    files.each do |file|
+      raise "ERROR: File #{file[:name]} already exists. Exiting." if File.exist?(file[:path])
+    end
+
+    # Create Source Modules
+    files.each_with_index do |file, i|
+      File.open(file[:path], 'w') do |f|
+        f.write(file[:boilerplate] % [file[:name]]) unless file[:boilerplate].nil?
+        f.write(file[:template] % [ file[:name],
+                                    file[:includes].map{|f| "#include \"#{f}\"\n"}.join,
+                                    file[:name].upcase ]
+               )
+      end
+      if (@options[:update_svn])
+        `svn add \"#{file[:path]}\"`
+        if $?.exitstatus == 0
+          puts "File #{file[:path]} created and added to source control"
+        else
+          puts "File #{file[:path]} created but FAILED adding to source control!"
+        end
       else
-        FileUtils.remove(file)
-        puts "File #{file} deleted"
+        puts "File #{file[:path]} created"
       end
-    else
-      puts "File #{file} does not exist so cannot be removed."
     end
+    puts 'Generate Complete'
   end
-  puts "Destroy Complete"
-  exit
-end
 
-#Abort if any module already exists
-files.each do |file|
-  raise "ERROR: File #{file[:name]} already exists. Exiting." if File.exist?(file[:path])
-end
+  ############################
+  def destroy(module_name, pattern=nil)
 
-# Create Source Modules
-files.each_with_index do |file, i|
-  File.open(file[:path], 'w') do |f|
-    f.write(file[:boilerplate] % [file[:name]]) unless file[:boilerplate].nil?
-    f.write(file[:template] % [ file[:name],
-                                file[:includes].map{|f| "#include \"#{f}\"\n"}.join,
-                                file[:name].upcase ]
-           )
+    files_to_operate_on(module_name, pattern).each do |filespec|
+      file = filespec[:path]
+      if File.exist?(file)
+        if @options[:update_svn]
+          `svn delete \"#{file}\" --force`
+          puts "File #{file} deleted and removed from source control"
+        else
+          FileUtils.remove(file)
+          puts "File #{file} deleted"
+        end
+      else
+        puts "File #{file} does not exist so cannot be removed."
+      end
+    end
+    puts "Destroy Complete"
   end
-  if (@update_svn)
-    `svn add \"#{file[:path]}\"`
-    if $?.exitstatus == 0
-      puts "File #{file[:path]} created and added to source control"
-    else
-      puts "File #{file[:path]} created but FAILED adding to source control!"
+
+end
+
+############################
+#Handle As Command Line If Called That Way
+if ($0 == __FILE__)
+  destroy = false
+  options = { }
+  module_name = nil
+
+  # 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 /^(\w+)/
+        raise "ERROR: You can't have more than one Module name specified!" unless module_name.nil?
+        module_name = arg
+      when /^-(h|-help)/
+        ARGV = []
+      else
+        raise "ERROR: Unknown option specified '#{arg}'"
     end
+  end
+
+  if (!ARGV[0])
+    puts [ "\nGENERATE MODULE\n-------- ------",
+           "\nUsage: ruby generate_module [options] module_name",
+           "  -i\"include\" sets the path to output headers to 'include' (DEFAULT ../src)",
+           "  -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)",
+           "  -d          destroy module instead of creating it.",
+           "  -u          update subversion too (requires subversion command line)",
+           "  -y\"my.yml\"  selects a different yaml config file for module generation",
+           "" ].join("\n")
+    exit
+  end
+
+  raise "ERROR: You must have a Module name specified! (use option -h for help)" if module_name.nil?
+  if (destroy)
+    UnityModuleGenerator.new(options).destroy(module_name)
   else
-    puts "File #{file[:path]} created"
+    UnityModuleGenerator.new(options).generate(module_name)
   end
+
 end
 
-puts 'Generate Complete'
+

data/vendor/c_exception/vendor/unity/auto/generate_test_runner.rb

@@ -95,7 +95,7 @@ class UnityTestRunnerGenerator
     tests_and_line_numbers = []
 
     source_scrubbed = source.clone
-    source_scrubbed = source_scrubbed.gsub(/"[^"]*"/, '')      # remove things in strings
+    source_scrubbed = source_scrubbed.gsub(/"[^"\n]*"/, '')      # remove things in strings
     source_scrubbed = source_scrubbed.gsub(/\/\/.*$/, '')      # remove line comments
     source_scrubbed = source_scrubbed.gsub(/\/\*.*?\*\//m, '') # remove block comments
     lines = source_scrubbed.split(/(^\s*\#.*$)                 # Treat preprocessor directives as a logical line

data/vendor/c_exception/vendor/unity/examples/example_1/makefile

@@ -10,7 +10,7 @@ ifeq ($(OSTYPE),cygwin)
 	MKDIR = mkdir -p
 	TARGET_EXTENSION=.out
 elseifeq ($(OSTYPE),msys)
-    CLEANUP = rm -f
+	CLEANUP = rm -f
 	MKDIR = mkdir -p
 	TARGET_EXTENSION=.exe
 elseifeq ($(OS),Windows_NT)

data/vendor/c_exception/vendor/unity/examples/example_2/makefile

@@ -10,7 +10,7 @@ ifeq ($(OSTYPE),cygwin)
 	MKDIR = mkdir -p
 	TARGET_EXTENSION=.out
 elseifeq ($(OSTYPE),msys)
-    CLEANUP = rm -f
+	CLEANUP = rm -f
 	MKDIR = mkdir -p
 	TARGET_EXTENSION=.exe
 elseifeq ($(OS),Windows_NT)

data/vendor/c_exception/vendor/unity/examples/unity_config.h

@@ -1,5 +1,6 @@
 /* Unity Configuration
  * As of May 11th, 2016 at ThrowTheSwitch/Unity commit 837c529
+ * Update: August 25th, 2016
  * See Also: Unity/docs/UnityConfigurationGuide.pdf
  *
  * Unity is designed to run on almost anything that is targeted by a C compiler.
@@ -53,31 +54,22 @@ extern "C"
  * automatically.
  **************************************************************************** */
 
-/* The first thing that Unity does to guess your types is check `stdint.h`. This
- * file includes defines like `UINT_MAX` that Unity can make use of to learn a
- * lot about your system. It's possible you don't want it to do this or it's
+/* The first attempt to guess your types is to check `limits.h`. Some compilers
+ * that don't support `stdint.h` could include `limits.h`. If you don't
+ * want Unity to check this file, define this to make it skip the inclusion.
+ * Unity looks at UINT_MAX & ULONG_MAX, which were available since C89.
+ */
+/* #define UNITY_EXCLUDE_LIMITS_H */
+
+/* The second thing that Unity does to guess your types is check `stdint.h`.
+ * This file defines `UINTPTR_MAX`, since C99, that Unity can make use of to
+ * learn about your system. It's possible you don't want it to do this or it's
  * possible that your system doesn't support `stdint.h`. If that's the case,
  * you're going to want to define this. That way, Unity will know to skip the
  * inclusion of this file and you won't be left with a compiler error.
  */
 /* #define UNITY_EXCLUDE_STDINT_H */
 
-/* The second attempt to guess your types is to check `limits.h`. Some compilers
- * that don't support `stdint.h` could include `limits.h` instead. If you don't
- * want Unity to check this file either, define this to make it skip the
- * inclusion.
- */
-/* #define UNITY_EXCLUDE_LIMITS_H */
-
-/* The third and final attempt to guess your types is to use the `sizeof()`
- * operator. Even if the first two options don't work, this one covers most
- * cases. There _is_ a rare compiler or two out there that doesn't support
- * `sizeof()` in the preprocessing stage, though. For these, you have the
- * ability to disable this feature as well.
- */
-/* #define UNITY_EXCLUDE_SIZEOF */
-
-
 /* ********************** MANUAL INTEGER TYPE DEFINITION ***********************
  * If you've disabled all of the automatic options above, you're going to have
  * to do the configuration yourself. There are just a handful of defines that