jruby_art 2.2.0 → 2.4.1

data/lib/jruby_art/library.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 require_relative 'native_folder'
 require_relative 'native_loader'
 
@@ -35,10 +37,17 @@ class Library
   end
 
   def locate_installed_java
-    prefix = library_path
-    @dir = Pathname.new(
-      File.join(prefix, "libraries/#{name}/library")
-    )
+    return if dir.directory?
+
+    if Processing::RP_CONFIG.fetch('processing_ide', false)
+      prefix = library_path
+      @dir = Pathname.new(File.join(prefix, 'libraries', name, 'library'))
+      @path = dir.join(Pathname.new("#{name}.jar"))
+    else
+      @dir = Pathname.new(
+        File.join(ENV['HOME'], '.jruby_art', 'libraries', name, 'library')
+      )
+    end
     @path = dir.join(Pathname.new("#{name}.jar"))
   end
 
@@ -55,7 +64,7 @@ class Library
   end
 
   def load_jars
-    Dir.glob("#{dir}/*.jar").each do |jar|
+    Dir.glob("#{dir}/*.jar").sort.each do |jar|
       require jar
     end
     return unless native_binaries?

data/lib/jruby_art/library_loader.rb

@@ -1,4 +1,5 @@
 # frozen_string_literal: false
+
 # The processing wrapper module
 module Processing
   require_relative 'library'
@@ -19,7 +20,7 @@ module Processing
     # Load a list of Ruby or Java libraries (in that order)
     # Usage: load_libraries :video, :video_event
     #
-    # If a library is put into a 'library' folder next to the sketch it will be used 
+    # If a library is put into a 'library' folder next to the sketch it will be used
     # instead of the library that ships with vanilla processing (or ide installed), or JRubyArt.
     def load_libraries(*args)
       message = 'no such file to load -- %s'
@@ -32,10 +33,12 @@ module Processing
 
     def loader(name)
       return true if @loaded_libraries.include?(name)
+
       fname = name.to_s
       library = Library.new(fname)
       library.locate
       return require_library(library, name) if library.ruby?
+
       warn("Not found library: #{fname}") unless library.exist?
       load_jars(library, name)
     end

data/lib/jruby_art/native_folder.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 require 'rbconfig'
 
 # Utility to load native binaries on Java CLASSPATH
@@ -5,10 +7,9 @@ require 'rbconfig'
 class NativeFolder
   attr_reader :os, :bit
 
-  LINUX_FORMAT = 'linux%s'.freeze
-  ARM32 = '-armv6hf'.freeze
-  # ARM64 = '-aarch64'.freeze
-  WIN_FORMAT = 'windows%d'.freeze
+  LINUX_FORMAT = 'linux%<bit>d'
+  # ARM64 = '-aarch64'
+  WIN_FORMAT = 'windows%<bit>d'
   WIN_PATTERNS = [
     /bccwin/i,
     /cygwin/i,
@@ -20,25 +21,26 @@ class NativeFolder
 
   def initialize
     @os = RbConfig::CONFIG['host_os'].downcase
-    @bit = java.lang.System.get_property('os.arch')
+    @bit = /64/.match?(java.lang.System.get_property('os.arch')) ? 64 : 32
   end
 
   def name
     return 'macosx' if /darwin|mac/.match?(os)
-    if /linux/.match?(os)
-      return format(LINUX_FORMAT, '64') if /amd64/.match?(bit)
-      return format(LINUX_FORMAT, ARM32) if /arm/.match?(bit)
-    end
-    if WIN_PATTERNS.any? { |pat| pat =~ os }
-      return format(WINDOWS_FORMAT, '64') if /64/.match?(bit)
-      return format(WINDOWS_FORMAT, '32') if /32/.match?(bit)
+
+    return format(LINUX_FORMAT, bit: bit) if /linux/.match?(os)
+
+    unless WIN_PATTERNS.any? { |pat| pat.match?(os) }
+      raise StandardError, 'Unsupported Architecture'
     end
-    raise 'Unsupported Architecture'
+
+    format(WIN_FORMAT, bit: bit)
   end
 
   def extension
     return '*.so' if /linux/.match?(os)
-    return '*.dll' if WIN_PATTERNS.any? { |pat| pat =~ os }
+
+    return '*.dll' if WIN_PATTERNS.any? { |pat| pat.match?(os) }
+
     '*.dylib' # MacOS
   end
 end

data/lib/jruby_art/native_loader.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 # This class knows how to dynamically set the 'java' native library path
 # It might not work with java 9?
 class NativeLoader
@@ -20,6 +22,7 @@ class NativeLoader
     field = JC::Class.for_name('java.lang.ClassLoader')
                      .get_declared_field('sys_paths')
     return unless field
+
     field.accessible = true # some jruby magic
     field.set(JC::Class.for_name('java.lang.System').get_class_loader, nil)
   end

data/lib/jruby_art/processing_ide.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 # detects processing preferences.txt, extracts sketchbook_path
 class ProcessingIde
   attr_reader :preferences
@@ -12,7 +14,9 @@ class ProcessingIde
   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/
+        if /sketchbook/.match?(line)
+          return line.tap { |sli| sli.slice!('sketchbook.path.three=') }.chomp
+        end
       end
     end
   end

data/lib/jruby_art/runner.rb

@@ -9,12 +9,12 @@ 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
-  # offers. Able to run, watch, live, create, app, and unpack
   unless defined? RP_CONFIG
     conf = Config.new.load_config
     RP_CONFIG = conf.config
   end
+  # Utility class to handle the different commands that the 'k9' command
+  # offers. Able to run, watch, live, create, app, and unpack
   class Runner
     WIN_PATTERNS = [
       /bccwin/i,
@@ -25,6 +25,11 @@ module Processing
       /wince/i
     ].freeze
 
+    INSTALL = <<~MSG.freeze
+      <Config|JRuby-Complete|Samples>
+      or <Sound|Video> library
+    MSG
+
     attr_reader :options, :argc, :filename, :os
 
     def initialize
@@ -35,19 +40,19 @@ module Processing
     def self.execute
       runner = new
       runner.parse_options(ARGV)
-      runner.execute!
+      runner.execute
     end
 
     # Dispatch central.
-    def execute!
-      show_help if options.empty?
+    def execute
+      parse_options('-h') if options.empty?
       show_version if options[:version]
       run_sketch if options[:run]
       watch_sketch if options[:watch]
       live if options[:live]
       create if options[:create]
       check if options[:check]
-      install if options[:install]
+      install(filename) if options[:install]
     end
 
     # Parse the command-line options.
@@ -57,49 +62,44 @@ module Processing
         # of the help screen.
         opts.banner = 'Usage: k9 [options] [<filename.rb>]'
         # Define the options, and what they do
-        options[:version] = false
+
         opts.on('-v', '--version', 'JRubyArt Version') do
           options[:version] = true
         end
 
-        options[:install] = false
-        opts.on('-i', '--install', 'Installs jruby-complete and examples') do
-          options[:install] = true
-        end
-
-        options[:check] = false
         opts.on('-?', '--check', 'Prints configuration') do
           options[:check] = true
         end
 
-        options[:app] = false
-        opts.on('-a', '--app', 'Export as app NOT IMPLEMENTED YET') do
-          options[:export] = true
+        opts.on('-i', '--install', INSTALL) do
+          options[:install] = true
         end
 
-        options[:watch] = false
-        opts.on('-w', '--watch', 'Watch/run the sketch') do
-          options[:watch] = true
+        opts.on('-f', '--force', 'Force removal of old Config') do
+          options[:force] = true
+        end
+
+        opts.on('-c', '--create', 'Create new outline sketch') do
+          options[:create] = true
         end
 
-        options[:run] = false
         opts.on('-r', '--run', 'Run the sketch') do
           options[:run] = true
         end
 
-        options[:live] = false
+        opts.on('-w', '--watch', 'Watch/run the sketch') do
+          options[:watch] = true
+        end
+
         opts.on('-l', '--live', 'As above, with pry console bound to Processing.app') do
           options[:live] = true
         end
 
-        options[:create] = false
-        opts.on('-c', '--create', 'Create new outline sketch') do
-          options[:create] = true
+        opts.on('-a', '--app', 'Export as app NOT IMPLEMENTED YET') do
+          options[:export] = true
         end
 
-        # This displays the help screen, all programs are
-        # assumed to have this option.
-        opts.on('-h', '--help', 'Display this screen') do
+        opts.on_tail('-h', '--help', 'Display this screen') do
           puts opts
           exit
         end
@@ -138,11 +138,26 @@ module Processing
       spin_up('watch.rb', filename, argc)
     end
 
-    def install
+    def install(library = nil)
       require_relative 'installer'
-      Installer.new.install
-      JRubyCompleteInstall.new.install
-      UnpackSamples.new.install
+      library ||= 'new'
+      case library.downcase
+      when /sound|video/
+        system "cd #{K9_ROOT}/vendors && rake download_and_copy_#{choice}"
+      when /samples/
+        system "cd #{K9_ROOT}/vendors && rake install_samples"
+      when /jruby/
+        system "cd #{K9_ROOT}/vendors && rake"
+      when /config/
+        remove_old_config if options[:force]
+        Installer.new.install
+      when /new/
+        # install samples and config JRubyArt
+        system "cd #{K9_ROOT}/vendors && rake"
+        Installer.new.install
+      else
+        warn format('No installer for %<library>s', library: library)
+      end
     end
 
     def check
@@ -152,19 +167,19 @@ module Processing
 
     # Show the standard help/usage message.
     def show_help
-      puts HELP_MESSAGE
+      puts HELP_INSTALL
     end
 
     def show_version
       require 'erb'
-      warning = 'WARNING: JDK11 is preferred'.freeze
+      warning = 'WARNING: JDK12 is preferred'.freeze
       if RUBY_PLATFORM == 'java'
-        warn warning unless ENV_JAVA['java.specification.version'] == '11'
+        warn warning unless ENV_JAVA['java.specification.version'].to_i >= 11
       end
-      template = ERB.new <<-EOF
-        JRubyArt version <%= JRubyArt::VERSION %>
-        Ruby version <%= RUBY_VERSION %>
-      EOF
+      template = ERB.new <<-VERSION
+      JRubyArt version <%= JRubyArt::VERSION %>
+      Ruby version <%= RUBY_VERSION %>
+      VERSION
       puts template.result(binding)
     end
 
@@ -184,20 +199,26 @@ module Processing
     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)
+      return if FileTest.exist?(filename)
+
+      puts("Couldn't find: #{filename}") and exit
     end
 
     def jruby_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
 
-    def libraries
-      %w(video sound).map { |library| Sketchbook.library(library) }.flatten
+    def remove_old_config
+      old_config = File.join((ENV['HOME']).to_s, '.jruby_art', 'config.yml')
+      puts "Removing #{old_config}"
+      system "rm #{old_config}"
     end
-  end # class Runner
-end # module Processing
+    # class Runner
+  end
+  # module Processing
+end

data/lib/jruby_art/runners/base.rb

@@ -1,4 +1,5 @@
 # frozen_string_literal: true
+
 SKETCH_PATH ||= ARGV.shift
 SKETCH_ROOT ||= File.absolute_path(File.dirname(SKETCH_PATH))
 
@@ -8,13 +9,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.freeze
+  BARE_WRAP = <<-BARE
   class Sketch < Processing::App
     %s
   end
-  EOS
+  BARE
 
-  NAKED_WRAP = <<-EOS.freeze
+  NAKED_WRAP = <<-NAKED
   class Sketch < Processing::App
     def setup
       sketch_title '%s'
@@ -26,7 +27,7 @@ module Processing
       size(%d, %d)
     end
   end
-  EOS
+  NAKED
 
   # This method is the common entry point to run a sketch, bare or complete.
   def self.load_and_run_sketch

data/lib/jruby_art/runners/live.rb

@@ -1,17 +1,20 @@
 # frozen_string_literal: false
+
 # A pry shell for live coding.
 # Will start with your sketch.
 require_relative 'base'
 Processing.load_and_run_sketch
 
+# Custom Exception
 class PryException < StandardError
+  MESSAGE = "You need to 'jruby -S gem install pry' for 'live' mode".freeze
+
+  def initialize(msg = MESSAGE)
+    super
+  end
 end
 
-MESSAGE = "You need to 'jruby -S gem install pry' for 'live' mode".freeze
+raise PryException unless Gem::Specification.find_all_by_name('pry').any?
 
-if Gem::Specification.find_all_by_name('pry').any?
-  require 'pry'
-  Processing.app.pry
-else
-  raise(PryException.new, MESSAGE)
-end
+require 'pry'
+Processing.app.pry

data/lib/jruby_art/runners/run.rb

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

data/lib/jruby_art/runners/watch.rb

@@ -1,4 +1,5 @@
 # frozen_string_literal: false
+
 require_relative 'base'
 require_relative '../config'
 
@@ -21,9 +22,10 @@ module Processing
     EOS
     SLEEP_TIME = 0.2
     def initialize
-      count = Dir["**.*rb"].length
+      count = Dir['**.*rb'].length
       max_watch = RP_CONFIG.fetch('MAX_WATCH', 20)
-      return warn format(WATCH_MESSAGE, max_watch, count) if count > max_watch.to_i
+      abort format(WATCH_MESSAGE, max_watch, count) if count > max_watch.to_i
+
       reload_files_to_watch
       @time = Time.now
       start_watching
@@ -36,7 +38,7 @@ module Processing
       Kernel.loop do
         if @files.find { |file| FileTest.exist?(file) && File.stat(file).mtime > @time }
           puts 'reloading sketch...'
-          Processing.app && Processing.app.close
+          Processing.app&.close
           java.lang.System.gc
           @time = Time.now
           start_runner
@@ -66,7 +68,7 @@ module Processing
     end
 
     def start_runner
-      @runner.kill if @runner && @runner.alive?
+      @runner.kill if @runner&.alive?
       @runner.join
       @runner = nil
       start_original