ceedling 0.12.0 → 0.12.1

data/Rakefile

@@ -85,3 +85,34 @@ desc "Update versions"
 task :update_revs do
   update_revisions
 end
+
+def test_project(name, ceedling_command, tasks)
+  cd('stage/') do
+    rm_rf(name)
+    puts "=" * 40
+    puts "Testing #{name}"
+    puts "=" * 40
+    rm_rf(name)
+    sh "ceedling #{ceedling_command}"
+    cd(name){sh("rake #{tasks.join(' ')}")}
+    puts ""
+    puts "Testing of #{name} successful!"
+    puts "=" * 40
+  end
+end
+
+desc "Test bundled projects"
+task :test_projects => [:install] do
+  rm_rf("stage/")
+  mkdir('stage/')
+
+  # test the skeleton project
+  test_project('skeleton', 'new skeleton', ['version', 'test:all'])
+
+  # test all of the bundled examples
+  examples = nil
+  cd("examples/"){examples = Dir['*/']}
+  examples.each do |ex_name|
+    test_project(ex_name, "example #{ex_name}", ['version', 'default'])
+  end
+end

data/examples/blinky/src/BlinkTask.h

@@ -3,6 +3,4 @@
 
 void BlinkTask(void);
 
-
-
-#endif
+#endif

data/examples/blinky/src/Configure.c

@@ -1,13 +1,11 @@
 #include "Configure.h"
 #include "main.h"
 #ifdef TEST
-  #define LOOP 
   #include "stub_io.h"
   #include "stub_interrupt.h"
 #else
   #include <avr/interrupt.h>
   #include <avr/io.h>
-  #define LOOP while(1)
 #endif // TEST
 
 /* setup timer 0 to divide bus clock by 64.

data/examples/blinky/test/support/stub_interrupt.h

@@ -55,7 +55,6 @@
 */
 
 // #if defined(__DOXYGEN__)
-#if 1
 /** \def sei()
     \ingroup avr_interrupts
 
@@ -64,13 +63,13 @@
     Enables interrupts by setting the global interrupt mask. This function
     actually compiles into a single line of assembly, so there is no function
     call overhead. */
-#define sei()
-#else  /* !DOXYGEN */
-# define sei()  __asm__ __volatile__ ("sei" ::)
-#endif /* DOXYGEN */
+// #define sei()
+void sei(void); // Redefine the macro as a function so that it can be mocked by CMock
+// #else  /* !DOXYGEN */
+// # define sei()  __asm__ __volatile__ ("sei" ::)
+// #endif /* DOXYGEN */
 
 // #if defined(__DOXYGEN__)
-#if 1
 /** \def cli()
     \ingroup avr_interrupts
 
@@ -79,17 +78,17 @@
     Disables all interrupts by clearing the global interrupt mask. This function
     actually compiles into a single line of assembly, so there is no function
     call overhead. */
-#define cli()
-#else  /* !DOXYGEN */
-# define cli()  __asm__ __volatile__ ("cli" ::)
-#endif /* DOXYGEN */
+// #define cli()
+void cli(void); // Redefine the macro as a function so that it can be mocked by CMock
+// #else  /* !DOXYGEN */
+// # define cli()  __asm__ __volatile__ ("cli" ::)
+// #endif /* DOXYGEN */
 
 
 /** \name Macros for writing interrupt handler functions */
 
 
 // #if defined(__DOXYGEN__)
-#if 1
 /** \def ISR(vector [, attributes])
     \ingroup avr_interrupts
 
@@ -112,25 +111,25 @@
 */
 // #  define ISR(vector, [attributes])
 #define ISR void ISR
-#else  /* real code */
-
-#if (__GNUC__ == 4 && __GNUC_MINOR__ >= 1) || (__GNUC__ > 4)
-#  define __INTR_ATTRS used, externally_visible
-#else /* GCC < 4.1 */
-#  define __INTR_ATTRS used
-#endif
-
-#ifdef __cplusplus
-#  define ISR(vector, ...)            \
-    extern "C" void vector (void) __attribute__ ((signal,__INTR_ATTRS)) __VA_ARGS__; \
-    void vector (void)
-#else
-#  define ISR(vector, ...)            \
-    void vector (void) __attribute__ ((signal,__INTR_ATTRS)) __VA_ARGS__; \
-    void vector (void)
-#endif
-
-#endif /* DOXYGEN */
+// #else  /* real code */
+
+// #if (__GNUC__ == 4 && __GNUC_MINOR__ >= 1) || (__GNUC__ > 4)
+// #  define __INTR_ATTRS used, externally_visible
+// #else /* GCC < 4.1 */
+// #  define __INTR_ATTRS used
+// #endif
+
+// #ifdef __cplusplus
+// #  define ISR(vector, ...)            \
+//     extern "C" void vector (void) __attribute__ ((signal,__INTR_ATTRS)) __VA_ARGS__; \
+//     void vector (void)
+// #else
+// #  define ISR(vector, ...)            \
+//     void vector (void) __attribute__ ((signal,__INTR_ATTRS)) __VA_ARGS__; \
+//     void vector (void)
+// #endif
+
+// #endif /* DOXYGEN */
 
 #if defined(__DOXYGEN__)
 /** \def SIGNAL(vector)

data/examples/blinky/test/test_BlinkTask.c

@@ -2,14 +2,20 @@
 #include "BlinkTask.h"
 #include "stub_io.h"
 
-void setUp(void) {
+// every test file requires this function
+// setUp() is called by the generated runner before each test case function
+void setUp(void)
+{
     PORTB = 0;
-}    // every test file requires this function;
-                       // setUp() is called by the generated runner before each test case function
-void tearDown(void) {} // every test file requires this function;
-                       // tearDown() is called by the generated runner before each test case function
+}    
+                       
+// every test file requires this function
+// tearDown() is called by the generated runner before each test case function
+void tearDown(void)
+{
+}
 
-void test_BlinkTask_should_toggle_led(void) //Reqs: 
+void test_BlinkTask_should_toggle_led(void)
 {
     /* Ensure known test state */
 
@@ -21,7 +27,7 @@ void test_BlinkTask_should_toggle_led(void) //Reqs:
     /* Verify test results */
     TEST_ASSERT_EQUAL(0x20, PORTB);
 }
-void test_BlinkTask_should_toggle_led_LOW(void) //Reqs: 
+void test_BlinkTask_should_toggle_led_LOW(void)
 {
     /* Ensure known test state */
     PORTB = 0x20;

data/examples/blinky/test/test_Configure.c

@@ -1,6 +1,7 @@
 #include "unity.h"
 #include "Configure.h"
 #include "stub_io.h"
+#include "mock_stub_interrupt.h"
 
 void setUp(void)
 {
@@ -10,14 +11,14 @@ void tearDown(void)
 {
 }
 
-void test_Configure_should_setup_timer_and_port(void) //Reqs: 
-{
+void test_Configure_should_setup_timer_and_port(void)
+    {
     /* Ensure known test state */
 
     /* Setup expected call chain */
     //these are defined into assembly instructions. 
-    // cli_Expect(); 
-    // sei_Expect();
+    cli_Expect(); 
+    sei_Expect();
     /* Call function under test */
     Configure();
 

data/examples/blinky/test/test_main.c

@@ -8,7 +8,7 @@ void setUp(void) {}    // every test file requires this function;
 void tearDown(void) {} // every test file requires this function;
                        // tearDown() is called by the generated runner before each test case function
 
-void test_AppMain_should_call_configure(void) //Reqs: 
+void test_AppMain_should_call_configure(void)
 {
     /* Ensure known test state */
     BlinkTaskReady=0;
@@ -20,7 +20,7 @@ void test_AppMain_should_call_configure(void) //Reqs:
     /* Verify test results */
     TEST_ASSERT_EQUAL(0, BlinkTaskReady);
 }
-void test_AppMain_should_call_configure_and_BlinkTask(void) //Reqs: 
+void test_AppMain_should_call_configure_and_BlinkTask(void)
 {
     /* Ensure known test state */
     BlinkTaskReady=1;
@@ -33,7 +33,7 @@ void test_AppMain_should_call_configure_and_BlinkTask(void) //Reqs:
     /* Verify test results */
     TEST_ASSERT_EQUAL(0, BlinkTaskReady);
 }
-void test_ISR_should_increment_tick(void) //Reqs: 
+void test_ISR_should_increment_tick(void)
 {
     /* Ensure known test state */
     tick = 0;
@@ -45,7 +45,7 @@ void test_ISR_should_increment_tick(void) //Reqs:
     /* Verify test results */
     TEST_ASSERT_EQUAL(1, tick);
 }
-void test_ISR_should_set_blinkReady_increment_tick(void) //Reqs: 
+void test_ISR_should_set_blinkReady_increment_tick(void)
 {
     /* Ensure known test state */
     tick = 1000;

data/examples/temp_sensor/rakefile.rb

@@ -1,4 +1,6 @@
 PROJECT_ROOT  = File.expand_path(File.dirname(__FILE__))
 PROJECT_TOOLS = 'vendor'
 
-load 'vendor/ceedling/lib/rakefile.rb'
+load 'vendor/ceedling/lib/rakefile.rb'
+
+task :default => ['test:all']

data/lib/ceedling/version.rb

@@ -2,7 +2,7 @@
 module Ceedling
   module Version
     # @private
-    GEM = "0.12.0"
+    GEM = "0.12.1"
 
     # @private
     CEEDLING = "0.10.226"

data/lib/ceedling/version.rb.erb

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

metadata

@@ -5,8 +5,8 @@ version: !ruby/object:Gem::Version
   segments: 
   - 0
   - 12
-  - 0
-  version: 0.12.0
+  - 1
+  version: 0.12.1
 platform: ruby
 authors: 
 - Mike Karlesky, Mark VanderVoord
@@ -67,6 +67,7 @@ files:
 - bin/ceedling
 - ceedling-gem.sublime-project
 - ceedling.gemspec
+- examples/blinky/.DS_Store
 - examples/blinky/project.yml
 - examples/blinky/rakefile.rb
 - examples/blinky/src/BlinkTask.c