ceedling 0.21.0 → 0.22.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: fef79035eb5bbe9732905e831e227da8e2a8b788
-  data.tar.gz: 6c9c2c4b267ecec0395ef6c0028a4595f12dc8a7
+  metadata.gz: fa78f4edc69d44667b522fa8d6774b5cba64bd1d
+  data.tar.gz: a00d68217deb360e479bd5689c87facd4dedfbe0
 SHA512:
-  metadata.gz: 95336d639633c43a5ecb27745fd4452645bd53a81b45715891f056aa660a581329f9fc7f326d1366ce2082a780fcd8ae74824a1eea91d9930f8c464b5e1059d2
-  data.tar.gz: b27f3cc0aef83627c2669ac2b0f23e4583906a724e30cfb58809cad4675ac37f8f2cde09710606383c06564558c7561eb8be33b85279063a0a1c1480e58bfb06
+  metadata.gz: 3ae2e3a928a4d7bce315ec4670d2fbe2d214f94fb17738d3e02e294687b80f3157cabbc9c94cbbf4339ad29edd933b31a063bfebceabcdd820bc6be7dfe154d1
+  data.tar.gz: baae9e8307806303c0f5fbf511102930a772e7c574e1e69662cc858f840aa5a57f3ecbfce47ea8c1b1e263507507be22b0900226814dd3ff39514c03f492a6e6

data/Gemfile

@@ -9,6 +9,7 @@ gem "constructor"
 gem "diy"
 gem "rr"
 gem "thor"
+gem "curses"
 
 #gem "pty",    :platforms => [ :ruby ] #automatically included on *nix platforms
 gem "popen4", :platforms => [ :mswin ]

data/bin/ceedling

@@ -164,7 +164,7 @@ else
       end
     end
 
-  rescue
+  rescue LoadError
 
     begin
 
@@ -180,7 +180,7 @@ else
         end
       end
 
-    rescue
+    rescue LoadError
 
       #if neither of these libraries were available, we can just shell out to the command and collect results
       def spawn_command(cmd, &block)
@@ -269,7 +269,6 @@ else
   end
 
   #run rake and capture all the output
-  okay_to_print = !(options[:pretend_we_are_gtest])
   options[:cmd] = if (options[:pretest].nil? || options[:pretest].empty?)
     "rake #{options[:args]}"
   else
@@ -277,8 +276,7 @@ else
   end
   spawn_command(options[:cmd]) do |stdout|
     stdout.each do |line|
-      okay_to_print = true if ((options[:pretend_we_are_gtest]) && (line.match(/\[\=+\]/)))
-      if (okay_to_print)
+      if (!options[:pretend_we_are_gtest] || (line.match(/^\[.*\]/)) || (line.match(/\d+ FAILED TESTS/)))
         f.puts(line) if (options[:outfile])
         if (options[:args].strip == "-T")
           line.gsub!(/(?<!\w)rake(?!\w)/,'ceedling')

data/ceedling.gemspec

@@ -16,6 +16,7 @@ Gem::Specification.new do |s|
 
   s.add_dependency "thor", ">= 0.14.5"
   s.add_dependency "rake", ">= 0.8.7"
+  s.add_dependency "curses", ">= 1.0.0"
 
   # Files needed from submodules
   s.files         = []

data/lib/ceedling/configurator.rb

@@ -79,6 +79,11 @@ class Configurator
   end
   
   
+  def populate_unity_defaults(config)
+      unity = config[:unity] || {}
+      @runner_config = unity.merge(@runner_config || config[:test_runner] || {})
+  end
+
   def populate_cmock_defaults(config)
     # cmock has its own internal defaults handling, but we need to set these specific values
     # so they're present for the build environment to access;
@@ -106,7 +111,8 @@ class Configurator
       cmock[:includes].uniq!
     end
 
-    @runner_config = cmock.merge(config[:test_runner] || {})
+    @runner_config = cmock.merge(@runner_config || config[:test_runner] || {})
+
     @cmock_builder.manufacture(cmock)
   end
   

data/lib/ceedling/configurator_plugins.rb

@@ -10,13 +10,13 @@ class ConfiguratorPlugins
     @script_plugins = []
   end
 
-  
+
   def add_load_paths(config)
     plugin_paths = {}
-    
+
     config[:plugins][:load_paths].each do |root|
       @system_wrapper.add_load_path( root ) if ( not @file_wrapper.directory_listing( File.join( root, '*.rb' ) ).empty? )
-    
+
       config[:plugins][:enabled].each do |plugin|
         path = File.join(root, plugin, "lib")
 
@@ -26,15 +26,15 @@ class ConfiguratorPlugins
         end
       end
     end
-    
+
     return plugin_paths
   end
-  
-  
+
+
   # gather up and return .rake filepaths that exist on-disk
   def find_rake_plugins(config)
     plugins_with_path = []
-    
+
     config[:plugins][:load_paths].each do |root|
       config[:plugins][:enabled].each do |plugin|
         rake_plugin_path = File.join(root, plugin, "#{plugin}.rake")
@@ -44,7 +44,7 @@ class ConfiguratorPlugins
         end
       end
     end
-    
+
     return plugins_with_path
   end
 
@@ -56,21 +56,21 @@ class ConfiguratorPlugins
         script_plugin_path = File.join(root, plugin, "lib", "#{plugin}.rb")
 
 
-        if @file_wrapper.exist?(script_plugin_path) or @file_wrapper.exist?(old_script_plugin_path)
-          @script_plugins << plugin 
+        if @file_wrapper.exist?(script_plugin_path)
+          @script_plugins << plugin
         end
 
       end
     end
-    
-    return @script_plugins 
+
+    return @script_plugins
   end
-  
-  
+
+
   # gather up and return configuration .yml filepaths that exist on-disk
   def find_config_plugins(config)
     plugins_with_path = []
-    
+
     config[:plugins][:load_paths].each do |root|
       config[:plugins][:enabled].each do |plugin|
         config_plugin_path = File.join(root, plugin, "config", "#{plugin}.yml")
@@ -81,15 +81,15 @@ class ConfiguratorPlugins
         end
       end
     end
-    
-    return plugins_with_path    
+
+    return plugins_with_path
   end
 
-  
+
   # gather up and return default .yml filepaths that exist on-disk
   def find_plugin_defaults(config)
     defaults_with_path = []
-    
+
     config[:plugins][:load_paths].each do |root|
       config[:plugins][:enabled].each do |plugin|
         default_path = File.join(root, plugin, 'config', 'defaults.yml')
@@ -100,7 +100,7 @@ class ConfiguratorPlugins
       end
     end
 
-    return defaults_with_path    
+    return defaults_with_path
   end
-  
+
 end

data/lib/ceedling/generator_test_runner.rb

@@ -4,52 +4,9 @@ class GeneratorTestRunner
   constructor :configurator, :file_path_utils, :file_wrapper
 
   def find_test_cases(test_file)
-    tests = []
-    tests_and_line_numbers = []
-    lines = []
-
-    # if we don't have preprocessor assistance, do some basic preprocessing of our own
-    if (not @configurator.project_use_test_preprocessor)
-      source = @file_wrapper.read(test_file)
-
-      # remove line comments
-      source = source.gsub(/\/\/.*$/, '')
-      # remove block comments
-      source = source.gsub(/\/\*.*?\*\//m, '')
-
-      # treat preprocessor directives as a logical line
-      lines = source.split(/(^\s*\#.*$) | (;|\{|\}) /x) # match ;, {, and } as end of lines
-    # otherwise, read the preprocessed file raw
-    else
-      lines = @file_wrapper.read( @file_path_utils.form_preprocessed_file_filepath(test_file) ).split(/;|\{|\}/)
-    end
-
-    # step 1. find test functions in (possibly preprocessed) file
-    # (note that lines are not broken up at end of lines)
-    lines.each do |line|
-      if (line =~ /^\s*void\s+((T|t)est.*)\s*\(\s*(void)?\s*\)/m)
-        tests << ($1.strip)
-      end
-    end
-
-    # step 2. associate test functions with line numbers in (non-preprocessed) original file
-    # (note that this time we must scan file contents broken up by end of lines)
-    raw_lines = @file_wrapper.read(test_file).split("\n")
-    raw_index = 0
-
-    tests.each do |test|
-      raw_lines[raw_index..-1].each_with_index do |line, index|
-        # test function might be declared across lines; look for it by its name followed
-        #  by a few tell-tale signs
-        if (line =~ /#{test}\s*($|\(|\()/)
-          raw_index += (index + 1)
-          tests_and_line_numbers << {:test => test, :line_number => raw_index}
-          break
-        end
-      end
-    end
-
-    return tests_and_line_numbers
+    require 'generate_test_runner.rb'
+    @test_runner_generator ||= UnityTestRunnerGenerator.new( @configurator.get_runner_config )
+    return @test_runner_generator.find_tests(@file_wrapper.read(test_file))
   end
 
   def generate(module_name, runner_filepath, test_cases, mock_list, test_file_includes=[])

data/lib/ceedling/setupinator.rb

@@ -21,6 +21,7 @@ class Setupinator
     # note: configurator modifies the cmock section of the hash with a couple defaults to tie 
     #       project together - the modified hash is used to build cmock object
     @ceedling[:configurator].populate_defaults( config_hash )
+    @ceedling[:configurator].populate_unity_defaults( config_hash )
     @ceedling[:configurator].populate_cmock_defaults( config_hash )
     @ceedling[:configurator].find_and_merge_plugins( config_hash )
     @ceedling[:configurator].tools_setup( config_hash )

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

data/plugins/module_generator/lib/module_generator.rb

@@ -7,139 +7,26 @@ class ModuleGenerator < Plugin
 
   attr_reader :config
 
-  def setup
-  
-    #---- New module templates
-    
-    @test_template = (<<-EOS).left_margin
-      #include "unity.h"
-      <%if defined?(MODULE_GENERATOR_TEST_INCLUDES) && (MODULE_GENERATOR_TEST_INCLUDES.class == Array) && !MODULE_GENERATOR_TEST_INCLUDES.empty?%>
-      <%MODULE_GENERATOR_TEST_INCLUDES.each do |header_file|%>
-      #include "<%=header_file%>"
-      <%end%>
-      <%end%>
-      #include "<%=@context[:headername]%>"
-      
-      void setUp(void)
-      {
-      }
-      
-      void tearDown(void)
-      {
-      }
-      
-      void test_<%=name%>_needs_to_be_implemented(void)
-      {
-      <%="\t"%>TEST_IGNORE_MESSAGE("Implement me!");
-      }
-      EOS
+  def create(module_name, optz={})
 
-    @source_template = (<<-EOS).left_margin
-      <%if defined?(MODULE_GENERATOR_SOURCE_INCLUDES) && (MODULE_GENERATOR_SOURCE_INCLUDES.class == Array) && !MODULE_GENERATOR_SOURCE_INCLUDES.empty?%>
-      <%MODULE_GENERATOR_SOURCE_INCLUDES.each do |header_file|%>
-      #include "<%=header_file%>"
-      <%end%>
-      <%end%>
-      #include "<%=@context[:headername]%>"
-      EOS
+    require "generate_module.rb" #From Unity Scripts
 
-    @header_template = (<<-EOS).left_margin
-      #ifndef <%=@context[:name]%>_H
-      #define <%=@context[:name]%>_H
-      
-      <%if defined?(MODULE_GENERATOR_HEADER_INCLUDES) && (MODULE_GENERATOR_HEADER_INCLUDES.class == Array) && !MODULE_GENERATOR_HEADER_INCLUDES.empty?%>
-      <%MODULE_GENERATOR_HEADER_INCLUDES.each do |header_file|%>
-      #include "<%=header_file%>"
-      <%end%>
-      <%end%>
-      
-      #endif // <%=@context[:name]%>_H
-      EOS
-  end
-
-  def create(path, optz={})
-  
-    extract_context(path, optz)
-
-    if !optz.nil? && (optz[:destroy] == true)
-      @ceedling[:streaminator].stdout_puts "Destroying '#{path}'..."
-      @files.each do |file|
-        if File.exist?(file[:path])
-          File.delete(file[:path])
-          @ceedling[:streaminator].stdout_puts "File #{file[:path]} deleted"
-        else
-          @ceedling[:streaminator].stdout_puts "File #{file[:path]} does not exist!"
-        end
-      end
-      exit
+    if ((!optz.nil?) && (optz[:destroy]))
+      UnityModuleGenerator.new( divine_options(optz) ).destroy(module_name)
+    else
+      UnityModuleGenerator.new( divine_options(optz) ).generate(module_name)
     end
-
-    @ceedling[:streaminator].stdout_puts "Generating '#{path}'..."
-
-    [File.dirname(@files[0][:path]), File.dirname(@files[1][:path])].each do |dir|
-      makedirs(dir, {:verbose => true})
-    end
-
-    # define_name = headername.gsub(/\.h$/, '_H').upcase
-
-    @files[0][:template] = @test_template
-    @files[1][:template] = @source_template
-    @files[2][:template] = @header_template
-
-    @files.each do |file|
-      if File.exist?(file[:path])
-        @ceedling[:streaminator].stdout_puts "File #{file[:path]} already exists!"
-      else
-        File.open(file[:path], 'w') do |new_file|
-          new_file << ERB.new(file[:template], 0, "<>").result(binding)
-        end
-        @ceedling[:streaminator].stdout_puts "File #{file[:path]} created"
-      end
-    end
-
   end
-  
+
   private
-  
-  def extract_context(path, optz={})
-    if (!defined?(MODULE_GENERATOR_PROJECT_ROOT) ||
-        !defined?(MODULE_GENERATOR_SOURCE_ROOT) ||
-        !defined?(MODULE_GENERATOR_TEST_ROOT))
-      raise "You must have ':module_generator:project_root:', ':module_generator:source_root:' and ':module_generator:test_root:' defined in your Ceedling configuration file"
-    end
-    
-    @context = {}
 
-    @context[:paths] = {
-      :base => @ceedling[:file_wrapper].get_expanded_path(MODULE_GENERATOR_PROJECT_ROOT).gsub('\\', '/').sub(/^\//, '').sub(/\/$/, ''),
-      :src => MODULE_GENERATOR_SOURCE_ROOT.gsub('\\', '/').sub(/^\//, '').sub(/\/$/, ''),
-      :test => MODULE_GENERATOR_TEST_ROOT.gsub('\\', '/').sub(/^\//, '').sub(/\/$/, '')
+  def divine_options(optz={})
+    {
+      :path_src => MODULE_GENERATOR_SOURCE_ROOT.gsub('\\', '/').sub(/^\//, '').sub(/\/$/, ''),
+      :path_inc => MODULE_GENERATOR_SOURCE_ROOT.gsub('\\', '/').sub(/^\//, '').sub(/\/$/, ''),
+      :path_tst => MODULE_GENERATOR_TEST_ROOT.gsub('\\', '/').sub(/^\//, '').sub(/\/$/, ''),
+      :pattern => optz[:pattern],
     }
-
-    location = File.dirname(path.gsub('\\', '/'))
-    location.sub!(/^\/?#{Regexp.escape(@context[:paths][:base])}\/?/i, '')
-    location.sub!(/^\/?#{Regexp.escape(@context[:paths][:src])}\/?/i, '')
-    location.sub!(/^\/?#{Regexp.escape(@context[:paths][:test])}\/?/i, '')
-    
-    @context[:location] = location
-
-    @context[:name] = File.basename(path).sub(/\.[ch]$/, '')
-    
-    # p @context[:name]
-    
-    @context[:testname] = "test_#{@context[:name]}.c"
-    @context[:sourcename] = "#{@context[:name]}.c"
-    @context[:headername] = "#{@context[:name]}.h"
-    
-    # p @context
-
-    @files = [
-      {:path => File.join(MODULE_GENERATOR_PROJECT_ROOT, @context[:paths][:test], location, @context[:testname])},
-      {:path => File.join(MODULE_GENERATOR_PROJECT_ROOT, @context[:paths][:src],  location, @context[:sourcename])},
-      {:path => File.join(MODULE_GENERATOR_PROJECT_ROOT, @context[:paths][:src],  location, @context[:headername])}
-    ]
-    
-    # p @files
   end
-  
+
 end

data/plugins/module_generator/module_generator.rake

@@ -2,13 +2,25 @@
 namespace :module do
 
   desc "Generate module (source, header and test files)"
-    task :create, :module_path do |t, args|
-    args[:module_path].split(/,/).each {|v| @ceedling[:module_generator].create(v) }
+  task :create, :module_path do |t, args|
+    files = [args[:module_path]] + (args.extras || [])
+    optz = {}
+    ["dh", "dih", "mch", "mvp"].each do |pat|
+      p = files.delete(pat)
+      optz[:pattern] = p unless p.nil?
+    end
+    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[:module_path].split(/,/).each {|v| @ceedling[:module_generator].create(v, {:destroy => true}) }
+    files = [args[:module_path]] + (args.extras || [])
+    optz = { :destroy => true }
+    ["dh", "dih", "mch", "mvp"].each do |pat|
+      p = files.delete(pat)
+      optz[:pattern] = p unless p.nil?
+    end
+    files.each {|v| @ceedling[:module_generator].create(v, optz) }
   end
 
 end