propane 2.7.1-java → 2.7.2-java

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 8e9d6379de6255f40524c6b647113c8c106e8ec2decbfe88f7adb73225a8d74d
-  data.tar.gz: 38454f8850e0e2ab2c4fed609bc8521188a2e98e79451f774b3b4fb17308cc11
+  metadata.gz: 87afa3f24e268a3aa9eab9e2b3cb959c4d2dbc33c325448df204f9b7753df837
+  data.tar.gz: 8da556fe7fe8740b457a48700bace4b03771365a0ce1617521d1136a5506ff58
 SHA512:
-  metadata.gz: ab65430ac2ac3ea8877a8552b71080d878a53c27d068927253d59e93e4078f4fb6eb3661078e0454dabd4f75875ca8230196a7dbeb65be763aa3c766c4de0090
-  data.tar.gz: 27dca256dd36b656b10d07f8a770948441b517cccff56fd44454bf6f2e89dee90427d89086e2d2b4a7e38ab3fab55d0961c1db29defdac46454da5e808a47a7d
+  metadata.gz: 8e24abaf39356af107a65e0be6dbf1a285bff83eef646a1ea335c50b20fa10eb573c4f7369f821915dc441c78acaed5e65cabd43d3a92e2ec4849ee9566be215
+  data.tar.gz: a2d16dfea4115a1667cc7ce718918f8bae6db62729a4b405585e250eded261900f9fb839a0ccb00e7c0fbca09f3ad9e99f159f096367826fadcabed835a5a277

data/CHANGELOG.md

@@ -1,3 +1,5 @@
+**v2.7.2** Slight re-factor of control_panel, fix virgin install of libraries folder, add grafica library examples suggest upgrade to jruby-9.1.17.0
+
 **v2.7.1** Avoid calling protected method in control_panel (ready for jdk9)
 
 **v2.7.0** Now using custom icons, nice blue ruby image

data/README.md

@@ -1,7 +1,7 @@
 # Propane
 To build custom core see [processing-core][processing-core]
 
-A slim layer to communicate with Processing from JRuby, features a polyglot maven build. We have created a configuration free version of ruby processing, for processing-3.3.7, where we include a modified processing core (`public runPropane()` replaces `protected runSketch()`, not currently useable with jruby and jdk 9). These jars are small enough to include in a gem distribution, and hence we do not require configuration. This has created a scriptable version, ie files get run direct from jruby, but you could use jruby-complete if you used the propane script (avoids need to give the absolute data path for the data folder, but would also be needed for a watch mode). See guide to [building ruby-processing projects][building]. NB: this is a far from perfect solution and some sketches still fail to run with jdk9, but a least I get to diagnose those errors too.
+A slim layer to communicate with Processing from JRuby, features a polyglot maven build. We have created a configuration free version of ruby processing, for processing-3.3.7, where we include a modified processing core (`public runPropane()` to replace `protected runSketch()`, (_runSketch not currently usable with jruby and jdk 9_). These jars are small enough to include in a gem distribution, and hence we do not require configuration. This has created a scriptable version, ie files get run direct from jruby, but you could use jruby-complete if you used the propane script (avoids need to give the absolute data path for the data folder, but would also be needed for a watch mode). See guide to [building ruby-processing projects][building]. NB: this is a far from perfect solution and javafx sketches and possibly a feew others still fail to run with jdk9, but a least I get to diagnose those errors too.
 
 adjust above for your OS/distro setup.
 
@@ -23,7 +23,7 @@ rake javadoc
 ## Installation
 ```bash
 jgem install propane # from rubygems
-jgem install propane-2.6.6-java.gem # local install requires a custom processing-core
+jgem install propane-2.7.1-java.gem # local install requires a custom processing-core
 ```
 
 ## Usage

data/lib/propane/version.rb

@@ -1,4 +1,4 @@
 # frozen_string_literal: true
 module Propane
-  VERSION = '2.7.1'.freeze
+  VERSION = '2.7.2'.freeze
 end

data/library/control_panel/control_panel.rb

@@ -15,7 +15,8 @@ module ControlPanel
       mx = range.end
       mx = range.max if range.exclude_end? && range.begin.respond_to?(:succ)
       max = mx * 100
-      super(min, max)
+      val = range.cover?(initial) ? initial * 100 : (range.first + range.last) * 50
+      super(min, max, val)
       set_minor_tick_spacing((max - min).abs / 10)
       set_paint_ticks true
       # paint_labels = true
@@ -26,8 +27,6 @@ module ControlPanel
         ControlPanel.app_value(name, value)
         proc.call(value) if proc
       end
-      val = initial.nil? ? (range.first + range.last) * 50 : initial * 100
-      set_value(val)
       ControlPanel.app_value(name, val)
     end
 

data/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.7.1'
+  id 'propane:propane', '2.7.2'
   packaging 'jar'
   description 'rp5extras for propane'
   organization 'ruby-processing', 'https://ruby-processing.github.io'

data/pom.xml

@@ -11,7 +11,7 @@ DO NOT MODIFIY - GENERATED CODE
   <modelVersion>4.0.0</modelVersion>
   <groupId>propane</groupId>
   <artifactId>propane</artifactId>
-  <version>2.7.1</version>
+  <version>2.7.2</version>
   <name>rp5extras</name>
   <description>rp5extras for propane</description>
   <url>https://github.com/monkstone/propane</url>

data/vendors/Rakefile

@@ -10,10 +10,12 @@ 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 = '2.1'.freeze
+EXAMPLES = '2.3'.freeze
 HOME_DIR = ENV['HOME']
 MAC_OR_LINUX = /linux|mac|darwin/ =~ RbConfig::CONFIG['host_os']
 
+CLOBBER.include(EXAMPLES, SOUND, GLVIDEO, VIDEO)
+
 desc 'download, and copy propane examples'
 task default: [:download_and_copy_samples]
 
@@ -33,13 +35,13 @@ file file_name do
 end
 
 desc 'download and copy sound library to ~/.propane'
-task download_and_copy_sound: [:download_sound, :copy_sound]
+task download_and_copy_sound: [:init_dir, :download_sound, :copy_sound, :clobber]
 
 desc 'download and copy video library to ~/.propane'
-task download_and_copy_video: [:download_video, :copy_video]
+task download_and_copy_video: [:init_dir, :download_video, :copy_video, :clobber]
 
 desc 'download and copy glvideo library to ~/.propane'
-task download_and_copy_glvideo: [:download_glvideo, :copy_glvideo]
+task download_and_copy_glvideo: [:init_dir, :download_glvideo, :copy_glvideo, :clobber]
 
 
 desc 'download sound library'
@@ -75,6 +77,15 @@ task :download_video do
   end
 end
 
+desc 'initialize ~/.propane directories'
+task :init_dir do
+  unless File.exist? "#{HOME_DIR}/.propane/libraries"
+    sh "mkdir -p ~/.propane"
+    sh "mkdir -p ~/.propane/libraries"
+  end
+end
+
+
 desc 'copy examples'
 task :copy_examples => file_name do
   if MAC_OR_LINUX.nil?
@@ -89,10 +100,13 @@ end
 
 desc 'copy sound library'
 task :copy_sound => SOUND do
+  directory "~/.propane"
+  directory "~/.propane/libraries"
   sh "unzip #{SOUND}"
   sh "rm -r #{HOME_DIR}/.propane/libraries/sound" if File.exist? "#{HOME_DIR}/.propane/libraries/sound"
-  sh "cp -r sound #{HOME_DIR}/.propane/libraries/sound"
+  sh "cp -r sound #{HOME_DIR}/.propane/libraries"
   sh 'rm -r sound'
+  sh 'rm -r __MACOSX'
 end
 
 desc 'copy video library'
@@ -105,6 +119,7 @@ end
 
 desc 'copy glvideo library'
 task :copy_glvideo => GLVIDEO do
+  directory "~/.propane/libraries/glvideo"
   sh "unzip #{GLVIDEO}"
   sh "rm -r #{HOME_DIR}/.propane/libraries/glvideo" if File.exist? "#{HOME_DIR}/.propane/libraries/glvideo"
   sh "cp -r glvideo #{HOME_DIR}/.propane/libraries/glvideo"

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: propane
 version: !ruby/object:Gem::Version
-  version: 2.7.1
+  version: 2.7.2
 platform: java
 authors:
 - monkstone
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2018-04-16 00:00:00.000000000 Z
+date: 2018-05-04 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rake