jruby_art 1.2.5 → 1.2.6

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: d1b91cea8de9bdd46bff4b9d7f87eb566d37db6a
-  data.tar.gz: 5acbc932e3a7b9ba2fc4dbbe11a83145eec1aa18
+  metadata.gz: 78fe78d9b4fc7d9ed32a9334a6c476018c8e605c
+  data.tar.gz: d9d3a711138cdb6e0dc0e1fe44522f68bed34003
 SHA512:
-  metadata.gz: 2dee4798bfb73b5c99c2884747bb855fc38cbd22a67b5fe9200d695229e85509841b2d6f06c276e434c9e1ed50d2171711a42c5a04258c674e396afd8df65ae6
-  data.tar.gz: 60ca9549ffa124cdf2d695f7539e7aaf2709986f715f303c2ddae395fc5a45b4728af4e3c10c5f49f891058d77c6aee56f20f1a05108fec0c0e44e8dd1db5c5a
+  metadata.gz: 845ddebe3786fec96a9dc18a89f19c2ca8b35ac747754933871ecb6f9e0874cda1167bdfb8982778a1c5034fb11134b4dc2e06fe2c82115d5813d9a684287ef2
+  data.tar.gz: b95e566503b2ac46c9ee32908c10a135243338aad858faf364a45128f5973c7cacd6844f3d9b2a406481182af1ffa93ec2eddd924e3f01fa8b3f6f907c21d4cd

data/lib/jruby_art.rb

@@ -1,4 +1,4 @@
-# frozen_string_literal: false
+# frozen_string_literal: true
 # JRubyArt is for Code Art.
 # Send suggestions, ideas, and hate-mail to mamba2928 [at] gmail.com
 # Also, send samples and libraries.

data/lib/jruby_art/app.rb

@@ -1,5 +1,4 @@
 # frozen_string_literal: false
-
 require 'java'
 require_relative '../rpextras'
 require_relative '../jruby_art/helper_methods'
@@ -31,7 +30,7 @@ module Processing
     key_pressed: :keyPressed,
     key_released: :keyReleased,
     key_typed: :keyTyped
-  }
+  }.freeze
   # All sketches extend this class
   class App < PApplet
     include HelperMethods, Math, MathTool, Render
@@ -87,7 +86,7 @@ module Processing
     def library_loaded?(library_name)
       self.class.library_loaded?(library_name)
     end
-   
+
     # Since processing-3.0 you should prefer setting the sketch width and
     # height and renderer using the size method in the settings loop of the
     # sketch (as with vanilla processing) but is hidden see created java.
@@ -108,7 +107,7 @@ module Processing
       # NB: this is the processing runSketch() method as used by processing.py
       run_sketch
     end
-    
+
     def size(*args)
       w, h, mode = *args
       @width ||= w
@@ -129,8 +128,8 @@ module Processing
 
     def data_path(dat)
       dat_root = File.join(SKETCH_ROOT, 'data')
-      Dir.mkdir(dat_root) unless File.exist?(dat_root)    
-      File.join(dat_root, dat)	    
+      Dir.mkdir(dat_root) unless File.exist?(dat_root)
+      File.join(dat_root, dat)
     end
 
     def sketch_size(x, y)
@@ -181,8 +180,8 @@ module Processing
     def import_opengl
       # Include processing opengl classes that we'd like to use:
       %w(FontTexture FrameBuffer LinePath LineStroker PGL
-      PGraphics2D PGraphics3D PGraphicsOpenGL PShader
-      PShapeOpenGL Texture).each do |klass|
+         PGraphics2D PGraphics3D PGraphicsOpenGL PShader
+         PShapeOpenGL Texture).each do |klass|
         java_import format('processing.opengl.%s', klass)
       end
     end

data/lib/jruby_art/config.rb

@@ -1,4 +1,3 @@
-# encoding: utf-8
 # frozen_string_literal: false
 
 require 'yaml'
@@ -9,7 +8,7 @@ module Processing
     config_path = '~/.jruby_art/config.yml'
     begin
       CONFIG_FILE_PATH = File.expand_path(config_path)
-      RP_CONFIG = (YAML.load_file(CONFIG_FILE_PATH))
+      RP_CONFIG = YAML.load_file(CONFIG_FILE_PATH)
     rescue
       warn(format('WARN: you need to set PROCESSING_ROOT in %s', config_path))
     end

data/lib/jruby_art/helper_methods.rb

@@ -181,7 +181,7 @@ module Processing
 
     private
 
-    FIXNUM_COL = -> (x) { x.is_a?(Fixnum) }
+    FIXNUM_COL = -> (x) { x.is_a?(Integer) } 
     STRING_COL = -> (x) { x.is_a?(String) }
     FLOAT_COL = -> (x) { x.is_a?(Float) }
     # parse single argument color int/double/String

data/lib/jruby_art/helpers/aabb.rb

@@ -1,6 +1,4 @@
-# encoding: utf-8
-# frozen_string_literal: false
-
+# frozen_string_literal: true
 # Axis aligned bounding box class (AABB would clash with Toxicgem)
 class AaBb
   attr_reader :center, :extent

data/lib/jruby_art/helpers/numeric.rb

@@ -1,5 +1,4 @@
-# encoding: utf-8
-# frozen_string_literal: false
+# frozen_string_literal: true
 # Re-open Numeric so that we can do simple degree and radian conversions
 # conversion factors are 180 / Math::PI and Math::PI / 180
 

data/lib/jruby_art/installer.rb

@@ -1,7 +1,7 @@
 # frozen_string_literal: false
 require 'yaml'
 
-VERSION = '3.2.1'.freeze # processing version
+VERSION = '3.2.3'.freeze # processing version
 
 # Abstract Installer class
 class Installer
@@ -84,7 +84,7 @@ class UnpackSamples < Installer
 end
 
 # JRuby-Complete installer
-class JRubyComplete < Installer
+class JRubyCompleteInstall < Installer
   def install
     system "cd #{gem_root}/vendors && rake"
     return if root_exist?

data/lib/jruby_art/jruby_complete.rb

@@ -0,0 +1,9 @@
+# frozen_string_literal: true
+class JRubyComplete
+  def self.complete
+    rcomplete = File.join(K9_ROOT, 'lib/ruby/jruby-complete.jar')
+    return [rcomplete] if FileTest.exist?(rcomplete)
+    warn "#{rcomplete} does not exist\nTry running `k9 --install`"
+    exit
+  end
+end

data/lib/jruby_art/launcher.rb

@@ -0,0 +1,41 @@
+# frozen_string_literal: true
+require_relative '../jruby_art/jruby_complete'
+require_relative '../jruby_art/java_opts'
+module Processing
+  # The command class check for configuration and options, before creating and
+  # executing the jruby (or java) command to run the sketch
+  class Launcher
+    attr_reader :runner, :args, :filename
+    def initialize(runner:, args:, filename:)
+      @runner = runner
+      @args = args
+      @filename = filename
+    end
+
+    # Trade in this Ruby instance for a JRuby instance, loading in a starter
+    # script and passing it some arguments. Unless you set JRUBY: false in
+    # ~/.jruby_art/config.yml, an installed version of jruby is used instead
+    # of our vendored one. Note the use of jruby-complete might make using
+    # other gems in your sketches hard (but not impossible)....
+    def cmd(root)
+      cmda = jruby_command(root)
+      begin
+        exec(*cmda)
+        # exec replaces the Ruby process with the JRuby one.
+      rescue Java::JavaLang::ClassNotFoundException
+      end
+    end
+
+    private
+
+    # avoiding multiline ternary etc
+    def jruby_command(root)
+      installed = Processing::RP_CONFIG.fetch('JRUBY', true)
+      opts = JRubyOpts.new(root).opts
+      return ['jruby', opts, runner, filename, args].flatten if installed
+      opts = JavaOpts.new(root).opts
+      complete = JRubyComplete.complete
+      ['java', opts, '-cp', complete, 'org.jruby.Main', runner, filename, args].flatten
+    end
+  end
+end

data/lib/jruby_art/library_loader.rb

@@ -1,4 +1,3 @@
-# encoding: utf-8
 # frozen_string_literal: false
 
 require_relative '../jruby_art'
@@ -29,10 +28,10 @@ module Processing
       message = 'no such file to load -- %s'
       args.each do |lib|
         loaded = load_ruby_library(lib) || load_java_library(lib)
-        fail(LoadError.new, format(message, lib)) unless loaded
+        raise(LoadError.new, format(message, lib)) unless loaded
       end
     end
-    alias_method :load_library, :load_libraries
+    alias load_library load_libraries
 
     # For pure ruby libraries.
     # The library should have an initialization ruby file
@@ -83,7 +82,7 @@ module Processing
     end
 
     def get_platform_specific_library_paths(basename)
-      # for MacOSX, but does this even work, or does Mac return '64'?
+      # for MacOS, 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')
@@ -118,6 +117,6 @@ module Processing
         end
       end
       nil
-    end    
+    end
   end
 end

data/lib/jruby_art/runner.rb

@@ -6,7 +6,7 @@ require 'rbconfig'
 require_relative '../jruby_art/config'
 require_relative '../jruby_art/version'
 require_relative '../jruby_art/java_opts'
-
+require_relative '../jruby_art/launcher'
 # processing wrapper module
 module Processing
   # Utility class to handle the different commands that the 'k9' command
@@ -136,7 +136,7 @@ module Processing
 
     def install
       require_relative '../jruby_art/installer'
-      JRubyComplete.new(K9_ROOT, host_os).install
+      JRubyCompleteInstall.new(K9_ROOT, host_os).install
       UnpackSamples.new(K9_ROOT, host_os).install
     end
 
@@ -156,42 +156,23 @@ module Processing
 
     private
 
-    # Trade in this Ruby instance for a JRuby instance, loading in a starter
-    # script and passing it some arguments. Unless you set JRUBY: false in
-    # ~/.jruby_art/config.yml, an installed version of jruby is used instead
-    # of our vendored one. Note the use of jruby-complete might make using
-    # other gems in your sketches hard (but not impossible)....
+    # We now build and execute the command arguments in the Launcher class.
+    # Here we only need to supply the starter script, filename and args if any,
+    # the Launcher class checks config (is executable java or jruby?)
+    # and for any options in java_args.txt or config
     def spin_up(starter_script, filename, argc)
-      runner = "#{K9_ROOT}/lib/jruby_art/runners/#{starter_script}"
-      if Processing::RP_CONFIG.fetch('JRUBY', true)
-        opts = JRubyOpts.new(SKETCH_ROOT).opts
-        command = ['jruby',
-                   opts,
-                   runner,
-                   filename,
-                   argc].flatten
-      else
-        opts = JavaOpts.new(SKETCH_ROOT).opts
-        command = ['java',
-                   opts,
-                   '-cp',
-                   jruby_complete,
-                   'org.jruby.Main',
-                   runner,
-                   filename,
-                   argc].flatten
-      end
-      begin
-        exec(*command)
-        # exec replaces the Ruby process with the JRuby one.
-      rescue Java::JavaLang::ClassNotFoundException
-      end
+      launch = Launcher.new(
+        runner: "#{K9_ROOT}/lib/jruby_art/runners/#{starter_script}",
+        args: argc,
+        filename: filename
+      )
+      launch.cmd(SKETCH_ROOT)
     end
 
     # NB: We really do mean to use 'and' not '&&' for flow control purposes
 
     def ensure_exists(filename)
-      puts "Couldn't find: #{filename}" and exit unless FileTest.exist?(filename)
+      puts("Couldn't find: #{filename}") and exit unless FileTest.exist?(filename)
     end
 
     def jruby_complete

data/lib/jruby_art/runners/base.rb

@@ -1,6 +1,4 @@
-# encoding: utf-8
-# frozen_string_literal: false
-
+# frozen_string_literal: true
 SKETCH_PATH ||= ARGV.shift
 SKETCH_ROOT ||= File.absolute_path(File.dirname(SKETCH_PATH))
 
@@ -10,13 +8,13 @@ require_relative '../app'
 # More processing module
 module Processing
   # For use with "bare" sketches that don't want to define a class or methods
-  BARE_WRAP = <<-EOS
+  BARE_WRAP = <<-EOS.freeze
   class Sketch < Processing::App
     %s
   end
   EOS
 
-  NAKED_WRAP = <<-EOS
+  NAKED_WRAP = <<-EOS.freeze
   class Sketch < Processing::App
     def setup
       sketch_title 'Nude Sketch'

data/lib/jruby_art/runners/live.rb

@@ -1,4 +1,3 @@
-# encoding: utf-8
 # frozen_string_literal: false
 # A pry shell for live coding.
 # Will start with your sketch.
@@ -8,11 +7,11 @@ Processing.load_and_run_sketch
 class PryException < StandardError
 end
 
-MESSAGE = "You need to 'jruby -S gem install pry' for 'live' mode"
+MESSAGE = "You need to 'jruby -S gem install pry' for 'live' mode".freeze
 
 if Gem::Specification.find_all_by_name('pry').any?
   require 'pry'
   $app.pry
 else
-  fail(PryException.new, MESSAGE)
+  raise(PryException.new, MESSAGE)
 end

data/lib/jruby_art/runners/run.rb

@@ -1,5 +1,4 @@
-# encoding: utf-8
-# frozen_string_literal: false
+# frozen_string_literal: true
 require_relative 'base'
 
 Processing.load_and_run_sketch

data/lib/jruby_art/runners/watch.rb

@@ -1,4 +1,3 @@
-# encoding: utf-8
 # frozen_string_literal: false
 require_relative 'base'
 require_relative '../config'
@@ -11,7 +10,7 @@ module Processing
   # the feedback between code and effect.
   class Watcher
     # Sic a new Processing::Watcher on the sketch
-    WATCH_MESSAGE ||= <<-EOS
+    WATCH_MESSAGE ||= <<-EOS.freeze
     Warning:
     To protect you from running watch mode in a top level
     directory with lots of nested ruby or GLSL files we
@@ -54,7 +53,7 @@ module Processing
       warn format(wformat, File.basename(SKETCH_PATH))
       puts format(tformat, e.backtrace.join("\n\t"))
     end
-    
+
     def start_original
       @runner = Thread.start do
         report_errors do

data/lib/jruby_art/version.rb

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

data/library/library_proxy/library_proxy.rb

@@ -1,5 +1,3 @@
-# require 'rpextras'
-#@todo fix how we call Library Proxy
 java_import Java::MonkstoneCore::LibraryProxy
 
 

data/vendors/Rakefile

@@ -1,6 +1,6 @@
 require 'rake/clean'
 
-WARNING = <<-EOS
+WARNING = <<-EOS.freeze
    WARNING: you may not have wget installed, you could just download
    the correct version of jruby-complete to the vendors folder, and
    re-run k9 setup install instead of installing wget. Some systems
@@ -8,8 +8,8 @@ WARNING = <<-EOS
 
 EOS
 
-JRUBYC_VERSION     = '9.1.5.0'
-EXAMPLES           = '1.6'
+JRUBYC_VERSION     = '9.1.6.0'
+EXAMPLES           = '1.7'
 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_sha256("jruby-complete-#{JRUBYC_VERSION}.jar", "7711fe1d09bb98727a43f5aaef5ea3a205500568bc2fa718cb7ef77dd3800519")
+  check_sha256("jruby-complete-#{JRUBYC_VERSION}.jar", "2a45c5f24deb538343c3a9b9a3b29bbeb11fa9d91cf8649271bd07d2e1aa28cb")
 end
 
 directory "../lib/ruby"

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: jruby_art
 version: !ruby/object:Gem::Version
-  version: 1.2.5
+  version: 1.2.6
 platform: ruby
 authors:
 - Jeremy Ashkenas
@@ -10,7 +10,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-10-18 00:00:00.000000000 Z
+date: 2016-11-12 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rake
@@ -61,6 +61,8 @@ files:
 - lib/jruby_art/helpers/numeric.rb
 - lib/jruby_art/installer.rb
 - lib/jruby_art/java_opts.rb
+- lib/jruby_art/jruby_complete.rb
+- lib/jruby_art/launcher.rb
 - lib/jruby_art/library_loader.rb
 - lib/jruby_art/runner.rb
 - lib/jruby_art/runners/base.rb
@@ -98,7 +100,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements:
 - A decent graphics card
-- java runtime >= 1.8.0_102+
+- java runtime >= 1.8.0_111+
 - processing = 3.2.1+
 rubyforge_project: 
 rubygems_version: 2.6.3