ruby-processing 1.0.11 → 2.4.1

data/lib/ruby-processing/config.rb

@@ -1,6 +1,17 @@
-require "yaml"
+require 'psych'
 
 module Processing
-  CONFIG_FILE_PATH = File.expand_path("~/.rp5rc")
-  CONFIG = (YAML::load_file(CONFIG_FILE_PATH) rescue {}).freeze 
+
+  if Processing.exported?
+    CONFIG = {'PROCESSING_ROOT' => RP5_ROOT}	  
+  end	  
+
+  unless defined? CONFIG
+    begin
+      CONFIG_FILE_PATH=File.expand_path("~/.rp5rc")
+      CONFIG = (Psych.load_file(CONFIG_FILE_PATH))
+    rescue 
+      warn("WARNING: you need to set PROCESSING_ROOT in ~/.rp5rc")  
+    end
+  end
 end

data/lib/ruby-processing/exporters/application_exporter.rb

@@ -1,3 +1,5 @@
+require 'rbconfig'
+
 module Processing
   
   # A utility class to export Ruby-Processing sketches as 
@@ -40,6 +42,7 @@ module Processing
       @prefix = "lib"
       cp_r(Dir["#{RP5_ROOT}/lib/templates/application/{*,**}"], @dest)
       @necessary_files = [@main_file_path]
+      @necessary_files += Dir["#{CONFIG["PROCESSING_ROOT"]}/core/library/{*,**}"]
       @necessary_files += Dir["#{RP5_ROOT}/lib/{*,**}"]
       @necessary_files += @real_requires
       NECESSARY_FOLDERS.each do |folder| 
@@ -55,10 +58,10 @@ module Processing
     end
     
     def calculate_substitutions
-      file_list = ['lib/core/jruby-complete.jar']
+      file_list = ['lib/ruby/jruby-complete.jar']
       @class_path = file_list.map {|f| "$JAVAROOT/" + f.sub(@prefix+"/", "") }.join(":")
-      @linux_class_path = file_list.map{|f| f.sub(@prefix+"/", "")}.join(":")
-      @windows_class_path = file_list.map{|f| f.sub(@prefix+"/", "")}.join(",")
+      @linux_class_path = ".:../lib/ruby/*:../lib/*:../lib/library/*"
+      @windows_class_path = ".;../lib/ruby/*;../lib/*;../lib/library/*"
     end
     
     def create_executables
@@ -76,7 +79,8 @@ module Processing
       cd @dest + "/Contents/Resources"
       # Poor ol' windows can't symlink.
       # TODO...
-      win = RUBY_PLATFORM.match(/mswin/i) || (RUBY_PLATFORM == 'java' && ENV_JAVA['os.name'].match(/windows/i))
+      win ||= RbConfig::CONFIG['host_os'].match(/mswin/i) 
+      win ||= RbConfig::CONFIG['host_os'].match(/windows/i)
       puts "\n[warning] Applications exported from Windows won't run on Macs...\n" if win 
       ln_s('../../lib', 'Java') unless win
     end
@@ -88,4 +92,4 @@ module Processing
     end
     
   end
-end
+end

data/lib/ruby-processing/exporters/base_exporter.rb

@@ -8,7 +8,7 @@ module Processing
   # code-munging needed to generate apps and applets.
   class BaseExporter
     include FileUtils
-    
+    ## hashes with strings as keys need to retain old hash syntax
     DEFAULT_DIMENSIONS = {'width' => '100', 'height' => '100'}
     DEFAULT_DESCRIPTION = ''
     NECESSARY_FOLDERS = ['data', 'lib', 'vendor']
@@ -84,10 +84,10 @@ module Processing
       requirements = []
       partial_paths = []
       loop do
-        matchdata = code.match(/^.*[^::\.\w](require|load)\b.*$/)
+        matchdata = code.match(/^.*[^::\.\w](require_relative|require|load)\b.*$/)
         break unless matchdata
         line = matchdata[0].gsub('__FILE__', "'#{@main_file_path}'")
-        line = line.gsub(/\b(require|load)\b/, 'partial_paths << ')
+        line = line.gsub(/\b(require_relative|require|load)\b/, 'partial_paths << ')
         eval(line)
         where = "{#{local_dir}/,}{#{partial_paths.join(',')}}"
         unless line =~ /\.[^.]+$/

data/lib/ruby-processing/exporters/creator.rb

@@ -6,7 +6,7 @@ module Processing
     ALL_DIGITS = /\A\d+\Z/
     
     # Create a blank sketch, given a path.
-    def create!(path, args, bare)
+    def create!(path, args, p3d)
       usage path
       main_file = File.basename(path, ".rb")
       # Check to make sure that the main file exists
@@ -28,12 +28,12 @@ module Processing
       # Make the file
       dir = File.dirname path
       mkdir_p dir
-      template_name = bare ? 'bare_sketch.rb.erb' : 'blank_sketch.rb.erb'
+      template_name = p3d ? 'p3d_sketch.rb.erb' : 'blank_sketch.rb.erb'
       template = File.new("#{RP5_ROOT}/lib/templates/create/#{template_name}")
       rendered = render_erb_from_string_with_binding(template.read, binding)
       full_path = File.join(dir, "#{@file_name}.rb")
       File.open(full_path, "w") {|f| f.print(rendered) }
-      puts "Created Sketch \"#{@title}\" in #{full_path.sub(/\A\.\//, '')}"
+      puts "Created Sketch \"#{@name}\" in #{full_path.sub(/\A\.\//, '')}"
     end
     
     # Show the help/usage message for create.
@@ -51,4 +51,4 @@ module Processing
       end
     end
   end
-end
+end

data/lib/ruby-processing/exporters/exporters.rb

@@ -0,0 +1,7 @@
+def setup
+  
+end
+
+def draw
+  
+end

data/lib/ruby-processing/helper_methods.rb

@@ -45,7 +45,9 @@ module Processing
       end
       super(*args)
     end
-
+    
+    # Overrides convenience function loop, to add ability to loop over a block 
+    # if supplied, otherwise perform as the PApplet class would
     def loop(&block)
       if block_given?
         while true do
@@ -55,6 +57,16 @@ module Processing
         super
       end
     end
+    
+    # Overrides Processing convenience function thread, which takes a String
+    # arg (for a function) to more rubylike version, takes a block...    
+    def thread(*args, &block)
+      if block_given?
+        Thread.new *args, &block
+      else
+        raise ArgumentError, "thread must be called with a block" , caller    
+      end
+    end
 
     # There's just so many functions in Processing,
     # Here's a convenient way to look for them.
@@ -67,7 +79,7 @@ module Processing
     # some methods. Add to this list as needed.
     def proxy_java_fields
       @declared_fields = {}
-      fields = %w(sketchPath key frameRate frame)
+      fields = %w(sketchPath key frameRate frame mousePressed keyPressed)
       fields.each {|f| @declared_fields[f] = java_class.declared_field(f) }
     end
 
@@ -89,7 +101,7 @@ module Processing
 
     # Provide a convenient handle for the Java-space version of self.
     def java_self
-      @java_self ||= Java.ruby_to_java self
+      @java_self ||= self.to_java(Java::ProcessingCore::PApplet)
     end
 
 
@@ -127,13 +139,12 @@ module Processing
 
     # Is the mouse pressed for this frame?
     def mouse_pressed?
-      Java.java_to_primitive(java_class.field("mousePressed").value(java_object))
+      field =  @declared_fields['mousePressed'].value(java_self)
     end
 
     # Is a key pressed for this frame?
-    def key_pressed?
-      Java.java_to_primitive(java_class.field("keyPressed").value(java_object))
+    def key_pressed? 
+      field =  @declared_fields['keyPressed'].value(java_self)
     end
-
   end
 end

data/lib/ruby-processing/library_loader.rb

@@ -20,7 +20,7 @@ module Processing
     def load_libraries(*args)
       args.each do |lib|
         loaded = load_ruby_library(lib) || load_java_library(lib)
-        raise LoadError.new "no such file to load -- #{lib}" if !loaded
+        raise LoadError.new( "no such file to load -- #{lib}") if !loaded
       end
     end
     alias :load_library :load_libraries
@@ -31,17 +31,17 @@ module Processing
     def load_ruby_library(library_name)
       library_name = library_name.to_sym
       return true if @loaded_libraries[library_name]
-      if Processing.online?
+      if Processing.exported?
         begin
-          return @loaded_libraries[library_name] = (require "library/#{library_name}/#{library_name}")
+          return @loaded_libraries[library_name] = (require_relative "../library/#{library_name}")
         rescue LoadError => e
           return false
         end
-      else
-        path = get_library_paths(library_name, "rb").first
-        return false unless path
-        return @loaded_libraries[library_name] = (require path)
       end
+
+      path = get_library_paths(library_name, "rb").first
+      return false unless path
+      return @loaded_libraries[library_name] = (require path)
     end
 
 
@@ -54,9 +54,6 @@ module Processing
     def load_java_library(library_name)
       library_name = library_name.to_sym
       return true if @loaded_libraries[library_name]
-      if Processing.online?
-        return @loaded_libraries[library_name] = !!(JRUBY_APPLET.get_parameter("archive").match(%r(#{library_name}))) 
-      end
       path = get_library_directory_path(library_name, "jar")
       jars = get_library_paths(library_name, "jar")
       return false if jars.empty?
@@ -83,9 +80,12 @@ module Processing
     end
 
     def get_platform_specific_library_paths(basename)
-      bits = "32"
-      if java.lang.System.getProperty("sun.arch.data.model") == "64" || 
-         java.lang.System.getProperty("java.vm.name").index("64")
+      bits = "universal"  # for MacOSX, but does this even work, or does Mac return "64"?
+      if java.lang.System.getProperty("sun.arch.data.model") == "32" || 
+        java.lang.System.getProperty("java.vm.name").index("32")
+        bits = "32"
+      elsif java.lang.System.getProperty("sun.arch.data.model") == "64" || 
+        java.lang.System.getProperty("java.vm.name").index("64")
         bits = "64"
       end
 
@@ -106,7 +106,8 @@ module Processing
     def get_library_directory_path(library_name, extension = nil)
       extensions = extension ? [extension] : %w{jar rb}
       extensions.each do |ext|
-        [ "#{SKETCH_ROOT}/library/#{library_name}", 
+        [ "#{SKETCH_ROOT}/library/#{library_name}",
+          "#{Processing::CONFIG["PROCESSING_ROOT"]}/modes/java/libraries/#{library_name}/library",
           "#{RP5_ROOT}/library/#{library_name}/library", 
           "#{RP5_ROOT}/library/#{library_name}", 
           "#{@sketchbook_library_path}/#{library_name}/library",
@@ -123,10 +124,10 @@ module Processing
     def find_sketchbook_path
       preferences_paths = []
       sketchbook_paths = []
-      if sketchbook_path = CONFIG["sketchbook_path"]
+      if sketchbook_path = Processing::CONFIG["sketchbook_path"]
         return File.expand_path(sketchbook_path)
       else
-        ["Application Data/Processing", "AppData/Roaming/Processing", 
+        ["'Application Data/Processing'", "AppData/Roaming/Processing", 
          "Library/Processing", "Documents/Processing", 
          ".processing", "sketchbook"].each do |prefix|
           path = "#{ENV["HOME"]}/#{prefix}"

data/lib/ruby-processing/runner.rb

@@ -1,36 +1,37 @@
 require 'ostruct'
 require 'fileutils'
-require 'ruby-processing/config'
+require 'rbconfig'
+require_relative 'config'
+require_relative 'version'
+
 
 module Processing
 
   # Utility class to handle the different commands that the 'rp5' command
-  # offers. Able to run, watch, live, create, app, applet, and unpack
+  # offers. Able to run, watch, live, create, app, and unpack
   class Runner
-
     HELP_MESSAGE = <<-EOS
-  Version: #{Processing::VERSION}
+  Version: #{RubyProcessing::VERSION}
 
   Ruby-Processing is a little shim between Processing and JRuby that helps
   you create sketches of code art.
 
   Usage:
-    rp5 [run | watch | live | create [width height] | app | applet | unpack] path/to/sketch
+    rp5 [run | watch | live | create [width height] | app | unpack] path/to/sketch
 
     run:        run sketch once
     watch:      watch for changes on the file and relaunch it on the fly
     live:       launch sketch and give an interactive IRB shell
     create:     create new sketch. Use --bare to generate simpler sketches without a class
     app:        create an application version of the sketch
-    applet:     create an applet version of the sketch
     unpack:     unpack samples or library
 
   Common options:
-    --jruby:    passed, use the installed version of jruby, instead of
-                our vendored jarred one (useful for gems).
+    --nojruby:  do not use the installed version of jruby, instead use our vendored
+                jarred one (required for shader sketches, and some others).
   
   Configuration file:
-    A YAML configuration file is located at #{Processing::CONFIG_FILE_PATH}
+    A YAML configuration file is located at {Processing::CONFIG_FILE_PATH}
     
     Possible options are:
 
@@ -43,9 +44,9 @@ module Processing
   Examples:
     rp5 unpack samples
     rp5 run samples/contributed/jwishy.rb
-    rp5 create some_new_sketch --bare 640 480
+    rp5 create some_new_sketch 640 480
+    rp5 create some_new_sketch --p3d 640 480
     rp5 watch some_new_sketch.rb
-    rp5 applet some_new_sketch.rb
 
   Everything Else:
     http://wiki.github.com/jashkenas/ruby-processing
@@ -54,7 +55,7 @@ module Processing
 
     # Start running a ruby-processing sketch from the passed-in arguments
     def self.execute
-      runner = new
+      runner = self.new
       runner.parse_options(ARGV)
       runner.execute!
     end
@@ -65,9 +66,8 @@ module Processing
       when 'run'    then run(@options.path, @options.args)
       when 'watch'  then watch(@options.path, @options.args)
       when 'live'   then live(@options.path, @options.args)
-      when 'create' then create(@options.path, @options.args, @options.bare)
+      when 'create' then create(@options.path, @options.args, @options.p3d)
       when 'app'    then app(@options.path)
-      when 'applet' then applet(@options.path)
       when 'unpack' then unpack(@options.path)
       when /-v/     then show_version
       when /-h/     then show_help
@@ -79,8 +79,9 @@ module Processing
     # Parse the command-line options. Keep it simple.
     def parse_options(args)
       @options = OpenStruct.new
-      @options.bare   = !!args.delete('--bare')
+      @options.p3d   = !!args.delete('--p3d')
       @options.jruby  = !!args.delete('--jruby')
+      @options.nojruby  = !!args.delete('--nojruby')
       @options.action = args[0]     || nil
       @options.path   = args[1]     || File.basename(Dir.pwd + '.rb')
       @options.args   = args[2..-1] || []
@@ -88,8 +89,8 @@ module Processing
 
     # Create a fresh Ruby-Processing sketch, with the necessary
     # boilerplate filled out.
-    def create(sketch, args, bare)
-      Processing::Creator.new.create!(sketch, args, bare)
+    def create(sketch, args, p3d)
+      Processing::Creator.new.create!(sketch, args, p3d)
     end
 
     # Just simply run a ruby-processing sketch.
@@ -116,11 +117,6 @@ module Processing
       Processing::ApplicationExporter.new.export!(sketch)
     end
 
-    # Generate an applet and HTML page for a given sketch.
-    def applet(sketch)
-      Processing::AppletExporter.new.export!(sketch)
-    end
-
     # Install the included samples to a given path, where you can run and
     # alter them to your heart's content.
     def unpack(dir)
@@ -132,7 +128,7 @@ module Processing
 
     # Display the current version of Ruby-Processing.
     def show_version
-      puts "Ruby-Processing version #{Processing::VERSION}"
+      puts "Ruby-Processing version #{RubyProcessing::VERSION}"
     end
 
     # Show the standard help/usage message.
@@ -145,20 +141,21 @@ module Processing
 
     # Trade in this Ruby instance for a JRuby instance, loading in a
     # starter script and passing it some arguments.
-    # If --jruby is passed, use the installed version of jruby, instead of
-    # our vendored jarred one (useful for gems).
+    # Unless --nojruby is passed, use the installed version of jruby, instead of
+    # our vendored jarred one (vendored version is required for some sketches eg shaders).
     def spin_up(starter_script, sketch, args)
       runner = "#{RP5_ROOT}/lib/ruby-processing/runners/#{starter_script}"
       java_args = discover_java_args(sketch)
-      command = @options.jruby ?
-                ['jruby', java_args, runner, sketch, args].flatten :
-                ['java', java_args, '-cp', jruby_complete, 'org.jruby.Main', runner, sketch, args].flatten
+      warn("The --jruby flag is no longer required") if @options.jruby
+      command = @options.nojruby ?
+         ['java', java_args, '-cp', jruby_complete, 'org.jruby.Main', runner, sketch, args].flatten :
+         ['jruby', java_args, runner, sketch, args].flatten                
       exec *command
       # exec replaces the Ruby process with the JRuby one.
     end
 
     # If you need to pass in arguments to Java, such as the ones on this page:
-    # http://java.sun.com/j2se/1.4.2/docs/tooldocs/windows/java.html
+    # http://docs.oracle.com/javase/1.5.0/docs/tooldocs/windows/java.html
     # then type them into a java_args.txt in your data directory next to your sketch.
     def discover_java_args(sketch)
       arg_file = "#{File.dirname(sketch)}/data/java_args.txt"
@@ -166,10 +163,10 @@ module Processing
       args += dock_icon
       if File.exists?(arg_file)
         args += File.read(arg_file).split(/\s+/)
-      elsif CONFIG["java_args"]
-        args += CONFIG["java_args"].split(/\s+/)
+      elsif Processing::CONFIG["java_args"]
+        args += Processing::CONFIG["java_args"].split(/\s+/)
       end
-      args.map! {|arg| "-J#{arg}" }            if @options.jruby
+      args.map! {|arg| "-J#{arg}" } unless @options.nojruby
       args
     end
 
@@ -178,12 +175,19 @@ module Processing
     end
 
     def jruby_complete
-      File.join(RP5_ROOT, 'lib/core/jruby-complete.jar')
+      rcomplete = File.join(RP5_ROOT, 'lib/ruby/jruby-complete.jar')
+      if File.exists?(rcomplete)
+        return rcomplete
+      else
+	warn "#{rcomplete} does not exist\nTry running `install_jruby_complete`"
+	exit
+      end	      
     end
 
     # On the Mac, we can display a fat, shiny ruby in the Dock.
     def dock_icon
-      mac = RUBY_PLATFORM.match(/darwin/i) || (RUBY_PLATFORM == 'java' && ENV_JAVA['os.name'].match(/mac/i))
+      mac ||= RbConfig::CONFIG['host_os'].match(/darwin/i) 
+      mac ||= RbConfig::CONFIG['host_os'].match(/mac/i) 
       mac ? ["-Xdock:name=Ruby-Processing", "-Xdock:icon=#{RP5_ROOT}/lib/templates/application/Contents/Resources/sketch.icns"] : []
     end
 

data/lib/ruby-processing/runners/base.rb

@@ -29,7 +29,7 @@ module Processing
     has_methods = !!source.match(/^[^#]*(def\s+setup|def\s+draw)/)
 
     if has_sketch
-      load SKETCH_PATH
+      load File.join(SKETCH_ROOT, SKETCH_PATH)      
       Processing::App.sketch_class.new if !$app
     else
       require 'erb'
@@ -42,19 +42,7 @@ module Processing
 
   # Read in the sketch source code. Needs to work both online and offline.
   def self.read_sketch_source
-    if Processing.online?
-      # Fuck the following lines. Fucking Java can go sit on broken glass.
-      source = ''
-      url = java.net.URL.new(JRUBY_APPLET.java_send(:getCodeBase), SKETCH_PATH)
-      input = java.io.BufferedReader.new(java.io.InputStreamReader.new(url.java_send(:openStream)))
-      while line = input.java_send(:readLine) do
-        source << (line + "\n") if line
-      end
-      input.close
-    else
-      # Ahhh, much better.
       source = File.read(SKETCH_PATH)
-    end
     source
   end