rubocop corrections

Author: monkstone

lib/jruby_art/app.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 require 'java'
 require_relative '../jruby_art'
 Dir["#{K9_ROOT}/lib/*.jar"].each do |jar|
@@ -10,7 +12,6 @@
 
 # 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 @@ def initialize(options = {})
         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
@@ -214,7 +215,7 @@ def respond_to_missing?(name, include_private = false)
 
     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

lib/jruby_art/config.rb

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

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
@@ -19,6 +20,7 @@ def sketch_title
   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
@@ -71,6 +73,7 @@ def method_lines(name, content, indent)
     two = content.empty? ? BLANK : format('  %s%s', indent, content)
     three = format('%send', indent)
     return [one, two, three] if /draw/ =~ name
+
     [one, two, three, BLANK]
   end
 end

lib/jruby_art/default_config.rb

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

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 @@ def hsb_color(hue, sat, brightness)
 
     def color(*args)
       return super(*args) unless args.length == 1
+
       super(hex_color(args[0]))
     end
 
@@ -61,7 +63,7 @@ def web_to_color_array(web)
     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
 
@@ -100,9 +102,9 @@ def max(*args)
     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
@@ -123,7 +125,7 @@ def find_method(method_name)
     # 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 +171,7 @@ def save_strings(filename, strings)
     # 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,16 +187,17 @@ def key_pressed?
 
     private
 
-    FIXNUM_COL = -> (x) { x.is_a?(Integer) }
-    STRING_COL = -> (x) { x.is_a?(String) }
-    FLOAT_COL = -> (x) { x.is_a?(Float) }
+    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)
@@ -206,6 +210,7 @@ def dist2d(*args)
       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 +219,7 @@ def dist3d(*args)
       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

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 @@ def self.from_min_max(min:, max:)
 
   def position(vec)
     return @center = vec unless block_given?
+
     @center = vec if yield
   end
 
@@ -24,6 +26,7 @@ def scale(d)
   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

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
 

lib/jruby_art/installer.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 require_relative 'config'
 require_relative 'processing_ide'
 
@@ -8,13 +10,14 @@ def initialize
   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

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 @@ def initialize
     @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

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