ceedling 0.22.0 → 0.24.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: fa78f4edc69d44667b522fa8d6774b5cba64bd1d
-  data.tar.gz: a00d68217deb360e479bd5689c87facd4dedfbe0
+  metadata.gz: 300e156b4f9cbd9bfbea4221b4773dbe3cf122f8
+  data.tar.gz: 823a00ec8ef37579f01e9d444d45d01b6a9cd0f0
 SHA512:
-  metadata.gz: 3ae2e3a928a4d7bce315ec4670d2fbe2d214f94fb17738d3e02e294687b80f3157cabbc9c94cbbf4339ad29edd933b31a063bfebceabcdd820bc6be7dfe154d1
-  data.tar.gz: baae9e8307806303c0f5fbf511102930a772e7c574e1e69662cc858f840aa5a57f3ecbfce47ea8c1b1e263507507be22b0900226814dd3ff39514c03f492a6e6
+  metadata.gz: 8ffe3c8e7a34b6f1cbfd3571a6fd47af2312b7d11a2be722a95587e6cacc4282683614d7e976e7114d442ab0f2efd4ef4fc0a7e6868a7d050c21bb73e7ef84f9
+  data.tar.gz: c9fe93d947af1d5dea5d4f0b3af34f922ed21467364371bd6c2d83c2ec407f9d211baf71a2fe47578cbe7656147c6ed81435b0d0fd1a3ac13e003b211a93a05a

data/Gemfile

@@ -9,7 +9,8 @@ gem "constructor"
 gem "diy"
 gem "rr"
 gem "thor"
-gem "curses"
 
+#these will be used if present, but ignored otherwise
+#gem "curses"
 #gem "pty",    :platforms => [ :ruby ] #automatically included on *nix platforms
-gem "popen4", :platforms => [ :mswin ]
+#gem "popen4", :platforms => [ :mswin ]

data/Gemfile.lock

@@ -30,7 +30,6 @@ DEPENDENCIES
   bundler (>= 1.3.5)
   constructor
   diy
-  popen4
   rake (>= 0.9.2.2)
   require_all
   rr

data/README.md

@@ -29,107 +29,38 @@ If bundler isn't installed on your system or you run into problems, you might ha
 
     > sudo gem install bundler
 
-Using Ceedling inside of a project
-==================================
+Pulling Ceedling inside a Project
+=================================
 
 Ceedling can deploy all of its guts into a folder. This allows it
 to be used without having to worry about external dependencies.
+You don't have to worry about Ceedling changing for this particular
+project just because you updated your gems.
+
+    ceedling new YourNewProjectName
+
+This will install all of Unity, CMock, and Ceedling into a new folder
+named YourNewProjectName. It will also create a simple directory structure
+for you with src and test folders. SCORE! It's also creates a simple
+rakefile and project.yml file that you can tweak to your own needs.
+
+It'll also include documentation for all of these tools, unless you
+specify --nodocs at when you issue the command above... then it skips
+that step for you.
+
+Using Ceedling From A Ruby Gem
+==============================
+
+Ceedling can also be used as a gem. By installing it this way, you
+can automatically update to the latest version of Ceedling, Unity,
+and CMock just by running an update on your gems. Use this if you
+are only running one project OR if you feel you want to keep all
+your projects up to date.
+
+    ceedling new YourNewProjectName --as_gem
+
+This creates a new folder named YourNewProjectName. Inside it will be your
+shiny new project file, rakefile, and a couple of src and test directories
+to get you started. You can then tweak all of those things to your heart's
+content.
 
-    ceedling new [your new project name]
-
-Using Ceedling outside of a project as a gem
-============================================
-
-Ceedling can also be used as a gem. The following Rakefile is the
-bare minimum required in order to use Ceedling this way:
-
-    require 'ceedling'
-    Ceedling.load_project
-
-If you want to load a Ceedling project YAML file other than the default `project.yml` (i.e. `./my_config.yml`), you can do:
-
-    Ceedling.load_project(config: './my_config.yml')
-
-Additionally, a project.yml is required. Here is one to get you
-started:
-
-    ---
-    :project:
-      :use_exceptions: FALSE
-      :use_test_preprocessor: TRUE
-      :use_deep_dependencies: TRUE
-      :build_root: build
-    #  :release_build: TRUE
-      :test_file_prefix: test_
-
-    #:release_build:
-    #  :output: MyApp.out
-    #  :use_assembly: FALSE
-
-    :environment:
-
-    :extension:
-      :executable: .out
-
-    :paths:
-      :test:
-        - +:test/**
-        - -:test/support
-      :source:
-        - src/**
-      :support:
-        - test/support
-
-    :defines:
-      # in order to add common defines:
-      #  1) remove the trailing [] from the :common: section
-      #  2) add entries to the :common: section (e.g. :test: has TEST defined)
-      :commmon: &common_defines []
-      :test:
-        - *common_defines
-        - TEST
-      :test_preprocess:
-        - *common_defines
-        - TEST
-
-    :cmock:
-      :when_no_prototypes: :warn
-      :enforce_strict_ordering: TRUE
-      :plugins:
-        - :ignore
-      :treat_as:
-        uint8:    HEX8
-        uint16:   HEX16
-        uint32:   UINT32
-        int8:     INT8
-        bool:     UINT8
-
-    #:tools:
-    # Ceedling defaults to using gcc for compiling, linking, etc.
-    # As [:tools] is blank, gcc will be used (so long as it's in your system path)
-    # See documentation to configure a given toolchain for use
-
-    :plugins:
-      :load_paths:
-        # This is required to use builtin ceedling plugins
-        - "#{Ceedling.load_path}"
-        # Uncomment this and create the directory in order to use your own
-        # custom ceedling plugins
-        # - ceedling_plugins
-      :enabled:
-        # These plugins ship with Ceedling.
-        - stdout_pretty_tests_report
-        # - stdout_ide_tests_report # IDE parseable output
-        # - teamcity_tests_report # TeamCity CI output (only enabled in TeamCity builds)
-        - module_generator # Adds tasks for creating code module files
-    ...
-
-Finally, you'll need to create something like the following directory structure. This one matches the project.yml
-defined above:
-
-    ./test
-    ./test/support
-    ./src
-    ./project.yml
-    ./Rakefile
-    ./build

data/bin/ceedling

@@ -132,6 +132,15 @@ unless (File.exists?("project.yml"))
       puts " - Execute 'rake -T' to view available test & build tasks"
       puts ''
     end
+
+    desc "version", "return the version of the tools installed"
+    def version()
+      require 'ceedling/version.rb'
+      puts "  Ceedling::   #{Ceedling::Version::CEEDLING}"
+      puts "  CMock::      #{Ceedling::Version::CMOCK}"
+      puts "  Unity::      #{Ceedling::Version::UNITY}"
+      puts "  CException:: #{Ceedling::Version::CEXCEPTION}"
+    end
   end
 
   if (ARGV[0] =~ /^\-T$/)
@@ -184,18 +193,23 @@ else
 
       #if neither of these libraries were available, we can just shell out to the command and collect results
       def spawn_command(cmd, &block)
-        block.call( `#{cmd}` )
+        block.call( StringIO.new(`#{cmd}`) )
       end
     end
 
   end
 
-  require 'curses'
   require 'yaml'
   require 'rbconfig'
 
-  Curses.init_screen()
-  cols = Curses.cols
+  #determine the width of the screen
+  cols = 80
+  begin
+    require 'curses'
+    Curses.init_screen()
+    cols = Curses.cols
+  rescue LoadError
+  end
 
   #determine platform
   platform = begin
@@ -230,23 +244,29 @@ else
 
   #merge in project settings if they can be found here
   yaml_options = YAML.load_file('project.yml')
-  options[:pretend_we_are_gtest] = (yaml_options[:plugins][:enabled].include? :stdout_gtestlike_tests_report)
-  options[:add_path] = yaml_options[:paths][:tools] || []
+  options[:pretend_we_are_gtest] = (yaml_options[:plugins][:enabled].include? :stdout_gtestlike_tests_report) if (yaml_options[:plugins] && yaml_options[:plugins][:enabled])
+  if (yaml_options[:paths])
+    options[:add_path] = yaml_options[:paths][:tools] || []
+  else
+    options[:add_path] = []
+  end
 
   #sort through command line options
   options[:args]
   ARGV.each do |v|
     case(v)
-      when /^(?:new|examples?)$/
+      when /^(?:new|examples?|templates?)$/
         puts "\nOops. You called ceedling with argument '#{v}'.\n" +
              "      This is an operation that will create a new project... \n" +
              "      but it looks like you're already in a project. If you really \n" +
              "      want to do this, try moving to an empty folder.\n\n"
         abort
-      when /--gtest/
+      when /^--gtest/
         options[:pretend_we_are_gtest] = true
-      when /--debug/
+      when /^--debug/
         options[:outfile] = "debug.txt"
+      when /^help$/
+        options[:args] += "-T "
       else
         options[:args] += v + " "
     end

data/ceedling.gemspec

@@ -16,7 +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"
+  # s.add_dependency "curses", ">= 1.0.0"
 
   # Files needed from submodules
   s.files         = []

data/docs/CeedlingPacket.md

@@ -124,7 +124,7 @@ source file (plus two C header files) and from the nature of its
 implementation - Unity will build in any C toolchain and is configurable
 for even the very minimalist of processors.
 
-[Unity]: http://unity.sourceforge.net/
+[Unity]: http://github.com/ThrowTheSwitch/Unity
 [test]: http://en.wikipedia.org/wiki/Unit_testing
 
 [CMock] is a tool written in Ruby able to generate entire
@@ -132,7 +132,7 @@ for even the very minimalist of processors.
 functions are invaluable in [interaction-based unit testing][ut].
 CMock's generated C code uses Unity.
 
-[CMock]: http://cmock.sourceforge.net/
+[CMock]: http://github.com/ThrowTheSwitch/CMock
 [mock]: http://en.wikipedia.org/wiki/Mock_object
 [ut]: http://martinfowler.com/articles/mocksArentStubs.html
 
@@ -142,7 +142,7 @@ CMock's generated C code uses Unity.
 cleaner and preferable alternative to managing and passing error codes
 up your return call trace.
 
-[CException]: http://cexception.sourceforge.net/
+[CException]: http://github.com/ThrowTheSwitch/CException
 [exn]: http://en.wikipedia.org/wiki/Exception_handling
 [setjmp]: http://en.wikipedia.org/wiki/Setjmp.h
 
@@ -164,74 +164,22 @@ As a [Ruby gem](http://docs.rubygems.org/read/chapter/1):
 
 1. [Download and install Ruby](http://www.ruby-lang.org/en/downloads/)
 
-2. Use Ruby's command line gem package manager to install Rake:
-   `gem install rake`
-
-3. Use Ruby's command line gem package manager to install Ceedling:
+2. Use Ruby's command line gem package manager to install Ceedling:
    `gem install ceedling` {text:line-break} (Unity, CMock,
    and CException come along with Ceedling for free)
 
-4. Execute Ceedling at command line to create example project
+3. Execute Ceedling at command line to create example project
    or an empty Ceedling project in your filesystem (executing
    `ceedling help` first is, well, helpful).
 
 Gem install notes:
 
-1. Steps 1-3 are a one time affair for your local environment.
-   When steps 1-3 are completed once, only step 4 is needed for
+1. Steps 1-2 are a one time affair for your local environment.
+   When steps 1-2 are completed once, only step 3 is needed for
    each new project.
 
 
 
-Alternatively, from scratch:
-
-1. [Download and install Ruby](http://www.ruby-lang.org/en/downloads/)
-
-2. Use Ruby's command line gem package manager to install Rake:
-   `gem install rake`
-
-3. Grab the Ceedling package (from sourceforge as download
-   or from svn) and place in your filesystem {text:line-break}
-   (it already contains Unity, CMock, and CException)
-
-4. Create an empty build directory for your project {text:line-break}
-   (Ceedling will fill out the directory structure below the
-   build root when executed)
-
-5. Create a simple Rakefile (`rakefile.rb`) that contains
-   a load call to Ceedling on your filesystem and a default task
-   (tasks available to tie to `default` are listed in the next
-   section):
-
-    ```ruby
-        load '<path>/ceedling/lib/rakefile.rb'
-        # ex. run all tests & build release artifact
-        task :default => ['test:all', :release]
-            # namespaced tasks must be quoted
-            # top-level tasks are Ruby symbols denoted by a leading ':'`
-    ```
-
-6. Create your project YAML file (more on this later in this document).
-   `project.yml` is the default file name Ceedling recognizes
-   in the working directory from which Rake is run (Rake is the
-   tool we actually use to take advantage of what Ceedling provides).
-
-
-From scratch install notes:
-
-1. Steps 1-3 are a one time affair for your local environment.
-   When steps 1-3 are completed once, only steps 4-6 are needed
-   for each new project.
-
-2. See the sample starter project for a working setup. When steps
-   1-3 are complete and assuming you have gcc in your path (Ceedling's
-   default toolchain), you will only need to edit the path within
-   the sample Rakefile (see step 5 above) to yield a working,
-   albeit simple, project. The default task need not be defined,
-   but it's not a bad idea to do so.
-
-
-
 General notes:
 
 1. Certain advanced features of Ceedling rely on gcc and cpp

data/lib/ceedling/configurator.rb

@@ -9,14 +9,14 @@ class Configurator
 
   attr_reader :project_config_hash, :script_plugins, :rake_plugins
   attr_accessor :project_logging, :project_debug, :project_verbosity, :sanity_checks
-  
+
   constructor(:configurator_setup, :configurator_builder, :configurator_plugins, :cmock_builder, :yaml_wrapper, :system_wrapper) do
     @project_logging   = false
     @project_debug     = false
     @project_verbosity = Verbosity::NORMAL
     @sanity_checks     = TestResultsSanityChecks::NORMAL
   end
-  
+
   def setup
     # special copy of cmock config to provide to cmock for construction
     @cmock_config_hash = {}
@@ -25,23 +25,23 @@ class Configurator
     # in eval() statements in build() have something of proper scope and persistence to reference
     @project_config_hash = {}
     @project_config_hash_backup = {}
-    
+
     @script_plugins = []
     @rake_plugins   = []
   end
-  
-  
+
+
   def replace_flattened_config(config)
     @project_config_hash.merge!(config)
     @configurator_setup.build_constants_and_accessors(@project_config_hash, binding())
   end
 
-  
+
   def store_config
     @project_config_hash_backup = @project_config_hash.clone
   end
-  
-  
+
+
   def restore_config
     @project_config_hash = @project_config_hash_backup
     @configurator_setup.build_constants_and_accessors(@project_config_hash, binding())
@@ -72,13 +72,13 @@ class Configurator
     @configurator_builder.populate_defaults( config, DEFAULT_TOOLS_TEST )
     @configurator_builder.populate_defaults( config, DEFAULT_TOOLS_TEST_PREPROCESSORS ) if (config[:project][:use_test_preprocessor])
     @configurator_builder.populate_defaults( config, DEFAULT_TOOLS_TEST_DEPENDENCIES )  if (config[:project][:use_deep_dependencies])
-    
+
     @configurator_builder.populate_defaults( config, DEFAULT_TOOLS_RELEASE )              if (config[:project][:release_build])
     @configurator_builder.populate_defaults( config, DEFAULT_TOOLS_RELEASE_ASSEMBLER )    if (config[:project][:release_build] and config[:release_build][:use_assembly])
     @configurator_builder.populate_defaults( config, DEFAULT_TOOLS_RELEASE_DEPENDENCIES ) if (config[:project][:release_build] and config[:project][:use_deep_dependencies])
   end
-  
-  
+
+
   def populate_unity_defaults(config)
       unity = config[:unity] || {}
       @runner_config = unity.merge(@runner_config || config[:test_runner] || {})
@@ -92,10 +92,10 @@ class Configurator
 
     # yes, we're duplicating the default mock_prefix in cmock, but it's because we need CMOCK_MOCK_PREFIX always available in Ceedling's environment
     cmock[:mock_prefix] = 'Mock' if (cmock[:mock_prefix].nil?)
-    
+
     # just because strict ordering is the way to go
     cmock[:enforce_strict_ordering] = true                                                  if (cmock[:enforce_strict_ordering].nil?)
-    
+
     cmock[:mock_path] = File.join(config[:project][:build_root], TESTS_BASE_PATH, 'mocks')  if (cmock[:mock_path].nil?)
     cmock[:verbosity] = @project_verbosity                                                  if (cmock[:verbosity].nil?)
 
@@ -105,7 +105,7 @@ class Configurator
     cmock[:plugins].uniq!
 
     cmock[:unity_helper] = false                     if (cmock[:unity_helper].nil?)
-    
+
     if (cmock[:unity_helper])
       cmock[:includes] << File.basename(cmock[:unity_helper])
       cmock[:includes].uniq!
@@ -115,8 +115,8 @@ class Configurator
 
     @cmock_builder.manufacture(cmock)
   end
-  
-  
+
+
   def get_runner_config
     @runner_config
   end
@@ -128,7 +128,7 @@ class Configurator
     config[:tools].each_key do |name|
       tool = config[:tools][name]
 
-      # populate name if not given      
+      # populate name if not given
       tool[:name] = name.to_s if (tool[:name].nil?)
 
       # handle inline ruby string substitution in executable
@@ -146,8 +146,8 @@ class Configurator
       tool[:optional] = false if (tool[:optional].nil?)
     end
   end
-  
-  
+
+
   def tools_supplement_arguments(config)
     tools_name_prefix = 'tools_'
     config[:tools].each_key do |name|
@@ -171,49 +171,49 @@ class Configurator
       path.replace(@system_wrapper.module_eval(path)) if (path =~ RUBY_STRING_REPLACEMENT_PATTERN)
       FilePathUtils::standardize(path)
     end
-    
+
     paths_hash = @configurator_plugins.add_load_paths(config)
-  
+
     @rake_plugins   = @configurator_plugins.find_rake_plugins(config)
     @script_plugins = @configurator_plugins.find_script_plugins(config)
     config_plugins  = @configurator_plugins.find_config_plugins(config)
     plugin_defaults = @configurator_plugins.find_plugin_defaults(config)
-    
+
     config_plugins.each do |plugin|
       config.deep_merge( @yaml_wrapper.load(plugin) )
     end
-    
+
     plugin_defaults.each do |defaults|
       @configurator_builder.populate_defaults( config, @yaml_wrapper.load(defaults) )
     end
-    
+
     # special plugin setting for results printing
     config[:plugins][:display_raw_test_results] = true if (config[:plugins][:display_raw_test_results].nil?)
-    
+
     paths_hash.each_pair { |name, path| config[:plugins][name] = path }
   end
 
-  
+
   def eval_environment_variables(config)
     config[:environment].each do |hash|
       key   = hash.keys[0]
       value = hash[key]
       items = []
-            
+
       interstitial = ((key == :path) ? File::PATH_SEPARATOR : '')
       items = ((value.class == Array) ? hash[key] : [value])
-      
+
       items.each { |item| item.replace( @system_wrapper.module_eval( item ) ) if (item =~ RUBY_STRING_REPLACEMENT_PATTERN) }
       hash[key] = items.join( interstitial )
-      
+
       @system_wrapper.env_set( key.to_s.upcase, hash[key] )
     end
   end
 
-  
+
   def eval_paths(config)
     # [:plugins]:[load_paths] already handled
-    
+
     paths = [ # individual paths that don't follow convention processed below
       config[:project][:build_root],
       config[:release_build][:artifacts]]
@@ -223,16 +223,16 @@ class Configurator
     config[:paths].each_pair { |collection, paths| eval_path_list( paths ) }
 
     config[:files].each_pair { |collection, files| eval_path_list( files ) }
-    
+
     # all other paths at secondary hash key level processed by convention:
     # ex. [:toplevel][:foo_path] & [:toplevel][:bar_paths] are evaluated
-    config.each_pair { |parent, child| eval_path_list( collect_path_list( child ) ) }    
+    config.each_pair { |parent, child| eval_path_list( collect_path_list( child ) ) }
   end
-  
-  
+
+
   def standardize_paths(config)
     # [:plugins]:[load_paths] already handled
-    
+
     paths = [ # individual paths that don't follow convention processed below
       config[:project][:build_root],
       config[:release_build][:artifacts]] # cmock path in case it was explicitly set in config
@@ -247,45 +247,45 @@ class Configurator
 
     config[:files].each_pair { |collection, files| files.each{ |path| FilePathUtils::standardize( path ) } }
 
-    config[:tools].each_pair { |tool, config| FilePathUtils::standardize( config[:executable] ) }
-    
+    config[:tools].each_pair { |tool, config| FilePathUtils::standardize( config[:executable] ) if (config.include? :executable) }
+
     # all other paths at secondary hash key level processed by convention:
     # ex. [:toplevel][:foo_path] & [:toplevel][:bar_paths] are standardized
     config.each_pair do |parent, child|
       collect_path_list( child ).each { |path| FilePathUtils::standardize( path ) }
-    end    
+    end
   end
 
 
   def validate(config)
     # collect felonies and go straight to jail
     raise if (not @configurator_setup.validate_required_sections( config ))
-    
+
     # collect all misdemeanors, everybody on probation
     blotter = []
     blotter << @configurator_setup.validate_required_section_values( config )
     blotter << @configurator_setup.validate_paths( config )
     blotter << @configurator_setup.validate_tools( config )
     blotter << @configurator_setup.validate_plugins( config )
-    
+
     raise if (blotter.include?( false ))
   end
-    
-  
+
+
   # create constants and accessors (attached to this object) from given hash
   def build(config, *keys)
     # create flattened & expanded configuration hash
     built_config = @configurator_setup.build_project_config( config, @configurator_builder.flattenify( config ) )
-    
+
     @project_config_hash = built_config.clone
     store_config()
 
     @configurator_setup.build_constants_and_accessors(built_config, binding())
-    
+
     # top-level keys disappear when we flatten, so create global constants & accessors to any specified keys
     keys.each do |key|
       hash = { key => config[key] }
-      @configurator_setup.build_constants_and_accessors(hash, binding())      
+      @configurator_setup.build_constants_and_accessors(hash, binding())
     end
   end
 
@@ -297,30 +297,30 @@ class Configurator
 
     # flatten our addition hash
     config_more_flattened = @configurator_builder.flattenify( config_more )
-    
+
     # merge our flattened hash with built hash from previous build
     @project_config_hash.deep_merge!( config_more_flattened )
     store_config()
 
     # create more constants and accessors
     @configurator_setup.build_constants_and_accessors(config_more_flattened, binding())
-    
+
     # recreate constants & update accessors with new merged, base values
     config_more.keys.each do |key|
       hash = { key => config_base[key] }
       @configurator_setup.build_constants_and_accessors(hash, binding())
     end
   end
-    
-  
+
+
   def insert_rake_plugins(plugins)
     plugins.each do |plugin|
       @project_config_hash[:project_rakefile_component_files] << plugin
     end
   end
-  
+
   ### private ###
-  
+
   private
 
   def collect_path_list( container )
@@ -328,12 +328,12 @@ class Configurator
     container.each_key { |key| paths << container[key] if (key.to_s =~ /_path(s)?$/) } if (container.class == Hash)
     return paths.flatten
   end
-  
+
   def eval_path_list( paths )
     paths.flatten.each do |path|
       path.replace( @system_wrapper.module_eval( path ) ) if (path =~ RUBY_STRING_REPLACEMENT_PATTERN)
     end
   end
-  
-  
+
+
 end

data/lib/ceedling/version.rb

@@ -2,7 +2,7 @@
 module Ceedling
   module Version
     # @private
-    GEM = "0.22.0"
+    GEM = "0.24.0"
     # @private
     CEEDLING = GEM
     # @private

data/lib/ceedling/version.rb.erb

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

data/vendor/c_exception/vendor/unity/auto/generate_test_runner.rb

@@ -23,6 +23,7 @@ class UnityTestRunnerGenerator
   def self.default_options
     {
       :includes         => [],
+      :defines          => [],
       :plugins          => [],
       :framework        => :unity,
       :test_prefix      => "test|spec|should",
@@ -167,6 +168,9 @@ class UnityTestRunnerGenerator
     output.puts('#include <setjmp.h>')
     output.puts('#include <stdio.h>')
     output.puts('#include "CException.h"') if @options[:plugins].include?(:cexception)
+    if (@options[:defines] && !@options[:defines].empty?)
+      @options[:defines].each {|d| output.puts("#define #{d}")}
+    end
     if (@options[:header_file] && !@options[:header_file].empty?)
       output.puts("#include \"#{File.basename(@options[:header_file])}\"")
     else

data/vendor/c_exception/vendor/unity/src/unity.c

@@ -733,13 +733,13 @@ void UnityAssertFloatSpecial(const _UF actual,
 
         case UNITY_FLOAT_IS_NAN:
         case UNITY_FLOAT_IS_NOT_NAN:
-            is_trait = isnan(actual);
+            is_trait = isnan(actual) ? 1 : 0;
             break;
 
         /* A determinate number is non infinite and not NaN. (therefore the opposite of the two above) */
         case UNITY_FLOAT_IS_DET:
         case UNITY_FLOAT_IS_NOT_DET:
-            if (isinf(actual) | isnan(actual))
+            if (isinf(actual) || isnan(actual))
                 is_trait = 0;
             else
                 is_trait = 1;
@@ -876,13 +876,13 @@ void UnityAssertDoubleSpecial(const _UD actual,
 
         case UNITY_FLOAT_IS_NAN:
         case UNITY_FLOAT_IS_NOT_NAN:
-            is_trait = isnan(actual);
+            is_trait = isnan(actual) ? 1 : 0;
             break;
 
         /* A determinate number is non infinite and not NaN. (therefore the opposite of the two above) */
         case UNITY_FLOAT_IS_DET:
         case UNITY_FLOAT_IS_NOT_DET:
-            if (isinf(actual) | isnan(actual))
+            if (isinf(actual) || isnan(actual))
                 is_trait = 0;
             else
                 is_trait = 1;

data/vendor/cmock/vendor/c_exception/vendor/unity/auto/generate_test_runner.rb

@@ -23,6 +23,7 @@ class UnityTestRunnerGenerator
   def self.default_options
     {
       :includes         => [],
+      :defines          => [],
       :plugins          => [],
       :framework        => :unity,
       :test_prefix      => "test|spec|should",
@@ -167,6 +168,9 @@ class UnityTestRunnerGenerator
     output.puts('#include <setjmp.h>')
     output.puts('#include <stdio.h>')
     output.puts('#include "CException.h"') if @options[:plugins].include?(:cexception)
+    if (@options[:defines] && !@options[:defines].empty?)
+      @options[:defines].each {|d| output.puts("#define #{d}")}
+    end
     if (@options[:header_file] && !@options[:header_file].empty?)
       output.puts("#include \"#{File.basename(@options[:header_file])}\"")
     else

data/vendor/cmock/vendor/c_exception/vendor/unity/src/unity.c

@@ -733,13 +733,13 @@ void UnityAssertFloatSpecial(const _UF actual,
 
         case UNITY_FLOAT_IS_NAN:
         case UNITY_FLOAT_IS_NOT_NAN:
-            is_trait = isnan(actual);
+            is_trait = isnan(actual) ? 1 : 0;
             break;
 
         /* A determinate number is non infinite and not NaN. (therefore the opposite of the two above) */
         case UNITY_FLOAT_IS_DET:
         case UNITY_FLOAT_IS_NOT_DET:
-            if (isinf(actual) | isnan(actual))
+            if (isinf(actual) || isnan(actual))
                 is_trait = 0;
             else
                 is_trait = 1;
@@ -876,13 +876,13 @@ void UnityAssertDoubleSpecial(const _UD actual,
 
         case UNITY_FLOAT_IS_NAN:
         case UNITY_FLOAT_IS_NOT_NAN:
-            is_trait = isnan(actual);
+            is_trait = isnan(actual) ? 1 : 0;
             break;
 
         /* A determinate number is non infinite and not NaN. (therefore the opposite of the two above) */
         case UNITY_FLOAT_IS_DET:
         case UNITY_FLOAT_IS_NOT_DET:
-            if (isinf(actual) | isnan(actual))
+            if (isinf(actual) || isnan(actual))
                 is_trait = 0;
             else
                 is_trait = 1;

data/vendor/cmock/vendor/unity/auto/generate_test_runner.rb

@@ -23,6 +23,7 @@ class UnityTestRunnerGenerator
   def self.default_options
     {
       :includes         => [],
+      :defines          => [],
       :plugins          => [],
       :framework        => :unity,
       :test_prefix      => "test|spec|should",
@@ -167,6 +168,9 @@ class UnityTestRunnerGenerator
     output.puts('#include <setjmp.h>')
     output.puts('#include <stdio.h>')
     output.puts('#include "CException.h"') if @options[:plugins].include?(:cexception)
+    if (@options[:defines] && !@options[:defines].empty?)
+      @options[:defines].each {|d| output.puts("#define #{d}")}
+    end
     if (@options[:header_file] && !@options[:header_file].empty?)
       output.puts("#include \"#{File.basename(@options[:header_file])}\"")
     else

data/vendor/cmock/vendor/unity/src/unity.c

@@ -733,13 +733,13 @@ void UnityAssertFloatSpecial(const _UF actual,
 
         case UNITY_FLOAT_IS_NAN:
         case UNITY_FLOAT_IS_NOT_NAN:
-            is_trait = isnan(actual);
+            is_trait = isnan(actual) ? 1 : 0;
             break;
 
         /* A determinate number is non infinite and not NaN. (therefore the opposite of the two above) */
         case UNITY_FLOAT_IS_DET:
         case UNITY_FLOAT_IS_NOT_DET:
-            if (isinf(actual) | isnan(actual))
+            if (isinf(actual) || isnan(actual))
                 is_trait = 0;
             else
                 is_trait = 1;
@@ -876,13 +876,13 @@ void UnityAssertDoubleSpecial(const _UD actual,
 
         case UNITY_FLOAT_IS_NAN:
         case UNITY_FLOAT_IS_NOT_NAN:
-            is_trait = isnan(actual);
+            is_trait = isnan(actual) ? 1 : 0;
             break;
 
         /* A determinate number is non infinite and not NaN. (therefore the opposite of the two above) */
         case UNITY_FLOAT_IS_DET:
         case UNITY_FLOAT_IS_NOT_DET:
-            if (isinf(actual) | isnan(actual))
+            if (isinf(actual) || isnan(actual))
                 is_trait = 0;
             else
                 is_trait = 1;

data/vendor/unity/auto/generate_test_runner.rb

@@ -23,6 +23,7 @@ class UnityTestRunnerGenerator
   def self.default_options
     {
       :includes         => [],
+      :defines          => [],
       :plugins          => [],
       :framework        => :unity,
       :test_prefix      => "test|spec|should",
@@ -167,6 +168,9 @@ class UnityTestRunnerGenerator
     output.puts('#include <setjmp.h>')
     output.puts('#include <stdio.h>')
     output.puts('#include "CException.h"') if @options[:plugins].include?(:cexception)
+    if (@options[:defines] && !@options[:defines].empty?)
+      @options[:defines].each {|d| output.puts("#define #{d}")}
+    end
     if (@options[:header_file] && !@options[:header_file].empty?)
       output.puts("#include \"#{File.basename(@options[:header_file])}\"")
     else

data/vendor/unity/src/unity.c

@@ -733,13 +733,13 @@ void UnityAssertFloatSpecial(const _UF actual,
 
         case UNITY_FLOAT_IS_NAN:
         case UNITY_FLOAT_IS_NOT_NAN:
-            is_trait = isnan(actual);
+            is_trait = isnan(actual) ? 1 : 0;
             break;
 
         /* A determinate number is non infinite and not NaN. (therefore the opposite of the two above) */
         case UNITY_FLOAT_IS_DET:
         case UNITY_FLOAT_IS_NOT_DET:
-            if (isinf(actual) | isnan(actual))
+            if (isinf(actual) || isnan(actual))
                 is_trait = 0;
             else
                 is_trait = 1;
@@ -876,13 +876,13 @@ void UnityAssertDoubleSpecial(const _UD actual,
 
         case UNITY_FLOAT_IS_NAN:
         case UNITY_FLOAT_IS_NOT_NAN:
-            is_trait = isnan(actual);
+            is_trait = isnan(actual) ? 1 : 0;
             break;
 
         /* A determinate number is non infinite and not NaN. (therefore the opposite of the two above) */
         case UNITY_FLOAT_IS_DET:
         case UNITY_FLOAT_IS_NOT_DET:
-            if (isinf(actual) | isnan(actual))
+            if (isinf(actual) || isnan(actual))
                 is_trait = 0;
             else
                 is_trait = 1;

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: ceedling
 version: !ruby/object:Gem::Version
-  version: 0.22.0
+  version: 0.24.0
 platform: ruby
 authors:
 - Mike Karlesky, Mark VanderVoord
@@ -10,7 +10,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-10-28 00:00:00.000000000 Z
+date: 2016-11-16 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: thor
@@ -40,20 +40,6 @@ dependencies:
     - - '>='
       - !ruby/object:Gem::Version
         version: 0.8.7
-- !ruby/object:Gem::Dependency
-  name: curses
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - '>='
-      - !ruby/object:Gem::Version
-        version: 1.0.0
-  type: :runtime
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - '>='
-      - !ruby/object:Gem::Version
-        version: 1.0.0
 description: Ceedling provides a set of tools to deploy its guts in a folder or which
   can be required in a Rakefile
 email:
@@ -75,7 +61,6 @@ files:
 - assets/rakefile_with_guts.rb
 - assets/test_example_file.c
 - bin/ceedling
-- ceedling-0.21.0.gem
 - ceedling.gemspec
 - config/test_environment.rb
 - docs/CeedlingPacket.md