Add support for Catch framework

lib/fake_function_framework.rb

@@ -7,10 +7,12 @@ class FakeFunctionFramework < Plugin
   def setup
     # Get the location of this plugin.
     @plugin_root = File.expand_path(File.join(File.dirname(__FILE__), '..'))
-    puts "Using fake function framework (fff)..."
+    @mock_config = @ceedling[:setupinator].config_hash[:cmock]
+    @silent        = (@mock_config[:verbosity] < 2)
+    puts "Using fake function framework (fff)..." unless @silent
 
     # Switch out the cmock_builder with our own.
-    @ceedling[:cmock_builder].cmock = FffMockGeneratorForCMock.new(@ceedling[:setupinator].config_hash[:cmock])
+    @ceedling[:cmock_builder].cmock = FffMockGeneratorForCMock.new(@mock_config)
 
     # Add the path to fff.h to the include paths.
     COLLECTION_PATHS_TEST_SUPPORT_SOURCE_INCLUDE_VENDOR << "#{@plugin_root}/vendor/fff"
@@ -23,9 +25,9 @@ def post_runner_generate(arg_hash)
     # all mocks linked into the test.
     File.open(arg_hash[:runner_file], 'a') do |f|
       f.puts
-      f.puts "//=======Defintions of FFF variables====="
+      f.puts "//=======Definitions of FFF variables====="
       f.puts %{#include "fff.h"}
-      f.puts "DEFINE_FFF_GLOBALS;"
+      f.puts "DEFINE_FFF_GLOBALS"
     end
   end
 
@@ -37,6 +39,7 @@ def initialize(options=nil)
     @cm_config      = CMockConfig.new(options)
     @cm_parser      = CMockHeaderParser.new(@cm_config)
     @silent        = (@cm_config.verbosity < 2)
+    FffMockGenerator.set_framework(@cm_config.framework)
 
     # These are the additional files to include in the mock files.
     @includes_h_pre_orig_header  = (@cm_config.includes || @cm_config.includes_h_pre_orig_header || []).map{|h| h =~ /</ ? h : "\"#{h}\""}
@@ -51,20 +54,25 @@ def setup_mocks(files)
     end
   end
 
-  def generate_mock (header_file_to_mock)
+  def get_mock_path(mock_name)
+    mock_path = @cm_config.mock_path
+    if @cm_config.subdir
+      # If a subdirectory has been configured, append it to the mock path.
+      mock_path = "#{mock_path}/#{@cm_config.subdir}"
+    end
+    full_path_for_mock = "#{mock_path}/#{mock_name}"
+  end
+
+  def generate_mock(header_file_to_mock)
       module_name = File.basename(header_file_to_mock, '.h')
       puts "Creating mock for #{module_name}..." unless @silent
       mock_name = @cm_config.mock_prefix + module_name + @cm_config.mock_suffix
-      mock_path = @cm_config.mock_path
-      if @cm_config.subdir
-          # If a subdirectory has been configured, append it to the mock path.
-          mock_path = "#{mock_path}/#{@cm_config.subdir}"
-      end
-      full_path_for_mock = "#{mock_path}/#{mock_name}"
+
+      full_path_for_mock = get_mock_path(mock_name)
 
       # Parse the header file so we know what to mock.
       parsed_header = @cm_parser.parse(module_name, File.read(header_file_to_mock))
-
+      
       # Create the directory if it doesn't exist.
       mkdir_p full_path_for_mock.pathmap("%d")
 
@@ -83,5 +91,4 @@ def generate_mock (header_file_to_mock)
           @includes_c_pre_orig_header, @includes_c_post_orig_header))
       end
   end
-
 end

lib/fff_mock_generator.rb

@@ -2,9 +2,13 @@
 # The mocks created are compatible with CMock for use with Ceedling.
 
 class FffMockGenerator
+  @@framework = :unity
 
-  def self.create_mock_header(module_name, mock_name, parsed_header, pre_includes=nil,
-    post_includes=nil)
+  def self.set_framework(framework)
+    @@framework = framework
+  end
+
+  def self.create_mock_header(module_name, mock_name, parsed_header, pre_includes=nil, post_includes=nil)
     output = StringIO.new
     write_opening_include_guard(mock_name, output)
     output.puts
@@ -46,8 +50,10 @@ def self.write_opening_include_guard(mock_name, output)
 
   def self.write_header_includes(module_name, output)
     output.puts %{#include "fff.h"}
-    output.puts %{#include "fff_unity_helper.h"}
+    output.puts %{#include "fff_#{@@framework.to_s}_helper.h"}
+    output.puts 'FFF_EXTERN_C'
     output.puts %{#include "#{module_name}.h"}
+    output.puts 'FFF_END_EXTERN_C'
   end
 
   def self.write_typedefs(parsed_header, output)
@@ -156,7 +162,7 @@ def self.write_function_macros(macro_type, parsed_header, output)
       end
 
       # Close the declaration.
-      output.puts ");"
+      output.puts ")"
     end
   end