madrona-rad 0.4.0 → 0.4.1

data/.gitignore

@@ -0,0 +1,5 @@
+.DS_Store
+bin/.DS_Store
+lib/.DS_Store
+lib/libraries/.DS_Store
+lib/rad/.DS_Store

data/Rakefile

@@ -1,145 +1,54 @@
 require 'rubygems'
 require 'rake'
-require 'rake/clean'
-require 'rake/testtask'
-require 'rake/packagetask'
-require 'rake/gempackagetask'
-require 'rake/rdoctask'
-require 'rake/contrib/rubyforgepublisher'
-require 'fileutils'
-require 'hoe'
-
-$: << "../lib/" # HACK while I work out r2c/rad incompatibilities
-# gem "RubyToC"   # HACK to deal with rubygems beta version activation bug
-
-RAD_ROOT = File.expand_path(File.dirname(__FILE__))
 
 begin
-  require 'spec/rake/spectask'
-rescue LoadError
-  puts 'To use rspec for testing you must install rspec gem:'
-  puts '$ sudo gem install rspec'
-  exit
-end
-
-include FileUtils
-require File.join(File.dirname(__FILE__), 'lib', 'rad', 'version')
-
-BIN = "rad"
-AUTHOR = 'Greg Borenstein'  # can also be an array of Authors
-EMAIL = "greg@mfdz.com"
-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."
-GEM_NAME = 'rad' # what ppl will type to install your gem
-
-@config_file = "~/.rubyforge/user-config.yml"
-@config = nil
-def rubyforge_username
-  unless @config
-    begin
-      @config = YAML.load(File.read(File.expand_path(@config_file)))
-    rescue
-      puts <<-EOS
-ERROR: No rubyforge config file found: #{@config_file}"
-Run 'rubyforge setup' to prepare your env for access to Rubyforge
- - See http://newgem.rubyforge.org/rubyforge.html for more details
-      EOS
-      exit
-    end
+  require 'jeweler'
+  Jeweler::Tasks.new do |gem|
+    gem.name = "madrona-rad"
+    gem.summary = %Q{RAD: Ruby Arduino Development - 0.4.1 -- 1.9 Ready!}
+    gem.description = %Q{Ruby Arduino Development: a framework for programming the Arduino physcial computing platform using Ruby}
+    gem.email = "jd@jdbarnhart.com"
+    gem.homepage = "http://github.com/madrona/madrona-rad"
+    gem.authors = ["JD Barnhart", "Greg Borenstein"]
+    gem.add_dependency "ruby2c", ">= 1.0.0.7"
+    gem.add_dependency "sexp_processor", ">=3.0.2"
+    gem.add_development_dependency "thoughtbot-shoulda", ">= 0"
+    # gem is a Gem::Specification... see http://www.rubygems.org/read/chapter/20 for additional settings
   end
-  @rubyforge_username ||= @config["username"]
-end
-
-RUBYFORGE_PROJECT = 'rad' # The unix name for your project
-HOMEPATH = "http://#{RUBYFORGE_PROJECT}.rubyforge.org"
-DOWNLOAD_PATH = "http://rubyforge.org/projects/#{RUBYFORGE_PROJECT}"
-
-NAME = "rad"
-REV = nil 
-# UNCOMMENT IF REQUIRED: 
-# REV = `svn info`.each {|line| if line =~ /^Revision:/ then k,v = line.split(': '); break v.chomp; else next; end} rescue nil
-VERS = Rad::VERSION::STRING + (REV ? ".#{REV}" : "")
-CLEAN.include ['**/.*.sw?', '*.gem', '.config', '**/.DS_Store']
-RDOC_OPTS = ['--quiet', '--title', 'rad documentation',
-    "--opname", "index.html",
-    "--line-numbers", 
-    "--main", "README",
-    "--inline-source"]
-
-class Hoe
-  def extra_deps 
-    @extra_deps.reject { |x| Array(x).first == 'hoe' } 
-  end 
+rescue LoadError
+  puts "Jeweler (or a dependency) not available. Install it with: sudo gem install jeweler"
 end
 
-# Generate all the Rake tasks
-# Run 'rake -T' to see list of generated tasks (from gem root directory)
-hoe = Hoe.new(GEM_NAME, VERS) do |p|
-  p.author = AUTHOR 
-  p.description = DESCRIPTION
-  p.email = EMAIL
-  p.summary = DESCRIPTION
-  p.url = HOMEPATH
-  p.rubyforge_name = RUBYFORGE_PROJECT if RUBYFORGE_PROJECT
-  p.test_globs = ["test/**/test_*.rb"]
-  p.clean_globs |= CLEAN  #An array of file patterns to delete on clean.
-  
-  # == Optional
-  p.changes = p.paragraphs_of("History.txt", 0..1).join("\n\n")
-  p.extra_deps =  [ ['ruby2c', '>= 1.0.0.6'] ]
-  #p.spec_extras = {}    # A hash of extra values to set in the gemspec.
+require 'rake/testtask'
+Rake::TestTask.new(:test) do |test|
+  test.libs << 'lib' << 'test'
+  test.pattern = 'test/**/test_*.rb'
+  test.verbose = true
 end
 
-CHANGES = hoe.paragraphs_of('History.txt', 0..1).join("\n\n")
-PATH    = (RUBYFORGE_PROJECT == GEM_NAME) ? RUBYFORGE_PROJECT : "#{RUBYFORGE_PROJECT}/#{GEM_NAME}"
-hoe.remote_rdoc_dir = File.join(PATH.gsub(/^#{RUBYFORGE_PROJECT}\/?/,''), 'rdoc')
-
-desc 'Generate website files'
-task :website_generate do
-  Dir['website/**/*.txt'].each do |txt|
-    sh %{ ruby scripts/txt2html #{txt} > #{txt.gsub(/txt$/,'html')} }
+begin
+  require 'rcov/rcovtask'
+  Rcov::RcovTask.new do |test|
+    test.libs << 'test'
+    test.pattern = 'test/**/test_*.rb'
+    test.verbose = true
+  end
+rescue LoadError
+  task :rcov do
+    abort "RCov is not available. In order to run rcov, you must: sudo gem install spicycode-rcov"
   end
 end
 
-desc 'Upload website files to rubyforge'
-task :website_upload do
-  host = "#{rubyforge_username}@rubyforge.org"
-  remote_dir = "/var/www/gforge-projects/#{PATH}/"
-  local_dir = 'website'
-  sh %{rsync -aCv #{local_dir}/ #{host}:#{remote_dir}}
-end
-
-desc 'Generate and upload website files'
-task :website => [:website_generate, :website_upload, :publish_docs]
-
-desc 'Release the website and new gem version'
-task :deploy => [:check_version, :website, :release] do
-  puts "Remember to create SVN tag:"
-  puts "svn copy svn+ssh://#{rubyforge_username}@rubyforge.org/var/svn/#{PATH}/trunk " +
-    "svn+ssh://#{rubyforge_username}@rubyforge.org/var/svn/#{PATH}/tags/REL-#{VERS} "
-  puts "Suggested comment:"
-  puts "Tagging release #{CHANGES}"
-end
+task :test => :check_dependencies
 
-desc 'Runs tasks website_generate and install_gem as a local deployment of the gem'
-task :local_deploy => [:website_generate, :install_gem]
+task :default => :test
 
-task :check_version do
-  unless ENV['VERSION']
-    puts 'Must pass a VERSION=x.y.z release version'
-    exit
-  end
-  unless ENV['VERSION'] == VERS
-    puts "Please update your version.rb to match the release version, currently #{VERS}"
-    exit
-  end
-end
+require 'rake/rdoctask'
+Rake::RDocTask.new do |rdoc|
+  version = File.exist?('VERSION') ? File.read('VERSION') : ""
 
-desc "Run the specs under spec/models"
-Spec::Rake::SpecTask.new do |t|
-  t.spec_opts = ['--options', "spec/spec.opts"]
-  t.spec_files = FileList['spec/models/*_spec.rb']
+  rdoc.rdoc_dir = 'rdoc'
+  rdoc.title = "madrona-rad #{version}"
+  rdoc.rdoc_files.include('README*')
+  rdoc.rdoc_files.include('lib/**/*.rb')
 end
-
-desc "Default task is to run specs"
-task :default => :spec
-

data/VERSION

@@ -0,0 +1 @@
+0.4.1

data/lib/examples/blink_m_address_assignment.rb

@@ -1,13 +1,5 @@
 class BlinkMAddressAssignment < ArduinoSketch
 
-  # IMPORTANT -- This is one for four examples that fails with Ruby 1.9 support (latest ruby2c and parsetree)
-  # the failing example is commented out and replaced with this hello world until I have a chance to resolve the issue -- jd
-  output_pin 13, :as => :led
-
-  def loop
-    blink led, 100 
-    x = 4
-  end
   # want to use more than one blink m?
   # since each blink m arrives with the same address, 
   # we can't address each one individually
@@ -22,91 +14,91 @@ class BlinkMAddressAssignment < ArduinoSketch
   # address to 10, during the next four seconds to 11 and so on
   # difficult without a screen.
   # if you need to, program an led to help with the timing
-   
+ 
 
-  # @blink_m_start_address = 10
-  #   @flag = false
-  #   @addr1 = "10, byte"
-  #   @addr2 = "11, byte"
-  #   @addr3 = "12, byte"
-  #   
-  #   output_pin 19, :as => :wire, :device => :i2c, :enable => :true # reminder, true issues wire.begin
-  #   input_pin 7,  :as => :button_one, :device => :button
-  #   input_pin 8,  :as => :button_two, :device => :button
-  #   input_pin 9,  :as => :button_three, :device => :button
-  #   
-  #   output_pin 5, :as => :my_lcd, :device => :pa_lcd, :rate => 19200, :clear_screen => :true
-  #   
-  #   def setup
-  #     delay 1000
-  #     my_lcd.setxy 0,0, "bienvenue"
-  #         delay 5000
-  #   end
-  #   
-  #   def loop  
-  #  
-  #     if @flag == false
-  #       staging
-  #     else
-  #       test_address 
-  #     end
-  #     delay 100
-  #   end
-  #   
-  #   def staging
-  #     my_lcd.setxy 0,0, "press button one to"
-  #     my_lcd.setxy 0,1, "set address to "
-  #     my_lcd.print @blink_m_start_address
-  #     my_lcd.setxy 0,2, "or two for status"
-  #     delay 60
-  #     my_lcd.setxy 0,3, "                "
-  #     my_lcd.setxy 0,3
-  #     800.times do |i|
-  #       return 0 if @flag == true
-  #       my_lcd.print "." if i % 50 == 0 
-  #       delay 5
-  #       if button_one.read_input
-  #         assign_address 
-  #       elsif button_two.read_input
-  #         test_address
-  #       end 
-  #     end
-  #     @blink_m_start_address += 1 
-  #   end
-  #   
-  #   def assign_address
-  #     @flag = true
-  #     my_lcd.clearscr "setting to "
-  #     my_lcd.print @blink_m_start_address
-  #     delay 100
-  #     BlinkM_setAddress @blink_m_start_address
-  #     my_lcd.clearscr "done"
-  #     control_it
-  #   end
-  #   
-  #   def control_it
-  #     delay 500
-  #     my_lcd.clearscr "stopping script"
-  #     BlinkM_stopScript @blink_m_start_address
-  #     my_lcd.clearscr "stopping script.."
-  #     delay 500
-  #     my_lcd.clearscr "fade to purple.."
-  #     BlinkM_fadeToRGB(@blink_m_start_address, 0xff,0x00,0xff)
-  #     my_lcd.clearscr "fade to purple"
-  #     delay 500
-  #     BlinkM_fadeToRGB(@blink_m_start_address, 0xff,0x00,0xff)
-  #   end
-  #   
-  #   
-  #   def test_address
-  #     my_lcd.clearscr
-  #     my_lcd.setxy 0,0, "testing address"
-  #     my_lcd.setxy 0,1
-  #     my_lcd.print blink_m_check_address_message @blink_m_start_address
-  #     delay 5000
-  #   end
-  # 
-  #   
+  @blink_m_start_address = 10
+  @flag = false
+  @addr1 = "10, byte"
+  @addr2 = "11, byte"
+  @addr3 = "12, byte"
+  
+  output_pin 19, :as => :wire, :device => :i2c, :enable => :true # reminder, true issues wire.begin
+  input_pin 7,  :as => :button_one, :device => :button
+  input_pin 8,  :as => :button_two, :device => :button
+  input_pin 9,  :as => :button_three, :device => :button
+  
+  output_pin 5, :as => :my_lcd, :device => :pa_lcd, :rate => 19200, :clear_screen => :true
+  
+  def setup
+    delay 1000
+    my_lcd.setxy 0,0, "bienvenue"
+        delay 5000
+  end
+  
+  def loop  
+ 
+    if @flag == false
+      staging
+    else
+      test_address 
+    end
+    delay 100
+  end
+  
+  def staging
+    my_lcd.setxy 0,0, "press button one to"
+    my_lcd.setxy 0,1, "set address to "
+    my_lcd.print @blink_m_start_address
+    my_lcd.setxy 0,2, "or two for status"
+    delay 60
+    my_lcd.setxy 0,3, "                "
+    my_lcd.setxy 0,3
+    800.times do |i|
+      return 0 if @flag == true
+      my_lcd.print "." if i % 50 == 0 
+      delay 5
+      if button_one.read_input
+        assign_address 
+      elsif button_two.read_input
+        test_address
+      end 
+    end
+    @blink_m_start_address += 1 
+  end
+  
+  def assign_address
+    @flag = true
+    my_lcd.clearscr "setting to "
+    my_lcd.print @blink_m_start_address
+    delay 100
+    BlinkM_setAddress @blink_m_start_address
+    my_lcd.clearscr "done"
+    control_it
+  end
+  
+  def control_it
+    delay 500
+    my_lcd.clearscr "stopping script"
+    BlinkM_stopScript @blink_m_start_address
+    my_lcd.clearscr "stopping script.."
+    delay 500
+    my_lcd.clearscr "fade to purple.."
+    BlinkM_fadeToRGB(@blink_m_start_address, 0xff,0x00,0xff)
+    my_lcd.clearscr "fade to purple"
+    delay 500
+    BlinkM_fadeToRGB(@blink_m_start_address, 0xff,0x00,0xff)
+  end
+  
+  
+  def test_address
+    my_lcd.clearscr
+    my_lcd.setxy 0,0, "testing address"
+    my_lcd.setxy 0,1
+    my_lcd.print blink_m_check_address_message @blink_m_start_address
+    delay 5000
+  end
+
+  
     
 
 end

data/lib/examples/blink_m_multi.rb

@@ -1,70 +1,61 @@
 class BlinkMMulti < ArduinoSketch
   
-  # IMPORTANT -- This is one for four examples that fails with Ruby 1.9 support (latest ruby2c and parsetree)
-  # the failing example is commented out and replaced with this hello world until I have a chance to resolve the issue -- jd
-  output_pin 13, :as => :led
-
-  def loop
-    blink led, 100 
-    x = 4
-  end
-
   # demonstrate control of individual blinkms
   # this assumes the leds have been assigned addresses 10, 11, 12
   # which can be done with blink m address assignment
 
   # two ways to address the blinkms, array and individual variables
-  # @blink_addresses = [10,11,12]
-  #   @addr_all = "0, byte" 
-  #   @addr1 = "10, byte"
-  #   @addr2 = "11, byte"
-  #   @addr3 = "12, byte"
-  #   
-  #   output_pin 19, :as => :wire, :device => :i2c, :enable => :true # reminder, true issues wire.begin
-  #   input_pin 7,  :as => :button_one, :device => :button
-  #   input_pin 8,  :as => :button_two, :device => :button
-  #   input_pin 9,  :as => :button_three, :device => :button
-  #   input_pin 10,  :as => :button_four, :device => :button
-  #   
-  #   # display the action on a 4x20 pa_lcd, yours may be 9200 instead of 19,200
-  # 
-  #   output_pin 5, :as => :my_lcd, :device => :pa_lcd, :rate => 19200, :clear_screen => :true
-  #   
-  #   
-  #   def loop  
-  #     stop_and_fade(@addr1) if button_one.read_input
-  #     stop_and_fade(@addr2) if button_two.read_input 
-  #     stop_and_fade(@addr3) if button_three.read_input 
-  #     dance if button_four.read_input 
-  #   end
-  #   
-  #   def stop_and_fade(addr)
-  #     f = 1 + addr # hack to coerce addr to int
-  #     my_lcd.clearscr
-  #     my_lcd.setxy 0,0, "blinkm # "
-  #     my_lcd.print addr
-  #     delay 700
-  #     BlinkM_stopScript addr
-  #     my_lcd.setxy 0,1, "stopping script.."
-  #     delay 700
-  #     my_lcd.setxy 0,2, "fade to purple.."
-  #     BlinkM_fadeToRGB(addr, 0xff,0x00,0xff)
-  #   end
-  #   
-  #   def dance
-  #     BlinkM_setFadeSpeed(@addr_all, 20) # 1-255, with 1 producing the slowest fade
-  #     my_lcd.clearscr
-  #     my_lcd.setxy 0,0, "Do the shimmy.."
-  #     my_lcd.setxy 0,1
-  #     @blink_addresses.each do |a|
-  #       BlinkM_fadeToRGB(a, 1,166,138)
-  #       delay 100
-  #     end
-  #     @blink_addresses.each do |a|
-  #       BlinkM_fadeToRGB(a, 35,0,112)
-  #       delay 100
-  #     end
-  #   end
-    
+  @blink_addresses = [10,11,12]
+  @addr_all = "0, byte" 
+  @addr1 = "10, byte"
+  @addr2 = "11, byte"
+  @addr3 = "12, byte"
+  
+  output_pin 19, :as => :wire, :device => :i2c, :enable => :true # reminder, true issues wire.begin
+  input_pin 7,  :as => :button_one, :device => :button
+  input_pin 8,  :as => :button_two, :device => :button
+  input_pin 9,  :as => :button_three, :device => :button
+  input_pin 10,  :as => :button_four, :device => :button
+  
+  # display the action on a 4x20 pa_lcd, yours may be 9200 instead of 19,200
+
+  output_pin 5, :as => :my_lcd, :device => :pa_lcd, :rate => 19200, :clear_screen => :true
+  
+  
+  def loop  
+    stop_and_fade(@addr1) if button_one.read_input
+    stop_and_fade(@addr2) if button_two.read_input 
+    stop_and_fade(@addr3) if button_three.read_input 
+    dance if button_four.read_input 
+  end
+  
+  def stop_and_fade(addr)
+    f = 1 + addr # hack to coerce addr to int
+    my_lcd.clearscr
+    my_lcd.setxy 0,0, "blinkm # "
+    my_lcd.print addr
+    delay 700
+    BlinkM_stopScript addr
+    my_lcd.setxy 0,1, "stopping script.."
+    delay 700
+    my_lcd.setxy 0,2, "fade to purple.."
+    BlinkM_fadeToRGB(addr, 0xff,0x00,0xff)
+  end
+  
+  def dance
+    BlinkM_setFadeSpeed(@addr_all, 20) # 1-255, with 1 producing the slowest fade
+    my_lcd.clearscr
+    my_lcd.setxy 0,0, "Do the shimmy.."
+    my_lcd.setxy 0,1
+    @blink_addresses.each do |a|
+      BlinkM_fadeToRGB(a, 1,166,138)
+      delay 100
+    end
+    @blink_addresses.each do |a|
+      BlinkM_fadeToRGB(a, 35,0,112)
+      delay 100
+    end
+  end
+  
 
 end