picrate 0.6.0-java → 0.7.0-java

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 00f6892195bf24cb8499f36e91c6bff8b26ccd9daf333134d56e56ca5a8b8276
-  data.tar.gz: b0c035e3c0fcd805ed138c8a95407b21e33ece9ae29fffb4b4443fc60d9ce7ac
+  metadata.gz: 503789e011ca3a619d42a03d351463c02e8cf64c8119dab588b8e0f826415ad0
+  data.tar.gz: e2092cab3393155d0a29da02616755a9e4c14e1d5a9ecb9eadec68b248383348
 SHA512:
-  metadata.gz: e57716795bb80e84a92bc40f92dffeb5c0fe43184e093b978a8b06c4003b075bf64171669ca4537488d8f2041ae3e2bb3ad802ce0013f7dcb7e81a56905a7e63
-  data.tar.gz: 3ae4e5b88f878db84575d7eddcb03c87ddb3475a190fd269fd32a0baea9641a5debd151f4962949c98bac52ed3488049c71b772afd87752633f3077c29b91682
+  metadata.gz: 7459a92d1eb700e7c4c3c71f57de09453456768789b1878380e699c118a6e7f382bae314308e8a01cfbf9a601621f826ba91720b981bd049ba330d328605e7da
+  data.tar.gz: 9a84ceac91c0b6f3c26baf6f1eb497ef73cd872940bac442942c55c19ce329fe26a49bb2b87bcb934455de072166948fabea5b3c09594e8d8ad3b7799a214f9c

data/.mvn/extensions.xml

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

data/CHANGELOG.md

@@ -1,3 +1,5 @@
+v0.7.0 Refactor sketch_writer to load params from ~/.picrate/sketch.yml. `AppRender => GfxRender` because we only need `PGraphics` in renderer.
+
 v0.6.0 Re-branding with new 'pick'/'eight' svg for PiCrate
 
 v0.5.0 Do geany configuration when installing samples

data/Rakefile

@@ -1,4 +1,6 @@
 # frozen_string_literal: false
+
+require 'fileutils'
 require_relative 'lib/picrate/version'
 
 HOME_DIR = ENV['HOME']
@@ -20,7 +22,7 @@ desc 'Create Manifest and Copy Jars'
 task :init do
   create_manifest
   # processing_root = File.dirname(`readlink -f $(which processing)`) # for Archlinux etc
-  processing_root = File.join(HOME_DIR, 'processing-3.4') # alternative for debian linux etc
+  processing_root = File.join(HOME_DIR, 'processing-3.5.3') # alternative for debian linux etc
   jar_dir = File.join(processing_root, 'core', 'library')
   opengl = Dir.entries(jar_dir).grep(/amd64|armv6hf/).select { |jar| jar =~ /linux/ }
   opengl.concat %w[jogl-all.jar gluegen-rt.jar]
@@ -31,7 +33,7 @@ end
 
 desc 'Install'
 task :install do
-  sh "mv target/picrate-#{PiCrate::VERSION}.jar lib"
+  FileUtils.mv "target/picrate-#{PiCrate::VERSION}.jar", 'lib'
 end
 
 desc 'Gem'
@@ -53,7 +55,6 @@ desc 'Test'
 task :test do
   sh 'jruby test/helper_methods_test.rb'
   sh 'jruby test/respond_to_test.rb' # Skip this test on Travis etc
-  sh 'jruby test/create_test.rb'
   sh 'jruby test/math_tool_test.rb'
   sh 'jruby test/deglut_spec_test.rb'
   sh 'jruby test/vecmath_spec_test.rb'

data/docs/_editors/geany.md

@@ -4,12 +4,20 @@ title:  "Geany"
 permalink: /editors/geany/
 keywords: editor, ide, ruby, picrate, vim, emacs, geany
 ---
-Geany is highly configurable, and we have created a `geany` project file `picrate.geany` and sketch template `picrate.rb` for you, thai get installed when you:-
+Geany is highly configurable, and we have created a `geany` project file `picrate.geany` and sketch template `picrate.rb` for you, that get installed when you:-
 
 ```bash
 picrate --install samples
 ```
 
+#### Using picrate.rb template ####
+
+![select picrate.rb]({{ site.github.url }}/assets/picrate_template.png)
+
+Remember to give untitled sketch a new name (PS: it's easy to create your own templates):-
+
+![new with template]({{ site.github.url }}/assets/new_with_template.png)
+
 Use `make` to check syntax and `run` to run sketch
 
 See running sketch below:-

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

@@ -14,7 +14,7 @@ mkdir installer
 cd installer
 rake
 ```
-Currently installs jruby-9.2.4.1
+Currently installs jruby-9.2.7.0
 
 ### Manual install ###
 
@@ -25,7 +25,7 @@ Get the latest version from [http://jruby.org/download][download]
 
 ```bash
 cd /opt
-sudo tar xzvf /pathToDownload/jruby-bin-9.2.4.1.tar.gz
+sudo tar xzvf /pathToDownload/jruby-bin-9.2.7.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.
@@ -49,5 +49,5 @@ export PATH="${PATH}:${GEM_PATH}/bin"
 
 If you know better please post on wiki
 
-[download]:"https://repo1.maven.org/maven2/org/jruby/jruby-dist/9.2.4.1/jruby-dist-9.2.4.1-bin.tar.gz"
+[download]:"https://repo1.maven.org/maven2/org/jruby/jruby-dist/9.2.7.0/jruby-dist-9.2.7.0-bin.tar.gz"
 [rake_gist]:https://gist.github.com/monkstone/159c5a9813c9cd181040b4715e74f6b2

data/docs/about.md

@@ -8,7 +8,14 @@ PiCrate is both a `library` and an `app` that allows you to create [processing][
 
 #### Executable ####
 
-The executable is `picrate`, which can be used to install samples (and configure [GeanyIDE][geany]) and some processing libraries
+PiCrate sketches are executable scripts that (but without the executable permission), that will run directly from jruby.
+
+
+```bash
+jruby my_sketch.rb
+```
+
+The gem executable is `picrate`, which can be used to install samples (and to configure [GeanyIDE][geany]) and some processing libraries
 
 #### Library ###
 

data/lib/picrate/creators/parameters.rb

@@ -0,0 +1,23 @@
+# frozen_string_literal: true
+
+require 'yaml'
+require 'fileutils'
+
+# module to read sketch.yml
+# and or create sketch.yml with default parameters
+module Parameters
+  PATH = File.join(ENV['HOME'], '.picrate').freeze
+  FILE = File.join(PATH, 'sketch.yml').freeze
+  PARAM = { 'sketch' =>
+    { 'width' => 640, 'height' => 480, 'mode' => 'P2D' } }.freeze
+
+    def self.write
+      FileUtils.mkdir_p PATH
+      File.write(FILE, PARAM.to_yaml)
+    end
+
+    def self.read
+      write unless File.exist?(FILE)
+      YAML.load_file(FILE)
+    end
+  end

data/lib/picrate/creators/sketch_factory.rb

@@ -4,7 +4,7 @@ class SketchFactory
   NAMES = %w[One Two Three]
   def initialize(argc)
     NAMES.each do |name|
-      SketchWriter.new(File.basename(name, '.rb'), width: 300, height: 300).write
+      SketchWriter.new(File.basename(name, '.rb')).write
     end
   end
 end

data/lib/picrate/creators/sketch_writer.rb

@@ -1,21 +1,64 @@
-# frozen_string_literal: false
-require_relative 'sketch_class'
+# frozen_string_literal: true
+
+require_relative 'parameters'
+require 'erb'
+
+TEMPLATE = ERB.new <<~SKETCH
+  require 'picrate'
+
+  class <%= @class %> < Processing::App
+    def settings
+      size <%= @width %>, <%= @height %>, <%= @mode %>
+    end
+
+    def setup
+      sketch_title '<%= @title %>'
+    end
+
+    def draw
+
+    end
+  end
+
+  <%= @class %>.new
+SKETCH
+
+# The SketchClass class knows how to format title & class name
+class SketchClass
+  attr_reader :name
+  def initialize(name)
+    @name = name
+  end
+
+  def class_name
+    name.split('_').collect(&:capitalize).join
+  end
+
+  def title
+    name.split('_').collect(&:capitalize).join(' ')
+  end
+
+  def filename
+    name << '.rb'
+  end
+end
 
 # The file writer can write a sketch when given instance of Sketch type
 class SketchWriter
-  attr_reader :file, :sketch
-
-  def initialize(path, args)
-    @sketch = SketchClass.new(
-      name: path,
-      width: args[0].to_i,
-      height: args[1].to_i,
-      mode: args[2]
-    )
-    @file = format('%s/%s.rb', File.dirname(path), path)
+  attr_reader :file, :name, :width, :height, :mode, :sketch
+  def initialize(path)
+    param = Parameters.read
+    @sketch = SketchClass.new(path)
+    @class = sketch.class_name
+    @title = sketch.title
+    sketch_param = param.fetch('sketch')
+    @width = sketch_param.fetch('width')
+    @height = sketch_param.fetch('height')
+    @mode = sketch_param.fetch('mode')
+    binding
   end
 
   def write
-    File.open(file, 'w+') { |f| f.write sketch.lines.join("\n") }
+    File.open(sketch.filename, 'w+') { |f| f.write TEMPLATE.result(binding) }
   end
 end

data/lib/picrate/runner.rb

@@ -63,7 +63,8 @@ module Processing
 
     def create
       require_relative 'creators/sketch_writer'
-      SketchWriter.new(File.basename(filename, '.rb'), argc).write
+      # in case user supplied extension, we remove it
+      SketchWriter.new(File.basename(filename, '.rb')).write
     end
 
     def show_version

data/lib/picrate/version.rb

@@ -1,4 +1,4 @@
 # frozen_string_literal: true
 module PiCrate
-  VERSION = '0.6.0'.freeze
+  VERSION = '0.7.0'.freeze
 end

data/picrate.gemspec

@@ -4,19 +4,19 @@ $LOAD_PATH.unshift(lib) unless $LOAD_PATH.include?(lib)
 require 'picrate/version'
 
 Gem::Specification.new do |gem|
-  gem.name          = 'picrate'
-  gem.version       = PiCrate::VERSION
-  gem.authors       = ['monkstone']
-  gem.email         = ['mamba2928@yahoo.co.uk']
-  gem.licenses     = %w(GPL-3.0 LGPL-2.0)
-  gem.description  = <<-EOS
-  A batteries included version of processing in ruby, for raspberrypi and linux.
-  Install samples to configures geany ide.
+  gem.name        = 'picrate'
+  gem.version     = PiCrate::VERSION
+  gem.authors     = ['monkstone']
+  gem.email       = ['mamba2928@yahoo.co.uk']
+  gem.licenses    = %w(GPL-3.0 LGPL-2.0)
+  gem.description = <<~EOS
+    A batteries included version of processing in ruby, for raspberrypi and
+    linux. Install samples to configures geany ide.
   EOS
-  gem.summary       = %q{ruby wrapper for processing-3.4 on raspberrypi and linux64}
-  gem.homepage      = 'https://ruby-processing.github.io/PiCrate/'
+  gem.summary     = %q{ruby wrapper for processing-3.5.3 on raspberrypi and linux64}
+  gem.homepage    = 'https://ruby-processing.github.io/PiCrate/'
   gem.post_install_message = %q{Use 'picrate --install Samples' to install samples}
-  gem.files         = `git ls-files`.split($/)
+  gem.files       = `git ls-files`.split($/)
   gem.files << "lib/picrate-#{PiCrate::VERSION}.jar"
   gem.files << 'lib/gluegen-rt.jar'
   gem.files << 'lib/jogl-all.jar'

data/pom.rb

@@ -1,7 +1,7 @@
 project 'picrate', 'http://maven.apache.org' do
 
   model_version '4.0.0'
-  id 'ruby-processing:picrate:0.6.0'
+  id 'ruby-processing:picrate:0.7.0'
   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',
     'maven.compiler.source' => '1.8' )
-    pom 'org.jruby:jruby:9.2.4.0'
+    pom 'org.jruby:jruby:9.2.7.0'
     jar 'org.processing:video:3.2.3'
     jar 'org.jogamp.jogl:jogl-all:${jogl.version}'
     jar 'org.jogamp.gluegen:gluegen-rt-main:${jogl.version}'

data/pom.xml

@@ -11,7 +11,7 @@ DO NOT MODIFIY - GENERATED CODE
   <modelVersion>4.0.0</modelVersion>
   <groupId>ruby-processing</groupId>
   <artifactId>picrate</artifactId>
-  <version>0.6.0</version>
+  <version>0.7.0</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>
@@ -66,19 +66,19 @@ DO NOT MODIFIY - GENERATED CODE
   <properties>
     <jogl.version>2.3.2</jogl.version>
     <jruby.api>http://jruby.org/apidocs/</jruby.api>
-    <source.directory>src/main</source.directory>
+    <maven.compiler.source>1.8</maven.compiler.source>
     <maven.compiler.target>1.8</maven.compiler.target>
+    <picrate.basedir>${project.basedir}</picrate.basedir>
+    <polyglot.dump.pom>pom.xml</polyglot.dump.pom>
     <processing.api>http://processing.github.io/processing-javadocs/core/</processing.api>
     <project.build.sourceEncoding>utf-8</project.build.sourceEncoding>
-    <polyglot.dump.pom>pom.xml</polyglot.dump.pom>
-    <maven.compiler.source>1.8</maven.compiler.source>
-    <picrate.basedir>${project.basedir}</picrate.basedir>
+    <source.directory>src/main</source.directory>
   </properties>
   <dependencies>
     <dependency>
       <groupId>org.jruby</groupId>
       <artifactId>jruby</artifactId>
-      <version>9.2.4.0</version>
+      <version>9.2.7.0</version>
       <type>pom</type>
     </dependency>
     <dependency>

data/src/main/java/monkstone/MathToolModule.java

@@ -1,7 +1,7 @@
 /**
  * The purpose of this tool is to allow picrate users to use an alternative
  * to processing.org map, lerp and norm methods in their sketches
- * Copyright (c) 2018 Martin Prout. This tool is free software; you can
+ * Copyright (c) 2018-19 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.

data/src/main/java/monkstone/fastmath/Deglut.java

@@ -1,5 +1,5 @@
 /* 
- * Copyright (c) 2018 Martin Prout
+ * Copyright (c) 2018-19 Martin Prout
  * 
  * This library is free software; you can redistribute it and/or
  * modify it under the terms of the GNU General Public

data/src/main/java/monkstone/vecmath/package-info.java

@@ -1,5 +1,5 @@
 /* 
-* Copyright (c) 2018 Martin Prout
+* Copyright (c) 2018-19 Martin Prout
 * 
 * This library is free software; you can redistribute it and/or
 * modify it under the terms of the GNU General Public

data/src/main/java/monkstone/vecmath/vec3/Vec3.java

@@ -1,7 +1,7 @@
 package monkstone.vecmath.vec3;
 
 /*
-* Copyright (c) 2018 Martin Prout
+* Copyright (c) 2018-19 Martin Prout
 *
 * This library is free software; you can redistribute it and/or
 * modify it under the terms of the GNU General Public

data/src/main/java/monkstone/videoevent/VideoInterface.java

@@ -1,5 +1,5 @@
 /* 
- * Copyright (c) 2018 Martin Prout
+ * Copyright (c) 2018-19 Martin Prout
  * 
  * This library is free software; you can redistribute it and/or
  * modify it under the terms of the GNU General Public

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

@@ -1,5 +1,5 @@
 /* 
-* Copyright (c) 2018 Martin Prout
+* Copyright (c) 2018-19 Martin Prout
 * 
 * This library is free software; you can redistribute it and/or
 * modify it under the terms of the GNU General Public

data/vendors/Rakefile

@@ -1,13 +1,15 @@
 # frozen_string_literal: true
+
+require 'fileutils'
 require 'rake/clean'
 
-WARNING = 'WARNING: wget download failed you could do a manual download'.freeze
-SOUND = 'sound.zip'.freeze
+WARNING = 'WARNING: wget download failed you could do a manual download'
+SOUND = 'sound.zip'
 SOUND_VERSION = 'v1.3.2'
 GLVIDEO = 'processing-glvideo.zip'
 VIDEO = 'video-2.zip'
 VIDEO_VERSION = '2'
-EXAMPLES = '0.0.9'.freeze
+EXAMPLES = '0.2.0'
 HOME_DIR = ENV['HOME']
 CLOBBER.include(EXAMPLES, SOUND, GLVIDEO, VIDEO)
 
@@ -15,7 +17,7 @@ desc 'download, and copy picrate examples'
 task default: [:download_and_copy_samples]
 
 desc 'download and copy examples to user home'
-task download_and_copy_samples: [:download_examples, :copy_examples, :config_geany]
+task download_and_copy_samples: %i[download_examples copy_examples config_geany]
 
 task :download_examples
 file_name = "#{EXAMPLES}.tar.gz"
@@ -30,22 +32,23 @@ file file_name do
 end
 
 desc 'download and copy sound library to ~/.picrate'
-task download_and_copy_sound: [:init_dir, :download_sound, :copy_sound, :clobber]
+task download_and_copy_sound: %i[init_dir download_sound copy_sound clobber]
 
 desc 'download and copy video library to ~/.picrate'
-task download_and_copy_video: [:init_dir, :download_video, :copy_video, :clobber]
+task download_and_copy_video: %i[init_dir download_video copy_video clobber]
 
 desc 'download and copy glvideo library to ~/.picrate'
-task download_and_copy_glvideo: [:init_dir, :download_glvideo, :copy_glvideo, :clobber]
+task download_and_copy_glvideo: %i[init_dir download_glvideo copy_glvideo clobber]
 
 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('/')
+  wget_base = 'wget https://github.com/processing/processing-sound/'
+  wget_string = [wget_base, 'releases/download/latest', SOUND].join('/')
   begin
     sh wget_string
   rescue
-    warn(WARNING)
+    puts 'Not Currently Available'
+    # warn(WARNING)
   end
 end
 
@@ -74,52 +77,52 @@ end
 desc 'initialize ~/.picrate directories'
 task :init_dir do
   unless File.exist? "#{HOME_DIR}/.picrate/libraries"
-    sh "mkdir -p #{HOME_DIR}/.picrate/libraries"
+    FileUtils.mkdir_p "#{HOME_DIR}/.picrate/libraries"
   end
 end
 
 desc 'configure geany'
 task :config_geany do
   unless File.exist? "#{HOME_DIR}/.config/geany/templates/files/picrate.rb"
-    sh "mkdir -p #{HOME_DIR}/.config/geany/templates/files"
-    sh "cp picrate.rb #{HOME_DIR}/.config/geany/templates/files"
+    FileUtils.mkdir_p "#{HOME_DIR}/.config/geany/templates/files"
+    FileUtils.cp 'picrate.rb' "#{HOME_DIR}/.config/geany/templates/files"
   end
   unless File.exist? "#{HOME_DIR}/projects/picrate.geany"
-    sh "mkdir -p #{HOME_DIR}/projects"
-    sh "cp picrate.geany #{HOME_DIR}/projects"
+    FileUtils.mkdir_p "#{HOME_DIR}/projects"
+    FileUtils.cp 'picrate.geany', "#{HOME_DIR}/projects"
   end
 end
 
 desc 'copy examples'
-task :copy_examples => file_name do
+task copy_examples: file_name do
   sh "tar xzvf #{EXAMPLES}.tar.gz"
-  sh "rm -r #{HOME_DIR}/picrate_samples" if File.exist? "#{HOME_DIR}/picrate_samples"
-  sh "cp -r picrate-examples-#{EXAMPLES} #{HOME_DIR}/picrate_samples"
-  sh "rm -r picrate-examples-#{EXAMPLES}"
+  FileUtils.rm_r "#{HOME_DIR}/picrate_samples" if File.exist? "#{HOME_DIR}/picrate_samples"
+  FileUtils.cp_r "picrate-examples-#{EXAMPLES}", "#{HOME_DIR}/picrate_samples"
+  FileUtils.rm_r "picrate-examples-#{EXAMPLES}"
 end
 
 desc 'copy sound library'
-task :copy_sound => SOUND do
+task copy_sound: SOUND do
   sh "unzip #{SOUND}"
-  sh "rm -r #{HOME_DIR}/.picrate/libraries/sound" if File.exist? "#{HOME_DIR}/.picrate/libraries/sound"
-  sh "cp -r sound #{HOME_DIR}/.picrate/libraries"
-  sh 'rm -r sound'
-  sh 'rm -r __MACOSX'
+  FileUtils.rm_r "#{HOME_DIR}/.picrate/libraries/sound" if File.exist? "#{HOME_DIR}/.picrate/libraries/sound"
+  FileUtils.cp_r 'sound', "#{HOME_DIR}/.picrate/libraries"
+  FileUtils.rm_r 'sound'
+  FileUtils.rm_r '__MACOSX'
 end
 
 desc 'copy video library'
-task :copy_video => VIDEO do
+task copy_video: VIDEO do
   sh "unzip #{VIDEO}"
-  sh "rm -r #{HOME_DIR}/.picrate/libraries/video" if File.exist? "#{HOME_DIR}/.picrate/libraries/video"
-  sh "cp -r video #{HOME_DIR}/.picrate/libraries/video"
-  sh 'rm -r video'
+  FileUtils.rm_r "#{HOME_DIR}/.picrate/libraries/video" if File.exist? "#{HOME_DIR}/.picrate/libraries/video"
+  FileUtils.cp_r 'video', "#{HOME_DIR}/.picrate/libraries/video"
+  FileUtils.rm_r 'video'
 end
 
 desc 'copy glvideo library'
-task :copy_glvideo => GLVIDEO do
-  directory "~/.picrate/libraries/glvideo"
+task copy_glvideo: GLVIDEO do
+  directory "#{HOME_DIR}/.picrate/libraries/glvideo"
   sh "unzip #{GLVIDEO}"
-  sh "rm -r #{HOME_DIR}/.picrate/libraries/glvideo" if File.exist? "#{HOME_DIR}/.picrate/libraries/glvideo"
-  sh "cp -r glvideo #{HOME_DIR}/.picrate/libraries/glvideo"
-  sh 'rm -r glvideo'
+  FileUtils.rm_r "#{HOME_DIR}/.picrate/libraries/glvideo" if File.exist? "#{HOME_DIR}/.picrate/libraries/glvideo"
+  FileUtils.cp_r 'glvideo', "#{HOME_DIR}/.picrate/libraries/glvideo"
+  FileUtils.rm_r 'glvideo'
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: picrate
 version: !ruby/object:Gem::Version
-  version: 0.6.0
+  version: 0.7.0
 platform: java
 authors:
 - monkstone
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2018-12-11 00:00:00.000000000 Z
+date: 2019-04-10 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rake
@@ -58,9 +58,9 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: '1.0'
-description: |2
-    A batteries included version of processing in ruby, for raspberrypi and linux.
-    Install samples to configures geany ide.
+description: |
+  A batteries included version of processing in ruby, for raspberrypi and
+  linux. Install samples to configures geany ide.
 email:
 - mamba2928@yahoo.co.uk
 executables:
@@ -157,7 +157,9 @@ files:
 - docs/assets/favicon.ico
 - docs/assets/geany.png
 - docs/assets/jwishy_picrate.png
+- docs/assets/new_with_template.png
 - docs/assets/picrate.svg
+- docs/assets/picrate_template.png
 - docs/classes.md
 - docs/css/main.scss
 - docs/editors.md
@@ -177,10 +179,10 @@ files:
 - lib/jogl-all-natives-linux-amd64.jar
 - lib/jogl-all-natives-linux-armv6hf.jar
 - lib/jogl-all.jar
-- lib/picrate-0.6.0.jar
+- lib/picrate-0.7.0.jar
 - lib/picrate.rb
 - lib/picrate/app.rb
-- lib/picrate/creators/sketch_class.rb
+- lib/picrate/creators/parameters.rb
 - lib/picrate/creators/sketch_factory.rb
 - lib/picrate/creators/sketch_writer.rb
 - lib/picrate/helper_methods.rb
@@ -318,7 +320,6 @@ files:
 - src/main/resources/icon/icon-64.png
 - src/main/resources/license.txt
 - test/color_group_test.rb
-- test/create_test.rb
 - test/deglut_spec_test.rb
 - test/helper_methods_test.rb
 - test/math_tool_test.rb
@@ -351,14 +352,12 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements:
 - java runtime >= 1.8.0_161+
-rubyforge_project: 
-rubygems_version: 2.7.8
+rubygems_version: 3.0.1
 signing_key: 
 specification_version: 4
-summary: ruby wrapper for processing-3.4 on raspberrypi and linux64
+summary: ruby wrapper for processing-3.5.3 on raspberrypi and linux64
 test_files:
 - test/color_group_test.rb
-- test/create_test.rb
 - test/deglut_spec_test.rb
 - test/helper_methods_test.rb
 - test/math_tool_test.rb

data/lib/picrate/creators/sketch_class.rb

@@ -1,57 +0,0 @@
-# frozen_string_literal: false
-
-# the sketch class
-class SketchClass
-  attr_reader :name, :width, :height, :mode
-
-  def initialize(name:, width: 150, height: 150, mode: nil)
-    @name, @width, @height, @mode = name, width, height, mode
-  end
-
-  def class_sketch
-    format('class %s < Processing::App', sketch_class)
-  end
-
-  def sketch_class
-    name.split('_').collect(&:capitalize).join
-  end
-
-  def sketch_new
-    format('%s.new', sketch_class)
-  end
-
-  def indent(line)
-    format('  %s', line)
-  end
-
-  def size
-    return format('    size %d, %d', width.to_i, height.to_i) unless mode
-    format('    size %d, %d, %s', width.to_i, height.to_i, mode.upcase)
-  end
-
-  def sketch_title
-    human = name.split('_').collect(&:capitalize).join(' ')
-    format("    sketch_title '%s'", human)
-  end
-
-  def method_lines(name, content = nil)
-    return [format('  def %s', name), '', '  end'] unless content
-    [format('  def %s', name), content, '  end', '']
-  end
-
-  def lines
-    lines = [
-      '#!/usr/bin/env jruby',
-      '# frozen_string_literal: false',
-      "require 'picrate'",
-      '',
-      class_sketch
-    ]
-    lines.concat method_lines('settings', size)
-    lines.concat method_lines('setup', sketch_title)
-    lines.concat method_lines('draw')
-    lines << 'end'
-    lines << ''
-    lines << sketch_new
-  end
-end

data/test/create_test.rb

@@ -1,68 +0,0 @@
-require_relative 'test_helper'
-require_relative '../lib/picrate/creators/sketch_class'
-require_relative '../lib/picrate/creators/sketch_writer'
-
-CLASS_SKETCH = <<~CODE
-
-#!/usr/bin/env jruby
-# frozen_string_literal: false
-require 'picrate'
-
-class FredSketch < Processing::App
-  def settings
-    size 200, 200
-  end
-
-  def setup
-    sketch_title 'Fred Sketch'
-  end
-
-  def draw
-
-  end
-end
-
-FredSketch.new
-
-CODE
-
-class SketchClassTest < Minitest::Test
-
-  def setup
-    @basic = SketchClass.new(name: 'fred_sketch', width: 200, height: 200)
-    @sketch = SketchClass.new(name: 'fred_sketch', width: 200, height: 200, mode: 'p2d')
-  end
-
-  def test_class
-    result = CLASS_SKETCH.split(/\n/, -1)
-    class_lines = @sketch.lines
-    class_lines.each_with_index do |line, i|
-      assert_equal result[i], line
-    end
-  end
-
-  def test_indent
-    assert_equal '  indent', @sketch.indent('indent')
-  end
-
-  def test_size
-    assert_equal '    size 200, 200, P2D', @sketch.size
-    assert_equal '    size 200, 200', @basic.size
-  end
-
-  def test_sketch_title
-    assert_equal "    sketch_title 'Fred Sketch'", @sketch.sketch_title
-  end
-
-  def test_class
-    assert_equal "FredSketch", @sketch.sketch_class
-  end
-
-  def test_class_new
-    assert_equal "FredSketch.new", @sketch.sketch_new
-  end
-
-  def test_sketch_class
-    assert_equal "class FredSketch < Processing::App", @basic.class_sketch
-  end
-end