propane 0.6.0-java → 0.7.0-java

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: fc959038fd93430af113ed74e02ae78b8edcebc7
-  data.tar.gz: e0bd4194934a2c0ae4c57220a0f253ab29b14b9a
+  metadata.gz: 6f7c8e44c6fbe975880869f4c5e8949c7292ab5b
+  data.tar.gz: 63dbc144992f49211386bcf673f24e3d72c9d9d4
 SHA512:
-  metadata.gz: a3ced8d05e48c9064445279d75eaf36f7ae29fcbbb667f1a68e22276f65673972580e341d06991d3fa0833e2bef7a722e47bb6900e7dfcdb8c8129c30171c3e1
-  data.tar.gz: 12b365acf34662ec7c526e86140ca684622fc47c8fba798b7658c7fcbc8f1df66013be766383f64cf5d3ac493777e16c9384226f7932777c81af7e434fe88063
+  metadata.gz: f8bc2eed2c1d79dae5a22c68af081955380070feb81ad96de689612d2d2f8037b6f613f5964268c523ffdc001890e98f17cb0a1b8897d4bbe53e727c9cce359e
+  data.tar.gz: 61c449de0ace22d8c04be925a6bb6354ccbe93a7b4f10f9fbb20b5e3d1a617e94a120959ab09fb7e870641a49633055c72b7411a410470d066e8bf8e25a652d5

data/.mvn/extensions.xml

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

data/.travis.yml

@@ -1,9 +1,17 @@
 language: ruby
+sudo: false
+addons:
+  apt:
+    packages:
+      -oracle-java8-installer
+
+rvm: 
+  - jruby-9.1.2.0
+jdk:
+  - oraclejdk8
+os:
+  - linux
 
-rvm:
-  - jruby-19mode
-script:
-  - bundle exec rake spec
 before_install:
   - "export DISPLAY=:99.0"
   - "sh -e /etc/init.d/xvfb start"

data/CHANGELOG.md

@@ -1,3 +1,4 @@
+**v0.7.0** Update to JRuby-Complete-9.1.2.0. 
 
 **v0.6.0** Includes a sketch creator utility 3D still only for linux64 and macosx, any Windows developers are welcome to extend to windows (should be easy), includes slider in sketch library, change to requiring jdk8. Update to JRuby-Complete-9.1.0.0, request updated arcball (to run samples). 
 

data/Rakefile

@@ -12,7 +12,7 @@ def create_manifest
   end
 end
 
-task default: [:init, :compile, :install, :test]
+task default: [:init, :compile, :install, :test, :gem]
 
 desc 'Create Manifest'
 task :init do

data/examples/complete/landscape.rb

@@ -16,7 +16,7 @@ class Landscape < Propane::App
     no_stroke    
     # The code of this shader shows how to integrate shaders from shadertoy
     # into Processing with minimal changes.
-    @landscape = load_shader('landscape.glsl')
+    @landscape = load_shader(data_path('landscape.glsl'))
     landscape.set('resolution', width.to_f, height.to_f)
   end
   

data/examples/regular/colors_two.rb

@@ -1,5 +1,3 @@
-# encoding: utf-8
-# frozen_string_literal: true
 # Creating Colors (Homage to Albers).
 #
 require 'propane'
@@ -9,7 +7,7 @@ require 'propane'
 class CreatingColors < Propane::App
   attr_reader :redder, :yellower, :orangish
   def setup
-    size 640, 360
+    size 640, 600
     # palette = web_to_color_array(['#CC6600', '#CC9900', '#993300'].to_java(:string))
     palette = web_to_color_array(['#CC6600', '#CC9900', '#993300'])
     # @redder = color 204, 102, 0

data/examples/regular/tree.rb

@@ -3,7 +3,6 @@ require 'propane'
 class Tree < Propane::App
   # http://processing.org/learning/topics/tree.html
   # by Joe Holt
-  
   def setup
     size 200, 200
     color_mode RGB, 1

data/examples/regular/vector_math.rb

@@ -8,19 +8,20 @@
 require 'propane'
 
 class VectorMath < Propane::App  
-  
+  attr_reader :center  
   def setup
     size(640, 360)
     stroke(255)
     stroke_weight(4)
+    # A vector that points to the center of the window
+    @center = Vec2D.new(width/2, height/2)
+    puts (center.eql? center)
   end
   
   def draw
     background(0)  
     # A vector that points to the mouse location
     mouse = Vec2D.new(mouse_x, mouse_y)
-    # A vector that points to the center of the window
-    center = Vec2D.new(width/2, height/2)
     # Subtract center from mouse which results in a vector that points from center to mouse
     mouse -= center  
     # Normalize the vector

data/lib/propane/app.rb

@@ -14,8 +14,6 @@ module Propane
     java_import 'monkstone.vecmath.ShapeRender'
   end
 
-  
-
   # This class is the base class the user should inherit from when making
   # their own sketch.
   #
@@ -29,8 +27,7 @@ module Propane
   #
   # end
   class App < PApplet
-    include Math
-    include HelperMethods
+    include Math, MathTool, HelperMethods
     attr_reader :title, :arguments, :options
     # App should be instantiated with an optional list of options
     # and array of arguments.

data/lib/propane/helpers/numeric.rb

@@ -1,9 +1,9 @@
 class Numeric #:nodoc:
   def degrees
-    self * 180 / Math::PI
+    self * 57.29577951308232
   end
 
   def radians
-    self * Math::PI / 180
+    self * 0.017453292519943295
   end
 end

data/lib/propane/runner.rb

@@ -1,10 +1,11 @@
-# encoding: utf-8
 # frozen_string_literal: false
 require "#{PROPANE_ROOT}/lib/propane"
 require "#{PROPANE_ROOT}/lib/propane/app"
 require 'optparse'
 
 module Propane
+  java_import 'monkstone.WatchSketchDir'
+  java_import 'java.nio.file.StandardWatchEventKinds'
   # Utility class to handle the different commands that the 'rp5' command
   # offers. Able to run, watch, live, create, app, and unpack
   class Runner
@@ -26,6 +27,7 @@ module Propane
       show_help if options.empty?
       show_version if options[:version]
       run_sketch if options[:run]
+      watch_sketch if options[:watch]
       create if options[:create]
       install if options[:install]
     end
@@ -48,11 +50,16 @@ module Propane
           options[:install] = true
         end
 
+        options[:watch] = false
+        opts.on('-w', '--watch', 'Watch the sketch') do
+          options[:watch] = true
+        end
+
         options[:run] = false
         opts.on('-r', '--run', 'Run the sketch using jruby-complete') do
           options[:run] = true
         end
-        
+
         options[:create] = false
         opts.on('-c', '--create', 'Create new sketch outline') do
           options[:create] = true
@@ -68,6 +75,23 @@ module Propane
       @argc = opt_parser.parse(args)
       @filename = argc.shift
     end
+    
+    def watch_sketch
+      run_sketch
+      root = File.absolute_path(File.dirname(filename))
+      watcher = WatchSketchDir.watch(root)
+      count = 0 # guard against a duplicate event
+      watcher.add_listener do |event|
+        if event.kind == StandardWatchEventKinds::ENTRY_MODIFY 
+          if count == 0       
+            puts 'reloading sketch...' 
+            run_sketch          
+          end
+          count += 1
+          count = 0 if count == 2
+        end
+      end  
+    end
 
     def run_sketch
       root = File.absolute_path(File.dirname(filename))
@@ -75,15 +99,15 @@ module Propane
       warn_format = 'File %s does not not Exist!'
       return warn(format(warn_format, sketch)) unless File.exist?(sketch)
       command = [
-        'java',
-        '-cp',
-        "#{PROPANE_ROOT}/lib/ruby/jruby-complete.jar",
-        'org.jruby.Main',
-        sketch.to_s
+      'java',
+      '-cp',
+      "#{PROPANE_ROOT}/lib/ruby/jruby-complete.jar",
+      'org.jruby.Main',
+      sketch.to_s
       ].flatten
       exec(*command)
     end
-    
+
     def create
       require_relative 'creators/creator'
       Propane::BasicSketch.new.create!(filename, argc)

data/lib/propane/version.rb

@@ -1,5 +1,5 @@
 # encoding: utf-8
 # frozen_string_literal: true
 module Propane
-  VERSION = '0.6.0'.freeze
+  VERSION = '0.7.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:rp5extras', '0.6.0'
+  id 'propane:rp5extras', '0.7.0'
   packaging 'jar'
   description 'rp5extras for propane'
   organization 'ruby-processing', 'https://ruby-processing.github.io'
@@ -33,7 +33,7 @@ project 'rp5extras', 'https://github.com/monkstone/propane' do
     'jogl.version' => '2.1.5-01'
     )
   
-  pom('org.jruby:jruby:9.1.0.0')
+  pom('org.jruby:jruby:9.1.2.0')
   jar('org.processing:core:2.2.1')
   jar('org.jogamp.jogl:jogl-all:${jogl.version}')
   jar('org.jogamp.gluegen:gluegen-rt-main:${jogl.version}')
@@ -92,15 +92,15 @@ project 'rp5extras', 'https://github.com/monkstone/propane' do
       )
     end
       
-    plugin( :compiler, '3.3',
+    plugin( :compiler, '3.5.1',
       source: '${maven.compiler.source}',
       target: '${maven.compiler.target}'
     )
-    plugin( :javadoc, '2.10.3',
+    plugin( :javadoc, '2.10.4',
       detect_offline_links:  'false',
       links: ['${jruby.api}', '${processing.api}']
     )
-    plugin( :jar, '2.6',
+    plugin( :jar, '3.0.2',
       archive: { manifestFile: 'MANIFEST.MF' }
     )
   end

data/pom.xml

@@ -11,7 +11,7 @@ DO NOT MODIFIY - GENERATED CODE
   <modelVersion>4.0.0</modelVersion>
   <groupId>propane</groupId>
   <artifactId>rp5extras</artifactId>
-  <version>0.6.0</version>
+  <version>0.7.0</version>
   <name>rp5extras</name>
   <description>rp5extras for propane</description>
   <url>https://github.com/monkstone/propane</url>
@@ -69,7 +69,7 @@ DO NOT MODIFIY - GENERATED CODE
     <dependency>
       <groupId>org.jruby</groupId>
       <artifactId>jruby</artifactId>
-      <version>9.1.0.0</version>
+      <version>9.1.2.0</version>
       <type>pom</type>
     </dependency>
     <dependency>
@@ -166,7 +166,7 @@ DO NOT MODIFIY - GENERATED CODE
         </plugin>
         <plugin>
           <artifactId>maven-compiler-plugin</artifactId>
-          <version>3.3</version>
+          <version>3.5.1</version>
           <configuration>
             <source>${maven.compiler.source}</source>
             <target>${maven.compiler.target}</target>
@@ -174,9 +174,9 @@ DO NOT MODIFIY - GENERATED CODE
         </plugin>
         <plugin>
           <artifactId>maven-javadoc-plugin</artifactId>
-          <version>2.10.3</version>
+          <version>2.10.4</version>
           <configuration>
-            <detect_offline_links>false</detect_offline_links>
+            <detectOfflineLinks>false</detectOfflineLinks>
             <links>
               <link>${jruby.api}</link>
               <link>${processing.api}</link>
@@ -185,7 +185,7 @@ DO NOT MODIFIY - GENERATED CODE
         </plugin>
         <plugin>
           <artifactId>maven-jar-plugin</artifactId>
-          <version>2.6</version>
+          <version>3.0.2</version>
           <configuration>
             <archive>
               <manifestFile>MANIFEST.MF</manifestFile>

data/propane.gemspec

@@ -23,7 +23,7 @@ Gem::Specification.new do |gem|
   gem.files << 'lib/jogl-all-2.1.5-01-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.2'  
+  gem.add_runtime_dependency 'arcball', '~> 0.0.3'  
   gem.require_paths = ['lib']
   gem.platform      = 'java'
 end

data/src/monkstone/CodeListener.java

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

data/src/monkstone/{MathTool.java → MathToolModule.java}

@@ -1,49 +1,47 @@
 /**
- * The purpose of this tool is to allow ruby-processing users to use an alternative 
+ * The purpose of this tool is to allow JRubyArt users to use an alternative
  * to processing.org map, lerp and norm methods in their sketches
- * Copyright (C) 2015-16 Martin Prout. This tool is free software; you can 
- * redistribute it and/or modify it under the terms of the GNU Lesser General 
+ * Copyright (c) 2015-16 Martin Prout. This tool 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.
- * 
+ *
  * Obtain a copy of the license at http://www.gnu.org/licenses/lgpl-2.1.html
  */
 package monkstone;
 
 import org.jruby.Ruby;
-import org.jruby.RubyClass;
 import org.jruby.RubyFloat;
 import org.jruby.RubyModule;
-import org.jruby.RubyObject;
 import org.jruby.RubyRange;
 import org.jruby.anno.JRubyMethod;
+import org.jruby.anno.JRubyModule;
 import org.jruby.runtime.ThreadContext;
 import org.jruby.runtime.builtin.IRubyObject;
 
 /**
  *
- * @author MartinProut
+ * @author Martin Prout
  */
-
-public class MathTool extends RubyObject {
-
-    private static final long serialVersionUID = 4427564758225746633L;
-    /**
-     *
-     * @param runtime
-     */
-    public static void createMathTool(Ruby runtime) {
-        RubyModule processing = runtime.defineModule("Processing");
-        RubyModule module = processing.defineModuleUnder("MathTool");
-        module.defineAnnotatedMethods(MathTool.class);
+@JRubyModule(name = "MathTool") 
+public class MathToolModule {    
+    
+   /**
+    *
+    * @param runtime Ruby
+    */
+  
+    public static void createMathToolModule(Ruby runtime) {
+        RubyModule mtModule = runtime.defineModule("MathTool");
+        mtModule.defineAnnotatedMethods(MathToolModule.class);
     }
 
     /**
      *
-     * @param context JRuby runtime
-     * @param recv self
+     * @param context ThreadContext
+     * @param recv IRubyObject 
      * @param args array of RubyRange (must be be numeric)
-     * @return RubyFloat
+     * @return mapped value RubyFloat
      */
     @JRubyMethod(name = "map1d", rest = true, module = true)
     public static IRubyObject mapOneD(ThreadContext context, IRubyObject recv, IRubyObject[] args) {
@@ -59,10 +57,10 @@ public class MathTool extends RubyObject {
 
     /**
      *
-     * @param context JRuby runtime
-     * @param recv self
+     * @param context ThreadContext
+     * @param recv IRubyObject 
      * @param args array of RubyRange (must be be numeric)
-     * @return RubyFloat
+     * @return mapped value RubyFloat
      */
     @JRubyMethod(name = "constrained_map", rest = true, module = true)
     public static IRubyObject constrainedMap(ThreadContext context, IRubyObject recv, IRubyObject[] args) {
@@ -82,16 +80,16 @@ public class MathTool extends RubyObject {
             value = max;
         }
        return mapMt(context, value, first1, last1, first2, last2);
-    }    
-    
+    }
+
     /**
      *
-     * @param context JRuby runtime
-     * @param recv self
+     * @param context ThreadContext
+     * @param recv self IRubyObject
      * @param args floats as in processing map function
-     * @return RubyFloat
+     * @return mapped value RubyFloat
      */
-    @JRubyMethod(name = {"p5map", "map"}, rest = true, module = true)
+    @JRubyMethod(name = "p5map", rest = true, module = true)
     public static IRubyObject mapProcessing(ThreadContext context, IRubyObject recv, IRubyObject[] args) {
         double value = (Double) args[0].toJava(Double.class);
         double first1 = (Double) args[1].toJava(Double.class);
@@ -99,14 +97,15 @@ public class MathTool extends RubyObject {
         double last1 = (Double) args[2].toJava(Double.class);
         double last2 = (Double) args[4].toJava(Double.class);
         return mapMt(context, value, first1, last1, first2, last2);
-    }   
-  
+    }
+
+
     /**
      * A more correct version than processing.org version
-     * @param context
-     * @param recv
+     * @param context ThreadContext
+     * @param recv self IRubyObject
      * @param args args[2] should be between 0 and 1.0 if not returns start or stop
-     * @return lerp value
+     * @return lerped value RubyFloat
      */
     @JRubyMethod(name = "lerp", rest = true, module = true)
     public static IRubyObject lerpP(ThreadContext context, IRubyObject recv, IRubyObject[] args) {
@@ -116,32 +115,33 @@ public class MathTool extends RubyObject {
         if (amount <= 0) return args[0];
         if (amount >= 1.0) return args[1];
         return context.getRuntime().newFloat((1 - amount) * start + (stop * amount));
-    }   
-    
+    }
+
+
     /**
      * Identical to p5map(value, low, high, 0, 1).
-     * Numbers outside of the range are not clamped to 0 and 1, 
-     * because out-of-range values are often intentional and useful. 
-     * @param context
-     * @param recv
-     * @param args
-     * @return norm value
+     * Numbers outside of the range are not clamped to 0 and 1,
+     * because out-of-range values are often intentional and useful.
+     * @param context ThreadContext
+     * @param recv IRubyObject
+     * @param args array of args must be be numeric
+     * @return mapped value RubyFloat
      */
     @JRubyMethod(name = "norm", rest = true, module = true)
-    public static IRubyObject normP(ThreadContext context, IRubyObject recv, IRubyObject[] args) { 
+    public static IRubyObject normP(ThreadContext context, IRubyObject recv, IRubyObject[] args) {
         double value = (Double) args[0].toJava(Double.class);
         double start = (Double) args[1].toJava(Double.class);
-        double stop = (Double) args[2].toJava(Double.class);         
+        double stop = (Double) args[2].toJava(Double.class);
         return mapMt(context, value, start, stop, 0, 1.0);
     }
-    
+
     /**
      * Identical to p5map(value, low, high, 0, 1) but 'clamped'.
-     * Numbers outside of the range are clamped to 0 and 1, 
-     * @param context
-     * @param recv
-     * @param args
-     * @return strict normalized value ie 0..1.0
+     * Numbers outside of the range are clamped to 0 and 1,
+     * @param context ThreadContext
+     * @param recv IRubyObject
+     * @param args array of args must be be numeric
+     * @return mapped value RubyFloat
      */
     @JRubyMethod(name = "norm_strict", rest = true, module = true)
     public static IRubyObject norm_strict(ThreadContext context, IRubyObject recv, IRubyObject[] args) {
@@ -156,18 +156,18 @@ public class MathTool extends RubyObject {
         } else {
             return mapMt(context, value, start, stop, 0, 1.0);
         }
-    }    
-    
-    static final RubyFloat mapMt(ThreadContext context, double value, double first1, double last1, double first2, double last2) {   
+    }
+
+    static final RubyFloat mapMt(ThreadContext context, double value, double first1, double last1, double first2, double last2) {
         double result = first2 + (last2 - first2) * ((value - first1) / (last1 - first1));
         return context.getRuntime().newFloat(result);
     }
-    
+
     /**
      * Provides processing constrain method as a ruby module method
-     * @param context
-     * @param recv
-     * @param args
+     * @param context ThreadContext
+     * @param recv IRubyObject
+     * @param args array of args must be be numeric
      * @return original or limit values
      */
     @JRubyMethod(name = "constrain", rest = true, module = true)
@@ -183,13 +183,4 @@ public class MathTool extends RubyObject {
             return args[1];
         }
     }
-
-    /**
-     *
-     * @param runtime
-     * @param metaClass
-     */
-    public MathTool(Ruby runtime, RubyClass metaClass) {
-        super(runtime, metaClass);
-    }
 }