ceedling 0.13.0 → 0.15.0

data/lib/{setupinator.rb → ceedling/setupinator.rb}

@@ -1,51 +1,51 @@
-
-class Setupinator
-
-  attr_reader :config_hash
-  attr_writer :ceedling
-
-  def setup
-    @ceedling = {}
-    @config_hash = {}
-  end
-
-  def load_project_files
-    @ceedling[:project_file_loader].find_project_files
-    return @ceedling[:project_file_loader].load_project_config
-  end
-
-  def do_setup(config_hash)
-    @config_hash = config_hash
-
-    # load up all the constants and accessors our rake files, objects, & external scripts will need;
-    # 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_cmock_defaults( config_hash )
-    @ceedling[:configurator].find_and_merge_plugins( config_hash )
-    @ceedling[:configurator].tools_setup( config_hash )
-    @ceedling[:configurator].eval_environment_variables( config_hash )
-    @ceedling[:configurator].eval_paths( config_hash )
-    @ceedling[:configurator].standardize_paths( config_hash )
-    @ceedling[:configurator].validate( config_hash )
-    @ceedling[:configurator].build( config_hash, :environment )
-    
-    @ceedling[:configurator].insert_rake_plugins( @ceedling[:configurator].rake_plugins )
-    @ceedling[:configurator].tools_supplement_arguments( config_hash )
-    
-    # merge in any environment variables plugins specify, after the main build
-    @ceedling[:plugin_manager].load_plugin_scripts( @ceedling[:configurator].script_plugins, @ceedling ) do |env|
-      @ceedling[:configurator].eval_environment_variables( env )
-      @ceedling[:configurator].build_supplement( config_hash, env )
-    end
-    
-    @ceedling[:plugin_reportinator].set_system_objects( @ceedling )
-    @ceedling[:file_finder].prepare_search_sources
-    @ceedling[:loginator].setup_log_filepath
-    @ceedling[:project_config_manager].config_hash = config_hash
-  end
-
-  def reset_defaults(config_hash)
-    @ceedling[:configurator].reset_defaults( config_hash )
-  end
-end
+
+class Setupinator
+
+  attr_reader :config_hash
+  attr_writer :ceedling
+
+  def setup
+    @ceedling = {}
+    @config_hash = {}
+  end
+
+  def load_project_files
+    @ceedling[:project_file_loader].find_project_files
+    return @ceedling[:project_file_loader].load_project_config
+  end
+
+  def do_setup(config_hash)
+    @config_hash = config_hash
+
+    # load up all the constants and accessors our rake files, objects, & external scripts will need;
+    # 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_cmock_defaults( config_hash )
+    @ceedling[:configurator].find_and_merge_plugins( config_hash )
+    @ceedling[:configurator].tools_setup( config_hash )
+    @ceedling[:configurator].eval_environment_variables( config_hash )
+    @ceedling[:configurator].eval_paths( config_hash )
+    @ceedling[:configurator].standardize_paths( config_hash )
+    @ceedling[:configurator].validate( config_hash )
+    @ceedling[:configurator].build( config_hash, :environment )
+    
+    @ceedling[:configurator].insert_rake_plugins( @ceedling[:configurator].rake_plugins )
+    @ceedling[:configurator].tools_supplement_arguments( config_hash )
+    
+    # merge in any environment variables plugins specify, after the main build
+    @ceedling[:plugin_manager].load_plugin_scripts( @ceedling[:configurator].script_plugins, @ceedling ) do |env|
+      @ceedling[:configurator].eval_environment_variables( env )
+      @ceedling[:configurator].build_supplement( config_hash, env )
+    end
+    
+    @ceedling[:plugin_reportinator].set_system_objects( @ceedling )
+    @ceedling[:file_finder].prepare_search_sources
+    @ceedling[:loginator].setup_log_filepath
+    @ceedling[:project_config_manager].config_hash = config_hash
+  end
+
+  def reset_defaults(config_hash)
+    @ceedling[:configurator].reset_defaults( config_hash )
+  end
+end

data/lib/{stream_wrapper.rb → ceedling/stream_wrapper.rb}

@@ -1,20 +1,20 @@
-
-class StreamWrapper
-
-  def stdout_puts(string)
-    $stdout.puts(string)
-  end
-
-  def stdout_flush
-    $stdout.flush
-  end
-  
-  def stderr_puts(string)
-    $stderr.puts(string)
-  end
-
-  def stderr_flush
-    $stderr.flush
-  end
-
-end
+
+class StreamWrapper
+
+  def stdout_puts(string)
+    $stdout.puts(string)
+  end
+
+  def stdout_flush
+    $stdout.flush
+  end
+  
+  def stderr_puts(string)
+    $stderr.puts(string)
+  end
+
+  def stderr_flush
+    $stderr.flush
+  end
+
+end

data/lib/{streaminator.rb → ceedling/streaminator.rb}

@@ -1,41 +1,40 @@
-
-class Streaminator
-
-  require 'constants'
-
-  constructor :streaminator_helper, :verbosinator, :loginator, :stream_wrapper
-
-  # for those objects for whom the configurator has already been instantiated,
-  # Streaminator is a convenience object for handling verbosity and writing to the std streams
-
-  def stdout_puts(string, verbosity=Verbosity::NORMAL)
-    if (@verbosinator.should_output?(verbosity))
-      @stream_wrapper.stdout_puts(string)
-      @stream_wrapper.stdout_flush
-    end
-    
-    # write to log as though Verbosity::OBNOXIOUS
-    @loginator.log( string, @streaminator_helper.extract_name($stdout) )
-  end
-
-  def stderr_puts(string, verbosity=Verbosity::NORMAL)
-    if (@verbosinator.should_output?(verbosity))
-      @stream_wrapper.stderr_puts(string)
-      @stream_wrapper.stderr_flush
-    end
-
-    # write to log as though Verbosity::OBNOXIOUS
-    @loginator.log( string, @streaminator_helper.extract_name($stderr) )
-  end
-
-  def stream_puts(stream, string, verbosity=Verbosity::NORMAL)
-    if (@verbosinator.should_output?(verbosity))
-      stream.puts(string)
-      stream.flush
-    end
-
-    # write to log as though Verbosity::OBNOXIOUS
-    @loginator.log( string, @streaminator_helper.extract_name(stream) )
-  end
-
-end
+require 'ceedling/constants'
+
+class Streaminator
+
+  constructor :streaminator_helper, :verbosinator, :loginator, :stream_wrapper
+
+  # for those objects for whom the configurator has already been instantiated,
+  # Streaminator is a convenience object for handling verbosity and writing to the std streams
+
+  def stdout_puts(string, verbosity=Verbosity::NORMAL)
+    if (@verbosinator.should_output?(verbosity))
+      @stream_wrapper.stdout_puts(string)
+      @stream_wrapper.stdout_flush
+    end
+    
+    # write to log as though Verbosity::OBNOXIOUS
+    @loginator.log( string, @streaminator_helper.extract_name($stdout) )
+  end
+
+  def stderr_puts(string, verbosity=Verbosity::NORMAL)
+    if (@verbosinator.should_output?(verbosity))
+      @stream_wrapper.stderr_puts(string)
+      @stream_wrapper.stderr_flush
+    end
+
+    # write to log as though Verbosity::OBNOXIOUS
+    @loginator.log( string, @streaminator_helper.extract_name($stderr) )
+  end
+
+  def stream_puts(stream, string, verbosity=Verbosity::NORMAL)
+    if (@verbosinator.should_output?(verbosity))
+      stream.puts(string)
+      stream.flush
+    end
+
+    # write to log as though Verbosity::OBNOXIOUS
+    @loginator.log( string, @streaminator_helper.extract_name(stream) )
+  end
+
+end

data/lib/{streaminator_helper.rb → ceedling/streaminator_helper.rb}

@@ -1,15 +1,15 @@
-
-class StreaminatorHelper
-
-  def extract_name(stream)
-    name = case (stream.fileno)
-      when 0 then '#<IO:$stdin>'
-      when 1 then '#<IO:$stdout>'
-      when 2 then '#<IO:$stderr>'
-      else stream.inspect
-    end
-    
-    return name
-  end
-
-end
+
+class StreaminatorHelper
+
+  def extract_name(stream)
+    name = case (stream.fileno)
+      when 0 then '#<IO:$stdin>'
+      when 1 then '#<IO:$stdout>'
+      when 2 then '#<IO:$stderr>'
+      else stream.inspect
+    end
+    
+    return name
+  end
+
+end

data/lib/{system_wrapper.rb → ceedling/system_wrapper.rb}

@@ -1,76 +1,76 @@
-require 'rbconfig'
-
-class SystemWrapper
-
-  # static method for use in defaults
-  def self.windows?
-    return ((RbConfig::CONFIG['host_os'] =~ /mswin|mingw/) ? true : false) if defined?(RbConfig)
-    return ((Config::CONFIG['host_os'] =~ /mswin|mingw/) ? true : false)
-  end
-
-  # class method so as to be mockable for tests
-  def windows?
-    return SystemWrapper.windows?
-  end
-  
-  def module_eval(string)
-    return Object.module_eval("\"" + string + "\"")
-  end
-
-  def eval(string)
-    return eval(string)
-  end
-
-  def search_paths
-    return ENV['PATH'].split(File::PATH_SEPARATOR)
-  end
-
-  def cmdline_args
-    return ARGV
-  end
-
-  def env_set(name, value)
-    ENV[name] = value
-  end
-  
-  def env_get(name)
-    return ENV[name]
-  end
-
-  def time_now
-    return Time.now.asctime
-  end
-
-  def shell_backticks(command)
-    return {
-      :output    => `#{command}`.freeze,
-      :exit_code => ($?.exitstatus).freeze
-    }
-  end
-
-  def shell_system(command)
-    system( command )
-    return {
-      :output    => ''.freeze,
-      :exit_code => ($?.exitstatus).freeze
-    }
-  end
-  
-  def add_load_path(path)
-    $LOAD_PATH.unshift(path)
-  end
-  
-  def require_file(path)
-    require(path)
-  end
-
-  def ruby_success
-    return ($!.nil? || $!.is_a?(SystemExit) && $!.success?)
-  end
-
-  def constants_include?(item)
-    # forcing to strings provides consistency across Ruby versions
-    return Object.constants.map{|constant| constant.to_s}.include?(item.to_s)
-  end
-  
-end
+require 'rbconfig'
+
+class SystemWrapper
+
+  # static method for use in defaults
+  def self.windows?
+    return ((RbConfig::CONFIG['host_os'] =~ /mswin|mingw/) ? true : false) if defined?(RbConfig)
+    return ((Config::CONFIG['host_os'] =~ /mswin|mingw/) ? true : false)
+  end
+
+  # class method so as to be mockable for tests
+  def windows?
+    return SystemWrapper.windows?
+  end
+  
+  def module_eval(string)
+    return Object.module_eval("\"" + string + "\"")
+  end
+
+  def eval(string)
+    return eval(string)
+  end
+
+  def search_paths
+    return ENV['PATH'].split(File::PATH_SEPARATOR)
+  end
+
+  def cmdline_args
+    return ARGV
+  end
+
+  def env_set(name, value)
+    ENV[name] = value
+  end
+  
+  def env_get(name)
+    return ENV[name]
+  end
+
+  def time_now
+    return Time.now.asctime
+  end
+
+  def shell_backticks(command)
+    return {
+      :output    => `#{command}`.freeze,
+      :exit_code => ($?.exitstatus).freeze
+    }
+  end
+
+  def shell_system(command)
+    system( command )
+    return {
+      :output    => ''.freeze,
+      :exit_code => ($?.exitstatus).freeze
+    }
+  end
+  
+  def add_load_path(path)
+    $LOAD_PATH.unshift(path)
+  end
+  
+  def require_file(path)
+    require(path)
+  end
+
+  def ruby_success
+    return ($!.nil? || $!.is_a?(SystemExit) && $!.success?)
+  end
+
+  def constants_include?(item)
+    # forcing to strings provides consistency across Ruby versions
+    return Object.constants.map{|constant| constant.to_s}.include?(item.to_s)
+  end
+  
+end

data/lib/{task_invoker.rb → ceedling/task_invoker.rb}

@@ -1,89 +1,89 @@
-require "par_map"
-
-class TaskInvoker
-
-  constructor :dependinator, :rake_utils, :rake_wrapper
-
-  def setup
-    @test_regexs = [/^#{TEST_ROOT_NAME}:/]
-    @release_regexs = [/^#{RELEASE_ROOT_NAME}(:|$)/]
-  end
-  
-  def add_test_task_regex(regex)
-    @test_regexs << regex
-  end
-
-  def add_release_task_regex(regex)
-    @release_regexs << regex
-  end
-  
-  def test_invoked?
-    invoked = false
-    
-    @test_regexs.each do |regex|
-      invoked = true if (@rake_utils.task_invoked?(regex))
-      break if invoked
-    end
-    
-    return invoked
-  end
-  
-  def release_invoked?
-    invoked = false
-    
-    @release_regexs.each do |regex|
-      invoked = true if (@rake_utils.task_invoked?(regex))
-      break if invoked
-    end
-    
-    return invoked
-  end
-
-  def invoked?(regex)
-    return @rake_utils.task_invoked?(regex)
-  end
-
-  
-  def invoke_test_mocks(mocks)
-    @dependinator.enhance_mock_dependencies( mocks )
-    mocks.each { |mock| @rake_wrapper[mock].invoke }
-  end
-  
-  def invoke_test_runner(runner)
-    @dependinator.enhance_runner_dependencies( runner )
-    @rake_wrapper[runner].invoke
-  end
-
-  def invoke_test_shallow_include_lists(files)
-    @dependinator.enhance_shallow_include_lists_dependencies( files )
-    files.each { |file| @rake_wrapper[file].invoke }
-  end
-
-  def invoke_test_preprocessed_files(files)
-    @dependinator.enhance_preprocesed_file_dependencies( files )
-    files.each { |file| @rake_wrapper[file].invoke }
-  end
-
-  def invoke_test_dependencies_files(files)
-    @dependinator.enhance_dependencies_dependencies( files )
-    files.each { |file| @rake_wrapper[file].invoke }
-  end
-
-  def invoke_test_results(result)
-    @dependinator.enhance_results_dependencies( result )
-    @rake_wrapper[result].invoke
-  end
-
-  def invoke_release_dependencies_files(files)
-    par_map(PROJECT_COMPILE_THREADS, files) do |file|
-       @rake_wrapper[file].invoke
-    end
-  end
-  
-  def invoke_release_objects(objects)
-    par_map(PROJECT_COMPILE_THREADS, objects) do |object|
-       @rake_wrapper[object].invoke
-    end
-  end
-  
-end
+require 'ceedling/par_map'
+
+class TaskInvoker
+
+  constructor :dependinator, :rake_utils, :rake_wrapper
+
+  def setup
+    @test_regexs = [/^#{TEST_ROOT_NAME}:/]
+    @release_regexs = [/^#{RELEASE_ROOT_NAME}(:|$)/]
+  end
+  
+  def add_test_task_regex(regex)
+    @test_regexs << regex
+  end
+
+  def add_release_task_regex(regex)
+    @release_regexs << regex
+  end
+  
+  def test_invoked?
+    invoked = false
+    
+    @test_regexs.each do |regex|
+      invoked = true if (@rake_utils.task_invoked?(regex))
+      break if invoked
+    end
+    
+    return invoked
+  end
+  
+  def release_invoked?
+    invoked = false
+    
+    @release_regexs.each do |regex|
+      invoked = true if (@rake_utils.task_invoked?(regex))
+      break if invoked
+    end
+    
+    return invoked
+  end
+
+  def invoked?(regex)
+    return @rake_utils.task_invoked?(regex)
+  end
+
+  
+  def invoke_test_mocks(mocks)
+    @dependinator.enhance_mock_dependencies( mocks )
+    mocks.each { |mock| @rake_wrapper[mock].invoke }
+  end
+  
+  def invoke_test_runner(runner)
+    @dependinator.enhance_runner_dependencies( runner )
+    @rake_wrapper[runner].invoke
+  end
+
+  def invoke_test_shallow_include_lists(files)
+    @dependinator.enhance_shallow_include_lists_dependencies( files )
+    files.each { |file| @rake_wrapper[file].invoke }
+  end
+
+  def invoke_test_preprocessed_files(files)
+    @dependinator.enhance_preprocesed_file_dependencies( files )
+    files.each { |file| @rake_wrapper[file].invoke }
+  end
+
+  def invoke_test_dependencies_files(files)
+    @dependinator.enhance_dependencies_dependencies( files )
+    files.each { |file| @rake_wrapper[file].invoke }
+  end
+
+  def invoke_test_results(result)
+    @dependinator.enhance_results_dependencies( result )
+    @rake_wrapper[result].invoke
+  end
+
+  def invoke_release_dependencies_files(files)
+    par_map(PROJECT_COMPILE_THREADS, files) do |file|
+       @rake_wrapper[file].invoke
+    end
+  end
+  
+  def invoke_release_objects(objects)
+    par_map(PROJECT_COMPILE_THREADS, objects) do |object|
+       @rake_wrapper[object].invoke
+    end
+  end
+  
+end