jruby_art 1.0.1 → 1.0.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: e92b1c57e195448c0318778dea7e979c92298158
-  data.tar.gz: 7f1c4de33b5bb59c8e70365bee02ad806c687969
+  metadata.gz: 48d37b040cb7e365cbf1d094c67d9d919842963e
+  data.tar.gz: 166054a0b6e271e12fc13472f514dc3df6ddc875
 SHA512:
-  metadata.gz: 3ab55691fef0923dd6b89df0f71d9e7c7dc21ab80b4d45e29c84b01826a31df7835f6fa8d404965c748e33ad658ccd215bfd4e6375347f9a5e7ca8ad8168a344
-  data.tar.gz: 8641fee1460310e3ffb6810171a341504ed08d537dc4300968f432fc26b1f64f349e1a3b9ab5a3aa1981d6392bb8fd031da4b130bc4c1ea6cd10a8a22287f371
+  metadata.gz: 9f5e7ab20d51a274f5b6cb2b9261ab3ff6c1ab53efc7265d1ee915edfb5f3e1a64a846d3216232b762af2d7d6b7877218111c1ee02f766d4d4455ffa0540a428
+  data.tar.gz: 9e789af265ac0219e29abd05a03f8d0e61e3867d78e993a5f10fe3b2ff34c26daa21333f04a6fe599d785c4608edd10e9cb55e57e0df11e04053f609c0dcb9e0

data/lib/jruby_art/app.rb

@@ -19,9 +19,10 @@ module Processing
   Java::MonkstoneVecmathVec3::Vec3Library.load(JRuby.runtime)
   Java::MonkstoneFastmath::DeglutLibrary.load(JRuby.runtime)
   Java::Monkstone::MathToolLibrary.load(JRuby.runtime)
-  AppRender ||= Java::MonkstoneVecmath::AppRender
-  ShapeRender ||= Java::MonkstoneVecmath::ShapeRender
-
+  module Render
+    java_import 'monkstone.vecmath.AppRender'
+    java_import 'monkstone.vecmath.ShapeRender'
+  end
   # Watch the definition of these methods, to make sure
   # that Processing is able to call them during events.
   METHODS_TO_ALIAS ||= {
@@ -36,7 +37,7 @@ module Processing
   }
   # All sketches extend this class
   class App < PApplet
-    include HelperMethods, Math, MathTool
+    include HelperMethods, Math, MathTool, Render
     # Alias some methods for familiarity for Shoes coders.
     # surface replaces :frame, but needs field_reader for access
     alias_method :oval, :ellipse

data/lib/jruby_art/library_loader.rb

@@ -80,7 +80,8 @@ module Processing
     end
 
     def get_platform_specific_library_paths(basename)
-      bits = 'universal'  # for MacOSX, but does this even work, or does Mac return '64'?
+      # for MacOSX, but does this even work, or does Mac return '64'?
+      bits = 'universal'
       if java.lang.System.getProperty('sun.arch.data.model') == '32' ||
         java.lang.System.getProperty('java.vm.name').index('32')
         bits = '32'
@@ -101,11 +102,12 @@ 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",
-        "#{K9_ROOT}/library/#{library_name}/library",
-        "#{K9_ROOT}/library/#{library_name}",
-        "#{@sketchbook_library_path}/#{library_name}/library"
+        [
+          "#{SKETCH_ROOT}/library/#{library_name}",
+          "#{Processing::RP_CONFIG['PROCESSING_ROOT']}/modes/java/libraries/#{library_name}/library",
+          "#{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?
             return jpath
@@ -120,9 +122,11 @@ module Processing
       sketchbook_paths = []
       sketchbook_path = Processing::RP_CONFIG.fetch('sketchbook_path', false)
       return sketchbook_path if sketchbook_path
-      ["'Application Data/Processing'", 'AppData/Roaming/Processing',
-       'Library/Processing', 'Documents/Processing',
-       '.processing', 'sketchbook'].each do |prefix|
+      [
+        "'Application Data/Processing'", 'AppData/Roaming/Processing',
+        '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 FileTest.file?(pref_path)
@@ -131,7 +135,7 @@ module Processing
       return sketchbook_paths.first if preferences_paths.empty?
       lines = IO.readlines(preferences_paths.first)
       matchedline = lines.grep(/^sketchbook/).first
-      matchedline[/=(.+)/].gsub('=', '')
+      matchedline[/=(.+)/].delete('=')
     end
   end
 end

data/lib/jruby_art/version.rb

@@ -1,3 +1,3 @@
 module JRubyArt
-  VERSION = '1.0.1'
+  VERSION = '1.0.2'
 end

data/library/library_proxy/library_proxy.rb

@@ -1,10 +1,12 @@
 # require 'rpextras'
+#@todo fix how we call LIbrary Proxy
+java_import Java::MonkstoneCore::LibraryProxy
 
-LibraryProxy = Java::MonkstoneCore::AbstractLibrary
 
 # classes that inherit from Library are expected to implement
-# the abstract methods of processing.core.AbstractLibrary
+# the abstract methods of processing.core.LibraryProxy
 # def pre...
 # def draw...
 # def post...
 # NOOP is fine...
+# `app` can be called to get PApplet instance

data/vendors/Rakefile

@@ -9,7 +9,7 @@ WARNING = <<-EOS
 EOS
 
 JRUBYC_VERSION     = '9.0.4.0'
-EXAMPLES           = '1.1'
+EXAMPLES           = '1.2'
 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", "4f094b4b7915def9d1cd35ce69ee12c1f102c8b2")
+  check_sha256("jruby-complete-#{JRUBYC_VERSION}.jar", "3b87fc20a8e51e56632d6b0f7a00b5906f5ecd6c6642f9c189105307103220e8")
 end
 
 directory "../lib/ruby"
@@ -37,16 +37,16 @@ task :copy_ruby => ["../lib/ruby"] do
   sh "cp -v jruby-complete-#{JRUBYC_VERSION}.jar ../lib/ruby/jruby-complete.jar"
 end
 
-def check_sha1(filename, expected_hash)
-  require "digest/sha1"
-  sha1 = Digest::SHA1.new
+def check_sha256(filename, expected_hash)
+  require "digest/sha256"
+  sha256 = Digest::SHA256.new
   File.open(filename, "r") do |f|
     while buf = f.read(4096)
-      sha1.update(buf)
+      sha256.update(buf)
     end
   end
-  if sha1.hexdigest != expected_hash
-    raise "bad sha1 checksum for #{filename} (expected #{expected_hash} got #{sha1.hexdigest})"
+  if sha256.hexdigest != expected_hash
+    raise "bad sha256 checksum for #{filename} (expected #{expected_hash} got #{sha256.hexdigest})"
   end
 end
 

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: jruby_art
 version: !ruby/object:Gem::Version
-  version: 1.0.1
+  version: 1.0.2
 platform: ruby
 authors:
 - Jeremy Ashkenas
@@ -10,7 +10,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-11-17 00:00:00.000000000 Z
+date: 2015-12-15 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rake
@@ -40,6 +40,26 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: '5.8'
+- !ruby/object:Gem::Dependency
+  name: maven
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '3.3'
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: 3.3.3
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '3.3'
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: 3.3.3
 description: |2
     JRubyArt is a ruby wrapper for the processing art framework.
     The current version supports processing-3.0, and uses jruby-9.0.3.0
@@ -102,7 +122,6 @@ requirements:
 - A decent graphics card
 - java runtime >= 1.8+
 - processing = 3.0.1+
-- maven = 3.3.3
 rubyforge_project: 
 rubygems_version: 2.5.0
 signing_key: