jruby_art 1.2.9 → 1.3.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 5a546d2ddb8d8bec07eff66933fe94a58a9b4bfe
-  data.tar.gz: 9169d2704cedb767444c204c364bcc679667bf51
+  metadata.gz: 292fae4f648b4f0327554d767cdd4640402a16c8
+  data.tar.gz: 8110acac7375c71c172b7874fa1de38ac107bfc5
 SHA512:
-  metadata.gz: 4c30db2ffa7956684c7c526f68bef2e7f0ed120a231d64d3fafae2700e0169f6f366f8ae3a805ed4a8406cfcf416ed6be3a28afaebaacd7bf547d0e6d8c3af48
-  data.tar.gz: 07be0723e66c76b74dc982040ea2baa2e5711d3a430650bc09fde36f8cbd73492f53950321eae41071ffa109c2349d20cc93342b72e5b24f4fb4545c19d6ce27
+  metadata.gz: b722c4cc150a52923b144b3dbc6397bc79a66fdeaf3233c51f991d4e61a6308202aa16a0f28cc907edb35e6e4c3f5982a64f430e9a7d921cd0a1481344607427
+  data.tar.gz: 74a19e1bd0f7495b176073a9e5d857c56b0b2aae464e8d46180f69d9e2a6f60ac5e334f591d4bb4896becf9c423b81cbc5f343a99bf9619f9dd31b17ce2fe1e3

data/lib/jruby_art/core.rb

@@ -0,0 +1,15 @@
+# frozen_string_literal: true
+# module encapsulates a check that the PROCESSING_ROOT exists
+module Core
+  def self.check?(path)
+    if File.directory?(path)
+      core_path = File.join(path, 'core/library/core.jar')
+      return true if File.exist?(core_path)
+      warn format('%s jar does not exist', core_path)
+    else warn format('%s directory does not exist', path)
+    end
+  end
+end
+
+# Provided processing distributions have the same nested structure ie:-
+# "core/library/core.jar" we can find "core.jar" when PROCESSING_ROOT exists

data/lib/jruby_art/creators/sketch_writer.rb

@@ -33,8 +33,7 @@ class SketchWriter
   end
 
   def write
-    template = SketchTemplate.template
-    sketch = template.code(param)
+    sketch = SketchFactory.create(param)
     File.open(file, 'w+') { |f| f.write sketch.join("\n") }
   end
 end
@@ -42,19 +41,26 @@ end
 # Implements methods and class_methods omits blank line after draw
 # uses private method_lines to format method lines
 class Sketch
+  attr_reader :param
+
+  def initialize(param)
+    @param = param
+    self
+  end
+
   BLANK ||= ''.freeze
   INDENT ||= '  '.freeze
 
-  def methods(param, indent)
+  def methods(indent)
     lines = []
     lines.concat method_lines('settings', param.sketch_size, indent)
     lines.concat method_lines('setup', param.sketch_title, indent)
     lines.concat method_lines('draw', BLANK, indent)
   end
 
-  def class_methods(param)
+  def class_methods
     lines = [format('class %s < Processing::App', param.class_name)]
-    lines.concat methods(param, INDENT)
+    lines.concat methods(INDENT)
     lines << 'end'
   end
 
@@ -70,37 +76,37 @@ class Sketch
 end
 
 # Switch templates on config
-class SketchTemplate
-  def self.template
+class SketchFactory
+  def self.create(param)
     case Processing::RP_CONFIG.fetch('template', 'bare')
     when /bare/
-      return BareSketch.new
+      BareSketch
     when /class/
-      return ClassSketch.new
+      ClassSketch
     when /emacs/
-      return EmacsSketch.new
-    end
+      EmacsSketch
+    end.new(param).code
   end
 end
 
 # The sketch class creates an array of formatted sketch lines
 class BareSketch < Sketch
-  def code(param)
-    methods(param, BLANK)
+  def code
+    methods(BLANK)
   end
 end
 
 # A simple class wrapped sketch
 class ClassSketch < Sketch
-  def code(param)
+  def code
     lines = ['# frozen_string_literal: false', BLANK]
-    lines.concat class_methods(param)
+    lines.concat class_methods
   end
 end
 
 # A sketch that will run with jruby, for emacs etc
 class EmacsSketch < Sketch
-  def code(param)
+  def code
     lines = [
       '# frozen_string_literal: false',
       "require 'jruby_art'",
@@ -109,7 +115,7 @@ class EmacsSketch < Sketch
       'Processing::App::SKETCH_PATH = __FILE__.freeze',
       BLANK
     ]
-    lines.concat class_methods(param)
+    lines.concat class_methods
     lines << BLANK
     lines << format('%s.new unless defined? $app', param.class_name)
   end

data/lib/jruby_art/helper_methods.rb

@@ -76,16 +76,19 @@ module Processing
 
     # explicitly provide 'processing.org' min instance method
     # to return a float:- a, b and c need to be floats
+    # you might choose to use ruby method directly and then
+    # provide a block to alter comparator eg
+    # args.min(&block) # { |a, b| a.value <=> b.value }
 
     def min(*args)
-      args.min # { |a,b| a <=> b } optional block not reqd
+      args.min
     end
 
     # explicitly provide 'processing.org' max instance method
-    # to return a float:- a, b and c need to be floats
+    # to return a float:- a, b and c need to be floats see above
 
     def max(*args)
-      args.max # { |a, b| a <=> b } optional block not reqd
+      args.max
     end
 
     # explicitly provide 'processing.org' dist instance method

data/lib/jruby_art/installer.rb

@@ -31,8 +31,7 @@ class Installer
   end
 
   def root_exist?
-    return false if config.empty?
-    File.exist? config['PROCESSING_ROOT']
+    Core.check?(config['PROCESSING_ROOT'])
   end
 
   def config
@@ -55,12 +54,13 @@ end
 
 # Configuration checker
 class Check < Installer
+  require_relative 'core' 
   def install
     show_version
     return super unless config
     installed = File.exist? File.join(gem_root, 'lib/ruby/jruby-complete.jar')
-    proot = '  PROCESSING_ROOT = Not Set!!!' unless root_exist?
-    proot ||= "  PROCESSING_ROOT = #{config['PROCESSING_ROOT']}"
+    proot = '  PROCESSING_ROOT = Not Set Correctly!!!' unless root_exist?
+    proot ||= "  PROCESSING_ROOT = #{config['PROCESSING_ROOT']}"    
     sketchbook = "  sketchbook_path = #{config['sketchbook_path']}"
     template = "  template = #{config['template']}"
     java_args = "  java_args = #{config['java_args']}"

data/lib/jruby_art/java_opts.rb

@@ -3,13 +3,12 @@
 class JavaOpts
   attr_reader :opts
 
-  def initialize(sketch_root)
-    arg_file = File.join(sketch_root, 'data/java_args.txt')
+  def initialize
+    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
+    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/launcher.rb

@@ -5,11 +5,13 @@ module Processing
   # The command class check for configuration and options, before creating and
   # executing the jruby (or java) command to run the sketch
   class Launcher
-    attr_reader :runner, :args, :filename
+    attr_reader :command
     def initialize(runner:, args:, filename:)
-      @runner = runner
-      @args = args
-      @filename = filename
+      @command = if Processing::RP_CONFIG.fetch('JRUBY', true)
+                   JRubyCommand.new(runner, filename, args)
+                 else
+                   JavaCommand.new(runner, filename, args)
+                 end
     end
 
     # Trade in this Ruby instance for a JRuby instance, loading in a starter
@@ -17,25 +19,41 @@ module Processing
     # ~/.jruby_art/config.yml, an installed version of jruby is used instead
     # of our vendored one. Note the use of jruby-complete might make using
     # other gems in your sketches hard (but not impossible)....
-    def cmd(root)
-      cmda = jruby_command(root)
+    def cmd
+      cmda = command.cmd
       begin
         exec(*cmda)
         # exec replaces the Ruby process with the JRuby one.
       rescue Java::JavaLang::ClassNotFoundException
       end
     end
+  end
+end
 
-    private
+# Wrap creation of java command string as a class
+class JavaCommand
+  MAIN = 'org.jruby.Main'.freeze
+  attr_reader :runner, :args, :filename, :opts, :complete
+  def initialize(runner, args, filename)
+    @runner, @args, @filename = runner, args, filename
+    @complete = JRubyComplete.complete
+    @opts = JavaOpts.new.opts
+  end
 
-    # avoiding multiline ternary etc
-    def jruby_command(root)
-      installed = Processing::RP_CONFIG.fetch('JRUBY', true)
-      opts = JRubyOpts.new(root).opts
-      return ['jruby', opts, runner, filename, args].flatten if installed
-      opts = JavaOpts.new(root).opts
-      complete = JRubyComplete.complete
-      ['java', opts, '-cp', complete, 'org.jruby.Main', runner, filename, args].flatten
-    end
+  def cmd
+    ['java', opts, '-cp', complete, MAIN, runner, filename, args].flatten
+  end
+end
+
+# Wrap creation of jruby command string as a class
+class JRubyCommand
+  attr_reader :runner, :args, :filename, :opts
+  def initialize(runner, args, filename)
+    @runner, @args, @filename = runner, args, filename
+    @opts = JRubyOpts.new.opts
+  end
+
+  def cmd
+    ['jruby', opts, runner, filename, args].flatten
   end
 end

data/lib/jruby_art/runner.rb

@@ -166,7 +166,7 @@ module Processing
         args: argc,
         filename: filename
       )
-      launch.cmd(SKETCH_ROOT)
+      launch.cmd
     end
 
     # NB: We really do mean to use 'and' not '&&' for flow control purposes

data/lib/jruby_art/version.rb

@@ -1,5 +1,5 @@
 # frozen_string_literal: true
 # A wrapper for version
 module JRubyArt
-  VERSION = '1.2.9'.freeze
+  VERSION = '1.3.0'.freeze
 end

data/vendors/Rakefile

@@ -8,8 +8,8 @@ WARNING = <<-EOS.freeze
 
 EOS
 
-JRUBYC_VERSION     = '9.1.7.0'
-EXAMPLES           = '2.0'
+JRUBYC_VERSION     = '9.1.8.0'
+EXAMPLES           = '2.1'
 HOME_DIR = ENV['HOME']
 MAC_OR_LINUX = /linux|mac|darwin/ =~ RbConfig::CONFIG['host_os']
 
@@ -27,7 +27,7 @@ file "jruby-complete-#{JRUBYC_VERSION}.jar" do
   rescue
     warn(WARNING)
   end
-  check_sha256("jruby-complete-#{JRUBYC_VERSION}.jar", "62983e2b6360005a65931b1cd5a5b50aa97168407feb29410454e658204521de")
+  check_sha256("jruby-complete-#{JRUBYC_VERSION}.jar", "f4552ce55ac6700ad51dc1dce8a3a0b8153cbe9b885006e039a98b558f77e551")
 end
 
 directory "../lib/ruby"

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: jruby_art
 version: !ruby/object:Gem::Version
-  version: 1.2.9
+  version: 1.3.0
 platform: ruby
 authors:
 - Jeremy Ashkenas
@@ -10,7 +10,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2017-02-14 00:00:00.000000000 Z
+date: 2017-03-07 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rake
@@ -53,6 +53,7 @@ files:
 - lib/jruby_art.rb
 - lib/jruby_art/app.rb
 - lib/jruby_art/config.rb
+- lib/jruby_art/core.rb
 - lib/jruby_art/creators/sketch_writer.rb
 - lib/jruby_art/helper_methods.rb
 - lib/jruby_art/helpers/aabb.rb