ceedling 0.17.0 → 0.18.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 3f080a37226ca2bad23bea2e314e7ac3828b4093
-  data.tar.gz: 37841e6f0c39ee415bb4607ecea0d5d8278ce8ee
+  metadata.gz: 51a11a8292cd1fb5d6278208a7bc687bb98d9079
+  data.tar.gz: 8c729bd71ea4928e6f33d32a62f32b33ac8db1e2
 SHA512:
-  metadata.gz: 26397b81e50d88ba54f0d9cb8510ea4f164bd34392bdf5af85fb274d6ea03f83bcf22c6a2d236e1bab8f1a13d8aa29097dcfb12101b27d812fc831059cf26827
-  data.tar.gz: 26c57f493b4d8b378aa6c40e3df248a3422a00f7ae82e2b87f8daa55e81d4d8203862a44c899534b6e80ea17502d8c74ccfa88890a8133e83a0c8af93368dca2
+  metadata.gz: f1139841553193bf878268f97526a8684f94bd10a3aa5efd81a5c59953aa85a72c7002cb1adce639e561cf9ae5621be4f294247f7086166fc1a942fcffc0391b
+  data.tar.gz: b548f7b16b85aeb75524bce5a51db838888dee2bfe1ae295a8f76b3a02e2ba865393abcbdfe46a837de79fa465bb914f38d6da028a4d2d36ed4f4b5ab07b354a

data/ceedling.gemspec

@@ -8,7 +8,7 @@ Gem::Specification.new do |s|
   s.version     = Ceedling::Version::GEM
   s.platform    = Gem::Platform::RUBY
   s.authors     = ["Mike Karlesky, Mark VanderVoord", "Greg Williams", "Matt Fletcher"]
-  s.email       = ["michael@karlesky.net, mvandervoord@gmail.com, williams@atomicembedded.com, fletcher@atomicobject.com"]
+  s.email       = ["michael@karlesky.net, mvandervoord@gmail.com, williams@atomicobject.com, fletcher@atomicobject.com"]
   s.homepage    = "http://throwtheswitch.org/"
   s.summary     = %q{Ceedling is a set of tools for the automation of builds and test running for C}
   s.description = %q{Ceedling provides a set of tools to deploy its guts in a folder or which can be required in a Rakefile}

data/lib/ceedling/version.rb

@@ -2,13 +2,13 @@
 module Ceedling
   module Version
     # @private
-    GEM = "0.17.0"
+    GEM = "0.18.0"
     # @private
     CEEDLING = GEM
     # @private
     CEXCEPTION = "1.3.17"
     # @private
-    CMOCK = "2.1.0"
+    CMOCK = "2.3.0"
     # @private
     UNITY = "2.2.0"
   end

data/lib/ceedling/version.rb.erb

@@ -2,8 +2,7 @@
 module Ceedling
   module Version
     # @private
-    GEM = "0.17.0"
-
+    GEM = "0.18.0"
     # @private
     CEEDLING = "<%= versions["CEEDLING"] %>"
     # @private

data/test_graveyard/unit/busted/generator_test_runner_test.rb

@@ -439,8 +439,7 @@ class GeneratorTestRunnerTest < Test::Unit::TestCase
     expected_output = %Q[
       int main(void)
       {
-        UnityBegin();
-        Unity.TestFile = "TestMe.c";
+        UnityBegin("TestMe.c");
 
         // RUN_TEST calls runTest
         RUN_TEST(test_a_little_test);
@@ -462,9 +461,7 @@ class GeneratorTestRunnerTest < Test::Unit::TestCase
     expected_output = %Q[
       int main(void)
       {
-        UnityBegin();
-        Unity.TestFile = "TestIfy.c";
-
+        UnityBegin("TestIfy.c");
 
         UnityEnd();
         return 0;

data/vendor/cmock/Gemfile

@@ -3,9 +3,7 @@ source "http://rubygems.org/"
 gem "bundler", "~> 1.1.rc.7"
 gem "rake", ">= 0.9.2.2"
 
-gem 'hardmock', '1.3.8'
-gem "rspec"
+gem "minitest"
 gem "require_all"
 gem "constructor"
 gem "diy"
-gem "rr"

data/vendor/cmock/Rakefile

@@ -10,8 +10,6 @@ require 'rake/clean'
 require 'rake/testtask'
 require './rakefile_helper'
 
-require 'rspec/core/rake_task'
-
 include RakefileHelpers
 
 DEFAULT_CONFIG_FILE = 'gcc.yml'
@@ -33,9 +31,9 @@ task :prep_system_tests => SYSTEM_TEST_SUPPORT_DIRS
 configure_clean
 configure_toolchain(DEFAULT_CONFIG_FILE)
 
-task :default => ['test:all']
-task :ci => [:no_color, :default]
-task :cruise => :ci
+task :default => [:test]
+task :ci      => [:no_color, :default]
+task :cruise  => :ci
 
 desc "Load configuration"
 task :config, :config_file do |t, args|
@@ -44,10 +42,10 @@ task :config, :config_file do |t, args|
   configure_toolchain(args[:config_file])
 end
 
-namespace :test do
-  desc "Run all unit and system tests"
-  task :all => [:clobber, :prep_system_tests, 'test:units', 'test:c', 'test:system']
+desc "Run all unit, c, and system tests"
+task :test => [:clobber, :prep_system_tests, 'test:units', 'test:c', 'test:system']
 
+namespace :test do
   desc "Run Unit Tests"
   Rake::TestTask.new('units') do |t|
     t.pattern = 'test/unit/*_test.rb'
@@ -56,7 +54,7 @@ namespace :test do
 
   #individual unit tests
   FileList['test/unit/*_test.rb'].each do |test|
-    Rake::TestTask.new(File.basename(test,'.*')) do |t|
+    Rake::TestTask.new(File.basename(test,'.*').sub('_test','')) do |t|
       t.pattern = test
       t.verbose = true
     end
@@ -88,8 +86,9 @@ namespace :test do
 
   #individual system tests
   FileList['test/system/test_interactions/*.yml'].each do |test|
-    desc "Run system test #{File.basename(test,'.*')}"
-    task "test:#{File.basename(test,'.*')}" do
+    basename = File.basename(test,'.*')
+    desc "Run system test #{basename}"
+    task basename do
       run_system_test_interactions([test])
     end
   end
@@ -103,9 +102,3 @@ end
 task :no_color do
   $colour_output = false
 end
-
-RSpec::Core::RakeTask.new(:spec) do |t|
-  spec_path = File.join(CMOCK_ROOT, 'test/spec')
-  t.pattern = spec_path + '/*_spec.rb'
-end
-

data/vendor/cmock/docs/license.txt

@@ -1,31 +1,19 @@
- Copyright (c) 2007-14 Mike Karlesky, Mark VanderVoord, Greg Williams
+Copyright (c) 2007-14 Mike Karlesky, Mark VanderVoord, Greg Williams
 
- Permission is hereby granted, free of charge, to any person
- obtaining a copy of this software and associated documentation
- files (the "Software"), to deal in the Software without
- restriction, including without limitation the rights to use,
- copy, modify, merge, publish, distribute, sublicense, and/or sell
- copies of the Software, and to permit persons to whom the
- Software is furnished to do so, subject to the following
- conditions:
-
- The above copyright notice and this permission notice shall be
- included in all copies or substantial portions of the Software.
-
- The end-user documentation included with the redistribution, if 
- any, must include the following acknowledgment: "This product 
- includes software developed for the CMock Project, by Mike Karlesky,
- Mark VanderVoord, and Greg Williams and other contributors", in 
- the same place and form as other third-party acknowledgments. 
- Alternately, this acknowledgment may appear in the software 
- itself, in the same form and location as other such third-party 
- acknowledgments.
- 
- THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
- EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES
- OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
- NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT
- HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY,
- WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING
- FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR
- OTHER DEALINGS IN THE SOFTWARE.
+Permission is hereby granted, free of charge, to any person obtaining a copy
+of this software and associated documentation files (the "Software"), to deal
+in the Software without restriction, including without limitation the rights
+to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+copies of the Software, and to permit persons to whom the Software is
+furnished to do so, subject to the following conditions:
+
+The above copyright notice and this permission notice shall be included in
+all copies or substantial portions of the Software.
+
+THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
+THE SOFTWARE.

data/vendor/cmock/examples/gcc.yml

@@ -11,7 +11,7 @@ compiler:
       - 'src/'
       - '../src/'
       - '../vendor/unity/src/'
-      - '../vendor/unity/examples/helper/'
+      - '../vendor/unity/examples/example_3/helper/'
       - 'mocks/'
       - *unit_tests_path
   defines:
@@ -40,4 +40,4 @@ linker:
   :includes:
     - Types.h
 
-colour: true
+colour: true

data/vendor/cmock/examples/iar_v4.yml

@@ -14,7 +14,7 @@ compiler:
     - --no_code_motion
     - --no_tbaa
     - --no_clustering
-    - --no_scheduling 
+    - --no_scheduling
     - --debug
     - --cpu_mode thumb
     - --endian little
@@ -32,7 +32,7 @@ compiler:
       - 'src/'
       - '../src/'
       - '../vendor/unity/src/'
-      - '../vendor/unity/examples/helper/'
+      - '../vendor/unity/examples/example_3/helper/'
       - 'mocks/'
       - [*tools_root, 'arm\inc\']
       - *unit_tests_path
@@ -88,4 +88,4 @@ simulator:
   :plugins: []
   :includes:
     - Types.h
-  
+

data/vendor/cmock/examples/iar_v5.yml

@@ -13,7 +13,7 @@ compiler:
     - --no_code_motion
     - --no_tbaa
     - --no_clustering
-    - --no_scheduling 
+    - --no_scheduling
     - --debug
     - --cpu_mode thumb
     - --endian=little
@@ -31,7 +31,7 @@ compiler:
       - 'src/'
       - '../src/'
       - '../vendor/unity/src/'
-      - '../vendor/unity/examples/helper/'
+      - '../vendor/unity/examples/example_3/helper/'
       - 'mocks/'
       - [*tools_root, 'arm\inc\']
       - *unit_tests_path
@@ -77,4 +77,4 @@ simulator:
   :plugins: []
   :includes:
     - Types.h
-  
+

data/vendor/cmock/examples/rakefile_helper.rb

@@ -7,29 +7,29 @@ require '../vendor/unity/auto/colour_reporter'
 module RakefileHelpers
 
   C_EXTENSION = '.c'
-  
+
   def load_configuration(config_file)
     $cfg_file = config_file
     $cfg = YAML.load(File.read($cfg_file))
     $colour_output = false unless $cfg['colour']
   end
-  
+
   def configure_clean
     CLEAN.include($cfg['compiler']['build_path'] + '*.*') unless $cfg['compiler']['build_path'].nil?
   end
-  
+
   def configure_toolchain(config_file=DEFAULT_CONFIG_FILE)
     config_file += '.yml' unless config_file =~ /\.yml$/
     load_configuration(config_file)
     configure_clean
   end
-  
+
   def get_unit_test_files
     path = $cfg['compiler']['unit_tests_path'] + 'Test*' + C_EXTENSION
     path.gsub!(/\\/, '/')
     FileList.new(path)
   end
-  
+
   def get_local_include_dirs
     include_dirs = $cfg['compiler']['includes']['items'].dup
     include_dirs.delete_if {|dir| dir.is_a?(Array)}
@@ -57,7 +57,7 @@ module RakefileHelpers
     end
     return nil
   end
-  
+
   def tackit(strings)
     case(strings)
       when Array
@@ -70,7 +70,7 @@ module RakefileHelpers
         strings
     end
   end
-  
+
   def squash(prefix, items)
     result = ''
     items.each { |item| result += " #{prefix}#{tackit(item)}" }
@@ -98,7 +98,7 @@ module RakefileHelpers
     execute(cmd_str + obj_file)
     return obj_file
   end
-  
+
   def build_linker_fields
     command  = tackit($cfg['linker']['path'])
     if $cfg['linker']['options'].nil?
@@ -114,17 +114,17 @@ module RakefileHelpers
     includes = includes.gsub(/\\ /, ' ').gsub(/\\\"/, '"').gsub(/\\$/, '') # Remove trailing slashes (for IAR)
     return {:command => command, :options => options, :includes => includes}
   end
-  
+
   def link_it(exe_name, obj_list)
     linker = build_linker_fields
-    cmd_str = "#{linker[:command]}#{linker[:options]}#{linker[:includes]} " +
+    cmd_str = "#{linker[:command]}#{linker[:includes]} " +
       (obj_list.map{|obj|"#{$cfg['linker']['object_files']['path']}#{obj} "}).join +
       $cfg['linker']['bin_files']['prefix'] + ' ' +
       $cfg['linker']['bin_files']['destination'] +
-      exe_name + $cfg['linker']['bin_files']['extension']
+      exe_name + $cfg['linker']['bin_files']['extension'] + " #{linker[:options]}"
     execute(cmd_str)
   end
-  
+
   def build_simulator_fields
     return nil if $cfg['simulator'].nil?
     if $cfg['simulator']['path'].nil?
@@ -144,7 +144,7 @@ module RakefileHelpers
     end
     return {:command => command, :pre_support => pre_support, :post_support => post_support}
   end
-  
+
   def execute(command_string, verbose=true)
     report command_string
     output = `#{command_string}`.chomp
@@ -154,7 +154,7 @@ module RakefileHelpers
     end
     return output
   end
-  
+
   def report_summary
     summary = UnityTestSummary.new
     summary.set_root_path(HERE)
@@ -165,34 +165,34 @@ module RakefileHelpers
     report summary.run
     raise "There were failures" if (summary.failures > 0)
   end
-  
+
   def run_tests(test_files)
-    
+
     report 'Running system tests...'
-    
+
     # Tack on TEST define for compiling unit tests
     load_configuration($cfg_file)
     test_defines = ['TEST']
     $cfg['compiler']['defines']['items'] = [] if $cfg['compiler']['defines']['items'].nil?
     $cfg['compiler']['defines']['items'] << 'TEST'
-    
+
     include_dirs = get_local_include_dirs
-    
+
     # Build and execute each unit test
     test_files.each do |test|
       obj_list = []
-      
+
       # Detect dependencies and build required required modules
       header_list = extract_headers(test) + ['cmock.h']
       header_list.each do |header|
-      
+
         #create mocks if needed
-        if (header =~ /Mock/) 
-          require "../lib/cmock.rb" 
-          @cmock ||= CMock.new($cfg_file) 
+        if (header =~ /Mock/)
+          require "../lib/cmock.rb"
+          @cmock ||= CMock.new($cfg_file)
           @cmock.setup_mocks([$cfg['compiler']['source_path']+header.gsub('Mock','')])
         end
-        
+
       end
 
       #compile all mocks
@@ -203,7 +203,7 @@ module RakefileHelpers
           obj_list << compile(src_file, test_defines)
         end
       end
-      
+
       # Build the test runner (generate if configured to do so)
       test_base = File.basename(test, C_EXTENSION)
       runner_name = test_base + '_Runner.c'
@@ -216,13 +216,13 @@ module RakefileHelpers
       end
 
       obj_list << compile(runner_path, test_defines)
-      
+
       # Build the test module
       obj_list << compile(test, test_defines)
-      
+
       # Link the test executable
       link_it(test_base, obj_list)
-      
+
       # Execute unit test and generate results file
       simulator = build_simulator_fields
       executable = $cfg['linker']['bin_files']['destination'] + test_base + $cfg['linker']['bin_files']['extension']
@@ -241,11 +241,11 @@ module RakefileHelpers
       File.open(test_results, 'w') { |f| f.print output }
     end
   end
-  
+
   def build_application(main)
-  
+
     report "Building application..."
-    
+
     obj_list = []
     load_configuration($cfg_file)
     main_path = $cfg['compiler']['source_path'] + main + C_EXTENSION
@@ -258,13 +258,13 @@ module RakefileHelpers
         obj_list << compile(src_file)
       end
     end
-    
+
     # Build the main source file
     main_base = File.basename(main_path, C_EXTENSION)
     obj_list << compile(main_path)
-    
+
     # Create the executable
     link_it(main_base, obj_list)
   end
-  
+
 end