jruby_art 0.4.0 → 0.4.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: bd9cb0f962dc0a84b23505e358c06629c40f68e6
-  data.tar.gz: fbe671a54abacc8ba092e8a0990a4001f2801eca
+  metadata.gz: c07e2583ae91828f56b50199830ca327fe9eadeb
+  data.tar.gz: 4afbc2e0d2437a6bcb5a30507a45797b309af3e6
 SHA512:
-  metadata.gz: 461771d79505d0055e7327292df3c592aa33ad8d5d61a302fc55e09d51f5c40d8f032eb9d9179e47d6fc4c746a0db2fbd875254b4f595572c0f5a0fc9d404746
-  data.tar.gz: 5e4ecc05a81f62637333b4b8a53c669b292c539e797c1012819f665851cd641c4111c701072b58c1873643fec1f4a0dc290461cc90063bf36659e1c645302dba
+  metadata.gz: 5153f072f9d863a5660b35f00eb6442d8fbc40a57e54a543f1fdbcc40dfca331157a5146312aa39292845645b171f8ad37bc81d95a66ef2fd80e5578fb268bb4
+  data.tar.gz: 29cb4e2832285999382f91874cae603090aca811f4546b66370e31d92372ec13c973820d300894a7c7a68ba57cf843d0f79a2af499ce81736a938d18f9cfbfde

data/lib/jruby_art/config.rb

@@ -1,4 +1,4 @@
-require 'psych'
+require 'yaml'
 
 # The wrapper module
 module Processing
@@ -6,7 +6,7 @@ module Processing
     config_path = '~/.jruby_art/config.yml'
     begin
       CONFIG_FILE_PATH = File.expand_path(config_path)
-      RP_CONFIG = (Psych.load_file(CONFIG_FILE_PATH))
+      RP_CONFIG = (YAML.load_file(CONFIG_FILE_PATH))
     rescue
       warn(format('WARN: you need to set PROCESSING_ROOT in %s', config_path))
     end

data/lib/jruby_art/helper_methods.rb

@@ -1,4 +1,6 @@
 # processing module wrapper
+require_relative '../rpextras'
+
 module Processing
   # Provides some convenience methods
   module HelperMethods
@@ -32,17 +34,8 @@ module Processing
     end
 
     def color(*args)
-      a = args[0]
-      # convert to signed int
-      if args.length == 1
-        if a.is_a?(Fixnum) && a >= 2**31
-          args = [a - 2**32]
-        elsif a.is_a?(String) && a[0].eql?('#')
-          h = a[1..-1].rjust(6, '0').prepend('ff')
-          return color(h.hex)
-        end
-      end
-      super(*args)
+      return super(*args) unless args.length == 1
+      super(hex_color(args[0]))
     end
 
     # Overrides Processing convenience function thread, which takes a String
@@ -134,7 +127,7 @@ module Processing
 
     # Uses PImage class method under hood
     def blend_color(c1, c2, mode)
-      Java::ProcessingCore::PImage::blendColor(c1, c2, mode)
+      Java::ProcessingCore::PImage.blendColor(c1, c2, mode)
     end
 
     # There's just so many functions in Processing,
@@ -147,7 +140,7 @@ module Processing
     # Proxy over a list of Java declared fields that have the same name as
     # some methods. Add to this list as needed.
     def proxy_java_fields
-      fields = %w(sketchPath key frameRate frame mousePressed keyPressed)
+      fields = %w(sketchPath key frameRate mousePressed keyPressed)
       methods  = fields.map { |field| java_class.declared_field(field) }
       @declared_fields = Hash[fields.zip(methods)]
     end
@@ -213,6 +206,17 @@ module Processing
 
     private
 
+    # parse single argument color int/double/String
+    def hex_color(a)
+      if a.is_a?(Fixnum)
+        return Java::Monkstone::ColorUtil.colorLong(a)
+      elsif a.is_a?(String) 
+        return Java::Monkstone::ColorUtil.colorString(a) if a =~ /#\h+/
+        raise StandardError, 'Dodgy Hexstring'
+      end
+      Java::Monkstone::ColorUtil.colorDouble(a)
+    end
+
     def dist2d(*args)
       dx = args[0] - args[2]
       dy = args[1] - args[3]

data/lib/jruby_art/runner.rb

@@ -21,6 +21,7 @@ module Processing
     choice:-
     run:              run sketch once
     watch:            watch for changes on the file and relaunch it on the fly
+    live:             run sketch and open a pry console bound to $app
     create [width height][mode][flag]: create a new sketch.
     setup:            check setup, install jruby-complete, unpack samples
 
@@ -62,6 +63,7 @@ module Processing
     def execute!
       case @options.action
       when 'run'    then run(@options.path, @options.args)
+      when 'live'   then live(@options.path, @options.args)  
       when 'watch'  then watch(@options.path, @options.args)
       when 'create' then create(@options.path, @options.args)
       when 'setup'  then setup(@options.path)
@@ -98,6 +100,12 @@ module Processing
       ensure_exists(sketch)
       spin_up('run.rb', sketch, args)
     end
+    
+    # Just simply run a JRubyArt sketch.
+    def live(sketch, args)
+      ensure_exists(sketch)
+      spin_up('live.rb', sketch, args)
+    end
 
     # Run a sketch, keeping an eye on it's file, and reloading
     # whenever it changes.

data/lib/jruby_art/runners/live.rb

@@ -0,0 +1,16 @@
+# A pry shell for live coding.
+# Will start with your sketch.
+require_relative 'base'
+Processing.load_and_run_sketch
+
+class PryException < StandardError
+end
+
+MESSAGE = "You need to 'jruby -S gem install pry' for 'live' mode"
+
+if Gem::Specification.find_all_by_name('pry').any?
+  require 'pry'
+  $app.pry
+else
+  fail(PryException.new, MESSAGE)
+end

data/lib/jruby_art/runners/watch.rb

@@ -1,10 +1,23 @@
 require_relative 'base'
+require_relative '../config'
 
 module Processing
+  class WatchException < StandardError
+  end
+
   # A sketch loader, observer, and reloader, to tighten
   # the feedback between code and effect.
   class Watcher
     # Sic a new Processing::Watcher on the sketch
+    WATCH_MESSAGE ||= <<-EOS
+    Warning:
+    To protect you from running watch mode in a top level
+    directory with lots of nested ruby or GLSL files we
+    limit the number of files to watch to %d.
+    If you really want to watch %d files you should
+    increase MAX_WATCH in ~/.jruby_art/config.yml
+
+    EOS
     SLEEP_TIME = 0.2
     def initialize
       reload_files_to_watch
@@ -52,6 +65,11 @@ module Processing
 
     def reload_files_to_watch
       @files = Dir.glob(File.join(SKETCH_ROOT, '**/*.{rb,glsl}'))
+      count = @files.length
+      max_watch = RP_CONFIG.fetch('MAX_WATCH', 20)
+      return unless count > max_watch
+      warn format(WATCH_MESSAGE, max_watch, count)
+      abort
     end
   end
 end

data/lib/jruby_art/version.rb

@@ -1,3 +1,3 @@
 module JRubyArt
-  VERSION = '0.4.0'
+  VERSION = '0.4.2'
 end

data/vendors/Rakefile

@@ -9,7 +9,7 @@ WARNING = <<-EOS
 EOS
 
 JRUBYC_VERSION     = '9.0.0.0'
-EXAMPLES           = '0.4'
+EXAMPLES           = '0.5'
 HOME_DIR = ENV['HOME']
 MAC_OR_LINUX = /linux|mac|darwin/ =~ RbConfig::CONFIG['host_os'] 
 

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: jruby_art
 version: !ruby/object:Gem::Version
-  version: 0.4.0
+  version: 0.4.2
 platform: ruby
 authors:
 - Jeremy Ashkenas
@@ -10,7 +10,7 @@ authors:
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2015-07-25 00:00:00.000000000 Z
+date: 2015-08-10 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   requirement: !ruby/object:Gem::Requirement
@@ -70,9 +70,9 @@ dependencies:
         version: '5.3'
 description: |2
     JRubyArt is a ruby wrapper for the processing art framework.
-    The current version supports processing-3.0a11, and uses jruby-9.0.0.0
+    The current version supports processing-3.0b2, and uses jruby-9.0.0.0
     as the glue between ruby and java. You can use both processing libraries and ruby
-    gems in your sketches. Features create/run/watch modes. The "watch" mode,
+    gems in your sketches. Features create/run/watch/live modes. The "watch" mode,
     provides a nice REPL-ish way to work on your processing sketches. Includes:-
     A "Control Panel" library, so that you can easily create sliders, buttons,
     checkboxes and drop-down menus, and hook them into your sketch's instance
@@ -96,6 +96,7 @@ files:
 - lib/jruby_art/library_loader.rb
 - lib/jruby_art/runner.rb
 - lib/jruby_art/runners/base.rb
+- lib/jruby_art/runners/live.rb
 - lib/jruby_art/runners/run.rb
 - lib/jruby_art/runners/watch.rb
 - lib/jruby_art/version.rb