propane 2.0.1-java → 2.0.2-java

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 71d0f803d7bb67facbb6118f910b7803f29ec306
-  data.tar.gz: 1e3c9e530b82d6cda1764f35a45135ba81e65e4f
+  metadata.gz: 9f847eb7d415cbd0c0ee989ebf5c5da70a68de20
+  data.tar.gz: cddade51d46516647451f40532d18e0d351bbe2a
 SHA512:
-  metadata.gz: cb7b0fb9079c432b03bf1daff649e15265e45e5ecf5134495677827e56953b381b2c8605969018036ebbe1299739556a8f83916115a9811f12d6c7c794de9ab1
-  data.tar.gz: 6c22a4b82b8b8c4eb0cce960540927c8f928ebdda9f77a2c7afdb6500bb040e909d773c378ef2d5aab4aa459df2c053a22df077eedda557ac6f9196359981703
+  metadata.gz: 9445e29c40600d55147c13434f253b517791d9ffd7dba8cdabca8b2ccb81128b4915cf773daf7fca3763104aec9c40d483ed280fa12d6d406ef7f7d018970f60
+  data.tar.gz: 583bceb0eeeacdbf4e1b1d3cbdb18bde2fe5b08c3b67f7c7e5917bd626618d7a46c1606ee6ebecd299d78726052cb2949de9d908fc2d30a9b8fd3e18e74e3e4b

data/CHANGELOG.md

@@ -1,4 +1,6 @@
-**v2.0.0** Refactored to work with processing-3.0, `--install samples` and/or vanilla processing `sound` and `video` libraries
+**v2.0.2** Using processing-3.2 core from local maven repository, refactored sketch creator
+
+**v2.0.1** 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

@@ -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
+To run sketches (works just fine from atom editor)
 
 ```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.1.1.jar gluegen-rt-2.3.2.jar jog-all-2.3.2.jar')
+    f.puts('Class-Path: core-3.2.0.jar gluegen-rt-2.3.2.jar jog-all-2.3.2.jar')
   end
 end
 

data/lib/propane/creators/sketch_class.rb

@@ -0,0 +1,54 @@
+# frozen_string_literal: false
+# the sketch class
+class SketchClass
+  attr_reader :name, :width, :height, :mode
+
+  def initialize(name:, width: 150, height: 150, mode: nil)
+    @name, @width, @height, @mode = name, width, height, mode
+  end
+
+  def class_sketch
+    format('class %s < Propane::App', sketch_class)
+  end
+
+  def sketch_class
+    name.split('_').collect(&:capitalize).join
+  end
+
+  def sketch_new
+    format('%s.new', sketch_class)
+  end
+
+  def indent(line)
+    format('  %s', line)
+  end
+
+  def size
+    return format('    size %d, %d', width.to_i, height.to_i) if mode.nil?
+    format('    size %d, %d, %s', width.to_i, height.to_i, mode.upcase)
+  end
+
+  def sketch_title
+    human = name.split('_').collect(&:capitalize).join(' ')
+    format("    sketch_title '%s'", human)
+  end
+
+  def method_lines(name, content = '')
+    return [format('  def %s', name), content, '  end'] if content.empty?
+    [format('  def %s', name), content, '  end', '']
+  end
+
+  def lines
+    lines = [
+      '# frozen_string_literal: false',
+      "require 'propane'",
+      '',
+      class_sketch
+    ]
+    lines.concat method_lines('settings', size)
+    lines.concat method_lines('setup', sketch_title)
+    lines.concat method_lines('draw')
+    lines << 'end'
+    lines << sketch_new
+  end
+end

data/lib/propane/creators/sketch_writer.rb

@@ -1,71 +1,21 @@
 # frozen_string_literal: false
-# The SketchParameters class knows how to format, size, title & class name
-class SketchParameters
-  attr_reader :name, :args
-  def initialize(name:, args:)
-    @name = name
-    @args = args
-  end
-
-  def class_name
-    name.split('_').collect(&:capitalize).join
-  end
-
-  def sketch_title
-    human = name.split('_').collect(&:capitalize).join(' ')
-    format("sketch_title '%s'", human)
-  end
-
-  def sketch_size
-    mode = args.length == 3 ? format(', %s', args[2].upcase) : ''
-    return 'size 200, 200' if args.empty?
-    format('size %d, %d%s', args[0].to_i, args[1].to_i, mode)
-  end
-end
+require_relative 'sketch_class'
 
 # The file writer can write a sketch when given instance of Sketch type
 class SketchWriter
-  attr_reader :file, :param
+  attr_reader :file, :sketch
 
   def initialize(path, args)
-    @param = SketchParameters.new(name: path, args: args)
+    @sketch = SketchClass.new(
+      name: path,
+      width: args[0].to_i,
+      height: args[1].to_i,
+      mode: args[2]
+    )
     @file = format('%s/%s.rb', File.dirname(path), path)
   end
 
-  def write(creator)
-    sketch = creator.code(param)
-    File.open(file, 'w+') { |f| f.write sketch.join("\n") }
-  end
-end
-
-# A simple class wrapped sketch
-class ClassSketch
-  INDENT ||= '  '
-  def code(param)
-    lines = [
-      '# frozen_string_literal: false',
-      "require 'propane'",
-      ''
-    ]
-    lines << format('class %s < Propane::App', param.class_name)
-    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)
-    three = format('%send', INDENT)
-    return [one, two, three] if /draw/ =~ name
-    [one, two, three, '']
-  end
-
-  def new(param)
-    ['', format('%s.new', param.class_name)]
+  def write
+    File.open(file, 'w+') { |f| f.write sketch.lines.join("\n") }
   end
 end

data/lib/propane/runner.rb

@@ -63,8 +63,7 @@ module Propane
 
     def create
       require_relative 'creators/sketch_writer'
-      sketch = ClassSketch.new
-      SketchWriter.new(File.basename(filename, '.rb'), argc).write(sketch)
+      SketchWriter.new(File.basename(filename, '.rb'), argc).write
     end
 
     def show_version

data/lib/propane/version.rb

@@ -1,5 +1,5 @@
 # encoding: utf-8
 # frozen_string_literal: true
 module Propane
-  VERSION = '2.0.1'.freeze
+  VERSION = '2.0.2'.freeze
 end

data/pom.rb

@@ -1,17 +1,16 @@
 require 'fileutils'
 project 'rp5extras', 'https://github.com/monkstone/propane' do
   model_version '4.0.0'
-  id 'propane:rp5extras', '2.0.1'
+  id 'propane:rp5extras', '2.0.2'
   packaging 'jar'
   description 'rp5extras for propane'
   organization 'ruby-processing', 'https://ruby-processing.github.io'
-  { 'monkstone' => 'Martin Prout', 'filib' => 'Phillip Cunningham' }.each do |key, value|
+  { 'monkstone' => 'Martin Prout' }.each do |key, value|
     developer key do
       name value
       roles 'developer'
     end
   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/ruby-processing/propane/issues', 'Github'
   
@@ -34,7 +33,7 @@ project 'rp5extras', 'https://github.com/monkstone/propane' do
     )
   
   pom 'org.jruby:jruby:9.1.2.0'
-  jar 'org.processing:core:3.1.1'
+  jar 'org.processing:core:3.2.0'
   jar 'org.processing:video:3.0.2'
   jar('org.jogamp.jogl:jogl-all:${jogl.version}')
   jar('org.jogamp.gluegen:gluegen-rt-main:${jogl.version}')
@@ -45,7 +44,7 @@ project 'rp5extras', 'https://github.com/monkstone/propane' do
       execute_goals( id: 'default-cli',
         artifactItems: [ { groupId:  'org.processing',
           artifactId:  'core',
-          version:  '3.1.1',         
+          version:  '3.2.0',         
           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.1</version>
+  <version>2.0.2</version>
   <name>rp5extras</name>
   <description>rp5extras for propane</description>
   <url>https://github.com/monkstone/propane</url>
@@ -20,10 +20,6 @@ DO NOT MODIFIY - GENERATED CODE
     <url>https://ruby-processing.github.io</url>
   </organization>
   <licenses>
-    <license>
-      <name>MIT</name>
-      <url>http://www.opensource.org/licenses/mit-license.php</url>
-    </license>
     <license>
       <name>GPL 3</name>
       <url>http://www.gnu.org/licenses/gpl-3.0-standalone.html</url>
@@ -37,13 +33,6 @@ DO NOT MODIFIY - GENERATED CODE
         <role>developer</role>
       </roles>
     </developer>
-    <developer>
-      <id>filib</id>
-      <name>Phillip Cunningham</name>
-      <roles>
-        <role>developer</role>
-      </roles>
-    </developer>
   </developers>
   <scm>
     <connection>scm:git:git://github.com/ruby-processing/propane.git</connection>
@@ -75,7 +64,7 @@ DO NOT MODIFIY - GENERATED CODE
     <dependency>
       <groupId>org.processing</groupId>
       <artifactId>core</artifactId>
-      <version>3.1.1</version>
+      <version>3.2.0</version>
     </dependency>
     <dependency>
       <groupId>org.processing</groupId>
@@ -114,7 +103,7 @@ DO NOT MODIFIY - GENERATED CODE
                   <artifactItem>
                     <groupId>org.processing</groupId>
                     <artifactId>core</artifactId>
-                    <version>3.1.1</version>
+                    <version>3.2.0</version>
                     <type>jar</type>
                     <outputDirectory>${propane.basedir}/lib</outputDirectory>
                   </artifactItem>

data/propane.gemspec

@@ -14,7 +14,7 @@ Gem::Specification.new do |gem|
   gem.homepage      = 'https://ruby-processing.github.io/propane/'
   gem.files         = `git ls-files`.split($/)
   gem.files << 'lib/propane.jar'
-  gem.files << 'lib/core-3.1.1.jar'
+  gem.files << 'lib/core-3.2.0.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/test/create_test.rb

@@ -3,7 +3,7 @@ require 'minitest/autorun'
 require 'minitest/pride'
 
 
-require_relative '../lib/propane/creators/sketch_writer'
+require_relative '../lib/propane/creators/sketch_class'
 
 CLASS_SKETCH = <<~CODE
 # frozen_string_literal: false
@@ -11,7 +11,7 @@ require 'propane'
 
 class FredSketch < Propane::App
   def settings
-    size 200, 200, P2D
+    size 200, 200
   end
 
   def setup
@@ -27,29 +27,66 @@ FredSketch.new
 
 CODE
 
-class SketchWriterTest < Minitest::Test
-  ParamMethods = Struct.new(:name, :class_name, :sketch_size, :sketch_title)
+BARE_SKETCH = <<~CODE
+def settings
+  size 200, 200, P2D
+end
+
+def setup
+  sketch_title 'Fred Sketch'
+end
+
+def draw
+
+end
+  
+CODE
+
+class SketchClassTest < Minitest::Test
   
   def setup
-    @param = ParamMethods.new(
-      'fred_sketch',
-      'FredSketch',
-      'size 200, 200, P2D',
-      "sketch_title 'Fred Sketch'"
-    )
+    @basic = SketchClass.new(name: 'fred_sketch', width: 200, height: 200)
+    @sketch = SketchClass.new(name: 'fred_sketch', width: 200, height: 200, mode: 'p2d')
+  end
+  
+  def test_class
+    result = CLASS_SKETCH.split(/\n/, -1)
+    class_lines = @sketch.lines
+    class_lines.each_with_index do |line, i|
+      assert_equal result[i], line
+    end
+  end
+
+  def test_indent
+    assert_equal '  indent', @sketch.indent('indent')
   end
 
-  def test_parameter_new
-    param = SketchParameters.new(name: 'fred_sketch', args: %w(200 200 p2d))
-    assert_equal 'size 200, 200, P2D', param.sketch_size
-    assert_equal 'FredSketch', param.class_name
+  def test_size
+    assert_equal '    size 200, 200, P2D', @sketch.size
+    assert_equal '    size 200, 200', @basic.size
+  end
+
+  def test_sketch_title
+    assert_equal "    sketch_title 'Fred Sketch'", @sketch.sketch_title
   end
 
   def test_class
+    assert_equal "FredSketch", @sketch.sketch_class
+  end
+
+  def test_class_new
+    assert_equal "FredSketch.new", @sketch.sketch_new
+  end
+
+  def test_method_lines
     result = CLASS_SKETCH.split(/\n/, -1)
-    class_lines = ClassSketch.new.code(@param)
-    class_lines.each_with_index do |line, i|
-      assert_equal result[i], line
+    @basic.method_lines('settings', @basic.size).each_with_index do |line, i|
+      assert_equal result[i + 4], line
     end
   end
+
+
+  def test_sketch_class
+    assert_equal "class FredSketch < Propane::App", @basic.class_sketch
+  end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: propane
 version: !ruby/object:Gem::Version
-  version: 2.0.1
+  version: 2.0.2
 platform: java
 authors:
 - monkstone
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-08-15 00:00:00.000000000 Z
+date: 2016-08-19 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.1.1.jar
+- lib/core-3.2.0.jar
 - lib/export.txt
 - lib/gluegen-rt-2.3.2-natives-linux-amd64.jar
 - lib/gluegen-rt-2.3.2-natives-macosx-universal.jar
@@ -56,6 +56,7 @@ files:
 - lib/propane.jar
 - lib/propane.rb
 - lib/propane/app.rb
+- lib/propane/creators/sketch_class.rb
 - lib/propane/creators/sketch_writer.rb
 - lib/propane/helper_methods.rb
 - lib/propane/helpers/numeric.rb