ceedling 0.21.0 → 0.22.0

data/vendor/cmock/vendor/unity/test/Makefile

@@ -1,9 +1,15 @@
-CC ?= gcc
+CC = gcc
 ifeq ($(shell uname -s), Darwin)
-CC ?= clang
+CC = clang
+CFLAGS += -std=c99 -pedantic -Wall -Weverything -Werror
+CFLAGS += -Wno-unknown-warning-option -Wno-switch-enum
+CFLAGS += -Wno-padded -Wno-double-promotion -Wno-missing-noreturn
+CFLAGS += -Wno-missing-prototypes
+endif
+ifeq ($(shell uname -s), Linux)
+CFLAGS += -std=c99 -pedantic -Wall -Wextra -Werror
 endif
 #DEBUG = -O0 -g
-CFLAGS += -std=c99 -pedantic -Wall -Wextra -Werror -Wredundant-decls
 CFLAGS += $(DEBUG)
 DEFINES =  -D UNITY_OUTPUT_CHAR=putcharSpy
 DEFINES += -D UNITY_SUPPORT_64 -D UNITY_INCLUDE_DOUBLE -D UNITY_NO_WEAK
@@ -14,10 +20,9 @@ BUILD_DIR = build
 TARGET = build/testunity-cov.exe
 
 # To generate coverage, call 'make -s', the default target runs.
-# To see missing coverage, follow up with 'make uncovered'.
 # For verbose output of all the tests, run 'make test'.
 default: coverage
-.PHONY: default coverage uncovered test clean
+.PHONY: default coverage test clean
 coverage: $(BUILD_DIR)/testunityRunner.c
 	cd $(BUILD_DIR) && \
 	$(CC) $(CFLAGS) $(DEFINES) $(foreach i,$(SRC), ../$i) $(COV_FLAGS) -o ../$(TARGET)
@@ -28,21 +33,28 @@ coverage: $(BUILD_DIR)/testunityRunner.c
 	grep '###' $(BUILD_DIR)/unity.c.gcov -C2 || true
 
 test: CFLAGS += -Wbad-function-cast -Wcast-qual -Wconversion -Wformat=2 -Wold-style-definition \
--Wpointer-arith -Wshadow -Wstrict-overflow=5 -Wstrict-prototypes -Wswitch-default -Wundef      \
--Wunreachable-code -Wunused -fstrict-aliasing
+-Wpointer-arith -Wredundant-decls -Wshadow -Wstrict-overflow=5 -Wstrict-prototypes             \
+-Wswitch-default -Wundef -Wunreachable-code -Wunused -fstrict-aliasing
 test: $(BUILD_DIR)/testunityRunner.c
 	$(CC) $(CFLAGS) $(DEFINES) $(INC_DIR) $(SRC) -o $(TARGET)
 	./$(TARGET)
 
+# Compile only, for testing that preprocessor detection works
+UNITY_C_ONLY =-c ../src/unity.c -o $(BUILD_DIR)/unity.o
+intDetection:
+	$(CC) $(CFLAGS) $(INC_DIR) $(UNITY_C_ONLY) -D UNITY_EXCLUDE_STDINT_H
+	$(CC) $(CFLAGS) $(INC_DIR) $(UNITY_C_ONLY) -D UNITY_EXCLUDE_LIMITS_H
+
 $(BUILD_DIR)/testunityRunner.c: tests/testunity.c | $(BUILD_DIR)
 	awk $(AWK_SCRIPT) tests/testunity.c > $@
 
-AWK_SCRIPT='/^void test/{ declarations[d++]=$$0; gsub(/\(?void\)? ?/,""); tests[t++]=$$0 } \
-       END{ print "\#include \"unity.h\" //Autogenerated by awk in Makefile" ; \
-            for (i=0; i<d; i++) { print declarations[i] ";" } \
-            printf "int main()\n{\n  UNITY_BEGIN();\n" ; \
-            for (i=0; i<t; i++) { print "    RUN_TEST(" tests[i] ");" } \
-            printf "  return UNITY_END();\n}\n" }'
+AWK_SCRIPT=\
+  '/^void test/{ declarations[d++]=$$0; gsub(/\(?void\)? ?/,""); tests[t++]=$$0; line[u++]=NR } \
+  END{ print "\#include \"unity.h\" /* Autogenerated by awk in Makefile */" ;   \
+       for (i=0; i<d; i++) { print declarations[i] ";" }                        \
+       printf "int main(void)\n{\n    UNITY_BEGIN();\n" ;                       \
+       for (i=0; i<t; i++) { print "    RUN_TEST(" tests[i] ", " line[i] ");" } \
+       printf "    return UNITY_END();\n}\n" }'
 
 $(BUILD_DIR):
 	mkdir -p $(BUILD_DIR)

data/vendor/cmock/vendor/unity/test/targets/gcc_32.yml

@@ -22,7 +22,6 @@ compiler:
     items:
       - UNITY_EXCLUDE_STDINT_H
       - UNITY_EXCLUDE_LIMITS_H
-      - UNITY_EXCLUDE_SIZEOF
       - UNITY_INCLUDE_DOUBLE
       - UNITY_SUPPORT_TEST_CASES
       - UNITY_INT_WIDTH=32

data/vendor/cmock/vendor/unity/test/targets/gcc_64.yml

@@ -22,7 +22,6 @@ compiler:
     items:
       - UNITY_EXCLUDE_STDINT_H
       - UNITY_EXCLUDE_LIMITS_H
-      - UNITY_EXCLUDE_SIZEOF
       - UNITY_INCLUDE_DOUBLE
       - UNITY_SUPPORT_TEST_CASES
       - UNITY_SUPPORT_64

data/vendor/cmock/vendor/unity/test/tests/testparameterized.c

@@ -18,20 +18,26 @@ void putcharSpy(int c) { (void)putchar(c);} // include passthrough for linking t
 
 #define VERIFY_FAILS_END                                                       \
     }                                                                          \
-    Unity.CurrentTestFailed = (Unity.CurrentTestFailed == 1) ? 0 : 1;          \
+    Unity.CurrentTestFailed = (Unity.CurrentTestFailed != 0) ? 0 : 1;          \
     if (Unity.CurrentTestFailed == 1) {                                        \
       SetToOneMeanWeAlreadyCheckedThisGuy = 1;                                 \
-      UnityPrint("[[[[ Previous Test Should Have Failed But Did Not ]]]]");    \
+      UnityPrintNumberUnsigned(Unity.CurrentTestLineNumber);                   \
+      UNITY_OUTPUT_CHAR(':');                                                  \
+      UnityPrint(Unity.CurrentTestName);                                       \
+      UnityPrint(":FAIL: [[[[ Test Should Have Failed But Did Not ]]]]");      \
       UNITY_OUTPUT_CHAR('\n');                                                 \
     }
 
 #define VERIFY_IGNORES_END                                                     \
     }                                                                          \
-    Unity.CurrentTestFailed = (Unity.CurrentTestIgnored == 1) ? 0 : 1;         \
+    Unity.CurrentTestFailed = (Unity.CurrentTestIgnored != 0) ? 0 : 1;         \
     Unity.CurrentTestIgnored = 0;                                              \
     if (Unity.CurrentTestFailed == 1) {                                        \
       SetToOneMeanWeAlreadyCheckedThisGuy = 1;                                 \
-      UnityPrint("[[[[ Previous Test Should Have Ignored But Did Not ]]]]");   \
+      UnityPrintNumberUnsigned(Unity.CurrentTestLineNumber);                   \
+      UNITY_OUTPUT_CHAR(':');                                                  \
+      UnityPrint(Unity.CurrentTestName);                                       \
+      UnityPrint(":FAIL: [[[[ Test Should Have Ignored But Did Not ]]]]");     \
       UNITY_OUTPUT_CHAR('\n');                                                 \
     }
 
@@ -50,7 +56,7 @@ void tearDown(void)
     TEST_FAIL_MESSAGE("<= Failed in tearDown");
   if ((SetToOneMeanWeAlreadyCheckedThisGuy == 0) && (Unity.CurrentTestFailed > 0))
   {
-    UnityPrint("[[[[ Previous Test Should Have Passed But Did Not ]]]]");
+    UnityPrint(": [[[[ Test Should Have Passed But Did Not ]]]]");
     UNITY_OUTPUT_CHAR('\n');
   }
 }

data/vendor/cmock/vendor/unity/test/tests/testunity.c

@@ -4,8 +4,8 @@
     [Released under MIT License. Please refer to license.txt for details]
 ========================================== */
 
-#include <setjmp.h>
 #include "unity.h"
+#include <setjmp.h>
 #include <string.h>
 
 // Dividing by these constants produces +/- infinity.
@@ -19,31 +19,42 @@ static const _UD d_zero = 0.0;
 #endif
 
 #define EXPECT_ABORT_BEGIN \
+    startPutcharSpy();     \
     if (TEST_PROTECT())    \
     {
 
 #define VERIFY_FAILS_END                                                       \
     }                                                                          \
+    endPutcharSpy(); /* start/end Spy to suppress output of failure message */ \
     Unity.CurrentTestFailed = (Unity.CurrentTestFailed == 1) ? 0 : 1;          \
     if (Unity.CurrentTestFailed == 1) {                                        \
       SetToOneMeanWeAlreadyCheckedThisGuy = 1;                                 \
       UnityPrintNumberUnsigned(Unity.CurrentTestLineNumber);                   \
       UNITY_OUTPUT_CHAR(':');                                                  \
       UnityPrint(Unity.CurrentTestName);                                       \
-      UnityPrint("[[[[ Previous Test Should Have Failed But Did Not ]]]]");    \
+      UnityPrint(":FAIL: [[[[ Test Should Have Failed But Did Not ]]]]");      \
       UNITY_OUTPUT_CHAR('\n');                                                 \
     }
 
 #define VERIFY_IGNORES_END                                                     \
     }                                                                          \
+    endPutcharSpy(); /* start/end Spy to suppress output of ignore message */  \
     Unity.CurrentTestFailed = (Unity.CurrentTestIgnored == 1) ? 0 : 1;         \
     Unity.CurrentTestIgnored = 0;                                              \
     if (Unity.CurrentTestFailed == 1) {                                        \
       SetToOneMeanWeAlreadyCheckedThisGuy = 1;                                 \
-      UnityPrint("[[[[ Previous Test Should Have Ignored But Did Not ]]]]");   \
+      UnityPrintNumberUnsigned(Unity.CurrentTestLineNumber);                   \
+      UNITY_OUTPUT_CHAR(':');                                                  \
+      UnityPrint(Unity.CurrentTestName);                                       \
+      UnityPrint(":FAIL: [[[[ Test Should Have Ignored But Did Not ]]]]");     \
       UNITY_OUTPUT_CHAR('\n');                                                 \
     }
 
+void startPutcharSpy(void);
+void endPutcharSpy(void);
+char* getBufferPutcharSpy(void);
+void putcharSpy(int c);
+
 static int SetToOneToFailInTearDown;
 static int SetToOneMeanWeAlreadyCheckedThisGuy;
 
@@ -59,7 +70,7 @@ void tearDown(void)
     TEST_FAIL_MESSAGE("<= Failed in tearDown");
   if ((SetToOneMeanWeAlreadyCheckedThisGuy == 0) && (Unity.CurrentTestFailed > 0))
   {
-    UnityPrint("[[[[ Previous Test Should Have Passed But Did Not ]]]]");
+    UnityPrint(": [[[[ Test Should Have Passed But Did Not ]]]]");
     UNITY_OUTPUT_CHAR('\n');
   }
 }
@@ -1370,7 +1381,7 @@ void testNotEqualString4(void)
 void testNotEqualStringLen4(void)
 {
     EXPECT_ABORT_BEGIN
-    TEST_ASSERT_EQUAL_STRING_LEN("\r\x16", "bar\n", 4);
+    TEST_ASSERT_EQUAL_STRING_LEN("ba\r\x16", "ba\r\n", 4);
     VERIFY_FAILS_END
 }
 
@@ -2272,6 +2283,14 @@ void testFailureCountIncrementsAndIsReturnedAtEnd(void)
     TEST_ASSERT_EQUAL(1, failures);
 }
 
+void testCstringsEscapeSequence(void)
+{
+    startPutcharSpy();
+    UnityPrint("\x16\x10");
+    endPutcharSpy();
+    TEST_ASSERT_EQUAL_STRING("\\x16\\x10", getBufferPutcharSpy());
+}
+
 #define TEST_ASSERT_EQUAL_PRINT_NUMBERS(expected, actual) {             \
         startPutcharSpy(); UnityPrintNumber((actual)); endPutcharSpy(); \
         TEST_ASSERT_EQUAL_STRING((expected), getBufferPutcharSpy());    \
@@ -2778,14 +2797,12 @@ void testFloatsNotEqualExpectedNaN(void)
 #endif
 }
 
-void testFloatsNotEqualBothNaN(void)
+void testFloatsEqualBothNaN(void)
 {
 #ifdef UNITY_EXCLUDE_FLOAT
     TEST_IGNORE();
 #else
-    EXPECT_ABORT_BEGIN
     TEST_ASSERT_EQUAL_FLOAT(0.0f / f_zero, 0.0f / f_zero);
-    VERIFY_FAILS_END
 #endif
 }
 
@@ -2833,14 +2850,12 @@ void testFloatsNotEqualExpectedInf(void)
 #endif
 }
 
-void testFloatsNotEqualBothInf(void)
+void testFloatsEqualBothInf(void)
 {
 #ifdef UNITY_EXCLUDE_FLOAT
     TEST_IGNORE();
 #else
-    EXPECT_ABORT_BEGIN
     TEST_ASSERT_EQUAL_FLOAT(1.0f / f_zero, 1.0f / f_zero);
-    VERIFY_FAILS_END
 #endif
 }
 
@@ -3175,7 +3190,7 @@ void testNotEqualFloatArraysNegative3(void)
 #endif
 }
 
-void testNotEqualFloatArraysNaN(void)
+void testEqualFloatArraysNaN(void)
 {
 #ifdef UNITY_EXCLUDE_FLOAT
     TEST_IGNORE();
@@ -3183,13 +3198,11 @@ void testNotEqualFloatArraysNaN(void)
     float p0[] = {1.0f, 0.0f / f_zero, 25.4f, 0.253f};
     float p1[] = {1.0f, 0.0f / f_zero, 25.4f, 0.253f};
 
-    EXPECT_ABORT_BEGIN
     TEST_ASSERT_EQUAL_FLOAT_ARRAY(p0, p1, 4);
-    VERIFY_FAILS_END
 #endif
 }
 
-void testNotEqualFloatArraysInf(void)
+void testEqualFloatArraysInf(void)
 {
 #ifdef UNITY_EXCLUDE_FLOAT
     TEST_IGNORE();
@@ -3197,9 +3210,7 @@ void testNotEqualFloatArraysInf(void)
     float p0[] = {1.0f, 1.0f / f_zero, 25.4f, 0.253f};
     float p1[] = {1.0f, 1.0f / f_zero, 25.4f, 0.253f};
 
-    EXPECT_ABORT_BEGIN
     TEST_ASSERT_EQUAL_FLOAT_ARRAY(p0, p1, 4);
-    VERIFY_FAILS_END
 #endif
 }
 
@@ -3310,14 +3321,12 @@ void testDoublesNotEqualExpectedNaN(void)
 #endif
 }
 
-void testDoublesNotEqualBothNaN(void)
+void testDoublesEqualBothNaN(void)
 {
 #ifdef UNITY_EXCLUDE_DOUBLE
     TEST_IGNORE();
 #else
-    EXPECT_ABORT_BEGIN
     TEST_ASSERT_EQUAL_DOUBLE(0.0 / d_zero, 0.0 / d_zero);
-    VERIFY_FAILS_END
 #endif
 }
 
@@ -3365,14 +3374,12 @@ void testDoublesNotEqualExpectedInf(void)
 #endif
 }
 
-void testDoublesNotEqualBothInf(void)
+void testDoublesEqualBothInf(void)
 {
 #ifdef UNITY_EXCLUDE_DOUBLE
     TEST_IGNORE();
 #else
-    EXPECT_ABORT_BEGIN
     TEST_ASSERT_EQUAL_DOUBLE(1.0 / d_zero, 1.0 / d_zero);
-    VERIFY_FAILS_END
 #endif
 }
 
@@ -3706,7 +3713,7 @@ void testNotEqualDoubleArraysNegative3(void)
 #endif
 }
 
-void testNotEqualDoubleArraysNaN(void)
+void testEqualDoubleArraysNaN(void)
 {
 #ifdef UNITY_EXCLUDE_DOUBLE
     TEST_IGNORE();
@@ -3714,13 +3721,11 @@ void testNotEqualDoubleArraysNaN(void)
     double p0[] = {1.0, 0.0 / d_zero, 25.4, 0.253};
     double p1[] = {1.0, 0.0 / d_zero, 25.4, 0.253};
 
-    EXPECT_ABORT_BEGIN
     TEST_ASSERT_EQUAL_DOUBLE_ARRAY(p0, p1, 4);
-    VERIFY_FAILS_END
 #endif
 }
 
-void testNotEqualDoubleArraysInf(void)
+void testEqualDoubleArraysInf(void)
 {
 #ifdef UNITY_EXCLUDE_DOUBLE
     TEST_IGNORE();
@@ -3728,9 +3733,7 @@ void testNotEqualDoubleArraysInf(void)
     double p0[] = {1.0, 1.0 / d_zero, 25.4, 0.253};
     double p1[] = {1.0, 1.0 / d_zero, 25.4, 0.253};
 
-    EXPECT_ABORT_BEGIN
     TEST_ASSERT_EQUAL_DOUBLE_ARRAY(p0, p1, 4);
-    VERIFY_FAILS_END
 #endif
 }
 

data/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'
+