ceedling 0.13.0.rc1 → 0.13.0

data/Gemfile.lock

@@ -0,0 +1,32 @@
+GEM
+  remote: http://rubygems.org/
+  specs:
+    constructor (2.0.0)
+    diff-lcs (1.1.3)
+    diy (1.1.2)
+      constructor (>= 1.0.0)
+    rake (0.9.2.2)
+    require_all (1.2.1)
+    rr (1.0.4)
+    rspec (2.8.0)
+      rspec-core (~> 2.8.0)
+      rspec-expectations (~> 2.8.0)
+      rspec-mocks (~> 2.8.0)
+    rspec-core (2.8.0)
+    rspec-expectations (2.8.0)
+      diff-lcs (~> 1.1.2)
+    rspec-mocks (2.8.0)
+    thor (0.16.0)
+
+PLATFORMS
+  ruby
+
+DEPENDENCIES
+  bundler (~> 1.1.rc.7)
+  constructor
+  diy
+  rake (>= 0.9.2.2)
+  require_all
+  rr
+  rspec
+  thor

data/README.md

@@ -25,16 +25,16 @@ started:
       :build_root: build
     #  :release_build: TRUE
       :test_file_prefix: test_
-    
+
     #:release_build:
     #  :output: MyApp.out
     #  :use_assembly: FALSE
-    
+
     :environment:
-    
+
     :extension:
       :executable: .out
-    
+
     :paths:
       :test:
         - +:test/**
@@ -43,7 +43,7 @@ started:
         - src/**
       :support:
         - test/support
-    
+
     :defines:
       # in order to add common defines:
       #  1) remove the trailing [] from the :common: section
@@ -55,7 +55,7 @@ started:
       :test_preprocess:
         - *common_defines
         - TEST
-    
+
     :cmock:
       :when_no_prototypes: :warn
       :enforce_strict_ordering: TRUE
@@ -67,12 +67,12 @@ started:
         uint32:   UINT32
         int8:     INT8
         bool:     UINT8
-    
+
     #:tools:
     # Ceedling defaults to using gcc for compiling, linking, etc.
     # As [:tools] is blank, gcc will be used (so long as it's in your system path)
     # See documentation to configure a given toolchain for use
-    
+
     :plugins:
       :load_paths:
         # This is required to use builtin ceedling plugins

data/assets/example_file.c

@@ -0,0 +1,5 @@
+#include "example_file.h"
+
+int add_numbers(int a, int b) {
+  return a + b;
+}

data/assets/example_file.h

@@ -0,0 +1,6 @@
+#ifndef EXAMPLE_FILE_H
+#define EXAMPLE_FILE_H
+
+int add_numbers(int a, int b);
+
+#endif /* EXAMPLE_FILE_H */

data/assets/project_as_gem.yml

@@ -0,0 +1,71 @@
+---
+
+# Notes:
+# Sample project C code is not presently written to produce a release artifact.
+# As such, release build options are disabled.
+# This sample, therefore, only demonstrates running a collection of unit tests.
+
+:project:
+  :use_exceptions: FALSE
+  :use_test_preprocessor: TRUE
+  :use_auxiliary_dependencies: TRUE
+  :build_root: build
+#  :release_build: TRUE
+  :test_file_prefix: test_
+
+#:release_build:
+#  :output: MyApp.out
+#  :use_assembly: FALSE
+
+:environment:
+
+:extension:
+  :executable: .out
+
+:paths:
+  :test:
+    - +:test/**
+    - -:test/support
+  :source:
+    - src/**
+  :support:
+    - test/support
+
+:defines:
+  # in order to add common defines:
+  #  1) remove the trailing [] from the :common: section
+  #  2) add entries to the :common: section (e.g. :test: has TEST defined)
+  :commmon: &common_defines []
+  :test:
+    - *common_defines
+    - TEST
+  :test_preprocess:
+    - *common_defines
+    - TEST
+
+:cmock:
+  :mock_prefix: mock_
+  :when_no_prototypes: :warn
+  :enforce_strict_ordering: TRUE
+  :plugins:
+    - :ignore
+    - :callback
+  :treat_as:
+    uint8:    HEX8
+    uint16:   HEX16
+    uint32:   UINT32
+    int8:     INT8
+    bool:     UINT8
+
+#:tools:
+# Ceedling defaults to using gcc for compiling, linking, etc.
+# As [:tools] is blank, gcc will be used (so long as it's in your system path)
+# See documentation to configure a given toolchain for use
+
+:plugins:
+  :load_paths:
+    - "#{builtin_ceedling_plugins_path}"
+  :enabled:
+    - stdout_pretty_tests_report
+    - module_generator
+...

data/assets/{project.yml → project_with_guts.yml}

@@ -44,10 +44,12 @@
     - TEST
 
 :cmock:
+  :mock_prefix: mock_
   :when_no_prototypes: :warn
   :enforce_strict_ordering: TRUE
   :plugins:
     - :ignore
+    - :callback
   :treat_as:
     uint8:    HEX8
     uint16:   HEX16

data/assets/rakefile_as_gem.rb

@@ -0,0 +1 @@
+require 'ceedling'

data/assets/test_example_file.c

@@ -0,0 +1,13 @@
+#include "unity.h"
+#include "example_file.h"
+
+void setUp(void) {}
+void tearDown(void) {}
+
+void test_add_numbers_adds_numbers(void) {
+  TEST_ASSERT_EQUAL(2, add_numbers(1,1));
+}
+
+void test_add_numbers_will_fail(void) {
+  TEST_ASSERT_EQUAL(2, add_numbers(2,2));
+}

data/bin/ceedling

@@ -13,6 +13,7 @@ class CeedlingTasks < Thor
 
   desc "new PROJECT_NAME", "new a new ceedling project"
   method_option :nodocs, :type => :boolean, :default => false, :desc => "No docs in vendor directory"
+  method_option :as_gem, :type => :boolean, :default => false, :desc => "Create the scaffold using Ceedling as a gem instead of filling in the vendor directory. Implies --no-docs."
   def new(name, silent = false)
     ceedling_path     = File.join(name, 'vendor', 'ceedling')
     source_path       = File.join(name, 'src')
@@ -20,47 +21,70 @@ class CeedlingTasks < Thor
     test_support_path = File.join(name, 'test/support')
     build_path        = File.join(name, 'build')
 
-    [ceedling_path, source_path, test_path, test_support_path, build_path].each do |d|
+    [source_path, test_path, test_support_path, build_path].each do |d|
       FileUtils.mkdir_p d
     end
 
-    folders = %w{plugins lib release}
-    folders << 'docs' unless options[:nodocs]
-
-    folders.map do |f|
-      {:src => f, :dst => File.join(ceedling_path, f)}
-    end.each do |f|
-      directory f[:src], f[:dst]
-    end
-
-    sub_components = [
-      {:src => 'vendor/c_exception/lib/',     :dst => 'vendor/c_exception/lib'},
-      {:src => 'vendor/c_exception/release/', :dst => 'vendor/c_exception/release'},
-      {:src => 'vendor/cmock/config/',        :dst => 'vendor/cmock/config'},
-      {:src => 'vendor/cmock/lib/',           :dst => 'vendor/cmock/lib'},
-      {:src => 'vendor/cmock/release/',       :dst => 'vendor/cmock/release'},
-      {:src => 'vendor/cmock/src/',           :dst => 'vendor/cmock/src'},
-      {:src => 'vendor/constructor/lib/',     :dst => 'vendor/constructor/lib'},
-      {:src => 'vendor/deep_merge/lib/',      :dst => 'vendor/deep_merge/lib'},
-      {:src => 'vendor/diy/lib',              :dst => 'vendor/diy/lib'},
-      {:src => 'vendor/unity/auto/',          :dst => 'vendor/unity/auto'},
-      {:src => 'vendor/unity/release/',       :dst => 'vendor/unity/release'},
-      {:src => 'vendor/unity/src/',           :dst => 'vendor/unity/src'},
-    ]
-
-    sub_components.each do |c|
-      directory c[:src], File.join(ceedling_path, c[:dst]) 
+    unless options[:as_gem]
+      FileUtils.mkdir_p ceedling_path
+
+      unless options[:nodocs]
+        doc_path = File.join(ceedling_path, 'docs')
+        FileUtils.mkdir_p doc_path
+
+        in_doc_path = lambda {|f| File.join(doc_path, f)}
+
+        doc_files = [
+                      'docs/CeedlingPacket.pdf',
+                      'vendor/c_exception/docs/CExceptionSummary.pdf',
+                      'vendor/cmock/docs/CMock Summary.pdf',
+                      'vendor/unity/docs/Unity Summary.pdf',
+                    ]
+
+        doc_files.each do |f|
+          copy_file f, in_doc_path.call(File.basename(f))
+        end
+      end
+
+      folders = %w{plugins lib release}
+      folders.map do |f|
+        {:src => f, :dst => File.join(ceedling_path, f)}
+      end.each do |f|
+        directory f[:src], f[:dst]
+      end
+
+      sub_components = [
+        {:src => 'vendor/c_exception/lib/',     :dst => 'vendor/c_exception/lib'},
+        {:src => 'vendor/c_exception/release/', :dst => 'vendor/c_exception/release'},
+        {:src => 'vendor/cmock/config/',        :dst => 'vendor/cmock/config'},
+        {:src => 'vendor/cmock/lib/',           :dst => 'vendor/cmock/lib'},
+        {:src => 'vendor/cmock/release/',       :dst => 'vendor/cmock/release'},
+        {:src => 'vendor/cmock/src/',           :dst => 'vendor/cmock/src'},
+        {:src => 'vendor/constructor/lib/',     :dst => 'vendor/constructor/lib'},
+        {:src => 'vendor/deep_merge/lib/',      :dst => 'vendor/deep_merge/lib'},
+        {:src => 'vendor/diy/lib',              :dst => 'vendor/diy/lib'},
+        {:src => 'vendor/unity/auto/',          :dst => 'vendor/unity/auto'},
+        {:src => 'vendor/unity/release/',       :dst => 'vendor/unity/release'},
+        {:src => 'vendor/unity/src/',           :dst => 'vendor/unity/src'},
+      ]
+
+      sub_components.each do |c|
+        directory c[:src], File.join(ceedling_path, c[:dst])
+      end
     end
 
-    files = %w{rakefile.rb project.yml}
-    files.each do |f|
-      copy_file File.join('assets', f), File.join(name, f)
+    if options[:as_gem]
+      copy_file File.join('assets', 'project_as_gem.yml'), File.join(name, 'project.yml')
+      copy_file File.join('assets', 'rakefile_as_gem.rb'), File.join(name, 'rakefile.rb')
+    else
+      copy_file File.join('assets', 'project_with_guts.yml'), File.join(name, 'project.yml')
+      copy_file File.join('assets', 'rakefile_with_guts.rb'), File.join(name, 'rakefile.rb')
     end
 
     unless silent
       puts "\n"
       puts "Project '#{name}' created!"
-      puts " - Tool documentation is located in vendor/ceedling/docs" if not options[:nodocs]
+      puts " - Tool documentation is located in vendor/ceedling/docs" if (not options[:nodocs]) and (not options[:as_gem])
       puts " - Execute 'rake -T' to view available test & build tasks"
       puts ''
     end

data/ceedling.gemspec

@@ -19,19 +19,20 @@ Gem::Specification.new do |s|
 
   # Files needed from submodules
   s.files         = []
-  s.files        += `find vendor/cmock/lib           -name "*.rb"`.split("\n")
-  s.files        += `find vendor/cmock/config        -name "*.rb"`.split("\n")
-  s.files        += `find vendor/cmock/release       -name "*.info"`.split("\n")
-  s.files        += `find vendor/cmock/src           -name "*.[ch]"`.split("\n")
-  s.files        += `find vendor/c_exception/lib     -name "*.[ch]"`.split("\n")
-  s.files        += `find vendor/c_exception/release -name "*.info"`.split("\n")
-  s.files        += `find vendor/unity/auto          -name "*.rb"`.split("\n")
-  s.files        += `find vendor/unity/release       -name "*.info"`.split("\n")
-  s.files        += `find vendor/unity/src           -name "*.[ch]"`.split("\n")
+  s.files        += Dir['vendor/**/docs/**/*.pdf', 'docs/**/*.pdf']
+  s.files        += Dir['vendor/cmock/lib/**/*.rb']
+  s.files        += Dir['vendor/cmock/config/**/*.rb']
+  s.files        += Dir['vendor/cmock/release/**/*.info']
+  s.files        += Dir['vendor/cmock/src/**/*.[ch]']
+  s.files        += Dir['vendor/c_exception/lib/**/*.[ch]']
+  s.files        += Dir['vendor/c_exception/release/**/*.info']
+  s.files        += Dir['vendor/unity/auto/**/*.rb']
+  s.files        += Dir['vendor/unity/release/**/*.info']
+  s.files        += Dir['vendor/unity/src/**/*.[ch]']
 
-  s.files        += `git ls-files`.split("\n")
-  s.test_files    = `git ls-files -- {test,spec,features}/*`.split("\n")
-  s.executables   = `git ls-files -- bin/*`.split("\n").map{ |f| File.basename(f) }
+  s.files      += Dir['**/*']
+  s.test_files  = Dir['test/**/*', 'spec/**/*', 'features/**/*']
+  s.executables = Dir['bin/**/*'].map{|f| File.basename(f)}
 
   s.require_paths = ["lib", "vendor/cmock/lib"]
 end

data/ceedling.sublime-project

@@ -0,0 +1,8 @@
+{
+	"folders":
+	[
+		{
+			"path": "/Users/johnvanenk/Development/AO/github_ceedling"
+		}
+	]
+}

data/ceedling.sublime-workspace

@@ -0,0 +1,365 @@
+{
+	"auto_complete":
+	{
+		"selected_items":
+		[
+		]
+	},
+	"buffers":
+	[
+		{
+			"file": "spec/uncatagorized_specs_spec.rb",
+			"settings":
+			{
+				"buffer_size": 190,
+				"line_ending": "Unix"
+			}
+		},
+		{
+			"file": "lib/configurator.rb",
+			"settings":
+			{
+				"buffer_size": 12191,
+				"line_ending": "Windows"
+			}
+		},
+		{
+			"file": "test_graveyard/unit/busted/configurator_test.rb",
+			"settings":
+			{
+				"buffer_size": 8539,
+				"line_ending": "Windows"
+			}
+		},
+		{
+			"file": "spec/spec_helper.rb",
+			"settings":
+			{
+				"buffer_size": 1081,
+				"line_ending": "Unix"
+			}
+		},
+		{
+			"file": "spec/configurator_spec.rb",
+			"settings":
+			{
+				"buffer_size": 249,
+				"line_ending": "Unix"
+			}
+		}
+	],
+	"build_system": "",
+	"command_palette":
+	{
+		"height": 0.0,
+		"selected_items":
+		[
+		],
+		"width": 0.0
+	},
+	"console":
+	{
+		"height": 0.0
+	},
+	"distraction_free":
+	{
+		"menu_visible": true,
+		"show_minimap": false,
+		"show_open_files": false,
+		"show_tabs": false,
+		"side_bar_visible": false,
+		"status_bar_visible": false
+	},
+	"file_history":
+	[
+		"/Users/johnvanenk/Development/AO/github_ceedling/spec/configurator_builder_spec.rb",
+		"/Users/johnvanenk/Development/AO/github_ceedling/test_graveyard/unit/busted/configurator_helper_test.rb",
+		"/Users/johnvanenk/Development/AO/github_ceedling/spec/preprocessinator_extractor_spec.rb",
+		"/Users/johnvanenk/Development/AO/github_ceedling/lib/configurator_builder.rb",
+		"/Users/johnvanenk/Development/AO/github_ceedling/spec/configuratior_helper_spec.rb",
+		"/Users/johnvanenk/Development/AO/github_ceedling/test_graveyard/unit/busted/configurator_builder_test.rb",
+		"/Users/johnvanenk/Development/AO/github_ceedling/test/unit/preprocessinator_extractor_test.rb",
+		"/Users/johnvanenk/Development/AO/github_ceedling/Gemfile",
+		"/Users/johnvanenk/Development/AO/github_ceedling/test/integration/paths_test.rb",
+		"/Users/johnvanenk/Development/AO/github_ceedling/rakefile.rb",
+		"/Users/johnvanenk/Development/AO/github_ceedling/test/test_helper.rb"
+	],
+	"find":
+	{
+		"height": 35.0
+	},
+	"find_in_files":
+	{
+		"height": 0.0,
+		"where_history":
+		[
+		]
+	},
+	"find_state":
+	{
+		"case_sensitive": false,
+		"find_history":
+		[
+			"standardize_paths",
+			"populate_tool_names"
+		],
+		"highlight": true,
+		"in_selection": false,
+		"preserve_case": false,
+		"regex": false,
+		"replace_history":
+		[
+		],
+		"reverse": false,
+		"show_context": true,
+		"use_buffer2": true,
+		"whole_word": false,
+		"wrap": true
+	},
+	"groups":
+	[
+		{
+			"selected": 1,
+			"sheets":
+			[
+				{
+					"buffer": 0,
+					"file": "spec/uncatagorized_specs_spec.rb",
+					"settings":
+					{
+						"buffer_size": 190,
+						"regions":
+						{
+						},
+						"selection":
+						[
+							[
+								190,
+								190
+							]
+						],
+						"settings":
+						{
+							"syntax": "Packages/Ruby/Ruby.tmLanguage"
+						},
+						"translation.x": 0.0,
+						"translation.y": 0.0,
+						"zoom_level": 1.0
+					},
+					"type": "text"
+				},
+				{
+					"buffer": 1,
+					"file": "lib/configurator.rb",
+					"settings":
+					{
+						"buffer_size": 12191,
+						"regions":
+						{
+						},
+						"selection":
+						[
+							[
+								8639,
+								8639
+							]
+						],
+						"settings":
+						{
+							"syntax": "Packages/Ruby/Ruby.tmLanguage",
+							"tab_size": 2,
+							"translate_tabs_to_spaces": true
+						},
+						"translation.x": 0.0,
+						"translation.y": 2960.0,
+						"zoom_level": 1.0
+					},
+					"type": "text"
+				},
+				{
+					"buffer": 2,
+					"file": "test_graveyard/unit/busted/configurator_test.rb",
+					"settings":
+					{
+						"buffer_size": 8539,
+						"regions":
+						{
+						},
+						"selection":
+						[
+							[
+								878,
+								899
+							]
+						],
+						"settings":
+						{
+							"syntax": "Packages/Ruby/Ruby.tmLanguage",
+							"tab_size": 2,
+							"translate_tabs_to_spaces": true
+						},
+						"translation.x": 0.0,
+						"translation.y": 0.0,
+						"zoom_level": 1.0
+					},
+					"type": "text"
+				}
+			]
+		},
+		{
+			"selected": 0,
+			"sheets":
+			[
+				{
+					"buffer": 3,
+					"file": "spec/spec_helper.rb",
+					"settings":
+					{
+						"buffer_size": 1081,
+						"regions":
+						{
+						},
+						"selection":
+						[
+							[
+								0,
+								0
+							]
+						],
+						"settings":
+						{
+							"syntax": "Packages/Ruby/Ruby.tmLanguage"
+						},
+						"translation.x": 0.0,
+						"translation.y": 0.0,
+						"zoom_level": 1.0
+					},
+					"type": "text"
+				},
+				{
+					"buffer": 4,
+					"file": "spec/configurator_spec.rb",
+					"settings":
+					{
+						"buffer_size": 249,
+						"regions":
+						{
+						},
+						"selection":
+						[
+							[
+								249,
+								249
+							]
+						],
+						"settings":
+						{
+							"syntax": "Packages/Ruby/Ruby.tmLanguage"
+						},
+						"translation.x": 0.0,
+						"translation.y": 0.0,
+						"zoom_level": 1.0
+					},
+					"type": "text"
+				}
+			]
+		}
+	],
+	"incremental_find":
+	{
+		"height": 0.0
+	},
+	"input":
+	{
+		"height": 31.0
+	},
+	"layout":
+	{
+		"cells":
+		[
+			[
+				0,
+				0,
+				1,
+				1
+			],
+			[
+				1,
+				0,
+				2,
+				1
+			]
+		],
+		"cols":
+		[
+			0.0,
+			0.5,
+			1.0
+		],
+		"rows":
+		[
+			0.0,
+			1.0
+		]
+	},
+	"menu_visible": true,
+	"output.exec":
+	{
+		"height": 100.0
+	},
+	"replace":
+	{
+		"height": 0.0
+	},
+	"save_all_on_build": true,
+	"select_file":
+	{
+		"height": 0.0,
+		"selected_items":
+		[
+			[
+				"configur",
+				"lib/configurator.rb"
+			],
+			[
+				"configurator_test",
+				"test_graveyard/unit/busted/configurator_test.rb"
+			],
+			[
+				"confihel",
+				"test_graveyard/unit/busted/configurator_helper_test.rb"
+			],
+			[
+				"confi",
+				"lib/configurator_builder.rb"
+			],
+			[
+				"preproces",
+				"spec/preprocessinator_extractor_spec.rb"
+			],
+			[
+				"spec",
+				"spec/spec_helper.rb"
+			],
+			[
+				"rakefile.rb",
+				"/Users/johnvanenk/Development/AO/github_ceedling/rakefile.rb"
+			]
+		],
+		"width": 0.0
+	},
+	"select_project":
+	{
+		"height": 0.0,
+		"selected_items":
+		[
+		],
+		"width": 0.0
+	},
+	"show_minimap": false,
+	"show_open_files": false,
+	"show_tabs": true,
+	"side_bar_visible": true,
+	"side_bar_width": 224.0,
+	"status_bar_visible": true
+}