propane 2.0.2-java → 2.0.3-java

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 9f847eb7d415cbd0c0ee989ebf5c5da70a68de20
-  data.tar.gz: cddade51d46516647451f40532d18e0d351bbe2a
+  metadata.gz: 1f3c6dc86329bbde3a56d284d72b1c6a3fe5775e
+  data.tar.gz: 0ad232d5e8538db5e81c43cec89afc4e340ce14c
 SHA512:
-  metadata.gz: 9445e29c40600d55147c13434f253b517791d9ffd7dba8cdabca8b2ccb81128b4915cf773daf7fca3763104aec9c40d483ed280fa12d6d406ef7f7d018970f60
-  data.tar.gz: 583bceb0eeeacdbf4e1b1d3cbdb18bde2fe5b08c3b67f7c7e5917bd626618d7a46c1606ee6ebecd299d78726052cb2949de9d908fc2d30a9b8fd3e18e74e3e4b
+  metadata.gz: 34c22b6d7512b91f33161501723f65f3409ab204b1ab5c6148740d8b83e4bb99e069d0ba5977ab3a74c4c6e1e4e2164b6b049af749452cea8f1a69058bb5adc5
+  data.tar.gz: daf9fe02b0423fae841cf8e05abfdd8453e30f6a390b0d7feebcf1f3a830bacaa8c81d0e23f73a6919d287b415aa21bb3d1a1757a6d1d99f2e211ac27dd0f84c

data/CHANGELOG.md

@@ -1,6 +1,10 @@
-**v2.0.2** Using processing-3.2 core from local maven repository, refactored sketch creator
+**v2.0.3** Suggest use of jruby-9.1.4.0, more about loading vanilla libraries
+ 
+**v2.0.2** Refactor install to either install `samples\sound\video` or warn (update to use a local processing-3.2.1 core, this is why travis fails), fix some examples, hence `0.3`
 
-**v2.0.1** Refactored to work with processing-3.0, `--install samples` and/or vanilla processing `sound` and `video` libraries
+**v2.0.1** Support processing-3.2.0
+
+**v2.0.0** Refactored to work with processing-3.0, `--install samples` and/or vanilla processing `sound` and `video` libraries
 
 **v0.9.0** Implements `data_path` in ruby, you should use this method to return the absolute path to the `data` folder (read and write).  Prefer JRubyArt methods, in the main.
 

data/README.md

@@ -1,11 +1,11 @@
 # Propane
 [![Gem Version](https://badge.fury.io/rb/propane.svg)](https://badge.fury.io/rb/propane)
 
-A slim layer to communicate with Processing from JRuby, features a polyglot maven build, this started out as a non serious project by Phillip Cunningam called ribiprocessing.  It has now morphed into an experimental project for ruby-processing so we can now "Cook with Gas". We have created a configuration free version of ruby processing, for processing-3.1+, where we get processing core from maven central (and opengl currently testing on linux64/mac). These jars are small enough to include in the gem distribution, and hence we should 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).
+A slim layer to communicate with Processing from JRuby, features a polyglot maven build, this started out as a non serious project by Phillip Cunningam called ribiprocessing.  It has now morphed into an experimental project for ruby-processing so we can now "Cook with Gas". We have created a configuration free version of ruby processing, for processing-3.2.1+, where we get processing core from maven central (and opengl currently testing on linux64/mac). These jars are small enough to include in the gem distribution, and hence we should 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).
 ## Requirements
 
 - jdk8+ since version 0.6.0
-- jruby-9.1.2.0+
+- jruby-9.1.4.0+
 - mvn-3.3.1+ (development only)
 
 ## Building and testing
@@ -56,7 +56,7 @@ propane -c my_sketch 200 200 p2d # for opengl 2D renderer
 propane -c my_sketch 200 200 p3d # for opengl 3D renderer
 ```
 
-To run sketches (works just fine from atom editor)
+To run sketches
 
 ```bash
 jruby -S propane --run my_sketch.rb # belt and braces version

data/Rakefile

@@ -7,7 +7,7 @@ def create_manifest
   File.open('MANIFEST.MF', 'w') do |f|
     f.puts(title)
     f.puts(version)
-    f.puts('Class-Path: core-3.2.0.jar gluegen-rt-2.3.2.jar jog-all-2.3.2.jar')
+    f.puts('Class-Path: core-3.2.1.jar gluegen-rt-2.3.2.jar jog-all-2.3.2.jar')
   end
 end
 

data/lib/propane/runner.rb

@@ -1,6 +1,6 @@
 # frozen_string_literal: false
 require 'optparse'
-require_relative 'version'	    
+require_relative 'version'
 
 module Propane
   # Utility class to handle the different commands that the 'propane' offers
@@ -23,7 +23,7 @@ module Propane
       show_help if options.empty?
       show_version if options[:version]
       create if options[:create]
-      install if options[:install]
+      install(filename) if options[:install]
     end
 
     # Parse the command-line options. Keep it simple.
@@ -71,14 +71,11 @@ module Propane
       puts format(v_format, Propane::VERSION, JRUBY_VERSION)
     end
 
-    def install
-      choice = filename.downcase
-      samples = "cd #{PROPANE_ROOT}/vendors && rake"
-      sound = "cd #{PROPANE_ROOT}/vendors && rake download_and_copy_sound"
-      video = "cd #{PROPANE_ROOT}/vendors && rake download_and_copy_video"
-      system samples if /samples/ =~ choice
-      system video if /video/ =~ choice
-      system sound if /sound/ =~ choice
+    def install(library)
+      choice = library.downcase
+      valid = Regexp.union('samples', 'sound', 'video')
+      return warn format('No installer for %s', choice) unless valid =~ choice
+      system "cd #{PROPANE_ROOT}/vendors && rake download_and_copy_#{choice}"
     end
   end # class Runner
 end # module Propane

data/lib/propane/version.rb

@@ -1,5 +1,5 @@
 # encoding: utf-8
 # frozen_string_literal: true
 module Propane
-  VERSION = '2.0.2'.freeze
+  VERSION = '2.0.3'.freeze
 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:rp5extras', '2.0.2'
+  id 'propane:rp5extras', '2.0.3'
   packaging 'jar'
   description 'rp5extras for propane'
   organization 'ruby-processing', 'https://ruby-processing.github.io'
@@ -32,8 +32,8 @@ project 'rp5extras', 'https://github.com/monkstone/propane' do
     'jogl.version' => '2.3.2'
     )
   
-  pom 'org.jruby:jruby:9.1.2.0'
-  jar 'org.processing:core:3.2.0'
+  pom 'org.jruby:jruby:9.1.4.0'
+  jar 'org.processing:core:3.2.1'
   jar 'org.processing:video:3.0.2'
   jar('org.jogamp.jogl:jogl-all:${jogl.version}')
   jar('org.jogamp.gluegen:gluegen-rt-main:${jogl.version}')
@@ -44,7 +44,7 @@ project 'rp5extras', 'https://github.com/monkstone/propane' do
       execute_goals( id: 'default-cli',
         artifactItems: [ { groupId:  'org.processing',
           artifactId:  'core',
-          version:  '3.2.0',         
+          version:  '3.2.1',         
           type:  'jar',
           outputDirectory: '${propane.basedir}/lib'
         },

data/pom.xml

@@ -11,7 +11,7 @@ DO NOT MODIFIY - GENERATED CODE
   <modelVersion>4.0.0</modelVersion>
   <groupId>propane</groupId>
   <artifactId>rp5extras</artifactId>
-  <version>2.0.2</version>
+  <version>2.0.3</version>
   <name>rp5extras</name>
   <description>rp5extras for propane</description>
   <url>https://github.com/monkstone/propane</url>
@@ -58,13 +58,13 @@ DO NOT MODIFIY - GENERATED CODE
     <dependency>
       <groupId>org.jruby</groupId>
       <artifactId>jruby</artifactId>
-      <version>9.1.2.0</version>
+      <version>9.1.4.0</version>
       <type>pom</type>
     </dependency>
     <dependency>
       <groupId>org.processing</groupId>
       <artifactId>core</artifactId>
-      <version>3.2.0</version>
+      <version>3.2.1</version>
     </dependency>
     <dependency>
       <groupId>org.processing</groupId>
@@ -103,7 +103,7 @@ DO NOT MODIFIY - GENERATED CODE
                   <artifactItem>
                     <groupId>org.processing</groupId>
                     <artifactId>core</artifactId>
-                    <version>3.2.0</version>
+                    <version>3.2.1</version>
                     <type>jar</type>
                     <outputDirectory>${propane.basedir}/lib</outputDirectory>
                   </artifactItem>

data/propane.gemspec

@@ -10,11 +10,11 @@ Gem::Specification.new do |gem|
   gem.email         = ['mamba2928@yahoo.co.uk']
   gem.licenses     = %w(GPL-3.0 LGPL-2.0)
   gem.description   = %q{A Standalone Ruby Processing implementation} 
-  gem.summary       = %q{A really slim layer between Ruby and Processing-3.1.1.}
+  gem.summary       = %q{A really slim layer between Ruby and Processing-3.2.1.}
   gem.homepage      = 'https://ruby-processing.github.io/propane/'
   gem.files         = `git ls-files`.split($/)
   gem.files << 'lib/propane.jar'
-  gem.files << 'lib/core-3.2.0.jar'
+  gem.files << 'lib/core-3.2.1.jar'
   gem.files << 'lib/gluegen-rt-2.3.2.jar'
   gem.files << 'lib/jogl-all-2.3.2.jar'
   gem.files << 'lib/gluegen-rt-2.3.2-natives-linux-amd64.jar'

data/vendors/Rakefile

@@ -9,13 +9,16 @@ SOUND = 'sound.zip'.freeze
 SOUND_VERSION = 'v1.3.2' # version 1.3.2
 VIDEO = 'video-2.zip'
 VIDEO_VERSION = '2' # version 1.0.1
-EXAMPLES = '0.2'.freeze
+EXAMPLES = '0.3'.freeze
 HOME_DIR = ENV['HOME']
 MAC_OR_LINUX = /linux|mac|darwin/ =~ RbConfig::CONFIG['host_os']
 
 desc 'download, and copy propane examples'
-task default: [:download_examples, :copy_examples]
+task default: [:download_and_copy_samples]
+
 desc 'download and copy examples to user home'
+task download_and_copy_samples: [:download_examples, :copy_examples]
+
 task :download_examples
 file_name = MAC_OR_LINUX.nil? ? "#{EXAMPLES}.zip" : "#{EXAMPLES}.tar.gz"
 wget_base = 'wget https://github.com/ruby-processing/propane-examples'

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: propane
 version: !ruby/object:Gem::Version
-  version: 2.0.2
+  version: 2.0.3
 platform: java
 authors:
 - monkstone
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-08-19 00:00:00.000000000 Z
+date: 2016-09-05 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: arcball
@@ -45,7 +45,7 @@ files:
 - Rakefile
 - bin/propane
 - lib/PROCESSING_LICENSE.txt
-- lib/core-3.2.0.jar
+- lib/core-3.2.1.jar
 - lib/export.txt
 - lib/gluegen-rt-2.3.2-natives-linux-amd64.jar
 - lib/gluegen-rt-2.3.2-natives-macosx-universal.jar
@@ -125,7 +125,7 @@ rubyforge_project:
 rubygems_version: 2.6.3
 signing_key: 
 specification_version: 4
-summary: A really slim layer between Ruby and Processing-3.1.1.
+summary: A really slim layer between Ruby and Processing-3.2.1.
 test_files:
 - test/create_test.rb
 - test/respond_to_test.rb