From fb08f9353552b9f3d89b10ac099fe7b4e1168d76 Mon Sep 17 00:00:00 2001
From: Mark VanderVoord <mvandervoord@gmail.com>
Date: Thu, 27 Oct 2016 23:18:04 -0400
Subject: [PATCH] Updated to latest version of libraries. Fixed errors in
 module generator passthrough. Updated version.

---
 lib/ceedling/version.rb                          |  8 ++++----
 plugins/module_generator/lib/module_generator.rb |  8 ++++----
 plugins/module_generator/module_generator.rake   | 12 ++++++------
 vendor/c_exception                               |  2 +-
 vendor/cmock                                     |  2 +-
 vendor/unity                                     |  2 +-
 6 files changed, 17 insertions(+), 17 deletions(-)

diff --git a/lib/ceedling/version.rb b/lib/ceedling/version.rb
index 9f3815ec..17a39ecc 100644
--- a/lib/ceedling/version.rb
+++ b/lib/ceedling/version.rb
@@ -2,14 +2,14 @@
 module Ceedling
   module Version
     # @private
-    GEM = "0.21.0"
+    GEM = "0.22.0"
     # @private
     CEEDLING = GEM
     # @private
-    CEXCEPTION = "1.3.17"
+    CEXCEPTION = "1.3.1"
     # @private
-    CMOCK = "2.4.2"
+    CMOCK = "2.4.3"
     # @private
-    UNITY = "2.3.2"
+    UNITY = "2.4.0"
   end
 end
diff --git a/plugins/module_generator/lib/module_generator.rb b/plugins/module_generator/lib/module_generator.rb
index f6b67898..4db21017 100755
--- a/plugins/module_generator/lib/module_generator.rb
+++ b/plugins/module_generator/lib/module_generator.rb
@@ -7,20 +7,20 @@ class ModuleGenerator < Plugin
 
   attr_reader :config
 
-  def create(path, optz={})
+  def create(module_name, optz={})
 
     require "generate_module.rb" #From Unity Scripts
 
     if ((!optz.nil?) && (optz[:destroy]))
-      UnityModuleGenerator.new( divine_options(path) ).destroy(module_name)
+      UnityModuleGenerator.new( divine_options(optz) ).destroy(module_name)
     else
-      UnityModuleGenerator.new( divine_options(path) ).generate(module_name)
+      UnityModuleGenerator.new( divine_options(optz) ).generate(module_name)
     end
   end
 
   private
 
-  def divine_options(path, optz={})
+  def divine_options(optz={})
     {
       :path_src => MODULE_GENERATOR_SOURCE_ROOT.gsub('\\', '/').sub(/^\//, '').sub(/\/$/, ''),
       :path_inc => MODULE_GENERATOR_SOURCE_ROOT.gsub('\\', '/').sub(/^\//, '').sub(/\/$/, ''),
diff --git a/plugins/module_generator/module_generator.rake b/plugins/module_generator/module_generator.rake
index d4ba1840..37e1a39b 100755
--- a/plugins/module_generator/module_generator.rake
+++ b/plugins/module_generator/module_generator.rake
@@ -3,24 +3,24 @@ namespace :module do
 
   desc "Generate module (source, header and test files)"
   task :create, :module_path do |t, args|
-    args = args[:module_path].split(/,/)
+    files = [args[:module_path]] + (args.extras || [])
     optz = {}
     ["dh", "dih", "mch", "mvp"].each do |pat|
-      p = args.delete(pat)
+      p = files.delete(pat)
       optz[:pattern] = p unless p.nil?
     end
-    args.each {|v| @ceedling[:module_generator].create(v, optz) }
+    files.each {|v| @ceedling[:module_generator].create(v, optz) }
   end
 
   desc "Destroy module (source, header and test files)"
   task :destroy, :module_path do |t, args|
-    args = args[:module_path].split(/,/)
+    files = [args[:module_path]] + (args.extras || [])
     optz = { :destroy => true }
     ["dh", "dih", "mch", "mvp"].each do |pat|
-      p = args.delete(pat)
+      p = files.delete(pat)
       optz[:pattern] = p unless p.nil?
     end
-    args.each {|v| @ceedling[:module_generator].create(v, optz) }
+    files.each {|v| @ceedling[:module_generator].create(v, optz) }
   end
 
 end
diff --git a/vendor/c_exception b/vendor/c_exception
index dfdbb00c..4e04771f 160000
--- a/vendor/c_exception
+++ b/vendor/c_exception
@@ -1 +1 @@
-Subproject commit dfdbb00c4d1503f5cb29ec89b51e98c735e4877c
+Subproject commit 4e04771fcf658500987d0be5a9a63f8e77d5e386
diff --git a/vendor/cmock b/vendor/cmock
index 8d4153c3..7243a3d7 160000
--- a/vendor/cmock
+++ b/vendor/cmock
@@ -1 +1 @@
-Subproject commit 8d4153c39cd59750f8d7981c7f183a5ae8687505
+Subproject commit 7243a3d78b9b595324da957e06249167831fadd7
diff --git a/vendor/unity b/vendor/unity
index 2ce86180..661c1b2d 160000
--- a/vendor/unity
+++ b/vendor/unity
@@ -1 +1 @@
-Subproject commit 2ce861801417ababe421df69cab9a33c204d450c
+Subproject commit 661c1b2d568693e3b6b631ae66f6872b194674f1