ceedling 0.13.0 → 0.15.0

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

@@ -1,64 +1,64 @@
-require 'constants'
-
-
-class ProjectFileLoader
-
-  attr_reader :main_file, :user_file
-
-  constructor :yaml_wrapper, :stream_wrapper, :system_wrapper, :file_wrapper
-
-  def setup
-    @main_file = nil
-    @user_file = nil
-    
-    @main_project_filepath = ''
-    @user_project_filepath = ''
-  end
-
-
-  def find_project_files
-    # first go hunting for optional user project file by looking for environment variable and then default location on disk
-    user_filepath = @system_wrapper.env_get('CEEDLING_USER_PROJECT_FILE')
-    
-    if ( not user_filepath.nil? and @file_wrapper.exist?(user_filepath) )
-      @user_project_filepath = user_filepath
-    elsif (@file_wrapper.exist?(DEFAULT_CEEDLING_USER_PROJECT_FILE))
-      @user_project_filepath = DEFAULT_CEEDLING_USER_PROJECT_FILE
-    end
-    
-    # next check for main project file by looking for environment variable and then default location on disk;
-    # blow up if we don't find this guy -- like, he's so totally important
-    main_filepath = @system_wrapper.env_get('CEEDLING_MAIN_PROJECT_FILE')
-    
-    if ( not main_filepath.nil? and @file_wrapper.exist?(main_filepath) )
-      @main_project_filepath = main_filepath
-    elsif (@file_wrapper.exist?(DEFAULT_CEEDLING_MAIN_PROJECT_FILE))
-      @main_project_filepath = DEFAULT_CEEDLING_MAIN_PROJECT_FILE
-    else
-      # no verbosity checking since this is lowest level reporting anyhow &
-      # verbosity checking depends on configurator which in turns needs this class (circular dependency)
-      @stream_wrapper.stderr_puts('Found no Ceedling project file (*.yml)')
-      raise
-    end
-    
-    @main_file = File.basename( @main_project_filepath )
-    @user_file = File.basename( @user_project_filepath ) if ( not @user_project_filepath.empty? )
-  end
-
-
-  def load_project_config
-    config_hash = {}
-    
-    # if there's no user project file, then just provide hash from project file
-    if (@user_project_filepath.empty?)
-      config_hash = @yaml_wrapper.load(@main_project_filepath)
-    # if there is a user project file, load it too and merge it on top of the project file,
-    # superseding anything that's common between them
-    else
-      config_hash = (@yaml_wrapper.load(@main_project_filepath)).merge(@yaml_wrapper.load(@user_project_filepath))
-    end
-    
-    return config_hash
-  end
-      
-end
+require 'ceedling/constants'
+
+
+class ProjectFileLoader
+
+  attr_reader :main_file, :user_file
+
+  constructor :yaml_wrapper, :stream_wrapper, :system_wrapper, :file_wrapper
+
+  def setup
+    @main_file = nil
+    @user_file = nil
+    
+    @main_project_filepath = ''
+    @user_project_filepath = ''
+  end
+
+
+  def find_project_files
+    # first go hunting for optional user project file by looking for environment variable and then default location on disk
+    user_filepath = @system_wrapper.env_get('CEEDLING_USER_PROJECT_FILE')
+    
+    if ( not user_filepath.nil? and @file_wrapper.exist?(user_filepath) )
+      @user_project_filepath = user_filepath
+    elsif (@file_wrapper.exist?(DEFAULT_CEEDLING_USER_PROJECT_FILE))
+      @user_project_filepath = DEFAULT_CEEDLING_USER_PROJECT_FILE
+    end
+    
+    # next check for main project file by looking for environment variable and then default location on disk;
+    # blow up if we don't find this guy -- like, he's so totally important
+    main_filepath = @system_wrapper.env_get('CEEDLING_MAIN_PROJECT_FILE')
+    
+    if ( not main_filepath.nil? and @file_wrapper.exist?(main_filepath) )
+      @main_project_filepath = main_filepath
+    elsif (@file_wrapper.exist?(DEFAULT_CEEDLING_MAIN_PROJECT_FILE))
+      @main_project_filepath = DEFAULT_CEEDLING_MAIN_PROJECT_FILE
+    else
+      # no verbosity checking since this is lowest level reporting anyhow &
+      # verbosity checking depends on configurator which in turns needs this class (circular dependency)
+      @stream_wrapper.stderr_puts('Found no Ceedling project file (*.yml)')
+      raise
+    end
+    
+    @main_file = File.basename( @main_project_filepath )
+    @user_file = File.basename( @user_project_filepath ) if ( not @user_project_filepath.empty? )
+  end
+
+
+  def load_project_config
+    config_hash = {}
+    
+    # if there's no user project file, then just provide hash from project file
+    if (@user_project_filepath.empty?)
+      config_hash = @yaml_wrapper.load(@main_project_filepath)
+    # if there is a user project file, load it too and merge it on top of the project file,
+    # superseding anything that's common between them
+    else
+      config_hash = (@yaml_wrapper.load(@main_project_filepath)).merge(@yaml_wrapper.load(@user_project_filepath))
+    end
+    
+    return config_hash
+  end
+      
+end

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

@@ -1,17 +1,17 @@
-
-class RakeUtils
-  
-  constructor :rake_wrapper
-
-  def task_invoked?(task_regex)
-    task_invoked = false
-    @rake_wrapper.task_list.each do |task|
-      if ((task.already_invoked) and (task.to_s =~ task_regex))
-        task_invoked = true
-        break
-      end
-    end
-    return task_invoked
-  end
-
-end
+
+class RakeUtils
+  
+  constructor :rake_wrapper
+
+  def task_invoked?(task_regex)
+    task_invoked = false
+    @rake_wrapper.task_list.each do |task|
+      if ((task.already_invoked) and (task.to_s =~ task_regex))
+        task_invoked = true
+        break
+      end
+    end
+    return task_invoked
+  end
+
+end

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

@@ -1,33 +1,33 @@
-require 'rubygems'
-require 'rake'
-require 'makefile' # our replacement for rake's make-style dependency loader
-
-include Rake::DSL if defined?(Rake::DSL)
-
-class Rake::Task
-  attr_reader :already_invoked
-end
-
-class RakeWrapper
-
-  def initialize
-    @makefile_loader = Rake::MakefileLoader.new # use our custom replacement noted above
-  end
-
-  def [](task)
-    return Rake::Task[task]
-  end
-
-  def task_list
-    return Rake::Task.tasks
-  end
-
-  def create_file_task(file_task, dependencies)
-    file(file_task => dependencies)
-  end
-
-  def load_dependencies(dependencies_path)
-    @makefile_loader.load(dependencies_path)
-  end
-
-end
+require 'rubygems'
+require 'rake'
+require 'ceedling/makefile' # our replacement for rake's make-style dependency loader
+
+include Rake::DSL if defined?(Rake::DSL)
+
+class Rake::Task
+  attr_reader :already_invoked
+end
+
+class RakeWrapper
+
+  def initialize
+    @makefile_loader = Rake::MakefileLoader.new # use our custom replacement noted above
+  end
+
+  def [](task)
+    return Rake::Task[task]
+  end
+
+  def task_list
+    return Rake::Task.tasks
+  end
+
+  def create_file_task(file_task, dependencies)
+    file(file_task => dependencies)
+  end
+
+  def load_dependencies(dependencies_path)
+    @makefile_loader.load(dependencies_path)
+  end
+
+end

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

@@ -1,74 +1,78 @@
-require 'fileutils'
-
-# get directory containing this here file, back up one directory, and expand to full path
-CEEDLING_ROOT    = File.expand_path(File.dirname(__FILE__) + '/..')
-CEEDLING_LIB     = File.join(CEEDLING_ROOT, 'lib')
-CEEDLING_VENDOR  = File.join(CEEDLING_ROOT, 'vendor')
-CEEDLING_RELEASE = File.join(CEEDLING_ROOT, 'release')
-
-$LOAD_PATH.unshift( CEEDLING_LIB )
-$LOAD_PATH.unshift( File.join(CEEDLING_VENDOR, 'unity/auto') )
-$LOAD_PATH.unshift( File.join(CEEDLING_VENDOR, 'diy/lib') )
-$LOAD_PATH.unshift( File.join(CEEDLING_VENDOR, 'constructor/lib') )
-$LOAD_PATH.unshift( File.join(CEEDLING_VENDOR, 'cmock/lib') )
-$LOAD_PATH.unshift( File.join(CEEDLING_VENDOR, 'deep_merge/lib') )
-
-require 'rake'
-
-require 'diy'
-require 'constructor'
-
-require 'constants'
-require 'target_loader'
-
-
-# construct all our objects
-@ceedling = DIY::Context.from_yaml( File.read( File.join(CEEDLING_LIB, 'objects.yml') ) )
-@ceedling.build_everything
-
-# one-stop shopping for all our setup and such after construction
-@ceedling[:setupinator].ceedling = @ceedling
-
-project_config =
-  begin
-    cfg = @ceedling[:setupinator].load_project_files
-    TargetLoader.inspect(cfg, ENV['TARGET'])
-  rescue TargetLoader::NoTargets
-    cfg
-  rescue TargetLoader::RequestReload
-    @ceedling[:setupinator].load_project_files
-  end
-
-@ceedling[:setupinator].do_setup( project_config )
-
-
-# tell all our plugins we're about to do something
-@ceedling[:plugin_manager].pre_build
-
-# load rakefile component files (*.rake)
-PROJECT_RAKEFILE_COMPONENT_FILES.each { |component| load(component) }
-
-# tell rake to shut up by default (overridden in verbosity / debug tasks as appropriate)
-verbose(false)
-
-
-# end block always executed following rake run
-END {
-  # cache our input configurations to use in comparison upon next execution
-  @ceedling[:cacheinator].cache_test_config( @ceedling[:setupinator].config_hash )    if (@ceedling[:task_invoker].test_invoked?)
-  @ceedling[:cacheinator].cache_release_config( @ceedling[:setupinator].config_hash ) if (@ceedling[:task_invoker].release_invoked?)
-
-  # delete all temp files unless we're in debug mode
-  if (not @ceedling[:configurator].project_debug)
-    @ceedling[:file_wrapper].rm_f( @ceedling[:file_wrapper].directory_listing( File.join(@ceedling[:configurator].project_temp_path, '*') ))
-  end
-
-	# only perform these final steps if we got here without runtime exceptions or errors
-	if (@ceedling[:system_wrapper].ruby_success)
-
-    # tell all our plugins the build is done and process results
-	  @ceedling[:plugin_manager].post_build
-	  @ceedling[:plugin_manager].print_plugin_failures
-	  exit(1) if (@ceedling[:plugin_manager].plugins_failed?)
-	end
-}
+require 'fileutils'
+
+# get directory containing this here file, back up one directory, and expand to full path
+CEEDLING_ROOT    = File.expand_path(File.dirname(__FILE__) + '/../..')
+CEEDLING_LIB     = File.join(CEEDLING_ROOT, 'lib')
+CEEDLING_VENDOR  = File.join(CEEDLING_ROOT, 'vendor')
+CEEDLING_RELEASE = File.join(CEEDLING_ROOT, 'release')
+
+$LOAD_PATH.unshift( CEEDLING_LIB )
+$LOAD_PATH.unshift( File.join(CEEDLING_VENDOR, 'unity/auto') )
+$LOAD_PATH.unshift( File.join(CEEDLING_VENDOR, 'diy/lib') )
+$LOAD_PATH.unshift( File.join(CEEDLING_VENDOR, 'constructor/lib') )
+$LOAD_PATH.unshift( File.join(CEEDLING_VENDOR, 'cmock/lib') )
+$LOAD_PATH.unshift( File.join(CEEDLING_VENDOR, 'deep_merge/lib') )
+
+require 'rake'
+
+require 'diy'
+require 'constructor'
+
+require 'ceedling/constants'
+require 'ceedling/target_loader'
+
+
+# construct all our objects
+# ensure load path contains all libraries needed first
+lib_ceedling_load_path_temp = File.join(CEEDLING_LIB, 'ceedling')
+$LOAD_PATH.unshift( lib_ceedling_load_path_temp )
+@ceedling = DIY::Context.from_yaml( File.read( File.join(lib_ceedling_load_path_temp, 'objects.yml') ) )
+@ceedling.build_everything
+# now that all objects are built, delete 'lib/ceedling' from load path
+$LOAD_PATH.delete(lib_ceedling_load_path_temp)
+# one-stop shopping for all our setup and such after construction
+@ceedling[:setupinator].ceedling = @ceedling
+
+project_config =
+  begin
+    cfg = @ceedling[:setupinator].load_project_files
+    TargetLoader.inspect(cfg, ENV['TARGET'])
+  rescue TargetLoader::NoTargets
+    cfg
+  rescue TargetLoader::RequestReload
+    @ceedling[:setupinator].load_project_files
+  end
+
+@ceedling[:setupinator].do_setup( project_config )
+
+
+# tell all our plugins we're about to do something
+@ceedling[:plugin_manager].pre_build
+
+# load rakefile component files (*.rake)
+PROJECT_RAKEFILE_COMPONENT_FILES.each { |component| load(component) }
+
+# tell rake to shut up by default (overridden in verbosity / debug tasks as appropriate)
+verbose(false)
+
+
+# end block always executed following rake run
+END {
+  # cache our input configurations to use in comparison upon next execution
+  @ceedling[:cacheinator].cache_test_config( @ceedling[:setupinator].config_hash )    if (@ceedling[:task_invoker].test_invoked?)
+  @ceedling[:cacheinator].cache_release_config( @ceedling[:setupinator].config_hash ) if (@ceedling[:task_invoker].release_invoked?)
+
+  # delete all temp files unless we're in debug mode
+  if (not @ceedling[:configurator].project_debug)
+    @ceedling[:file_wrapper].rm_f( @ceedling[:file_wrapper].directory_listing( File.join(@ceedling[:configurator].project_temp_path, '*') ))
+  end
+
+	# only perform these final steps if we got here without runtime exceptions or errors
+	if (@ceedling[:system_wrapper].ruby_success)
+
+    # tell all our plugins the build is done and process results
+	  @ceedling[:plugin_manager].post_build
+	  @ceedling[:plugin_manager].print_plugin_failures
+	  exit(1) if (@ceedling[:plugin_manager].plugins_failed?)
+	end
+}

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

@@ -1,58 +1,58 @@
-require 'constants'
-
-
-class ReleaseInvoker
-
-  constructor :configurator, :release_invoker_helper, :build_invoker_utils, :dependinator, :task_invoker, :file_path_utils, :file_wrapper
-
-
-  def setup_and_invoke_c_objects( c_files )
-    objects = @file_path_utils.form_release_build_c_objects_filelist( c_files )
-
-    begin
-      @release_invoker_helper.process_deep_dependencies( @file_path_utils.form_release_dependencies_filelist( c_files ) )
-
-      @dependinator.enhance_release_file_dependencies( objects )
-      @task_invoker.invoke_release_objects( objects )
-    rescue => e
-      @build_invoker_utils.process_exception( e, RELEASE_SYM, false )
-    end
-
-    return objects
-  end
-
-
-  def setup_and_invoke_asm_objects( asm_files )
-    objects = @file_path_utils.form_release_build_asm_objects_filelist( asm_files )
-
-    begin
-      @dependinator.enhance_release_file_dependencies( objects )
-      @task_invoker.invoke_release_objects( objects )
-    rescue => e
-      @build_invoker_utils.process_exception( e, RELEASE_SYM, false )
-    end
-    
-    return objects
-  end
-
-
-  def refresh_c_deep_dependencies
-    return if (not @configurator.project_use_deep_dependencies)
-
-    @file_wrapper.rm_f( 
-      @file_wrapper.directory_listing( 
-        File.join( @configurator.project_release_dependencies_path, '*' + @configurator.extension_dependencies ) ) )
-
-    @release_invoker_helper.process_deep_dependencies( 
-      @file_path_utils.form_release_dependencies_filelist( 
-        @configurator.collection_all_source ) )    
-  end
-
-
-  def artifactinate( *files )
-    files.flatten.each do |file|
-      @file_wrapper.cp( file, @configurator.project_release_artifacts_path ) if @file_wrapper.exist?( file )
-    end
-  end
-
-end
+require 'ceedling/constants'
+
+
+class ReleaseInvoker
+
+  constructor :configurator, :release_invoker_helper, :build_invoker_utils, :dependinator, :task_invoker, :file_path_utils, :file_wrapper
+
+
+  def setup_and_invoke_c_objects( c_files )
+    objects = @file_path_utils.form_release_build_c_objects_filelist( c_files )
+
+    begin
+      @release_invoker_helper.process_deep_dependencies( @file_path_utils.form_release_dependencies_filelist( c_files ) )
+
+      @dependinator.enhance_release_file_dependencies( objects )
+      @task_invoker.invoke_release_objects( objects )
+    rescue => e
+      @build_invoker_utils.process_exception( e, RELEASE_SYM, false )
+    end
+
+    return objects
+  end
+
+
+  def setup_and_invoke_asm_objects( asm_files )
+    objects = @file_path_utils.form_release_build_asm_objects_filelist( asm_files )
+
+    begin
+      @dependinator.enhance_release_file_dependencies( objects )
+      @task_invoker.invoke_release_objects( objects )
+    rescue => e
+      @build_invoker_utils.process_exception( e, RELEASE_SYM, false )
+    end
+    
+    return objects
+  end
+
+
+  def refresh_c_deep_dependencies
+    return if (not @configurator.project_use_deep_dependencies)
+
+    @file_wrapper.rm_f( 
+      @file_wrapper.directory_listing( 
+        File.join( @configurator.project_release_dependencies_path, '*' + @configurator.extension_dependencies ) ) )
+
+    @release_invoker_helper.process_deep_dependencies( 
+      @file_path_utils.form_release_dependencies_filelist( 
+        @configurator.collection_all_source ) )    
+  end
+
+
+  def artifactinate( *files )
+    files.flatten.each do |file|
+      @file_wrapper.cp( file, @configurator.project_release_artifacts_path ) if @file_wrapper.exist?( file )
+    end
+  end
+
+end