ceedling 0.28.1 → 0.28.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 71e849e4b01257b6bf46ff3f0c640ac834c75649
-  data.tar.gz: ad0c659fdc9dc461f80fe802876f1ef14901c4ec
+  metadata.gz: 5ab20a20fd53b1935cb3c11cffa2f890c18f4f10
+  data.tar.gz: 8d728ca829262063f0422614c248d0eb77ca77a7
 SHA512:
-  metadata.gz: 21ce60fcc40db82d6f48067a5209a8ea9f7d6292005bb099e1143440b430fc3f5f73c4fcd345bf46683cec81ee62322a2dabae519c1ab05c1dc49d7e7ebd21a2
-  data.tar.gz: c7c120c485e554afaae2f4afeefdc6651b7636739d1501f37a919988d81bf38a6facb580bcb19a866bff023ca520ff7dca862a744836d2a845e524ffad6b6b2c
+  metadata.gz: 6aac3b5f1c9bf0179912b4bb8f1ea0889765643d9414afad5706bc45b20110045766b5ea8035809406df5247f8b6ec32ae7ebcc299ad1e2dce37365a50b3525c
+  data.tar.gz: e40627df9e67de61b8f7e0e6e5360bcc4d69f727c1cff93a13fdbaea06f1333184b1fbf56664eeefab381926f68ae66e142f1194660442a619e12a699bf577f0

data/bin/ceedling

@@ -204,6 +204,7 @@ else
   #create our default meta-runner option set
   options = {
     :pretest => nil,
+    :args => [],
     :add_path => [],
     :path_connector => (platform == :mswin) ? ";" : ":",
     :graceful_fail => false,
@@ -244,7 +245,7 @@ else
       when /^project:(\w+)/
         ENV['CEEDLING_USER_PROJECT_FILE'] = "#{$1}.yml"
       else
-        #nothing
+        options[:args].push(v)
     end
   end
 
@@ -282,7 +283,7 @@ else
       task :default => options[:default_tasks]
 
       # Run our Tasks!
-      Rake.application.collect_command_line_tasks(ARGV)
+      Rake.application.collect_command_line_tasks(options[:args])
       Rake.application.top_level
     end
   end

data/docs/CeedlingPacket.md

@@ -1338,6 +1338,8 @@ Notes:
 * File specifiers are case sensitive (must match original file
   name)
 
+* File specifiers do support regular expressions if encased in quotes
+
 * '*' is a special (optional) file specifier to provide flags
   to all files not otherwise specified
 
@@ -1352,6 +1354,8 @@ Example [:flags] YAML blurb
         - -Wall
       :fan:        # add '--O2' to compilation of fan.c
         - --O2
+      :'test_.+':   # add '-pedantic' to all test-files
+        - -pedantic
       :*:          # add '-foo' to compilation of all files not main.c or fan.c
         - -foo
   :test:

data/lib/ceedling/configurator_builder.rb

@@ -316,6 +316,32 @@ class ConfiguratorBuilder
   end
 
 
+  def collect_release_existing_compilation_input(in_hash)
+    release_input = @file_wrapper.instantiate_file_list
+
+    paths =
+      in_hash[:collection_paths_source] +
+      in_hash[:collection_paths_include]
+
+    paths << File.join(in_hash[:cexception_vendor_path], CEXCEPTION_LIB_PATH) if (in_hash[:project_use_exceptions])
+
+    paths.each do |path|
+      release_input.include( File.join(path, "*#{in_hash[:extension_header]}") )
+      if File.exists?(path) and not File.directory?(path)
+        release_input.include( path )
+      else
+        release_input.include( File.join(path, "*#{in_hash[:extension_source]}") )
+      end
+    end
+
+    @file_system_utils.revise_file_list( release_input, in_hash[:files_source] )
+    @file_system_utils.revise_file_list( release_input, in_hash[:files_include] )
+    # finding assembly files handled explicitly through other means
+
+    return {:collection_release_existing_compilation_input => release_input}
+  end
+
+
   def collect_all_existing_compilation_input(in_hash)
     all_input = @file_wrapper.instantiate_file_list
 

data/lib/ceedling/configurator_setup.rb

@@ -37,6 +37,7 @@ class ConfiguratorSetup
     flattened_config.merge!(@configurator_builder.collect_assembly(flattened_config))
     flattened_config.merge!(@configurator_builder.collect_source(flattened_config))
     flattened_config.merge!(@configurator_builder.collect_headers(flattened_config))
+    flattened_config.merge!(@configurator_builder.collect_release_existing_compilation_input(flattened_config))
     flattened_config.merge!(@configurator_builder.collect_all_existing_compilation_input(flattened_config))
     flattened_config.merge!(@configurator_builder.collect_test_and_vendor_defines(flattened_config))
     flattened_config.merge!(@configurator_builder.collect_release_and_vendor_defines(flattened_config))

data/lib/ceedling/file_finder.rb

@@ -83,7 +83,7 @@ class FileFinder
   end
   
   
-  def find_compilation_input_file(file_path, complain=:error)
+  def find_compilation_input_file(file_path, complain=:error, release=false)
     found_file = nil
     
     source_file = File.basename(file_path).ext(@configurator.extension_source)
@@ -105,6 +105,12 @@ class FileFinder
           @file_wrapper.directory_listing( File.join(@configurator.cmock_mock_path, '*') ),
           complain)
 
+    elsif release
+      found_file =
+        @file_finder_helper.find_file_in_collection(
+          source_file,
+          @configurator.collection_release_existing_compilation_input,
+          complain)
     else
       found_file = 
         @file_finder_helper.find_file_in_collection(

data/lib/ceedling/flaginator.rb

@@ -7,6 +7,8 @@ require 'ceedling/constants'
 # :flags:
 #   :release:
 #     :compile:
+#       :'test_.+'
+#         - -pedantic   # add '-pedantic' to every test file
 #       :*:          # add '-foo' to compilation of all files not main.c
 #         - -foo
 #       :main:       # add '-Wall' to compilation of main.c
@@ -17,16 +19,41 @@ require 'ceedling/constants'
 #         - --bar
 #         - --baz
 
+def partition(hash, &predicate)
+  hash.partition(&predicate).map(&:to_h)
+end
 
 class Flaginator
 
   constructor :configurator
 
+  def get_flag(hash, file_name)
+    file_key = file_name.to_sym
+   
+    # 1. try literals
+    literals, magic = partition(hash) { |k, v| k.to_s =~ /^\w+$/ }  
+    return literals[file_key] if literals.include?(file_key)
+    
+    any, regex = partition(magic) { |k, v| (k == :'*') || (k == :'.*')  } # glob or regex wild card
+    
+    # 2. try regexes
+    find_res = regex.find { |k, v| file_name =~ /^#{k.to_s}$/ }
+    return find_res[1] if find_res
+    
+    # 3. try anything
+    find_res = any.find { |k, v| file_name =~ /.*/ }
+    return find_res[1] if find_res
+      
+    # 4. well, we've tried
+    return []
+  end
+  
   def flag_down( operation, context, file )
     # create configurator accessor method
     accessor = ('flags_' + context.to_s).to_sym
 
     # create simple filename key from whatever filename provided
+    file_name = File.basename( file ).ext('')
     file_key = File.basename( file ).ext('').to_sym
 
     # if no entry in configuration for flags for this context, bail out
@@ -41,14 +68,7 @@ class Flaginator
     # redefine flags to sub hash associated with the operation
     flags = flags[operation]
 
-    # if our file is in the flags hash, extract the array of flags
-    if (flags.include?( file_key )) then return flags[file_key]
-    # if our file isn't in the flags hash, but there is default for all other files, extract array of flags
-    elsif (flags.include?( :* )) then return flags[:*]
-    end
-
-    # fall through: flags were specified but none applying to present file
-    return []
+    return get_flag(flags, file_name)
   end
 
 end

data/lib/ceedling/rules_release.rake

@@ -21,7 +21,7 @@ end
 
 rule(/#{PROJECT_RELEASE_BUILD_OUTPUT_C_PATH}\/#{'.+\\'+EXTENSION_OBJECT}$/ => [
     proc do |task_name|
-      @ceedling[:file_finder].find_compilation_input_file(task_name)
+      @ceedling[:file_finder].find_compilation_input_file(task_name, :error, true)
     end
   ]) do |object|
   @ceedling[:generator].generate_object_file(
@@ -44,8 +44,8 @@ rule(/#{PROJECT_RELEASE_BUILD_TARGET}/) do |bin_file|
     RELEASE_SYM,
     objects,
     bin_file.name,
-    map_file,
-    lib_args )
+    map_file,
+    lib_args )
   @ceedling[:release_invoker].artifactinate( bin_file.name, map_file, @ceedling[:configurator].release_build_artifacts )
 end
 

data/lib/ceedling/rules_release_deep_dependencies.rake

@@ -2,7 +2,7 @@
 
 rule(/#{PROJECT_RELEASE_DEPENDENCIES_PATH}\/#{'.+\\'+EXTENSION_DEPENDENCIES}$/ => [
     proc do |task_name|
-      @ceedling[:file_finder].find_compilation_input_file(task_name)
+      @ceedling[:file_finder].find_compilation_input_file(task_name, :error, true)
     end  
   ]) do |dep|
   @ceedling[:generator].generate_dependencies_file(

data/lib/ceedling/version.rb

@@ -2,14 +2,14 @@
 module Ceedling
   module Version
     # @private
-    GEM = "0.28.1"
+    GEM = "0.28.2"
     # @private
     CEEDLING = GEM
     # @private
     CEXCEPTION = "1.3.1"
     # @private
-    CMOCK = "2.4.4"
+    CMOCK = "2.4.5"
     # @private
-    UNITY = "2.4.1"
+    UNITY = "2.4.2"
   end
 end

data/plugins/gcov/config/defaults.yml

@@ -36,7 +36,7 @@
     :arguments:
         - -p
         - -b
-        - -e '^vendor.*|^build.*|^test.*|^lib.*'
+        - -e "'^vendor.*|^build.*|^test.*|^lib.*'"
         - --html
         - -r .
         - -o GcovCoverageResults.html
@@ -46,7 +46,7 @@
     :arguments:
         - -p
         - -b
-        - -e '^vendor.*|^build.*|^test.*|^lib.*'
+        - -e "'^vendor.*|^build.*|^test.*|^lib.*'"
         - --html
         - -r .
         - -o  "$": GCOV_ARTIFACTS_FILE
@@ -56,7 +56,8 @@
     :arguments:
         - -p
         - -b
-        - -e '^vendor.*|^build.*|^test.*|^lib.*'
+        - -e "'^vendor.*|^build.*|^test.*|^lib.*'"
+        - --html
         - --html-details
         - -r .
         - -o  "$": GCOV_ARTIFACTS_FILE

data/plugins/module_generator/lib/module_generator.rb

@@ -30,7 +30,7 @@ class ModuleGenerator < Plugin
       :mock_prefix  => ((defined? CMOCK_MOCK_PREFIX            ) ? CMOCK_MOCK_PREFIX : "Mock" ),
       :includes     => ((defined? MODULE_GENERATOR_INCLUDES    ) ? MODULE_GENERATOR_INCLUDES : {} ),
       :boilerplates => ((defined? MODULE_GENERATOR_BOILERPLATES) ? MODULE_GENERATOR_BOILERPLATES : {} ),
-      :naming       => ((defined? MODULE_GENERATOR_NAMING      ) ? MODULE_GENERATOR_NAMING : "snake" ),
+      :naming       => ((defined? MODULE_GENERATOR_NAMING      ) ? MODULE_GENERATOR_NAMING : nil ),
       :update_svn   => ((defined? MODULE_GENERATOR_UPDATE_SVN  ) ? MODULE_GENERATOR_UPDATE_SVN : false ),
     }
   end

data/plugins/subprojects/README.md

@@ -1,63 +1,63 @@
-ceedling-subprojects
-====================
-
-Plugin for supporting subprojects that are built as static libraries. It continues to support  
-dependency tracking, without getting confused between your main project files and your   
-subproject files. It accepts different compiler flags and linker flags, allowing you to   
-optimize for your situation.
-
-First, you're going to want to add the extension to your list of known extensions:
-
-```
-:extension:
-  :subprojects: '.a'
-```
-
-Define a new section called :subprojects. There, you can list as many subprojects  
-as you may need under the :paths key. For each, you specify a unique place to build  
-and a unique name.
-
-```
-:subprojects:  
-  :paths:
-   - :name: libprojectA
-     :source:
-       - ./subprojectA/first/dir
-       - ./subprojectA/second/dir
-     :include:
-       - ./subprojectA/include/dir
-     :build_root: ./subprojectA/build/dir
-     :defines: 
-       - DEFINE_JUST_FOR_THIS_FILE
-       - AND_ANOTHER
-   - :name: libprojectB
-     :source:
-       - ./subprojectB/only/dir
-     :include:
-       - ./subprojectB/first/include/dir
-       - ./subprojectB/second/include/dir
-     :build_root: ./subprojectB/build/dir
-     :defines: [] #none for this one
-```
-
-You can specify the compiler and linker, just as you would a release build:
-
-```
-:tools:
-  :subprojects_compiler:
-    :executable: gcc
-    :arguments:
-      - -g
-      - -I"$": COLLECTION_PATHS_SUBPROJECTS
-      - -D$: COLLECTION_DEFINES_SUBPROJECTS
-      - -c "${1}"
-      - -o "${2}"
-  :subprojects_linker:
-    :executable: ar
-    :arguments:
-      - rcs
-      - ${2}
-      - ${1}
-```
-
-That's all there is to it! Happy Hacking!
+ceedling-subprojects
+====================
+
+Plugin for supporting subprojects that are built as static libraries. It continues to support  
+dependency tracking, without getting confused between your main project files and your   
+subproject files. It accepts different compiler flags and linker flags, allowing you to   
+optimize for your situation.
+
+First, you're going to want to add the extension to your list of known extensions:
+
+```
+:extension:
+  :subprojects: '.a'
+```
+
+Define a new section called :subprojects. There, you can list as many subprojects  
+as you may need under the :paths key. For each, you specify a unique place to build  
+and a unique name.
+
+```
+:subprojects:  
+  :paths:
+   - :name: libprojectA
+     :source:
+       - ./subprojectA/first/dir
+       - ./subprojectA/second/dir
+     :include:
+       - ./subprojectA/include/dir
+     :build_root: ./subprojectA/build/dir
+     :defines: 
+       - DEFINE_JUST_FOR_THIS_FILE
+       - AND_ANOTHER
+   - :name: libprojectB
+     :source:
+       - ./subprojectB/only/dir
+     :include:
+       - ./subprojectB/first/include/dir
+       - ./subprojectB/second/include/dir
+     :build_root: ./subprojectB/build/dir
+     :defines: [] #none for this one
+```
+
+You can specify the compiler and linker, just as you would a release build:
+
+```
+:tools:
+  :subprojects_compiler:
+    :executable: gcc
+    :arguments:
+      - -g
+      - -I"$": COLLECTION_PATHS_SUBPROJECTS
+      - -D$: COLLECTION_DEFINES_SUBPROJECTS
+      - -c "${1}"
+      - -o "${2}"
+  :subprojects_linker:
+    :executable: ar
+    :arguments:
+      - rcs
+      - ${2}
+      - ${1}
+```
+
+That's all there is to it! Happy Hacking!

data/plugins/subprojects/config/defaults.yml

@@ -1,33 +1,33 @@
----
-#:extension:
-#  :subprojects: '.a'
-
-:subprojects:
-  :paths: []
-#   - :name: subprojectA
-#     :source:
-#       - ./first/subproject/dir
-#       - ./second/subproject/dir
-#     :include:
-#       - ./first/include/dir
-#     :build_root: ./subproject/build/dir
-#     :defines:
-#       - FIRST_DEFINE
-
-:tools:
-  :subprojects_compiler:
-    :executable: gcc
-    :arguments:
-      - -g
-      - -I"$": COLLECTION_PATHS_SUBPROJECTS
-      - -D$: COLLECTION_DEFINES_SUBPROJECTS
-      - -c "${1}"
-      - -o "${2}"
-  :subprojects_linker:
-    :executable: ar
-    :arguments:
-      - rcs
-      - ${2}
-      - ${1}
-
-...
+---
+#:extension:
+#  :subprojects: '.a'
+
+:subprojects:
+  :paths: []
+#   - :name: subprojectA
+#     :source:
+#       - ./first/subproject/dir
+#       - ./second/subproject/dir
+#     :include:
+#       - ./first/include/dir
+#     :build_root: ./subproject/build/dir
+#     :defines:
+#       - FIRST_DEFINE
+
+:tools:
+  :subprojects_compiler:
+    :executable: gcc
+    :arguments:
+      - -g
+      - -I"$": COLLECTION_PATHS_SUBPROJECTS
+      - -D$: COLLECTION_DEFINES_SUBPROJECTS
+      - -c "${1}"
+      - -o "${2}"
+  :subprojects_linker:
+    :executable: ar
+    :arguments:
+      - rcs
+      - ${2}
+      - ${1}
+
+...