ruby-processing 2.6.11 → 2.6.12

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 95f093af92488a7783924a932a086c10e2e81058
-  data.tar.gz: 77868bd9e219521101a104c4d6d0207f77b5c877
+  metadata.gz: d97dffce26050b2b5f80189ef063b6f9093a8f39
+  data.tar.gz: 045df452ea1968641ddfccac5e0e2222efdfc06d
 SHA512:
-  metadata.gz: 76ad255dc7e19dc407f787523d0c26d1be56cdcfbb8329ff4f0fae5c2b5e3a609bc4f7d310a7f7abb342808fb892acf3b183e429cca8b0f3a72641bf604977ad
-  data.tar.gz: ef356cde4063ee9b2d7bd5f1e8fb00e5f8e37898ef9b6a68426bde2d3d8e9cb92e74171d336a47050c5bb422bcb481be552bf4b5ddba1f9987485637189179a9
+  metadata.gz: 8d3e525fc43e1d74ea96e7df4b3cd52eb81601f2e8f57a603163cc80988d8ab227ce84a7875123eac9bb18fb80bf5cc7a65b58a695b163ec6db95bb39a48f7bd
+  data.tar.gz: 63a38138b14d31f5bdb1b49fc8ab46ff87bddd41393e279ebcb1365809b4c9ad326caf441a3941beff68306919326e7b131727c86362c1ed4d4785b3e349ac7d

data/lib/ruby-processing/app.rb

@@ -8,12 +8,6 @@ require_relative '../ruby-processing/helpers/string_extra'
 require_relative '../ruby-processing/library_loader'
 require_relative '../ruby-processing/config'
 
-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
   # This is the main Ruby-Processing class, and is what you'll
   # inherit from when you create a sketch. This class can call

data/lib/ruby-processing/runner.rb

@@ -171,6 +171,10 @@ module Processing
 
 
     private
+    
+    def core_classpath
+      Dir["#{Processing::RP_CONFIG['PROCESSING_ROOT']}/core/library/\*.jar"]
+    end
 
     # Trade in this Ruby instance for a JRuby instance, loading in a starter
     # script and passing it some arguments.Unless '--nojruby' is passed, the
@@ -182,18 +186,25 @@ module Processing
       runner = "#{RP5_ROOT}/lib/ruby-processing/runners/#{starter_script}"
       warn('The --jruby flag is no longer required') if @options.jruby
       @options.nojruby = true if Processing::RP_CONFIG['JRUBY'] == 'false'
-      java_args = discover_java_args(sketch)
+      java_args = discover_java_args(sketch)      
       if @options.nojruby
+        classpath = jruby_complete + core_classpath
         command = ['java',
                    java_args,
                    '-cp',
-                   jruby_complete,
+                   classpath.join(':'),
                    'org.jruby.Main',
                    runner,
                    sketch,
                    args].flatten
       else
-        command = ['jruby', java_args, runner, sketch, args].flatten
+        command = ['jruby', 
+                   java_args,
+                   '-J-cp',
+                   core_classpath.join(':'),
+                   runner, 
+                   sketch, 
+                   args].flatten
       end
       exec(*command)
       # exec replaces the Ruby process with the JRuby one.
@@ -223,7 +234,7 @@ module Processing
 
     def jruby_complete
       rcomplete = File.join(RP5_ROOT, 'lib/ruby/jruby-complete.jar')
-      return rcomplete if FileTest.exist?(rcomplete)
+      return [rcomplete] if FileTest.exist?(rcomplete)
       warn "#{rcomplete} does not exist\nTry running `rp5 setup install`"
       exit
     end

data/lib/ruby-processing/version.rb

@@ -1,3 +1,3 @@
 module RubyProcessing
-  VERSION = '2.6.11'
+  VERSION = '2.6.12'
 end

data/library/video_event/video_event.rb

@@ -2,11 +2,4 @@ require 'rpextras'
 
 class Processing::App
   include Java::ProcessingCore::VideoInterface
-  def captureEvent(c)
-    # satisfy implement abstract class
-  end
-  
-  def movieEvent(m)
-    # satisfy implement abstract class
-  end  
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: ruby-processing
 version: !ruby/object:Gem::Version
-  version: 2.6.11
+  version: 2.6.12
 platform: ruby
 authors:
 - Jeremy Ashkenas
@@ -16,7 +16,7 @@ authors:
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2015-06-07 00:00:00.000000000 Z
+date: 2015-06-12 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   requirement: !ruby/object:Gem::Requirement
@@ -90,7 +90,6 @@ extensions: []
 extra_rdoc_files: []
 files:
 - bin/rp5
-- lib/rpextras.jar
 - lib/ruby-processing.rb
 - lib/ruby-processing/app.rb
 - lib/ruby-processing/config.rb
@@ -129,6 +128,7 @@ files:
 - library/vecmath/vecmath.rb
 - library/video_event/video_event.rb
 - vendors/Rakefile
+- lib/rpextras.jar
 homepage: http://wiki.github.com/jashkenas/ruby-processing
 licenses:
 - MIT
@@ -152,7 +152,7 @@ requirements:
 - java runtime >= 1.7+
 - processing = 2.2.1+
 rubyforge_project:
-rubygems_version: 2.4.6
+rubygems_version: 2.1.9
 signing_key:
 specification_version: 4
 summary: Code as Art, Art as Code. Processing and Ruby are meant for each other.