jruby_art 0.3.1.pre → 0.4.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 6310fd7a020ca5af0b1efd759a68402e64390c64
-  data.tar.gz: 27ee30134bbdad7cc47a31730a457b6d382a51a1
+  metadata.gz: bd9cb0f962dc0a84b23505e358c06629c40f68e6
+  data.tar.gz: fbe671a54abacc8ba092e8a0990a4001f2801eca
 SHA512:
-  metadata.gz: a76a9bf6a75eba08aa8a9a46e0add4188b515138fd265408ee4acd7af9b047efd14e7a2d4c1501e5582a13d0ac7d9e9f82c8bab4063eb9c760b9b72d57da81d9
-  data.tar.gz: 44c04ac82796deb2e411b27f2b2ccdb4872ee2e8052bec0ce7be1123a0720ef8e00fa3a3c1c8a370a44acfec65cec1921c41dadc115d2f4918076444b3c46e2a
+  metadata.gz: 461771d79505d0055e7327292df3c592aa33ad8d5d61a302fc55e09d51f5c40d8f032eb9d9179e47d6fc4c746a0db2fbd875254b4f595572c0f5a0fc9d404746
+  data.tar.gz: 5e4ecc05a81f62637333b4b8a53c669b292c539e797c1012819f665851cd641c4111c701072b58c1873643fec1f4a0dc290461cc90063bf36659e1c645302dba

data/lib/jruby_art.rb

@@ -1,9 +1,9 @@
-# Ruby-Processing is for Code Art.
+# JRubyArt is for Code Art.
 # Send suggestions, ideas, and hate-mail to mamba2928 [at] gmail.com
 # Also, send samples and libraries.
-unless defined? RP5_ROOT
+unless defined? K9_ROOT
   $LOAD_PATH << File.expand_path(File.dirname(__FILE__))
-  RP5_ROOT = File.expand_path(File.dirname(__FILE__) + '/../')
+  K9_ROOT = File.expand_path(File.dirname(__FILE__) + '/../')
 end
 
 SKETCH_ROOT ||= Dir.pwd
@@ -12,14 +12,7 @@ require 'jruby_art/version'
 require 'jruby_art/helpers/numeric'
 require 'jruby_art/helpers/range'
 
-# The top-level namespace, a home for all Ruby-Processing classes.
+# The top-level namespace, a home for all JRubyArt classes.
 module Processing
-
-  # 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 was slated for possible removal by ruby-2.2 never happened
-  autoload :App,                  'jruby_art/app'
-  autoload :Runner,               'jruby_art/runner'
-  autoload :Watcher,              'jruby_art/runners/watch'
+  require 'jruby_art/runner'
 end

data/lib/jruby_art/app.rb

@@ -7,15 +7,18 @@ require_relative '../jruby_art/config'
 
 # A wrapper module for the processing App
 module Processing
+  Dir[format("%s/core/library/\*.jar", RP_CONFIG['PROCESSING_ROOT'])].each do |jar| 
+    require jar unless jar =~ /native/
+  end
   # Include some core processing classes that we'd like to use:
   include_package 'processing.core'
   # Load vecmath and fastmath modules
-  Java::ProcessingVecmathArcball::ArcballLibrary.new.load(JRuby.runtime, false)
-  Java::ProcessingVecmathVec2::Vec2Library.new.load(JRuby.runtime, false)
-  Java::ProcessingVecmathVec3::Vec3Library.new.load(JRuby.runtime, false)
-  Java::ProcessingFastmath::DeglutLibrary.new.load(JRuby.runtime, false)
-  AppRender ||= Java::ProcessingVecmath::AppRender
-  ShapeRender ||= Java::ProcessingVecmath::ShapeRender
+  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::MonkstoneFastmath::DeglutLibrary.new.load(JRuby.runtime, false)
+  AppRender ||= Java::MonkstoneVecmath::AppRender
+  ShapeRender ||= Java::MonkstoneVecmath::ShapeRender
 
   # Watch the definition of these methods, to make sure
   # that Processing is able to call them during events.

data/lib/jruby_art/library_loader.rb

@@ -1,4 +1,6 @@
-# Then processing wrapper module
+# The processing wrapper module
+require_relative '../jruby_art'
+
 module Processing
 
   # Encapsulate library loader functionality as a class
@@ -19,7 +21,7 @@ module Processing
     # Usage: load_libraries :opengl, :boids
     #
     # 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.
+    # be used instead of the library that ships with JRubyArt.
     def load_libraries(*args)
       message = 'no such file to load -- %s'
       args.each do |lib|
@@ -101,8 +103,8 @@ module Processing
       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}",
+        "#{K9_ROOT}/library/#{library_name}/library",
+        "#{K9_ROOT}/library/#{library_name}",
         "#{@sketchbook_library_path}/#{library_name}/library"
         ].each do |jpath|
           if File.exist?(jpath) && !Dir.glob(format('%s/*.%s', jpath, ext)).empty?

data/lib/jruby_art/runner.rb

@@ -12,7 +12,7 @@ module Processing
     HELP_MESSAGE ||= <<-EOS
     Version: #{JRubyArt::VERSION}
 
-    Ruby-Processing is a little shim between Processing and JRuby that helps
+    JRubyArt is a little shim between Processing and JRuby that helps
     you create sketches of code art.
 
     Usage:
@@ -110,18 +110,18 @@ module Processing
       proc_root = FileTest.exist?("#{ENV['HOME']}/.jruby_art/config.yml")
       case choice
       when /check/
-        check(proc_root, FileTest.exist?("#{RP5_ROOT}/lib/ruby/jruby-complete.jar"))
+        check(proc_root, FileTest.exist?("#{K9_ROOT}/lib/ruby/jruby-complete.jar"))
       when /install/
         install(proc_root)
       when /unpack_samples/
-        system "cd #{RP5_ROOT}/vendors && rake unpack_samples"
+        system "cd #{K9_ROOT}/vendors && rake unpack_samples"
       else
         puts 'Usage: k9 setup [check | install | unpack_samples]'
       end
     end
 
     def install(root_exist)
-      system "cd #{RP5_ROOT}/vendors && rake"
+      system "cd #{K9_ROOT}/vendors && rake"
       return if root_exist
       set_processing_root
       warn 'PROCESSING_ROOT set optimistically, run check to confirm'
@@ -141,7 +141,7 @@ module Processing
       puts "  jruby-complete installed = #{installed}"
     end
 
-    # Display the current version of Ruby-Processing.
+    # Display the current version of JRubyArt.
     def show_version
       puts format('JRubyArt version %s', JRubyArt::VERSION)
     end
@@ -153,10 +153,6 @@ 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
     # installed version of jruby is used instead of our vendored jarred one
@@ -164,16 +160,14 @@ module Processing
     # jruby-complete by default set JRUBY: false in ~/.k9rc config
     # (but that will make using other gems in your sketches hard....)
     def spin_up(starter_script, sketch, args)
-      runner = "#{RP5_ROOT}/lib/jruby_art/runners/#{starter_script}"
-      warn('The --jruby flag is no longer required') if @options.jruby
+      runner = "#{K9_ROOT}/lib/jruby_art/runners/#{starter_script}"
       @options.nojruby = true if Processing::RP_CONFIG['JRUBY'] == 'false'
       java_args = discover_java_args(sketch)
       if @options.nojruby
-        classpath = jruby_complete + core_classpath
         command = ['java',
                    java_args,
                    '-cp',
-                   classpath.join(path_separator),
+                   jruby_complete,
                    'org.jruby.Main',
                    runner,
                    sketch,
@@ -181,8 +175,6 @@ module Processing
       else
         command = ['jruby',
                    java_args,
-                   '-J-cp',
-                   core_classpath.join(path_separator),
                    runner,
                    sketch,
                    args].flatten
@@ -190,14 +182,10 @@ module Processing
       begin
         exec(*command)
         # exec replaces the Ruby process with the JRuby one.
-      rescue Java::JavaLang::ClassNotFoundExcetion
+      rescue Java::JavaLang::ClassNotFoundException
       end
     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
     # add them to a java_args.txt in your data directory next to your sketch.
@@ -221,11 +209,19 @@ module Processing
     end
 
     def jruby_complete
-      rcomplete = File.join(RP5_ROOT, 'lib/ruby/jruby-complete.jar')
+      rcomplete = File.join(K9_ROOT, 'lib/ruby/jruby-complete.jar')
       return [rcomplete] if FileTest.exist?(rcomplete)
       warn "#{rcomplete} does not exist\nTry running `k9 setup install`"
       exit
     end
+    
+    def libraries
+      %w(video sound).map { |library| sketchbook_library(library) }.flatten
+    end
+    
+    def sketchbook_library(name)
+      Dir["#{Processing::RP_CONFIG['sketchbook_path']}/libraries/#{name}/library/\*.jar"]
+    end
 
     def host_os
       detect_os = RbConfig::CONFIG['host_os']
@@ -249,7 +245,7 @@ module Processing
       if os == :mac
         data['PROCESSING_ROOT'] = '/Applications/Processing.app/Contents/Java'
       else
-        root = "#{ENV['HOME']}/processing-3.0a10"
+        root = "#{ENV['HOME']}/processing-3.0a11"
         data['PROCESSING_ROOT'] = root
       end
       data['JRUBY'] = 'true'
@@ -261,8 +257,8 @@ module Processing
       @os ||= host_os
       icon = []
       if os == :mac
-        icon << '-Xdock:name=Ruby-Processing'
-        icon << "-Xdock:icon=#{RP5_ROOT}/lib/templates/application/Contents/Resources/sketch.icns"
+        icon << '-Xdock:name=JRubyArt'
+        icon << "-Xdock:icon=#{K9_ROOT}/lib/templates/application/Contents/Resources/sketch.icns"
       end
       icon
     end

data/lib/jruby_art/runners/base.rb

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

data/lib/jruby_art/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/jruby_art/runners/watch.rb

@@ -1,4 +1,4 @@
-require_relative '../runners/base'
+require_relative 'base'
 
 module Processing
   # A sketch loader, observer, and reloader, to tighten
@@ -12,7 +12,7 @@ module Processing
       start_watching
     end
 
-    # Kicks off a thread to watch the sketch, reloading Ruby-Processing
+    # Kicks off a thread to watch the sketch, reloading JRubyArt
     # and restarting the sketch whenever it changes.
     def start_watching
       start_runner

data/lib/jruby_art/version.rb

@@ -1,3 +1,3 @@
 module JRubyArt
-  VERSION = '0.3.1.pre'
+  VERSION = '0.4.0'
 end

data/library/library_proxy/library_proxy.rb

@@ -1,6 +1,6 @@
 # require '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/video_event/video_event.rb

@@ -1,4 +1,3 @@
-
 class Processing::App
-  include Java::ProcessingCore::VideoInterface
+  include Java::MonkstoneVideoevent::VideoInterface
 end

data/vendors/Rakefile

@@ -8,8 +8,8 @@ WARNING = <<-EOS
       
 EOS
 
-JRUBYC_VERSION     = '9.0.0.0.rc2'
-EXAMPLES           = '0.2'
+JRUBYC_VERSION     = '9.0.0.0'
+EXAMPLES           = '0.4'
 HOME_DIR = ENV['HOME']
 MAC_OR_LINUX = /linux|mac|darwin/ =~ RbConfig::CONFIG['host_os'] 
 
@@ -27,7 +27,7 @@ file "jruby-complete-#{JRUBYC_VERSION}.jar" do
   rescue
     warn(WARNING)
   end
-  check_sha1("jruby-complete-#{JRUBYC_VERSION}.jar", "3c490d1b621db41709e0d093ab36585a50604dfd")
+  check_sha1("jruby-complete-#{JRUBYC_VERSION}.jar", "2479278bdd92d85ca37c5d45a4ec4745c50dfccb")
 end
 
 directory "../lib/ruby"
@@ -77,5 +77,5 @@ task :copy_examples => file_name do
   end
   sh "rm -r #{HOME_DIR}/k9_samples" if File.exist? "#{HOME_DIR}/k9_samples"
   sh "cp -r samples4ruby-processing3-#{EXAMPLES} #{HOME_DIR}/k9_samples"  
-  sh "rm -r samples4ruby-processing3-#{EXAMPLES} #{HOME_DIR}/k9_samples"
+  sh "rm -r samples4ruby-processing3-#{EXAMPLES}"
 end  

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: jruby_art
 version: !ruby/object:Gem::Version
-  version: 0.3.1.pre
+  version: 0.4.0
 platform: ruby
 authors:
 - Jeremy Ashkenas
@@ -10,12 +10,12 @@ authors:
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2015-07-09 00:00:00.000000000 Z
+date: 2015-07-25 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
@@ -23,13 +23,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
@@ -37,13 +37,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
@@ -51,13 +51,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
@@ -65,12 +65,12 @@ dependencies:
   type: :development
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: '5.3'
 description: |2
     JRubyArt is a ruby wrapper for the processing art framework.
-    The current version supports processing-3.0a10, and uses jruby-9.0.0.0.rc2
+    The current version supports processing-3.0a11, and uses jruby-9.0.0.0
     as the glue between ruby and java. You can use both processing libraries and ruby
     gems in your sketches. Features create/run/watch modes. The "watch" mode,
     provides a nice REPL-ish way to work on your processing sketches. Includes:-
@@ -116,18 +116,18 @@ require_paths:
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
-  - - '>='
+  - - ">="
     - !ruby/object:Gem::Version
       version: '2.1'
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
-  - - '>'
+  - - ">="
     - !ruby/object:Gem::Version
-      version: 1.3.1
+      version: '0'
 requirements:
 - A decent graphics card
 - java runtime >= 1.8+
-- processing = 3.0a10+
+- processing = 3.0a11+
 rubyforge_project:
 rubygems_version: 2.4.8
 signing_key: