new run-app mode

jashkenas · Jun 27, 2016 · 167a167 · 167a167
1 parent fd843e3
commit 167a167
Show file tree

Hide file tree

Showing 6 changed files with 10 additions and 8 deletions.
diff --git a/CHANGELOG b/CHANGELOG
@@ -1,3 +1,5 @@
+v2.7.0 bump version in recognition of the 'new' run-app option see wiki Getting-Started
+
 v2.6.18 update to jruby-complete-1.7.25, to allow travis testing, anyone wishing to update to jruby-complete-9.0.5.0+ should try out `propane`.
 
 v2.6.17 move to a polyglot maven build and update to jruby-complete-1.7.24, to allow travis testing, should be easy to update to jruby-complete-9.0+ if required. Updating processing version is unecessary because JRubyArt does that.

diff --git a/README.md b/README.md
@@ -24,7 +24,7 @@ To install jruby-complete use our built in tool (relies on `wget` to download [j
 
 since ruby-processing-2.5.0 `rp5 setup install` (was `install_jruby_complete`)
 
-If you haven't got `wget` just download jruby-complete-1.7.25 (for ruby-processing-2.6.18) to the vendors folder (then run above tool)
+If you haven't got `wget` just download jruby-complete-1.7.25 (for ruby-processing-2.7.0) to the vendors folder (then run above tool)
 
 The vendored jruby-complete is only required for application export, and running certain sketches (eg shader sketches see [wiki][]).
 
@@ -104,7 +104,7 @@ This gem has been tested with the following ruby implementations
 * Ruby 2.1.2
 * Ruby 2.2.1
 * Ruby 2.3.0
-* [JRuby][] preferred use jruby-1.7.XX but also works with jruby-9.0.5.0 release 
+* [JRuby][] preferred use jruby-1.7.XX but also works with jruby-9.1.2.0 release 
 
 ### Supported processing version
 

diff --git a/lib/ruby-processing/runners/base.rb b/lib/ruby-processing/runners/base.rb
@@ -40,9 +40,9 @@ def self.load_and_run_sketch
       run_app
       return
     end
+    code = no_methods ? format(NAKED_WRAP, source) : format(BARE_WRAP, source)
     Object.class_eval(code, SKETCH_PATH, -1)
     Processing::App.sketch_class.new
-    code = no_methods ? format(NAKED_WRAP, source) : format(BARE_WRAP, source)
   end
 
   # Read in the sketch source code. Needs to work both online and offline.

diff --git a/lib/ruby-processing/version.rb b/lib/ruby-processing/version.rb
@@ -1,3 +1,3 @@
 module RubyProcessing
-  VERSION = '2.6.18'
+  VERSION = '2.7.0'
 end
diff --git a/pom.rb b/pom.rb
@@ -1,13 +1,13 @@
 require 'fileutils'
 project 'rp5extras', 'https://github.com/jashkenas/ruby-processing' do
   model_version '4.0.0'
-  id 'ruby-processing:rp5extras', '2.6.18'
+  id 'ruby-processing:rp5extras', '2.7.0'
   packaging 'jar'
   description 'rp5extras for ruby-processing'
   organization 'ruby-processing', 'https://ruby-processing.github.io'
   developer 'monkstone' do
     name 'Martin Prout'
-    email '[email protected]'
+    email '[email protected]'
     roles 'developer'
   end
 

diff --git a/pom.xml b/pom.xml
@@ -11,7 +11,7 @@ DO NOT MODIFIY - GENERATED CODE
   <modelVersion>4.0.0</modelVersion>
   <groupId>ruby-processing</groupId>
   <artifactId>rp5extras</artifactId>
-  <version>2.6.18</version>
+  <version>2.7.0</version>
   <name>rp5extras</name>
   <description>rp5extras for ruby-processing</description>
   <url>https://github.com/jashkenas/ruby-processing</url>
@@ -23,7 +23,7 @@ DO NOT MODIFIY - GENERATED CODE
     <developer>
       <id>monkstone</id>
       <name>Martin Prout</name>
-      <email>[email protected]</email>
+      <email>[email protected]</email>
       <roles>
         <role>developer</role>
       </roles>