jruby_art 1.7.0 → 2.0.0.pre

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: bf7e9cc088b896c579b6060d9de2339618e64c778841a7a3013ab524c717d4f7
-  data.tar.gz: efa2ffb466a3b3707f892b4e1df7c2949f97555ffbfdb4a95a3790162af059e0
+  metadata.gz: 95ee9ba2c0566f581fcbeb6419b9833363db4c3241dceea519363df6ec4bf087
+  data.tar.gz: 36e05debb0b7b3eff6de066214d8268aa1dbad95e7b555878b307fb688def583
 SHA512:
-  metadata.gz: e3da93db8cf08f3256e882647fea84144e9f6b1a78d643c9aa4d2f3361d0bac5eb43f7c371cbf5e28ac7fce85683263a63acfbd7495049f7d4e70c12e635c8bf
-  data.tar.gz: cdadd37a6a7eed36508595407e568664e851634b0186cf530a5f42bba3d8530d32ae17a2e62f4eab576610019bf5441e6cbc2de601748829360048bcb47a6441
+  metadata.gz: '09e63329ce38c729359ceba06eb607560ad17b867a02bd81601ef0932ec0e2fa5c57a24fe9489aaeacc109117a5bbe9d5cec0f3f29e30990adc3917193f73dc4'
+  data.tar.gz: a48465a30672125a40d8188a5c04610c1fa6665048a0d1165f1d2bbbcb80a4e1e5abdef0bd7a7d70bab7509c7930e90001e2b7f3201974d4508c40546fabd907

data/lib/jruby_art/app.rb

@@ -1,7 +1,8 @@
-
-# frozen_string_literal: false
 require 'java'
-require_relative '../rpextras'
+require_relative '../jruby_art'
+Dir["#{K9_ROOT}/lib/*.jar"].each do |jar|
+  require jar
+end
 require_relative '../jruby_art/helper_methods'
 require_relative '../jruby_art/helpers/aabb'
 require_relative '../jruby_art/library_loader'
@@ -9,13 +10,13 @@ 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'
+  java_import 'processing.core.PFont'
   # Load vecmath, fastmath and mathtool modules
   Java::Monkstone::JRLibrary.load(JRuby.runtime)
+  # import custom Vecmath renderers
   module Render
     java_import 'monkstone.vecmath.GfxRender'
     java_import 'monkstone.vecmath.ShapeRender'
@@ -86,6 +87,7 @@ module Processing
       # Processing call them by their expected Java names.
       def method_added(method_name) #:nodoc:
         return unless METHODS_TO_ALIAS.key?(method_name)
+
         alias_method METHODS_TO_ALIAS[method_name], method_name
       end
     end
@@ -117,9 +119,9 @@ module Processing
     end
 
     def size(*args)
-      w, h, mode = *args
-      @width ||= w
-      @height ||= h
+      width, height, mode = *args
+      @width ||= width
+      @height ||= height
       @render_mode ||= mode
       import_opengl if /opengl/ =~ mode
       super(*args)
@@ -131,6 +133,7 @@ module Processing
 
     def sketch_path(spath = '')
       return super() if spath.empty?
+
       super(spath)
     end
 
@@ -181,19 +184,22 @@ module Processing
       klass.constants.each do |name|
         const = klass.const_get name
         next if const.class != Class || const.to_s.match(/^Java::/)
-        const.class_eval 'include Processing::Proxy'
+
+        const.class_eval 'include Processing::Proxy', __FILE__, __LINE__
       end
     end
 
     def import_opengl
       # Include processing opengl classes that we'd like to use:
+      opengl = 'processing.opengl.%s'
       %w[FontTexture FrameBuffer LinePath LineStroker PGL
          PGraphics2D PGraphics3D PGraphicsOpenGL PShader
          PShapeOpenGL Texture].each do |klass|
-        java_import format('processing.opengl.%s', klass)
+        java_import format(opengl, klass)
       end
     end
-  end # Processing::App
+  end
+  # Processing::App
 
   # @HACK purists may prefer 'forwardable' to the use of Proxy
   # Importing PConstants here to access the processing constants
@@ -207,8 +213,12 @@ module Processing
     end
 
     def method_missing(name, *args)
-      return Processing.app.send(name, *args) if Processing.app && Processing.app.respond_to?(name)
+      app = Processing.app
+      return app.send(name, *args) if app && app.respond_to?(name)
+
       super
     end
-  end # Processing::Proxy
-end # Processing
+  end
+  # Processing::Proxy
+end
+# Processing

data/lib/jruby_art/config.rb

@@ -1,44 +1,43 @@
-# frozen_string_literal: false
-
 require 'yaml'
+require_relative 'default_config'
+require_relative 'version'
+HOME = ENV['HOME']
+# Configuration class
+class Config
+  attr_reader :config
+  def initialize(conf = {})
+    @config = Default.config.merge(conf)
+  end
 
-# The wrapper module
-module Processing
-  unless defined? RP_CONFIG
-    config_path = "#{ENV['HOME']}/.jruby_art/config.yml"
-    begin
-      CONFIG_FILE_PATH = File.expand_path(config_path)
-      RP_CONFIG = YAML.safe_load(File.read(CONFIG_FILE_PATH))
-    rescue
-      warn(format('WARN: you need to set PROCESSING_ROOT in %s', config_path))
-    end
+  def write_to_file
+    directory = File.join(HOME, '.jruby_art')
+    Dir.mkdir(directory) unless Dir.exist? directory
+    File.write(File.join(HOME, '.jruby_art', 'config.yml'), config.to_yaml)
   end
 
-  WIN_PATTERNS = [
-    /bccwin/i,
-    /cygwin/i,
-    /djgpp/i,
-    /ming/i,
-    /mswin/i,
-    /wince/i
-  ].freeze
+  def load_config
+    config_path = File.join(File.join(HOME, '.jruby_art', 'config.yml'))
+    if File.exist? config_path
+      loaded = YAML.safe_load(File.read(config_path))
+      @config = Default.config.merge(loaded)
+      return self unless loaded.key? 'PROCESSING_ROOT'
 
-  # 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 /gnueabihf/ then :arm
-      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
+      warn '*********** Move Old Config File ***************'
     end
+    @config = Default.config
+    warn '*********** Default Config Loaded ***************'
+    self
   end
 
-  OS ||= HostOS.os
+  def check
+    load_config
+    puts "JRubyArt version #{JRubyArt::VERSION}"
+    puts 'Approximates to Processing-4.0'
+    puts "processing ide = #{config.fetch('processing_ide', false)}"
+    puts "library_path = #{config.fetch('library_path', File.join(HOME, '.jruby_art'))}"
+    puts "template = #{config.fetch('template', 'bare')}"
+    puts "java_args = #{config.fetch('java_args', '')}"
+    puts "MAX_WATCH = #{config.fetch('MAX_WATCH', 32)}"
+    puts "JRUBY = #{config.fetch('JRUBY', true)}"
+  end
 end

data/lib/jruby_art/default_config.rb

@@ -0,0 +1,13 @@
+# default configuration
+class Default
+  def self.config
+    {
+      'processing_ide' => false,
+      'library_path' => File.join(ENV['HOME'], '.jruby_art', 'libraries'),
+      'MAX_WATCH' => 32,
+      'JRUBY' => true,
+      'template' => 'bare',
+      'java_args' => nil
+    }
+  end
+end

data/lib/jruby_art/helper_methods.rb

@@ -1,6 +1,6 @@
 # frozen_string_literal: false
 # processing module wrapper
-require_relative '../rpextras'
+require_relative '../jruby_art'
 
 module Processing
   # Provides some convenience methods

data/lib/jruby_art/installer.rb

@@ -1,99 +1,34 @@
-# frozen_string_literal: false
+require_relative 'config'
+require_relative 'processing_ide'
 
-require 'yaml'
-VERSION = '3.5.3'.freeze # processing version
-HOME = ENV['HOME']
-# Abstract Installer class
 class Installer
-  attr_reader :os, :sketch, :gem_root, :confd
-  def initialize(root, os)
-    @os = os
-    @gem_root = root
-    @sketch = "#{HOME}/sketchbook" if os == :linux
-    @sketch = "#{HOME}/My Documents/Processing" if os == :windows
-    @sketch = "#{HOME}/Documents/Processing" if os == :mac
-    @confd = "#{HOME}/.jruby_art"
+  attr_reader :processing_ide
+  def initialize
+    @processing_ide = ProcessingIde.new
   end
 
-  # Optimistically set processing root
-  def set_processing_root
-    folder = "#{HOME}/.jruby_art"
-    Dir.mkdir(folder) unless File.exist? folder
-    path = File.join(folder, 'config.yml')
-    proot = "#{HOME}/processing-#{VERSION}"
-    proot = "/usr/local/lib/processing-#{VERSION}" if os == :arm
-    proot = "/Java/Processing-#{VERSION}" if os == :windows
-    proot = '/Applications/Processing.app/Contents/Java' if os == :mac
-    jruby = true
-    jruby = false if os == :arm
-    settings = %w[
-      PROCESSING_ROOT JRUBY sketchbook_path template MAX_WATCH sketch_title width height
-    ]
-    values = [
-      proot, true, sketch, 'bare', 32, 'JRubyArt Static Sketch', 600, 600
-    ]
-    data = settings.zip(values).to_h
-    open(path, 'w:UTF-8') { |file| file.write(data.to_yaml) }
-    warn 'PROCESSING_ROOT set optimistically, run check to confirm'
-  end
-
-  def root_exist?
-    Core.check?(config['PROCESSING_ROOT'])
-  end
-
-  def config
-    k9config = File.join(confd, 'config.yml')
-    return '' unless File.exist? k9config
-    YAML.load_file(k9config)
-  end
-
-  # in place of default installer class
-  def install
-    puts 'Usage: k9 [--check | --install | --help]'
-  end
-
-  # Display the current version of JRubyArt.
-  def show_version
-    puts format('JRubyArt version %s', JRubyArt::VERSION)
-    puts format('Expected Processing version %s', VERSION)
-  end
-end
-
-# Configuration checker
-class Check < Installer
-  require_relative './core'
   def install
-    show_version
-    return super unless config
-    installed = File.exist? File.join(gem_root, 'lib/ruby/jruby-complete.jar')
-    proot = '  PROCESSING_ROOT = Not Set Correctly!!!' unless root_exist?
-    proot ||= "  PROCESSING_ROOT = #{config['PROCESSING_ROOT']}"
-    sketchbook = "  sketchbook_path = #{config['sketchbook_path']}"
-    template = "  template = #{config['template']}"
-    java_args = "  java_args = #{config['java_args']}"
-    max_watch = "  MAX_WATCH = #{config['MAX_WATCH']}"
-    jruby = config.fetch('JRUBY', true)
-    puts proot
-    puts "  JRUBY = #{jruby}" unless jruby.nil?
-    puts "  jruby-complete installed = #{installed}"
-    puts sketchbook
-    puts template
-    puts java_args
-    puts max_watch
+    if processing_ide.installed?
+      config = Config.new(
+        'processing_ide' => true,
+        'library_path' => processing_ide.sketchbook_path)
+    else
+      config = Config.new('processing_ide' => false)
+    end
+    config.write_to_file
   end
 end
 
 # Examples Installer
-class UnpackSamples < Installer
+class UnpackSamples
   def install
-    system "cd #{gem_root}/vendors && rake unpack_samples"
+    system "cd #{K9_ROOT}/vendors && rake unpack_samples"
   end
 end
 
 # JRuby-Complete installer
-class JRubyCompleteInstall < Installer
+class JRubyCompleteInstall
   def install
-    set_processing_root unless File.exist? File.join(confd, 'config.yml')
-    system "cd #{gem_root}/vendors && rake"
+    system "cd #{K9_ROOT}/vendors && rake"
   end
 end

data/lib/jruby_art/library.rb

@@ -3,7 +3,6 @@ require_relative 'native_loader'
 
 require 'pathname'
 
-BUNDLED = %r{pdf|net|dxf|svg|serial}
 # This class knows where to find propane libraries
 class Library
   require_relative '../jruby_art'
@@ -22,6 +21,7 @@ class Library
     return if (@path = Pathname.new(
       File.join(K9_ROOT, 'library', name, "#{name}.rb")
     )).exist?
+
     locate_java
   end
 
@@ -30,33 +30,26 @@ class Library
       File.join(SKETCH_ROOT, 'library', name)
     )
     return @path = dir.join(Pathname.new("#{name}.jar")) if dir.directory?
+
     locate_installed_java
   end
 
   def locate_installed_java
-    prefix = bundled? ? File.join(root, 'modes/java') : sketchbook
+    prefix = library_path
     @dir = Pathname.new(
       File.join(prefix, "libraries/#{name}/library")
     )
     @path = dir.join(Pathname.new("#{name}.jar"))
   end
 
-  def sketchbook
-    Processing::RP_CONFIG.fetch('sketchbook_path', "#{ENV['HOME']}/sketchbook")
-  end
-
-  def root
-    Processing::RP_CONFIG.fetch('PROCESSING_ROOT', "#{ENV['HOME']}/processing")
+  def library_path
+    Processing::RP_CONFIG.fetch('library_path', "#{ENV['HOME']}/.jruby_art")
   end
 
   def ruby?
     path.extname == '.rb'
   end
 
-  def bundled?
-    BUNDLED =~ name
-  end
-
   def exist?
     path.exist?
   end
@@ -66,6 +59,7 @@ class Library
       require jar
     end
     return unless native_binaries?
+
     add_binaries_to_classpath
   end
 

data/lib/jruby_art/processing_ide.rb

@@ -0,0 +1,19 @@
+# detects processing preferences.txt, extracts sketchbook_path
+class ProcessingIde
+  attr_reader :preferences
+  def initialize
+    @preferences = File.join(ENV['HOME'], '.processing', 'preferences.txt')
+  end
+
+  def installed?
+    File.exist?(preferences)
+  end
+
+  def sketchbook_path
+    File.open(preferences, 'r') do |file|
+      file.each_line do |line|
+        return line.tap { |sli| sli.slice!('sketchbook.path.three=') }.chomp if line =~ /sketchbook/
+      end
+    end
+  end
+end

data/lib/jruby_art/runner.rb

@@ -11,6 +11,10 @@ require_relative '../jruby_art/launcher'
 module Processing
   # Utility class to handle the different commands that the 'k9' command
   # offers. Able to run, watch, live, create, app, and unpack
+  unless defined? RP_CONFIG
+    conf = Config.new.load_config
+    RP_CONFIG = conf.config
+  end
   class Runner
     WIN_PATTERNS = [
       /bccwin/i,
@@ -135,14 +139,15 @@ module Processing
     end
 
     def install
-      require_relative '../jruby_art/installer'
-      JRubyCompleteInstall.new(K9_ROOT, OS).install
-      UnpackSamples.new(K9_ROOT, OS).install
+      require_relative 'installer'
+      Installer.new.install
+      JRubyCompleteInstall.new.install
+      UnpackSamples.new.install
     end
 
     def check
-      require_relative '../jruby_art/installer'
-      Check.new(K9_ROOT, OS).install
+      require_relative '../jruby_art/config'
+      Config.new.check
     end
 
     # Show the standard help/usage message.
@@ -152,9 +157,9 @@ module Processing
 
     def show_version
       require 'erb'
-      warning = 'WARNING: JDK8 is preferred'.freeze
+      warning = 'WARNING: JDK11 is preferred'.freeze
       if RUBY_PLATFORM == 'java'
-        warn warning unless ENV_JAVA['java.specification.version'] == '1.8'
+        warn warning unless ENV_JAVA['java.specification.version'] == '11'
       end
       template = ERB.new <<-EOF
         JRubyArt version <%= JRubyArt::VERSION %>

data/lib/jruby_art/version.rb

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

data/vendors/Rakefile

@@ -1,3 +1,4 @@
+require 'fileutils'
 require 'rake/clean'
 
 WARNING = <<-WARN.freeze
@@ -19,7 +20,7 @@ CLOBBER << "jruby-complete-#{JRUBYC_VERSION}.jar.sha256"
 
 file "jruby-complete-#{JRUBYC_VERSION}.jar.sha256" do
   begin
-    sh "wget https://repo1.maven.org/maven2/org/jruby/jruby-complete/#{JRUBYC_VERSION}/jruby-complete-#{JRUBYC_VERSION}.jar.sha256"
+    system "wget https://repo1.maven.org/maven2/org/jruby/jruby-complete/#{JRUBYC_VERSION}/jruby-complete-#{JRUBYC_VERSION}.jar.sha256"
   rescue
     warn(WARNING)
   end
@@ -36,7 +37,7 @@ task download: ["jruby-complete-#{JRUBYC_VERSION}.jar"]
 
 file "jruby-complete-#{JRUBYC_VERSION}.jar" do
   begin
-    sh "wget https://repo1.maven.org/maven2/org/jruby/jruby-complete/#{JRUBYC_VERSION}/jruby-complete-#{JRUBYC_VERSION}.jar"
+    system "wget https://repo1.maven.org/maven2/org/jruby/jruby-complete/#{JRUBYC_VERSION}/jruby-complete-#{JRUBYC_VERSION}.jar"
   rescue
     warn(WARNING)
   end
@@ -48,7 +49,9 @@ directory '../lib/ruby'
 
 desc 'copy jruby-complete'
 task copy_ruby: ['../lib/ruby'] do
-  sh "cp -v jruby-complete-#{JRUBYC_VERSION}.jar ../lib/ruby/jruby-complete.jar"
+  FileUtils.cp(
+    "jruby-complete-#{JRUBYC_VERSION}.jar", '../lib/ruby/jruby-complete.jar'
+  )
 end
 
 def check_sha256(filename, expected_hash)
@@ -73,9 +76,9 @@ file_name = MAC_OR_LINUX.nil? ? "#{EXAMPLES}.zip" : "#{EXAMPLES}.tar.gz"
 file file_name do
   begin
     if MAC_OR_LINUX.nil?
-      sh "wget https://github.com/ruby-processing/JRubyArt-examples/archive/#{EXAMPLES}.zip"
+      system "wget https://github.com/ruby-processing/JRubyArt-examples/archive/#{EXAMPLES}.zip"
     else
-      sh "wget https://github.com/ruby-processing/JRubyArt-examples/archive/#{EXAMPLES}.tar.gz"
+      system "wget https://github.com/ruby-processing/JRubyArt-examples/archive/#{EXAMPLES}.tar.gz"
     end
   rescue
     warn(WARNING)
@@ -89,7 +92,7 @@ task copy_examples: file_name do
   else
     sh "tar xzvf #{EXAMPLES}.tar.gz"
   end
-  sh "rm -r #{HOME_DIR}/k9_samples" if File.exist? "#{HOME_DIR}/k9_samples"
-  sh "cp -r JRubyArt-examples-#{EXAMPLES} #{HOME_DIR}/k9_samples"
-  sh "rm -r JRubyArt-examples-#{EXAMPLES}"
+  FileUtils.rm_r("#{HOME_DIR}/k9_samples") if File.exist? "#{HOME_DIR}/k9_samples"
+  FileUtils.cp_r("JRubyArt-examples-#{EXAMPLES}", "#{HOME_DIR}/k9_samples")
+  FileUtils.rm_r("JRubyArt-examples-#{EXAMPLES}")
 end

metadata

@@ -1,16 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: jruby_art
 version: !ruby/object:Gem::Version
-  version: 1.7.0
+  version: 2.0.0.pre
 platform: ruby
 authors:
-- Jeremy Ashkenas
-- Guillaume Pierronnet
 - Martin Prout
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2019-04-10 00:00:00.000000000 Z
+date: 2019-05-17 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rake
@@ -41,7 +39,7 @@ dependencies:
       - !ruby/object:Gem::Version
         version: '5.10'
 description: |2
-    JRubyArt is a ruby wrapper for the processing art framework, with enhanced
+    JRubyArt is a ruby implementation of the processing art framework, with enhanced
     functionality. Use both processing libraries and ruby gems in your sketches.
     Features create/run/watch/live modes.
 email: mamba2928@yahoo.co.uk
@@ -51,11 +49,20 @@ extensions: []
 extra_rdoc_files: []
 files:
 - bin/k9
+- lib/gluegen-rt-natives-linux-amd64.jar
+- lib/gluegen-rt-natives-macosx-universal.jar
+- lib/gluegen-rt-natives-windows-amd64.jar
+- lib/gluegen-rt.jar
+- lib/jogl-all-natives-linux-amd64.jar
+- lib/jogl-all-natives-macosx-universal.jar
+- lib/jogl-all-natives-windows-amd64.jar
+- lib/jogl-all.jar
+- lib/jruby_art.jar
 - lib/jruby_art.rb
 - lib/jruby_art/app.rb
 - lib/jruby_art/config.rb
-- lib/jruby_art/core.rb
 - lib/jruby_art/creators/sketch_writer.rb
+- lib/jruby_art/default_config.rb
 - lib/jruby_art/helper_methods.rb
 - lib/jruby_art/helpers/aabb.rb
 - lib/jruby_art/helpers/numeric.rb
@@ -67,13 +74,13 @@ files:
 - lib/jruby_art/library_loader.rb
 - lib/jruby_art/native_folder.rb
 - lib/jruby_art/native_loader.rb
+- lib/jruby_art/processing_ide.rb
 - lib/jruby_art/runner.rb
 - lib/jruby_art/runners/base.rb
 - lib/jruby_art/runners/live.rb
 - lib/jruby_art/runners/run.rb
 - lib/jruby_art/runners/watch.rb
 - lib/jruby_art/version.rb
-- lib/rpextras.jar
 - library/boids/boids.rb
 - library/chooser/chooser.rb
 - library/color_group/color_group.rb
@@ -100,14 +107,13 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '2.3'
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
-  - - ">="
+  - - ">"
     - !ruby/object:Gem::Version
-      version: '0'
+      version: 1.3.1
 requirements:
 - A decent graphics card
-- java runtime >= 1.8.0_171+
-- processing = 3.5.3
-rubygems_version: 3.0.1
+- java runtime >= 11.0.3+
+rubygems_version: 3.0.3
 signing_key: 
 specification_version: 4
 summary: Code as Art, Art as Code. Processing and Ruby are meant for each other.

data/lib/jruby_art/core.rb

@@ -1,15 +0,0 @@
-# frozen_string_literal: true
-# module encapsulates a check that the PROCESSING_ROOT exists
-module Core
-  def self.check?(path)
-    if File.directory?(path)
-      core_path = File.join(path, 'core/library/core.jar')
-      return true if File.exist?(core_path)
-      warn format('%s jar does not exist', core_path)
-    else warn format('%s directory does not exist', path)
-    end
-  end
-end
-
-# Provided processing distributions have the same nested structure ie:-
-# "core/library/core.jar" we can find "core.jar" when PROCESSING_ROOT exists