propane 2.5.0-java → 2.6.0-java

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 9533ddd2e6f1573ce40817c97356676069e9e2a4
-  data.tar.gz: 7b2b891d044c4f98c85b5b1f286a60d1b77f5281
+  metadata.gz: 567aec3d6371ce62d0f6f92dd1f5b892d19d70b5
+  data.tar.gz: 03c137c744d27124dbf52a4fca6cbd78b02f1c11
 SHA512:
-  metadata.gz: 7e9fec391db8b365247028e0a298329342e39fa716027a031402768cecb33c5e764fcd0fae5d96ed31dafa578bdbfa9d762cf1c6cb8549baeae01a345a7db623
-  data.tar.gz: 0d251e46ec1a06f2bed2357a2ae178c6af0a67efe0cd5f869aea38287e9bc7232585018dd553a4041b971ee82e3e76b8299598c509a936d726bf04e61fda03d3
+  metadata.gz: 1d139c3005b7b43ccb8a9f063a459b9a036c45dcf466eb7827208a6ea9baaf2b22f7490d53499c9f369acddf7ef6b0ecd344bd07606fcdd8de2e1006b1ace02e
+  data.tar.gz: 61f7b3f865f49ac239ce886b59f0c336f37ab1b8fa456d238a4fd420088a613dfbc5d39b1226554c2e8a5e67b743c64de4ef9f28cb3799f0b74c882bafc3df98

data/.mvn/extensions.xml

@@ -3,6 +3,6 @@
   <extension>
     <groupId>io.takari.polyglot</groupId>
     <artifactId>polyglot-ruby</artifactId>
-    <version>0.1.19</version>
+    <version>0.2.0</version>
   </extension>
 </extensions>

data/CHANGELOG.md

@@ -1,10 +1,14 @@
+**v2.6.0** Reafactored `LibraryLoader` knows less about `Library` class.  The library class _knows_ about paths, and checks that they exist. Features ability to load GLVideo library, that will surely be the future for video (supports gstreamer-1.0 instead of gstreamer-0.1.0 that has already been dropped by some linux distros).
+
+**v2.5.5** Intermediate `refactored_library` loader, can be release if required but still not there as regards refactor goals.
+
 **v2.5.0** No need for `$app` we can replace with `Propane.app`
 
-**v2.4.1** Add post_initialize hoop to app.rb.
+**v2.4.1** Add `post_initialize` hook to `app.rb`.
 
 **v2.4.0** Extend LibraryProxy to include mouseEvent and keyEvent.
 
-**v2.3.4** Simplify control_panel library (replacing `c.title = 'PaneTitle'` with `c.title('PaneTitle')`) also enable use of `block` with `button's`.
+**v2.3.4** Simplify `control_panel` library (replacing `c.title = 'PaneTitle'` with `c.title('PaneTitle')`) also enable use of `block` with `button's`.
 
 **v2.3.3** Update to processing-3.3.4, and upgrade jruby-9.1.12.0 last in 9.1 series?
 

data/README.md

@@ -28,7 +28,7 @@ rake javadoc
 ## Installation
 ```bash
 jgem install propane # from rubygems
-jgem install propane-2.5.0-java.gem # for local install
+jgem install propane-2.6.0-java.gem # for local install
 ```
 
 ## Usage

data/lib/propane.rb

@@ -1,8 +1,8 @@
-# frozen_string_literal: false
+# frozen_string_literal: true
 require 'java'
 unless defined? PROPANE_ROOT
   $LOAD_PATH << File.expand_path(File.dirname(__FILE__))
-  PROPANE_ROOT = File.expand_path(File.dirname(__FILE__) + '/../')
+  PROPANE_ROOT = File.absolute_path(File.dirname(__dir__))
 end
 Dir["#{PROPANE_ROOT}/lib/*.jar"].each do |jar|
   require jar

data/lib/propane/creators/sketch_factory.rb

@@ -0,0 +1,12 @@
+require_relative 'sketch_writer'
+
+class SketchFactory
+  NAMES = %w[One Two Three]
+  def initialize(argc)
+    NAMES.each do |name|
+      SketchWriter.new(File.basename(name, '.rb'), width: 300, height: 300).write
+    end
+  end
+end
+
+SketchFactory.new(File.join(ENV['HOME'], 'test'))

data/lib/propane/library.rb

@@ -0,0 +1,69 @@
+require_relative 'native_folder'
+require_relative 'native_loader'
+require 'pathname'
+
+# This class knows where to find propane libraries
+class Library
+  attr_reader :name, :path, :dir, :ppath
+
+  def initialize(name)
+    @name = name
+    @ruby = true
+  end
+
+  def locate
+    return if (@path = Pathname.new(
+      File.join(Propane::SKETCH_ROOT, 'library', name, "#{name}.rb")
+    )).exist?
+    return if (@path = Pathname.new(
+      File.join(PROPANE_ROOT, 'library', name, "#{name}.rb")
+    )).exist?
+    locate_java
+  end
+
+  def locate_java
+    @dir = Pathname.new(
+      File.join(Propane::SKETCH_ROOT, 'library', name)
+    )
+    locate_installed_java
+  end
+
+  def locate_installed_java
+    unless dir.directory?
+      @dir = Pathname.new(
+        File.join(ENV['HOME'], '.propane', 'libraries', name, 'library')
+      )
+    end
+    @path = dir.join(Pathname.new("#{name}.jar"))
+  end
+
+  def ruby?
+    path.extname == '.rb'
+  end
+
+  def exist?
+    path.exist?
+  end
+
+  def load_jars
+    Dir.glob("#{dir}/*.jar").each do |jar|
+      require jar
+    end
+    return true unless native_binaries?
+    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 add_binaries_to_classpath
+    native_loader = NativeLoader.new
+    native_loader.add_native_path(ppath)
+    true
+  end
+end

data/lib/propane/library_loader.rb

@@ -1,8 +1,13 @@
 # frozen_string_literal: false
+
 # The processing wrapper module
 module Propane
+  require_relative 'library'
+
   # Encapsulate library loader functionality as a class
   class LibraryLoader
+    attr_reader :library
+
     def initialize
       @loaded_libraries = Hash.new(false)
     end
@@ -13,103 +18,36 @@ module Propane
     end
 
     # Load a list of Ruby or Java libraries (in that order)
-    # Usage: load_libraries :opengl, :boids
+    # Usage: load_libraries :video, :video_event
     #
     # If a library is put into a 'library' folder next to the sketch it will
-    # be used instead of the library that ships with Propane.
+    # be used instead of an installed propane library.
     def load_libraries(*args)
       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
+        loaded = loader(lib)
+        raise(LoadError.new, format(message, lib)) unless loaded
       end
     end
-    alias_method :load_library, :load_libraries
-
-    # For pure ruby libraries.
-    # The library should have an initialization ruby file
-    # of the same name as the library folder.
-    def load_ruby_library(library_name)
-      library_name = library_name.to_sym
-      return true if @loaded_libraries.include?(library_name)
-      path = get_library_paths(library_name, 'rb').first
-      return false unless path
-      @loaded_libraries[library_name] = (require path)
-    end
+    alias load_library load_libraries
 
-    # HACK: For pure java libraries, such as the ones that are available
-    # on this page: http://processing.org/reference/libraries/index.html
-    # that include native code, we mess with the 'Java ClassLoader', so that
-    # you don't have to futz with your PATH. But it's probably bad juju.
-    def load_java_library(library_name)
-      library_name = library_name.to_sym
-      return true if @loaded_libraries.include?(library_name)
-      jpath = get_library_directory_path(library_name, 'jar')
-      jars = get_library_paths(library_name, 'jar')
-      return false if jars.empty?
-      jars.each { |jar| require jar }
-      platform_specific_library_paths = get_platform_specific_library_paths(jpath)
-      platform_specific_library_paths = platform_specific_library_paths.select do |ppath|
-        FileTest.directory?(ppath) && !Dir.glob(File.join(ppath, '*.{so,dll,jnilib}')).empty?
-      end
-      unless platform_specific_library_paths.empty?
-        platform_specific_library_paths << java.lang.System.getProperty('java.library.path')
-        new_library_path = platform_specific_library_paths.join(java.io.File.pathSeparator)
-        java.lang.System.setProperty('java.library.path', new_library_path)
-        field = java.lang.Class.for_name('java.lang.ClassLoader').get_declared_field('sys_paths')
-        if field
-          field.accessible = true
-          field.set(java.lang.Class.for_name('java.lang.System').get_class_loader, nil)
-        end
-      end
-      @loaded_libraries[library_name] = true
+    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
 
-    def platform
-      match = %w(mac linux windows).find do |os|
-        java.lang.System.getProperty('os.name').downcase.index(os)
-      end
-      return 'other' unless match
-      return match unless match =~ /mac/
-      'macosx'
+    def load_jars(lib, name)
+      lib.load_jars
+      @loaded_libraries[name] = true
     end
 
-    def get_platform_specific_library_paths(basename)
-      # for MacOSX, 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')
-        bits = '32'
-      elsif java.lang.System.getProperty('sun.arch.data.model') == '64' ||
-            java.lang.System.getProperty('java.vm.name').index('64')
-        bits = '64' unless platform =~ /macosx/
-      end
-      [platform, platform + bits].map { |p| File.join(basename, p) }
-    end
-
-    def get_library_paths(library_name, extension = nil)
-      dir = get_library_directory_path(library_name, extension)
-      Dir.glob("#{dir}/*.{rb,jar}")
-    end
-
-    protected
-
-    def get_library_directory_path(library_name, extension = nil)
-      extensions = extension ? [extension] : %w(jar rb)
-      extensions.each do |ext|
-        [
-          "#{SKETCH_ROOT}/library/#{library_name}",
-          "#{PROPANE_ROOT}/library/#{library_name}",
-          "#{PROPANE_ROOT}/library/#{library_name}/library",
-          "#{PROPANE_ROOT}/library/#{library_name}",
-          "#{ENV['HOME']}/.propane/libraries/#{library_name}/library"
-        ].each do |jpath|
-          if File.exist?(jpath) && !Dir.glob(format('%s/*.%s', jpath, ext)).empty?
-            return jpath
-          end
-        end
-      end
-      nil
+    def require_library(lib, name)
+      @loaded_libraries[name] = require lib.path
     end
   end
 end

data/lib/propane/native_folder.rb

@@ -0,0 +1,33 @@
+require 'rbconfig'
+
+# Utility to load native binaries on Java CLASSPATH
+class NativeFolder
+  attr_reader :os, :bit
+
+  WIN_FORMAT = 'windows%d'.freeze
+  LINUX_FORMAT = 'linux%d'.freeze
+  # WIN_PATTERNS = [
+  #   /bccwin/i,
+  #   /cygwin/i,
+  #   /djgpp/i,
+  #   /ming/i,
+  #   /mswin/i,
+  #   /wince/i
+  # ].freeze
+
+  def initialize
+    @os = RbConfig::CONFIG['host_os'].downcase
+    @bit = java.lang.System.get_property('os.arch') =~ /64/ ? 64 : 32
+  end
+
+  def name
+    return 'macosx' if os =~ /darwin/ || os =~ /mac/
+    # return format(WIN_FORMAT, bit) if WIN_PATTERNS.include? os
+    return format(LINUX_FORMAT, bit) if os =~ /linux/
+  end
+
+  def extension
+    return '*.so' if os =~ /linux/
+    '*.dylib' # MacOS
+  end
+end

data/lib/propane/native_loader.rb

@@ -0,0 +1,27 @@
+# This class knows how to dynamically set the 'java' native library path
+# It might not work with java 9?
+class NativeLoader
+  attr_reader :separator, :current_path
+
+  # This module wraps java_import with namespace JC
+  module JC
+    java_import 'java.lang.Class'
+    java_import 'java.lang.System'
+    java_import 'java.io.File'
+  end
+
+  def initialize
+    @separator = JC::File.pathSeparatorChar
+    @current_path = JC::System.getProperty('java.library.path')
+  end
+
+  def add_native_path(pth)
+    current_path << separator << pth
+    JC::System.setProperty('java.library.path', current_path)
+    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
+end

data/lib/propane/runner.rb

@@ -40,7 +40,7 @@ module Propane
         end
 
         options[:install] = false
-        message = '<Samples><Video><Sound> Install samples or library'
+        message = '<Samples><GLVideo><Video><Sound> Install samples or library'
         opts.on('-i', '--install', message) do
           options[:install] = true
         end
@@ -50,11 +50,6 @@ module Propane
           options[:create] = true
         end
 
-        options[:example] = false
-        opts.on('-e', '--example', 'Create new sketch outline') do
-          options[:example] = true
-        end
-
         # This displays the help screen, all programs are
         # assumed to have this option.
         opts.on('-h', '--help', 'Display this screen') do
@@ -68,11 +63,6 @@ module Propane
 
     def create
       require_relative 'creators/sketch_writer'
-      SketchFactory.new(argc).write
-    end
-
-    def examples
-      require_relative 'creators/sketch_factory'
       SketchWriter.new(File.basename(filename, '.rb'), argc).write
     end
 
@@ -83,7 +73,7 @@ module Propane
 
     def install(library)
       choice = library.downcase
-      valid = Regexp.union('samples', 'sound', 'video')
+      valid = Regexp.union('samples', 'sound', 'video', 'glvideo')
       return warn format('No installer for %s', choice) unless valid =~ choice
       system "cd #{PROPANE_ROOT}/vendors && rake download_and_copy_#{choice}"
     end

data/lib/propane/version.rb

@@ -1,4 +1,4 @@
 # frozen_string_literal: true
 module Propane
-  VERSION = '2.5.0'.freeze
+  VERSION = '2.6.0'.freeze
 end

data/pom.rb

@@ -1,7 +1,7 @@
 require 'fileutils'
 project 'rp5extras', 'https://github.com/monkstone/propane' do
   model_version '4.0.0'
-  id 'propane:propane', '2.5.0'
+  id 'propane:propane', '2.6.0'
   packaging 'jar'
   description 'rp5extras for propane'
   organization 'ruby-processing', 'https://ruby-processing.github.io'

data/pom.xml

@@ -11,7 +11,7 @@ DO NOT MODIFIY - GENERATED CODE
   <modelVersion>4.0.0</modelVersion>
   <groupId>propane</groupId>
   <artifactId>propane</artifactId>
-  <version>2.5.0</version>
+  <version>2.6.0</version>
   <name>rp5extras</name>
   <description>rp5extras for propane</description>
   <url>https://github.com/monkstone/propane</url>

data/vendors/Rakefile

@@ -7,9 +7,10 @@ WARNING = <<-EOS
 EOS
 SOUND = 'sound.zip'.freeze
 SOUND_VERSION = 'v1.3.2' # version 1.3.2
+GLVIDEO = 'processing-glvideo.zip'
 VIDEO = 'video-2.zip'
 VIDEO_VERSION = '2' # version 1.0.1
-EXAMPLES = '1.5'.freeze
+EXAMPLES = '1.6'.freeze
 HOME_DIR = ENV['HOME']
 MAC_OR_LINUX = /linux|mac|darwin/ =~ RbConfig::CONFIG['host_os']
 
@@ -37,6 +38,9 @@ task download_and_copy_sound: [:download_sound, :copy_sound]
 desc 'download and copy video library to ~/.propane'
 task download_and_copy_video: [:download_video, :copy_video]
 
+desc 'download and copy glvideo library to ~/.propane'
+task download_and_copy_glvideo: [:download_glvideo, :copy_glvideo]
+
 
 desc 'download sound library'
 task :download_sound do
@@ -49,6 +53,17 @@ task :download_sound do
   end
 end
 
+desc 'download glvideo library'
+task :download_glvideo do
+  wget_base = 'wget https://github.com/gohai/processing-glvideo'
+  wget_string = [wget_base, 'releases/download/latest', GLVIDEO].join('/')
+  begin
+    sh wget_string
+  rescue
+    warn(WARNING)
+  end
+end
+
 desc 'download video library'
 task :download_video do
   wget_base = 'wget https://github.com/processing/processing-video'
@@ -87,3 +102,11 @@ task :copy_video => VIDEO do
   sh "cp -r video #{HOME_DIR}/.propane/libraries/video"
   sh 'rm -r video'
 end
+
+desc 'copy glvideo library'
+task :copy_glvideo => GLVIDEO do
+  sh "unzip #{GLVIDEO}"
+  sh "rm -r #{HOME_DIR}/.propane/libraries/glvideo" if File.exist? "#{HOME_DIR}/.propane/libraries/glvideo"
+  sh "cp -r glvideo #{HOME_DIR}/.propane/libraries/glvideo"
+  sh 'rm -r glvideo'
+end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: propane
 version: !ruby/object:Gem::Version
-  version: 2.5.0
+  version: 2.6.0
 platform: java
 authors:
 - monkstone
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2017-08-15 00:00:00.000000000 Z
+date: 2017-08-26 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rake
@@ -91,10 +91,14 @@ files:
 - lib/propane.rb
 - lib/propane/app.rb
 - lib/propane/creators/sketch_class.rb
+- lib/propane/creators/sketch_factory.rb
 - lib/propane/creators/sketch_writer.rb
 - lib/propane/helper_methods.rb
 - lib/propane/helpers/numeric.rb
+- lib/propane/library.rb
 - lib/propane/library_loader.rb
+- lib/propane/native_folder.rb
+- lib/propane/native_loader.rb
 - lib/propane/runner.rb
 - lib/propane/version.rb
 - library/boids/boids.rb