jruby_art 2.2.2 → 2.3.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: e25d59a1fa21e3d739e0216f56a1f4ae478f754abfe1d5d3244c54eeecca5899
-  data.tar.gz: 19d230b5ef2d9783903428d4d4a0ccad4dc1057cff71089a657057bfdd220f85
+  metadata.gz: 7ee18c588fdced0f939e179331f2dcf2e88fbfc61ec0ebca2078118eacccd514
+  data.tar.gz: 24c98f53ea6b2776f0bfc24df6898791b5a14ea19202f3fcefdc4c4635c51007
 SHA512:
-  metadata.gz: 464399ff7d12d8440410cec971d8802a2f1ee6659152560bfd77e171671c6ecf2d78a829c2550d31055de90432b7485e7d790baec26fe804ed163742b0a93ed1
-  data.tar.gz: 7e397c9136a757036c0234bf98801688000316a88120d3afac822a3cf7669d100621f0b143d47a31ddd3f0b3376aac8af31568fa9f2178a07e4261fc380ad37e
+  metadata.gz: 61856fcb19e38edb9fb6bba81db4d2ae87ba107624763b971ec9225c319a95a11e7bb1b134937f2231f67f6cf796b68e680b47cc6ba57eb82e3f0a3f1f7a5326
+  data.tar.gz: 76d34c152133440dc2606339eb5f228961a41aaa64ff7ad47549aafe214acf8b2cb1e873323944a9cc513f67c824b6299e82f4e65e5332a7ee0670fd56be8d3b

data/bin/k9

@@ -1,10 +1,11 @@
 #!/usr/bin/env ruby
+# frozen_string_literal: true
 
 file = __FILE__
-if test(?l, file)
-  require "pathname"
+if test('l', file)
+  require 'pathname'
   file = Pathname.new(file).realpath
 end
 
-require File.expand_path(File.dirname(file) + "/../lib/jruby_art")
+require File.expand_path(File.dirname(file) + '/../lib/jruby_art')
 Processing::Runner.execute

data/lib/jruby_art/app.rb

@@ -1,6 +1,8 @@
+# frozen_string_literal: true
+
 require 'java'
 require_relative '../jruby_art'
-Dir["#{K9_ROOT}/lib/*.jar"].each do |jar|
+Dir["#{K9_ROOT}/lib/*.jar"].sort.each do |jar|
   require jar
 end
 require_relative '../jruby_art/helper_methods'
@@ -10,7 +12,6 @@ require_relative '../jruby_art/config'
 
 # A wrapper module for the processing App
 module Processing
-
   # Include some core processing classes that we'd like to use:
   include_package 'processing.core'
   # Load vecmath, fastmath and mathtool modules
@@ -113,7 +114,7 @@ module Processing
         puts(exception.backtrace.map { |trace| "\t#{trace}" })
         close
       end
-      @surface = self.get_surface
+      @surface = get_surface
       # NB: this is the processing runSketch() method as used by processing.py
       run_sketch
     end
@@ -123,7 +124,7 @@ module Processing
       @width ||= width
       @height ||= height
       @render_mode ||= mode
-      import_opengl if /opengl/ =~ mode
+      import_opengl if /opengl/.match?(mode)
       super(*args)
     end
 
@@ -183,7 +184,7 @@ module Processing
       klass = Processing::App.sketch_class
       klass.constants.each do |name|
         const = klass.const_get name
-        next if const.class != Class || const.to_s.match(/^Java::/)
+        next if const.class != Class || /^Java::/.match?(const.to_s)
 
         const.class_eval 'include Processing::Proxy', __FILE__, __LINE__
       end
@@ -214,7 +215,7 @@ module Processing
 
     def method_missing(name, *args)
       app = Processing.app
-      return app.send(name, *args) if app && app.respond_to?(name)
+      return app.send(name, *args) if app&.respond_to?(name)
 
       super
     end

data/lib/jruby_art/config.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 require 'yaml'
 require_relative 'default_config'
 require_relative 'version'

data/lib/jruby_art/creators/sketch_writer.rb

@@ -1,4 +1,5 @@
 # frozen_string_literal: false
+
 # The SketchParameters class knows how to format, size, title & class name
 class SketchParameters
   attr_reader :name, :args
@@ -13,13 +14,19 @@ class SketchParameters
 
   def sketch_title
     human = name.split('_').collect(&:capitalize).join(' ')
-    format("sketch_title '%s'", human)
+    format("sketch_title '%<title>s'", title: human)
   end
 
   def sketch_size
-    mode = args.length == 3 ? format(', %s', args[2].upcase) : ''
+    mode = args.length == 3 ? format(', %<mode>s', mode: args[2].upcase) : ''
     return 'size 200, 200' if args.empty?
-    format('size %d, %d%s', args[0].to_i, args[1].to_i, mode)
+
+    format(
+      'size %<width>d, %<height>d%<mode>s',
+      width: args[0].to_i,
+      height: args[1].to_i,
+      mode: mode
+    )
   end
 end
 
@@ -29,7 +36,9 @@ class SketchWriter
 
   def initialize(path, args)
     @param = SketchParameters.new(name: path, args: args)
-    @file = format('%s/%s.rb', File.dirname(path), path)
+    @file = format(
+      '%<dir>s/%<file>s.rb', dir: File.dirname(path), file: path
+    )
   end
 
   def write
@@ -45,7 +54,6 @@ class Sketch
 
   def initialize(param)
     @param = param
-    self
   end
 
   BLANK ||= ''.freeze
@@ -59,18 +67,25 @@ class Sketch
   end
 
   def class_methods
-    lines = [format('class %s < Processing::App', param.class_name)]
+    lines = [format('class %<name>s < Processing::App', name: param.class_name)]
     lines.concat methods(INDENT)
     lines << 'end'
   end
 
   private
 
+  def content(content, indent)
+    return BLANK if content.empty?
+
+    format('  %<indent>s%<content>s', indent: indent, content: content)
+  end
+
   def method_lines(name, content, indent)
-    one = format('%sdef %s', indent, name)
-    two = content.empty? ? BLANK : format('  %s%s', indent, content)
-    three = format('%send', indent)
-    return [one, two, three] if /draw/ =~ name
+    one = format('%<indent>sdef %<name>s', indent: indent, name: name)
+    two = content(content, indent)
+    three = format('%<indent>send', indent: indent)
+    return [one, two, three] if /draw/.match?(name)
+
     [one, two, three, BLANK]
   end
 end
@@ -99,7 +114,7 @@ end
 # A simple class wrapped sketch
 class ClassSketch < Sketch
   def code
-    lines = ['# frozen_string_literal: false', BLANK]
+    lines = ['# frozen_string_literal: true', BLANK]
     lines.concat class_methods
   end
 end
@@ -108,7 +123,8 @@ end
 class EmacsSketch < Sketch
   def code
     lines = [
-      '# frozen_string_literal: false',
+      '# frozen_string_literal: true',
+      BLANK,
       "require 'jruby_art'",
       "require 'jruby_art/app'",
       BLANK,
@@ -117,6 +133,8 @@ class EmacsSketch < Sketch
     ]
     lines.concat class_methods
     lines << BLANK
-    lines << format('%s.new if Processing.app.nil?', param.class_name)
+    lines << format(
+      '%<name>s.new if Processing.app.nil?', name: param.class_name
+    )
   end
 end

data/lib/jruby_art/default_config.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 # default configuration
 class Default
   def self.config

data/lib/jruby_art/helper_methods.rb

@@ -1,4 +1,5 @@
 # frozen_string_literal: false
+
 # processing module wrapper
 require_relative '../jruby_art'
 
@@ -53,6 +54,7 @@ module Processing
 
     def color(*args)
       return super(*args) unless args.length == 1
+
       super(hex_color(args[0]))
     end
 
@@ -61,7 +63,7 @@ module Processing
     end
 
     def int_to_ruby_colors(p5color)
-      warn "[DEPRECATION] `int_to_ruby_colors` is deprecated.  Please use `p52ruby` instead."
+      warn '[DEPRECATION] `int_to_ruby_colors` is deprecated.  Please use `p52ruby` instead.'
       p52ruby(p5color)
     end
 
@@ -72,11 +74,8 @@ module Processing
     # Overrides Processing convenience function thread, which takes a String
     # arg (for a function) to more rubylike version, takes a block...
     def thread(&block)
-      if block_given?
-        Thread.new(&block)
-      else
-        raise ArgumentError, 'thread must be called with a block', caller
-      end
+      warn 'A Block is Needed' unless block_given?
+      Java::JavaLang::Thread.new(&block).start
     end
 
     # explicitly provide 'processing.org' min instance method
@@ -100,9 +99,9 @@ module Processing
     def dist(*args)
       case args.length
       when 4
-        return dist2d(*args)
+        dist2d(*args)
       when 6
-        return dist3d(*args)
+        dist3d(*args)
       else
         raise ArgumentError, 'takes 4 or 6 parameters'
       end
@@ -117,13 +116,13 @@ module Processing
     # Here's a convenient way to look for them.
     def find_method(method_name)
       reg = Regexp.new(method_name.to_s, true)
-      methods.sort.select { |meth| reg.match(meth) }
+      methods.sort.select { |meth| reg.match?(meth) }
     end
 
     # 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(key frameRate mousePressed keyPressed)
+      fields = %w[key frameRate mousePressed keyPressed]
       methods = fields.map { |field| java_class.declared_field(field) }
       @declared_fields = Hash[fields.zip(methods)]
     end
@@ -169,6 +168,7 @@ module Processing
     # frame_rate needs to support reading and writing
     def frame_rate(fps = nil)
       return @declared_fields['frameRate'].value(java_self) unless fps
+
       super(fps)
     end
 
@@ -184,19 +184,17 @@ module Processing
 
     private
 
-    FIXNUM_COL = -> (x) { x.is_a?(Integer) }
-    STRING_COL = -> (x) { x.is_a?(String) }
-    FLOAT_COL = -> (x) { x.is_a?(Float) }
     # parse single argument color int/double/String
-    def hex_color(a)
-      case a
-      when FIXNUM_COL
-        Java::Monkstone::ColorUtil.colorLong(a)
-      when STRING_COL
-        return Java::Monkstone::ColorUtil.colorString(a) if a =~ /#\h+/
-        raise StandardError, 'Dodgy Hexstring'
-      when FLOAT_COL
-        Java::Monkstone::ColorUtil.colorDouble(a)
+    def hex_color(arg)
+      case arg
+      when Integer
+        Java::Monkstone::ColorUtil.colorLong(arg)
+      when String
+        raise StandardError, 'Dodgy Hexstring' unless /#\h{6}$/.match?(arg)
+
+        Java::Monkstone::ColorUtil.colorString(arg)
+      when Float
+        Java::Monkstone::ColorUtil.colorDouble(arg)
       else
         raise StandardError, 'Dodgy Color Conversion'
       end
@@ -206,6 +204,7 @@ module Processing
       dx = args[0] - args[2]
       dy = args[1] - args[3]
       return 0 if dx.abs < EPSILON && dy.abs < EPSILON
+
       Math.hypot(dx, dy)
     end
 
@@ -214,6 +213,7 @@ module Processing
       dy = args[1] - args[4]
       dz = args[2] - args[5]
       return 0 if dx.abs < EPSILON && dy.abs < EPSILON && dz.abs < EPSILON
+
       Math.sqrt(dx * dx + dy * dy + dz * dz)
     end
   end

data/lib/jruby_art/helpers/aabb.rb

@@ -1,4 +1,5 @@
 # frozen_string_literal: true
+
 # Axis aligned bounding box class (AABB would clash with Toxicgem)
 class AaBb
   attr_reader :center, :extent
@@ -14,6 +15,7 @@ class AaBb
 
   def position(vec)
     return @center = vec unless block_given?
+
     @center = vec if yield
   end
 
@@ -24,6 +26,7 @@ class AaBb
   def contains?(vec)
     rad = extent * 0.5
     return false unless (center.x - rad.x..center.x + rad.x).cover? vec.x
+
     (center.y - rad.y..center.y + rad.y).cover? vec.y
   end
 end

data/lib/jruby_art/helpers/numeric.rb

@@ -1,4 +1,5 @@
 # frozen_string_literal: true
+
 # Re-open Numeric so that we can do simple degree and radian conversions
 # conversion factors are 180 / Math::PI and Math::PI / 180
 

data/lib/jruby_art/installer.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 require_relative 'config'
 require_relative 'processing_ide'
 
@@ -8,13 +10,14 @@ class Installer
   end
 
   def install
-    if processing_ide.installed?
-      config = Config.new(
-        'processing_ide' => true,
-        'library_path' => processing_ide.sketchbook_path)
-    else
-      config = Config.new('processing_ide' => false)
-    end
+    config = if processing_ide.installed?
+               Config.new(
+                 'processing_ide' => true,
+                 'library_path' => processing_ide.sketchbook_path
+               )
+             else
+               Config.new('processing_ide' => false)
+             end
     config.write_to_file
   end
 end

data/lib/jruby_art/java_opts.rb

@@ -1,4 +1,5 @@
 # frozen_string_literal: false
+
 # class to parse java_args.txt or java_args in config.yml
 class JavaOpts
   attr_reader :opts
@@ -8,6 +9,7 @@ class JavaOpts
     @opts = []
     @opts += File.read(arg_file).split(/\s+/) if FileTest.exist?(arg_file)
     return unless opts.empty? && Processing::RP_CONFIG.fetch('java_args', false)
+
     @opts += Processing::RP_CONFIG['java_args'].split(/\s+/)
   end
 end

data/lib/jruby_art/jruby_complete.rb

@@ -1,8 +1,10 @@
 # frozen_string_literal: true
+
 class JRubyComplete
   def self.complete
     rcomplete = File.join(K9_ROOT, 'lib/ruby/jruby-complete.jar')
     return [rcomplete] if FileTest.exist?(rcomplete)
+
     warn "#{rcomplete} does not exist\nTry running `k9 --install`"
     exit
   end

data/lib/jruby_art/launcher.rb

@@ -1,4 +1,5 @@
 # frozen_string_literal: true
+
 require_relative '../jruby_art/jruby_complete'
 require_relative '../jruby_art/java_opts'
 module Processing
@@ -32,10 +33,12 @@ end
 
 # Wrap creation of java command string as a class
 class JavaCommand
-  MAIN = 'org.jruby.Main'.freeze
+  MAIN = 'org.jruby.Main'
   attr_reader :runner, :args, :filename, :opts, :complete
   def initialize(runner, args, filename)
-    @runner, @args, @filename = runner, args, filename
+    @runner = runner
+    @args = args
+    @filename = filename
     @complete = JRubyComplete.complete
     @opts = JavaOpts.new.opts
   end
@@ -49,7 +52,9 @@ end
 class JRubyCommand
   attr_reader :runner, :args, :filename, :opts
   def initialize(runner, args, filename)
-    @runner, @args, @filename = runner, args, filename
+    @runner = runner
+    @args = args
+    @filename = filename
     @opts = JRubyOpts.new.opts
   end
 

data/lib/jruby_art/library.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 require_relative 'native_folder'
 require_relative 'native_loader'
 
@@ -17,71 +19,69 @@ class Library
   def locate
     return if (@path = Pathname.new(
       File.join(SKETCH_ROOT, 'library', name, "#{name}.rb")
-      )).exist?
-      return if (@path = Pathname.new(
-        File.join(K9_ROOT, 'library', name, "#{name}.rb")
-        )).exist?
-
-        locate_java
-      end
-
-      def locate_java
-        @dir = Pathname.new(
-          File.join(SKETCH_ROOT, 'library', name)
-        )
-        return @path = dir.join(Pathname.new("#{name}.jar")) if dir.directory?
-
-        locate_installed_java
-      end
-
-      def locate_installed_java
-        unless dir.directory?
-          if Processing::RP_CONFIG.fetch('processing_ide', false)
-            prefix = library_path
-            @dir = Pathname.new(
-              File.join(prefix, 'libraries', name, 'library')
-            )
-            @path = dir.join(Pathname.new("#{name}.jar"))
-          else
-            @dir = Pathname.new(
-              File.join(ENV['HOME'], '.jruby_art', 'libraries', name, 'library')
-            )
-          end
-          @path = dir.join(Pathname.new("#{name}.jar"))
-        end
-      end
-
-      def library_path
-        Processing::RP_CONFIG.fetch('library_path', "#{ENV['HOME']}/.jruby_art")
-      end
-
-      def ruby?
-        path.extname == '.rb'
-      end
-
-      def exist?
-        path.exist?
-      end
-
-      def load_jars
-        Dir.glob("#{dir}/*.jar").each do |jar|
-          require jar
-        end
-        return unless native_binaries?
-
-        add_binaries_to_classpath
-      end
-
-      def native_binaries?
-        native_folder = NativeFolder.new
-        native = native_folder.name
-        @ppath = File.join(dir, native)
-        File.directory?(ppath) &&
-        !Dir.glob(File.join(ppath, native_folder.extension)).empty?
-      end
-
-      def add_binaries_to_classpath
-        native_loader = NativeLoader.new
-        native_loader.add_native_path(ppath)
-      end
+    )).exist?
+    return if (@path = Pathname.new(
+      File.join(K9_ROOT, 'library', name, "#{name}.rb")
+    )).exist?
+
+    locate_java
+  end
+
+  def locate_java
+    @dir = Pathname.new(
+      File.join(SKETCH_ROOT, 'library', name)
+    )
+    return @path = dir.join(Pathname.new("#{name}.jar")) if dir.directory?
+
+    locate_installed_java
+  end
+
+  def locate_installed_java
+    return if dir.directory?
+
+    if Processing::RP_CONFIG.fetch('processing_ide', false)
+      prefix = library_path
+      @dir = Pathname.new(File.join(prefix, 'libraries', name, 'library'))
+      @path = dir.join(Pathname.new("#{name}.jar"))
+    else
+      @dir = Pathname.new(
+        File.join(ENV['HOME'], '.jruby_art', 'libraries', name, 'library')
+      )
+    end
+    @path = dir.join(Pathname.new("#{name}.jar"))
+  end
+
+  def library_path
+    Processing::RP_CONFIG.fetch('library_path', "#{ENV['HOME']}/.jruby_art")
+  end
+
+  def ruby?
+    path.extname == '.rb'
+  end
+
+  def exist?
+    path.exist?
+  end
+
+  def load_jars
+    Dir.glob("#{dir}/*.jar").sort.each do |jar|
+      require jar
     end
+    return unless native_binaries?
+
+    add_binaries_to_classpath
+  end
+
+  def native_binaries?
+    native_folder = NativeFolder.new
+    native = native_folder.name
+    @ppath = File.join(dir, native)
+    File.directory?(ppath) &&
+      !Dir.glob(File.join(ppath, native_folder.extension)).empty?
+  end
+
+  def add_binaries_to_classpath
+    native_loader = NativeLoader.new
+    native_loader.add_native_path(ppath)
+  end
+end