jruby_art 1.1.2 → 1.1.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 7dc367d2baeead82e8b4017a333879cc81ad5a2a
-  data.tar.gz: b901245c19d4c67b6f80e406ab211e0e98420ee3
+  metadata.gz: 9b2efc2b922f7fc4f2deaa35f08f4eff1b76f866
+  data.tar.gz: 3d1c58ba7d1b7fdaad54f60c3cc7db530b9aa192
 SHA512:
-  metadata.gz: acbfbaae7b7df8296c0decb9ac2907bc839409311538e47903e850bdd4fe6b4db59ba6f47d3378ed821abe41872753302397176d265b870bebbef4e88b891a90
-  data.tar.gz: 387499d644a78e6a176383d43f5cc54402575b96cc07e61b0f92063ad89a584788130bb20e9a1a7aae93482be69620e202d6c3e2c9f3b229e38b6cacd15ece24
+  metadata.gz: 4ac06b256d5e9cb69c25c49a2f2aafe4cd8027ce04407f1b6c3dc5549938e0e41d48a3e8e4c36ec9b5a1f237e6b2e611ae3758d70faebbb07ad95a56e48d5900
+  data.tar.gz: fbe51822b4bb75092c909d57ea1a477ccd4ad2e41270745523a6d389f159b77162e219a24b5609814f55ad2f39ef2b12b604744ad13ea68ff1dee51f298f3b11

data/lib/jruby_art/creators/creator.rb

@@ -2,7 +2,7 @@
 
 BASIC = <<-CODE
 def setup
-sketch_title '%s'
+  sketch_title '%s'
 end
 
 def draw
@@ -10,16 +10,16 @@ def draw
 end
 
 def settings
-size %s, %s
-# pixel_density(2) # here for hi-dpi displays only
-# smooth # here
+  size %s, %s
+  # pixel_density(2) # here for hi-dpi displays only
+  # smooth # here
 end
 
 CODE
 
 BASIC_MODE = <<-CODE
 def setup
-sketch_title '%s'
+  sketch_title '%s'
 end
 
 def draw
@@ -27,8 +27,8 @@ def draw
 end
 
 def settings
-size %s, %s, %s
-# smooth # here
+  size %s, %s, %s
+  # smooth # here
 end
 
 CODE
@@ -37,19 +37,19 @@ CLASS_BASIC = <<-CODE
 # encoding: utf-8
 # frozen_string_literal: false
 class %s < Processing::App
-def setup
-sketch_title '%s'
-end
+  def setup
+    sketch_title '%s'
+  end
 
-def draw
+  def draw
 
-end
+  end
 
-def settings
-size %s, %s
-# pixel_density(2) # here for hi-dpi displays only
-# smooth # here
-end
+  def settings
+    size %s, %s
+    # pixel_density(2) # here for hi-dpi displays only
+    # smooth # here
+  end
 end
 CODE
 
@@ -59,21 +59,21 @@ EMACS_BASIC = <<-CODE
 require 'jruby_art'
 require 'jruby_art/app'
 
-Processing::App::SKETCH_PATH = __FILE__
+Processing::App::SKETCH_PATH = __FILE__.freeze
 
 class %s < Processing::App
-def setup
-sketch_title '%s'
-end
+  def setup
+    sketch_title '%s'
+  end
 
-def draw
+  def draw
 
-end
+  end
 
-def settings
-size %s, %s
-# smooth # here
-end
+  def settings
+    size %s, %s
+    # smooth # here
+  end
 end
 
 %s.new unless defined? $app
@@ -83,18 +83,18 @@ CLASS_MODE = <<-CODE
 # encoding: utf-8
 # frozen_string_literal: false
 class %s < Processing::App
-def setup
-sketch_title '%s'
-end
+  def setup
+    sketch_title '%s'
+  end
 
-def draw
+  def draw
 
-end
+  end
 
-def settings
-size %s, %s, %s
-# smooth # here
-end
+  def settings
+    size %s, %s, %s
+    # smooth # here
+  end
 end
 CODE
 
@@ -104,21 +104,21 @@ EMACS_MODE = <<-CODE
 require 'jruby_art'
 require 'jruby_art/app'
 
-Processing::App::SKETCH_PATH = __FILE__
+Processing::App::SKETCH_PATH = __FILE__.freeze
 
 class %s < Processing::App
-def setup
-sketch_title '%s'
-end
+  def setup
+    sketch_title '%s'
+  end
 
-def draw
+  def draw
 
-end
+  end
 
-def settings
-size %s, %s, %s
-# smooth # here
-end
+  def settings
+    size %s, %s, %s
+    # smooth # here
+  end
 end
 
 %s.new unless defined? $app
@@ -128,7 +128,7 @@ INNER = <<-CODE
 # encoding: utf-8
 # frozen_string_literal: false
 class %s
-include Processing::Proxy
+  include Processing::Proxy
 
 end
 CODE
@@ -136,13 +136,12 @@ CODE
 # creator wrapper module using StringExtra
 module Creator
   require_relative '../helpers/string_extra'
-  using StringExtra
   # Write file to disk
   class SketchWriter
     attr_reader :file
 
     def initialize(path)
-      underscore = path.underscore
+      underscore = StringExtra.new(path).underscore
       @file = "#{File.dirname(path)}/#{underscore}.rb"
     end
 
@@ -157,7 +156,7 @@ module Creator
   class Base
     ALL_DIGITS = /\A\d+\Z/
     def already_exist(path)
-      underscore = path.underscore
+      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!'
@@ -197,12 +196,12 @@ module Creator
       already_exist(path)
       main_file = File.basename(path, '.rb') # allow uneeded extension input
       writer = SketchWriter.new(main_file)
-      @title = main_file.titleize
+      @title = StringExtra.new(main_file).titleize
       @width = args[0]
       @height = args[1]
-      @mode = args[2].upcase unless args[2].nil?
-      template = @mode.nil? ? basic_template : basic_template_mode
-      writer.save(template)
+      return writer.save(basic_template) if args[2].nil?
+      @mode = args[2].upcase
+      writer.save(basic_template_mode)
     end
   end
 
@@ -222,9 +221,9 @@ module Creator
       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
+      @name = StringExtra.new(main_file).camelize
       writer = SketchWriter.new(main_file)
-      @title = main_file.titleize
+      @title = StringExtra.new(main_file).titleize
       @width, @height = args[0], args[1]
       @mode = args[2].upcase unless args[2].nil?
       template = @mode.nil? ? class_template : class_template_mode
@@ -247,9 +246,9 @@ module Creator
       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
+      @name = StringExtra.new(main_file).camelize
       writer = SketchWriter.new(main_file)
-      @title = main_file.titleize
+      @title = StringExtra.new(main_file).titleize
       @width, @height = args[0], args[1]
       @mode = args[2].upcase unless args[2].nil?
       template = @mode.nil? ? emacs_template : emacs_template_mode

data/lib/jruby_art/helpers/string_extra.rb

@@ -1,28 +1,33 @@
 # frozen_string_literal: false
-# String refinement for sketch creator
-module StringExtra
-  refine String do
-    def titleize
-      underscore
-        .humanize
-        .gsub(/\b([a-z])/) { Regexp.last_match[1].capitalize }
-    end
+require 'forwardable'
+# reverting to StringExtra class, from a module with String refinements
+class StringExtra
+  extend Forwardable
+  def_delegators(:@str, :upcase, :capitalize, :length, :downcase, :gsub)
+  def initialize(str)
+    @str = str
+  end
 
-    def humanize
-      gsub(/_id$/, '').tr('_', ' ').capitalize
-    end
+  def titleize
+    underscore
+      .gsub(/_id$/, '').tr('_', ' ').capitalize
+      .gsub(/\b([a-z])/) { Regexp.last_match[1].capitalize }
+  end
 
-    def camelize
-      gsub(%r{/\/(.?)/}) { '::' + Regexp.last_match[1].upcase }
-        .gsub(/(^|_)(.)/) { Regexp.last_match[2].upcase }
-    end
+  def humanize
+    gsub(/_id$/, '').tr('_', ' ').capitalize
+  end
+
+  def camelize
+    gsub(%r{/\/(.?)/}) { '::' + Regexp.last_match[1].upcase }
+      .gsub(/(^|_)(.)/) { Regexp.last_match[2].upcase }
+  end
 
-    def underscore
-      gsub(/::/, '/')
-        .gsub(/([A-Z]+)([A-Z][a-z])/, '\1_\2')
-        .gsub(/([a-z\d])([A-Z])/, '\1_\2')
-        .tr('-', '_')
-        .downcase
-    end
+  def underscore
+    gsub(/::/, '/')
+      .gsub(/([A-Z]+)([A-Z][a-z])/, '\1_\2')
+      .gsub(/([a-z\d])([A-Z])/, '\1_\2')
+      .tr('-', '_')
+      .downcase
   end
 end

data/lib/jruby_art/java_opts.rb

@@ -0,0 +1,21 @@
+# frozen_string_literal: false
+# class to parse java_args.txt or java_args in config.yml
+class JavaOpts
+  attr_reader :opts
+
+  def initialize(sketch_root)
+    arg_file = File.join(sketch_root, 'data/java_args.txt')
+    @opts = []
+    @opts += File.read(arg_file).split(/\s+/) if FileTest.exist?(arg_file)
+    if opts.empty? && Processing::RP_CONFIG.fetch('java_args', false)
+      @opts += Processing::RP_CONFIG['java_args'].split(/\s+/)
+    end
+  end
+end
+
+# wrap args to pass through to jvm from jruby
+class JRubyOpts < JavaOpts
+  def opts
+    super.map { |arg| "-J#{arg}" }
+  end
+end

data/lib/jruby_art/runner.rb

@@ -6,7 +6,7 @@ require 'rbconfig'
 require_relative '../jruby_art/config'
 require_relative '../jruby_art/version'
 require_relative '../jruby_art/installer'
-require_relative '../jruby_art/java_args'
+require_relative '../jruby_art/java_opts'
 
 # processing wrapper module
 module Processing
@@ -118,13 +118,13 @@ module Processing
     def watch(sketch, args)
       ensure_exists(sketch)
       spin_up('watch.rb', sketch, args)
-    end      
+    end
 
-    def setup(choice)      
+    def setup(choice)
       return Check.new(K9_ROOT, host_os).install if choice =~ /check/
       return JRubyComplete.new(K9_ROOT, host_os).install if choice =~ /install/
       return UnpackSamples.new(K9_ROOT, host_os).install if choice =~ /unpack_sample/
-      Installer.new(K9_ROOT, host_os).install        
+      Installer.new(K9_ROOT, host_os).install
     end
 
     # Show the standard help/usage message.
@@ -132,6 +132,10 @@ module Processing
       puts HELP_MESSAGE
     end
 
+    def show_version
+      puts format('JRubyArt version %s', JRubyArt::VERSION)
+    end
+
     private
 
     # Trade in this Ruby instance for a JRuby instance, loading in a starter
@@ -142,10 +146,10 @@ module Processing
     def spin_up(starter_script, sketch, args)
       runner = "#{K9_ROOT}/lib/jruby_art/runners/#{starter_script}"
       @options.nojruby = true if Processing::RP_CONFIG['JRUBY'] == 'false'
-      java_args = JavaArgs.new(SKETCH_ROOT)
       if @options.nojruby
+        opts = JavaOpts.new(SKETCH_ROOT).opts
         command = ['java',
-                   java_args.java,
+                   opts,
                    '-cp',
                    jruby_complete,
                    'org.jruby.Main',
@@ -153,8 +157,9 @@ module Processing
                    sketch,
                    args].flatten
       else
+        opts = JRubyOpts.new(SKETCH_ROOT).opts
         command = ['jruby',
-                   java_args.jruby,
+                   opts,
                    runner,
                    sketch,
                    args].flatten
@@ -164,7 +169,7 @@ module Processing
         # exec replaces the Ruby process with the JRuby one.
       rescue Java::JavaLang::ClassNotFoundException
       end
-    end     
+    end
 
     # NB: We really do mean to use 'and' not '&&' for flow control purposes
 

data/lib/jruby_art/runners/watch.rb

@@ -69,7 +69,7 @@ module Processing
       @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
+      return unless count > max_watch.to_i
       warn format(WATCH_MESSAGE, max_watch, count)
       abort
     end

data/lib/jruby_art/version.rb

@@ -2,5 +2,5 @@
 # frozen_string_literal: true
 # A wrapper for version
 module JRubyArt
-  VERSION = '1.1.2'
+  VERSION = '1.1.3'
 end

data/library/library_proxy/README.md

@@ -1,4 +1,6 @@
 ### Using the LibraryProxy in your sketches
+LibraryProxy is a [abstract java class](https://github.com/ruby-processing/JRubyArt/blob/master/src/monkstone/core/LibraryProxy.java) so that you can acccess vanilla processing library reflection methods in you sketches using ruby.
+
 In the sketch you should `load_library :library_proxy` and your library class should inherit 
 from LibraryProxy and implement pre(), draw() and post() methods (can be empty method if not 
 required). For simplicity initialize your `processing library` in the sketch `setup`.
@@ -94,4 +96,4 @@ end
 # does nothing here see custom_array.rb
 def draw
 end
-```
+```

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: jruby_art
 version: !ruby/object:Gem::Version
-  version: 1.1.2
+  version: 1.1.3
 platform: ruby
 authors:
 - Jeremy Ashkenas
@@ -10,7 +10,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-06-14 00:00:00.000000000 Z
+date: 2016-07-01 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rake
@@ -64,7 +64,7 @@ files:
 - lib/jruby_art/helpers/numeric.rb
 - lib/jruby_art/helpers/string_extra.rb
 - lib/jruby_art/installer.rb
-- lib/jruby_art/java_args.rb
+- lib/jruby_art/java_opts.rb
 - lib/jruby_art/library_loader.rb
 - lib/jruby_art/runner.rb
 - lib/jruby_art/runners/base.rb

data/lib/jruby_art/java_args.rb

@@ -1,21 +0,0 @@
-# frozen_string_literal: false
-# class to parse java_args.txt or java_args in config.yml
-class JavaArgs
-  attr_reader :java
-
-  def initialize(sketch_root)
-    arg_file = File.join(sketch_root, 'data/java_args.txt')
-    @java = []
-    if FileTest.exist?(arg_file)
-      @java += File.read(arg_file).split(/\s+/)
-    elsif Processing::RP_CONFIG['java_args']
-      @java += Processing::RP_CONFIG['java_args'].split(/\s+/)
-    end
-  end
-  
-  # wrap java args for jruby
-  def jruby
-    return [] if java.length == 0
-    java.map { |arg| "-J#{arg}" }
-  end
-end