ruby-processing 2.4.4 → 2.5.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: b4495d11c567dab0a4324cbb26cfb493f18e413a
-  data.tar.gz: 49efbea8dca4fcbbc160312bb6888b38217e935d
+  metadata.gz: a5b8a868675fde6dc0132b818e7587a83225334c
+  data.tar.gz: e8df4b54e6a1cd9a20b8c0595e659540a3245f34
 SHA512:
-  metadata.gz: c3fd10e43df37279cd790a9705ee42fec592335461f09490127097f3bf0aaa649bd9968faa86193df6bdb7dc30be4b12c1a04aa46cb2cc8aa2ae82a25b9aebee
-  data.tar.gz: 3b01b98834983da3428190813ac6e2a1d9c834d078d578b55a9131fcaaa75978fa4eec3d7fb39137f93745149cf1c501ec5aad8983ec4806c2e064ce64f8d41c
+  metadata.gz: 452ebce774bac88364da71c0800ed75cabb3017282d97adf2a0cf71b421c121e162a145d56c92974e12eb7b82358d204454c599cd86dee2f06418320cac90144
+  data.tar.gz: e409850694f47b0b6acacd3f46d9fad87bfac2a2dca2a0ae238443828c14a7c5097f70157799f3a4501f6606cc9fcd6b4d6841161bada1985365996945ecf876

data/lib/ruby-processing.rb

@@ -7,7 +7,7 @@ unless defined? RP5_ROOT
   RP5_ROOT = File.expand_path(File.dirname(__FILE__) + "/../")
 end
 
-SKETCH_ROOT = Dir.pwd unless defined? SKETCH_ROOT
+SKETCH_ROOT ||= Dir.pwd
 
 require 'ruby-processing/version'
 require 'ruby-processing/helpers/string'
@@ -17,14 +17,16 @@ require 'ruby-processing/helpers/numeric'
 module Processing
 
   def self.exported?
-    @exported ||= ENV['EXPORTED'].eql?('true')	  
+    @exported ||= ENV['EXPORTED'].eql?('true')
   end
 
-  # Autoload a number of constants that we may end up using.
+  # Autoload a number of path/constants that we may end up using.
+  # mri ruby does not understand ** require 'java' ** and we may otherwise call it
+  # from mri ruby without lazy path loading of autoload
+  # NB: autoload is slated for possible removal by ruby-2.2
+
   autoload :App,                  'ruby-processing/app'
   autoload :Runner,               'ruby-processing/runner'
   autoload :Watcher,              'ruby-processing/runners/watch'
-  autoload :Creator,              'ruby-processing/exporters/creator'
-  autoload :BaseExporter,         'ruby-processing/exporters/base_exporter'
-  autoload :ApplicationExporter,  'ruby-processing/exporters/application_exporter'
+
 end

data/lib/ruby-processing/app.rb

@@ -2,13 +2,12 @@
 # This class is a thin wrapper around Processing's PApplet.
 # Most of the code here is for interfacing with Swing,
 # web applets, going fullscreen and so on.
-
 require 'java'
-require 'ruby-processing/helper_methods'
-require 'ruby-processing/library_loader'
-require 'ruby-processing/config'
+require_relative '../ruby-processing/helper_methods'
+require_relative '../ruby-processing/library_loader'
+require_relative '../ruby-processing/config'
 
-Dir["#{Processing::CONFIG["PROCESSING_ROOT"]}/core/library/\*.jar"].each { |jar| require jar }
+Dir["#{Processing::RB_CONFIG["PROCESSING_ROOT"]}/core/library/\*.jar"].each { |jar| require jar }
 
 # Include some core processing classes that we'd like to use:
 %w(PApplet PConstants PFont PImage PShape PShapeOBJ PShapeSVG PStyle PGraphicsJava2D PGraphics PFont PVector PMatrix2D PMatrix3D).each do |klass|
@@ -16,7 +15,7 @@ Dir["#{Processing::CONFIG["PROCESSING_ROOT"]}/core/library/\*.jar"].each { |jar|
 end
 
 module Processing
-  
+
   # This is the main Ruby-Processing class, and is what you'll
   # inherit from when you create a sketch. This class can call
   # all of the methods available in Processing, and has two
@@ -27,15 +26,15 @@ module Processing
   class App < PApplet
     include Math
     include HelperMethods
-    
+
     # Alias some methods for familiarity for Shoes coders.
     #attr_accessor :frame, :title
     alias_method :oval, :ellipse
     alias_method :stroke_width, :stroke_weight
     alias_method :rgb, :color
     alias_method :gray, :color
-    
-    
+
+
     # When certain special methods get added to the sketch, we need to let
     # Processing call them by their expected Java names.
     def self.method_added(method_name) #:nodoc:
@@ -55,13 +54,13 @@ module Processing
         alias_method methods_to_alias[method_name], method_name
       end
     end
-    
-    
+
+
     # Class methods that we should make available in the instance.
     [:map, :pow, :norm, :lerp, :second, :minute, :hour, :day, :month, :year,
-    :sq, :constrain, :dist, :blend_color, :degrees, :radians, :mag, :println,
-    :hex, :min, :max, :abs, :binary, :ceil, :nf, :nfc, :nfp, :nfs,
-    :norm, :round, :trim, :unbinary, :unhex ].each do |meth|
+      :sq, :constrain, :dist, :blend_color, :degrees, :radians, :mag, :println,
+      :hex, :min, :max, :abs, :binary, :ceil, :nf, :nfc, :nfp, :nfs,
+      :norm, :round, :trim, :unbinary, :unhex ].each do |meth|
       method = <<-EOS
       def #{meth}(*args)
       self.class.#{meth}(*args)
@@ -69,49 +68,49 @@ module Processing
       EOS
       eval method
     end
-    
+
     # Handy getters and setters on the class go here:
     def self.sketch_class;  @sketch_class;        end
-      @@full_screen = false
+    @@full_screen = false
     def self.full_screen;   @@full_screen = true; end
     def full_screen?;       @@full_screen;        end
-      
-      
+
+
     # Keep track of what inherits from the Processing::App, because we're going
     # to want to instantiate one.
     def self.inherited(subclass)
       super(subclass)
       @sketch_class = subclass
     end
-    
+
     def self.has_slider(*args) #:nodoc:
       raise "has_slider has been replaced with a nicer control_panel library. Check it out."
     end
-    
+
     @@library_loader = LibraryLoader.new
     class << self
       def load_libraries(*args)
         @@library_loader.load_library(*args)
       end
-      alias :load_library :load_libraries 
-      
+      alias :load_library :load_libraries
+
       def library_loaded?(library_name)
         @@library_loader.library_loaded?(library_name)
       end
-      
+
       def load_ruby_library(*args)
         @@library_loader.load_ruby_library(*args)
       end
-      
+
       def load_java_library(*args)
         @@library_loader.load_java_library(*args)
       end
     end
-    
+
     def library_loaded?(library_name)
       self.class.library_loaded?(library_name)
     end
-    
+
     # When you make a new sketch, you pass in (optionally),
     # a width, height, x, y, title, and whether or not you want to
     # run in full-screen.
@@ -125,33 +124,30 @@ module Processing
       set_sketch_path #unless Processing.online?
       mix_proxy_into_inner_classes
       #@started = false
-      
-      java.lang.Thread.default_uncaught_exception_handler = proc do |thread, exception|
+
+      java.lang.Thread.default_uncaught_exception_handler = proc do |_thread_, exception|
         puts(exception.class.to_s)
         puts(exception.message)
         puts(exception.backtrace.collect { |trace| "\t" + trace })
-        close        
+        close
       end
-      
-      # for the list of all available args, see 
+
+      # for the list of all available args, see
       # http://processing.org/reference/
 
       args = []
-      
       @width, @height = options[:width], options[:height]
-      
-      if @@full_screen || options[:full_screen] 
+      if @@full_screen || options[:full_screen]
         @@full_screen = true
         args << "--present"
-      end      
+      end
       @render_mode  ||= JAVA2D
-        x = options[:x] || 0
-        y = options[:y] || 0
-        args << "--location=#{x}, #{y}"
-        
-        title = options[:title] || File.basename(SKETCH_PATH).sub(/(\.rb)$/, '').titleize
-        args << title
-        PApplet.run_sketch(args, self)
+      x = options[:x] || 0
+      y = options[:y] || 0
+      args << "--location=#{x}, #{y}"
+      title = options[:title] || File.basename(SKETCH_PATH).sub(/(\.rb)$/, '').titleize
+      args << title
+      PApplet.run_sketch(args, self)
       #end
     end
 
@@ -167,34 +163,33 @@ module Processing
         end
       end
       super(*args)
-    end 
-    
+    end
+
     # Make sure we set the size if we set it before we start the animation thread.
     def start
       self.size(@width, @height) if @width && @height
       super()
     end
-    
+
     # Provide a loggable string to represent this sketch.
     def inspect
       "#<Processing::App:#{self.class}:#{@title}>"
     end
-   
-    
+
     # Cleanly close and shutter a running sketch.
     def close
-        control_panel.remove if respond_to?(:control_panel)
-        self.dispose
-        self.frame.dispose
+      control_panel.remove if respond_to?(:control_panel)
+      self.dispose
+      self.frame.dispose
     end
-    
-    
-    private 
-    
+
+
+    private
+
     # Mix the Processing::Proxy into any inner classes defined for the
     # sketch, attempting to mimic the behavior of Java's inner classes.
     def mix_proxy_into_inner_classes
-      
+
       klass = Processing::App.sketch_class
       klass.constants.each do |name|
         const = klass.const_get name
@@ -202,16 +197,13 @@ module Processing
         const.class_eval 'include Processing::Proxy'
       end
     end
-    
   end # Processing::App
-  
-  
+
   # This module will get automatically mixed in to any inner class of
   # a Processing::App, in order to mimic Java's inner classes, which have
   # unfettered access to the methods defined in the surrounding class.
   module Proxy
     include Math
-    
     # Generate the list of method names that we'd like to proxy for inner classes.
     # Nothing camelCased, nothing __internal__, just the Processing API.
     def self.desired_method_names(inner_class)
@@ -221,8 +213,7 @@ module Processing
       methods = Processing::App.public_instance_methods
       methods.reject {|m| unwanted.include?(m) || bad_method.match(m) || inner_class.method_defined?(m) }
     end
-    
-    
+
     # Proxy methods through to the sketch.
     def self.proxy_methods(inner_class)
       code = desired_method_names(inner_class).inject('') do |code, method|
@@ -238,8 +229,7 @@ module Processing
       end
       inner_class.class_eval(code)
     end
-    
-    
+
     # Proxy the sketch's constants on to the inner classes.
     def self.proxy_constants(inner_class)
       Processing::App.constants.each do |name|
@@ -247,14 +237,11 @@ module Processing
         inner_class.const_set(name, Processing::App.const_get(name))
       end
     end
-    
-    
+
     # Don't do all of the work unless we have an inner class that needs it.
     def self.included(inner_class)
       proxy_methods(inner_class)
       proxy_constants(inner_class)
     end
-    
   end # Processing::Proxy
-  
 end # Processing

data/lib/ruby-processing/config.rb

@@ -3,15 +3,15 @@ require 'psych'
 module Processing
 
   if Processing.exported?
-    CONFIG = {'PROCESSING_ROOT' => RP5_ROOT}	  
-  end	  
+    RB_CONFIG = { 'PROCESSING_ROOT' => RP5_ROOT, 'JRUBY' => 'false' }
+  end
 
-  unless defined? CONFIG
+  unless defined? RB_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")  
+      CONFIG_FILE_PATH=File.expand_path('~/.rp5rc')
+      RB_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,96 +1,95 @@
 require 'rbconfig'
 
 module Processing
-  
-  # A utility class to export Ruby-Processing sketches as 
+  require_relative '../../ruby-processing/exporters/base_exporter'
+  # A utility class to export Ruby-Processing sketches as
   # Mac/Win/Nix Applications.
   class ApplicationExporter < BaseExporter
-    
+
     USAGE = <<-EOS
-        
+
     The application exporter will generate a Mac application for you.
     Usage: script/application <path_to_sketch>
-    Example: script/applet samples/jwishy.rb 
+    Example: script/applet samples/jwishy.rb
     Probably won't work with Oracle Java on Mac
-      
+
     EOS
-    
+
     def export!(sketch)
       # Check to make sure that the main file exists
       @main_file_path, @main_file, @main_folder = *get_main_file(sketch)
-      usage( @main_file_path && File.exist?(@main_file_path) )
-      
+      usage(@main_file_path && File.exist?(@main_file_path))
+
       extract_information
-      
+
       compute_destination_name
-      
+
       wipe_and_recreate_destination
-      
+
       copy_over_necessary_files
-      
+
       calculate_substitutions
-      
+
       create_executables
-      
+
       symlink_library_into_place
     end
-    
+
     def compute_destination_name
       @dest = "#{@title}.app"
     end
-    
+
     def copy_over_necessary_files
-      @prefix = "lib"
+      @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["#{RB_CONFIG['PROCESSING_ROOT']}/core/library/{*,**}"]
       @necessary_files += Dir["#{RP5_ROOT}/lib/{*,**}"]
       @necessary_files += @real_requires
-      NECESSARY_FOLDERS.each do |folder| 
+      NECESSARY_FOLDERS.each do |folder|
         resource_path = File.join(@main_folder, folder)
         @necessary_files << resource_path if File.exist?(resource_path)
       end
       @necessary_files.uniq!
       cp_r(@necessary_files, File.join(@dest, @prefix))
-      cp_r(@libraries, File.join(@dest, @prefix, "library")) unless @libraries.empty?
+      cp_r(@libraries, File.join(@dest, @prefix, 'library')) unless @libraries.empty?
       # Then move the icon
-      potential_icon = Dir.glob(File.join(@dest, @prefix, "data/*.icns"))[0]
-      move(potential_icon, File.join(@dest, "Contents/Resources/sketch.icns"), :force => true ) if potential_icon
+      potential_icon = Dir.glob(File.join(@dest, @prefix, 'data/*.icns'))[0]
+      move(potential_icon, File.join(@dest, 'Contents/Resources/sketch.icns'), force: true) if potential_icon
     end
-    
+
     def calculate_substitutions
       file_list = ['lib/ruby/jruby-complete.jar']
-      @class_path = file_list.map {|f| "$JAVAROOT/" + f.sub(@prefix+"/", "") }.join(":")
-      @linux_class_path = ".:../lib/ruby/*:../lib/*:../lib/library/*"
-      @windows_class_path = ".;../lib/ruby/*;../lib/*;../lib/library/*"
+      @class_path = file_list.map { |f| '$JAVAROOT/' + f.sub(@prefix+'/', '') }.join(':')
+      @linux_class_path = '.:../lib/ruby/*:../lib/*:../lib/library/*'
+      @windows_class_path = '.;../lib/ruby/*;../lib/*;../lib/library/*'
     end
-    
+
     def create_executables
       render_erb_in_path_with_binding(@dest, binding, :delete => true)
-      rm Dir.glob(@dest + "/**/*.java")
-      runnable = @dest + "/" + File.basename(@main_file, ".rb")
-      move @dest + "/run", runnable
-      move @dest + "/run.exe", "#{runnable}.exe"
+      rm Dir.glob(@dest + '/**/*.java')
+      runnable = @dest + '/' + File.basename(@main_file, '.rb')
+      move @dest + '/run', runnable
+      move @dest + '/run.exe', "#{runnable}.exe"
       chmod 0755, runnable
       chmod 0755, "#{runnable}.exe"
       chmod 0755, File.join(@dest, 'Contents', 'MacOS', 'JavaApplicationStub')
     end
-    
+
     def symlink_library_into_place
-      cd @dest + "/Contents/Resources"
+      cd @dest + '/Contents/Resources'
       # Poor ol' windows can't symlink.
       # TODO...
-      win ||= RbConfig::CONFIG['host_os'].match(/mswin/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 
+      puts "\n[warning] Applications exported from Windows won't run on Macs...\n" if win
       ln_s('../../lib', 'Java') unless win
     end
-    
+
     def usage(predicate)
       return if predicate
       puts USAGE
       exit
     end
-    
   end
 end