jruby_art 0.2.2.pre → 0.2.3.pre

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: cc6b839d4a0522e7ee66e742f988458db321bd8c
-  data.tar.gz: 139442bd195106223036ab7d7e8af3090466c58b
+  metadata.gz: 6583235100be711a51d787b016db40e373f058bb
+  data.tar.gz: 3e12254c7ba77564a7a43899e09b142a4add57f2
 SHA512:
-  metadata.gz: fd9a024eb64be8c46b8f505243e848928e922d525aa6c7485abf5e5c3de52141aa3110e047b7dfb62e72b1816ee568e8ec1e4a226aab16e6499865e7fb01bd27
-  data.tar.gz: 422611e5878dc76d27346b1c935ff5b3356dd1a5d8db86c46df25b1938c66a21a3ff8bb9beb909a79c120ddb29a60e4d8530d9e84fbca3005dfb715df3ab631f
+  metadata.gz: 98e5d4dc74ed309290100e96f2d42fcfab4eb3346e46b86a8129f107fcabecea90cd63a5e557f87f1e3e08389c84115d491e98195392842dc0d0eb5e2df790a7
+  data.tar.gz: 39dbad9dbf14b0520dd8c9b0c350a1e200741e1bee9f9796474e466de41ed49006dc9828f09e390a9dec59db1731e9de2a8c6511318fbbcaff2786c3bd41a9cc

data/CHANGELOG.md

@@ -0,0 +1,45 @@
+## JRubyArt CHANGELOG
+
+It might seem a little of that this log starts at version 0.1.2, the reason for this is that previous version relate to earlier versions which were essentially a clone of ruby-processing.
+
+### Version 0.2.3
+
+Now using curl instead of wget "following the path of least resistance for enfeebled Mac users" and also there might be better Windows support for curl vs wget. Now includes a library loader for jars (supports video and sound library etc), added control_panel and boids library.
+
+### Version 0.2.2
+This was meant to be the pre-jruby-9000 version, but is now the pre library_loader
+version
+
+### Version 0.2.1
+
+Features jruby-complete-1.7.19 and filtered native jars (attempt at load according to OS and Arch) works linux64
+
+### Version 0.2.0
+
+First pre release version features jruby-complete-1.7.18
+
+### Version 0.1.7
+
+Now installs jruby-complete-1.7.17 (which is a good deal smaller), also includes experimental Proxy extension to access draw, pre and post loops by reflection
+
+### Version 0.1.6
+
+Vec2D and Vec3D get `:to_curve_vertex`, see included example. Also new in examples is how to use jar libraries (toxiclibs) with JRubyArt.
+
+### Version 0.1.5
+
+Now you can wrap a bare sketch with `k9 wrap sketch.rb` sensibly wraps bare P2D, P3D and default processing mode sketches.  The runner now laso makes a similar check.
+
+### Version 0.1.4
+
+Now with k9 you can run `bare` sketches, like original ruby-processing but with less sugar. So instead of `cos` use `Math,cos` etc, further no attempt has been made to mimic processing inner-class behaviour (bad OO practice). 
+
+
+### Version 0.1.3
+
+Move config file from ~/.k9rc to ~/.jruby_art/config.yml, created installer for jruby-complete.jar.  For sketches needing to be run with jruby-complete use `k9 run sketch.rb` (this includes shader sketches with `load_image`) or use netbeans with jruby-plugin to develop your sketches. For 3D sketches (or to use P2D) inherit from AppGL, both AppGL and App inherit directly from PApplet. Examples have been moved to there own repo `k9 setup install` downloads and install jruby-complete and downloads and extracts sample to users HOME directory.
+
+
+### Version 0.1.2
+
+First point release, requires user build, supports 2D and opengl sketches, but no library support. Sketches will only run with jruby (jruby-complete is not included). To run sketches with load_image jruby-complete is required, so either provide that or use netbeans as your ide (with jruby plugin).

data/README.md

@@ -10,7 +10,7 @@ Java runtime 7+, and ruby (can be MRI ruby), curl (to download jruby-complete an
 ### Getting Started
 
 ```bash
-gem install jruby-art --dev
+gem install jruby-art --pre
 k9 setup install # uses curl to to download jruby-complete and examples
 cd examples/contributed
 k9 run clock.rb # if you've got jruby on your machine `jruby clock.rb` also works
@@ -53,7 +53,7 @@ However such sketches must be run with `k9 run sketch.rb`, however you can do 'k
 
 jruby-1.7.19 (when sketches run with jruby command)
 
-jruby-9.0.0.0.pre1 also seems to work (the next pre-release will target jruby-9.0.0.0-pre1)
+jruby-9.0.0.0.pre1 also seems to work (the next pre-release will target jruby-9.0.0.0-pre2)
 
 or
 
@@ -73,6 +73,7 @@ See [netbeans][]
 
 [CHANGELOG][]
 
+[Building latest gem](https://github.com/ruby-processing/JRubyArt/wiki/Building-latest-gem/)
 [Acknowledgements]:ACKNOWLEDGEMENTS.md
 [CHANGELOG]:CHANGELOG.md
 [Contributing]:CONTRIBUTING.md

data/Rakefile

@@ -4,26 +4,29 @@ require 'rake/clean'
 require 'rubygems/package_task'
 require 'rdoc/task'
 require 'rake/testtask'
-require 'rspec/core/rake_task'
 require_relative 'lib/jruby_art/version'
 
+CLEAN.include('tmp')
+CLOBBER.include(Rake::FileList.new('lib/*.jar'))
+
 spec = Gem::Specification.new do |s|
   s.name = 'jruby_art'
   s.version = JRubyArt::VERSION
   s.has_rdoc = true
-  s.extra_rdoc_files = ['README.md', 'LICENSE.md']
+  s.extra_rdoc_files = ['README.md', 'LICENSE.md', 'CHANGELOG.md']
   s.summary = 'Ruby processing development branch'
-  s.description = 'A jruby wrapper for processing'
+  s.description = "A ruby wrapper for processing, that doesn't require a separate install of processing"
   s.license = 'MIT'
   s.author = 'Martin Prout'
   s.email = 'martin_p@lineone.net'
   s.homepage = 'https://github.com/ruby-processing/JRubyArt'
   s.executables << 'k9'
-  s.files = %w(LICENSE.md README.md Rakefile) + Dir.glob("{bin,lib,spec,vendors}/**/*")
+  s.files = %w(LICENSE.md README.md Rakefile CHANGELOG.md) + Dir.glob('{bin,lib,library,spec,vendors}/**/*')
   s.require_path = 'lib'
-  s.add_development_dependency "rake", "~> 10.4"
-  s.add_development_dependency "rspec", "~> 3.1"
-  s.add_development_dependency "rake-compiler", "~> 0.9"
+  s.required_ruby_version = '~> 2.0'
+  s.add_development_dependency 'rake', '~> 10.4'
+  s.add_development_dependency 'rspec', '~> 3.2'
+  s.add_development_dependency 'rake-compiler', '~> 0.9'
   s.requirements << 'A decent graphics card'
   s.requirements << 'java runtime >= 1.7+'
 end
@@ -41,53 +44,42 @@ def copy_jars(name, dest)
   begin
     path = File.expand_path(conf)
     rp_config = (Psych.load_file(path))
-    source= "#{rp_config["PROCESSING_ROOT"]}/core/library/"    
+    source = "#{rp_config['PROCESSING_ROOT']}/core/library/"
   rescue
     raise "WARNING: you must set PROCESSING_ROOT in #{conf} compile"
   end
-	body = proc {
-	  Dir["#{source}/*.jar"].each do |f|
-	    puts "Copying #{f} To #{dest}"
-	    FileUtils.cp f, dest
-	  end
-	}
-	Rake::Task.define_task(name, &body)	
+  body = proc {
+    Dir["#{source}/*.jar"].each do |f|
+      puts "Copying #{f} To #{dest}"
+      FileUtils.cp f, dest
+    end
+  }
+  Rake::Task.define_task(name, &body)
 end
 
 copy_jars(:processing_jars, 'lib')
 
 Rake::JavaExtensionTask.new('processing') do |ext|
   jars = FileList['lib/*.jar']
-  ext.classpath = jars.map { |x| File.expand_path x}.join ':'
+  ext.classpath = jars.map { |x| File.expand_path x }.join ':'
   ext.name = 'rpextras'
   ext.debug = true
   ext.lib_dir = 'lib'
-  ext.source_version='1.7'
-  ext.target_version='1.7'
+  ext.source_version = '1.7'
+  ext.target_version = '1.7'
 end
 
 Gem::PackageTask.new(spec) do |p|
   p.gem_spec = spec
-  p.need_tar = true
-  p.need_zip = true
+  p.need_tar = false
+  p.need_zip = false
 end
 
 Rake::RDocTask.new do |rdoc|
-  files =['README.md', 'LICENSE.md', 'lib/**/*.rb']
+  files = ['README.md', 'LICENSE.md', 'lib/**/*.rb', 'library']
   rdoc.rdoc_files.add(files)
-  rdoc.main = "README.md" # page to start on
-  rdoc.title = "JRubyArt Docs"
+  rdoc.main = 'README.md' # page to start on
+  rdoc.title = 'JRubyArt Docs'
   rdoc.rdoc_dir = 'doc/rdoc' # rdoc output folder
   rdoc.options << '--line-numbers'
 end
-
-Rake::TestTask.new do |t|
-  t.test_files = FileList['test/**/*.rb']
-end
-
-RSpec::Core::RakeTask.new do |spec|
-  spec.pattern = 'spec/*_spec.rb'
-  spec.rspec_opts = [Dir["lib"].to_a.join(':')]
-end
-
-

data/lib/jruby_art/app.rb

@@ -1,4 +1,5 @@
 require_relative 'helper_methods'
+require_relative 'library_loader'
 
 # The Processing module is a wrapper for JRubyArt
 # Author:: Martin Prout (extends / re-implements ruby-processing)
@@ -25,14 +26,14 @@ module Processing
     def post_initialize(_opts = {})
       nil
     end
-
+    
     # This method configures the sketch title and and presentation mode.
     #
     def configure_sketch
       presentation_mode
       sketch_title
     end
-
+    
     # This method sets the sketch presentation mode.
     #
     def presentation_mode
@@ -40,20 +41,20 @@ module Processing
       args << '--full-screen'
       args << "--bgcolor=#{opts[:bgcolor]}" if opts[:bgcolor]
     end
-
+    
     # This method is the main draw loop of the sketch. This is usually
     # overridden by the user.
     #
     def draw
       nil
     end
-
+    
     # This method runs the processing sketch.
     #
     def run_sketch
       PApplet.run_sketch(args.to_java(:string), self)
     end
-
+    
     # This method sets the sketch title.
     #
     def sketch_title
@@ -72,13 +73,34 @@ module Processing
     key_released: :keyReleased,
     key_typed: :keyTyped
   }
-
+  
   # This class is for default (Java2D) sketches only
   class App < PApplet
-    include Common, HelperMethods
-    Java::ProcessingVecmathArcball::ArcballLibrary.new.load(JRuby.runtime, false)
+    include Math, Common, HelperMethods
     attr_reader :title, :args, :opts
-
+    
+    class << self
+      # Handy getters and setters on the class go here:
+      attr_accessor :sketch_class, :library_loader
+      
+      def load_libraries(*args)
+        library_loader ||= LibraryLoader.new
+        library_loader.load_libraries(*args)
+      end
+      alias_method :load_library, :load_libraries
+      
+      # When certain special methods get added to the sketch, we need to let
+      # 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
+    
+    def sketch_class
+      self.class.sketch_class
+    end
+    
     # App should be instantiated with an optional list of opts
     # and array of args.
     #
@@ -90,35 +112,27 @@ module Processing
       post_initialize(opts)
       @args = args
       @opts = opts
+      $app = self
       configure_sketch
       run_sketch
     end
-
+    
     # This method provides the default setup for the sketch. It can
     # be overridden by the user for finer grained control.
     #
     def setup
       size(width, height)
     end
-
-    # When certain special methods get added to the sketch, we need to let
-    # Processing call them by their expected Java names.
-    def self.method_added(method_name) # :nodoc:
-      # Watch the definition of these methods, to make sure
-      # that Processing is able to call them during events.
-      if METHODS_TO_ALIAS.key?(method_name)
-        alias_method METHODS_TO_ALIAS[method_name], method_name
-      end
-    end
   end
-
+  
   # This class is for opengl sketches (P2D and P3D)
   class AppGL < PApplet
-    include Processing, Common
+    include Math, Processing, Common
     include_package 'processing.opengl' # imports the processing.opengl package.
     include HelperMethods
+    Java::ProcessingVecmathArcball::ArcballLibrary.new.load(JRuby.runtime, false)
     attr_reader :title, :args, :opts
-
+    
     # App should be instantiated with an optional list of opts
     # and array of args.
     #
@@ -130,10 +144,11 @@ module Processing
       post_initialize(opts)
       @args = args
       @opts = opts
+      $app = self
       configure_sketch
       run_sketch
     end
-
+    
     # This method provides the default setup for the sketch. It can
     # be overridden by the user for finer grained control.
     #
@@ -141,7 +156,13 @@ module Processing
       size(width, height, mode = P3D)
       fail unless /opengl/ =~ mode
     end
-
+    
+    def load_libraries(*args)
+      library_loader ||= LibraryLoader.new
+      library_loader.load_libraries(*args)
+    end
+    alias_method :load_library, :load_libraries
+    
     # When certain special methods get added to the sketch, we need to let
     # Processing call them by their expected Java names.
     def self.method_added(method_name) #:nodoc:
@@ -151,3 +172,4 @@ module Processing
     end
   end
 end
+

data/lib/jruby_art/config.rb

@@ -1,7 +1,7 @@
 require 'psych'
-
+# The Processing module is a wrapper for JRubyArt
+# Author:: Martin Prout (extends / re-implements ruby-processing)
 module Processing
-
   unless defined? RP_CONFIG
     begin
       CONFIG_FILE_PATH = File.expand_path('~/.jruby_art/config.yml')

data/lib/jruby_art/creator.rb

@@ -55,7 +55,7 @@ module Processing
     def already_exist(path)
       underscore = StringExtra.new(path).underscore
       new_file = "#{File.dirname(path)}/#{underscore}.rb"
-      return if !File.exist?(path) && !File.exist?(new_file)
+      return if !FileTest.exist?(path) && !FileTest.exist?(new_file)
       puts 'That file already exists!'
       exit
     end

data/lib/jruby_art/helper_methods.rb

@@ -1,4 +1,5 @@
 module Processing
+  # Useful methods, not otherwise available	
   module HelperMethods
     # processings epsilon may not be defined yet
     EPSILON ||= 1.0e-04
@@ -107,7 +108,7 @@ module Processing
       end
       fail ArgumentError, 'takes 4 parameters'
     end
-  
+
     # dist_squared only makes sense with 3D distance
     def dist_squared(*args)
       len = args.length

data/lib/jruby_art/helpers/numeric.rb

@@ -1,4 +1,5 @@
-class Numeric #:nodoc:
+# extends Numeric class to provide degrees and radians convenience methods
+class Numeric  
   def degrees
     self * 180 / Math::PI
   end

data/lib/jruby_art/library_loader.rb

@@ -0,0 +1,104 @@
+# The LibraryLoader class adds some logic for loading library jars/ruby libraries
+class LibraryLoader
+  require_relative 'config'
+  attr_reader :installed, :libraries_path, :loaded_libraries, :local
+  
+  def initialize
+    @libraries_path = Processing::RP_CONFIG.fetch('LIBRARIES_PATH', "#{ENV['HOME']}/.jruby_art/libraries")
+    @loaded_libraries = []
+    sketch_root = defined?(SKETCH_ROOT).nil? ? Dir.pwd : SKETCH_ROOT
+    @local = File.absolute_path("#{sketch_root}/library/")
+    @installed = File.absolute_path("#{K9_ROOT}/library/")
+  end
+  
+  # Load a list of Java libraries or ruby libraries
+  # Usage: load_libraries :boids, :control_panel, :video
+  #
+  # If a library is put into a 'library' folder next to the sketch it will
+  # be used instead of the library that ships with JRubyArt.
+  def load_libraries(*args)
+    args.each do |arg|
+      next if loaded_libraries.include? arg
+      local_ruby_lib(arg)
+      local_java_lib(arg)
+      installed_ruby_lib(arg)
+      installed_java_lib(arg)
+    end
+  end
+  
+  def local_java_lib(arg)
+    java_lib(local, arg)
+  end
+  
+  def installed_java_lib(arg)
+    java_lib(libraries_path, arg)
+  end
+  
+  def installed_ruby_lib(arg)
+    ruby_file = File.join(installed, format('%s/%s.rb', arg, arg))
+    return unless FileTest.exist?(ruby_file)
+    require ruby_file
+    loaded_libraries << arg
+  end
+  
+  def local_ruby_lib(arg)
+    ruby_file = File.join(local, format('%s.rb', arg))
+    return unless FileTest.exist? ruby_file
+    require ruby_file
+    loaded_libraries << arg
+  end
+  
+  # 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 java_lib(path, library_name)
+    library_name = library_name.to_sym
+    jars = get_library_paths(path, library_name)
+    jpath = format("%s/%s/library", path, library_name.to_s )
+    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|
+      test(?d, 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
+  end
+  
+  def platform
+    match = %w(Mac Linux Windows).find do |os|
+      java.lang.System.getProperty('os.name').index(os)
+    end
+    return 'other' unless match
+    return match.downcase unless match =~ /Mac/
+    'macosx'
+  end
+  
+  def get_platform_specific_library_paths(basename)
+    bits = 'universal' # for MacOSX, but does this even work, or does Mac return '64'?
+    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(path, library_name)
+    lib = File.join(path, library_name.to_s)
+    jar_files = File.join(lib, '**', '*.jar')
+    Dir.glob(jar_files)
+  end
+end

data/lib/jruby_art/parse.rb

@@ -6,7 +6,7 @@ SKETCH_ROOT ||= File.dirname(SKETCH_PATH)
 require_relative '../jruby_art'
 require_relative '../jruby_art/'
 require_relative '../jruby_art/helpers/string_extra'
-
+# The top level module
 module Processing
   # For use with "bare" sketches that don't want to define a class or methods
   BARE_TEMPLATE = <<-EOS
@@ -18,7 +18,7 @@ module Processing
 
   Sketch.new(title: '%s')
   EOS
-  
+
   NAKED_TEMPLATE = <<-EOS
   require 'jruby_art'
 
@@ -37,14 +37,14 @@ module Processing
   def self.load_and_run_sketch
     source = read_sketch_source
     has_sketch = !source.match(/^[^#]*< Processing::App/).nil?
-    has_methods = !source.match(/^[^#]*(def\s+setup|def\s+draw)/).nil?    
+    has_methods = !source.match(/^[^#]*(def\s+setup|def\s+draw)/).nil?
     return load File.join(SKETCH_ROOT, SKETCH_PATH) if has_sketch
     title = StringExtra.new(File.basename(SKETCH_PATH).sub(/(\.rb)$/, '')).titleize
     if has_methods
-      default = source.match(/P(2|3)D/)      
+      default = source.match(/P(2|3)D/)
       mode = default ? 'Processing::App' : 'Processing::AppGL'
       code = format(BARE_TEMPLATE, mode, source, title)
-    else     
+    else
       code = format(NAKED_TEMPLATE, source, title)
     end
     Object.class_eval code, SKETCH_PATH, -1
@@ -57,4 +57,3 @@ module Processing
 end
 
 Processing.load_and_run_sketch
-

data/lib/jruby_art/runner.rb

@@ -25,12 +25,12 @@ module Processing
     EOS
     
     WIN_PATTERNS = [
-    /bccwin/i,
-    /cygwin/i,
-    /djgpp/i,
-    /mingw/i,
-    /mswin/i,
-    /wince/i
+                      /bccwin/i,
+                      /cygwin/i,
+                      /djgpp/i,
+                      /mingw/i,
+                      /mswin/i,
+                      /wince/i
     ]
     
     attr_reader :os
@@ -80,7 +80,7 @@ module Processing
       writer.read(sketch)
       writer.write
     end
-    
+  
     def run(sketch, args)
       command = ['java', '-jar', jruby_complete, parse, sketch, args].flatten
       exec(*command)
@@ -88,7 +88,7 @@ module Processing
     
     def jruby_complete
       rcomplete = File.join(K9_ROOT, '/lib/ruby/jruby-complete.jar')
-      return rcomplete if File.exist?(rcomplete)
+      return rcomplete if FileTest.exist?(rcomplete)
       warn "#{rcomplete} does not exist\nTry running `k9 setup install`"
     end
 
@@ -98,8 +98,8 @@ module Processing
     
     def setup(choice)
       usage = 'Usage: k9 setup [install]'
-      installed = File.exist?(File.join(K9_ROOT, '/lib/ruby/jruby-complete.jar'))
-      proc_root = File.exist?("#{ENV['HOME']}/.jruby_art/config.yml")
+      installed = FileTest.exist?(File.join(K9_ROOT, '/lib/ruby/jruby-complete.jar'))
+      proc_root = FileTest.exist?("#{ENV['HOME']}/.jruby_art/config.yml")
       case choice
       when /install/  # download and install jruby-complete and unpack examples to user home
         system "cd #{K9_ROOT}/vendors && rake"

data/lib/jruby_art/version.rb

@@ -1,3 +1,4 @@
+# The sole purpose of this module is to provide a name-space for version
 module JRubyArt
-  VERSION = '0.2.2.pre'
+  VERSION = '0.2.3.pre'
 end

data/lib/jruby_art.rb

@@ -9,18 +9,6 @@ end
 
 # guard prevents issues with mri ruby when using creator
 if RUBY_PLATFORM == 'java'
-  #def platform
-  #  host_os = RbConfig::CONFIG['host_os']
-  #  return '*mac-universal.jar' if host_os =~ /mac|darwin/
-  #  bit = ENV_JAVA['sun.arch.data.model']
-  #  if host_os =~ /linux/
-  #    bit.eql?('32') ? '*linux-i586.jar' : '*linux-amd64.jar'
-  #  elsif host_os =~ /cygwin|windows/
-  #    bit.eql?('32') ? '*windows-i586.jar' : '*windows-amd64.jar'
-  #  else
-  #    '*armv6hf.jar'
-  #  end
-  #end
   working_directory = File.join(File.dirname(__FILE__))
   $LOAD_PATH << working_directory unless $LOAD_PATH.include?(working_directory)
   Dir[File.join(working_directory, '*.jar')].each do |jar|
@@ -34,6 +22,7 @@ if RUBY_PLATFORM == 'java'
   Java::ProcessingFastmath::DeglutLibrary.new.load(JRuby.runtime, false)
   Java::ProcessingVecmathVec2::Vec2Library.new.load(JRuby.runtime, false)
   Java::ProcessingVecmathVec3::Vec3Library.new.load(JRuby.runtime, false)
+  
   AppRender = Java::ProcessingVecmath::AppRender
   ShapeRender = Java::ProcessingVecmath::ShapeRender
   require 'jruby_art/app'

data/library/boids/boids.rb

@@ -0,0 +1,217 @@
+# Boids -- after Tom de Smedt.
+# See his Python version: http://nodebox.net/code/index.php/Boids
+# This is an example of how a pure-Ruby library can work.
+# -- omygawshkenas
+
+class Boid
+  attr_accessor :boids, :x, :y, :z, :vx, :vy, :vz, :is_perching, :perch_time
+
+  def initialize(boids, x, y, z)
+    @boids, @flock = boids, boids
+    @x, @y, @z = x, y, z
+    @vx, @vy, @vz = 0.0, 0.0, 0.0
+    @is_perching = false
+    @perch_time = 0.0
+  end
+
+  def cohesion(d = 100.0)
+    # Boids gravitate towards the center of the flock,
+    # Which is the averaged position of the rest of the boids.
+    cvx, cvy, cvz = 0.0, 0.0, 0.0
+    boids.reject { |bd| bd.equal? self }.each do |boid|
+      cvx, cvy, cvz = cvx + boid.x, cvy + boid.y, cvz + boid.z
+    end
+    count = boids.length - 1.0
+    cvx, cvy, cvz = cvx / count, cvy / count, cvz / count
+    [(cvx - x) / d, (cvy - y) / d, (cvz - z) / d]
+  end
+
+  def separation(radius = 10.0)
+    # Boids don't like to cuddle.
+    svx, svy, svz = 0.0, 0.0, 0.0
+    boids.reject { |bd| bd.equal? self }.each do |boid|
+      dvx, dvy, dvz = x - boid.x, y - boid.y, z - boid.z
+      svx += dvx if dvx.abs < radius
+      svy += dvy if dvy.abs < radius
+      svz += dvz if dvz.abs < radius
+    end
+    [svx, svy, svz]
+  end
+
+  def alignment(d = 5.0)
+    # Boids like to fly at the speed of traffic.
+    avx, avy, avz = 0.0, 0.0, 0.0
+    boids.reject { |bd| bd.equal? self }.each do |boid|
+      avx, avy, avz = avx + boid.vx, avy + boid.vy, avz + boid.vz
+    end
+    count = boids.length - 1.0
+    avx, avy, avz = avx / count, avy / count, avz / count
+    [(avx - vx) / d, (avy - vy) / d, (avz - vz) / d]
+  end
+
+  def limit(max = 30.0)
+    # Tweet, Tweet! The boid police will bust you for breaking the speed limit.
+    most = [@vx.abs, @vy.abs, @vz.abs].max
+    return if most < max
+    scale = max / most.to_f
+    @vx *= scale
+    @vy *= scale
+    @vz *= scale
+  end
+
+  def angle
+    a = (Math.atan(@vy / @vx) * (180.0 / Math::PI)) + 360.0
+    a += 180.0 if @vx < 0.0
+    a
+  end
+
+  def goal(gx, gy, gz, d = 50.0)
+    # Them boids is hungry.
+    [(gx - x) / d, (gy - y) / d, (gz - z) / d]
+  end
+end
+
+require 'forwardable'
+
+class Boids
+  include Enumerable
+  extend Forwardable
+  def_delegators(:@boids, :reject, :<<, :each, :shuffle!, :length, :next)
+
+  attr_accessor :boids, :x, :y, :w, :h,
+                :scattered, :has_goal, :flee
+
+  attr_reader :scatter, :scatter_time, :scatter_i,
+              :perch, :perch_y, :perch_t, :boids,
+              :goal_x, :goal_y, :goal_z
+
+  def initialize
+    @boids = []
+  end
+
+  def self.flock(n, x, y, w, h)
+    Boids.new.setup(n, x, y, w, h)
+  end
+
+  def setup(n, x, y, w, h)
+    n.times do
+      dx, dy = rand(w), rand(h)
+      z = rand(200.0)
+      self << Boid.new(self, x + dx, y + dy, z)
+    end
+    @x, @y, @w, @h = x, y, w, h
+    init
+    self
+  end
+
+  def init
+    @scattered = false
+    @scatter = 0.005
+    @scatter_time = 50.0
+    @scatter_i = 0.0
+    @perch = 1.0 # Lower this number to divebomb.
+    @perch_y = h
+    @perch_t = -> { rand(25..75.0) }
+    @has_goal = false
+    @flee = false
+    @goal_x = @goal_y = @goal_z = 0.0
+  end
+
+  def scatter(chance = 0.005, frames = 50.0)
+    @scatter = chance
+    @scatter_time = frames
+  end
+
+  def no_scatter
+    @scatter = 0.0
+  end
+
+  def perch(ground = nil, chance = 1.0, frames = nil)
+    frames ||= -> { rand(25..75.0) }
+    ground ||= h
+    @perch, @perch_y, @perch_t = chance, ground, frames
+  end
+
+  def no_perch
+    @perch = 0.0
+  end
+
+  def goal(gx, gy, gz, flee = false)
+    @has_goal = true
+    @flee = flee
+    @goal_x, @goal_y, @goal_z = gx, gy, gz
+  end
+
+  def no_goal
+    @has_goal = false
+  end
+
+  def constrain
+    # Put them boids in a cage.
+    dx, dy = w * 0.1, h * 0.1
+    each do |b|
+      b.vx += rand(dx) if b.x < x - dx
+      b.vx += rand(dy) if b.y < y - dy
+      b.vx -= rand(dx) if b.x > x + w + dx
+      b.vy -= rand(dy) if b.y > y + h + dy
+      b.vz += 10.0 if b.z < 0.0
+      b.vz -= 10.0 if b.z > 100.0
+      next unless b.y > @perch_y && rand < @perch
+      b.y = @perch_y
+      b.vy = -(b.vy.abs) * 0.2
+      b.is_perching = true
+      @perch_t.respond_to?(:call) ? b.perch_time = @perch_t.call : b.perch_time = @perch_t
+    end
+  end
+
+  def update(opts = {}) # Just flutter, little boids ... just flutter away.
+    options = {
+      shuffled: true,     #  Shuffling keeps things flowing smooth.
+      cohesion: 100.0,
+      separation: 10.0,
+      alignment: 5.0,
+      goal: 20.0,
+      limit: 30.0
+    }
+    options.merge! opts
+    shuffle! if options[:shuffled]
+    m1 = 1.0   # cohesion
+    m2 = 1.0   # separation
+    m3 = 1.0   # alignment
+    m4 = 1.0   # goal
+    @scattered = true if !(@scattered) && rand < @scatter
+    if @scattered
+      m1 = -m1
+      m3 *= 0.25
+      @scatter_i += 1.0
+    end
+    if @scatter_i >= @scatter_time
+      @scattered = false
+      @scatter_i = 0.0
+    end
+    m4 = 0.0 unless @has_goal
+    m4 = -m4 if @flee
+    each do |b|
+      if b.is_perching
+        if b.perch_time > 0.0
+          b.perch_time -= 1.0
+          next
+        else
+          b.is_perching = false
+        end
+      end
+      vx1, vy1, vz1 = *b.cohesion(options[:cohesion])
+      vx2, vy2, vz2 = *b.separation(options[:separation])
+      vx3, vy3, vz3 = *b.alignment(options[:alignment])
+      vx4, vy4, vz4 = b.goal(@goal_x, @goal_y, @goal_z, options[:goal])
+      b.vx += m1 * vx1 + m2 * vx2 + m3 * vx3 + m4 * vx4
+      b.vy += m1 * vy1 + m2 * vy2 + m3 * vy3 + m4 * vy4
+      b.vz += m1 * vz1 + m2 * vz2 + m3 * vz3 + m4 * vz4
+      b.limit(options[:limit])
+      b.x += b.vx
+      b.y += b.vy
+      b.z += b.vz
+    end
+    constrain
+  end
+end

data/library/control_panel/control_panel.rb

@@ -0,0 +1,172 @@
+# Here's a little library for quickly hooking up controls to sketches.
+# For messing with the parameters and such.
+# These controls will set instance variables on the sketches.
+
+# You can make sliders, checkboxes, buttons, and drop-down menus.
+# (optionally) pass the range and default value.
+
+module ControlPanel
+  # class used to create slider elements for control_panel
+  class Slider < javax.swing.JSlider
+    def initialize(control_panel, name, range, initial_value, proc = nil)
+      min = range.begin * 100
+      max = (
+        (range.exclude_end? && range.begin.respond_to?(:succ)) ?
+          range.max : range.end) * 100
+      super(min, max)
+      set_minor_tick_spacing((max - min).abs / 10)
+      set_paint_ticks true
+      # paint_labels = true
+      set_preferred_size(java.awt.Dimension.new(190, 30))
+      label = control_panel.add_element(self, name)
+      add_change_listener do
+        update_label(label, name, value)
+        $app.instance_variable_set("@#{name}", value) unless value.nil?
+        proc.call(value) if proc
+      end
+      set_value(initial_value ? initial_value * 100 : min)
+      fire_state_changed
+    end
+
+    def value
+      get_value / 100.0
+    end
+
+    def update_label(label, name, value)
+      value = value.to_s
+      value << '0' if value.length < 4
+      label.set_text "<html><br><b>#{name}: #{value}</b></html>"
+    end
+  end
+
+  # class used to combo_box menu elements for control_panel
+  class Menu < javax.swing.JComboBox
+    def initialize(control_panel, name, elements, initial_value, proc = nil)
+      super(elements.to_java(:String))
+      set_preferred_size(java.awt.Dimension.new(190, 30))
+      control_panel.add_element(self, name)
+      add_action_listener do
+        $app.instance_variable_set("@#{name}", value) unless value.nil?
+        proc.call(value) if proc
+      end
+      set_selected_index(initial_value ? elements.index(initial_value) : 0)
+    end
+
+    def value
+      get_selected_item
+    end
+  end
+
+  # Creates check-box elements for control_panel
+  class Checkbox < javax.swing.JCheckBox
+    def initialize(control_panel, name, proc = nil)
+      @control_panel = control_panel
+      super(name.to_s)
+      set_preferred_size(java.awt.Dimension.new(190, 64))
+      set_horizontal_alignment javax.swing.SwingConstants::CENTER
+      control_panel.add_element(self, name, false)
+      add_action_listener do
+        $app.instance_variable_set("@#{name}", value) unless value.nil?
+        proc.call(value) if proc
+      end
+    end
+
+    def value
+      is_selected
+    end
+  end
+
+  # Creates button elements for control_panel
+  class Button < javax.swing.JButton
+    def initialize(control_panel, name, proc = nil)
+      super(name.to_s)
+      set_preferred_size(java.awt.Dimension.new(170, 64))
+      control_panel.add_element(self, name, false, true)
+      add_action_listener do
+        $app.send(name.to_s)
+        proc.call(value) if proc
+      end
+    end
+  end
+
+  # class used to contain control_panel elements
+  class Panel < javax.swing.JFrame
+    java_import javax.swing.UIManager
+
+    attr_accessor :elements, :panel
+
+    def initialize
+      super()
+      @elements = []
+      @panel = javax.swing.JPanel.new(java.awt.FlowLayout.new(1, 0, 0))
+      set_feel
+    end
+
+    def display
+      add panel
+      set_size 200, 30 + (64 * elements.size)
+      set_default_close_operation javax.swing.JFrame::HIDE_ON_CLOSE
+      set_resizable false
+      set_location($app.width + 10, 0) unless $app.width + 10 > $app.displayWidth
+      panel.visible = true
+    end
+
+    def add_element(element, name, has_label = true, _button_ = false)
+      if has_label
+        label = javax.swing.JLabel.new("<html><br><b>#{name}</b></html>")
+        panel.add label
+      end
+      elements << element
+      panel.add element
+      has_label ? label : nil
+    end
+
+    def remove
+      remove_all
+      dispose
+    end
+
+    def slider(name, range = 0..100, initial_value = nil, &block)
+      Slider.new(self, name, range, initial_value, block || nil)
+    end
+
+    def menu(name, elements, initial_value = nil, &block)
+      Menu.new(self, name, elements, initial_value, block || nil)
+    end
+
+    def checkbox(name, initial_value = nil, &block)
+      checkbox = Checkbox.new(self, name, block || nil)
+      checkbox.do_click if initial_value == true
+    end
+
+    def button(name, &block)
+      Button.new(self, name, block || nil)
+    end
+
+    def look_feel(lf)
+      set_feel(lf)
+    end
+    
+    private
+    
+    def set_feel(lf = 'metal')
+      lafinfo = javax.swing.UIManager.getInstalledLookAndFeels
+      laf = lafinfo.select do |info|
+        info.getName.eql? lf.capitalize
+      end
+      javax.swing.UIManager.setLookAndFeel(laf[0].getClassName)
+    end
+  end
+
+  # instance methods module
+  module InstanceMethods
+    def control_panel
+      @control_panel = ControlPanel::Panel.new unless @control_panel
+      return @control_panel unless block_given?
+      yield(@control_panel)
+      @control_panel.display
+    end
+  end
+end
+
+Processing::App.send :include, ControlPanel::InstanceMethods

data/library/file_chooser/file_chooser.rb

@@ -0,0 +1,82 @@
+# Here's a little library for using swing JFileChooser.
+# in ruby-processing, borrows heavily from control_panel
+
+module FileChooser
+  ##
+  # FileFilter is abstract, requires accept and getDescription
+  ##
+
+  require 'pathname'
+  JXChooser = Java::javax::swing::JFileChooser
+  JFile = Java::java::io::File
+  System = Java::JavaLang::System
+
+  class Filter < Java::javax::swing::filechooser::FileFilter
+    attr_reader :description, :extensions
+    def define(description, extensions)
+      @description, @extensions = description, extensions
+    end
+
+    def accept(fobj)
+      return true if extensions.include? File.extname(fobj.to_s).downcase
+      return true if fobj.isDirectory
+    end
+
+    def getDescription
+      description
+    end
+  end
+
+  class RXChooser
+    java_import javax.swing.UIManager
+    require 'rbconfig'
+    HOST = 'host_os'
+    UHOME = 'user.home'
+    UDIR = 'user.dir'
+    OS = :unix
+    case RbConfig::CONFIG[HOST]
+    when /darwin/      then OS = :mac
+    when /mswin|mingw/ then OS = :windows
+    end
+
+    def initialize
+      javax.swing.UIManager.setLookAndFeel(
+        javax.swing.UIManager.getSystemLookAndFeelClassName)
+      @chooser = JXChooser.new
+    end
+
+    def set_filter(description, extensions)
+      filter = FileChooser::Filter.new
+      filter.define(description, extensions)
+      @chooser.setFileFilter(filter)
+    end
+
+    def display
+      if :windows == OS
+        @chooser.setCurrentDirectory(JFile.new(System.getProperty(UDIR)))
+      else
+        @chooser.setCurrentDirectory(JFile.new(System.getProperty(UHOME)))
+      end
+      success = @chooser.show_open_dialog($app)
+      if success == JXChooser::APPROVE_OPTION
+        return Pathname.new(@chooser.get_selected_file.get_absolute_path).to_s
+      else
+        nil
+      end
+    end
+
+    def dispose
+      @chooser = nil
+    end
+  end
+
+  module InstanceMethods
+    def file_chooser
+      @chooser = RXChooser.new
+      return @chooser unless block_given?
+      yield(@chooser)
+    end
+  end
+end
+
+Processing::App.send :include, FileChooser::InstanceMethods

data/spec/app_spec.rb

@@ -13,7 +13,7 @@ describe Processing::App do
     @processing_sketch = TestSketch.new title: 'sketch'
   end
 
-  METHODS = %w(
+  METHODS = %i(
     alpha
     ambient
     ambient_light
@@ -196,13 +196,13 @@ describe Processing::App do
   )
 
   METHODS.each { |method_string|
-    it "method: #{method_string}" do
-      @processing_sketch.should respond_to(method_string)
+    it "method: .#{method_string}" do
+      expect(@processing_sketch).to respond_to(method_string)
     end
   }
 
   after :all do
-    java.lang.System.exit 0
+    @processing_sketch.exit 
   end
 
 end

data/spec/library_loader_spec.rb

@@ -0,0 +1,23 @@
+require_relative '../lib/jruby_art/library_loader'
+require_relative '../lib/jruby_art/config'
+require 'spec_helper'
+
+describe LibraryLoader do
+  
+  before :all do    
+    K9_ROOT = "../"
+    @library_loader = LibraryLoader.new 
+  end
+
+  METHODS = %i(local_java_lib local_ruby_lib installed_java_lib installed_java_lib load_libraries)
+
+  METHODS.each { |method_string|
+    it "method: .#{method_string}" do
+      expect(@library_loader).to respond_to(method_string)
+    end
+  }
+
+  after :all do
+    @library_loader = nil
+  end
+end

data/vendors/Rakefile

@@ -10,7 +10,7 @@ WARNING = <<-EOS
 EOS
 
 JRUBYC_VERSION      = '1.7.19'
-EXAMPLES                    = '0.0.4'
+EXAMPLES                    = '0.0.5'
 HOME_DIR = ENV['HOME']
 MAC_OR_LINUX = /linux|mac|darwin/ =~ RbConfig::CONFIG['host_os'] 
 CLOBBER.include("jruby-complete-#{JRUBYC_VERSION}.jar", "#{EXAMPLES}.tar.gz")

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: jruby_art
 version: !ruby/object:Gem::Version
-  version: 0.2.2.pre
+  version: 0.2.3.pre
 platform: ruby
 authors:
 - Martin Prout
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2015-02-11 00:00:00.000000000 Z
+date: 2015-02-28 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   requirement: !ruby/object:Gem::Requirement
@@ -29,7 +29,7 @@ dependencies:
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: '3.1'
+        version: '3.2'
   name: rspec
   prerelease: false
   type: :development
@@ -37,7 +37,7 @@ dependencies:
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: '3.1'
+        version: '3.2'
 - !ruby/object:Gem::Dependency
   requirement: !ruby/object:Gem::Requirement
     requirements:
@@ -52,7 +52,7 @@ dependencies:
     - - ~>
       - !ruby/object:Gem::Version
         version: '0.9'
-description: A jruby wrapper for processing
+description: A ruby wrapper for processing, that doesn't require a separate install of processing
 email: martin_p@lineone.net
 executables:
 - k9
@@ -60,10 +60,12 @@ extensions: []
 extra_rdoc_files:
 - README.md
 - LICENSE.md
+- CHANGELOG.md
 files:
 - LICENSE.md
 - README.md
 - Rakefile
+- CHANGELOG.md
 - bin/k9
 - lib/gluegen-rt.jar
 - lib/rpextras.jar
@@ -83,6 +85,7 @@ files:
 - lib/core.jar
 - lib/jogl-all-natives-linux-i586.jar
 - lib/jruby_art/creator.rb
+- lib/jruby_art/library_loader.rb
 - lib/jruby_art/writer.rb
 - lib/jruby_art/config.rb
 - lib/jruby_art/runner.rb
@@ -94,6 +97,10 @@ files:
 - lib/jruby_art/helpers/camel_string.rb
 - lib/jruby_art/helpers/numeric.rb
 - lib/jruby_art/helpers/range.rb
+- library/control_panel/control_panel.rb
+- library/boids/boids.rb
+- library/file_chooser/file_chooser.rb
+- spec/library_loader_spec.rb
 - spec/vecmath_spec.rb
 - spec/spec_helper.rb
 - spec/app_spec.rb
@@ -109,9 +116,9 @@ require_paths:
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
-  - - '>='
+  - - ~>
     - !ruby/object:Gem::Version
-      version: '0'
+      version: '2.0'
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
   - - '>'