madrona-rad 0.2.5 → 0.2.6

data/test/test_translation_post_processing.rb

@@ -0,0 +1,185 @@
+#!/usr/local/bin/ruby -w
+
+$TESTING = true
+
+# this is a test stub for now
+# lets review these
+# neee to remove this constant from tests and pull it from rad
+C_VAR_TYPES = "unsigned|int|long|double|str|char|byte|float|bool"
+require "rubygems"
+require "#{File.expand_path(File.dirname(__FILE__))}/../lib/rad/rad_processor.rb"
+require "#{File.expand_path(File.dirname(__FILE__))}/../lib/rad/rad_rewriter.rb"
+require "#{File.expand_path(File.dirname(__FILE__))}/../lib/rad/rad_type_checker.rb"
+require "#{File.expand_path(File.dirname(__FILE__))}/../lib/rad/variable_processing"
+require "#{File.expand_path(File.dirname(__FILE__))}/../lib/rad/arduino_sketch"
+require 'test/unit'
+
+
+class TranslationTesting < ArduinoSketch
+
+  def one
+    delay 1
+  end
+  
+  def two
+    delay 1
+    @foo = 1
+  end
+  
+  def three
+    @foo = 1
+    bar = 2
+    baz = wha
+  end
+  
+  def four
+    @foo = 1
+    bar = 2
+    wiggle = wha
+  end
+  
+  def five
+    @foo = 1
+    f = KOOL
+  end
+  
+  def six
+    a = ZAK
+    
+  end
+  
+  def seven(int)
+    # coerce int to long int
+    a = int * 2
+  end
+  
+  def eight(str)
+    # coerce str to string
+    a = ZAK + str
+  end
+  
+  def nine
+    @my_array.each do |a|
+      delay a
+    end
+  end
+  
+
+end
+
+
+
+class TestTranslationPostProcessing < Test::Unit::TestCase
+
+  
+
+
+  def setup
+    $external_var_identifiers = ["__foo", "__toggle", "wiggle"]   
+    $define_types = { "KOOL" => "long", "ZAK" => "str"}
+    $array_types = { "my_array" => "int"}
+    
+    
+  end
+  
+  # remove these external variables and parens on variables
+  # need to actually run code through ruby_to_c for some of these tests
+  
+  def test_int
+    name = "foo_a"
+    value_string = "int(__toggle = 0);"
+    expected = ""
+    result = ArduinoSketch.post_process_ruby_to_c_methods(value_string)
+    assert_equal(expected, result)
+  end
+  
+  def test_bool
+    name = "foo_b"
+    value_string = "bool(__toggle = 0);"
+    expected = ""
+    result = ArduinoSketch.post_process_ruby_to_c_methods(value_string)
+    assert_equal(expected, result)
+  end
+  
+  def test_long
+    name = "foo_c"
+    value_string = "long(__foo = 0);"
+    expected = ""
+    result = ArduinoSketch.post_process_ruby_to_c_methods(value_string)
+    assert_equal(expected, result)
+  end
+  
+  def test_trans_one
+    name = "foo_d"
+    expected = "void\none() {\ndelay(1);\n}"    
+    result = raw_rtc_meth = RADProcessor.translate(TranslationTesting, "one")
+    assert_equal(expected, result)
+  end
+  
+  # notice the nice behavior of @foo
+  def test_trans_two
+    name = "foo_e"
+    expected = "void\ntwo() {\ndelay(1);\n__foo = 1;\n}"    
+    result = raw_rtc_meth = RADProcessor.translate(TranslationTesting, "two")
+    assert_equal(expected, result)
+  end
+  
+  # notice the nice behavior of @foo
+  def test_trans_three
+    name = "foo_f"
+    expected = "void\nthree() {\nlong bar;\nvoid * baz;\n__foo = 1;\nbar = 2;\nbaz = wha();\n}"    
+    result = raw_rtc_meth = RADProcessor.translate(TranslationTesting, "three")
+    assert_equal(expected, result)
+  end
+  
+  # need to take a closer look at this ... include "void * wiggle" regex?
+  # 
+  def test_trans_four
+    name = "foo_f"
+    expected = "void\nfour() {\nlong bar;\nvoid * wiggle;\n__foo = 1;\nbar = 2;\nwiggle = wha();\n}"    
+    result = raw_rtc_meth = RADProcessor.translate(TranslationTesting, "four")
+    assert_equal(expected, result)
+  end
+  
+  def test_trans_five
+    name = "foo_f"
+    expected = "void\nfive() {\nlong f;\n__foo = 1;\nf = KOOL;\n}"
+    result = raw_rtc_meth = RADProcessor.translate(TranslationTesting, "five")
+    assert_equal(expected, result)
+  end
+  
+  def test_trans_six
+    name = "foo_f"
+    expected = "void\nsix() {\nstr a;\na = ZAK;\n}"
+    result = raw_rtc_meth = RADProcessor.translate(TranslationTesting, "six")
+    assert_equal(expected, result)
+  end
+  
+  def test_trans_seven
+    name = "foo_f"
+    expected = "void\nseven(long int) {\nlong a;\na = int * 2;\n}"
+    result = raw_rtc_meth = RADProcessor.translate(TranslationTesting, "seven")
+    assert_equal(expected, result)
+  end
+  
+  def test_trans_eight
+    name = "foo_f"
+    expected = "void\neight(long str) {\nvoid * a;\na = ZAK + str;\n}"
+    result = raw_rtc_meth = RADProcessor.translate(TranslationTesting, "eight")
+    assert_equal(expected, result)
+  end
+  
+  def test_trans_nine
+    name = "foo_f"
+    expected = "void\nnine() {\nunsigned int index_a;\nfor (index_a = 0; index_a < (int) (sizeof(__my_array) / sizeof(__my_array[0])); index_a++) {\nint a = __my_array[index_a];\ndelay(a);\n}\n}"
+    result = raw_rtc_meth = RADProcessor.translate(TranslationTesting, "nine")
+    assert_equal(expected, result)
+  end
+  
+  
+  ## need to look at unsigned long 
+  ## need parens removal tests
+  
+
+
+end

data/{lib/test → test}/test_variable_processing.rb

@@ -4,9 +4,10 @@ $TESTING = true
 
 # need to tell it where we are
 # lets review these
-C_VAR_TYPES = "int|void|unsigned|long|short|uint8_t|static|byte|float"
-require 'vendor/rad/variable_processing'
-require 'vendor/rad/arduino_sketch'
+# neee to remove this constant from tests and pull it from rad
+C_VAR_TYPES = "unsigned|int|long|double|str|char|byte|float|bool"
+require "#{File.expand_path(File.dirname(__FILE__))}/../lib/rad/variable_processing"
+require "#{File.expand_path(File.dirname(__FILE__))}/../lib/rad/arduino_sketch"
 require 'test/unit'
 
 
@@ -81,7 +82,7 @@ class TestVariableProcessing < Test::Unit::TestCase
   def test_int_with_type
     name = "foo_i"
     value_string = "int"
-    expected = "long __foo_i;"
+    expected = "int __foo_i;"
     result = @t.pre_process_vars(name, value_string)
     assert_equal(expected, result[0])
   end
@@ -94,7 +95,7 @@ class TestVariableProcessing < Test::Unit::TestCase
     assert_equal(expected, result[0])
   end
   
-  def test_int_with_type
+  def test_int_with_type_two
     name = "foo_k"
     value_string = "2, int"
     expected = "int __foo_k = 2;"
@@ -134,14 +135,6 @@ class TestVariableProcessing < Test::Unit::TestCase
     assert_equal(expected, result[0])
   end
   
-  def test_int_with_unsigned_long
-    name = "foo_p"
-    value_string = "2, long unsigned"
-    expected = "long unsigned __foo_p = 2;"
-    result = @t.pre_process_vars(name, value_string)
-    assert_equal(expected, result[0])
-  end
-  
   def test_int_with_short_int
     name = "foo_q"
     value_string = "2, short int"
@@ -182,6 +175,63 @@ class TestVariableProcessing < Test::Unit::TestCase
     assert_equal(expected, result[0])
   end
   
+  def test_negative_int_string
+    name = "foo_w"
+    value_string = "-1, int"
+    expected = "int __foo_w = -1;"
+    result = @t.pre_process_vars(name, value_string)
+    assert_equal(expected, result[0])
+  end
+  
+  def test_negative_float_string
+    name = "foo_x"
+    value_string = "-0.1, float"
+    expected = "float __foo_x = -0.1;"
+    result = @t.pre_process_vars(name, value_string)
+    assert_equal(expected, result[0])
+  end
+  
+  def test_negative_larger_float_string
+    name = "foo_y"
+    value_string = "-1000.01, float"
+    expected = "float __foo_y = -1000.01;"
+    result = @t.pre_process_vars(name, value_string)
+    assert_equal(expected, result[0])
+  end
+  
+  def test_negative_long_string
+    name = "foo_z"
+    value_string = "-.0991, float"
+    expected = "float __foo_z = -0.0991;"
+    result = @t.pre_process_vars(name, value_string)
+    assert_equal(expected, result[0])
+  end
+  
+  def test_negative_float_string_two
+    name = "foo_aa"
+    value_string = "-.01, float"
+    expected = "float __foo_aa = -0.01;"
+    result = @t.pre_process_vars(name, value_string)
+    assert_equal(expected, result[0])
+  end
+  
+  def test_negative_interter_string
+    name = "foo_bb"
+    value_string = "-.01, float"
+    expected = "float __foo_bb = -0.01;"
+    result = @t.pre_process_vars(name, value_string)
+    assert_equal(expected, result[0])
+  end
+  
+  def test_dash_string
+    name = "foo_cc"
+    value_string = "-hmmm"
+    expected = "char* __foo_cc = \"-hmmm\";"
+    result = @t.pre_process_vars(name, value_string)
+    assert_equal(expected, result[0])
+  end
+  
+  
   
 
   

data/website/index.html

@@ -35,12 +35,13 @@
     	  <a href="http://rubyforge.org/projects/rad" class="numbers">0.2.2</a>
     	</div>
 			<div id="buy-arduino">
-				
-								<a href="http://www.sparkfun.com/commerce/product_info.php?products_id=666">
-
-				<img src="http://www.sparkfun.com/commerce/images/ArduinoUSBBoard-01-M.jpg" />
+			  <h3>Sponsored by:</h3>
+			  <h4>The Shoppe at Wulfden</h4>
+			  <a href="http://www.wulfden.org/freeduino/freeduino.shtml">
+				  <img src="http://www.wulfden.org/freeduino/freeduino-1.jpg" /><br />
 				</a>
-								<h4><a href="http://www.sparkfun.com/commerce/product_info.php?products_id=666">Buy an Arduino from Sparkfun</a></h4>
+				<h4><a href="http://www.wulfden.org/freeduino/freeduino.shtml">Totally Open Arduino-Compatible Hardware</a></h4>
+				
 
 			</div>
 		</div>
@@ -76,7 +77,7 @@
 	<p><code>$ sudo gem install rad</code></p>
 
 
-	<p>You&#8217;ll also need to have the Arduino environment installed, which you can get from <a href="http://www.arduino.cc/en/Main/Software">the Arduino website</a>.  <span class="caps">RAD</span> currently requires Arduino 0010, but we try to keep it up-to-date with new Arduino releases.</p>	
+	<p>You&#8217;ll also need to have the Arduino environment installed, which you can get from <a href="http://www.arduino.cc/en/Main/Software">the Arduino website</a>.  <span class="caps">RAD</span> currently requires Arduino 0011, but we try to keep it up-to-date with new Arduino releases.</p>	
 
 
 	<h2>The Basics</h2>
@@ -140,7 +141,7 @@ end
 	<p>There&#8217;s lots to do.</p>
 
 
-	<p>If you&#8217;re looking for a place to dive in and don&#8217;t know quite where, <a href="mailto:ruby-arduino-development@googlegroups.com">email the RAD Google Group</a>; we're friendly! If you want to start by taking a log at the code, the trunk repository is <code>svn://rubyforge.org/var/svn/rad/trunk</code> for anonymous access.</p>
+	<p>If you&#8217;re looking for a place to dive in and don&#8217;t know quite where, <a href="mailto:ruby-arduino-development@googlegroups.com">email the RAD Google Group</a>; we're friendly! If you want to start by taking a look at the code, check out RAD on GitHub: <code>http://github.com/atduskgreg/rad/tree/master</code>.</p>
 
 
 	<h2>License</h2>

metadata

@@ -1,37 +1,37 @@
 --- !ruby/object:Gem::Specification 
 name: madrona-rad
 version: !ruby/object:Gem::Version 
-  version: 0.2.5
+  version: 0.2.6
 platform: ruby
 authors: 
 - Greg Borenstein
-- "plugins+: JD Barnhart"
+- JD Barnhart
 autorequire: 
 bindir: bin
 cert_chain: []
 
-date: 2008-06-25 00:00:00 -07:00
+date: 2008-07-30 00:00:00 -07:00
 default_executable: rad
 dependencies: 
 - !ruby/object:Gem::Dependency 
-  name: mime-types
+  name: RubyToC
   version_requirement: 
   version_requirements: !ruby/object:Gem::Requirement 
     requirements: 
-    - - ">"
+    - - ">="
       - !ruby/object:Gem::Version 
-        version: 0.0.0
+        version: 1.0.0
     version: 
 - !ruby/object:Gem::Dependency 
-  name: RubyToC
+  name: hoe
   version_requirement: 
   version_requirements: !ruby/object:Gem::Requirement 
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
-        version: 1.0.0
+        version: 1.7.0
     version: 
-description: "Ruby Arduino Development: a framework for programming the Arduino physcial computing platform using Ruby"
+description: A framework for programming the Arduino physcial computing platform using Ruby. RAD converts Ruby scripts written using a set of Rails-like conventions and helpers into C source code which can be compiled and run on the Arduino microcontroller.
 email: jd@jdbarnhart.com
 executables: 
 - rad
@@ -39,8 +39,18 @@ extensions: []
 
 extra_rdoc_files: 
 - History.txt
+- License.txt
 - Manifest.txt
+- lib/libraries/DS1307/keywords.txt
+- lib/libraries/FrequencyTimer2/keywords.txt
+- lib/libraries/OneWire/keywords.txt
+- lib/libraries/OneWire/readme.txt
+- lib/libraries/Servo/keywords.txt
+- lib/libraries/Stepper/keywords.txt
+- lib/libraries/Wire/keywords.txt
+- lib/rad/todo.txt
 - README.rdoc
+- website/index.txt
 files: 
 - History.txt
 - License.txt
@@ -49,78 +59,101 @@ files:
 - Rakefile
 - bin/rad
 - lib/examples/add_hysteresis.rb
+- lib/examples/blink_m_address_assignment.rb
 - lib/examples/blink_m_hello.rb
-- lib/examples/external_variable_fu.rb
+- lib/examples/blink_m_multi.rb
+- lib/examples/configure_pa_lcd_boot.rb
 - lib/examples/debounce_methods.rb
+- lib/examples/external_variable_fu.rb
 - lib/examples/external_variables.rb
 - lib/examples/first_sound.rb
 - lib/examples/frequency_generator.rb
+- lib/examples/hello_array.rb
+- lib/examples/hello_array2.rb
+- lib/examples/hello_array_eeprom.rb
 - lib/examples/hello_eeprom.rb
+- lib/examples/hello_eeprom_lcdpa.rb
+- lib/examples/hello_lcd_charset.rb
+- lib/examples/hello_pa_lcd.rb
 - lib/examples/hello_servos.rb
 - lib/examples/hello_world.rb
+- lib/examples/hysteresis_duel.rb
 - lib/examples/i2c_with_clock_chip.rb
+- lib/examples/motor_knob.rb
 - lib/examples/orig_servo_throttle.rb
 - lib/examples/servo_buttons.rb
+- lib/examples/servo_calibrate_continuous.rb
 - lib/examples/servo_throttle.rb
 - lib/examples/sparkfun_lcd.rb
+- lib/examples/spectra_soft_pot.rb
 - lib/examples/times_method.rb
 - lib/examples/toggle.rb
 - lib/examples/two_wire.rb
 - lib/libraries/DS1307/DS1307.cpp
 - lib/libraries/DS1307/DS1307.h
 - lib/libraries/DS1307/keywords.txt
-- lib/libraries/FrequencyTimer2/keywords.txt
 - lib/libraries/FrequencyTimer2/FrequencyTimer2.cpp
 - lib/libraries/FrequencyTimer2/FrequencyTimer2.h
-- lib/libraries/OneWire/keywords.txt
+- lib/libraries/FrequencyTimer2/keywords.txt
 - lib/libraries/OneWire/OneWire.cpp
 - lib/libraries/OneWire/OneWire.h
+- lib/libraries/OneWire/keywords.txt
 - lib/libraries/OneWire/readme.txt
-- lib/libraries/Servo/keywords.txt
-- lib/libraries/Servo/Servo.cpp
-- lib/libraries/Servo/Servo.h
 - lib/libraries/SWSerLCDpa/SWSerLCDpa.cpp
 - lib/libraries/SWSerLCDpa/SWSerLCDpa.h
 - lib/libraries/SWSerLCDsf/SWSerLCDsf.cpp
 - lib/libraries/SWSerLCDsf/SWSerLCDsf.h
+- lib/libraries/Servo/Servo.cpp
+- lib/libraries/Servo/Servo.h
+- lib/libraries/Servo/keywords.txt
+- lib/libraries/Stepper/Stepper.cpp
+- lib/libraries/Stepper/Stepper.h
+- lib/libraries/Stepper/keywords.txt
 - lib/libraries/Wire/Wire.cpp
-- lib/libraries/Wire/keywords.txt
 - lib/libraries/Wire/Wire.h
+- lib/libraries/Wire/keywords.txt
 - lib/libraries/Wire/twi.h
-- lib/libraries/Wire/utilities/twi.c
-- lib/libraries/Wire/utilities/twi.h
+- lib/libraries/Wire/utility/twi.c
+- lib/libraries/Wire/utility/twi.h
 - lib/plugins/bitwise_ops.rb
 - lib/plugins/blink_m.rb
 - lib/plugins/debounce.rb
 - lib/plugins/debug_output_to_lcd.rb
+- lib/plugins/hysteresis.rb
 - lib/plugins/i2c_eeprom.rb
 - lib/plugins/input_output_state.rb
+- lib/plugins/lcd_padding.rb
 - lib/plugins/mem_test.rb
 - lib/plugins/servo_pulse.rb
 - lib/plugins/servo_setup.rb
 - lib/plugins/smoother.rb
 - lib/plugins/spark_fun_serial_lcd.rb
+- lib/plugins/spectra_symbol.rb
 - lib/rad.rb
-- lib/rad/arduino_sketch.rb
 - lib/rad/arduino_plugin.rb
+- lib/rad/arduino_sketch.rb
+- lib/rad/generators/makefile/makefile.erb
+- lib/rad/generators/makefile/makefile.rb
+- lib/rad/init.rb
 - lib/rad/rad_processor.rb
 - lib/rad/rad_rewriter.rb
-- lib/rad/variable_processing.rb
-- lib/rad/init.rb
-- lib/rad/todo.txt
+- lib/rad/rad_type_checker.rb
+- lib/rad/sim/arduino_sketch.rb
 - lib/rad/tasks/build_and_make.rake
 - lib/rad/developer.rake
 - lib/rad/tasks/rad.rb
+- lib/rad/todo.txt
+- lib/rad/variable_processing.rb
 - lib/rad/version.rb
-- lib/rad/generators/makefile/makefile.erb
-- lib/rad/generators/makefile/makefile.rb
-- lib/test/test_array_processing.rb
-- lib/test/test_variable_processing.rb
 - scripts/txt2html
 - setup.rb
 - spec/models/spec_helper.rb
 - spec/models/arduino_sketch_spec.rb
 - spec/spec.opts
+- test/test_array_processing.rb
+- test/test_plugin_loading.rb
+- test/test_translation_post_processing.rb
+- test/test_variable_processing.rb
 - website/index.html
 - website/index.txt
 - website/javascripts/rounded_corners_lite.inc.js
@@ -131,7 +164,7 @@ files:
 - website/examples/hello_world.rb.html
 - website/examples/serial_motor.rb.html
 has_rdoc: true
-homepage: http://github.com/madrona/rad
+homepage: http://rad.rubyforge.org
 post_install_message: 
 rdoc_options: 
 - --main
@@ -156,6 +189,9 @@ rubyforge_project: rad
 rubygems_version: 1.2.0
 signing_key: 
 specification_version: 2
-summary: Fork of the Ruby Arduino Development - 0.2.5.1.0
-test_files: []
-
+summary: A framework for programming the Arduino physcial computing platform using Ruby. RAD converts Ruby scripts written using a set of Rails-like conventions and helpers into C source code which can be compiled and run on the Arduino microcontroller.
+test_files: 
+- test/test_array_processing.rb
+- test/test_plugin_loading.rb
+- test/test_translation_post_processing.rb
+- test/test_variable_processing.rb