ruby-processing 2.6.7 → 2.6.8

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 66a5c0578c17ec6e9ace637abb2626d7c4907549
-  data.tar.gz: 711c1d6afedd64b8ca08956f7fd86a76db6841ea
+  metadata.gz: f86e1e9a4937a12e054537a3a11d87bd4d80ca8d
+  data.tar.gz: d9504d46543bf9467603fd6f0b3b8b25ddcfc366
 SHA512:
-  metadata.gz: 3d8d40e8e3a1b996de6071faf63b0b8f9b2ac912a7d8564c93bb94c18ccea8641f67e019cc7090fd879539de2649554070318d7a090620bda3c59b59ef81f1e8
-  data.tar.gz: a193bb65ae7813300bc723a478d543e457a9b4fedd6c97e1e5d506c78ee43eebfbc543962ccdc6ea3504090ad1c5b170bda7c07e654d7a568b17165fb23e0904
+  metadata.gz: 7618164b1440aa65fb4d8361392fcfde54588741e1f48fcd983c079bfcd936c6a8d1dd32f3a38e56cf63428022df0733641b4ccf0ce462d6377360d7ccbaf734
+  data.tar.gz: a00bd119873be49f403a5b606e82f98a84a7e10c52a4ab2a5fd741fbbce4d324616e8d3658a2d71743e09b065c245421f3b45779ee915ccb041d0ef18d72503a

data/lib/ruby-processing/app.rb

@@ -8,9 +8,10 @@ require_relative '../ruby-processing/helpers/string_extra'
 require_relative '../ruby-processing/library_loader'
 require_relative '../ruby-processing/config'
 
-Dir["#{Processing::RP_CONFIG['PROCESSING_ROOT']}/core/library/\*.jar"].each do
-|jar|
-require jar
+jars = Dir["#{Processing::RP_CONFIG['PROCESSING_ROOT']}/core/library/\*.jar"]
+# We don't seem need to load the native jars so perhaps we shouldn't
+jars.reject { |jar| jar =~ /native/ }.each do |jar|
+  require jar
 end
 
 module Processing
@@ -48,19 +49,6 @@ module Processing
     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:
-      if METHODS_TO_ALIAS.key?(method_name)
-        alias_method METHODS_TO_ALIAS[method_name], method_name
-      end
-    end
-
-    # Handy getters and setters on the class go here:
-    class << self
-      attr_accessor :sketch_class
-    end
-
     def sketch_class
       self.class.sketch_class
     end
@@ -72,23 +60,33 @@ module Processing
       @sketch_class = subclass
     end
 
-    @@library_loader = LibraryLoader.new
     class << self
+      # Handy getters and setters on the class go here:
+      attr_accessor :sketch_class, :library_loader
+
       def load_libraries(*args)
-        @@library_loader.load_library(*args)
+        library_loader ||= LibraryLoader.new
+        library_loader.load_library(*args)
       end
       alias_method :load_library, :load_libraries
 
       def library_loaded?(library_name)
-        @@library_loader.library_loaded?(library_name)
+        library_loader.library_loaded?(library_name)
       end
 
       def load_ruby_library(*args)
-        @@library_loader.load_ruby_library(*args)
+        library_loader.load_ruby_library(*args)
       end
 
       def load_java_library(*args)
-        @@library_loader.load_java_library(*args)
+        library_loader.load_java_library(*args)
+      end
+
+      # When certain special methods get added to the sketch, we need to let
+      # Processing call them by their expected Java names.
+      def method_added(method_name) #:nodoc:
+        return unless METHODS_TO_ALIAS.key?(method_name)
+        alias_method METHODS_TO_ALIAS[method_name], method_name
       end
     end
 
@@ -172,7 +170,7 @@ module Processing
         java_import "processing.opengl.#{klass}"
       end
     end
-    
+
     def run_sketch(options = {})
       args = []
       @width, @height = options[:width], options[:height]
@@ -206,9 +204,7 @@ module Processing
       unwanted -= %w(width height cursor create_image background size resize)
       methods = Processing::App.public_instance_methods
       methods.reject do |m|
-        unwanted.include?(m) ||
-        bad_method.match(m) ||
-        inner_class.method_defined?(m)
+        unwanted.include?(m) || bad_method.match(m) || inner_class.method_defined?(m)
       end
     end
 

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

@@ -19,7 +19,7 @@ module Processing
     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 && FileTest.exist?(@main_file_path))
 
       extract_information
 
@@ -49,7 +49,7 @@ module Processing
       @necessary_files += @real_requires
       NECESSARY_FOLDERS.each do |folder|
         resource_path = File.join(@main_folder, folder)
-        @necessary_files << resource_path if File.exist?(resource_path)
+        @necessary_files << resource_path if FileTest.exist?(resource_path)
       end
       @necessary_files.uniq!
       cp_r(@necessary_files, File.join(@dest, @prefix))

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

@@ -119,7 +119,7 @@ module Processing
     end
 
     def wipe_and_recreate_destination
-      remove_entry_secure @dest if File.exist?(@dest)
+      remove_entry_secure @dest if FileTest.exist?(@dest)
       mkdir_p @dest
     end
 

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

@@ -74,7 +74,7 @@ module Processing
     def already_exist(path)
       underscore = StringExtra.new(path).underscore
       new_file = "#{File.dirname(path)}/#{underscore}.rb"
-      return if !File.exist?(path) && !File.exist?(new_file)
+      return if !FileTest.exist?(path) && !FileTest.exist?(new_file)
       puts 'That file already exists!'
       exit
     end

data/lib/ruby-processing/library_loader.rb

@@ -1,9 +1,10 @@
 module Processing
+  # Encapsulate library loader functionality as a class
   class LibraryLoader
     attr_reader :sketchbook_library_path
 
     def initialize
-      @sketchbook_library_path = File.join(find_sketchbook_path || '', 'libraries')
+      @sketchbook_library_path = File.join(find_sketchbook_path, 'libraries')
       @loaded_libraries = Hash.new(false)
     end
 
@@ -18,9 +19,10 @@ module Processing
     # If a library is put into a 'library' folder next to the sketch it will
     # be used instead of the library that ships with Ruby-Processing.
     def load_libraries(*args)
+      message = 'no such file to load -- %s'
       args.each do |lib|
         loaded = load_ruby_library(lib) || load_java_library(lib)
-        fail(LoadError.new, "no such file to load -- #{lib}") unless loaded
+        fail(LoadError.new, format(message, lib)) unless loaded
       end
     end
     alias_method :load_library, :load_libraries
@@ -30,7 +32,7 @@ module Processing
     # of the same name as the library folder.
     def load_ruby_library(library_name)
       library_name = library_name.to_sym
-      return true if @loaded_libraries[library_name]
+      return true if @loaded_libraries.include?(library_name)
       if Processing.exported?
         begin
           return @loaded_libraries[library_name] = (require_relative "../library/#{library_name}")
@@ -43,15 +45,13 @@ module Processing
       @loaded_libraries[library_name] = (require path)
     end
 
-    # For pure java libraries, such as the ones that are available
+    # HACK: For pure java libraries, such as the ones that are available
     # on this page: http://processing.org/reference/libraries/index.html
-    #
-    # P.S. -- Loading libraries which include native code needs to
-    # hack the 'Java ClassLoader', so that you don't have to
-    # futz with your PATH. But it's probably bad juju.
+    # that include native code, we mess with the 'Java ClassLoader', so that
+    # you don't have to futz with your PATH. But it's probably bad juju.
     def load_java_library(library_name)
       library_name = library_name.to_sym
-      return true if @loaded_libraries[library_name]
+      return true if @loaded_libraries.include?(library_name)
       jpath = get_library_directory_path(library_name, 'jar')
       jars = get_library_paths(library_name, 'jar')
       return false if jars.empty?
@@ -60,7 +60,6 @@ module Processing
       platform_specific_library_paths = platform_specific_library_paths.select do |ppath|
         test(?d, ppath) && !Dir.glob(File.join(ppath, '*.{so,dll,jnilib}')).empty?
       end
-
       unless platform_specific_library_paths.empty?
         platform_specific_library_paths << java.lang.System.getProperty('java.library.path')
         new_library_path = platform_specific_library_paths.join(java.io.File.pathSeparator)
@@ -73,23 +72,23 @@ module Processing
       end
       @loaded_libraries[library_name] = true
     end
-    
+
     def platform
-      match = %w(Mac Linux Windows).find do |os|
-        java.lang.System.getProperty('os.name').index(os)
+      match = %w(mac linux windows).find do |os|
+        java.lang.System.getProperty('os.name').downcase.index(os)
       end
       return 'other' unless match
-      return match.downcase unless match =~ /Mac/
-      return 'macosx'
+      return match unless match =~ /mac/
+      'macosx'
     end
 
     def get_platform_specific_library_paths(basename)
       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')
+        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')
+        java.lang.System.getProperty('java.vm.name').index('64')
         bits = '64' unless platform =~ /macosx/
       end
       [platform, platform + bits].map { |p| File.join(basename, p) }
@@ -105,14 +104,13 @@ 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}",
-          "#{Processing::RP_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",
-          "#{@sketchbook_library_path}/#{library_name}"
+        ["#{SKETCH_ROOT}/library/#{library_name}",
+        "#{Processing::RP_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"
         ].each do |jpath|
-          if File.exist?(jpath) && !Dir.glob(jpath + "/*.#{ext}").empty?
+          if File.exist?(jpath) && !Dir.glob(format('%s/*.%s', jpath, ext)).empty?
             return jpath
           end
         end
@@ -123,32 +121,21 @@ module Processing
     def find_sketchbook_path
       preferences_paths = []
       sketchbook_paths = []
-      if sketchbook_path = Processing::RP_CONFIG['sketchbook_path']
-        return File.expand_path(sketchbook_path)
+      if sketchbook_path = Processing::RP_CONFIG.fetch('sketchbook_path', false)
+        return sketchbook_path
       else
         ["'Application Data/Processing'", 'AppData/Roaming/Processing',
-          'Library/Processing', 'Documents/Processing',
-          '.processing', 'sketchbook'].each do |prefix|
-          spath = "#{ENV['HOME']}/#{prefix}"
-          pref_path = spath + '/preferences.txt'
-          if test(?f, pref_path)
-            preferences_paths << pref_path
-          end
-          if test(?d, spath)
-            sketchbook_paths << spath
-          end
+        'Library/Processing', 'Documents/Processing',
+        '.processing', 'sketchbook'].each do |prefix|
+          spath = format('%s/%s', ENV['HOME'], prefix)
+          pref_path = format('%s/preferences.txt', spath)
+          preferences_paths << pref_path if test(?f, pref_path)
+          sketchbook_paths << spath if test(?d, spath)
         end
-        if preferences_paths.empty?
-          sketchbook_path = sketchbook_paths.first
-        else
-          lines = File.readlines(preferences_paths.first)
-          regex1 = /^sketchbook\.path=(.+)/           # processing-2.0
-          regex2 = /^sketchbook\.path\.three=(.+)/    # processing-3.0
-          matched_lines = lines.grep(regex1) { $1 } unless $1 == ''
-          matched_lines = lines.grep(regex2) { $1 } unless $1 == ''
-          sketchbook_path = matched_lines.first
-        end
-        return sketchbook_path
+        return sketchbook_paths.first if preferences_paths.empty?
+        lines = IO.readlines(preferences_paths.first)
+        matchedline = lines.grep(/^sketchbook/).first
+        matchedline[/=(.+)/].gsub('=', '')
       end
     end
   end

data/lib/ruby-processing/runner.rb

@@ -47,7 +47,7 @@ module Processing
       /bccwin/i,
       /cygwin/i,
       /djgpp/i,
-      /mingw/i,
+      /ming/i,
       /mswin/i,
       /wince/i
     ]
@@ -124,10 +124,10 @@ module Processing
     end
 
     def setup(choice)
-      proc_root = File.exist?("#{ENV['HOME']}/.rp5rc")
+      proc_root = FileTest.exist?("#{ENV['HOME']}/.rp5rc")
       case choice
       when /check/
-        check(proc_root, File.exist?("#{RP5_ROOT}/lib/ruby/jruby-complete.jar"))
+        check(proc_root, FileTest.exist?("#{RP5_ROOT}/lib/ruby/jruby-complete.jar"))
       when /install/
         install(proc_root)
       when /unpack_samples/
@@ -206,7 +206,7 @@ module Processing
       arg_file = "#{File.dirname(sketch)}/data/java_args.txt"
       args = []
       args += dock_icon
-      if File.exist?(arg_file)
+      if FileTest.exist?(arg_file)
         args += File.read(arg_file).split(/\s+/)
       elsif Processing::RP_CONFIG['java_args']
         args += Processing::RP_CONFIG['java_args'].split(/\s+/)
@@ -218,12 +218,12 @@ module Processing
     # NB: we really do require 'and' not '&&' to get message returned
 
     def ensure_exists(sketch)
-      puts "Couldn't find: #{sketch}" and exit unless File.exist?(sketch)
+      puts "Couldn't find: #{sketch}" and exit unless FileTest.exist?(sketch)
     end
 
     def jruby_complete
       rcomplete = File.join(RP5_ROOT, 'lib/ruby/jruby-complete.jar')
-      return rcomplete if File.exist?(rcomplete)
+      return rcomplete if FileTest.exist?(rcomplete)
       warn "#{rcomplete} does not exist\nTry running `rp5 setup install`"
       exit
     end

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

@@ -5,6 +5,7 @@ module Processing
   # the feedback between code and effect.
   class Watcher
     # Sic a new Processing::Watcher on the sketch
+    SLEEP_TIME = 0.2
     def initialize
       reload_files_to_watch
       @time = Time.now
@@ -16,7 +17,7 @@ module Processing
     def start_watching
       start_runner
       Kernel.loop do
-        if @files.find { |file| File.exist?(file) && File.stat(file).mtime > @time }
+        if @files.find { |file| FileTest.exist?(file) && File.stat(file).mtime > @time }
           puts 'reloading sketch...'
           $app && $app.close
           @time = Time.now
@@ -24,7 +25,7 @@ module Processing
           start_runner
           reload_files_to_watch
         end
-        sleep 0.33
+        sleep SLEEP_TIME
       end
     end
 

data/lib/ruby-processing/version.rb

@@ -1,3 +1,3 @@
 module RubyProcessing
-  VERSION = '2.6.7'
+  VERSION = '2.6.8'
 end

data/library/vecmath/vecmath.rb

@@ -1,5 +1,9 @@
 require 'rpextras'
 
+# HACK: required for exported applications, comment out or replace first line
+# with next line (create a lib folder here and move rpextras.jar there.
+# require_relative 'lib/rpextras'
+
 Java::ProcessingVecmathArcball::ArcballLibrary.new.load(JRuby.runtime, false)
 Java::ProcessingVecmathVec2::Vec2Library.new.load(JRuby.runtime, false)
 Java::ProcessingVecmathVec3::Vec3Library.new.load(JRuby.runtime, false)

data/vendors/Rakefile

@@ -75,6 +75,7 @@ task :copy_examples => file_name do
   else
     sh "tar xzvf #{EXAMPLES}.tar.gz" 
   end
+  sh "rm -r #{HOME_DIR}/rp_samples" if File.exist? "#{HOME_DIR}/rp_samples"
   sh "cp -r Example-Sketches-#{EXAMPLES} #{HOME_DIR}/rp_samples"  
   sh "rm -r Example-Sketches-#{EXAMPLES}"   
 end

metadata

@@ -1,24 +1,22 @@
 --- !ruby/object:Gem::Specification
 name: ruby-processing
 version: !ruby/object:Gem::Version
-  version: 2.6.7
+  version: 2.6.8
 platform: ruby
 authors:
 - Jeremy Ashkenas
-- Peter Gassner
-- Martin Stannard
-- Andrew Nanton
+- Peter Gassner Martin Stannard Andrew Nanton
 - Marc Chung
 - Peter Krenn
 - Florian Jenett
 - Andreas Haller
-- Juris Galang
-- Guillaume Pierronnet
+- Juris
+- Galang Guillaume Pierronne
 - Martin Prout
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2015-01-30 00:00:00.000000000 Z
+date: 2015-04-03 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   requirement: !ruby/object:Gem::Requirement
@@ -152,7 +150,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
   - - '>='
     - !ruby/object:Gem::Version
-      version: '0'
+      version: 1.9.3
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
   - - '>='