jruby_art 1.2.7 → 1.2.8

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 4da6eeb261a073b3c3f6112d128ec968be2ac318
-  data.tar.gz: 58976723ac243d117a2fa73bc2629c6181b77c39
+  metadata.gz: ebf4e0e9543d34a691190a32b124c92c83acb263
+  data.tar.gz: 5f5c169933e317f65d1efeffa9fcdc8086c83c01
 SHA512:
-  metadata.gz: fccd6b7fd496ca222f3bb42407df58b727ea07005cfe2ee2c4cbd3bfda38ae44ac4f23c88f75a90c9babf72e2df1fbad2d8976f1f55960085a9b5523d88d71bc
-  data.tar.gz: f3b67a676d082efdde7795b57beef2af35f56a13435f2708169570959c2080dfd4d52abb271e928b2ae8ec33ff9a8a916380122a1b6164311ad23a7c95d31d43
+  metadata.gz: '091a86a696a90c174d5c8d506adc2f656bfaf4ed473b19fa55f9da8d2faa320b47ab3e07e0be44d38f910df603bbd4b8203b2036c3a2d993fd12e056285cc2ec'
+  data.tar.gz: 8d3861eb7bcb6f8105b97c36536805738c346aae8e7c7ecd4145ba28793b13cbcf3b7cf341699f085ef05dcf1a6a4f1831a77f83f921f6b589784484477bfe22

data/lib/jruby_art/app.rb

@@ -1,3 +1,4 @@
+
 # frozen_string_literal: false
 require 'java'
 require_relative '../rpextras'
@@ -55,10 +56,10 @@ module Processing
 
     class << self
       # Handy getters and setters on the class go here:
-      attr_accessor :sketch_class, :library_loader
+      attr_reader :sketch_class, :library_loader
 
       def load_libraries(*args)
-        library_loader ||= LibraryLoader.new
+        @library_loader ||= LibraryLoader.new
         library_loader.load_library(*args)
       end
       alias load_library load_libraries
@@ -93,9 +94,10 @@ module Processing
     # Options are no longer relevant, define post_initialize method to use
     # custom options (see Sandi Metz POODR)
 
-    def initialize
+    def initialize(options = {})
       super()
       $app = self
+      post_initialize(options)
       proxy_java_fields
       mix_proxy_into_inner_classes
       java.lang.Thread.default_uncaught_exception_handler = proc do |_thread_, exception|
@@ -121,8 +123,8 @@ module Processing
       surface.set_title(title)
     end
 
-    def sketch_path(spath = nil)
-      return super() if spath.nil?
+    def sketch_path(spath = '')
+      return super() if spath.empty?
       super(spath)
     end
 

data/lib/jruby_art/config.rb

@@ -13,4 +13,42 @@ module Processing
       warn(format('WARN: you need to set PROCESSING_ROOT in %s', config_path))
     end
   end
+
+  WIN_PATTERNS = [
+    /bccwin/i,
+    /cygwin/i,
+    /djgpp/i,
+    /ming/i,
+    /mswin/i,
+    /wince/i
+  ].freeze
+
+  # This class knows about supported JRubyArt operating systems
+  class HostOS
+    def self.os
+      detect_os = RbConfig::CONFIG['host_os']
+      case detect_os
+      when /mac|darwin/ then :mac
+      when /linux/ then :linux
+      when /solaris|bsd/ then :unix
+      else
+        WIN_PATTERNS.find { |reg| detect_os =~ reg }
+        raise "unsupported os: #{detect_os.inspect}" if Regexp.last_match.nil?
+        :windows
+      end
+    end
+  end
+
+  OS ||= HostOS.os
+end
+
+# This class encapulates knowledge of processing sketchbook structure
+class Sketchbook
+  def self.path
+    File.join(Processing::RP_CONFIG['sketchbook_path'], 'libraries')
+  end
+
+  def self.library(name)
+    Dir["#{path}/#{name}/library/\*.jar"]
+  end
 end

data/lib/jruby_art/installer.rb

@@ -31,13 +31,13 @@ class Installer
   end
 
   def root_exist?
-    return false if config.nil?
+    return false if config.empty?
     File.exist? config['PROCESSING_ROOT']
   end
 
   def config
     k9config = File.expand_path("#{home}/.jruby_art/config.yml")
-    return nil unless File.exist? k9config
+    return '' unless File.exist? k9config
     YAML.load_file(k9config)
   end
 

data/lib/jruby_art/library_loader.rb

@@ -109,7 +109,7 @@ module Processing
           "#{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"
+	  "#{Sketchbook.path}/#{library_name}/library"
         ].each do |jpath|
           if File.exist?(jpath) && !Dir.glob(format('%s/*.%s', jpath, ext)).empty?
             return jpath

data/lib/jruby_art/runner.rb

@@ -136,13 +136,13 @@ module Processing
 
     def install
       require_relative '../jruby_art/installer'
-      JRubyCompleteInstall.new(K9_ROOT, host_os).install
-      UnpackSamples.new(K9_ROOT, host_os).install
+      JRubyCompleteInstall.new(K9_ROOT, OS).install
+      UnpackSamples.new(K9_ROOT, OS).install
     end
 
     def check
       require_relative '../jruby_art/installer'
-      Check.new(K9_ROOT, host_os).install
+      Check.new(K9_ROOT, OS).install
     end
 
     # Show the standard help/usage message.
@@ -183,24 +183,7 @@ module Processing
     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']
-      case detect_os
-      when /mac|darwin/ then :mac
-      when /linux/ then :linux
-      when /solaris|bsd/ then :unix
-      else
-        WIN_PATTERNS.find { |r| detect_os =~ r }
-        raise "unknown os: #{detect_os.inspect}" if Regexp.last_match.nil?
-        :windows
-      end
+      %w(video sound).map { |library| Sketchbook.library(library) }.flatten
     end
   end # class Runner
 end # module Processing

data/lib/jruby_art/version.rb

@@ -1,5 +1,5 @@
 # frozen_string_literal: true
 # A wrapper for version
 module JRubyArt
-  VERSION = '1.2.7'.freeze
+  VERSION = '1.2.8'.freeze
 end

data/vendors/Rakefile

@@ -9,7 +9,7 @@ WARNING = <<-EOS.freeze
 EOS
 
 JRUBYC_VERSION     = '9.1.7.0'
-EXAMPLES           = '1.8'
+EXAMPLES           = '1.9'
 HOME_DIR = ENV['HOME']
 MAC_OR_LINUX = /linux|mac|darwin/ =~ RbConfig::CONFIG['host_os']
 

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: jruby_art
 version: !ruby/object:Gem::Version
-  version: 1.2.7
+  version: 1.2.8
 platform: ruby
 authors:
 - Jeremy Ashkenas
@@ -10,7 +10,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2017-01-12 00:00:00.000000000 Z
+date: 2017-01-31 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rake
@@ -101,7 +101,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
 requirements:
 - A decent graphics card
 - java runtime >= 1.8.0_111+
-- processing = 3.2.1+
+- processing = 3.2.4+
 rubyforge_project: 
 rubygems_version: 2.6.8
 signing_key: