jruby_art 2.2.0 → 2.2.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: ebbb071256ed356c298940ff1d43ab297083601dd1133f8bdc2cd9372c2cab75
-  data.tar.gz: fdb9418da66238174d66ed86cd7e01737141612dac48069d81c73d65bd002928
+  metadata.gz: 3101b35efc934fc4337e6f8f34f3ea9d8022c8bf1001d743a01b675417ddf35e
+  data.tar.gz: 25481f1ab8a5f77ca32cd08542f64b7aa771fc29c6399859bf5f433b5d71c4e7
 SHA512:
-  metadata.gz: db6e4d1bcccbe15f31785b4f454505d0fa298648ce119c2b6bba5cfca3da92a381b4fc1a1834d16611c7d3e569929347fabb0c29abf71bc8d91b51328450a2af
-  data.tar.gz: b3f8884511bbc842313fa8e20e38e0622e20199a0d36add5adc14ea59ac100ddbafeddfc4d7f22e4fbb39b1fab7a8f98e85b2ba37b91f7f568077fc9c1939f15
+  metadata.gz: ec5f26712feeee0f7b151133457d6beb1216459e03e1410a9d77bed0ab2b575120f9b0b2dd064c8b88f1090640b1f97f13cc8e6881d32053ef84c273c5da6279
+  data.tar.gz: 0f51c6231b99a00994ac354d78b433a54731cc757d4728650f6b255983d9ddcfbd7d03e1a07826f2e272582d7645be7b764224cb6e1a37b44c151a1f9d6bd35d

data/lib/jruby_art/helper_methods.rb

@@ -57,7 +57,7 @@ module Processing
     end
 
     def web_to_color_array(web)
-      Java::Monkstone::ColorUtil.webArray(web)
+      Java::Monkstone::ColorUtil.webArray(web.to_java(:string))
     end
 
     def int_to_ruby_colors(p5color)

data/lib/jruby_art/library.rb

@@ -17,62 +17,71 @@ class Library
   def locate
     return if (@path = Pathname.new(
       File.join(SKETCH_ROOT, 'library', name, "#{name}.rb")
-    )).exist?
-    return if (@path = Pathname.new(
-      File.join(K9_ROOT, 'library', name, "#{name}.rb")
-    )).exist?
+      )).exist?
+      return if (@path = Pathname.new(
+        File.join(K9_ROOT, 'library', name, "#{name}.rb")
+        )).exist?
 
-    locate_java
-  end
+        locate_java
+      end
 
-  def locate_java
-    @dir = Pathname.new(
-      File.join(SKETCH_ROOT, 'library', name)
-    )
-    return @path = dir.join(Pathname.new("#{name}.jar")) if dir.directory?
+      def locate_java
+        @dir = Pathname.new(
+          File.join(SKETCH_ROOT, 'library', name)
+        )
+        return @path = dir.join(Pathname.new("#{name}.jar")) if dir.directory?
 
-    locate_installed_java
-  end
+        locate_installed_java
+      end
 
-  def locate_installed_java
-    prefix = library_path
-    @dir = Pathname.new(
-      File.join(prefix, "libraries/#{name}/library")
-    )
-    @path = dir.join(Pathname.new("#{name}.jar"))
-  end
+      def locate_installed_java
+        unless 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
+      end
 
-  def library_path
-    Processing::RP_CONFIG.fetch('library_path', "#{ENV['HOME']}/.jruby_art")
-  end
+      def library_path
+        Processing::RP_CONFIG.fetch('library_path', "#{ENV['HOME']}/.jruby_art")
+      end
 
-  def ruby?
-    path.extname == '.rb'
-  end
+      def ruby?
+        path.extname == '.rb'
+      end
 
-  def exist?
-    path.exist?
-  end
+      def exist?
+        path.exist?
+      end
 
-  def load_jars
-    Dir.glob("#{dir}/*.jar").each do |jar|
-      require jar
-    end
-    return unless native_binaries?
+      def load_jars
+        Dir.glob("#{dir}/*.jar").each do |jar|
+          require jar
+        end
+        return unless native_binaries?
 
-    add_binaries_to_classpath
-  end
+        add_binaries_to_classpath
+      end
 
-  def native_binaries?
-    native_folder = NativeFolder.new
-    native = native_folder.name
-    @ppath = File.join(dir, native)
-    File.directory?(ppath) &&
-      !Dir.glob(File.join(ppath, native_folder.extension)).empty?
-  end
+      def native_binaries?
+        native_folder = NativeFolder.new
+        native = native_folder.name
+        @ppath = File.join(dir, native)
+        File.directory?(ppath) &&
+        !Dir.glob(File.join(ppath, native_folder.extension)).empty?
+      end
 
-  def add_binaries_to_classpath
-    native_loader = NativeLoader.new
-    native_loader.add_native_path(ppath)
-  end
-end
+      def add_binaries_to_classpath
+        native_loader = NativeLoader.new
+        native_loader.add_native_path(ppath)
+      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,
@@ -23,7 +23,12 @@ module Processing
       /ming/i,
       /mswin/i,
       /wince/i
-    ].freeze
+    ]
+
+    INSTALL = <<~MSG
+    <Config|JRuby-Complete|Samples>
+    or <Sound|Video> library
+    MSG
 
     attr_reader :options, :argc, :filename, :os
 
@@ -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,13 +138,29 @@ 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 unpack_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 %s', library)
+      end
     end
 
+
     def check
       require_relative '../jruby_art/config'
       Config.new.check
@@ -152,19 +168,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,7 +200,6 @@ 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)
     end
@@ -192,12 +207,17 @@ module Processing
     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']}", '.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

@@ -8,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.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 +26,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/version.rb

@@ -1,5 +1,5 @@
 # frozen_string_literal: true
 # A wrapper for version
 module JRubyArt
-	VERSION = '2.2.0'
+	VERSION = '2.2.1'
 end

data/library/video_event/video_event.rb

@@ -1,3 +1,4 @@
 class Processing::App
-  include Java::MonkstoneVideoevent::VideoInterface
+  include Java::MonkstoneVideoevent::MovieEvent
+  include Java::MonkstoneVideoevent::CaptureEvent
 end

data/vendors/Rakefile

@@ -1,50 +1,57 @@
+# frozen_string_literal: true
+
 require 'fileutils'
 require 'rake/clean'
 
-WARNING = <<-WARN.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
-   may also require 'sudo' access to install, NB: this is untested....
+WARNING = <<~WARN
+  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
+  may also require 'sudo' access to install, NB: this is untested....
 
 WARN
-
-JRUBYC_VERSION     = '9.2.8.0'.freeze
-
-EXAMPLES           = '3.4'.freeze
+# https://github.com/processing/processing-video/releases/download/r6-v2.0-beta4/video-2.0-beta4.zip
+JRUBYC_VERSION = '9.2.9.0'
+SOUND = 'sound.zip'
+SOUND_VERSION = 'v2.2.2'
+VIDEO = 'video-2.0-beta4.zip'
+VIDEO_VERSION = 'r6-v2.0-beta4'
+EXAMPLES = '3.4'
 HOME_DIR = ENV['HOME']
 MAC_OR_LINUX = /linux|mac|darwin/ =~ RbConfig::CONFIG['host_os']
 
 CLOBBER << "jruby-complete-#{JRUBYC_VERSION}.jar"
 CLOBBER << "jruby-complete-#{JRUBYC_VERSION}.jar.sha256"
 
-file "jruby-complete-#{JRUBYC_VERSION}.jar.sha256" do
-  begin
-    system "wget https://repo1.maven.org/maven2/org/jruby/jruby-complete/#{JRUBYC_VERSION}/jruby-complete-#{JRUBYC_VERSION}.jar.sha256"
-  rescue
-    warn(WARNING)
-  end
+desc 'dependency check'
+task :wget_check do
+  WGET ||= `which wget`
+  warn WARNING unless WGET
 end
 
-desc 'get sha256'
-task get_sha256: ["jruby-complete-#{JRUBYC_VERSION}.jar.sha256"]
-
-desc 'download, and copy to jruby_art'
-task default: %i[get_sha256 download copy_ruby]
-
-desc 'download JRuby upstream sources'
-task download: ["jruby-complete-#{JRUBYC_VERSION}.jar"]
+file "jruby-complete-#{JRUBYC_VERSION}.jar.sha256" do
+  system "wget https://repo1.maven.org/maven2/org/jruby/jruby-complete/#{JRUBYC_VERSION}/jruby-complete-#{JRUBYC_VERSION}.jar.sha256"
+end
 
 file "jruby-complete-#{JRUBYC_VERSION}.jar" do
   begin
     system "wget https://repo1.maven.org/maven2/org/jruby/jruby-complete/#{JRUBYC_VERSION}/jruby-complete-#{JRUBYC_VERSION}.jar"
-  rescue
+  rescue NameError
     warn(WARNING)
   end
   value = File.read("jruby-complete-#{JRUBYC_VERSION}.jar.sha256")
   check_sha256("jruby-complete-#{JRUBYC_VERSION}.jar", value)
 end
 
+desc 'get sha256'
+task get_sha256: ['wget_check', "jruby-complete-#{JRUBYC_VERSION}.jar.sha256"]
+
+desc 'download, and copy to jruby_art'
+task default: %i[wget_check download copy_ruby install_samples]
+
+desc 'download JRuby upstream sources'
+task download: ['get_sha256', "jruby-complete-#{JRUBYC_VERSION}.jar"]
+
 directory '../lib/ruby'
 
 desc 'copy jruby-complete'
@@ -67,30 +74,70 @@ def check_sha256(filename, expected_hash)
   raise "bad sha256 checksum for #{filename} (expected #{expected_hash} got #{sha256.hexdigest})"
 end
 
+desc 'initialize ~/.jruby_art directories'
+task :init_dir do
+  unless File.exist? "#{HOME_DIR}/.jruby_art/libraries"
+    FileUtils.mkdir_p "#{HOME_DIR}/.jruby_art/libraries"
+  end
+end
+
+desc 'download and copy sound library to ~/.jruby_art'
+task download_and_copy_sound: %i[wget_check init_dir download_sound copy_sound clobber]
+
+desc 'download and copy video library to ~/.jruby_art'
+task download_and_copy_video: %i[wget_check init_dir download_video copy_video clobber]
+
+desc 'download sound library'
+task :download_sound do
+  wget_base = 'wget https://github.com/processing/processing-sound'
+  wget_string = [wget_base, 'releases/download/latest', SOUND].join('/')
+  puts wget_string
+  system wget_string
+end
+
+desc 'download video library'
+task :download_video do
+  wget_base = 'wget https://github.com/processing/processing-video'
+  wget_string = [wget_base, 'releases/download', VIDEO_VERSION, VIDEO].join('/')
+  system wget_string
+end
+
+desc 'copy sound library'
+task copy_sound: SOUND do
+  system "unzip #{SOUND}"
+  FileUtils.rm_r "#{HOME_DIR}/.picrate/libraries/sound" if File.exist? "#{HOME_DIR}/.jruby_art/libraries/sound"
+  FileUtils.cp_r 'sound', "#{HOME_DIR}/.jruby_art/libraries"
+  FileUtils.rm_r 'sound'
+end
+
+desc 'copy video library'
+task copy_video: VIDEO do
+  system "unzip #{VIDEO}"
+  FileUtils.rm_r "#{HOME_DIR}/.picrate/libraries/video" if File.exist? "#{HOME_DIR}/.jruby_art/libraries/video"
+  FileUtils.cp_r 'video', "#{HOME_DIR}/.jruby_art/libraries/video"
+  FileUtils.rm_r 'video'
+end
+
 desc 'download, and copy to jruby_art'
-task unpack_samples: %i[download_examples copy_examples]
+task install_samples: %i[download_examples copy_examples]
 
 desc 'download and copy examples to user home'
 task :download_examples
 file_name = MAC_OR_LINUX.nil? ? "#{EXAMPLES}.zip" : "#{EXAMPLES}.tar.gz"
 file file_name do
-  begin
-    if MAC_OR_LINUX.nil?
-      system "wget https://github.com/ruby-processing/JRubyArt-examples/archive/#{EXAMPLES}.zip"
-    else
-      system "wget https://github.com/ruby-processing/JRubyArt-examples/archive/#{EXAMPLES}.tar.gz"
-    end
-  rescue
-    warn(WARNING)
+  if MAC_OR_LINUX.nil?
+    system "wget https://github.com/ruby-processing/JRubyArt-examples/archive/#{EXAMPLES}.zip"
+  else
+    system "wget https://github.com/ruby-processing/JRubyArt-examples/archive/#{EXAMPLES}.tar.gz"
   end
 end
 
 desc 'copy examples'
 task copy_examples: file_name do
   if MAC_OR_LINUX.nil?
-    sh "unzip #{EXAMPLES}.zip"
+    system  "unzip #{EXAMPLES}.zip"
   else
-    sh "tar xzvf #{EXAMPLES}.tar.gz"
+    system  "tar xzvf #{EXAMPLES}.tar.gz"
   end
   FileUtils.rm_r("#{HOME_DIR}/k9_samples") if File.exist? "#{HOME_DIR}/k9_samples"
   FileUtils.cp_r("JRubyArt-examples-#{EXAMPLES}", "#{HOME_DIR}/k9_samples")

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: jruby_art
 version: !ruby/object:Gem::Version
-  version: 2.2.0
+  version: 2.2.1
 platform: ruby
 authors:
 - Martin Prout
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2019-08-30 00:00:00.000000000 Z
+date: 2019-11-17 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rake
@@ -57,7 +57,7 @@ files:
 - lib/jogl-all-natives-macosx-universal.jar
 - lib/jogl-all-natives-windows-amd64.jar
 - lib/jogl-all.jar
-- lib/jruby_art-2.2.0.jar
+- lib/jruby_art-2.2.1.jar
 - lib/jruby_art.rb
 - lib/jruby_art/app.rb
 - lib/jruby_art/config.rb
@@ -116,7 +116,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
 requirements:
 - A decent graphics card
 - java runtime >= 11.0.3+
-rubygems_version: 3.0.4
+rubygems_version: 3.0.6
 signing_key: 
 specification_version: 4
 summary: Code as Art, Art as Code. Processing and Ruby are meant for each other.