propane 0.4.0.pre-java → 0.5.0-java

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 8be45e7e7dceb0061a4af4af3044de8e277d0ace
-  data.tar.gz: d9477ff46ea8cac2ed39cf486d7a9556a9312aae
+  metadata.gz: 1ce0539eb503a2238662e89c13413096a9432e0d
+  data.tar.gz: 72c8c27180b18e1160a5e4d1bb67f2230be092cd
 SHA512:
-  metadata.gz: b5e216855d9d126045ae5d2ec0eb0962bd83861c58d1c1cbe740f56bcf43a192bdb6464bfcbfc811e340a7dcb47c304cf69db5e21fded92c094d5f06f0a789a0
-  data.tar.gz: 4e514eb57e7fbf78bb861d4e156063fe2a85f39ab21f4a348b02da0e6e56edbe225c61792179de7c05b0c56d608b6bb702ef6947714d6a0225be89d4dab48263
+  metadata.gz: d6ab0d0df27aa665df986025dc02f056a9a512c70fb31dc719a15b37715d5765f531d12487d9b631980bf4ea68715bd6d0c9d654fb4605b8136f2fa47b2fdf9b
+  data.tar.gz: af7361a4fbd3427fed659086521529451117b20eaf83dafb209bb013459b2717c1a0822f30c19f96609e0489da9f8ca950424e4e1f34b644670e64a9653b4ea0

data/CHANGELOG.md

@@ -1,5 +1,7 @@
 
-**v0.4.0.pre** Inclusion of jogl-all.jar should fix 3D if install fails try getting rid of previous versions of gem (especially if you had done local installs, foxed me first) 3D still only for linux64 and macosx, any Windows developers are welocme to extens to windows (should be easy).
+**v0.5.0** Includes a a sketch creator utility 3D still only for linux64 and macosx, any Windows developers are welcome to extend to windows (should be easy).
+
+**v0.4.0.pre** Inclusion of jogl-all.jar should fix 3D if install fails try getting rid of previous versions of gem (especially if you had done local installs, foxed me first) 3D still only for linux64 and macosx, any Windows developers are welcome to extend to windows (should be easy).
 
 **v0.3.0.pre** First pre-release of propane.gem turns out 3D was not working because of missing jar in gem (3D was only going to work on macosx and linux64 OS anyways.
 

data/README.md

@@ -4,7 +4,7 @@
 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 mainly scriptable version, ie files get run direct from jruby.  However (as with ruby-processing/JRubyArt) certain sketches need to call jruby via jruby-complete, for this we have created an executable `propane` that can also be used to install `jruby-complete` as well as run sketches (maybe export?, possibly watch).
 ## Requirements
 
-- jdk7+
+- jdk7+ possibly jdk8+ in near future
 - jruby-9.0.5.0+
 - mvn-3.3.1+ (development only)
 
@@ -18,7 +18,8 @@ rake javadoc
 
 ## Installation
 ```bash
-jgem install propane-{version}-java.gem
+jgem install propane-{version}-java.gem # local install
+jgem install propane --pre # from rubygems.org, drop --pre once there is a regular released version
 ```
 
 ## Usage
@@ -61,7 +62,15 @@ Many sketches will run just using an installed jruby, but shader sketches must b
 ```bash
 propane --install
 ```
-To run sketches using the installed jruby-complete
+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
+```
+NB: will not overwrite existing sketch with the same name eg `my_sketch.rb` above
+
+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

data/Rakefile

@@ -22,7 +22,7 @@ end
 desc 'Install'
 task :install do
   sh 'mvn dependency:copy'
-  sh 'mv target/rpextras.jar lib'
+  sh 'mv target/propane.jar lib'
 end
 
 desc 'Gem'

data/lib/propane/creators/creator.rb

@@ -0,0 +1,136 @@
+# encoding: utf-8
+# frozen_string_literal: false
+
+BASIC = <<-CODE
+# encoding: utf-8
+# frozen_string_literal: false
+require 'propane'
+
+class %s < Propane::App
+  def setup
+    size %s, %s
+  end
+
+  def draw
+
+  end
+end
+
+%s.new title: '%s'
+CODE
+
+MODE = <<-CODE
+# encoding: utf-8
+# frozen_string_literal: false
+require 'propane'
+
+class %s < Propane::App
+  def setup
+    size %s, %s, %s
+  end
+
+  def draw
+
+  end
+end
+
+%s.new title: '%s'
+CODE
+
+INNER = <<-CODE
+# encoding: utf-8
+# frozen_string_literal: false
+class %s
+  include Propane::Proxy
+
+end
+CODE
+
+# processing wrapper module
+module Propane
+  require_relative '../helpers/string_extra'
+  # Write file to disk
+  class SketchWriter
+    attr_reader :file
+    def initialize(path)
+      underscore = StringExtra.new(path).underscore
+      @file = "#{File.dirname(path)}/#{underscore}.rb"
+    end
+
+    def save(template)
+      File.open(file, 'w+') do |f|
+        f.write(template)
+      end
+    end
+  end
+
+  # An abstract class providing common methods for real creators
+  class Creator
+    ALL_DIGITS = /\A\d+\Z/
+
+    def already_exist(path)
+      underscore = StringExtra.new(path).underscore
+      new_file = "#{File.dirname(path)}/#{underscore}.rb"
+      return if !FileTest.exist?(path) && !FileTest.exist?(new_file)
+      puts 'That file already exists!'
+      exit
+    end
+
+    # Show the help/usage message for create.
+    def usage
+      puts <<-USAGE
+
+      Usage: propane --create <sketch_to_generate> <width> <height> <mode>
+      optional mode can be P2D / P3D.
+      Use    --inner to generated a ruby version of 'java' Inner class
+      Examples: propane --create app 800 600
+      propane --create app 800 600 p3d 
+      propane --create inner_class --inner
+
+      USAGE
+    end
+  end
+
+  # This class creates bare sketches, with an optional render mode
+  class BasicSketch < Creator
+    def template_default
+      format(BASIC, @name, @width, @height, @name, @title)
+    end
+
+    def template_mode
+      format(MODE, @name, @width, @height, @mode, @name, @title)
+    end
+    # Create a class wrapped sketch, given a path.
+    def create!(path, args)
+      return usage if /\?/ =~ path || /--help/ =~ path
+      main_file = File.basename(path, '.rb') # allow uneeded extension input
+      # Check to make sure that the main file doesn't exist already
+      already_exist(path)
+      @name = StringExtra.new(main_file).camelize
+      writer = SketchWriter.new(main_file)
+      @title = StringExtra.new(main_file).titleize
+      @width, @height = args[0], args[1]
+      @mode = args[2].upcase unless args[2].nil?
+      template = @mode.nil? ? template_default : template_mode
+      writer.save(template)
+    end
+  end
+
+  # This class creates a pseudo 'java inner class' of the sketch
+  class Inner < Creator
+    def inner_class_template
+      format(INNER, @name)
+    end
+    # Create a pseudo inner class, given a path.
+    def create!(path, _args_)
+      return usage if /\?/ =~ path || /--help/ =~ path
+      main_file = File.basename(path, '.rb') # allow uneeded extension input
+      # Check to make sure that the main file doesn't exist already
+      already_exist(path)
+      @name = main_file.camelize
+      writer = SketchWriter.new(main_file)
+      template = inner_class_template
+      writer.save(template)
+    end
+  end
+end

data/lib/propane/helpers/string_extra.rb

@@ -0,0 +1,45 @@
+# encoding: utf-8
+# frozen_string_literal: false
+
+require 'forwardable'
+
+# String utility for creating titles and class-names
+class StringExtra
+  extend Forwardable
+  def_delegators :@str, :upcase, :capitalize, :length, :downcase, :gsub, :tr
+  def initialize(str)
+    @str = str
+  end
+
+  def titleize
+    gsub(/::/, '/')
+      .gsub(/([A-Z]+)([A-Z][a-z])/, '\1_\2')
+      .gsub(/([a-z\d])([A-Z])/, '\1_\2')
+      .tr('-', '_')
+      .downcase
+      .gsub(/_id$/, '')
+      .tr('_', ' ').capitalize
+      .gsub(/\b([a-z])/) { Regexp.last_match[1].capitalize }
+  end
+
+  def humanize
+    gsub(/_id$/, '').tr(/_/, ' ').capitalize
+  end
+
+  def underscore
+    gsub(/::/, '/')
+      .gsub(/([A-Z]+)([A-Z][a-z])/, '\1_\2')
+      .gsub(/([a-z\d])([A-Z])/, '\1_\2')
+      .sub('-', '_')
+      .downcase
+  end
+
+  def camelize(first_letter_in_uppercase = true)
+    if first_letter_in_uppercase
+      @str.gsub(%r{/(.?)}) { '::' + Regexp.last_match[1].upcase }
+          .gsub(/(^|_)(.)/) { Regexp.last_match[2].upcase }
+    else
+      @str[0] + camelize[1..-1]
+    end
+  end
+end

data/lib/propane/runner.rb

@@ -8,7 +8,7 @@ module Propane
   # Utility class to handle the different commands that the 'rp5' command
   # offers. Able to run, watch, live, create, app, and unpack
   class Runner
-    attr_reader :options, :name
+    attr_reader :options, :argc, :filename
 
     def initialize
       @options = {}
@@ -26,6 +26,7 @@ module Propane
       show_help if options.empty?
       show_version if options[:version]
       run_sketch if options[:run]
+      create if options[:create]
       install if options[:install]
     end
 
@@ -51,6 +52,11 @@ module Propane
         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
+        end
 
         # This displays the help screen, all programs are
         # assumed to have this option.
@@ -59,12 +65,13 @@ module Propane
           exit
         end
       end
-      @name = opt_parser.parse(args)
+      @argc = opt_parser.parse(args)
+      @filename = argc.shift
     end
 
     def run_sketch
-      root = File.absolute_path(File.dirname(ARGV.shift))
-      sketch = File.join(root, name)
+      root = File.absolute_path(File.dirname(filename))
+      sketch = File.join(root, filename)
       warn_format = 'File %s does not not Exist!'
       return warn(format(warn_format, sketch)) unless File.exist?(sketch)
       command = [
@@ -76,9 +83,15 @@ module Propane
       ].flatten
       exec(*command)
     end
+    
+    def create
+      require_relative 'creators/creator'
+      Propane::BasicSketch.new.create!(filename, argc)
+    end
 
     def show_version
-      puts format('Propane version %s', Propane::VERSION)
+      v_format = "Propane version %s\nJRuby version %s"
+      puts format(v_format, Propane::VERSION, JRUBY_VERSION)
     end
 
     def install

data/lib/propane/version.rb

@@ -1,5 +1,5 @@
 # encoding: utf-8
 # frozen_string_literal: true
 module Propane
-  VERSION = '0.4.0.pre'.freeze
+  VERSION = '0.5.0'.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', '0.4.0.pre'
+  id 'propane:rp5extras', '0.5.0'
   packaging 'jar'
   description 'rp5extras for propane'
   organization 'ruby-processing', 'https://ruby-processing.github.io'
@@ -108,6 +108,6 @@ project 'rp5extras', 'https://github.com/monkstone/propane' do
   build do
     default_goal 'package'
     source_directory 'src'
-    final_name 'rpextras'
+    final_name 'propane'
   end
 end

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.4.0.pre</version>
+  <version>0.5.0</version>
   <name>rp5extras</name>
   <description>rp5extras for propane</description>
   <url>https://github.com/monkstone/propane</url>
@@ -91,7 +91,7 @@ DO NOT MODIFIY - GENERATED CODE
   <build>
     <sourceDirectory>src</sourceDirectory>
     <defaultGoal>package</defaultGoal>
-    <finalName>rpextras</finalName>
+    <finalName>propane</finalName>
     <pluginManagement>
       <plugins>
         <plugin>

data/propane.gemspec

@@ -13,7 +13,7 @@ Gem::Specification.new do |gem|
   gem.summary       = %q{A really slim layer between Ruby and Processing-2.2.1.}
   gem.homepage      = 'https://github.com/monkstone/propane'
   gem.files         = `git ls-files`.split($/)
-  gem.files << 'lib/rpextras.jar'
+  gem.files << 'lib/propane.jar'
   gem.files << 'lib/core-2.2.1.jar'
   gem.files << 'lib/gluegen-rt-2.1.5-01.jar'
   gem.files << 'lib/jogl-all-2.1.5-01.jar'

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: propane
 version: !ruby/object:Gem::Version
-  version: 0.4.0.pre
+  version: 0.5.0
 platform: java
 authors:
 - filib
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-03-26 00:00:00.000000000 Z
+date: 2016-04-01 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: arcball
@@ -87,15 +87,17 @@ files:
 - lib/jogl-all-2.1.5-01-natives-linux-amd64.jar
 - lib/jogl-all-2.1.5-01-natives-macosx-universal.jar
 - lib/jogl-all-2.1.5-01.jar
+- lib/propane.jar
 - lib/propane.rb
 - lib/propane/app.rb
+- lib/propane/creators/creator.rb
 - lib/propane/helper_methods.rb
 - lib/propane/helpers/numeric.rb
+- lib/propane/helpers/string_extra.rb
 - lib/propane/library_loader.rb
 - lib/propane/runner.rb
 - lib/propane/underscorer.rb
 - lib/propane/version.rb
-- lib/rpextras.jar
 - library/boids/boids.rb
 - library/control_panel/control_panel.rb
 - pom.rb
@@ -128,9 +130,9 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '0'
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
-  - - ">"
+  - - ">="
     - !ruby/object:Gem::Version
-      version: 1.3.1
+      version: '0'
 requirements: []
 rubyforge_project: 
 rubygems_version: 2.5.2