propane 0.9.0-java → 2.0.0.pre-java

data/propane.gemspec

@@ -6,21 +6,21 @@ require 'propane/version'
 Gem::Specification.new do |gem|
   gem.name          = 'propane'
   gem.version       = Propane::VERSION
-  gem.authors       = ['filib', 'monkstone']
+  gem.authors       = ['monkstone']
   gem.email         = ['mamba2928@yahoo.co.uk']
   gem.license       = 'MIT'
   gem.description   = %q{A Standalone Ruby Processing implementation} 
-  gem.summary       = %q{A really slim layer between Ruby and Processing-2.2.1.}
-  gem.homepage      = 'https://github.com/monkstone/propane'
+  gem.summary       = %q{A really slim layer between Ruby and Processing-3.1.1.}
+  gem.homepage      = 'https://ruby-processing.github.io/propane/'
   gem.files         = `git ls-files`.split($/)
   gem.files << 'lib/propane.jar'
-  gem.files << 'lib/core-2.2.1.jar'
-  gem.files << 'lib/gluegen-rt-2.1.5-01.jar'
-  gem.files << 'lib/jogl-all-2.1.5-01.jar'
-  gem.files << 'lib/gluegen-rt-2.1.5-01-natives-linux-amd64.jar'
-  gem.files << 'lib/gluegen-rt-2.1.5-01-natives-macosx-universal.jar'
-  gem.files << 'lib/jogl-all-2.1.5-01-natives-linux-amd64.jar'
-  gem.files << 'lib/jogl-all-2.1.5-01-natives-macosx-universal.jar'
+  gem.files << 'lib/core-3.1.1.jar'
+  gem.files << 'lib/gluegen-rt-2.3.2.jar'
+  gem.files << 'lib/jogl-all-2.3.2.jar'
+  gem.files << 'lib/gluegen-rt-2.3.2-natives-linux-amd64.jar'
+  gem.files << 'lib/gluegen-rt-2.3.2-natives-macosx-universal.jar'
+  gem.files << 'lib/jogl-all-2.3.2-natives-linux-amd64.jar'
+  gem.files << 'lib/jogl-all-2.3.2-natives-macosx-universal.jar'
   gem.executables   = gem.files.grep(%r{^bin/}).map{ |f| File.basename(f) }
   gem.test_files    = gem.files.grep(%r{^(test|spec|features)/})
   gem.add_runtime_dependency 'arcball', '~> 0.0.3'  

data/src/monkstone/videoevent/VideoInterface.java

@@ -0,0 +1,42 @@
+/* 
+ * Copyright (c) 2015-16 Martin Prout
+ * 
+ * This library is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU Lesser General Public
+ * License as published by the Free Software Foundation; either
+ * version 2.1 of the License, or (at your option) any later version.
+ * 
+ * http://creativecommons.org/licenses/LGPL/2.1/
+ * 
+ * This library is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+ * Lesser General Public License for more details.
+ * 
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with this library; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
+ */
+
+package monkstone.videoevent;
+import processing.video.Movie;
+import processing.video.Capture;
+/**
+ * This interface makes it easier/possible to use the reflection methods
+ * from Movie and Capture classes in Propane::App in propane
+ * @author Martin Prout
+ */
+public interface VideoInterface {
+    /**
+     * Used to implement reflection method in PApplet
+     * @see processing.video.Movie
+     * @param movie Movie
+     */
+    public void movieEvent(Movie movie);
+    /**
+     * Used to implement reflection method in PApplet
+     * @see processing.video.Capture
+     * @param capture Capture
+     */
+    public void captureEvent(Capture capture);    
+}

data/src/monkstone/videoevent/package-info.java

@@ -0,0 +1,20 @@
+/* 
+* Copyright (c) 2015-16 Martin Prout
+* 
+* This library is free software; you can redistribute it and/or
+* modify it under the terms of the GNU Lesser General Public
+* License as published by the Free Software Foundation; either
+* version 2.1 of the License, or (at your option) any later version.
+* 
+* http://creativecommons.org/licenses/LGPL/2.1/
+* 
+* This library is distributed in the hope that it will be useful,
+* but WITHOUT ANY WARRANTY; without even the implied warranty of
+* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+* Lesser General Public License for more details.
+* 
+* You should have received a copy of the GNU Lesser General Public
+* License along with this library; if not, write to the Free Software
+* Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
+*/
+package monkstone.videoevent;

data/test/create_test.rb

@@ -10,25 +10,32 @@ CLASS_SKETCH = <<~CODE
 require 'propane'
 
 class FredSketch < Propane::App
-  def setup
+  def settings
     size 200, 200, P2D
   end
 
+  def setup
+    sketch_title 'Fred Sketch'
+  end
+
   def draw
 
   end
 end
 
+FredSketch.new
+
 CODE
 
 class SketchWriterTest < Minitest::Test
-  ParamMethods = Struct.new(:name, :class_name, :sketch_size)
+  ParamMethods = Struct.new(:name, :class_name, :sketch_size, :sketch_title)
   
   def setup
     @param = ParamMethods.new(
       'fred_sketch',
       'FredSketch',
-      'size 200, 200, P2D'
+      'size 200, 200, P2D',
+      "sketch_title 'Fred Sketch'"
     )
   end
 

data/test/respond_to_test.rb

@@ -156,6 +156,7 @@ METHODS = %i(
   shear_x
   shear_y
   shininess
+  sketch_title
   size
   smooth
   specular
@@ -186,6 +187,14 @@ METHODS = %i(
 )
 
 class TestSketch < Propane::App
+  def settings
+    size 100, 100
+  end
+
+  def setup
+    sketch_title 'Sketch Test'
+  end
+
   def draw
     exit if frame_count > 30
   end
@@ -193,7 +202,7 @@ end
 
 class SpecTest < Minitest::Test  
   def setup
-    @processing_sketch = TestSketch.new title: 'sketch'
+    @processing_sketch = TestSketch.new
   end
   
   def test_respond

data/vendors/Rakefile

@@ -1,78 +1,86 @@
-# encoding: utf-8
-# frozen_string_literal: false
+# frozen_string_literal: true
 require 'rake/clean'
 
 WARNING = <<-EOS
    WARNING: you may not have wget installed, you could just download
-   the correct version of jruby-complete to the vendors folder, and
-   re-run
+   the correct version of propane-examples (see EXAMPLES vendors directory)
 EOS
-
-EXAMPLES = '0.1'.freeze
-JRUBYC_VERSION = '9.1.2.0'.freeze
+SOUND = 'sound.zip'.freeze 
+SOUND_VERSION = 'v1.3.2' # version 1.3.2
+VIDEO = 'video-2.zip'
+VIDEO_VERSION = '2' # version 1.0.1
+EXAMPLES = '0.2'.freeze
 HOME_DIR = ENV['HOME']
-MAC_OR_LINUX = /linux|mac|darwin/ =~ RbConfig::CONFIG['host_os'] 
-
-CLOBBER.include("jruby-complete-#{JRUBYC_VERSION}.jar")
-
-desc 'download, and copy to propane'
-task default: [:download, :copy_ruby, :download_examples, :copy_examples]
+MAC_OR_LINUX = /linux|mac|darwin/ =~ RbConfig::CONFIG['host_os']
 
-desc 'download JRuby upstream sources'
-task download: ["jruby-complete-#{JRUBYC_VERSION}.jar"]
-
-file "jruby-complete-#{JRUBYC_VERSION}.jar" do
+desc 'download, and copy propane examples'
+task default: [: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"
+wget_base = 'wget https://github.com/ruby-processing/propane-examples'
+wget_string = [wget_base, 'archive', file_name].join('/')
+file file_name do
   begin
-    sh "wget https://s3.amazonaws.com/jruby.org/downloads/#{JRUBYC_VERSION}/jruby-complete-#{JRUBYC_VERSION}.jar"
+    sh wget_string
   rescue
     warn(WARNING)
   end
-  check_sha256("jruby-complete-#{JRUBYC_VERSION}.jar", "b9a6838ff7bbb0b3eda4eeba26017329572bc2fa014008a069b3848482275283")
 end
 
-directory '../lib/ruby'
+desc 'download and copy sound library to ~/.propane'
+task download_and_copy_sound: [:download_sound, :copy_sound]
 
-desc 'copy jruby-complete'
-task copy_ruby: ["../lib/ruby"] do
-  sh "cp -v jruby-complete-#{JRUBYC_VERSION}.jar ../lib/ruby/jruby-complete.jar"
-end
+desc 'download and copy video library to ~/.propane'
+task download_and_copy_video: [:download_video, :copy_video]
 
-def check_sha256(filename, expected_hash)
-  require 'digest'
-  sha256 = Digest::SHA256.new
-  File.open(filename, 'r') do |f|
-    while buf = f.read(4096)
-      sha256.update(buf)
-    end
-  end
-  if sha256.hexdigest != expected_hash
-    raise "bad sha256 checksum for #{filename} (expected #{expected_hash} got #{sha256.hexdigest})"
+
+desc 'download sound library'
+task :download_sound do
+  wget_base = 'wget https://github.com/processing/processing-sound'
+  wget_string = [wget_base, 'releases/download', SOUND_VERSION, SOUND].join('/')
+  begin
+    sh wget_string
+  rescue
+    warn(WARNING)
   end
 end
 
-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
+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('/')  
   begin
-    if MAC_OR_LINUX.nil?
-      sh "wget https://github.com/ruby-processing/propane-examples/archive/#{EXAMPLES}.zip"
-    else
-      sh "wget https://github.com/ruby-processing/propane-examples/archive/#{EXAMPLES}.tar.gz"
-    end
+    sh wget_string
   rescue
     warn(WARNING)
   end
 end
 
-desc "copy examples"
+desc 'copy examples'
 task :copy_examples => file_name do
   if MAC_OR_LINUX.nil?
-    sh "unzip #{EXAMPLES},zip"
+    sh "unzip #{EXAMPLES}.zip"
   else
-    sh "tar xzvf #{EXAMPLES}.tar.gz" 
+    sh "tar xzvf #{EXAMPLES}.tar.gz"
   end
-  sh "rm -r #{HOME_DIR}/k9_samples" if File.exist? "#{HOME_DIR}/propane_samples"
-  sh "cp -r propane-examples-#{EXAMPLES} #{HOME_DIR}/propane_samples"  
+  sh "rm -r #{HOME_DIR}/propane_samples" if File.exist? "#{HOME_DIR}/propane_samples"
+  sh "cp -r propane-examples-#{EXAMPLES} #{HOME_DIR}/propane_samples"
   sh "rm -r propane-examples-#{EXAMPLES}"
 end
+
+desc 'copy sound library'
+task :copy_sound => SOUND do
+  sh "unzip #{SOUND}"
+  sh "rm -r #{HOME_DIR}/.propane/libraries/sound" if File.exist? "#{HOME_DIR}/.propane/libraries/sound"
+  sh "cp -r sound #{HOME_DIR}/.propane/libraries/sound"
+  sh 'rm -r sound'
+end
+
+desc 'copy video library'
+task :copy_video => VIDEO do
+  sh "unzip #{VIDEO}"
+  sh "rm -r #{HOME_DIR}/.propane/libraries/video" if File.exist? "#{HOME_DIR}/.propane/libraries/video"
+  sh "cp -r video #{HOME_DIR}/.propane/libraries/video"
+  sh 'rm -r video'
+end

metadata

@@ -1,15 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: propane
 version: !ruby/object:Gem::Version
-  version: 0.9.0
+  version: 2.0.0.pre
 platform: java
 authors:
-- filib
 - monkstone
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-08-04 00:00:00.000000000 Z
+date: 2016-08-11 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: arcball
@@ -41,19 +40,19 @@ files:
 - ".travis.yml"
 - CHANGELOG.md
 - Gemfile
-- LICENSE.txt
+- LICENSE
 - README.md
 - Rakefile
 - bin/propane
 - lib/PROCESSING_LICENSE.txt
-- lib/core-2.2.1.jar
+- lib/core-3.1.1.jar
 - lib/export.txt
-- lib/gluegen-rt-2.1.5-01-natives-linux-amd64.jar
-- lib/gluegen-rt-2.1.5-01-natives-macosx-universal.jar
-- lib/gluegen-rt-2.1.5-01.jar
-- lib/jogl-all-2.1.5-01-natives-linux-amd64.jar
-- lib/jogl-all-2.1.5-01-natives-macosx-universal.jar
-- lib/jogl-all-2.1.5-01.jar
+- lib/gluegen-rt-2.3.2-natives-linux-amd64.jar
+- lib/gluegen-rt-2.3.2-natives-macosx-universal.jar
+- lib/gluegen-rt-2.3.2.jar
+- lib/jogl-all-2.3.2-natives-linux-amd64.jar
+- lib/jogl-all-2.3.2-natives-macosx-universal.jar
+- lib/jogl-all-2.3.2.jar
 - lib/propane.jar
 - lib/propane.rb
 - lib/propane/app.rb
@@ -68,14 +67,13 @@ files:
 - library/file_chooser/chooser.rb
 - library/file_chooser/file_chooser.rb
 - library/slider/slider.rb
+- library/video_event/video_event.rb
 - pom.rb
 - pom.xml
 - propane.gemspec
-- src/monkstone/CodeListener.java
 - src/monkstone/ColorUtil.java
 - src/monkstone/MathToolModule.java
 - src/monkstone/PropaneLibrary.java
-- src/monkstone/WatchSketchDir.java
 - src/monkstone/core/AbstractLibrary.java
 - src/monkstone/fastmath/Deglut.java
 - src/monkstone/fastmath/package-info.java
@@ -97,10 +95,12 @@ files:
 - src/monkstone/vecmath/vec2/package-info.java
 - src/monkstone/vecmath/vec3/Vec3.java
 - src/monkstone/vecmath/vec3/package-info.java
+- src/monkstone/videoevent/VideoInterface.java
+- src/monkstone/videoevent/package-info.java
 - test/create_test.rb
 - test/respond_to_test.rb
 - vendors/Rakefile
-homepage: https://github.com/monkstone/propane
+homepage: https://ruby-processing.github.io/propane/
 licenses:
 - MIT
 metadata: {}
@@ -115,15 +115,15 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '0'
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
-  - - ">="
+  - - ">"
     - !ruby/object:Gem::Version
-      version: '0'
+      version: 1.3.1
 requirements: []
 rubyforge_project: 
 rubygems_version: 2.6.3
 signing_key: 
 specification_version: 4
-summary: A really slim layer between Ruby and Processing-2.2.1.
+summary: A really slim layer between Ruby and Processing-3.1.1.
 test_files:
 - test/create_test.rb
 - test/respond_to_test.rb

data/LICENSE.txt

@@ -1,22 +0,0 @@
-Copyright (c) 2013 Philip Cunningham
-
-MIT License
-
-Permission is hereby granted, free of charge, to any person obtaining
-a copy of this software and associated documentation files (the
-"Software"), to deal in the Software without restriction, including
-without limitation the rights to use, copy, modify, merge, publish,
-distribute, sublicense, and/or sell copies of the Software, and to
-permit persons to whom the Software is furnished to do so, subject to
-the following conditions:
-
-The above copyright notice and this permission notice shall be
-included in all copies or substantial portions of the Software.
-
-THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
-EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
-MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
-NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE
-LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION
-OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
-WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.

data/src/monkstone/CodeListener.java

@@ -1,7 +0,0 @@
-package monkstone;
-
-import java.nio.file.WatchEvent;
-
-public interface CodeListener {
-    public void code_event(WatchEvent<?> event);     
-}

data/src/monkstone/WatchSketchDir.java

@@ -1,190 +0,0 @@
-/**
- * This class allows JRubyArt to watch for changes to sketch files
- * specifically those with a 'rb' or 'glsl' extension requires user to supply
- * a path String and code listener to constructor. The code listener should 
- * accept a filesystem WatchEvent
- */
-
-/*
- * This code is a modified version of WatchDir.java
- * Copyright (c) 2008, 2010, Oracle and/or its affiliates. All rights reserved.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions
- * are met:
- *
- *   - Redistributions of source code must retain the above copyright
- *     notice, this list of conditions and the following disclaimer.
- *
- *   - Redistributions in binary form must reproduce the above copyright
- *     notice, this list of conditions and the following disclaimer in the
- *     documentation and/or other materials provided with the distribution.
- *
- *   - Neither the name of Oracle nor the names of its
- *     contributors may be used to endorse or promote products derived
- *     from this software without specific prior written permission.
- *
- * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS
- * IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO,
- * THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
- * PURPOSE ARE DISCLAIMED.  IN NO EVENT SHALL THE COPYRIGHT OWNER OR
- * CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL,
- * EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO,
- * PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR
- * PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF
- * LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING
- * NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
- * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
- */
-package monkstone;
-
-import java.io.IOException;
-import java.nio.file.FileSystems;
-import java.nio.file.FileVisitResult;
-import java.nio.file.Files;
-import java.nio.file.Path;
-import java.nio.file.Paths;
-import java.nio.file.SimpleFileVisitor;
-import static java.nio.file.StandardWatchEventKinds.*;
-import java.nio.file.WatchEvent;
-import java.nio.file.WatchKey;
-import java.nio.file.WatchService;
-import java.nio.file.attribute.BasicFileAttributes;
-import java.util.HashMap;
-import java.util.Map;
-
-/**
- * Example to watch a directory (or tree) for changes to files.
- */
-public class WatchSketchDir {
-
-    private final WatchService watcher;
-    private final Map<WatchKey, Path> keys;
-    private boolean trace = false;
-    
-    @SuppressWarnings("unchecked")
-    static <T> WatchEvent<T> cast(WatchEvent<?> event) {
-        return (WatchEvent<T>) event;
-    }
-
-
-    /**
-     * Register the given directory with the WatchService
-     */
-    private void register(Path dir) throws IOException {
-        WatchKey key = dir.register(watcher, ENTRY_MODIFY);
-        if (trace) {
-            Path prev = keys.get(key);
-            if (prev == null) {
-                System.out.format("register: %s\n", dir);
-            } else if (!dir.equals(prev)) {
-                System.out.format("update: %s -> %s\n", prev, dir);
-            }
-        }
-        keys.put(key, dir);
-    }
-
-    /**
-     * Register the given directory, and all its sub-directories, with the
-     * WatchService.
-     */
-    private void registerAll(final Path start) throws IOException {
-        // register directory and sub-directories
-        Files.walkFileTree(start, new SimpleFileVisitor<Path>() {
-            @Override
-            public FileVisitResult preVisitDirectory(Path dir, BasicFileAttributes attrs)
-                    throws IOException {
-                register(dir);
-                return FileVisitResult.CONTINUE;
-            }
-        });
-    }
-    
-    static final WatchSketchDir watch(String dir) throws IOException{
-        return new WatchSketchDir(dir);
-    }
-
-    /**
-     * Creates a WatchService and registers the given directory
-     * @param dir String
-     * @param obj CodeListener
-     * @throws IOException
-     */
-    private WatchSketchDir(String dir) throws IOException {
-        this(Paths.get(dir));
-    }
-
-    /**
-     * Creates a WatchService and registers the given directory
-     *
-     * @param dir Path
-     * @param obj CodeListener
-     * @throws java.io.IOException
-     */
-    private WatchSketchDir(Path dir) throws IOException {
-        this.watcher = FileSystems.getDefault().newWatchService();
-        this.keys = new HashMap<>();
-
-        System.out.format("Scanning Codebase\n", dir);
-        registerAll(dir);
-        System.out.format("Watching %s\n", dir);
-
-        // enable trace after initial registration
-        this.trace = true;
-    }
-
-    /**
-     * Process all events for keys queued to the watcher
-     */
-    public void addListener(CodeListener obj) {
-        for (;;) {
-
-            // wait for key to be signalled
-            WatchKey key;
-            try {
-                key = watcher.take();
-            } catch (InterruptedException x) {
-                return;
-            }
-
-            Path dir = keys.get(key);
-            if (dir == null) {
-                System.err.println("WatchKey not recognized!!");
-                continue;
-            }
-
-            key.pollEvents().stream().forEach((WatchEvent<?> event) -> {
-                WatchEvent.Kind kind = event.kind();
-                // TBD - provide example of how OVERFLOW event is handled
-                if (!(kind == OVERFLOW)) {
-                    // Context for directory entry event is the file name of entry
-                    WatchEvent<Path> ev = cast(event);
-                    Path name = ev.context();
-                    Path child = dir.resolve(name);
-                    if (kind == ENTRY_MODIFY){
-                    if (child.toFile().getAbsolutePath().endsWith(".rb")
-                            || child.toFile().getAbsolutePath().endsWith(".glsl")) {
-    
-                        obj.code_event(event);
-                        key.reset();
-                    }
-                    }
-                    // if directory is created, and watching recursively, then
-                    // register it and its sub-directories
-                }
-            });
-
-            // reset key and remove from set if directory no longer accessible
-            boolean valid = key.reset();
-            if (!valid) {
-                keys.remove(key);
-
-                // all directories are inaccessible
-                if (keys.isEmpty()) {
-                    break;
-                }
-            }
-        }
-    }    
-
-}