toxiclibs 0.9.3 → 1.0.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
-SHA1:
-  metadata.gz: 6f3d33ee0f9f83586b8def699d2bdf8867b6a992
-  data.tar.gz: 6085ba979f1dcbeb6f97baab27e4a121f99f5fe1
+SHA256:
+  metadata.gz: bb631f45b5fb8df9acc6abbb1c03ddd8427c71d541601955b098934b6c9bff72
+  data.tar.gz: 23a64c5c0038efed7f914485f36277feedcbbc3871d6ea965afcee046228fedc
 SHA512:
-  metadata.gz: 9dd5915cfc0900a502fea967efbd4a3b3ef2d0718d99445b0719cf54cbbb70737f3e4b24191f356a1d8600d3278ca8ca8f3db4619ffe0f9ee2fc642219565087
-  data.tar.gz: dd164f6da93f3ba3925071e408988501696579f78295671d01e66f7561abb985dbb25685bb64675beb29f30db4e4d4c1bf2fb024453b4a3906be4e3225e2ee09
+  metadata.gz: 21c40b1481a4f4265f63d3d06a04c62230f1cb78d909f8a296d5c8b21cc47cbc82b4db3b8c73789eb861b63854ccacb83704fada053702ae7b83c9f17f278ab6
+  data.tar.gz: 8eb685db0276ca3b84b76c05e887ca65e50011057e35de55b2a65ae7061146535586ebfdebd185a4cfc51767fa93ee6a1a6afb5fc01645840b186f8f64717298

data/.mvn/extensions.xml

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

data/CHANGELOG.md

@@ -1,7 +1,9 @@
 
+**v1.0.0** About time we got to 1.0.0 bump processing to 3.3.4
+
 **v0.9.3** Bump processing version to processing-3.3.2.
 
-**v0.9.2** Bump processing version, add `to_ruby_string` method to `ColorList` see examples, allow use of `TColor` without `Toxi` prefix. Removed audio. 
+**v0.9.2** Bump processing version, add `to_ruby_string` method to `ColorList` see examples, allow use of `TColor` without `Toxi` prefix. Removed audio.
 
 **v0.9.1** Make it easier to load PerlinNoise and SimplexNoise
 

data/README.md

@@ -8,10 +8,10 @@
 gem install toxiclibs
 ```
 
-### NB: Use version 0.4 for ruby-processing, and 0.9.2 for propane and JRubyArt
+### NB: Use version 0.4 for ruby-processing, and 1.0.0 for propane and JRubyArt
 
 NB: Build is only failing because current version of processing is not available at maven central.
-This gem provides Karsten Schmidts (aka toxi, @postspectacular) toxiclibs jars for JRubyArt. To compile the gem follow the instructions for [JRubyArt][]. Most parts of toxiclibs API is exposed in the latest version, (but only a few examples are included) in principle it should be possible to make all available!!! For this demonstration I have used up to date source code for version 21, since [toxis final release][] has not yet been released (although [Dan Shiffman][] has released a version for processing-3.0+). There are reported to be number of outstanding bugs with toxiclibs, if they affect you report it [here][] (or better fix them yourself and submit a pull request). Version 0.9.2 features java code updated to use java lambda (jdk8) and was compiled against processing-3.3 core.jar. The audio library was not working and has been dropped since version 0.9.2.
+This gem provides Karsten Schmidts (aka toxi, @postspectacular) toxiclibs jars for JRubyArt. To compile the gem follow the instructions for [JRubyArt][]. Most parts of toxiclibs API is exposed in the latest version, (but only a few examples are included) in principle it should be possible to make all available!!! For this demonstration I have used up to date source code for version 21, since [toxis final release][] has not yet been released (although [Dan Shiffman][] has released a version for processing-3.0+). There are reported to be number of outstanding bugs with toxiclibs, if they affect you report it [here][] (or better fix them yourself and submit a pull request).
 
 ![grayscott image](http://4.bp.blogspot.com/-d4MiL4_0Njk/VFJMv6VUicI/AAAAAAAAEgY/fFAfrXDxNXM/s400/grayscott.png)
 

data/lib/toxiclibs/version.rb

@@ -1,5 +1,5 @@
 # frozen_string_literal: true
 # wrapper to give version a meaningful name
 module Toxiclibs
-  VERSION = '0.9.3'.freeze
+  VERSION = '1.0.0'.freeze
 end

data/pom.rb

@@ -1,7 +1,7 @@
 project 'toxiclibs' do
 
   model_version '4.0.0'
-  id 'ruby-processing:toxiclibs:0.9.3'
+  id 'ruby-processing:toxiclibs:1.0.0'
   packaging 'jar'
 
   description 'toxiclibs-library for JRubyArt'
@@ -29,17 +29,17 @@ project 'toxiclibs' do
             )
 
   jar 'args4j:args4j:2.0.31'
-  jar 'org.processing:core:3.3.2'
+  jar 'org.processing:core:3.3.6'
 
-  plugin( :compiler, '3.5.1',
+  plugin( :compiler, '3.7.0',
           'source' =>  '1.8',
           'target' =>  '1.8' )
   plugin( :jar, '3.0.2',
           'archive' => {
             'manifestFile' =>  'MANIFEST.MF'
           } )
-  plugin :resources, '2.6'
-  plugin :dependency, '2.10' do
+  plugin :resources, '3.0.2'
+  plugin :dependency, '3.0.2' do
     execute_goals( :id => 'default-cli',
                    'artifactItems' => [ { 'groupId' =>  'args4j',
                                           'artifactId' =>  'args4j',

data/pom.xml

@@ -11,7 +11,7 @@ DO NOT MODIFIY - GENERATED CODE
   <modelVersion>4.0.0</modelVersion>
   <groupId>ruby-processing</groupId>
   <artifactId>toxiclibs</artifactId>
-  <version>0.9.3</version>
+  <version>1.0.0</version>
   <name>toxiclibs</name>
   <description>toxiclibs-library for JRubyArt</description>
   <organization>
@@ -58,7 +58,7 @@ DO NOT MODIFIY - GENERATED CODE
     <dependency>
       <groupId>org.processing</groupId>
       <artifactId>core</artifactId>
-      <version>3.3.2</version>
+      <version>3.3.6</version>
     </dependency>
   </dependencies>
   <build>
@@ -68,7 +68,7 @@ DO NOT MODIFIY - GENERATED CODE
     <plugins>
       <plugin>
         <artifactId>maven-compiler-plugin</artifactId>
-        <version>3.5.1</version>
+        <version>3.7.0</version>
         <configuration>
           <source>1.8</source>
           <target>1.8</target>
@@ -85,11 +85,11 @@ DO NOT MODIFIY - GENERATED CODE
       </plugin>
       <plugin>
         <artifactId>maven-resources-plugin</artifactId>
-        <version>2.6</version>
+        <version>3.0.2</version>
       </plugin>
       <plugin>
         <artifactId>maven-dependency-plugin</artifactId>
-        <version>2.10</version>
+        <version>3.0.2</version>
         <executions>
           <execution>
             <id>default-cli</id>

data/src/com/toxi/net/UDPSyncServer.java

@@ -102,7 +102,7 @@ public class UDPSyncServer {
      */
     protected int frameCount;
 
-    private static Logger logger;
+    private static Logger LOGGER;
 
     /**
      * Optional server event listener
@@ -147,9 +147,9 @@ public class UDPSyncServer {
         try {
             if (configFile != null)
                 config.load(new FileInputStream(configFile));
-            logger = Logger.getLogger("com.postspectacular");
-            logger.addHandler(new ConsoleHandler());
-            logger.setLevel(Level.CONFIG);
+            LOGGER = Logger.getLogger("com.postspectacular");
+            LOGGER.addHandler(new ConsoleHandler());
+            LOGGER.setLevel(Level.CONFIG);
             configure(config);
             run();
         } catch (FileNotFoundException e) {
@@ -175,8 +175,8 @@ public class UDPSyncServer {
         connectionTimeOut = config.getInt("udp.ttl", connectionTimeOut);
         UDPConnection.setTTL(connectionTimeOut);
         receiveTimeOut = config.getInt("udp.receivetimeout", receiveTimeOut);
-        if (logger != null) {
-            logger.log(Level.INFO, "configured server... port:{0} clients:{1} fps:{2} ttl:{3} rto:{4}", new Object[]{port, numClients, frameRate, connectionTimeOut, receiveTimeOut});
+        if (LOGGER != null) {
+            LOGGER.log(Level.INFO, "configured server... port:{0} clients:{1} fps:{2} ttl:{3} rto:{4}", new Object[]{port, numClients, frameRate, connectionTimeOut, receiveTimeOut});
         }
         setState(ServerState.WAITING_FOR_CLIENTS);
     }
@@ -188,8 +188,8 @@ public class UDPSyncServer {
     public void run() {
         try {
             socket = new DatagramSocket(port);
-            if (logger != null)
-                logger.log(Level.INFO, "creating socket @ port {0}", port);
+            if (LOGGER != null)
+                LOGGER.log(Level.INFO, "creating socket @ port {0}", port);
             if (listener != null) {
                 listener.serverStarted();
             }
@@ -197,8 +197,8 @@ public class UDPSyncServer {
                 switch (state) {
 
                     case WAITING_FOR_CLIENTS:
-                        if (logger != null)
-                            logger.info("Server running, waiting for connections...");
+                        if (LOGGER != null)
+                            LOGGER.info("Server running, waiting for connections...");
                         // disable timeout, i.e socket will block indefinitely
                         // until
                         // a packet is received
@@ -224,8 +224,8 @@ public class UDPSyncServer {
                                 UDPConnection conn = iter.next();
                                 if (!conn.isAlive()) {
                                     iter.remove();
-                                    if (logger != null)
-                                        logger.log(Level.WARNING, "{0} disconnected", conn);
+                                    if (LOGGER != null)
+                                        LOGGER.log(Level.WARNING, "{0} disconnected", conn);
                                     if (listener != null)
                                         listener.clientDisconnected(conn);
                                 }
@@ -252,8 +252,8 @@ public class UDPSyncServer {
                                         conn = new UDPConnection(ip, portDP);
                                         conn.send(socket, getSyncPayload());
                                         connections.put(connID, conn);
-                                        if (logger != null)
-                                            logger.log(Level.FINE, "re-adding connection: {0}", conn);
+                                        if (LOGGER != null)
+                                            LOGGER.log(Level.FINE, "re-adding connection: {0}", conn);
                                     }
                                     if (listener != null)
                                         listener.clientUpdated(conn,
@@ -267,13 +267,13 @@ public class UDPSyncServer {
                             long delta = (endSynch - beginSynch) / 1000000;
                             if (delta < frameDuration) {
                                 int sleep = frameDuration - (int) delta;
-                                if (logger != null)
-                                    logger.log(Level.FINEST, "sleeping: {0}", sleep);
+                                if (LOGGER != null)
+                                    LOGGER.log(Level.FINEST, "sleeping: {0}", sleep);
                                 Thread.sleep(sleep);
                             }
                         } else {
-                            if (logger != null)
-                                logger.info("all clients disconnected");
+                            if (LOGGER != null)
+                                LOGGER.info("all clients disconnected");
                             setState(ServerState.WAITING_FOR_CLIENTS);
                         }
                 }
@@ -281,8 +281,8 @@ public class UDPSyncServer {
         } catch (IOException | InterruptedException e) {
             handleException(e);
         } finally {
-            if (logger != null)
-                logger.info("server shutting down...");
+            if (LOGGER != null)
+                LOGGER.info("server shutting down...");
             if (socket != null)
                 socket.close();
         }
@@ -302,8 +302,8 @@ public class UDPSyncServer {
         try {
             DatagramPacket receivePacket = new DatagramPacket(receiveData,
                     receiveData.length);
-            if (logger != null)
-                logger.log(Level.INFO, "waiting for {0} more clients to reconnect...", (numClients - connections.size()));
+            if (LOGGER != null)
+                LOGGER.log(Level.INFO, "waiting for {0} more clients to reconnect...", (numClients - connections.size()));
             socket.receive(receivePacket);
             InetAddress ip = receivePacket.getAddress();
             int portDP = receivePacket.getPort();
@@ -311,14 +311,14 @@ public class UDPSyncServer {
             if (connections.get(connID) == null) {
                 if (connections.isEmpty()) {
                     frameCount = 0;
-                    if (logger != null)
-                        logger.info("resetting frame count");
+                    if (LOGGER != null)
+                        LOGGER.info("resetting frame count");
                 }
                 UDPConnection conn = new UDPConnection(ip, portDP);
                 connections.put(connID, conn);
                 conn.send(socket, getSyncPayload());
-                if (logger != null)
-                    logger.log(Level.FINE, "added new connection: {0}", conn);
+                if (LOGGER != null)
+                    LOGGER.log(Level.FINE, "added new connection: {0}", conn);
                 if (listener != null) {
                     listener.clientConnected(conn);
                 }
@@ -332,8 +332,8 @@ public class UDPSyncServer {
     private void handleException(Exception e) {
         if (listener != null)
             listener.serverError(e);
-        if (logger != null)
-            logger.log(Level.SEVERE, "Server error", e);
+        if (LOGGER != null)
+            LOGGER.log(Level.SEVERE, "Server error", e);
         else
             e.printStackTrace();
     }
@@ -381,8 +381,8 @@ public class UDPSyncServer {
      */
     private void setState(ServerState s) {
         state = s;
-        if (logger != null)
-            logger.log(Level.CONFIG, "new server state: {0}", state);
+        if (LOGGER != null)
+            LOGGER.log(Level.CONFIG, "new server state: {0}", state);
         if (listener != null)
             listener.serverStateChanged(s);
     }
@@ -434,7 +434,7 @@ public class UDPSyncServer {
      * @param logger
      */
     public void setLogger(Logger logger) {
-        UDPSyncServer.logger = logger;
+        UDPSyncServer.LOGGER = logger;
     }
 
     /**
@@ -444,7 +444,7 @@ public class UDPSyncServer {
      */
     public void setListener(ServerListener listener) {
         this.listener = listener;
-        if (logger != null)
-            logger.log(Level.INFO, "new server listener: {0}", listener);
+        if (LOGGER != null)
+            LOGGER.log(Level.INFO, "new server listener: {0}", listener);
     }
 }

data/src/toxi/processing/ToxiclibsSupport.java

@@ -73,7 +73,7 @@ public class ToxiclibsSupport {
     /**
      *
      */
-    protected static final Logger logger = Logger
+    protected static final Logger LOGGER = Logger
             .getLogger(ToxiclibsSupport.class.getName());
 
     /**
@@ -237,7 +237,7 @@ public class ToxiclibsSupport {
                 gfx.ellipse(e.x - r.x, e.y - r.y, r.x * 2, r.y * 2);
                 break;
             default:
-                logger.log(Level.WARNING, "invalid ellipse mode: {0}", gfx.ellipseMode);
+                LOGGER.log(Level.WARNING, "invalid ellipse mode: {0}", gfx.ellipseMode);
         }
     }
 
@@ -968,7 +968,7 @@ public class ToxiclibsSupport {
                 gfx.rect(r.x + rw, r.y + rh, rw, rh);
                 break;
             default:
-                logger.log(Level.WARNING, "invalid rect mode: {0}", gfx.rectMode);
+                LOGGER.log(Level.WARNING, "invalid rect mode: {0}", gfx.rectMode);
         }
     }
 

data/toxiclibs.gemspec

@@ -10,7 +10,7 @@ Gem::Specification.new do |spec|
   spec.extra_rdoc_files = %w(README.md LICENSE.md)
   spec.summary = %q(Updated and extended toxiclibs libraries for JRubyArt and propane)
   spec.description =<<-EOS
-  Toxiclibs java libraries wrapped in a rubygem. Compiled and tested with JRubyArt-1.3.2 and processing-3.3.2
+  Toxiclibs java libraries wrapped in a rubygem. Compiled and tested with JRubyArt-1.4.4 and processing-3.3.6
   EOS
   spec.licenses = %w(MIT LGPL-3.0)
   spec.authors = %w(Karsten\ Schmidt Martin\ Prout)
@@ -20,5 +20,5 @@ Gem::Specification.new do |spec|
   spec.files << 'lib/toxiclibs.jar'
   spec.files << 'lib/args4j-2.0.31.jar'
   spec.require_paths = ['lib']
-  spec.add_development_dependency 'rake', '~> 12.0', '>= 12.0.0'
+  spec.add_development_dependency 'rake', '~> 12.3', '>= 12.3.0'
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: toxiclibs
 version: !ruby/object:Gem::Version
-  version: 0.9.3
+  version: 1.0.0
 platform: ruby
 authors:
 - Karsten Schmidt
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2017-04-26 00:00:00.000000000 Z
+date: 2017-12-18 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rake
@@ -17,22 +17,22 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '12.0'
+        version: '12.3'
     - - ">="
       - !ruby/object:Gem::Version
-        version: 12.0.0
+        version: 12.3.0
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '12.0'
+        version: '12.3'
     - - ">="
       - !ruby/object:Gem::Version
-        version: 12.0.0
+        version: 12.3.0
 description: "  Toxiclibs java libraries wrapped in a rubygem. Compiled and tested
-  with JRubyArt-1.3.2 and processing-3.3.2\n"
+  with JRubyArt-1.4.4 and processing-3.3.6\n"
 email: mamba2928@yahoo.co.uk
 executables: []
 extensions: []
@@ -459,7 +459,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.6.11
+rubygems_version: 2.7.3
 signing_key: 
 specification_version: 4
 summary: Updated and extended toxiclibs libraries for JRubyArt and propane