madrona-rad 0.2.7 → 0.3.1

data/lib/rad/init.rb

@@ -5,10 +5,12 @@ unless defined?(PROJECT_DIR_NAME)
   PROJECT_DIR_NAME = a[a.length-1]
 end
 
-PLUGIN_C_VAR_TYPES = "int|void|unsigned|long|short|uint8_t|static|byte|char\\*"
+PLUGIN_C_VAR_TYPES = "int|void|unsigned|long|short|uint8_t|static|byte|char\\*|uint8_t"
 
+gem "ParseTree", "~>3.0.4"
+gem "ruby2c", "~>1.0.0.6"
 
-%w(generators/makefile/makefile.rb rad_processor.rb rad_rewriter.rb rad_type_checker.rb variable_processing.rb arduino_sketch.rb arduino_plugin.rb tasks/rad.rb).each do |path|
+%w(generators/makefile/makefile.rb rad_processor.rb rad_rewriter.rb rad_type_checker.rb variable_processing.rb arduino_sketch.rb arduino_plugin.rb hardware_library.rb tasks/rad.rb sketch_compiler.rb).each do |path|
   require File.expand_path("#{RAD_ROOT}/vendor/rad/#{path}")
 end
 

data/lib/rad/linux_installer.rb

@@ -0,0 +1,132 @@
+class LinuxInstaller
+  
+  # this is the thing we actually run to make something happen
+  def self.install!
+    puts "Welcome to the RAD Linux Installer!"
+    puts "-----------------------------------"
+    puts "Let's begin."
+    puts
+    
+    check_or_warn_for_usb_driver
+    
+    # of course we need rubygems
+    # maybe just rely on the user installing rubygems, because the ubuntu one sux
+    #check_or_install_package("rubygems")
+    #%x{gem update --system}
+    
+    # we need java to make this ship float
+    check_or_nag_package("sun-java5-jre")
+    
+    # remove a package that interferes with the arduino usb/serial driver
+    check_or_remove_package("brltty")
+    
+    # install pre-requisites
+    check_or_install_package("binutils-avr")
+    check_or_install_package("gcc-avr")
+    check_or_install_package("avr-libc")
+    check_or_install_package("unzip")
+    check_or_install_package("wget")
+    
+    # remove a probably out of date avrdude
+    check_or_remove_package("avrdude")
+    
+    # install pre-requisites for avrdude if we wanted to build from source
+    # nah, it comes with the arduino binary
+    #check_or_install_package("gcc")
+    #check_or_install_package("bison")
+    #check_or_install_package("flex")
+    check_or_install_arduino
+  end
+  
+  def self.check_or_install_package(package_name)
+  	package = %x{dpkg --get-selections | grep #{package_name}}
+  	if package.include?("\tinstall")
+  		puts "#{package_name} installed!"
+  	else
+  		puts "installing #{package_name}..."
+  		%x{apt-get install -y #{package_name}}
+  	end
+  end
+  
+  def self.check_or_nag_package(package_name, custom_msg = nil)
+  	package = %x{dpkg --get-selections | grep #{package_name}}
+  	if package.include?("\tinstall")
+  		puts "#{package_name} installed!"
+  	else
+  		puts "you will need to manually install #{package_name}! use the command below."
+  		if custom_msg
+  			puts custom_msg
+  		else
+  			puts "sudo apt-get install #{package_name}"
+  		end		
+  		exit
+  	end
+  end
+  
+  def self.check_or_remove_package(package_name)
+  	package = %x{dpkg --get-selections | grep #{package_name}}
+  
+  	#an easier way to check for installed packages?
+  	if package.include?("\tinstall")
+  		puts "removing #{package_name}..."
+  		%x{apt-get remove -y #{package_name}}
+  	else
+  		puts "#{package_name} previously uninstalled!"
+  	end
+  end
+  
+  def self.check_or_warn_for_usb_driver
+  
+  	# check if usb device recognized by system
+  	puts "Please plug in your arduino to your usb port... [hit enter to continue]"
+  	STDIN.gets # we patiently wait
+  
+  	usb = %x{dmesg | tail | grep "FTDI USB Serial" | grep -c "now attached"}
+  
+  	if usb.to_i == 0
+  		# maybe we can be nice here and offer to download and install the driver package
+  		puts "the system is not recognizing your usb-serial driver, please re-install"
+  		exit
+  	end
+  end
+  
+  def self.check_or_install_arduino 
+  	if File.exist?("/usr/local/arduino-0012")
+  		puts "arduino software previously installed at /usr/local/arduino-0012 !"
+  	else
+  		puts "installing arduino software..."
+  		%x{cd /usr/local/; wget http://arduino.cc/files/arduino-0012-linux.tgz}
+  		%x{tar -C /usr/local -xzf /usr/local/arduino-0012-linux.tgz}
+  
+  		%x{ln -s /usr/local/arduino-0012/arduino ~/Desktop/arduino}
+  
+  		# gotta patch it so it can run from command line or anywhere
+  		arduino_file = File.open("/usr/local/arduino-0012/arduino") {|f| f.read}
+  		new_doc = arduino_file.split("\n")
+  		new_doc[1] = "cd /usr/local/arduino-0012"
+  		File.open("/usr/local/arduino-0012/arduino", "w") {|f| f.puts new_doc }
+  
+  		%x{mkdir -p /usr/local/arduino-0012/hardware/tools/avr/bin}
+  		# there is a difference from what the makefile expects to where it is
+  		%x{ln -s /usr/bin/avr-gcc /usr/local/arduino-0012/hardware/tools/avr/bin/avr-gcc}		
+  		%x{ln -s /usr/bin/avr-g++ /usr/local/arduino-0012/hardware/tools/avr/bin/avr-g++}
+  		%x{ln -s /usr/bin/avr-ar /usr/local/arduino-0012/hardware/tools/avr/bin/avr-ar}
+  		%x{ln -s /usr/bin/avr-objcopy /usr/local/arduino-0012/hardware/tools/avr/bin/avr-objcopy}
+  		%x{ln -s /usr/local/arduino-0012/hardware/tools/avrdude /usr/local/arduino-0012/hardware/tools/avr/bin/avrdude}
+  		%x{ln -s /usr/local/arduino-0012/hardware/tools/avrdude.conf /usr/local/arduino-0012/hardware/tools/avr/etc/avrdude.conf}
+  
+  
+  		puts
+  		puts "************************************************************************"
+  		puts "**  please add /usr/local/arduino-0012 to your path!                  **"
+  		puts "**  you will also need to run sudo update-alternatives --config java  **"
+  		puts "**  to choose java-1.50-sun as the default java                       **"
+  		puts "************************************************************************"
+  		puts
+  	end
+  	
+  end
+end
+
+
+

data/lib/rad/progressbar.rb

@@ -0,0 +1,236 @@
+#
+# Ruby/ProgressBar - a text progress bar library
+#
+# Copyright (C) 2001-2005 Satoru Takabayashi <satoru@namazu.org>
+#     All rights reserved.
+#     This is free software with ABSOLUTELY NO WARRANTY.
+#
+# You can redistribute it and/or modify it under the terms
+# of Ruby's license.
+#
+
+class ProgressBar
+  VERSION = "0.9"
+
+  def initialize (title, total, out = STDERR)
+    @title = title
+    @total = total
+    @out = out
+    @terminal_width = 80
+    @bar_mark = "o"
+    @current = 0
+    @previous = 0
+    @finished_p = false
+    @start_time = Time.now
+    @previous_time = @start_time
+    @title_width = 14
+    @format = "%-#{@title_width}s %3d%% %s %s"
+    @format_arguments = [:title, :percentage, :bar, :stat]
+    clear
+    show
+  end
+  attr_reader   :title
+  attr_reader   :current
+  attr_reader   :total
+  attr_accessor :start_time
+
+  private
+  def fmt_bar
+    bar_width = do_percentage * @terminal_width / 100
+    sprintf("|%s%s|", 
+            @bar_mark * bar_width, 
+            " " *  (@terminal_width - bar_width))
+  end
+
+  def fmt_percentage
+    do_percentage
+  end
+
+  def fmt_stat
+    if @finished_p then elapsed else eta end
+  end
+
+  def fmt_stat_for_file_transfer
+    if @finished_p then 
+      sprintf("%s %s %s", bytes, transfer_rate, elapsed)
+    else 
+      sprintf("%s %s %s", bytes, transfer_rate, eta)
+    end
+  end
+
+  def fmt_title
+    @title[0,(@title_width - 1)] + ":"
+  end
+
+  def convert_bytes (bytes)
+    if bytes < 1024
+      sprintf("%6dB", bytes)
+    elsif bytes < 1024 * 1000 # 1000kb
+      sprintf("%5.1fKB", bytes.to_f / 1024)
+    elsif bytes < 1024 * 1024 * 1000  # 1000mb
+      sprintf("%5.1fMB", bytes.to_f / 1024 / 1024)
+    else
+      sprintf("%5.1fGB", bytes.to_f / 1024 / 1024 / 1024)
+    end
+  end
+
+  def transfer_rate
+    bytes_per_second = @current.to_f / (Time.now - @start_time)
+    sprintf("%s/s", convert_bytes(bytes_per_second))
+  end
+
+  def bytes
+    convert_bytes(@current)
+  end
+
+  def format_time (t)
+    t = t.to_i
+    sec = t % 60
+    min  = (t / 60) % 60
+    hour = t / 3600
+    sprintf("%02d:%02d:%02d", hour, min, sec);
+  end
+
+  # ETA stands for Estimated Time of Arrival.
+  def eta
+    if @current == 0
+      "ETA:  --:--:--"
+    else
+      elapsed = Time.now - @start_time
+      eta = elapsed * @total / @current - elapsed;
+      sprintf("ETA:  %s", format_time(eta))
+    end
+  end
+
+  def elapsed
+    elapsed = Time.now - @start_time
+    sprintf("Time: %s", format_time(elapsed))
+  end
+  
+  def eol
+    if @finished_p then "\n" else "\r" end
+  end
+
+  def do_percentage
+    if @total.zero?
+      100
+    else
+      @current  * 100 / @total
+    end
+  end
+
+  def get_width
+    # FIXME: I don't know how portable it is.
+    default_width = 80
+    begin
+      tiocgwinsz = 0x5413
+      data = [0, 0, 0, 0].pack("SSSS")
+      if @out.ioctl(tiocgwinsz, data) >= 0 then
+        rows, cols, xpixels, ypixels = data.unpack("SSSS")
+        if cols >= 0 then cols else default_width end
+      else
+        default_width
+      end
+    rescue Exception
+      default_width
+    end
+  end
+
+  def show
+    arguments = @format_arguments.map {|method| 
+      method = sprintf("fmt_%s", method)
+      send(method)
+    }
+    line = sprintf(@format, *arguments)
+
+    width = get_width
+    if line.length == width - 1 
+      @out.print(line + eol)
+      @out.flush
+    elsif line.length >= width
+      @terminal_width = [@terminal_width - (line.length - width + 1), 0].max
+      if @terminal_width == 0 then @out.print(line + eol) else show end
+    else # line.length < width - 1
+      @terminal_width += width - line.length + 1
+      show
+    end
+    @previous_time = Time.now
+  end
+
+  def show_if_needed
+    if @total.zero?
+      cur_percentage = 100
+      prev_percentage = 0
+    else
+      cur_percentage  = (@current  * 100 / @total).to_i
+      prev_percentage = (@previous * 100 / @total).to_i
+    end
+
+    # Use "!=" instead of ">" to support negative changes
+    if cur_percentage != prev_percentage || 
+        Time.now - @previous_time >= 1 || @finished_p
+      show
+    end
+  end
+
+  public
+  def clear
+    @out.print "\r"
+    @out.print(" " * (get_width - 1))
+    @out.print "\r"
+  end
+
+  def finish
+    @current = @total
+    @finished_p = true
+    show
+  end
+
+  def finished?
+    @finished_p
+  end
+
+  def file_transfer_mode
+    @format_arguments = [:title, :percentage, :bar, :stat_for_file_transfer]
+  end
+
+  def format= (format)
+    @format = format
+  end
+
+  def format_arguments= (arguments)
+    @format_arguments = arguments
+  end
+
+  def halt
+    @finished_p = true
+    show
+  end
+
+  def inc (step = 1)
+    @current += step
+    @current = @total if @current > @total
+    show_if_needed
+    @previous = @current
+  end
+
+  def set (count)
+    if count < 0 || count > @total
+      raise "invalid count: #{count} (total: #{@total})"
+    end
+    @current = count
+    show_if_needed
+    @previous = @current
+  end
+
+  def inspect
+    "#<ProgressBar:#{@current}/#{@total}>"
+  end
+end
+
+class ReversedProgressBar < ProgressBar
+  def do_percentage
+    100 - super
+  end
+end
+

data/lib/rad/rad_processor.rb

@@ -1,14 +1,54 @@
+require 'rubygems'
 require 'ruby_to_ansi_c'
 
+# HACK: you should require your dependencies
+$array_index_helpers ||= ('a'..'zzz').to_a
+
+class Environment # HACK until ruby_parser is re-released
+  alias :old_all :all
+  def all
+    idx = @dyn.index(false) || 0
+    @env[0..idx].reverse.inject { |env, scope| env.merge scope }
+  end
+end
+
 class RADProcessor < RubyToAnsiC
 
+  @translator = nil
+
+  # REFACTOR: rename to self.process
+  def self.translate file, klass, method
+    sexp = RubyParser.new.process File.read(file), file
+    sexp = s(:block, sexp) unless sexp.sexp_type == :block
+
+    # this sucks... but it finds the class and method within the tree
+    # it doesn't currently deal with class methods or anything special
+    # AT ALL.
+
+    k_sexp = sexp.find_nodes(:class).find { |k|
+      k[1] == klass
+    }
+
+    body = k_sexp.scope
+    body = body.block if body.block # RubyParser bug?
+
+    m = body.find_nodes(:defn).find { |m|
+      m[1] == method
+    } rescue nil
+
+    @translator = nil # HACK
+
+    self.translator.process m if m
+  end
+
   def self.translator
-    unless defined? @translator then
+    unless @translator then
       @translator = CompositeSexpProcessor.new
       @translator << RADRewriter.new
       @translator << RADTypeChecker.new
-      @translator << R2CRewriter.new
+      # HACK: more harm than good @translator << CRewriter.new
       @translator << self.new
+
       @translator.on_error_in(:defn) do |processor, exp, err|
         result = processor.expected.new
         case result
@@ -21,6 +61,7 @@ class RADProcessor < RubyToAnsiC
         result << msg
         result
       end
+
     end
     @translator
   end
@@ -79,12 +120,8 @@ class RADProcessor < RubyToAnsiC
     
   def process_lasgn(exp)
     out = ""
-
     var = exp.shift
-    value = exp.shift
-    # grab the size of the args, if any, before process converts to a string
-    arg_count = 0
-    arg_count = value.length - 1 if value.first == :array
+    value = exp.shift # HACK FUCK || s(:array) # HACK?
     args = value
 
     exp_type = exp.sexp_type
@@ -106,13 +143,23 @@ class RADProcessor < RubyToAnsiC
         out << "#{var}[#{i}] = #{process o};\n"
       end
     else
-      out << "#{var} = #{process args}"
+      out << "#{var}"
+      out << " = #{process args}" if args
     end
 
     out.sub!(/;\n\Z/, '')
 
     return out
   end
+  
+  def process_str(exp)
+    s = exp.shift.gsub(/\n/, '\\n')
+    if s.size == 1
+      return "\'#{s}\'"
+    else
+      return "\"#{s}\""
+    end
+  end
 
 
-end
+end