rad 0.0.3 → 0.0.4

data/History.txt

@@ -1,17 +1,24 @@
-== 0.0.1 2007-07-22
+== 0.0.4 2007-07-24
 
 * 1 major enhancement:
-  * Initial release
-  * most features of the Arduino software library functional
-  * experimental implementation of the serial interface
-  * complete rake-based build, compile, and upload cycle
+  * serial_begin class method
+  
+== 0.0.3 2007-07-23
 
+* 1 major enhancement:
+  * bug fix in blink helper method
+  
 == 0.0.2 2007-07-23
 
 * 1 major enhancement:
   * blink helper method
   
-== 0.0.3 2007-07-23
+== 0.0.1 2007-07-22
 
 * 1 major enhancement:
-  * bug fix in blink helper method
+  * Initial release
+  * most features of the Arduino software library functional
+  * experimental implementation of the serial interface
+  * complete rake-based build, compile, and upload cycle
+
+

data/lib/rad/arduino_sketch.rb

@@ -6,6 +6,7 @@ class ArduinoSketch
   def initialize
     @declarations = []
     @pin_modes = {:output => [], :input => []}
+    @other_setup = [] # specifically, Serial.begin
     @accessors = []
     @signatures = ["void blink();"]
     @helper_methods = <<-CODE
@@ -52,6 +53,12 @@ class ArduinoSketch
     @helper_methods << "\n#{st}\n"
   end
   
+  def serial_begin(opts={})
+    rate = opts[:rate] ? opts[:rate] : 9600
+    @other_setup << "Serial.begin(#{rate});"
+  end
+  
+  
   def compose_setup # also composes headers and signatures
     result = "#include <WProgram.h>\nvoid loop();\nvoid setup();"
     @signatures.each do |dec|
@@ -70,33 +77,32 @@ class ArduinoSketch
         result << "pinMode(#{value}, #{k.to_s.upcase});\n"
       end
     end
-    result<<"}\n#{@helper_methods}"
+    result << @other_setup.join("\n")
+    result << "}\n#{@helper_methods}"
+    result << "\n#{serial_boilerplate}\n"
+
   end
   
   private
   
   def serial_boilerplate
     # TODO:
-    # take away serial_begin and write a real class method
     # serial_print and serial_println need signatures for every combination of argument options
     <<-CODE
-    void serial_begin(int speed){
-      Serial.begin(speed)
-    }
     int serial_available(){
-      Serial.available() > 0
+      return (Serial.available() > 0);
     }
     int serial_read(){
-      Serial.read()
+      return Serial.read();
     }
     void serial_flush(){
-      Serial.flush()
+      return Serial.flush();
     }
-    void serial_print()
-    void serial_println()
-    Serial.print(data)
-    Serial.println(data)
     CODE
+    # void serial_print()
+    #     void serial_println()
+    #     Serial.print(data)
+    #     Serial.println(data)
   end
   
 end

data/lib/rad/tasks/build_and_make.rake

@@ -33,7 +33,7 @@ namespace :build do
     klass = @file_names.first.split(".").first.split("_").collect{|c| c.capitalize}.join("")
     eval File.read(@file_names.first)
     @loop = RubyToAnsiC.translate(constantize(klass), "loop")
-    result = "#{@setup}\n#{@loop}"
+    result = "#{@setup}\n#{@loop}\n"
     name = @file_names.first.split(".").first
     File.open("#{name}/#{name}.cpp", "w"){|f| f << result}
   end

data/lib/rad/version.rb

@@ -2,7 +2,7 @@ module Rad #:nodoc:
   module VERSION #:nodoc:
     MAJOR = 0
     MINOR = 0
-    TINY  = 3
+    TINY  = 4
 
     STRING = [MAJOR, MINOR, TINY].join('.')
   end

data/spec/models/arduino_sketch_spec.rb

@@ -1,6 +1,25 @@
 require File.dirname(__FILE__) + '/spec_helper.rb'
 require File.expand_path(File.dirname(__FILE__) + "/../../lib/rad/arduino_sketch.rb")
 
+context "Arduino#serial_begin" do
+  setup do
+    @as = ArduinoSketch.new
+  end
+  
+  specify "should default baud_rate to 9600" do
+    @as.serial_begin
+    @as.instance_variable_get("@other_setup").should include("Serial.begin(9600);")
+  end
+  specify "should set an alternate baud_rate if told" do
+    @as.serial_begin :rate => 2400
+    @as.instance_variable_get("@other_setup").should include("Serial.begin(2400);")
+  end
+  specify "should add the correct function call to the composed_setup" do
+    @as.serial_begin
+    @as.compose_setup.should match(Regexp.new(Regexp.escape("Serial.begin(9600);")))
+  end
+end
+
 
 context "Arduino Base" do
   setup do

data/website/index.html

@@ -33,7 +33,7 @@
     <h1>RAD</h1>
     <div id="version" class="clickable" onclick='document.location = "http://rubyforge.org/projects/rad"; return false'>
       <p>Get Version</p>
-      <a href="http://rubyforge.org/projects/rad" class="numbers">0.0.3</a>
+      <a href="http://rubyforge.org/projects/rad" class="numbers">0.0.4</a>
     </div>
     <h1>&#x2192; &#8216;Ruby Arduino Development&#8217;</h1>
 
@@ -55,6 +55,11 @@
 
 <pre syntax="ruby">$ sudo gem install rad</pre>
 
+	<p><span class="caps">RAD</span> depends on <a href="http://rubyforge.org/projects/ruby2c/">Ruby2C</a>, which seems immune to the normal gem requirement techniques, so, if you don&#8217;t already have it, you&#8217;ll need to install that as well:</p>
+
+
+<pre syntax="ruby">$ sudo gem install Ruby2C</pre>
+
 	<h2>The basics</h2>
 
 

data/website/index.txt

@@ -15,6 +15,10 @@ h2. Installing
 
 <pre syntax="ruby">$ sudo gem install rad</pre>
 
+RAD depends on <a href="http://rubyforge.org/projects/ruby2c/">Ruby2C</a>, which seems immune to the normal gem requirement techniques, so, if you don't already have it, you'll need to install that as well:
+
+<pre syntax="ruby">$ sudo gem install Ruby2C</pre>
+
 h2. The basics
 
 <code>$ rad my_sketch</code>

metadata

@@ -3,8 +3,8 @@ rubygems_version: 0.9.2
 specification_version: 1
 name: rad
 version: !ruby/object:Gem::Version 
-  version: 0.0.3
-date: 2007-07-23 00:00:00 -07:00
+  version: 0.0.4
+date: 2007-07-24 00:00:00 -07:00
 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.
 require_paths: 
 - lib