Skip to content

Commit 76b2525

Browse files
committed
get ready for merge
1 parent 48596dd commit 76b2525

8 files changed

Lines changed: 19 additions & 17 deletions

Gemfile

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,3 @@
11
source 'https://rubygems.org'
22
ruby '2.5.3', :engine => 'jruby', :engine_version => '9.2.8.0'
3-
gem 'arcball', '~>1.0.1'
4-
gem 'geomerative' '~>1.1.0'
5-
gem 'ruby_wordcram', '~>2.0.4'
3+
gemspec

README.md

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,13 +1,13 @@
11
__C6H3N3O7__ [![Gem Version](https://badge.fury.io/rb/picrate.svg)](https://badge.fury.io/rb/picrate)![Travis CI](https://travis-ci.org/ruby-processing/PiCrate.svg)
22

33
# PiCrate
4-
New version for buster on raspberryPI 3B+ assumes self installed jdk11 or greater.
4+
Version for RaspberryPI `Stretch` and `Oracle JDK8`, will probably also work on `OpenJDK11+` but see `PiCrate-2.0.0` for version targetting `Buster`.
55
Create processing sketches in ruby on raspberry-pi and linux (this project is a parallel development of [propane][propane] targetting the raspberry-pi, but will initially be developed on a regular linux box). The aim is to produce a gem installable app that can be run with jruby, with minimal dependencies. Drop the `C` and you get pirate, or and an `e` and get `PiCreate`, a happy coincidence?
66

77
### To install from rubygems ###
88

99
```bash
10-
jgem install picrate
10+
jgem install picrate -v 1.1.0 # NB: important to specify version
1111
```
1212

1313
### To Build and Test ###
@@ -19,7 +19,7 @@ Requires maven, openjdk11+ (to build, uses `release` flag), and a jdk8 and jruby
1919
```bash
2020
cd PiCrate
2121
rake # assumes an installed version of vanilla processing
22-
jgem install picrate-2.0.0-java.gem
22+
jgem install picrate-1.1.0-java.gem
2323
```
2424
To create a template sketch:-
2525
```bash
@@ -51,7 +51,7 @@ MySketch.new
5151
```
5252
### Run Sketch ###
5353
```bash
54-
jruby my_sketch.rb
54+
jruby --dev my_sketch.rb # --dev flag speeds start-up
5555
```
5656

5757

docs/_posts/2018-05-06-getting_started.md

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -16,9 +16,9 @@ jgem install picrate
1616
__For a first install:-__
1717

1818
```bash
19-
picrate --install # no args
19+
picrate --install # no args, install samples and geany config
2020
# or
21-
picrate -i
21+
picrate -i Samples # to omit geany config
2222
```
2323

2424
This installs example sketches in `~/sample_sketches` and ties them into a `geany` project `picrate.geany`. It should also be possible to run sketches from the `geany` ide.

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

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@ mkdir installer
1414
cd installer
1515
rake
1616
```
17-
Currently installs jruby-9.2.7.0
17+
Currently installs jruby-9.2.8.0
1818

1919
### Manual install ###
2020

@@ -25,7 +25,7 @@ Get the latest version from [http://jruby.org/download][download]
2525

2626
```bash
2727
cd /opt
28-
sudo tar xzvf /pathToDownload/jruby-bin-9.2.7.0.tar.gz
28+
sudo tar xzvf /pathToDownload/jruby-bin-9.2.8.0.tar.gz
2929
```
3030

3131
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"
4949

5050
If you know better please post on wiki
5151

52-
[download]:"https://repo1.maven.org/maven2/org/jruby/jruby-dist/9.2.7.0/jruby-dist-9.2.7.0-bin.tar.gz"
52+
[download]:"https://repo1.maven.org/maven2/org/jruby/jruby-dist/9.2.8.0/jruby-dist-9.2.8.0-bin.tar.gz"
5353
[rake_gist]:https://gist.github.com/monkstone/159c5a9813c9cd181040b4715e74f6b2

docs/_posts/2018-11-18-building-gem.md

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -8,11 +8,11 @@ Requirements:-
88

99
1. An installed version of vanilla processing to provide `processing.org` customised version of the `jogl` jars. The default `Rakefile` assumes root installation of processing, for debian distros you will need to adjust `processing_root` _ca. line 20_.
1010

11-
2. jdk-11 and maven (builds for jdk-8)
11+
2. jdk-11+ and maven (builds for jdk-8)
1212

1313
Simply clone this distribution, then rake to build and test gem
1414
```bash
15-
git clone https://github.com/ruby-processing/PiCrate.git
15+
git clone -b stretch --single-branch https://github.com/ruby-processing/PiCrate.git
1616
cd PiCrate
1717
rake # to build gem
1818
```

docs/_posts/2018-11-27-getting_started_geany.md

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -10,13 +10,15 @@ The current version of raspbian installs jdk-1.8.0_65-bi17 (hard float) and that
1010
Then install JRuby see [jruby][jruby].
1111

1212
```bash
13-
jgem install picrate
13+
jgem install picrate -v 1.1.0
1414
```
1515

1616
Install samples, and configure `geany` ide (for `PiCrate`)
1717

1818
```bash
19-
picrate -i Samples # geany configuration files are installed if required
19+
picrate -i # geany configuration files are installed if required
20+
# or
21+
picrate --install # no args or samples without geany config
2022
```
2123

2224
Install processing libraries

docs/about.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -25,7 +25,7 @@ Your PiCrate sketches need to `require` the `picrate` library, and can be run wi
2525

2626
* Gui interface, sketches can be run from [GeanyIDE][geany]
2727

28-
28+
* Use --dev flag to speed start-up
2929

3030

3131
[rubygems]:https://rubygems.org/

picrate.gemspec

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -31,6 +31,8 @@ Gem::Specification.new do |gem|
3131
gem.add_development_dependency 'rake', '~> 12.3'
3232
gem.add_development_dependency 'minitest', '~> 5.10'
3333
gem.add_runtime_dependency 'arcball', '~> 1.0.1'
34+
gem.add_runtime_dependency 'geomerative', '~> 1.1'
35+
gem.add_runtime_dependency 'ruby_wordcram', '~> 2.0.4'
3436
gem.require_paths = ['lib']
3537
gem.platform = 'java'
3638
gem.requirements << 'java runtime == 8'

0 commit comments

Comments
 (0)