ceedling 0.13.0 → 0.15.0

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

@@ -1,124 +1,124 @@
-require 'constants'
-
-class ConfiguratorPlugins
-
-  constructor :stream_wrapper, :file_wrapper, :system_wrapper
-  attr_reader :rake_plugins, :script_plugins
-
-  def setup
-    @rake_plugins   = []
-    @script_plugins = []
-  end
-
-  
-  def add_load_paths(config)
-    plugin_paths = {}
-    
-    config[:plugins][:load_paths].each do |root|
-      @system_wrapper.add_load_path( root ) if ( not @file_wrapper.directory_listing( File.join( root, '*.rb' ) ).empty? )
-    
-      config[:plugins][:enabled].each do |plugin|
-        path = File.join(root, plugin, "lib")
-        old_path = File.join( root, plugin )
-
-        if ( not @file_wrapper.directory_listing( File.join( path, '*.rb' ) ).empty? )
-          plugin_paths[(plugin + '_path').to_sym] = path
-          @system_wrapper.add_load_path( path )
-        elsif ( not @file_wrapper.directory_listing( File.join( old_path, '*.rb' ) ).empty? )
-          plugin_paths[(plugin + '_path').to_sym] = old_path
-          @system_wrapper.add_load_path( old_path )
-        end
-      end
-    end
-    
-    return plugin_paths
-  end
-  
-  
-  # gather up and return .rake filepaths that exist on-disk
-  def find_rake_plugins(config)
-    plugins_with_path = []
-    
-    config[:plugins][:load_paths].each do |root|
-      config[:plugins][:enabled].each do |plugin|
-        rake_plugin_path = File.join(root, plugin, "#{plugin}.rake")
-        if (@file_wrapper.exist?(rake_plugin_path))
-          plugins_with_path << rake_plugin_path
-          @rake_plugins << plugin
-        end
-      end
-    end
-    
-    return plugins_with_path
-  end
-
-
-  # gather up and return just names of .rb classes that exist on-disk
-  def find_script_plugins(config)
-    config[:plugins][:load_paths].each do |root|
-      config[:plugins][:enabled].each do |plugin|
-        script_plugin_path = File.join(root, plugin, "lib", "#{plugin}.rb")
-
-        # Add the old path here to support legacy style. Eventaully remove.
-        old_script_plugin_path = File.join(root, plugin, "#{plugin}.rb")
-
-        if @file_wrapper.exist?(script_plugin_path) or @file_wrapper.exist?(old_script_plugin_path)
-          @script_plugins << plugin 
-        end
-
-        # Print depreciation warning.
-        if @file_wrapper.exist?(old_script_plugin_path)
-          $stderr.puts "WARNING: Depreciated plugin style used in #{plugin}. Use new directory structure!"
-        end
-      end
-    end
-    
-    return @script_plugins 
-  end
-  
-  
-  # gather up and return configuration .yml filepaths that exist on-disk
-  def find_config_plugins(config)
-    plugins_with_path = []
-    
-    config[:plugins][:load_paths].each do |root|
-      config[:plugins][:enabled].each do |plugin|
-        config_plugin_path = File.join(root, plugin, "config", "#{plugin}.yml")
-
-        # Add the old path here to support legacy style. Eventaully remove.
-        old_config_plugin_path = File.join(root, plugin, "#{plugin}.yml")
-
-        if @file_wrapper.exist?(config_plugin_path)
-          plugins_with_path << config_plugin_path
-        elsif @file_wrapper.exist?(old_config_plugin_path)
-          # there's a warning printed for this in find_script_plugins
-          plugins_with_path << old_config_plugin_path
-        end
-      end
-    end
-    
-    return plugins_with_path    
-  end
-
-  
-  # gather up and return default .yml filepaths that exist on-disk
-  def find_plugin_defaults(config)
-    defaults_with_path = []
-    
-    config[:plugins][:load_paths].each do |root|
-      config[:plugins][:enabled].each do |plugin|
-        default_path = File.join(root, plugin, 'config', 'defaults.yml')
-        old_default_path = File.join(root, plugin, 'defaults.yml')
-
-        if @file_wrapper.exist?(default_path)
-          defaults_with_path << default_path
-        elsif @file_wrapper.exist?(old_default_path)
-          defaults_with_path << old_default_path
-        end
-      end
-    end
-
-    return defaults_with_path    
-  end
-  
-end
+require 'ceedling/constants'
+
+class ConfiguratorPlugins
+
+  constructor :stream_wrapper, :file_wrapper, :system_wrapper
+  attr_reader :rake_plugins, :script_plugins
+
+  def setup
+    @rake_plugins   = []
+    @script_plugins = []
+  end
+
+  
+  def add_load_paths(config)
+    plugin_paths = {}
+    
+    config[:plugins][:load_paths].each do |root|
+      @system_wrapper.add_load_path( root ) if ( not @file_wrapper.directory_listing( File.join( root, '*.rb' ) ).empty? )
+    
+      config[:plugins][:enabled].each do |plugin|
+        path = File.join(root, plugin, "lib")
+        old_path = File.join( root, plugin )
+
+        if ( not @file_wrapper.directory_listing( File.join( path, '*.rb' ) ).empty? )
+          plugin_paths[(plugin + '_path').to_sym] = path
+          @system_wrapper.add_load_path( path )
+        elsif ( not @file_wrapper.directory_listing( File.join( old_path, '*.rb' ) ).empty? )
+          plugin_paths[(plugin + '_path').to_sym] = old_path
+          @system_wrapper.add_load_path( old_path )
+        end
+      end
+    end
+    
+    return plugin_paths
+  end
+  
+  
+  # gather up and return .rake filepaths that exist on-disk
+  def find_rake_plugins(config)
+    plugins_with_path = []
+    
+    config[:plugins][:load_paths].each do |root|
+      config[:plugins][:enabled].each do |plugin|
+        rake_plugin_path = File.join(root, plugin, "#{plugin}.rake")
+        if (@file_wrapper.exist?(rake_plugin_path))
+          plugins_with_path << rake_plugin_path
+          @rake_plugins << plugin
+        end
+      end
+    end
+    
+    return plugins_with_path
+  end
+
+
+  # gather up and return just names of .rb classes that exist on-disk
+  def find_script_plugins(config)
+    config[:plugins][:load_paths].each do |root|
+      config[:plugins][:enabled].each do |plugin|
+        script_plugin_path = File.join(root, plugin, "lib", "#{plugin}.rb")
+
+        # Add the old path here to support legacy style. Eventaully remove.
+        old_script_plugin_path = File.join(root, plugin, "#{plugin}.rb")
+
+        if @file_wrapper.exist?(script_plugin_path) or @file_wrapper.exist?(old_script_plugin_path)
+          @script_plugins << plugin 
+        end
+
+        # Print depreciation warning.
+        if @file_wrapper.exist?(old_script_plugin_path)
+          $stderr.puts "WARNING: Depreciated plugin style used in #{plugin}. Use new directory structure!"
+        end
+      end
+    end
+    
+    return @script_plugins 
+  end
+  
+  
+  # gather up and return configuration .yml filepaths that exist on-disk
+  def find_config_plugins(config)
+    plugins_with_path = []
+    
+    config[:plugins][:load_paths].each do |root|
+      config[:plugins][:enabled].each do |plugin|
+        config_plugin_path = File.join(root, plugin, "config", "#{plugin}.yml")
+
+        # Add the old path here to support legacy style. Eventaully remove.
+        old_config_plugin_path = File.join(root, plugin, "#{plugin}.yml")
+
+        if @file_wrapper.exist?(config_plugin_path)
+          plugins_with_path << config_plugin_path
+        elsif @file_wrapper.exist?(old_config_plugin_path)
+          # there's a warning printed for this in find_script_plugins
+          plugins_with_path << old_config_plugin_path
+        end
+      end
+    end
+    
+    return plugins_with_path    
+  end
+
+  
+  # gather up and return default .yml filepaths that exist on-disk
+  def find_plugin_defaults(config)
+    defaults_with_path = []
+    
+    config[:plugins][:load_paths].each do |root|
+      config[:plugins][:enabled].each do |plugin|
+        default_path = File.join(root, plugin, 'config', 'defaults.yml')
+        old_default_path = File.join(root, plugin, 'defaults.yml')
+
+        if @file_wrapper.exist?(default_path)
+          defaults_with_path << default_path
+        elsif @file_wrapper.exist?(old_default_path)
+          defaults_with_path << old_default_path
+        end
+      end
+    end
+
+    return defaults_with_path    
+  end
+  
+end

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

@@ -1,124 +1,124 @@
-
-# add sort-ability to symbol so we can order keys array in hash for test-ability 
-class Symbol
-  include Comparable
-
-  def <=>(other)
-    self.to_s <=> other.to_s
-  end
-end
-
-
-class ConfiguratorSetup
-  
-  constructor :configurator_builder, :configurator_validator, :configurator_plugins, :stream_wrapper
-  
-  
-  def build_project_config(config, flattened_config)
-    ### flesh out config
-    @configurator_builder.clean(flattened_config)
-    
-    ### add to hash values we build up from configuration & file system contents
-    flattened_config.merge!(@configurator_builder.set_build_paths(flattened_config))
-    flattened_config.merge!(@configurator_builder.set_force_build_filepaths(flattened_config))
-    flattened_config.merge!(@configurator_builder.set_rakefile_components(flattened_config))
-    flattened_config.merge!(@configurator_builder.set_library_build_info_filepaths(flattened_config))
-    flattened_config.merge!(@configurator_builder.set_release_target(flattened_config))
-    flattened_config.merge!(@configurator_builder.collect_project_options(flattened_config))
-    
-    ### iterate through all entries in paths section and expand any & all globs to actual paths
-    flattened_config.merge!(@configurator_builder.expand_all_path_globs(flattened_config))
-    
-    flattened_config.merge!(@configurator_builder.collect_vendor_paths(flattened_config))
-    flattened_config.merge!(@configurator_builder.collect_source_and_include_paths(flattened_config))
-    flattened_config.merge!(@configurator_builder.collect_source_include_vendor_paths(flattened_config))
-    flattened_config.merge!(@configurator_builder.collect_test_support_source_include_paths(flattened_config))
-    flattened_config.merge!(@configurator_builder.collect_test_support_source_include_vendor_paths(flattened_config))
-    flattened_config.merge!(@configurator_builder.collect_tests(flattened_config))
-    flattened_config.merge!(@configurator_builder.collect_assembly(flattened_config))
-    flattened_config.merge!(@configurator_builder.collect_source(flattened_config))
-    flattened_config.merge!(@configurator_builder.collect_headers(flattened_config))
-    flattened_config.merge!(@configurator_builder.collect_all_existing_compilation_input(flattened_config))
-    flattened_config.merge!(@configurator_builder.collect_test_and_vendor_defines(flattened_config))
-    flattened_config.merge!(@configurator_builder.collect_release_and_vendor_defines(flattened_config))
-    flattened_config.merge!(@configurator_builder.collect_release_artifact_extra_link_objects(flattened_config))
-    flattened_config.merge!(@configurator_builder.collect_test_fixture_extra_link_objects(flattened_config))
-
-    return flattened_config
-  end
-
-  
-  def build_constants_and_accessors(config, context)
-    @configurator_builder.build_global_constants(config)
-    @configurator_builder.build_accessor_methods(config, context)
-  end
-  
-  
-  def validate_required_sections(config)
-    validation = []
-    validation << @configurator_validator.exists?(config, :project)
-    validation << @configurator_validator.exists?(config, :paths)
-
-    return false if (validation.include?(false))
-    return true
-  end
-
-  def validate_required_section_values(config)
-    validation = []
-    validation << @configurator_validator.exists?(config, :project, :build_root)
-    validation << @configurator_validator.exists?(config, :paths, :test)
-    validation << @configurator_validator.exists?(config, :paths, :source)
-
-    return false if (validation.include?(false))
-    return true
-  end
-
-  def validate_paths(config)
-    validation = []
-
-    validation << @configurator_validator.validate_filepath(config, :project, :build_root)
-    validation << @configurator_validator.validate_filepath(config, :cmock, :unity_helper) if config[:cmock][:unity_helper]
-
-    config[:project][:options_paths].each do |path|
-      validation << @configurator_validator.validate_filepath_simple( path, :project, :options_paths )
-    end
-
-    config[:plugins][:load_paths].each do |path|
-      validation << @configurator_validator.validate_filepath_simple( path, :plugins, :load_paths )
-    end
-
-    config[:paths].keys.sort.each do |key|
-      validation << @configurator_validator.validate_path_list(config, :paths, key)
-    end
-
-    return false if (validation.include?(false))
-    return true
-  end
-  
-  def validate_tools(config)
-    validation = []
-
-    config[:tools].keys.sort.each do |key|
-      validation << @configurator_validator.exists?(config, :tools, key, :executable)
-      validation << @configurator_validator.validate_executable_filepath(config, :tools, key, :executable) if (not config[:tools][key][:optional])
-      validation << @configurator_validator.validate_tool_stderr_redirect(config, :tools, key)
-    end
-
-    return false if (validation.include?(false))
-    return true
-  end
-
-  def validate_plugins(config)
-    missing_plugins = 
-      Set.new( config[:plugins][:enabled] ) - 
-      Set.new( @configurator_plugins.rake_plugins ) - 
-      Set.new( @configurator_plugins.script_plugins )
-    
-    missing_plugins.each do |plugin|
-      @stream_wrapper.stderr_puts("ERROR: Ceedling plugin '#{plugin}' contains no rake or ruby class entry point. (Misspelled or missing files?)")
-    end
-    
-    return ( (missing_plugins.size > 0) ? false : true )
-  end
-
-end
+
+# add sort-ability to symbol so we can order keys array in hash for test-ability 
+class Symbol
+  include Comparable
+
+  def <=>(other)
+    self.to_s <=> other.to_s
+  end
+end
+
+
+class ConfiguratorSetup
+  
+  constructor :configurator_builder, :configurator_validator, :configurator_plugins, :stream_wrapper
+  
+  
+  def build_project_config(config, flattened_config)
+    ### flesh out config
+    @configurator_builder.clean(flattened_config)
+    
+    ### add to hash values we build up from configuration & file system contents
+    flattened_config.merge!(@configurator_builder.set_build_paths(flattened_config))
+    flattened_config.merge!(@configurator_builder.set_force_build_filepaths(flattened_config))
+    flattened_config.merge!(@configurator_builder.set_rakefile_components(flattened_config))
+    flattened_config.merge!(@configurator_builder.set_library_build_info_filepaths(flattened_config))
+    flattened_config.merge!(@configurator_builder.set_release_target(flattened_config))
+    flattened_config.merge!(@configurator_builder.collect_project_options(flattened_config))
+    
+    ### iterate through all entries in paths section and expand any & all globs to actual paths
+    flattened_config.merge!(@configurator_builder.expand_all_path_globs(flattened_config))
+    
+    flattened_config.merge!(@configurator_builder.collect_vendor_paths(flattened_config))
+    flattened_config.merge!(@configurator_builder.collect_source_and_include_paths(flattened_config))
+    flattened_config.merge!(@configurator_builder.collect_source_include_vendor_paths(flattened_config))
+    flattened_config.merge!(@configurator_builder.collect_test_support_source_include_paths(flattened_config))
+    flattened_config.merge!(@configurator_builder.collect_test_support_source_include_vendor_paths(flattened_config))
+    flattened_config.merge!(@configurator_builder.collect_tests(flattened_config))
+    flattened_config.merge!(@configurator_builder.collect_assembly(flattened_config))
+    flattened_config.merge!(@configurator_builder.collect_source(flattened_config))
+    flattened_config.merge!(@configurator_builder.collect_headers(flattened_config))
+    flattened_config.merge!(@configurator_builder.collect_all_existing_compilation_input(flattened_config))
+    flattened_config.merge!(@configurator_builder.collect_test_and_vendor_defines(flattened_config))
+    flattened_config.merge!(@configurator_builder.collect_release_and_vendor_defines(flattened_config))
+    flattened_config.merge!(@configurator_builder.collect_release_artifact_extra_link_objects(flattened_config))
+    flattened_config.merge!(@configurator_builder.collect_test_fixture_extra_link_objects(flattened_config))
+
+    return flattened_config
+  end
+
+  
+  def build_constants_and_accessors(config, context)
+    @configurator_builder.build_global_constants(config)
+    @configurator_builder.build_accessor_methods(config, context)
+  end
+  
+  
+  def validate_required_sections(config)
+    validation = []
+    validation << @configurator_validator.exists?(config, :project)
+    validation << @configurator_validator.exists?(config, :paths)
+
+    return false if (validation.include?(false))
+    return true
+  end
+
+  def validate_required_section_values(config)
+    validation = []
+    validation << @configurator_validator.exists?(config, :project, :build_root)
+    validation << @configurator_validator.exists?(config, :paths, :test)
+    validation << @configurator_validator.exists?(config, :paths, :source)
+
+    return false if (validation.include?(false))
+    return true
+  end
+
+  def validate_paths(config)
+    validation = []
+
+    validation << @configurator_validator.validate_filepath(config, :project, :build_root)
+    validation << @configurator_validator.validate_filepath(config, :cmock, :unity_helper) if config[:cmock][:unity_helper]
+
+    config[:project][:options_paths].each do |path|
+      validation << @configurator_validator.validate_filepath_simple( path, :project, :options_paths )
+    end
+
+    config[:plugins][:load_paths].each do |path|
+      validation << @configurator_validator.validate_filepath_simple( path, :plugins, :load_paths )
+    end
+
+    config[:paths].keys.sort.each do |key|
+      validation << @configurator_validator.validate_path_list(config, :paths, key)
+    end
+
+    return false if (validation.include?(false))
+    return true
+  end
+  
+  def validate_tools(config)
+    validation = []
+
+    config[:tools].keys.sort.each do |key|
+      validation << @configurator_validator.exists?(config, :tools, key, :executable)
+      validation << @configurator_validator.validate_executable_filepath(config, :tools, key, :executable) if (not config[:tools][key][:optional])
+      validation << @configurator_validator.validate_tool_stderr_redirect(config, :tools, key)
+    end
+
+    return false if (validation.include?(false))
+    return true
+  end
+
+  def validate_plugins(config)
+    missing_plugins = 
+      Set.new( config[:plugins][:enabled] ) - 
+      Set.new( @configurator_plugins.rake_plugins ) - 
+      Set.new( @configurator_plugins.script_plugins )
+    
+    missing_plugins.each do |plugin|
+      @stream_wrapper.stderr_puts("ERROR: Ceedling plugin '#{plugin}' contains no rake or ruby class entry point. (Misspelled or missing files?)")
+    end
+    
+    return ( (missing_plugins.size > 0) ? false : true )
+  end
+
+end