Skip to content

Commit

Permalink
get ready for release
Browse files Browse the repository at this point in the history
  • Loading branch information
monkstone committed Oct 10, 2017
1 parent 3945b43 commit 54f2116
Show file tree
Hide file tree
Showing 7 changed files with 23 additions and 12 deletions.
2 changes: 2 additions & 0 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
@@ -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).
Expand Down
15 changes: 10 additions & 5 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand All @@ -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
Expand All @@ -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/
2 changes: 1 addition & 1 deletion lib/propane/version.rb
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
# frozen_string_literal: true
module Propane
VERSION = '2.6.1'.freeze
VERSION = '2.6.2'.freeze
end
4 changes: 2 additions & 2 deletions pom.rb
Original file line number Diff line number Diff line change
@@ -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'
Expand Down Expand Up @@ -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}')
Expand Down
4 changes: 2 additions & 2 deletions pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@ DO NOT MODIFIY - GENERATED CODE
<modelVersion>4.0.0</modelVersion>
<groupId>propane</groupId>
<artifactId>propane</artifactId>
<version>2.6.1</version>
<version>2.6.2</version>
<name>rp5extras</name>
<description>rp5extras for propane</description>
<url>https://github.com/monkstone/propane</url>
Expand Down Expand Up @@ -58,7 +58,7 @@ DO NOT MODIFIY - GENERATED CODE
<dependency>
<groupId>org.jruby</groupId>
<artifactId>jruby</artifactId>
<version>9.1.12.0</version>
<version>9.1.13.0</version>
<type>pom</type>
</dependency>
<dependency>
Expand Down
6 changes: 5 additions & 1 deletion propane.gemspec
Original file line number Diff line number Diff line change
Expand Up @@ -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($/)
Expand Down
2 changes: 1 addition & 1 deletion vendors/Rakefile
Original file line number Diff line number Diff line change
Expand Up @@ -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']

Expand Down

0 comments on commit 54f2116

Please sign in to comment.