ceedling 0.28.3 → 0.29.0

data/lib/ceedling/tool_executor_helper.rb

@@ -1,164 +1,164 @@
-require 'ceedling/constants' # for Verbosity enumeration & $stderr redirect enumeration
-
-##
-# Helper functions for the tool executor
-class ToolExecutorHelper
-
-  constructor :streaminator, :system_utils, :system_wrapper
-
-  ##
-  # Returns the stderr redirection based on the config and logging.
-  # ==== Attributes
-  #
-  # * _tool_config_:  A hash containing config information.
-  # * _logging_:  A boolean representing if logging is enabled or not.
-  #
-  def stderr_redirection(tool_config, logging)
-    # if there's no logging enabled, return :stderr_redirect unmodified
-    return tool_config[:stderr_redirect] if (not logging)
-
-    # if there is logging enabled but the redirect is a custom value (not enum), return the custom string
-    return tool_config[:stderr_redirect] if (tool_config[:stderr_redirect].class == String)
-
-    # if logging is enabled but there's no custom string, return the AUTO enumeration so $stderr goes into the log
-    return StdErrRedirect::AUTO
-  end
-
-
-  ##
-  # Returns the background execution prepend based on the config.
-  # ==== Attributes
-  #
-  # * _tool_config_:  A hash containing config information.
-  #
-  def background_exec_cmdline_prepend(tool_config)
-    return nil if (tool_config.nil? || tool_config[:background_exec].nil?)
-
-    config_exec = tool_config[:background_exec]
-
-    if ((config_exec == BackgroundExec::AUTO) and (@system_wrapper.windows?))
-      return 'start'
-    end
-
-    if (config_exec == BackgroundExec::WIN)
-      return 'start'
-    end
-
-    return nil
-  end
-
-
-  ##
-  # Modifies an executables path based on platform.
-  # ==== Attributes
-  #
-  # * _executable_:  The executable's path.
-  #
-  def osify_path_separators(executable)
-    return executable.gsub(/\//, '\\') if (@system_wrapper.windows?)
-    return executable
-  end
-
-  ##
-  # Returns the stderr redirect append based on the config.
-  # ==== Attributes
-  #
-  # * _tool_config_:  A hash containing config information.
-  #
-  def stderr_redirect_cmdline_append(tool_config)
-    return nil if (tool_config.nil? || tool_config[:stderr_redirect].nil?)
-
-    config_redirect = tool_config[:stderr_redirect]
-    redirect        = StdErrRedirect::NONE
-
-    if (config_redirect == StdErrRedirect::AUTO)
-       if (@system_wrapper.windows?)
-         redirect = StdErrRedirect::WIN
-       elsif (@system_utils.tcsh_shell?)
-         redirect = StdErrRedirect::TCSH
-       else
-         redirect = StdErrRedirect::UNIX
-       end
-    end
-
-    case redirect
-      # we may need more complicated processing after some learning with various environments
-      when StdErrRedirect::NONE then nil
-      when StdErrRedirect::WIN  then '2>&1'
-      when StdErrRedirect::UNIX then '2>&1'
-      when StdErrRedirect::TCSH then '|&'
-      else redirect.to_s
-    end
-  end
-
-  ##
-  # Returns the background execution append based on the config.
-  # ==== Attributes
-  #
-  # * _tool_config_:  A hash containing config information.
-  #
-  def background_exec_cmdline_append(tool_config)
-    return nil if (tool_config.nil? || tool_config[:background_exec].nil?)
-
-    config_exec = tool_config[:background_exec]
-
-    # if :auto & windows, then we already prepended 'start' and should append nothing
-    return nil if ((config_exec == BackgroundExec::AUTO) and (@system_wrapper.windows?))
-
-    # if :auto & not windows, then we append standard '&'
-    return '&' if ((config_exec == BackgroundExec::AUTO) and (not @system_wrapper.windows?))
-
-    # if explicitly Unix, then append '&'
-    return '&' if (config_exec == BackgroundExec::UNIX)
-
-  # * _command_str_:  A hash containing config information.
-    # all other cases, including :none, :win, & anything unrecognized, append nothing
-    return nil
-  end
-
-  ##
-  # Outputs success results if command succeeded and we have verbosity cranked up.
-  # ==== Attributes
-  #
-  # * _command_str_:  The command ran.
-  # * _shell_results_:  The outputs of the command including exit code and
-  # output.
-  # * _boom_:  A boolean representing if a non zero result is erroneous.
-  #
-  def print_happy_results(command_str, shell_result, boom=true)
-    if ((shell_result[:exit_code] == 0) or ((shell_result[:exit_code] != 0) and not boom))
-      output  = "> Shell executed command:\n"
-      output += "'#{command_str}'\n"
-      output += "> Produced output:\n"             if (not shell_result[:output].empty?)
-      output += "#{shell_result[:output].strip}\n" if (not shell_result[:output].empty?)
-      output += "> And exited with status: [#{shell_result[:exit_code]}].\n" if (shell_result[:exit_code] != 0)
-      output += "\n"
-
-      @streaminator.stdout_puts(output, Verbosity::OBNOXIOUS)
-    end
-  end
-
-  ##
-  # Outputs failures results if command failed and we have verbosity set to minimum error level.
-  # ==== Attributes
-  #
-  # * _command_str_:  The command ran.
-  # * _shell_results_:  The outputs of the command including exit code and
-  # output.
-  # * _boom_:  A boolean representing if a non zero result is erroneous.
-  #
-  def print_error_results(command_str, shell_result, boom=true)
-    if ((shell_result[:exit_code] != 0) and boom)
-      output  = "ERROR: Shell command failed.\n"
-      output += "> Shell executed command:\n"
-      output += "'#{command_str}'\n"
-      output += "> Produced output:\n"             if (not shell_result[:output].empty?)
-      output += "#{shell_result[:output].strip}\n" if (not shell_result[:output].empty?)
-      output += "> And exited with status: [#{shell_result[:exit_code]}].\n" if (shell_result[:exit_code] != nil)
-      output += "> And then likely crashed.\n"                               if (shell_result[:exit_code] == nil)
-      output += "\n"
-
-      @streaminator.stderr_puts(output, Verbosity::ERRORS)
-    end
-  end
-end
+require 'ceedling/constants' # for Verbosity enumeration & $stderr redirect enumeration
+
+##
+# Helper functions for the tool executor
+class ToolExecutorHelper
+
+  constructor :streaminator, :system_utils, :system_wrapper
+
+  ##
+  # Returns the stderr redirection based on the config and logging.
+  # ==== Attributes
+  #
+  # * _tool_config_:  A hash containing config information.
+  # * _logging_:  A boolean representing if logging is enabled or not.
+  #
+  def stderr_redirection(tool_config, logging)
+    # if there's no logging enabled, return :stderr_redirect unmodified
+    return tool_config[:stderr_redirect] if (not logging)
+
+    # if there is logging enabled but the redirect is a custom value (not enum), return the custom string
+    return tool_config[:stderr_redirect] if (tool_config[:stderr_redirect].class == String)
+
+    # if logging is enabled but there's no custom string, return the AUTO enumeration so $stderr goes into the log
+    return StdErrRedirect::AUTO
+  end
+
+
+  ##
+  # Returns the background execution prepend based on the config.
+  # ==== Attributes
+  #
+  # * _tool_config_:  A hash containing config information.
+  #
+  def background_exec_cmdline_prepend(tool_config)
+    return nil if (tool_config.nil? || tool_config[:background_exec].nil?)
+
+    config_exec = tool_config[:background_exec]
+
+    if ((config_exec == BackgroundExec::AUTO) and (@system_wrapper.windows?))
+      return 'start'
+    end
+
+    if (config_exec == BackgroundExec::WIN)
+      return 'start'
+    end
+
+    return nil
+  end
+
+
+  ##
+  # Modifies an executables path based on platform.
+  # ==== Attributes
+  #
+  # * _executable_:  The executable's path.
+  #
+  def osify_path_separators(executable)
+    return executable.gsub(/\//, '\\') if (@system_wrapper.windows?)
+    return executable
+  end
+
+  ##
+  # Returns the stderr redirect append based on the config.
+  # ==== Attributes
+  #
+  # * _tool_config_:  A hash containing config information.
+  #
+  def stderr_redirect_cmdline_append(tool_config)
+    return nil if (tool_config.nil? || tool_config[:stderr_redirect].nil?)
+
+    config_redirect = tool_config[:stderr_redirect]
+    redirect        = StdErrRedirect::NONE
+
+    if (config_redirect == StdErrRedirect::AUTO)
+       if (@system_wrapper.windows?)
+         redirect = StdErrRedirect::WIN
+       elsif (@system_utils.tcsh_shell?)
+         redirect = StdErrRedirect::TCSH
+       else
+         redirect = StdErrRedirect::UNIX
+       end
+    end
+
+    case redirect
+      # we may need more complicated processing after some learning with various environments
+      when StdErrRedirect::NONE then nil
+      when StdErrRedirect::WIN  then '2>&1'
+      when StdErrRedirect::UNIX then '2>&1'
+      when StdErrRedirect::TCSH then '|&'
+      else redirect.to_s
+    end
+  end
+
+  ##
+  # Returns the background execution append based on the config.
+  # ==== Attributes
+  #
+  # * _tool_config_:  A hash containing config information.
+  #
+  def background_exec_cmdline_append(tool_config)
+    return nil if (tool_config.nil? || tool_config[:background_exec].nil?)
+
+    config_exec = tool_config[:background_exec]
+
+    # if :auto & windows, then we already prepended 'start' and should append nothing
+    return nil if ((config_exec == BackgroundExec::AUTO) and (@system_wrapper.windows?))
+
+    # if :auto & not windows, then we append standard '&'
+    return '&' if ((config_exec == BackgroundExec::AUTO) and (not @system_wrapper.windows?))
+
+    # if explicitly Unix, then append '&'
+    return '&' if (config_exec == BackgroundExec::UNIX)
+
+  # * _command_str_:  A hash containing config information.
+    # all other cases, including :none, :win, & anything unrecognized, append nothing
+    return nil
+  end
+
+  ##
+  # Outputs success results if command succeeded and we have verbosity cranked up.
+  # ==== Attributes
+  #
+  # * _command_str_:  The command ran.
+  # * _shell_results_:  The outputs of the command including exit code and
+  # output.
+  # * _boom_:  A boolean representing if a non zero result is erroneous.
+  #
+  def print_happy_results(command_str, shell_result, boom=true)
+    if ((shell_result[:exit_code] == 0) or ((shell_result[:exit_code] != 0) and not boom))
+      output  = "> Shell executed command:\n"
+      output += "'#{command_str}'\n"
+      output += "> Produced output:\n"             if (not shell_result[:output].empty?)
+      output += "#{shell_result[:output].strip}\n" if (not shell_result[:output].empty?)
+      output += "> And exited with status: [#{shell_result[:exit_code]}].\n" if (shell_result[:exit_code] != 0)
+      output += "\n"
+
+      @streaminator.stdout_puts(output, Verbosity::OBNOXIOUS)
+    end
+  end
+
+  ##
+  # Outputs failures results if command failed and we have verbosity set to minimum error level.
+  # ==== Attributes
+  #
+  # * _command_str_:  The command ran.
+  # * _shell_results_:  The outputs of the command including exit code and
+  # output.
+  # * _boom_:  A boolean representing if a non zero result is erroneous.
+  #
+  def print_error_results(command_str, shell_result, boom=true)
+    if ((shell_result[:exit_code] != 0) and boom)
+      output  = "ERROR: Shell command failed.\n"
+      output += "> Shell executed command:\n"
+      output += "'#{command_str}'\n"
+      output += "> Produced output:\n"             if (not shell_result[:output].empty?)
+      output += "#{shell_result[:output].strip}\n" if (not shell_result[:output].empty?)
+      output += "> And exited with status: [#{shell_result[:exit_code]}].\n" if (shell_result[:exit_code] != nil)
+      output += "> And then likely crashed.\n"                               if (shell_result[:exit_code] == nil)
+      output += "\n"
+
+      @streaminator.stderr_puts(output, Verbosity::ERRORS)
+    end
+  end
+end

data/lib/ceedling/verbosinator.rb

@@ -1,10 +1,10 @@
-
-class Verbosinator
-
-  constructor :configurator
-
-  def should_output?(level)
-    return (level <= @configurator.project_verbosity)
-  end
-
-end
+
+class Verbosinator
+
+  constructor :configurator
+
+  def should_output?(level)
+    return (level <= @configurator.project_verbosity)
+  end
+
+end

data/lib/ceedling/version.rb

@@ -1,15 +1,36 @@
-# @private
-module Ceedling
-  module Version
-    # @private
-    GEM = "0.28.3"
-    # @private
-    CEEDLING = GEM
-    # @private
-    CEXCEPTION = "1.3.1"
-    # @private
-    CMOCK = "2.4.5"
-    # @private
-    UNITY = "2.4.2"
-  end
-end
+
+# @private
+module Ceedling
+  module Version
+    # Check for local or global version of vendor directory in order to look up versions
+    { 
+      "CEXCEPTION" => File.join("vendor","c_exception","lib","CException.h"),
+      "CMOCK"      => File.join("vendor","cmock","src","cmock.h"),
+      "UNITY"      => File.join("vendor","unity","src","unity.h"),
+    }.each_pair do |name, path|
+      filename = if (File.exist?(File.join("..","..",path)))
+        File.join("..","..",path)
+      elsif (File.exist?(File.join(File.dirname(__FILE__),"..","..",path)))
+        File.join(File.dirname(__FILE__),"..","..",path)
+      else
+        eval "#{name} = 'unknown'"
+        continue
+      end
+
+      # Actually look up the versions
+      a = [0,0,0]
+      File.readlines(filename) do |line|
+        ["VERSION_MAJOR", "VERSION_MINOR", "VERSION_BUILD"].each_with_index do |field, i|
+          m = line.match(/#{name}_#{field}\s+(\d+)/)
+          a[i] = m[1] unless (m.nil?)
+        end
+      end
+
+      # Make a constant from each, so that we can use it elsewhere
+      eval "#{name} = '#{a.join(".")}'"
+    end
+
+    GEM = "0.29.0"
+    CEEDLING = GEM
+  end
+end

data/lib/ceedling/yaml_wrapper.rb

@@ -1,17 +1,17 @@
-require 'yaml'
-require 'erb'
-
-
-class YamlWrapper
-
-  def load(filepath)
-    return YAML.load(ERB.new(File.read(filepath)).result)
-  end
-
-  def dump(filepath, structure)
-    File.open(filepath, 'w') do |output|
-      YAML.dump(structure, output)
-    end
-  end
-
-end
+require 'yaml'
+require 'erb'
+
+
+class YamlWrapper
+
+  def load(filepath)
+    return YAML.load(ERB.new(File.read(filepath)).result)
+  end
+
+  def dump(filepath, structure)
+    File.open(filepath, 'w') do |output|
+      YAML.dump(structure, output)
+    end
+  end
+
+end

data/license.txt

@@ -1,31 +1,31 @@
- Copyright (c) 2007-2017 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 Unity 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.
+ Copyright (c) 2007-2019 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 Unity 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.