propane 0.9.0-java → 2.0.0.pre-java

data/README.md

@@ -1,7 +1,7 @@
 # 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, albeit tied to processing-2.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).
+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).
 ## Requirements
 
 - jdk8+ since version 0.6.0
@@ -29,47 +29,41 @@ require 'propane'
 
 class FlashingLightsSketch < Propane::App
 
-  attr_reader :random_background
-
-  def initialize opts={}
-    @random_background = opts.fetch :random_background, RandomBackground.new(self)
-    super
+  def settings
+    size(800, 600)
   end
 
   def setup
-    size(800, 600)
+    sketch_title 'Flashing Light Sketch'
   end
 
   def draw
-    random_background.generate
-  end
-
-end
-
-class RandomBackground
-  include Propane::Proxy
-
-  def generate
     background(rand(255), rand(255), rand(255))
   end
-
 end
 
-FlashingLightsSketch.new title: "Flashing Lights"
+FlashingLightsSketch.new
 ```
 
-To install the samples and jruby-complete. The samples get copied to `~/propane_samples`.
+To install the samples.  The samples get copied to `~/propane_samples`. Depends on wget.
 ```bash
-propane --install
+propane --install samples
 ```
 There is a handy sketch creator tool
 ```bash
 propane -c my_sketch 200 200 # for default renderer
 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
 
-To run sketches using the installed jruby-complete, you can also use shortform `-r`
 ```bash
-propane --run my_sketch.rb          # or
 jruby -S propane --run my_sketch.rb # belt and braces version
 ```
+To install the sound and video libraries `~/.propane/libraries`. Depends on wget.
+```bash
+propane --install sound
+propane --install video
+```
+Other java libraries can be manually installed to the same folder (no need for processing ide)

data/Rakefile

@@ -1,4 +1,3 @@
-# encoding: utf-8
 # frozen_string_literal: false
 require_relative 'lib/propane/version'
 
@@ -8,7 +7,7 @@ def create_manifest
   File.open('MANIFEST.MF', 'w') do |f|
     f.puts(title)
     f.puts(version)
-    f.puts('Class-Path: core-2.2.1.jar gluegen-rt-2.1.5-01.jar jog-all-2.1.5-01.jar')
+    f.puts('Class-Path: core-3.1.1.jar gluegen-rt-2.3.2.jar jog-all-2.3.2.jar')
   end
 end
 
@@ -48,6 +47,7 @@ end
 desc 'Test'
 task :test do
   sh 'jruby test/respond_to_test.rb'
+  sh 'jruby test/create_test.rb'
 end
 
 desc 'clean'

data/lib/propane.rb

@@ -1,4 +1,3 @@
-# encoding: utf-8
 # frozen_string_literal: false
 unless defined? PROPANE_ROOT
   $LOAD_PATH << File.expand_path(File.dirname(__FILE__))
@@ -7,6 +6,4 @@ end
 Dir["#{PROPANE_ROOT}/lib/*.jar"].each do |jar|
   require jar
 end
-require 'propane/version'
-require 'propane/app'
-require 'propane/helpers/numeric'
+require_relative 'propane/app'

data/lib/propane/app.rb

@@ -19,7 +19,8 @@ module Propane
   # their own sketch.
   #
   # i.e.
-  #
+  # require 'propane'
+  # 
   # class MySketch < Propane::App
   #
   #   def draw
@@ -27,6 +28,8 @@ module Propane
   #   end
   #
   # end
+  #
+  # MySketch.new
 
   # Watch the definition of these methods, to make sure
   # that Processing is able to call them during events.
@@ -49,15 +52,27 @@ module Propane
     alias stroke_width stroke_weight
     alias rgb color
     alias gray color
-    attr_reader :title, :arguments, :options
+    field_reader :surface
+    
+    def sketch_class
+      self.class.sketch_class
+    end
+
+    # Keep track of what inherits from the Processing::App, because we're
+    # going to want to instantiate one.
+    def self.inherited(subclass)
+      super(subclass)
+      @sketch_class = subclass
+    end
+    
     # App should be instantiated with an optional list of options
     # and array of arguments.
     #
-    # App.new(width: 500, height: 500, fullscreen: true)
+    # App.new
     #
     class << self
       # Handy getters and setters on the class go here:
-      attr_accessor :sketch_class, :library_loader
+      attr_accessor :sketch_class, :library_loader, :title, :arguments, :options
 
       def load_libraries(*args)
         library_loader ||= LibraryLoader.new
@@ -99,7 +114,6 @@ module Propane
       $app = self
       @arguments = arguments
       @options   = options
-      configure_sketch
       run_sketch
     end
 
@@ -111,6 +125,10 @@ module Propane
       import_opengl if /opengl/ =~ mode
       super(*args)
     end
+    
+    def sketch_title(title)
+      surface.set_title(title)
+    end
 
     def data_path(dat)
       dat_root = File.join(SKETCH_ROOT, 'data')
@@ -118,12 +136,6 @@ module Propane
       File.join(dat_root, dat)
     end
 
-    # This method runs the processing sketch.
-    #
-    def run_sketch
-      PApplet.run_sketch(arguments, self)
-    end
-
     private
 
     def import_opengl
@@ -135,26 +147,6 @@ module Propane
       end
     end
 
-    # This method configures the sketch title and and presentation mode.
-    #
-    def configure_sketch
-      set_sketch_title
-      set_presentation_mode
-    end
-
-    # This method sets the sketch presentation mode.
-    #
-    def set_presentation_mode
-      arguments.concat ['--present'] if options[:fullscreen]
-    end
-
-    # This method sets the sketch title.
-    #
-    def set_sketch_title
-      title_string = options.fetch(:title, 'processing sketch')
-      arguments.concat [title_string]
-    end
-
     def proxy_java_fields
       fields = %w(sketchPath key frameRate mousePressed keyPressed)
       methods = fields.map { |field| java_class.declared_field(field) }

data/lib/propane/creators/sketch_writer.rb

@@ -11,8 +11,9 @@ class SketchParameters
     name.split('_').collect(&:capitalize).join
   end
 
-  def title
-    name.split('_').collect(&:capitalize).join(' ')
+  def sketch_title
+    human = name.split('_').collect(&:capitalize).join(' ')
+    format("sketch_title '%s'", human)
   end
 
   def sketch_size
@@ -47,14 +48,15 @@ class ClassSketch
       ''
     ]
     lines << format('class %s < Propane::App', param.class_name)
-    lines.concat method_lines('setup', param.sketch_size)
+    lines.concat method_lines('settings', param.sketch_size)
+    lines.concat method_lines('setup', param.sketch_title)
     lines.concat method_lines('draw', '')
     lines << 'end'
     lines.concat new(param)
   end
-  
+
   private
-  
+
   def method_lines(name, content)
     one = format('%sdef %s', INDENT, name)
     two = content.empty? ? '' : format('  %s%s', INDENT, content)
@@ -64,7 +66,6 @@ class ClassSketch
   end
 
   def new(param)
-    ['', format("%s.new title: '%s'", param.class_name, param.title)]
+    ['', format('%s.new', param.class_name)]
   end
 end
-

data/lib/propane/helper_methods.rb

@@ -1,7 +1,6 @@
 # frozen_string_literal: false
 # processing module wrapper
-require_relative '../propane'
-
+require_relative 'helpers/numeric'
 module Propane
   # Provides some convenience methods
   module HelperMethods

data/lib/propane/library_loader.rb

@@ -100,7 +100,8 @@ module Propane
         [
           "#{PROPANE_ROOT}/library/#{library_name}",
           "#{PROPANE_ROOT}/library/#{library_name}/library",
-          "#{PROPANE_ROOT}/library/#{library_name}"
+          "#{PROPANE_ROOT}/library/#{library_name}",
+          "#{ENV['HOME']}/.propane/libraries/#{library_name}/library"
         ].each do |jpath|
           if File.exist?(jpath) && !Dir.glob(format('%s/*.%s', jpath, ext)).empty?
             return jpath

data/lib/propane/runner.rb

@@ -1,13 +1,9 @@
 # frozen_string_literal: false
-require "#{PROPANE_ROOT}/lib/propane"
-require "#{PROPANE_ROOT}/lib/propane/app"
 require 'optparse'
+require_relative 'version'	    
 
 module Propane
-  java_import 'monkstone.WatchSketchDir'
-  java_import 'java.nio.file.StandardWatchEventKinds'
-  # Utility class to handle the different commands that the 'rp5' command
-  # offers. Able to run, watch, live, create, app, and unpack
+  # Utility class to handle the different commands that the 'propane' offers
   class Runner
     attr_reader :options, :argc, :filename
 
@@ -15,7 +11,7 @@ module Propane
       @options = {}
     end
 
-    # Start running a propane sketch from the passed-in arguments
+    # Start running a propane command from the passed-in arguments
     def self.execute
       runner = new
       runner.parse_options(ARGV)
@@ -26,8 +22,6 @@ module Propane
     def execute!
       show_help if options.empty?
       show_version if options[:version]
-      run_sketch if options[:run]
-      watch_sketch if options[:watch]
       create if options[:create]
       install if options[:install]
     end
@@ -46,20 +40,11 @@ module Propane
         end
 
         options[:install] = false
-        opts.on('-i', '--install', 'Installs jruby-complete') do
+        message = '<Samples><Video><Sound> Install samples or library'
+        opts.on('-i', '--install', message) do
           options[:install] = true
         end
 
-        options[:watch] = false
-        opts.on('-w', '--watch', 'Watch the sketch') do
-          options[:watch] = true
-        end
-
-        options[:run] = false
-        opts.on('-r', '--run', 'Run the sketch using jruby-complete') do
-          options[:run] = true
-        end
-
         options[:create] = false
         opts.on('-c', '--create', 'Create new sketch outline') do
           options[:create] = true
@@ -75,39 +60,6 @@ module Propane
       @argc = opt_parser.parse(args)
       @filename = argc.shift
     end
-    
-    def watch_sketch
-      run_sketch
-      root = File.absolute_path(File.dirname(filename))
-      watcher = WatchSketchDir.watch(root)
-      count = 0 # guard against a duplicate event
-      watcher.add_listener do |event|
-        if event.kind == StandardWatchEventKinds::ENTRY_MODIFY 
-          if count == 0       
-            puts 'reloading sketch...' 
-            run_sketch          
-          end
-          count += 1
-          count = 0 if count == 2
-        end
-      end  
-    end
-
-    def run_sketch
-      # root = File.absolute_path(File.dirname(filename))
-      # sketch = File.join(root, filename)
-      sketch = File.join(SKETCH_ROOT, filename)
-      warn_format = 'File %s does not not Exist!'
-      return warn(format(warn_format, sketch)) unless File.exist?(sketch)
-      command = [
-      'java',
-      '-cp',
-      "#{PROPANE_ROOT}/lib/ruby/jruby-complete.jar",
-      'org.jruby.Main',
-      sketch.to_s
-      ].flatten
-      exec(*command)
-    end
 
     def create
       require_relative 'creators/sketch_writer'
@@ -121,7 +73,13 @@ module Propane
     end
 
     def install
-      system "cd #{PROPANE_ROOT}/vendors && rake"
+      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
     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 = '0.9.0'.freeze
+  VERSION = '2.0.0.pre'.freeze
 end

data/library/video_event/video_event.rb

@@ -0,0 +1,3 @@
+class Propane::App
+  include Java::MonkstoneVideoevent::VideoInterface
+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', '0.9.0'
+  id 'propane:rp5extras', '2.0.0'
   packaging 'jar'
   description 'rp5extras for propane'
   organization 'ruby-processing', 'https://ruby-processing.github.io'
@@ -13,12 +13,12 @@ project 'rp5extras', 'https://github.com/monkstone/propane' do
   end
   license 'MIT', 'http://www.opensource.org/licenses/mit-license.php'
   license 'GPL 3', 'http://www.gnu.org/licenses/gpl-3.0-standalone.html'  
-  issue_management 'https://github.com/monkstone/propane/issues', 'Github'
+  issue_management 'https://github.com/ruby-processing/propane/issues', 'Github'
   
   source_control(
-    url: 'https://github.com/monkstone/propane',
-    connection: 'scm:git:git://github.com/monkstone/propane.git',
-    developer_connection: 'scm:git:git@github.com/monkstone/propane.git'
+    url: 'https://github.com/ruby-processing/propane',
+    connection: 'scm:git:git://github.com/ruby-processing/propane.git',
+    developer_connection: 'scm:git:git@github.com/ruby-processing/propane.git'
     )
   
   properties('source.directory' => 'src',
@@ -30,11 +30,12 @@ project 'rp5extras', 'https://github.com/monkstone/propane' do
     'jruby.api' => 'http://jruby.org/apidocs/',
     'processing.api' => 'http://processing.github.io/processing-javadocs/core/',
     'jruby.api' => 'http://jruby.org/apidocs/',
-    'jogl.version' => '2.1.5-01'
+    'jogl.version' => '2.3.2'
     )
   
-  pom('org.jruby:jruby:9.1.2.0')
-  jar('org.processing:core:2.2.1')
+  pom 'org.jruby:jruby:9.1.2.0'
+  jar 'org.processing:core:3.1.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 +45,7 @@ project 'rp5extras', 'https://github.com/monkstone/propane' do
       execute_goals( id: 'default-cli',
         artifactItems: [ { groupId:  'org.processing',
           artifactId:  'core',
-          version:  '2.2.1',         
+          version:  '3.1.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>0.9.0</version>
+  <version>2.0.0</version>
   <name>rp5extras</name>
   <description>rp5extras for propane</description>
   <url>https://github.com/monkstone/propane</url>
@@ -46,16 +46,16 @@ DO NOT MODIFIY - GENERATED CODE
     </developer>
   </developers>
   <scm>
-    <connection>scm:git:git://github.com/monkstone/propane.git</connection>
-    <developerConnection>scm:git:git@github.com/monkstone/propane.git</developerConnection>
-    <url>https://github.com/monkstone/propane</url>
+    <connection>scm:git:git://github.com/ruby-processing/propane.git</connection>
+    <developerConnection>scm:git:git@github.com/ruby-processing/propane.git</developerConnection>
+    <url>https://github.com/ruby-processing/propane</url>
   </scm>
   <issueManagement>
     <system>Github</system>
-    <url>https://github.com/monkstone/propane/issues</url>
+    <url>https://github.com/ruby-processing/propane/issues</url>
   </issueManagement>
   <properties>
-    <jogl.version>2.1.5-01</jogl.version>
+    <jogl.version>2.3.2</jogl.version>
     <jruby.api>http://jruby.org/apidocs/</jruby.api>
     <source.directory>src</source.directory>
     <maven.compiler.target>1.8</maven.compiler.target>
@@ -75,7 +75,12 @@ DO NOT MODIFIY - GENERATED CODE
     <dependency>
       <groupId>org.processing</groupId>
       <artifactId>core</artifactId>
-      <version>2.2.1</version>
+      <version>3.1.1</version>
+    </dependency>
+    <dependency>
+      <groupId>org.processing</groupId>
+      <artifactId>video</artifactId>
+      <version>3.0.2</version>
     </dependency>
     <dependency>
       <groupId>org.jogamp.jogl</groupId>
@@ -109,7 +114,7 @@ DO NOT MODIFIY - GENERATED CODE
                   <artifactItem>
                     <groupId>org.processing</groupId>
                     <artifactId>core</artifactId>
-                    <version>2.2.1</version>
+                    <version>3.1.1</version>
                     <type>jar</type>
                     <outputDirectory>${propane.basedir}/lib</outputDirectory>
                   </artifactItem>