ruby-processing 2.6.13 → 2.6.14

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 0dd16b8c23b72512132d1d5d4ec026e4a8ea3c73
-  data.tar.gz: cb859d80e805cb554abab5dadc86cd35d3977871
+  metadata.gz: 44805ffa73fa01bdd4064925c53ef8c6f1a70503
+  data.tar.gz: 3bb2dfbdaf8452b5134124a9076354bdc81f3fe2
 SHA512:
-  metadata.gz: 4c77a518ef8bf243e6cd30d4d8d0371072ef1b0cb68e24d20e880a8844f992ea188325da8480c35b150ba6b48d6560604013a2006840c4b28504ed5789c3780b
-  data.tar.gz: c6ed3b51da1ed81e459194535668977e69a58816092d3f19b7b742d57e7502c29e5c7dffa7e5d22b2b1061ac5a877050723df154cd10490612103a78122dc951
+  metadata.gz: 4e86989139b8a0ce2cac4f3aed69da1a63de183e78abb596fffb22ebfa79647a78205aa60cb3ecc8e4ebd1f3bd511a8f9430ec2ecf937d50b6e92b19a38f3cf8
+  data.tar.gz: 1bbc0c5067c4d3f645dea500d5b4c0ce35a78c0ced86e1f0029153e96ccfdd15bd9f2b5e0d997bac4f0c063b6b1bb3684c88b5d8aa0d226aafaf25376198f95f

data/lib/ruby-processing.rb

@@ -14,15 +14,5 @@ require 'ruby-processing/helpers/range'
 
 # The top-level namespace, a home for all Ruby-Processing classes.
 module Processing
-  def self.exported?
-    @exported ||= ENV['EXPORTED'].eql?('true')
-  end
-
-  # 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'
+  require 'ruby-processing/runner'   
 end

data/lib/ruby-processing/app.rb

@@ -3,10 +3,12 @@
 # Most of the code here is for interfacing with Swing,
 # web applets, going fullscreen and so on.
 require 'java'
-require_relative '../ruby-processing/helper_methods'
-require_relative '../ruby-processing/helpers/string_extra'
-require_relative '../ruby-processing/library_loader'
-require_relative '../ruby-processing/config'
+require_relative 'helper_methods'
+require_relative 'helpers/string_extra'
+require_relative 'library_loader'
+require_relative 'config'
+
+
 
 module Processing
   # This is the main Ruby-Processing class, and is what you'll
@@ -16,7 +18,9 @@ module Processing
   # should define in your sketch. 'setup' will be called one
   # time when the sketch is first loaded, and 'draw' will be
   # called constantly, for every frame.
-
+  Dir["#{RP_CONFIG["PROCESSING_ROOT"]}/core/library/\*.jar"].each do |jar| 
+    require jar unless jar =~ /native/
+  end
   # Include some core processing classes that we'd like to use:
   include_package 'processing.core'
 

data/lib/ruby-processing/config.rb

@@ -1,7 +1,8 @@
 require 'psych'
 
 module Processing
-  if Processing.exported?
+  
+  if ENV['EXPORTED'].eql?('true')
     RP_CONFIG = { 'PROCESSING_ROOT' => RP5_ROOT, 'JRUBY' => 'false' }
   end
   unless defined? RP_CONFIG

data/lib/ruby-processing/library_loader.rb

@@ -1,4 +1,6 @@
-# Then processing wrapper module
+# The processing wrapper module
+require_relative '../ruby-processing'
+
 module Processing
 
   # Encapsulate library loader functionality as a class
@@ -35,7 +37,7 @@ module Processing
     def load_ruby_library(library_name)
       library_name = library_name.to_sym
       return true if @loaded_libraries.include?(library_name)
-      if Processing.exported?
+      if ENV['EXPORTED'].eql?('true')
         begin
           return @loaded_libraries[library_name] = (require_relative "../library/#{library_name}")
         rescue LoadError

data/lib/ruby-processing/runner.rb

@@ -4,7 +4,6 @@ require 'rbconfig'
 require_relative '../ruby-processing/config'
 require_relative '../ruby-processing/version'
 
-
 module Processing
 
   # Utility class to handle the different commands that the 'rp5' command
@@ -158,7 +157,6 @@ module Processing
       puts "  jruby-complete installed = #{installed}"
     end
 
-
     # Display the current version of Ruby-Processing.
     def show_version
       puts "Ruby-Processing version #{RubyProcessing::VERSION}"
@@ -169,13 +167,8 @@ module Processing
       puts HELP_MESSAGE
     end
 
-
     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
     # installed version of jruby is used instead of our vendored jarred one
@@ -186,34 +179,26 @@ 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)      
-      if @options.nojruby
-        classpath = jruby_complete + core_classpath
+      java_args = discover_java_args(sketch)
+      if @options.nojruby 
         command = ['java',
-                   java_args,
-                   '-cp',
-                   classpath.join(path_separator),
-                   'org.jruby.Main',
-                   runner,
-                   sketch,
-                   args].flatten
+                  java_args,
+                  '-cp',
+                  jruby_complete,
+                  'org.jruby.Main',
+                  runner,
+                  sketch,
+                  args].flatten
       else
         command = ['jruby', 
-                   java_args,
-                   '-J-cp',
-                   core_classpath.join(path_separator),
-                   runner, 
-                   sketch, 
-                   args].flatten
+                  java_args,
+                  runner, 
+                  sketch, 
+                  args].flatten        
       end
       exec(*command)
       # exec replaces the Ruby process with the JRuby one.
     end
-    
-    def path_separator
-      (host_os == :windows) ? ';' : ':'
-    end
-      
 
     # If you need to pass in arguments to Java, such as the ones on this page:
     # http://docs.oracle.com/javase/1.5.0/docs/tooldocs/windows/java.html
@@ -239,7 +224,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/runners/base.rb

@@ -3,8 +3,8 @@
 SKETCH_PATH ||= ARGV.shift
 SKETCH_ROOT ||= File.dirname(SKETCH_PATH)
 
-require_relative '../../ruby-processing'
-require_relative '../../ruby-processing/app'
+# we can safely require app.rb as we are using a jruby runtime
+require_relative '../app'
 
 # More processing module
 module Processing

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

@@ -1,12 +1,16 @@
-# An IRB shell for live coding.
-# This flavor will either load up empty Ruby-Processing,
-# or will start with your sketch.
-
-require_relative '../../ruby-processing/runners/base'
+# A pry shell for live coding.
+# Will start with your sketch.
+require_relative 'base'
 Processing.load_and_run_sketch
 
-ARGV.clear # So that IRB doesn't try to load them as files.
+class PryException < StandardError
+end
+
+MESSAGE = "You need to 'jruby -S gem install pry' for 'live' mode"
 
-require 'irb'
-IRB.setup(__FILE__)
-IRB.start
+if Gem::Specification.find_all_by_name('pry').any?
+  require 'pry'
+  $app.pry
+else
+  fail(PryException.new, MESSAGE)
+end

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

@@ -1,6 +1,3 @@
-# TODO: this is crud. Windows applets are having serious
-# trouble with absolute paths.
-
-require_relative '../runners/base'
+require_relative 'base'
 
 Processing.load_and_run_sketch

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

@@ -1,4 +1,4 @@
-require_relative '../runners/base'
+require_relative 'base'
 
 module Processing
   # A sketch loader, observer, and reloader, to tighten

data/lib/ruby-processing/version.rb

@@ -1,3 +1,3 @@
 module RubyProcessing
-  VERSION = '2.6.13'
+  VERSION = '2.6.14'
 end

data/library/fastmath/fastmath.rb

@@ -1,3 +1,4 @@
-require 'rpextras'
+require_relative '../../lib/ruby-processing'
+require "#{RP5_ROOT}/lib/rpextras"
 
-Java::ProcessingFastmath::DeglutLibrary.new.load(JRuby.runtime, false)
+Java::MonkstoneFastmath::DeglutLibrary.new.load(JRuby.runtime, false)

data/library/library_proxy/library_proxy.rb

@@ -1,6 +1,7 @@
-require 'rpextras'
+require_relative '../../lib/ruby-processing'
+require "#{RP5_ROOT}/lib/rpextras"
 
-LibraryProxy = Java::ProcessingCore::AbstractLibrary
+LibraryProxy = Java::MonkstoneCore::AbstractLibrary
 
 # classes that inherit from Library are expected to implement
 # the abstract methods of processing.core.AbstractLibrary

data/library/vecmath/vecmath.rb

@@ -1,12 +1,9 @@
-require 'rpextras'
+require_relative '../../lib/ruby-processing'
+require "#{RP5_ROOT}/lib/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::MonkstoneArcball::ArcballLibrary.new.load(JRuby.runtime, false)
+Java::MonkstoneVecmathVec2::Vec2Library.new.load(JRuby.runtime, false)
+Java::MonkstoneVecmathVec3::Vec3Library.new.load(JRuby.runtime, false)
 
-Java::ProcessingVecmathArcball::ArcballLibrary.new.load(JRuby.runtime, false)
-Java::ProcessingVecmathVec2::Vec2Library.new.load(JRuby.runtime, false)
-Java::ProcessingVecmathVec3::Vec3Library.new.load(JRuby.runtime, false)
-
-AppRender = Java::ProcessingVecmath::AppRender
-ShapeRender = Java::ProcessingVecmath::ShapeRender
+AppRender ||= Java::MonkstoneVecmath::AppRender
+ShapeRender ||= Java::MonkstoneVecmath::ShapeRender

data/library/video_event/video_event.rb

@@ -1,7 +1,8 @@
-require 'rpextras'
+require_relative '../../lib/ruby-processing'
+require "#{RP5_ROOT}/lib/rpextras"
 
 class Processing::App
-  include Java::ProcessingCore::VideoInterface
+  include Java::MonkstoneVideoevent::VideoInterface
   def captureEvent(c)
     # satisfy implement abstract class
   end

data/vendors/Rakefile

@@ -9,7 +9,7 @@ WARNING = <<-EOS
 EOS
 
 JRUBYC_VERSION     = '1.7.21'
-EXAMPLES           = '1.6'
+EXAMPLES           = '1.7'
 HOME_DIR = ENV['HOME']
 MAC_OR_LINUX = /linux|mac|darwin/ =~ RbConfig::CONFIG['host_os'] 
 

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: ruby-processing
 version: !ruby/object:Gem::Version
-  version: 2.6.13
+  version: 2.6.14
 platform: ruby
 authors:
 - Jeremy Ashkenas
@@ -16,12 +16,12 @@ authors:
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2015-07-07 00:00:00.000000000 Z
+date: 2015-07-29 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: '1.3'
   name: bundler
@@ -29,13 +29,13 @@ dependencies:
   type: :development
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: '1.3'
 - !ruby/object:Gem::Dependency
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: '10.3'
   name: rake
@@ -43,13 +43,13 @@ dependencies:
   type: :development
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: '10.3'
 - !ruby/object:Gem::Dependency
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: '0.9'
   name: rake-compiler
@@ -57,13 +57,13 @@ dependencies:
   type: :development
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: '0.9'
 - !ruby/object:Gem::Dependency
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: '5.3'
   name: minitest
@@ -71,18 +71,14 @@ dependencies:
   type: :development
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: '5.3'
-description: |2
-    Ruby-Processing is a ruby wrapper for the processing art framework.
-    The current version supports processing-2.2.1, and uses jruby-1.7.xx
-    as the glue between ruby and java. You can use both processing libraries and ruby
-    gems in your sketches. Features create/export/run/watch modes. The "watch" mode,
-    provides a nice REPL-ish way to work on your processing sketches. Includes:-
-    A "Control Panel" library, so that you can easily create sliders, buttons,
-    checkboxes and drop-down menus, and hook them into your sketch's instance
-    variables and hundreds of worked examples to get you started...
+description: "  Ruby-Processing is a ruby wrapper for the processing art framework.\n\
+  \  This version supports processing-2.2.1, and uses jruby-complete-1.7.22 or an\
+  \ \n  installed jruby as the glue between ruby and java. Use both processing \n\
+  \  libraries and ruby gems in your sketches. The \"watch\" mode, provides a \n \
+  \ nice REPL-ish way to work on your processing sketches. \n"
 email: jeremy@ashkenas.com
 executables:
 - rp5
@@ -90,6 +86,7 @@ extensions: []
 extra_rdoc_files: []
 files:
 - bin/rp5
+- lib/rpextras.jar
 - lib/ruby-processing.rb
 - lib/ruby-processing/app.rb
 - lib/ruby-processing/config.rb
@@ -128,7 +125,6 @@ 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
@@ -139,12 +135,12 @@ require_paths:
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
-  - - '>='
+  - - ">="
     - !ruby/object:Gem::Version
       version: 1.9.3
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
-  - - '>='
+  - - ">="
     - !ruby/object:Gem::Version
       version: '0'
 requirements:
@@ -152,7 +148,7 @@ requirements:
 - java runtime >= 1.7+
 - processing = 2.2.1+
 rubyforge_project:
-rubygems_version: 2.1.9
+rubygems_version: 2.4.8
 signing_key:
 specification_version: 4
 summary: Code as Art, Art as Code. Processing and Ruby are meant for each other.