ceedling 0.9.4 → 0.10.0

data/.gitignore

@@ -4,6 +4,7 @@ Gemfile.lock
 pkg/*
 doc
 .yardoc
+*.sublime-workspace
 
 new_project_template/vendor/ceedling/docs/CeedlingPacket.pdf
 new_project_template/vendor/ceedling/vendor/unity/auto/colour_prompt.rb

data/ceedling-gem.sublime-project

@@ -1,575 +1,8 @@
 {
-	"auto_complete":
-	{
-		"selected_items":
-		[
-		]
-	},
-	"buffers":
-	[
-		{
-			"file": "/Users/greg/git/ceedling-gem/ceedling-gem/examples/temp_sensor/project.yml",
-			"settings":
-			{
-				"buffer_size": 1078,
-				"line_ending": "Windows"
-			}
-		},
-		{
-			"file": "/Users/greg/git/ceedling-gem/ceedling-gem/README.md",
-			"settings":
-			{
-				"buffer_size": 1918,
-				"line_ending": "Unix"
-			}
-		},
-		{
-			"file": "/Users/greg/git/ceedling-gem/ceedling-gem/ceedling.gemspec",
-			"settings":
-			{
-				"buffer_size": 1013,
-				"line_ending": "Unix"
-			}
-		},
-		{
-			"file": "/Users/greg/git/ceedling-gem/ceedling-gem/lib/ceedling/version.rb",
-			"settings":
-			{
-				"buffer_size": 243,
-				"line_ending": "Unix"
-			}
-		},
-		{
-			"file": "/Users/greg/git/ceedling-gem/ceedling-gem/bin/ceedling",
-			"settings":
-			{
-				"buffer_size": 1745,
-				"line_ending": "Unix"
-			}
-		},
-		{
-			"file": "/Users/greg/git/ceedling-gem/ceedling-gem/new_project_template/project.yml",
-			"settings":
-			{
-				"buffer_size": 1275,
-				"line_ending": "Unix"
-			}
-		},
-		{
-			"file": "/Users/greg/git/ceedling-gem/ceedling-gem/lib/ceedling/version.rb.erb",
-			"settings":
-			{
-				"buffer_size": 320,
-				"line_ending": "Unix"
-			}
-		},
-		{
-			"file": "/Users/greg/git/ceedling-gem/ceedling-gem/lib/ceedling.rb",
-			"settings":
-			{
-				"buffer_size": 102,
-				"line_ending": "Unix"
-			}
-		},
-		{
-			"file": "/Users/greg/git/ceedling-gem/ceedling-gem/new_project_template/rakefile.rb",
-			"settings":
-			{
-				"buffer_size": 131,
-				"line_ending": "Unix"
-			}
-		},
-		{
-			"file": "/Users/greg/git/ceedling-gem/ceedling-gem/new_project_template/vendor/ceedling/lib/rakefile.rb",
-			"settings":
-			{
-				"buffer_size": 2353,
-				"line_ending": "Windows"
-			}
-		},
-		{
-			"file": "/Users/greg/git/ceedling-gem/ceedling-gem/new_project_template/vendor/ceedling/lib/tasks_base.rake",
-			"settings":
-			{
-				"buffer_size": 2996,
-				"line_ending": "Windows"
-			}
-		}
-	],
-	"build_system": "",
-	"file_history":
-	[
-		"/Users/greg/git/ceedling-gem/ceedling-gem/Rakefile",
-		"/Users/greg/git/ceedling-gem/ceedling-gem/version.info",
-		"/Users/greg/git/ceedling-gem/ceedling-gem/new_project_template/vendor/ceedling/plugins/bullseye/template.erb",
-		"/Users/greg/git/ceedling-gem/ceedling-gem/temp/vendor/cmock/release/version.info",
-		"/Users/greg/git/ceedling-gem/ceedling-gem/temp/vendor/c_exception/release/version.info",
-		"/Users/greg/git/ceedling-gem/ceedling-gem/examples/temp_sensor/rakefile.rb",
-		"/Users/greg/git/ceedling-gem/ceedling-gem/delete.rb",
-		"/Users/greg/git/ceedling-gem/ceedling-gem/temp_sensor_project/rakefile.rb",
-		"/Users/greg/Downloads/BullseyeCoverage-8.0.19/README",
-		"/Users/greg/git/ceedling-gem/ceedling-gem/ceedling-gem.sublime-project",
-		"/Users/greg/Downloads/project.yml",
-		"/Users/greg/git/ceedling-gem/ceedling-gem/Gemfile",
-		"/Users/greg/git/ceedling-gem/ceedling-gem/foo.rb",
-		"/opt/local/bin/ruby"
-	],
-	"find_in_files":
-	{
-		"include_history":
-		[
-			""
-		],
-		"location_history":
-		[
-			"<open folders>"
-		]
-	},
-	"find_state":
-	{
-		"case_sensitive": false,
-		"find_history":
-		[
-			"test_sensor",
-			"task :version",
-			"dest",
-			"Dir"
-		],
-		"highlight": true,
-		"in_selection": false,
-		"preserve_case": false,
-		"regex": false,
-		"replace_history":
-		[
-		],
-		"reverse": false,
-		"show_context": true,
-		"use_buffer": false,
-		"whole_word": false,
-		"wrap": true
-	},
 	"folders":
-	{
-		"mount_points":
-		[
-			"/Users/greg/git/ceedling-gem/ceedling-gem"
-		]
-	},
-	"groups":
 	[
 		{
-			"selected": 1,
-			"sheets":
-			[
-				{
-					"buffer": 0,
-					"file": "/Users/greg/git/ceedling-gem/ceedling-gem/examples/temp_sensor/project.yml",
-					"settings":
-					{
-						"buffer_size": 1078,
-						"regions":
-						{
-						},
-						"selection":
-						[
-							[
-								371,
-								371
-							]
-						],
-						"settings":
-						{
-							"syntax": "Packages/YAML/YAML.tmLanguage",
-							"tab_size": 2,
-							"translate_tabs_to_spaces": true
-						},
-						"translation.x": 0,
-						"translation.y": 211,
-						"zoom_level": 1
-					},
-					"type": "text"
-				},
-				{
-					"buffer": 1,
-					"file": "/Users/greg/git/ceedling-gem/ceedling-gem/README.md",
-					"settings":
-					{
-						"buffer_size": 1918,
-						"regions":
-						{
-						},
-						"selection":
-						[
-							[
-								1247,
-								1247
-							]
-						],
-						"settings":
-						{
-							"syntax": "Packages/Markdown/Markdown.tmLanguage"
-						},
-						"translation.x": 0,
-						"translation.y": 239,
-						"zoom_level": 1
-					},
-					"type": "text"
-				},
-				{
-					"buffer": 2,
-					"file": "/Users/greg/git/ceedling-gem/ceedling-gem/ceedling.gemspec",
-					"settings":
-					{
-						"buffer_size": 1013,
-						"regions":
-						{
-						},
-						"selection":
-						[
-							[
-								593,
-								593
-							]
-						],
-						"settings":
-						{
-							"syntax": "Packages/Ruby/Ruby.tmLanguage",
-							"tab_size": 2,
-							"translate_tabs_to_spaces": true
-						},
-						"translation.x": 0,
-						"translation.y": 0,
-						"zoom_level": 1
-					},
-					"type": "text"
-				},
-				{
-					"buffer": 3,
-					"file": "/Users/greg/git/ceedling-gem/ceedling-gem/lib/ceedling/version.rb",
-					"settings":
-					{
-						"buffer_size": 243,
-						"regions":
-						{
-						},
-						"selection":
-						[
-							[
-								0,
-								0
-							]
-						],
-						"settings":
-						{
-							"syntax": "Packages/Ruby/Ruby.tmLanguage",
-							"tab_size": 4,
-							"translate_tabs_to_spaces": true
-						},
-						"translation.x": 0,
-						"translation.y": 0,
-						"zoom_level": 1
-					},
-					"type": "text"
-				},
-				{
-					"buffer": 4,
-					"file": "/Users/greg/git/ceedling-gem/ceedling-gem/bin/ceedling",
-					"settings":
-					{
-						"buffer_size": 1745,
-						"regions":
-						{
-						},
-						"selection":
-						[
-							[
-								1370,
-								1370
-							]
-						],
-						"settings":
-						{
-							"syntax": "Packages/Ruby/Ruby.tmLanguage",
-							"tab_size": 2,
-							"translate_tabs_to_spaces": true
-						},
-						"translation.x": 0,
-						"translation.y": 0,
-						"zoom_level": 1
-					},
-					"type": "text"
-				},
-				{
-					"buffer": 5,
-					"file": "/Users/greg/git/ceedling-gem/ceedling-gem/new_project_template/project.yml",
-					"settings":
-					{
-						"buffer_size": 1275,
-						"regions":
-						{
-						},
-						"selection":
-						[
-							[
-								860,
-								860
-							]
-						],
-						"settings":
-						{
-							"syntax": "Packages/YAML/YAML.tmLanguage",
-							"tab_size": 2,
-							"translate_tabs_to_spaces": true
-						},
-						"translation.x": 0,
-						"translation.y": 127,
-						"zoom_level": 1
-					},
-					"type": "text"
-				}
-			]
-		},
-		{
-			"selected": 4,
-			"sheets":
-			[
-				{
-					"buffer": 6,
-					"file": "/Users/greg/git/ceedling-gem/ceedling-gem/lib/ceedling/version.rb.erb",
-					"settings":
-					{
-						"buffer_size": 320,
-						"regions":
-						{
-						},
-						"selection":
-						[
-							[
-								75,
-								75
-							]
-						],
-						"settings":
-						{
-							"syntax": "Packages/Rails/HTML (Rails).tmLanguage",
-							"tab_size": 4,
-							"translate_tabs_to_spaces": true
-						},
-						"translation.x": 0,
-						"translation.y": 0,
-						"zoom_level": 1
-					},
-					"type": "text"
-				},
-				{
-					"buffer": 7,
-					"file": "/Users/greg/git/ceedling-gem/ceedling-gem/lib/ceedling.rb",
-					"settings":
-					{
-						"buffer_size": 102,
-						"regions":
-						{
-						},
-						"selection":
-						[
-							[
-								0,
-								0
-							]
-						],
-						"settings":
-						{
-							"syntax": "Packages/Ruby/Ruby.tmLanguage"
-						},
-						"translation.x": 0,
-						"translation.y": 0,
-						"zoom_level": 1
-					},
-					"type": "text"
-				},
-				{
-					"buffer": 8,
-					"file": "/Users/greg/git/ceedling-gem/ceedling-gem/new_project_template/rakefile.rb",
-					"settings":
-					{
-						"buffer_size": 131,
-						"regions":
-						{
-						},
-						"selection":
-						[
-							[
-								131,
-								131
-							]
-						],
-						"settings":
-						{
-							"syntax": "Packages/Ruby/Ruby.tmLanguage"
-						},
-						"translation.x": 0,
-						"translation.y": 0,
-						"zoom_level": 1
-					},
-					"type": "text"
-				},
-				{
-					"buffer": 9,
-					"file": "/Users/greg/git/ceedling-gem/ceedling-gem/new_project_template/vendor/ceedling/lib/rakefile.rb",
-					"settings":
-					{
-						"buffer_size": 2353,
-						"regions":
-						{
-						},
-						"selection":
-						[
-							[
-								632,
-								632
-							]
-						],
-						"settings":
-						{
-							"syntax": "Packages/Ruby/Ruby.tmLanguage",
-							"tab_size": 2,
-							"translate_tabs_to_spaces": true
-						},
-						"translation.x": 0,
-						"translation.y": 0,
-						"zoom_level": 1
-					},
-					"type": "text"
-				},
-				{
-					"buffer": 10,
-					"file": "/Users/greg/git/ceedling-gem/ceedling-gem/new_project_template/vendor/ceedling/lib/tasks_base.rake",
-					"settings":
-					{
-						"buffer_size": 2996,
-						"regions":
-						{
-						},
-						"selection":
-						[
-							[
-								802,
-								802
-							]
-						],
-						"settings":
-						{
-							"syntax": "Packages/Ruby/Ruby.tmLanguage",
-							"tab_size": 2,
-							"translate_tabs_to_spaces": true
-						},
-						"translation.x": 0,
-						"translation.y": 0,
-						"zoom_level": 1
-					},
-					"type": "text"
-				}
-			]
+			"path": "/Users/greg/git/ceedling-gem"
 		}
-	],
-	"layout":
-	{
-		"cells":
-		[
-			[
-				0,
-				0,
-				1,
-				1
-			],
-			[
-				1,
-				0,
-				2,
-				1
-			]
-		],
-		"cols":
-		[
-			0,
-			0.5,
-			1
-		],
-		"rows":
-		[
-			0,
-			1
-		]
-	},
-	"menu_visible": true,
-	"save_all_on_build": true,
-	"select_file":
-	{
-		"height": 0,
-		"selected_items":
-		[
-			[
-				"ceedling",
-				"lib/ceedling.rb"
-			],
-			[
-				"versioerb",
-				"lib/ceedling/version.rb.erb"
-			],
-			[
-				"/plugins",
-				"new_project_template/vendor/ceedling/plugins/bullseye/template.erb"
-			],
-			[
-				"versionin",
-				"temp/vendor/cmock/release/version.info"
-			],
-			[
-				"versinfo",
-				"temp/vendor/c_exception/release/version.info"
-			],
-			[
-				"proje",
-				"new_project_template/project.yml"
-			],
-			[
-				"rake",
-				"Rakefile"
-			],
-			[
-				"ceedlingversion",
-				"lib/ceedling/version.rb"
-			],
-			[
-				"gemfil",
-				"Gemfile"
-			],
-			[
-				"gem",
-				"ceedling.gemspec"
-			],
-			[
-				"gems",
-				"ceedling.gemspec"
-			],
-			[
-				"foo",
-				"foo.rb"
-			]
-		],
-		"width": 0
-	},
-	"select_project":
-	{
-		"height": 0,
-		"selected_items":
-		[
-		],
-		"width": 0
-	},
-	"show_minimap": false,
-	"show_tabs": true,
-	"side_bar_visible": false,
-	"side_bar_width": 245,
-	"status_bar_visible": true
+	]
 }

data/lib/ceedling/version.rb

@@ -2,15 +2,15 @@
 module Ceedling
   module Version
     # @private
-    GEM = "0.9.4"
+    GEM = "0.10.0"
 
     # @private
-    CEEDLING = "0.9.217"
+    CEEDLING = "0.10.224"
     # @private
     CEXCEPTION = "1.2.17"
     # @private
-    CMOCK = "2.0.214"
+    CMOCK = "2.0.215"
     # @private
-    UNITY = "2.0.135"
+    UNITY = "2.0.136"
   end
 end

data/lib/ceedling/version.rb.erb

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

data/new_project_template/vendor/ceedling/lib/configurator.rb

@@ -225,7 +225,7 @@ class Configurator
     
     paths = [ # individual paths that don't follow convention processed below
       config[:project][:build_root],
-      config[:release_build][:artifacts]]
+      config[:release_build][:artifacts]] # cmock path in case it was explicitly set in config
 
     paths.flatten.each { |path| FilePathUtils::standardize( path ) }
 

data/new_project_template/vendor/ceedling/lib/configurator_builder.rb

@@ -230,8 +230,8 @@ class ConfiguratorBuilder
   def collect_source_and_include_paths(in_hash)
     return {
       :collection_paths_source_and_include => 
-        in_hash[:collection_paths_source] + 
-        in_hash[:collection_paths_include]
+        ( in_hash[:collection_paths_source] + 
+          in_hash[:collection_paths_include] ).select {|x| File.directory?(x)}
       }    
   end
 
@@ -251,25 +251,24 @@ class ConfiguratorBuilder
   def collect_test_support_source_include_paths(in_hash)
     return {
       :collection_paths_test_support_source_include => 
-        in_hash[:collection_paths_test] +
+        (in_hash[:collection_paths_test] +
         in_hash[:collection_paths_support] +
         in_hash[:collection_paths_source] + 
-        in_hash[:collection_paths_include]
+        in_hash[:collection_paths_include] ).select {|x| File.directory?(x)}
       }    
   end
+
+
+  def collect_vendor_paths(in_hash)
+    return {:collection_paths_vendor => get_vendor_paths(in_hash)}
+  end
   
-  
-  def collect_test_support_source_include_vendor_paths(in_hash)
-    extra_paths = []
-    extra_paths << FilePathUtils::form_ceedling_vendor_path(UNITY_LIB_PATH)
-    extra_paths << FilePathUtils::form_ceedling_vendor_path(CEXCEPTION_LIB_PATH) if (in_hash[:project_use_exceptions])
-    extra_paths << FilePathUtils::form_ceedling_vendor_path(CMOCK_LIB_PATH)      if (in_hash[:project_use_mocks])
-    extra_paths << in_hash[:cmock_mock_path]                                     if (in_hash[:project_use_mocks])
 
+  def collect_test_support_source_include_vendor_paths(in_hash)
     return {
       :collection_paths_test_support_source_include_vendor => 
         in_hash[:collection_paths_test_support_source_include] +
-        extra_paths
+        get_vendor_paths(in_hash)
       }    
   end
   
@@ -304,11 +303,13 @@ class ConfiguratorBuilder
 
   def collect_source(in_hash)
     all_source = @file_wrapper.instantiate_file_list
-    
     in_hash[:collection_paths_source].each do |path|
-      all_source.include( File.join(path, "*#{in_hash[:extension_source]}") )
+      if File.exists?(path) and not File.directory?(path)
+        all_source.include( path )
+      else
+        all_source.include( File.join(path, "*#{in_hash[:extension_source]}") )
+      end
     end
-    
     @file_system_utils.revise_file_list( all_source, in_hash[:files_source] )
     
     return {:collection_all_source => all_source}
@@ -349,7 +350,11 @@ class ConfiguratorBuilder
 
     paths.each do |path|
       all_input.include( File.join(path, "*#{in_hash[:extension_header]}") )
-      all_input.include( File.join(path, "*#{in_hash[:extension_source]}") )
+      if File.exists?(path) and not File.directory?(path)
+        all_input.include( path )
+      else
+        all_input.include( File.join(path, "*#{in_hash[:extension_source]}") )
+      end
     end
     
     @file_system_utils.revise_file_list( all_input, in_hash[:files_test] )
@@ -415,5 +420,18 @@ class ConfiguratorBuilder
     
     return { :collection_test_fixture_extra_link_objects => objects }
   end
+
+
+  private
+
+  def get_vendor_paths(in_hash)
+    vendor_paths = []
+    vendor_paths << FilePathUtils::form_ceedling_vendor_path(UNITY_LIB_PATH)
+    vendor_paths << FilePathUtils::form_ceedling_vendor_path(CEXCEPTION_LIB_PATH) if (in_hash[:project_use_exceptions])
+    vendor_paths << FilePathUtils::form_ceedling_vendor_path(CMOCK_LIB_PATH)      if (in_hash[:project_use_mocks])
+    vendor_paths << in_hash[:cmock_mock_path]                                     if (in_hash[:project_use_mocks])
+
+    return vendor_paths
+  end
   
 end

data/new_project_template/vendor/ceedling/lib/configurator_plugins.rb

@@ -18,10 +18,15 @@ class ConfiguratorPlugins
       @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 )
+        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
@@ -52,8 +57,19 @@ class ConfiguratorPlugins
   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, "#{plugin}.rb")
-        @script_plugins << plugin if @file_wrapper.exist?(script_plugin_path)
+        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
     
@@ -67,8 +83,17 @@ class ConfiguratorPlugins
     
     config[:plugins][:load_paths].each do |root|
       config[:plugins][:enabled].each do |plugin|
-        config_plugin_path = File.join(root, plugin, "#{plugin}.yml")
-        plugins_with_path << config_plugin_path if @file_wrapper.exist?(config_plugin_path)
+        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
     
@@ -82,8 +107,14 @@ class ConfiguratorPlugins
     
     config[:plugins][:load_paths].each do |root|
       config[:plugins][:enabled].each do |plugin|
-        default_path = File.join(root, plugin, 'defaults.yml')
-        defaults_with_path << default_path if @file_wrapper.exist?(default_path)
+        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
 

data/new_project_template/vendor/ceedling/lib/configurator_setup.rb

@@ -29,6 +29,7 @@ class ConfiguratorSetup
     ### 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))

data/new_project_template/vendor/ceedling/lib/erb_wrapper.rb

@@ -0,0 +1,9 @@
+require 'erb'
+
+class ErbWrapper
+  def generate_file(template, data, output_file)
+    File.open(output_file, "w") do |f|
+      f << ERB.new(template, 0, "<>").result(binding)
+    end
+  end
+end

data/new_project_template/vendor/ceedling/lib/file_system_wrapper.rb

@@ -0,0 +1,10 @@
+
+class FileSystemWrapper
+
+  def cd(path)
+    FileUtils.cd path do
+      yield
+    end
+  end
+
+end

data/new_project_template/vendor/ceedling/lib/file_wrapper.rb

@@ -10,6 +10,11 @@ class FileWrapper
     return File.expand_path(path)
   end
 
+  def basename(path, extension=nil)
+    return File.basename(path, extension) if extension
+    return File.basename(path)
+  end
+
   def exist?(filepath)
     return true if (filepath == NULL_FILE_PATH)
     return File.exist?(filepath)

data/new_project_template/vendor/ceedling/lib/generator.rb

@@ -3,7 +3,7 @@ require 'constants'
 
 class Generator
 
-  constructor :configurator, 
+  constructor :configurator,
               :generator_helper,
               :preprocessinator,
               :cmock_builder,
@@ -13,8 +13,10 @@ class Generator
               :test_includes_extractor,
               :tool_executor,
               :file_finder,
+              :file_path_utils,
               :streaminator,
-              :plugin_manager
+              :plugin_manager,
+              :file_wrapper
 
 
   def generate_shallow_includes_list(context, file)
@@ -80,7 +82,7 @@ class Generator
     @plugin_manager.pre_compile_execute(arg_hash)
 
     @streaminator.stdout_puts("Compiling #{File.basename(arg_hash[:source])}...", Verbosity::NORMAL)
-    command = 
+    command =
       @tool_executor.build_command_line( arg_hash[:tool],
                                          arg_hash[:source],
                                          arg_hash[:object],
@@ -104,7 +106,7 @@ class Generator
     @plugin_manager.pre_link_execute(arg_hash)
     
     @streaminator.stdout_puts("Linking #{File.basename(arg_hash[:executable])}...", Verbosity::NORMAL)
-    command = 
+    command =
       @tool_executor.build_command_line( arg_hash[:tool],
                                          arg_hash[:objects],
                                          arg_hash[:executable],

data/new_project_template/vendor/ceedling/lib/objects.yml

@@ -1,6 +1,8 @@
 
 file_wrapper:
 
+file_system_wrapper:
+
 stream_wrapper:
 
 rake_wrapper:
@@ -119,6 +121,8 @@ streaminator_helper:
 
 setupinator:
 
+plugin_builder:
+
 plugin_manager:
   compose:
     - configurator
@@ -185,8 +189,10 @@ generator:
     - test_includes_extractor
     - tool_executor
     - file_finder
+    - file_path_utils
     - streaminator
     - plugin_manager
+    - file_wrapper
 
 generator_helper:
   compose:
@@ -298,4 +304,6 @@ release_invoker_helper:
 build_invoker_utils:
   compose:
     - configurator
-    - streaminator
+    - streaminator
+
+erb_wrapper:

data/new_project_template/vendor/ceedling/lib/plugin.rb

@@ -32,6 +32,7 @@ end
 
 class Plugin
   attr_reader :name, :environment
+  attr_accessor :plugin_objects
 
   def initialize(system_objects, name)
     @environment = []

data/new_project_template/vendor/ceedling/lib/plugin_builder.rb

@@ -0,0 +1,53 @@
+require 'plugin'
+
+class PluginBuilder
+
+  attr_accessor :plugin_objects
+
+  def construct_plugin(plugin_name, object_map_yaml, system_objects)
+    # @streaminator.stdout_puts("Constructing plugin #{plugin_name}...", Verbosity::OBNOXIOUS)
+    object_map = {}
+    @plugin_objects = {}
+    @system_objects = system_objects
+
+    if object_map_yaml
+      @object_map = YAML.load(object_map_yaml)
+      @object_map.each_key do |obj|
+        construct_object(obj)
+      end
+    else
+      raise "Invalid object map for plugin #{plugin_name}!"
+    end
+
+    return @plugin_objects
+  end
+
+  private
+  
+  def camelize(underscored_name)
+    return underscored_name.gsub(/(_|^)([a-z0-9])/) {$2.upcase}
+  end
+
+  def construct_object(obj)
+    if @plugin_objects[obj].nil?
+      if @object_map[obj] && @object_map[obj]['compose']
+        @object_map[obj]['compose'].each do |dep|
+          construct_object(dep)
+        end
+      end
+      build_object(obj)
+    end
+  end
+
+  def build_object(new_object)
+    if @plugin_objects[new_object.to_sym].nil?
+      # @streaminator.stdout_puts("Building plugin object #{new_object}", Verbosity::OBNOXIOUS)
+      require new_object
+      class_name = camelize(new_object)
+      new_instance = eval("#{class_name}.new(@system_objects, class_name.to_s)")
+      new_instance.plugin_objects = @plugin_objects
+      @plugin_objects[new_object.to_sym] = new_instance
+    end
+  end
+
+end

data/new_project_template/vendor/ceedling/lib/rake_wrapper.rb

@@ -2,6 +2,8 @@ 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

data/new_project_template/vendor/ceedling/lib/tasks_base.rake

@@ -84,7 +84,7 @@ namespace :options do
 
     desc "Merge #{option} project options."
     task option.downcase.to_sym do
-      @ceedling[:setupinator].reset_defaults( @ceedling[:setupinator].config_hash )
+      # @ceedling[:setupinator].reset_defaults( @ceedling[:setupinator].config_hash )
       hash = @ceedling[:project_config_manager].merge_options( @ceedling[:setupinator].config_hash, option_path )
       @ceedling[:setupinator].do_setup( hash )
     end

data/new_project_template/vendor/ceedling/lib/tool_executor.rb

@@ -45,7 +45,7 @@ class ToolExecutor
     options[:boom] = true if (options[:boom].nil?)
     options[:stderr_redirect] = StdErrRedirect::NONE if (options[:stderr_redirect].nil?)
     options[:background_exec] = BackgroundExec::NONE if (options[:background_exec].nil?)
-    
+
     # build command line
     command_line = [
       @tool_executor_helper.background_exec_cmdline_prepend( options ),

data/new_project_template/vendor/ceedling/plugins/stdout_pretty_tests_report/{stdout_pretty_tests_report.rb → lib/stdout_pretty_tests_report.rb}

@@ -5,9 +5,8 @@ class StdoutPrettyTestsReport < Plugin
   
   def setup
     @result_list = []
-    
-    template = @ceedling[:file_wrapper].read( File.join( PLUGINS_STDOUT_PRETTY_TESTS_REPORT_PATH, 'template.erb' ) )
-      
+    @plugin_root = File.expand_path(File.join(File.dirname(__FILE__), '..'))
+    template = @ceedling[:file_wrapper].read(File.join(@plugin_root, 'assets/template.erb'))
     @ceedling[:plugin_reportinator].register_test_results_template( template )
   end
   

data/new_project_template/vendor/ceedling/release/build.info

@@ -1 +1 @@
-217
+224

data/new_project_template/vendor/ceedling/release/version.info

@@ -1 +1 @@
-0.9
+0.10

data/new_project_template/vendor/ceedling/vendor/cmock/release/build.info

@@ -1 +1 @@
-214
+215

data/new_project_template/vendor/ceedling/vendor/unity/auto/generate_test_runner.rb

@@ -111,12 +111,17 @@ class UnityTestRunnerGenerator
 
   def find_includes(input_file)
     input_file.rewind
-    includes = []
-    input_file.readlines.each do |line|
-      scan_results = line.scan(/^\s*#include\s+\"\s*(.+)\.[hH]\s*\"/)
-      includes << scan_results[0][0] if (scan_results.size > 0)
-    end
-    return includes
+    
+    #read in file
+    source = input_file.read
+    
+    #remove comments (block and line, in three steps to ensure correct precedence)
+    source.gsub!(/\/\/(?:.+\/\*|\*(?:$|[^\/])).*$/, '')  # remove line comments that comment out the start of blocks
+    source.gsub!(/\/\*.*?\*\//m, '')                     # remove block comments 
+    source.gsub!(/\/\/.*$/, '')                          # remove line comments (all that remain)
+    
+    #parse out includes
+    return source.scan(/^\s*#include\s+\"\s*(.+)\.[hH]\s*\"/).flatten
   end
   
   def find_mocks(includes)

data/new_project_template/vendor/ceedling/vendor/unity/release/build.info

@@ -1 +1 @@
-135
+136

data/new_project_template/vendor/ceedling/vendor/unity/src/unity.c

@@ -816,8 +816,8 @@ void UnityAssertEqualStringArray( const char** expected,
 //-----------------------------------------------
 void UnityAssertEqualMemory( const void* expected,
                              const void* actual,
-                             _UU32 length,
-                             _UU32 num_elements,
+                             const _UU32 length,
+                             const _UU32 num_elements,
                              const char* msg,
                              const UNITY_LINE_TYPE lineNumber)
 {
@@ -933,6 +933,10 @@ void UnityDefaultTestRun(UnityTestFunction Func, const char* FuncName, const int
 void UnityBegin(void)
 {
     Unity.NumberOfTests = 0;
+    Unity.TestFailures = 0;
+    Unity.TestIgnores = 0;
+    Unity.CurrentTestFailed = 0;
+    Unity.CurrentTestIgnored = 0;
 }
 
 //-----------------------------------------------

data/new_project_template/vendor/ceedling/vendor/unity/src/unity_internals.h

@@ -183,14 +183,23 @@ typedef void (*UnityTestFunction)(void);
 
 typedef enum
 {
+#if (UNITY_INT_WIDTH == 16)
+    UNITY_DISPLAY_STYLE_INT      = 2 + UNITY_DISPLAY_RANGE_INT + UNITY_DISPLAY_RANGE_AUTO,
+#elif (UNITY_INT_WIDTH  == 32)
     UNITY_DISPLAY_STYLE_INT      = 4 + UNITY_DISPLAY_RANGE_INT + UNITY_DISPLAY_RANGE_AUTO,
+#endif
     UNITY_DISPLAY_STYLE_INT8     = 1 + UNITY_DISPLAY_RANGE_INT,
     UNITY_DISPLAY_STYLE_INT16    = 2 + UNITY_DISPLAY_RANGE_INT,
     UNITY_DISPLAY_STYLE_INT32    = 4 + UNITY_DISPLAY_RANGE_INT,
 #ifdef UNITY_SUPPORT_64
     UNITY_DISPLAY_STYLE_INT64    = 8 + UNITY_DISPLAY_RANGE_INT,
 #endif
+
+#if (UNITY_INT_WIDTH == 16)
     UNITY_DISPLAY_STYLE_UINT     = 4 + UNITY_DISPLAY_RANGE_UINT + UNITY_DISPLAY_RANGE_AUTO,
+#elif (UNITY_INT_WIDTH  == 32)
+    UNITY_DISPLAY_STYLE_UINT     = 2 + UNITY_DISPLAY_RANGE_UINT + UNITY_DISPLAY_RANGE_AUTO,
+#endif
     UNITY_DISPLAY_STYLE_UINT8    = 1 + UNITY_DISPLAY_RANGE_UINT,
     UNITY_DISPLAY_STYLE_UINT16   = 2 + UNITY_DISPLAY_RANGE_UINT,
     UNITY_DISPLAY_STYLE_UINT32   = 4 + UNITY_DISPLAY_RANGE_UINT,
@@ -203,6 +212,7 @@ typedef enum
 #ifdef UNITY_SUPPORT_64
     UNITY_DISPLAY_STYLE_HEX64    = 8 + UNITY_DISPLAY_RANGE_HEX,
 #endif
+    UNITY_DISPLAY_STYLE_UNKNOWN
 } UNITY_DISPLAY_STYLE_T;
 
 struct _Unity

metadata

@@ -1,13 +1,12 @@
 --- !ruby/object:Gem::Specification 
 name: ceedling
 version: !ruby/object:Gem::Version 
-  hash: 51
-  prerelease: 
+  prerelease: false
   segments: 
   - 0
-  - 9
-  - 4
-  version: 0.9.4
+  - 10
+  - 0
+  version: 0.10.0
 platform: ruby
 authors: 
 - Mike Karlesky, Mark VanderVoord
@@ -17,17 +16,16 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2011-08-09 00:00:00 Z
+date: 2011-12-27 00:00:00 -05:00
+default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
   name: thor
   prerelease: false
   requirement: &id001 !ruby/object:Gem::Requirement 
-    none: false
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
-        hash: 45
         segments: 
         - 0
         - 14
@@ -39,11 +37,9 @@ dependencies:
   name: rake
   prerelease: false
   requirement: &id002 !ruby/object:Gem::Requirement 
-    none: false
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
-        hash: 49
         segments: 
         - 0
         - 8
@@ -180,10 +176,12 @@ files:
 - new_project_template/vendor/ceedling/lib/constants.rb
 - new_project_template/vendor/ceedling/lib/defaults.rb
 - new_project_template/vendor/ceedling/lib/dependinator.rb
+- new_project_template/vendor/ceedling/lib/erb_wrapper.rb
 - new_project_template/vendor/ceedling/lib/file_finder.rb
 - new_project_template/vendor/ceedling/lib/file_finder_helper.rb
 - new_project_template/vendor/ceedling/lib/file_path_utils.rb
 - new_project_template/vendor/ceedling/lib/file_system_utils.rb
+- new_project_template/vendor/ceedling/lib/file_system_wrapper.rb
 - new_project_template/vendor/ceedling/lib/file_wrapper.rb
 - new_project_template/vendor/ceedling/lib/flaginator.rb
 - new_project_template/vendor/ceedling/lib/generator.rb
@@ -195,6 +193,7 @@ files:
 - new_project_template/vendor/ceedling/lib/makefile.rb
 - new_project_template/vendor/ceedling/lib/objects.yml
 - new_project_template/vendor/ceedling/lib/plugin.rb
+- new_project_template/vendor/ceedling/lib/plugin_builder.rb
 - new_project_template/vendor/ceedling/lib/plugin_manager.rb
 - new_project_template/vendor/ceedling/lib/plugin_manager_helper.rb
 - new_project_template/vendor/ceedling/lib/plugin_reportinator.rb
@@ -249,14 +248,14 @@ files:
 - new_project_template/vendor/ceedling/plugins/gcov/gcov.rb
 - new_project_template/vendor/ceedling/plugins/gcov/readme.txt
 - new_project_template/vendor/ceedling/plugins/gcov/template.erb
+- new_project_template/vendor/ceedling/plugins/module_generator/config/module_generator.yml
+- new_project_template/vendor/ceedling/plugins/module_generator/lib/module_generator.rb
 - new_project_template/vendor/ceedling/plugins/module_generator/module_generator.rake
-- new_project_template/vendor/ceedling/plugins/module_generator/module_generator.rb
-- new_project_template/vendor/ceedling/plugins/module_generator/module_generator.yml
-- new_project_template/vendor/ceedling/plugins/stdout_ide_tests_report/stdout_ide_tests_report.rb
-- new_project_template/vendor/ceedling/plugins/stdout_ide_tests_report/stdout_ide_tests_report.yml
-- new_project_template/vendor/ceedling/plugins/stdout_pretty_tests_report/stdout_pretty_tests_report.rb
-- new_project_template/vendor/ceedling/plugins/stdout_pretty_tests_report/stdout_pretty_tests_report.yml
-- new_project_template/vendor/ceedling/plugins/stdout_pretty_tests_report/template.erb
+- new_project_template/vendor/ceedling/plugins/stdout_ide_tests_report/config/stdout_ide_tests_report.yml
+- new_project_template/vendor/ceedling/plugins/stdout_ide_tests_report/lib/stdout_ide_tests_report.rb
+- new_project_template/vendor/ceedling/plugins/stdout_pretty_tests_report/assets/template.erb
+- new_project_template/vendor/ceedling/plugins/stdout_pretty_tests_report/config/stdout_pretty_tests_report.yml
+- new_project_template/vendor/ceedling/plugins/stdout_pretty_tests_report/lib/stdout_pretty_tests_report.rb
 - new_project_template/vendor/ceedling/plugins/warnings_report/warnings_report.rb
 - new_project_template/vendor/ceedling/plugins/xml_tests_report/xml_tests_report.rb
 - new_project_template/vendor/ceedling/release/build.info
@@ -295,6 +294,7 @@ files:
 - new_project_template/vendor/ceedling/vendor/unity/src/unity.c
 - new_project_template/vendor/ceedling/vendor/unity/src/unity.h
 - new_project_template/vendor/ceedling/vendor/unity/src/unity_internals.h
+has_rdoc: true
 homepage: http://throwtheswitch.org/
 licenses: []
 
@@ -304,27 +304,23 @@ rdoc_options: []
 require_paths: 
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement 
-  none: false
   requirements: 
   - - ">="
     - !ruby/object:Gem::Version 
-      hash: 3
       segments: 
       - 0
       version: "0"
 required_rubygems_version: !ruby/object:Gem::Requirement 
-  none: false
   requirements: 
   - - ">="
     - !ruby/object:Gem::Version 
-      hash: 3
       segments: 
       - 0
       version: "0"
 requirements: []
 
 rubyforge_project: ceedling
-rubygems_version: 1.8.2
+rubygems_version: 1.3.6
 signing_key: 
 specification_version: 3
 summary: Gemified version of the Ceedling C testing / build environment