ceedling 0.12.2 → 0.13.0.rc1

data/{new_project_template/vendor/ceedling/lib → lib}/objects.yml

@@ -259,8 +259,6 @@ preprocessinator_file_handler:
     - file_wrapper   
 
 preprocessinator_extractor:
-  compose:
-    - file_wrapper
 
 test_invoker:
   compose:

data/lib/par_map.rb

@@ -0,0 +1,19 @@
+
+
+def par_map(n, things, &block)
+  queue = Queue.new
+  things.each { |thing| queue << thing }
+  threads = (1..n).collect do
+    Thread.new do
+      begin
+        while true
+          yield queue.pop(true)
+        end
+      rescue ThreadError
+
+      end
+    end
+  end
+  threads.each { |t| t.join }
+end
+

data/{new_project_template/vendor/ceedling/lib → lib}/plugin_manager.rb

@@ -16,13 +16,18 @@ class PluginManager
     script_plugins.each do |plugin|
       # protect against instantiating object multiple times due to processing config multiple times (option files, etc)
 			next if (@plugin_manager_helper.include?(@plugin_objects, plugin))
-      @system_wrapper.require_file( "#{plugin}.rb" )
-      object = @plugin_manager_helper.instantiate_plugin_script( camelize(plugin), system_objects, plugin )
-      @plugin_objects << object
-      environment += object.environment
-      
-      # add plugins to hash of all system objects
-      system_objects[plugin.downcase.to_sym] = object
+      begin
+        @system_wrapper.require_file( "#{plugin}.rb" )
+        object = @plugin_manager_helper.instantiate_plugin_script( camelize(plugin), system_objects, plugin )
+        @plugin_objects << object
+        environment += object.environment
+        
+        # add plugins to hash of all system objects
+        system_objects[plugin.downcase.to_sym] = object
+      rescue
+        puts "Exception raised while trying to load plugin: #{plugin}"
+        raise
+      end
     end
     
     yield( { :environment => environment } ) if (environment.size > 0)
@@ -89,7 +94,14 @@ class PluginManager
   end
 
   def execute_plugins(method, *args)
-    @plugin_objects.each {|plugin| plugin.send(method, *args) }
+    @plugin_objects.each do |plugin|
+      begin
+        plugin.send(method, *args)
+      rescue
+        puts "Exception raised in plugin: #{plugin.name}, in method #{method}"
+        raise
+      end
+    end
   end
 
 end

data/lib/preprocessinator_extractor.rb

@@ -0,0 +1,30 @@
+class PreprocessinatorExtractor
+  def extract_base_file_from_preprocessed_expansion(filepath)
+    # preprocessing by way of toolchain preprocessor expands macros, eliminates
+    # comments, strips out #ifdef code, etc.  however, it also expands in place
+    # each #include'd file.  so, we must extract only the lines of the file
+    # that belong to the file originally preprocessed
+
+    # iterate through all lines and alternate between extract and ignore modes
+    # all lines between a '#'line containing file name of our filepath and the
+    # next '#'line should be extracted
+
+    base_name  = File.basename(filepath)
+    not_pragma = /^#(?!pragma\b)/ # preprocessor directive that's not a #pragma
+    pattern    = /^#.*(\s|\/|\\|\")#{Regexp.escape(base_name)}/
+    found_file = false # have we found the file we care about?
+
+    lines = []
+    File.readlines(filepath).each do |line|
+      if found_file and not line.match(not_pragma)
+        lines << line
+      else
+        found_file = false
+      end
+
+      found_file = true if line.match(pattern)
+    end
+
+    return lines
+  end
+end

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

@@ -1,3 +1,4 @@
+require "par_map"
 
 class TaskInvoker
 
@@ -73,13 +74,16 @@ class TaskInvoker
     @rake_wrapper[result].invoke
   end
 
-
   def invoke_release_dependencies_files(files)
-    files.each { |file| @rake_wrapper[file].invoke }
+    par_map(PROJECT_COMPILE_THREADS, files) do |file|
+       @rake_wrapper[file].invoke
+    end
   end
   
   def invoke_release_objects(objects)
-    objects.each { |object| @rake_wrapper[object].invoke }
+    par_map(PROJECT_COMPILE_THREADS, objects) do |object|
+       @rake_wrapper[object].invoke
+    end
   end
   
 end

data/rakefile.rb

@@ -0,0 +1,14 @@
+#!/usr/bin/env rake
+require 'bundler'
+
+task :ci => [:bundle_install, :spec]
+
+require 'rspec/core/rake_task'
+desc "Run all rspecs"
+RSpec::Core::RakeTask.new(:spec) do |t|
+  t.pattern = 'spec/**/*_spec.rb'
+end
+
+task :bundle_install do
+  sh 'bundle install'
+end

data/release/build.info

@@ -0,0 +1,2 @@
+226
+

data/spec/configurator_builder_spec.rb

@@ -0,0 +1,7 @@
+#derived from test_graveyard/unit/busted/configurator_builder_test.rb
+
+require 'spec_helper'
+
+describe ConfiguratorBuilder do
+	xit "is scary"
+end

data/spec/configurator_helper_spec.rb

@@ -0,0 +1,5 @@
+require 'spec_helper'
+
+describe "ConfiguratorHelper" do
+  xit "doesn't exist..."
+end

data/spec/configurator_spec.rb

@@ -0,0 +1,10 @@
+require 'spec_helper'
+
+describe Configurator do
+	describe "#standardize_paths" do
+		xit "should standardize [:project][:build_root]"
+		xit "should standardize [:paths]"
+		xit "should standardize [:files]"
+		xit "should standardize [:tools]"
+	end
+end

data/spec/par_map_spec.rb

@@ -0,0 +1,57 @@
+require "par_map"
+
+def short_task_should(n) 
+  done_count = 0
+  par_map(n, [0.01] * (n - 1) + [0] * 10) do |seconds|
+    sleep(seconds)
+    if seconds == 1 then
+      done_count.should >= 10
+    else
+      done_count += 1
+    end
+  end
+end
+
+describe "par_map" do
+  it "should run shorter tasks while larger tasks are blocking (with 2 threads)" do
+    short_task_should(2)
+  end
+
+  it "should run shorter tasks while larger tasks are blocking (with 3 threads)" do
+    short_task_should(3) 
+  end
+
+  it "should run shorter tasks while larger tasks are blocking (with 4 threads)" do
+    short_task_should(4)
+  end 
+
+  #the following two tests are still slightly nondeterministic and may occasionally 
+  #  show false positives (though we think we've gotten it pretty stable)
+  it "should collide if multiple threads are used" do
+    is_running = false
+    # we are trying to maximize the potential for collision by varying the sleep
+    #  delay between threads
+    collision = false
+    par_map(4, (1..5).to_a) do |x|
+      if is_running then
+        collision = true
+      end
+      is_running = true
+      sleep(0.01 * x)
+      is_running = false
+    end
+    collision.should be true
+  end
+
+  it "should be serial if only one thread is used" do
+    is_running = false
+    par_map(1, (1..5).to_a) do |x|
+      is_running.should be false
+      is_running = true
+      sleep(0.01 * x)
+      is_running = false
+    end
+  end
+
+  
+end

data/spec/preprocessinator_extractor_spec.rb

@@ -0,0 +1,46 @@
+# derived from test_graveyard/unit/preprocessinator_extractor_test.rb
+
+require 'spec_helper'
+
+describe PreprocessinatorExtractor do
+  describe "#extract_base_file_from_preprocessed_expansion" do
+    it "should extract text from the original file and keep #pragma statements" do
+      file_path = "path/to/WANT.c"
+      input_str = <<-EOS
+        # 1 "some/file/we/do/not/care/about.c" 5
+        #pragma shit
+        some_text_we_do_not_want();
+        # 1 "some/file/we/DO/WANT.c" 99999
+        some_text_we_do_not_want();
+        #pragma want
+        some_awesome_text_we_want_so_hard();
+        holy_crepes_more_awesome_text();
+        # oh darn
+        # 1 "some/useless/file.c" 9
+        a set of junk
+        more junk
+        # 1 "holy/shoot/yes/WANT.c" 10
+        some_additional_awesome_want_text();
+      EOS
+      input_str = input_str.left_margin.rstrip
+
+      expect_str = <<-EOS
+        some_text_we_do_not_want();
+        #pragma want
+        some_awesome_text_we_want_so_hard();
+        holy_crepes_more_awesome_text();
+        some_additional_awesome_want_text();
+      EOS
+      expect_str = expect_str.left_margin.rstrip.split("\n")
+
+      stub(File).readlines(file_path) { input_str.split("\n") }
+
+      subject.extract_base_file_from_preprocessed_expansion(file_path).should == expect_str
+    end
+
+    # These were originally hinted at by the old test, but we don't see anything
+    # in the implementation that does this. They are here as reminders in the future.
+    # # xit "should ignore formatting"
+    # # xit "should ignore whitespace"
+  end
+end