From 54f2116d8ec22d4d7d31d6faad07b40ec92cb92f Mon Sep 17 00:00:00 2001 From: monkstone Date: Tue, 10 Oct 2017 07:17:39 +0100 Subject: [PATCH] get ready for release --- CHANGELOG.md | 2 ++ README.md | 15 ++++++++++----- lib/propane/version.rb | 2 +- pom.rb | 4 ++-- pom.xml | 4 ++-- propane.gemspec | 6 +++++- vendors/Rakefile | 2 +- 7 files changed, 23 insertions(+), 12 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index d636fe6..7af3b38 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,3 +1,5 @@ +**v2.6.2** Features example sketches using the PixelFlow library by Thomas Diewald + **v2.6.1** Bump processing version, bump recommended jruby version. **v2.6.0** Refactored `LibraryLoader` knows less about `Library` class. The library class _knows_ about paths, and checks that they exist. Features ability to load GLVideo library, that will surely be the future for video (supports gstreamer-1.0 instead of gstreamer-0.1.0 that has already been dropped by some linux distros). diff --git a/README.md b/README.md index 474ccd2..9999a07 100644 --- a/README.md +++ b/README.md @@ -54,10 +54,7 @@ end FlashingLightsSketch.new ``` -To install the samples. The samples get copied to `~/propane_samples`. Depends on wget. -```bash -propane --install samples -``` + There is a handy sketch creator tool ```bash propane -c my_sketch 200 200 # for default renderer @@ -68,7 +65,7 @@ propane -c my_sketch 200 200 p3d # for opengl 3D renderer To run sketches ```bash -jruby -S propane --run my_sketch.rb # belt and braces version +jruby my_sketch.rb # or use script to run sketches from atom ``` To install the sound and video libraries `~/.propane/libraries`. Depends on wget. ```bash @@ -79,5 +76,13 @@ Other java libraries can be manually installed to the same folder (no need for p See [gh-pages][gh-pages] for more detailed instructions and much more. +## Examples + +[Worked Examples](https://github.com/ruby-processing/propane-examples) more to follow, feel free to add your own, especially ruby-2.2+ syntax now we can. To install the samples. The samples get copied to `~/propane_samples`. Depends on wget. +```bash +propane --install samples +``` + please move existing `propane_samples` if you wish to keep them. The current release features several PixelFlow glsl library examples, including a few shadertoy demos as sketches. + [building]:http://ruby-processing.github.io/building/building/ [gh-pages]:https://ruby-processing.github.io/propane/ diff --git a/lib/propane/version.rb b/lib/propane/version.rb index b6434e1..59e3c27 100644 --- a/lib/propane/version.rb +++ b/lib/propane/version.rb @@ -1,4 +1,4 @@ # frozen_string_literal: true module Propane - VERSION = '2.6.1'.freeze + VERSION = '2.6.2'.freeze end diff --git a/pom.rb b/pom.rb index 1d75e45..35a6917 100644 --- a/pom.rb +++ b/pom.rb @@ -1,7 +1,7 @@ require 'fileutils' project 'rp5extras', 'https://github.com/monkstone/propane' do model_version '4.0.0' - id 'propane:propane', '2.6.1' + id 'propane:propane', '2.6.2' packaging 'jar' description 'rp5extras for propane' organization 'ruby-processing', 'https://ruby-processing.github.io' @@ -32,7 +32,7 @@ 'jogl.version' => '2.3.2' ) - pom 'org.jruby:jruby:9.1.12.0' + pom 'org.jruby:jruby:9.1.13.0' jar 'org.processing:core:3.3.6' jar 'org.processing:video:3.0.2' jar('org.jogamp.jogl:jogl-all:${jogl.version}') diff --git a/pom.xml b/pom.xml index b3ba448..9971fa8 100644 --- a/pom.xml +++ b/pom.xml @@ -11,7 +11,7 @@ DO NOT MODIFIY - GENERATED CODE 4.0.0 propane propane - 2.6.1 + 2.6.2 rp5extras rp5extras for propane https://github.com/monkstone/propane @@ -58,7 +58,7 @@ DO NOT MODIFIY - GENERATED CODE org.jruby jruby - 9.1.12.0 + 9.1.13.0 pom diff --git a/propane.gemspec b/propane.gemspec index 1e2706a..6068f20 100644 --- a/propane.gemspec +++ b/propane.gemspec @@ -9,7 +9,11 @@ Gem::Specification.new do |gem| gem.authors = ['monkstone'] gem.email = ['mamba2928@yahoo.co.uk'] gem.licenses = %w(GPL-3.0 LGPL-2.0) - gem.description = %q{A batteries included version of processing in ruby, MacOS and linux64} + gem.description = <<-EOS + A batteries included version of processing in ruby, for MacOS and linux64. The + current release features several PixelFlow glsl library examples, including a + few shadertoy demos as sketches. + EOS gem.summary = %q{ruby wrapper for processing-3.3.6 on MacOS and linux64 bit only for opengl} gem.homepage = 'https://ruby-processing.github.io/propane/' gem.files = `git ls-files`.split($/) diff --git a/vendors/Rakefile b/vendors/Rakefile index 690d041..8ac53f5 100644 --- a/vendors/Rakefile +++ b/vendors/Rakefile @@ -10,7 +10,7 @@ SOUND_VERSION = 'v1.3.2' # version 1.3.2 GLVIDEO = 'processing-glvideo.zip' VIDEO = 'video-2.zip' VIDEO_VERSION = '2' # version 1.0.1 -EXAMPLES = '1.6'.freeze +EXAMPLES = '1.7'.freeze HOME_DIR = ENV['HOME'] MAC_OR_LINUX = /linux|mac|darwin/ =~ RbConfig::CONFIG['host_os']