picrate 2.1.1-java → 2.1.2-java

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: d75664876e56bfb68eb317371315aa6eb989d714f0ca9421c997fded6013f92e
-  data.tar.gz: 0ed6af00f023c0d5d447cdf19e94001343f64b335e28b0037029368aed84705a
+  metadata.gz: 7e9ef3696c4eb0b3a488c7e25d30546ab03eae3a49e5220ec3d9cf4c862fddf3
+  data.tar.gz: 88f799089492e9507bbb09baa4e9634c335627fea27ec8adf22207cf4678de7b
 SHA512:
-  metadata.gz: 6369280804b285a714f9fb8cb9dac9dd70cb46d0b6d0aa66a9e3dc63d06cf3425be9cb0bf1143f5ed81f2e4823790ddba517eeb2ab852567f5f1eded80471e96
-  data.tar.gz: ace654cbd577df5fab79afcddafbb67a1c19aca7beb4c19fec8a3db01bf06bc308ba35107febb9122d320ff3bb7b6779ecdd1885089b9dde196825f6802fe0cf
+  metadata.gz: 57be7c1825b5afe9fac52830070c97e04b18590d6db7d3ff099a83861e757eb7dfba02f1f9a3ad80c5e6b20c1ce73226a13be1ce3aefb3d6e66180af59d742d1
+  data.tar.gz: a94c876edf96da7f89939d0cb11e8ab09f74c03686c5f36eaeae90ea61c5dd44e23c9d7812d521a17215110534a722f4a20ee7c29f8dffc28a1af0b15eac21db

data/.mvn/extensions.xml

@@ -3,7 +3,7 @@
   <extension>
     <groupId>io.takari.polyglot</groupId>
     <artifactId>polyglot-ruby</artifactId>
-    <version>0.4.3
+    <version>0.4.5
     </version>
   </extension>
 </extensions>

data/.mvn/wrapper/MavenWrapperDownloader.java

@@ -20,7 +20,7 @@ import java.util.Properties;
 
 public class MavenWrapperDownloader {
 
-    private static final String WRAPPER_VERSION = "0.5.5";
+    private static final String WRAPPER_VERSION = "0.5.6";
     /**
      * Default URL to download the maven-wrapper.jar from, if no 'downloadUrl' is provided.
      */

data/.mvn/wrapper/maven-wrapper.properties

@@ -1,2 +1,2 @@
-distributionUrl=https://repo.maven.apache.org/maven2/org/apache/maven/apache-maven/3.6.1/apache-maven-3.6.1-bin.zip
-wrapperUrl=https://repo.maven.apache.org/maven2/io/takari/maven-wrapper/0.5.5/maven-wrapper-0.5.5.jar
+distributionUrl=https://repo.maven.apache.org/maven2/org/apache/maven/apache-maven/3.6.3/apache-maven-3.6.3-bin.zip
+wrapperUrl=https://repo.maven.apache.org/maven2/io/takari/maven-wrapper/0.5.6/maven-wrapper-0.5.6.jar

data/CHANGELOG.md

@@ -1,4 +1,6 @@
-v2.1.1 Bump to JRuby-9.2.13.0, include examples using ruby `clamp` in place of processing `constrain`.
+v2.1.2 Bump to JRuby-9.2.14.0
+
+v2.1.1 Bump to JRuby-9.2.13.0, include examples using ruby `clamp` in place of processing `constrain`, update to video-2.0 release, add run instruction to help
 
 v2.1.0 Refactor how we configure geany so we can use ENV['HOME'] rather hard code config file. Bump to JRuby-9.2.12.0, include Sam Pottingers July 2020 staging changes.
 

data/README.md

@@ -19,7 +19,7 @@ Requires java to build (and jogl-2.4.0-rc jars), but uses a maven wrapper so you
 ```bash
 cd PiCrate # or whatever you call it
 rake # assumes an installed version of vanilla processing
-jgem install picrate-2.1.1-java.gem
+jgem install picrate-2.1.2-java.gem
 
 ```
 To create a template sketch:-

data/docs/_posts/2018-05-06-install_jruby.md

@@ -14,7 +14,7 @@ Get the latest version from [http://jruby.org/download][download]
 
 ```bash
 cd /opt
-sudo tar xzvf /pathToDownload/jruby-bin-9.2.13.0.tar.gz
+sudo tar xzvf /pathToDownload/jruby-bin-9.2.14.0.tar.gz
 ```
 
 Then use the excellent `update-alternatives` tool to provide symbolic links to `jruby`, `jgem`, `jirb` and `rake` especially if you haven't installed `mri` ruby.
@@ -38,9 +38,9 @@ export PATH="${PATH}:${GEM_PATH}/bin"
 
 ### Automated install using bash ###
 
-The [picrate2_install.sh][bash] script currently installs jruby-9.2.13.0 and picrate-2.1.1.
+The [picrate2_install.sh][bash] script currently installs jruby-9.2.14.0 and picrate-2.1.2.
 
 If you know better please post on wiki
 
-[download]:"https://repo1.maven.org/maven2/org/jruby/jruby-dist/9.2.13.0/jruby-dist-9.2.13.0-bin.tar.gz"
+[download]:"https://repo1.maven.org/maven2/org/jruby/jruby-dist/9.2.14.0/jruby-dist-9.2.14.0-bin.tar.gz"
 [bash]:https://gist.github.com/monkstone/6ae9840d7b7008c177b4a9f589d14ec6

data/docs/_posts/2020-05-11-getting_started_manjaro.md

@@ -5,12 +5,20 @@ date:   2020-05-11 07:34:13
 categories: PiCrate update
 permalink: /getting_manjaro/
 ---
-Currently Manjaro does not come with a pre-installed java. So the first step is to install a `jdk` the distro version (jdk14) should work. Setting the JDK_HOME environment (easiest done `/etc/profile.d`) and then manually install the latest JRuby. It is probably worth creating a symbolic links to `/usr/bin/jruby` and `/usr/bin/jgem` from wherever you installed jruby eg /opt folder.
+If Manjaro does not come with a pre-installed java, then the first step is to install a `jdk` the distro version (jdk14) should work. 
 
 ```bash
-mkdir -p ~/.gem/ruby/2.5.0
+sudo pacman -S jdk-openjdk # current distro version jdk14
 ```
+You can also use pacman to install jruby
+```bash
+sudo pacman -S jruby # current version jruby-9.2.14.0
+```
+It is probably a good idea to create a local gem store (rather needing to use sudo to install gems)
 
+```bash
+mkdir -p ~/.gem/ruby/2.5.0 # current MRI version supported by jruby
+```
 Now set your `GEM_HOME`, `GEM_PATH` and amend your `PATH` as follows:-
 
 ```bash
@@ -19,16 +27,20 @@ echo "export GEM_PATH=\"\${HOME}/.gem/ruby/${MRI_RUBY}\"" >> ~/.bashrc
 echo "export PATH=\"\${PATH}:\${GEM_PATH}/bin\"" >> ~/.bashrc
 source ~/.bashrc # to update environment without re-logging in
 ```
-Now should be ready to install `picrate` and other gems.
-Install a local version of rake:-
+Now should be ready to install `picrate` and other gems. But speed up install time you should set `--no-document` option in ~/.gemrc
+
 ```bash
-jgem install rake
+touch ~/.gemrc
+echo "gem: --no-document" > ~/.gemrc
 ```
 To install latest picrate and its dependencies:-
 
 ```bash
 jgem install picrate
 ```
+
+Geany is a good editor/ide for PiCrate on the RaspberryPI (install via pacman), but some may prefer vim. For geany you should edit/preferences/Terminal to `Execute programs in the VTE`.
+
 __For a first install:-__
 
 ```bash
@@ -37,7 +49,7 @@ picrate --install # no args, install samples and geany config
 picrate -i Samples # to omit geany config
 ```
 
-This installs example sketches in `~/projects/examples` and ties them into a `geany` project `examples.geany`. It should also be possible to run sketches from the `geany` ide. Sketches need to be run in VTE terminal on Manjaro ARM the terminal emulator, does not give access to local environment variables in the version of Geany supplied.
+This installs example sketches in `~/projects/examples` and ties them into a `geany` project `examples.geany`. It should also be possible to run sketches from the `geany` ide. The geany config creates `picrate.rb` template sketch so you can create a new sketch with template.
 
 To create a template sketch from the command line:-
 
@@ -77,7 +89,7 @@ vim my_sketch.rb
 To run sketches from command line:-
 
 ```bash
-jruby my_sketch.rb
+jruby --dev my_sketch.rb
 ```
 
 Or even `chmod +x my_sketch.rb` to make an executable script.

data/lib/picrate.rb

@@ -9,4 +9,5 @@ end
 Dir["#{PICRATE_ROOT}/lib/*.jar"].sort.each do |jar|
   require jar
 end
-require_relative 'picrate/app'
+require "#{PICRATE_ROOT}/lib/picrate/app"
+require "#{PICRATE_ROOT}/lib/picrate/helpers/numeric"

data/lib/picrate/helper_methods.rb

@@ -1,7 +1,7 @@
 # frozen_string_literal: false
 
 # processing module wrapper
-require_relative 'helpers/numeric'
+
 module Processing
   # Provides some convenience methods
   module HelperMethods

data/lib/picrate/runner.rb

@@ -32,7 +32,7 @@ module Processing
       opt_parser = OptionParser.new do |opts|
         # Set a banner, displayed at the top
         # of the help screen.
-        opts.banner = 'Usage: picrate [options] [<sketch.rb>]'
+        opts.banner = 'Usage: picrate [options] [<name>]'
 
         # Define the options, and what they do
         options[:version] = false
@@ -55,6 +55,8 @@ module Processing
         # assumed to have this option.
         opts.on_tail('-h', '--help', 'Display this screen') do
           puts opts
+          puts ''
+          puts 'Run a sketch: jruby [--dev] [<sketch.rb>]'
           exit
         end
       end
@@ -81,9 +83,7 @@ module Processing
       library ||= 'new'
       choice = library.downcase
       case choice
-      when /sound/
-        warn 'The sound library is broken, try minim instead'
-      when /samples|video/
+      when /samples|sound|video/
         system "cd #{PICRATE_ROOT}/vendors && rake install_#{choice}"
       when /new/
         # install samples and config geany

data/lib/picrate/version.rb

@@ -1,5 +1,5 @@
 # frozen_string_literal: true
 
 module PiCrate
-  VERSION = '2.1.1'
+  VERSION = '2.1.2'
 end

data/library/jcomplex/jcomplex.rb

@@ -0,0 +1 @@
+java_import Java::MonkstoneComplex::JComplex

data/mvnw

@@ -212,9 +212,9 @@ else
       echo "Couldn't find .mvn/wrapper/maven-wrapper.jar, downloading it ..."
     fi
     if [ -n "$MVNW_REPOURL" ]; then
-      jarUrl="$MVNW_REPOURL/io/takari/maven-wrapper/0.5.5/maven-wrapper-0.5.5.jar"
+      jarUrl="$MVNW_REPOURL/io/takari/maven-wrapper/0.5.6/maven-wrapper-0.5.6.jar"
     else
-      jarUrl="https://repo.maven.apache.org/maven2/io/takari/maven-wrapper/0.5.5/maven-wrapper-0.5.5.jar"
+      jarUrl="https://repo.maven.apache.org/maven2/io/takari/maven-wrapper/0.5.6/maven-wrapper-0.5.6.jar"
     fi
     while IFS="=" read key value; do
       case "$key" in (wrapperUrl) jarUrl="$value"; break ;;

data/mvnw.cmd

@@ -120,7 +120,7 @@ SET MAVEN_JAVA_EXE="%JAVA_HOME%\bin\java.exe"
 set WRAPPER_JAR="%MAVEN_PROJECTBASEDIR%\.mvn\wrapper\maven-wrapper.jar"
 set WRAPPER_LAUNCHER=org.apache.maven.wrapper.MavenWrapperMain
 
-set DOWNLOAD_URL="https://repo.maven.apache.org/maven2/io/takari/maven-wrapper/0.5.5/maven-wrapper-0.5.5.jar"
+set DOWNLOAD_URL="https://repo.maven.apache.org/maven2/io/takari/maven-wrapper/0.5.6/maven-wrapper-0.5.6.jar"
 
 FOR /F "tokens=1,2 delims==" %%A IN ("%MAVEN_PROJECTBASEDIR%\.mvn\wrapper\maven-wrapper.properties") DO (
     IF "%%A"=="wrapperUrl" SET DOWNLOAD_URL=%%B
@@ -134,7 +134,7 @@ if exist %WRAPPER_JAR% (
     )
 ) else (
     if not "%MVNW_REPOURL%" == "" (
-        SET DOWNLOAD_URL="%MVNW_REPOURL%/io/takari/maven-wrapper/0.5.5/maven-wrapper-0.5.5.jar"
+        SET DOWNLOAD_URL="%MVNW_REPOURL%/io/takari/maven-wrapper/0.5.6/maven-wrapper-0.5.6.jar"
     )
     if "%MVNW_VERBOSE%" == "true" (
         echo Couldn't find %WRAPPER_JAR%, downloading it ...

data/picrate.gemspec

@@ -30,7 +30,7 @@ Gem::Specification.new do |gem|
   gem.executables   = gem.files.grep(%r{^bin/}).map { |f| File.basename(f) }
   gem.test_files    = gem.files.grep(%r{^(test|spec|features)/})
   gem.add_development_dependency 'minitest', '~> 5.10'
-  gem.add_development_dependency 'rake', '~> 12.3'
+  gem.add_runtime_dependency 'rake', '~> 13.0'
   gem.add_runtime_dependency 'arcball', '~> 1.0', '>= 1.0.1'
   gem.require_paths = ['lib']
   gem.platform      = 'java'

data/pom.rb

@@ -2,7 +2,7 @@
 
 project 'picrate', 'http://maven.apache.org' do
   model_version '4.0.0'
-  id 'ruby-processing:picrate:2.1.1'
+  id 'ruby-processing:picrate:2.1.2'
   packaging 'jar'
 
   description 'An integrated processing-core (somewhat hacked), with additional java code for a jruby version of processing.'
@@ -31,7 +31,7 @@ project 'picrate', 'http://maven.apache.org' do
              'project.build.sourceEncoding' => 'utf-8',
              'polyglot.dump.pom' => 'pom.xml')
 
-  pom 'org.jruby:jruby:9.2.13.0'
+  pom 'org.jruby:jruby:9.2.14.0'
   jar 'org.jogamp.jogl:jogl-all:${jogl.version}'
   jar 'org.jogamp.gluegen:gluegen-rt-main:${jogl.version}'
   jar 'org.processing:video:3.0.2'
@@ -47,11 +47,12 @@ overrides do
          'links' => ['${processing.api}',
                      '${jruby.api}'])
   plugin(:jar, '3.2.0',
-         'archive' => {
-           'manifestEntries' => {
-             'Class-Path' => 'gluegen-rt.jar jog-all.jar'
-           }
-         })
+    'archive' => {
+      'manifestEntries' => {
+        'Automatic-Module-Name' => 'processing.core'
+      }
+    }
+  )
   plugin :jdeps, '3.1.2' do
     execute_goals 'jdkinternals', 'test-jdkinternals'
   end

data/pom.xml

@@ -6,12 +6,12 @@ DO NOT MODIFIY - GENERATED CODE
 
 
 -->
-<project xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd" xmlns="http://maven.apache.org/POM/4.0.0"
+<project xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 https://maven.apache.org/xsd/maven-4.0.0.xsd" xmlns="http://maven.apache.org/POM/4.0.0"
     xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
   <modelVersion>4.0.0</modelVersion>
   <groupId>ruby-processing</groupId>
   <artifactId>picrate</artifactId>
-  <version>2.1.1</version>
+  <version>2.1.2</version>
   <name>picrate</name>
   <description>An integrated processing-core (somewhat hacked), with additional java code for a jruby version of processing.</description>
   <url>http://maven.apache.org</url>
@@ -76,7 +76,7 @@ DO NOT MODIFIY - GENERATED CODE
     <dependency>
       <groupId>org.jruby</groupId>
       <artifactId>jruby</artifactId>
-      <version>9.2.13.0</version>
+      <version>9.2.14.0</version>
       <type>pom</type>
     </dependency>
     <dependency>
@@ -149,7 +149,7 @@ DO NOT MODIFIY - GENERATED CODE
           <configuration>
             <archive>
               <manifestEntries>
-                <Class-Path>gluegen-rt.jar jog-all.jar</Class-Path>
+                <Automatic-Module-Name>processing.core</Automatic-Module-Name>
               </manifestEntries>
             </archive>
           </configuration>

data/src/main/java/monkstone/complex/JComplex.java

@@ -0,0 +1,252 @@
+package monkstone.complex;
+
+import java.util.Objects;
+
+/**
+ * The purpose of this class is to to make Complex operations more efficient
+ * than JRuby RubyComplex, by having a simpler interface, only modest
+ * improvements were obtained (but this is better than nothing on RaspberryPI).
+ */
+public final class JComplex {
+
+    private final double re;   // the real part
+    private final double im;   // the imaginary part
+    private final static JComplex ZERO = new JComplex(0, 0);
+    private final static JComplex NAN = new JComplex(Double.NaN, Double.NaN);
+
+    /**
+     * create a new object with the given real and imaginary parts
+     *
+     * @param real
+     * @param imag
+     */
+    public JComplex(double real, double imag) {
+        re = real;
+        im = imag;
+    }
+
+    /**
+     * @return a string representation of the invoking Complex object
+     */
+    @Override
+    public String toString() {
+        return "JComplex(" + re + ", " + im + "i)";
+    }
+
+    /**
+     *
+     * @return abs/modulus/magnitude
+     */
+    public final double abs() {
+        return Math.hypot(re, im);
+    }
+
+    /**
+     *
+     * @return square of abs/modulus/magnitude
+     */
+    public final double abs2() {
+        return re * re + im * im;
+    }
+
+    /**
+     *
+     * @return angle/phase/argument, normalized to be between -pi and pi
+     */
+    public final double phase() {
+        return Math.atan2(im, re);
+    }
+
+    /**
+     *
+     * @param b
+     * @return a new Complex object whose value is (this + b)
+     */
+    public final JComplex add(JComplex b) {
+        JComplex a = this;             // invoking object
+        double real = a.re + b.re;
+        double imag = a.im + b.im;
+        return new JComplex(real, imag);
+    }
+
+    /**
+     *
+     * @param scalar
+     * @return a new Complex object whose value is (this + scalar)
+     */
+    public final JComplex add(double scalar) {
+        return new JComplex(re + scalar, im);
+    }
+
+    public final boolean zero() {
+        return this.equals(ZERO);
+    }
+
+    /**
+     *
+     * @param b
+     * @return a new Complex object whose value is (this - b)
+     */
+    public final JComplex sub(JComplex b) {
+        JComplex a = this;
+        double real = a.re - b.re;
+        double imag = a.im - b.im;
+        return new JComplex(real, imag);
+    }
+
+    /**
+     *
+     * @param scalar
+     * @return a new Complex object whose value is (this - scalar)
+     */
+    public final JComplex sub(double scalar) {
+        return new JComplex(re - scalar, im);
+    }
+
+    /**
+     *
+     * @param b
+     * @return a new Complex object whose value is (this * b)
+     */
+    public final JComplex mul(JComplex b) {
+        JComplex a = this;
+        double real = a.re * b.re - a.im * b.im;
+        double imag = a.re * b.im + a.im * b.re;
+        return new JComplex(real, imag);
+    }
+
+    /**
+     * Also known as scale
+     *
+     * @param b
+     * @return a new Complex object whose value is (this * b)
+     */
+    public final JComplex mul(double b) {
+        return new JComplex(re * b, im * b);
+    }
+
+    /**
+     *
+     * @return a new Complex object whose value is the conjugate of this
+     */
+    public final JComplex conjugate() {
+        return new JComplex(re, -im);
+    }
+
+    /**
+     *
+     * @return a new Complex object whose value is the reciprocal of this
+     */
+    private JComplex reciprocal() {
+        double scale = re * re + im * im; // self dot product
+        return new JComplex(re / scale, -im / scale);
+    }
+
+    /**
+     *
+     * @param other
+     * @return this^other
+     */
+    public final JComplex pow(JComplex other) {
+        if (this.zero()) {
+            if (other.zero()) {
+                return ZERO;
+            }
+            return NAN;
+        }
+        return (this).log().mul(other).exp();
+    }
+
+    /**
+     *
+     * @param scalar
+     * @return this^scalar
+     */
+    public final JComplex pow(double scalar) {
+        if (this.zero()) {
+            if (scalar == 0) {
+                return ZERO;
+            }
+            return NAN;
+        }
+        return (this).log().mul(scalar).exp();
+    }
+
+    /**
+     *
+     * @return log
+     */
+    private JComplex log() {
+        return new JComplex(Math.log(abs()), Math.atan2(im, re));
+    }
+
+    /**
+     *
+     * @return real part
+     */
+    public final double re() {
+        return re;
+    }
+
+    /**
+     *
+     * @return imaginary part
+     */
+    public final double im() {
+        return im;
+    }
+
+    /**
+     *
+     * @param b
+     * @return a / b
+     */
+    public final JComplex div(JComplex b) {
+        JComplex a = this;
+        return a.mul(b.reciprocal());
+    }
+
+    /**
+     *
+     * @param b
+     * @return a / b
+     */
+    public final JComplex div(double b) {
+        if (b == 0) {
+            return NAN;
+        }
+        return new JComplex(re / b, im / b);
+    }
+
+    /**
+     *
+     * @return a new Complex object whose value is the complex exponential of
+     * this
+     */
+    public final JComplex exp() {
+        return new JComplex(Math.exp(re) * Math.cos(im), Math.exp(re) * Math.sin(im));
+    }
+
+    @Override
+    public final int hashCode() {
+        return Objects.hash(re, im);
+    }
+
+    @Override
+    public final boolean equals(Object obj) {
+        if (this == obj) {
+            return true;
+        }
+        if (obj == null) {
+            return false;
+        }
+        if (getClass() != obj.getClass()) {
+            return false;
+        }
+        final JComplex other = (JComplex) obj;
+        if (Double.doubleToLongBits(this.re) != Double.doubleToLongBits(other.re)) {
+            return false;
+        }
+        return Double.doubleToLongBits(this.im) == Double.doubleToLongBits(other.im);
+    }
+}

data/vendors/Rakefile

@@ -5,9 +5,9 @@ require 'rake/clean'
 require_relative './geany'
 WARNING = 'WARNING: wget download failed you could do a manual download'
 SOUND = 'sound.zip'
-SOUND_VERSION = 'v1.3.2'
-VIDEO = 'video-2.0-beta4.zip'
-VIDEO_VERSION = 'r6-v2.0-beta4'
+PROCESSING_GITHUB = 'https://github.com/processing'
+VIDEO = 'video.zip'
+DOWNLOAD = 'releases/download/latest'
 EXAMPLES = '0.5.5'
 HOME_DIR = ENV['HOME']
 LIBRARY = File.join(HOME_DIR, '.picrate', 'libraries')
@@ -47,16 +47,24 @@ task download_samples: ["#{EXAMPLES}.tar.gz"]
 
 desc 'download sound library'
 task :download_sound do
-  wget_base = 'wget -P https://github.com/processing/processing-sound'
-  wget_string = [wget_base, 'releases/download/latest', SOUND].join('/')
-  system wget_string
+  wget_base = ['wget', PROCESSING_GITHUB].join(' ')
+  wget_string = [wget_base, 'processing-sound', DOWNLOAD, SOUND].join('/')
+  begin
+    sh wget_string
+  rescue StandardError
+    warn(WARNING)
+  end
 end
 
 desc 'download video library'
 task :download_video do
-  wget_base = 'wget -P /tmp https://github.com/processing/processing-video'
-  wget_string = [wget_base, 'releases/download', VIDEO_VERSION, VIDEO].join('/')
-  system wget_string
+  wget_base = ['wget', PROCESSING_GITHUB].join(' ')
+  wget_string = [wget_base, 'processing-video', DOWNLOAD, VIDEO].join('/')
+  begin
+    sh wget_string
+  rescue StandardError
+    warn(WARNING)
+  end
 end
 
 desc 'initialize ~/.picrate directories'
@@ -71,10 +79,10 @@ task :install_config do
     FileUtils.cp 'picrate.rb', "#{HOME_DIR}/.config/geany/templates/files"
   end
   project_dir = File.join(HOME_DIR, 'projects')
-  unless File.exist? File.join(project_dir, 'examples', 'picrate_sketches.geany')
-    FileUtils.mkdir_p "#{HOME_DIR}/projects/examples"
-    config = GeanyConfig.new(project_dir, 'examples')
-    config.save(File.join(project_dir, 'examples', 'picrate_sketches.geany'))
+  unless File.exist? File.join(project_dir, 'picrate_sketches.geany')
+    FileUtils.mkdir_p "#{HOME_DIR}/projects"
+    config = GeanyConfig.new(project_dir)
+    config.save(File.join(project_dir, 'picrate_sketches.geany'))
   end
 end
 
@@ -89,15 +97,16 @@ end
 
 desc 'copy sound library'
 task copy_sound: SOUND do
-  system "unzip -d /tmp /tmp/#{SOUND}"
-  FileUtils.rm_r "#{LIBRARY}/sound" if File.exist? "#{LIBRARY}/sound"
-  FileUtils.cp_r '/tmp/sound', LIBRARY
+  sh "unzip #{SOUND}"
+  sh "rm -r #{LIBRARY}/sound" if File.exist? "#{LIBRARY}/sound"
+  sh "cp -r sound #{LIBRARY}"
+  sh 'rm -r sound'
 end
 
 desc 'copy video library'
-task copy_video: "/tmp/#{VIDEO}" do
-  system "unzip -d /tmp /tmp/#{VIDEO}"
-  FileUtils.rm_r "#{LIBRARY}/video" if File.exist? "#{LIBRARY}/video"
-  FileUtils.mkdir_p "#{LIBRARY}/video/library"
-  FileUtils.mv Dir.glob('/tmp/video/library/*.jar'), "#{LIBRARY}/video/library"
+task copy_video: VIDEO do
+  sh "unzip #{VIDEO}"
+  sh "rm -r #{LIBRARY}/video" if File.exist? "#{LIBRARY}/video"
+  sh "cp -r video #{LIBRARY}"
+  sh 'rm -r video'
 end

data/vendors/geany.rb

@@ -25,7 +25,7 @@ indent_mode=2
 
 [project]
 name=picrate_samples
-base_path=<%= home %>
+base_path=examples
 description=Exploring PiCrate
 file_patterns=*.rb;*.glsl;*.txt;
 
@@ -69,9 +69,9 @@ class GeanyConfig
   include ERB::Util
   attr_accessor :home, :directory, :template
 
-  def initialize(home, directory, template = geany_config)
+  def initialize(directory, template = geany_config)
     @home = home
-    @directory = File.join(home, directory)
+    @directory = directory
     @template = template
   end
 

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: picrate
 version: !ruby/object:Gem::Version
-  version: 2.1.1
+  version: 2.1.2
 platform: java
 authors:
 - monkstone
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2020-08-17 00:00:00.000000000 Z
+date: 2020-12-13 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   requirement: !ruby/object:Gem::Requirement
@@ -29,15 +29,15 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '12.3'
+        version: '13.0'
   name: rake
-  type: :development
+  type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '12.3'
+        version: '13.0'
 - !ruby/object:Gem::Dependency
   requirement: !ruby/object:Gem::Requirement
     requirements:
@@ -190,7 +190,7 @@ files:
 - lib/jogl-all-natives-linux-amd64.jar
 - lib/jogl-all-natives-linux-armv6hf.jar
 - lib/jogl-all.jar
-- lib/picrate-2.1.1.jar
+- lib/picrate-2.1.2.jar
 - lib/picrate.rb
 - lib/picrate/app.rb
 - lib/picrate/creators/parameters.rb
@@ -209,6 +209,7 @@ files:
 - library/color_group/color_group.rb
 - library/control_panel/control_panel.rb
 - library/dxf/dxf.rb
+- library/jcomplex/jcomplex.rb
 - library/library_proxy/README.md
 - library/library_proxy/library_proxy.rb
 - library/net/net.rb
@@ -226,6 +227,7 @@ files:
 - src/main/java/monkstone/ColorUtil.java
 - src/main/java/monkstone/MathToolModule.java
 - src/main/java/monkstone/PicrateLibrary.java
+- src/main/java/monkstone/complex/JComplex.java
 - src/main/java/monkstone/core/LibraryProxy.java
 - src/main/java/monkstone/fastmath/Deglut.java
 - src/main/java/monkstone/fastmath/package-info.java