jruby_art 1.4.9 → 1.5.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 62f15748c8f15285baedba615bed165bebb679f8a5b21e647de315a9aaf0f174
-  data.tar.gz: 7bb82b8017f5634a7e5f5a94ec437de06e1c86e103cbc9ec49fd5e5012d5e4ca
+  metadata.gz: 20966364c7191224c052ca9a3e34198ef198f18b166a57d302a2d950c5c05f83
+  data.tar.gz: 6ec471e3fa76fcf4e7aae579cd41a5c43cf510a2d1531ddc1e152a6d27dc3f76
 SHA512:
-  metadata.gz: 5f08212b86eac0deaed68e92299203d96d92c5726aa0e52bafd492590d91188bdd997ec9d17616f8206cc763786954c38bc66bb417f95655cacb98a3535b51a9
-  data.tar.gz: f9cae8415421790555f8c8b835fda74a350ef04723100b0dd052c52a558847c6b0573fa4b18922eb8e576c247c96b29aa5c57dc05744e8cd5ecc1477db33fb86
+  metadata.gz: 19d6a6521b7b101c4f0c5df0c21197eb9d72cf2ebe05c7984e03f407b05c57a0603b07df892788c40721db9dd053dcb34008954c2d4f95d41557235c1da19f29
+  data.tar.gz: 710e0d2063719445c20558c14feb8dac182cfaa8601b4bde4945600156ef497336086e08f5d124cae11d5ddc99eb50860376ab5cf117e0dc30ec10e17a8fb637

data/lib/jruby_art/config.rb

@@ -29,10 +29,11 @@ module Processing
       detect_os = RbConfig::CONFIG['host_os']
       case detect_os
       when /mac|darwin/ then :mac
+      when /gnueabihf/ then :arm 
       when /linux/ then :linux
       when /solaris|bsd/ then :unix
       else
-        WIN_PATTERNS.find { |reg| detect_os =~ reg }
+        WIN_PATTERNS.find { |reg| reg.match?(detect_os) }
         raise "unsupported os: #{detect_os.inspect}" if Regexp.last_match.nil?
         :windows
       end

data/lib/jruby_art/creators/sketch_writer.rb

@@ -117,6 +117,6 @@ class EmacsSketch < Sketch
     ]
     lines.concat class_methods
     lines << BLANK
-    lines << format('%s.new unless defined? $app', param.class_name)
+    lines << format('%s.new if Processing.app.nil?', param.class_name)
   end
 end

data/lib/jruby_art/installer.rb

@@ -21,8 +21,11 @@ class Installer
     Dir.mkdir(folder) unless File.exist? folder
     path = File.join(folder, 'config.yml')
     proot = "#{HOME}/processing-#{VERSION}"
+    proot = "/usr/local/lib/processing-#{VERSION}" if os == :arm
     proot = "/Java/Processing-#{VERSION}" if os == :windows
     proot = '/Applications/Processing.app/Contents/Java' if os == :mac
+    jruby = true
+    jruby = false if os == :arm
     settings = %w[
       PROCESSING_ROOT JRUBY sketchbook_path template MAX_WATCH sketch_title width height
     ]

data/lib/jruby_art/native_folder.rb

@@ -1,11 +1,14 @@
 require 'rbconfig'
 
 # Utility to load native binaries on Java CLASSPATH
+# HACK until jruby returns a more specific 'host_os' than 'linux'
 class NativeFolder
   attr_reader :os, :bit
 
+  LINUX_FORMAT = 'linux%s'.freeze
+  ARM32 = '-armv6hf'.freeze
+  # ARM64 = '-aarch64'.freeze
   WIN_FORMAT = 'windows%d'.freeze
-  LINUX_FORMAT = 'linux%d'.freeze
   WIN_PATTERNS = [
     /bccwin/i,
     /cygwin/i,
@@ -17,18 +20,25 @@ class NativeFolder
 
   def initialize
     @os = RbConfig::CONFIG['host_os'].downcase
-    @bit = java.lang.System.get_property('os.arch') =~ /64/ ? 64 : 32
+    @bit = java.lang.System.get_property('os.arch')
   end
 
   def name
-    return 'macosx' if os =~ /darwin/ || os =~ /mac/
-    return format(WIN_FORMAT, bit) if WIN_PATTERNS.any? { |pat| pat =~ os }
-    return format(LINUX_FORMAT, bit) if os =~ /linux/
+    return 'macosx' if /darwin|mac/.match?(os)
+    if /linux/.match?(os)
+      return format(LINUX_FORMAT, '64') if /amd64/.match?(bit)
+      return format(LINUX_FORMAT, ARM32) if /arm/.match?(bit)
+    end
+    if WIN_PATTERNS.any? { |pat| pat.match?(os) }
+      return format(WINDOWS_FORMAT, '64') if /64/.match?(bit)
+      return format(WINDOWS_FORMAT, '32') if /32/.match?(bit)
+    end
+    raise 'Unsupported Architecture'
   end
 
   def extension
-    return '*.so' if os =~ /linux/
-    return '*.dll' if WIN_PATTERNS.any? { |pat| pat =~ os }
+    return '*.so' if /linux/.match?(os)
+    return '*.dll' if WIN_PATTERNS.any? { |pat| pat.match?(os) }
     '*.dylib' # MacOS
   end
-end
+end

data/lib/jruby_art/version.rb

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

data/library/control_panel/control_panel.rb

@@ -15,7 +15,8 @@ module ControlPanel
       mx = range.end
       mx = range.max if range.exclude_end? && range.begin.respond_to?(:succ)
       max = mx * 100
-      super(min, max)
+      val = range.cover?(initial) ? initial * 100 : (range.first + range.last) * 50
+      super(min, max, val)
       set_minor_tick_spacing((max - min).abs / 10)
       set_paint_ticks true
       # paint_labels = true
@@ -26,8 +27,6 @@ module ControlPanel
         ControlPanel.app_value(name, value)
         proc.call(value) if proc
       end
-      val = initial.nil? ? (range.first + range.last) * 50 : initial * 100
-      set_value(val)
       ControlPanel.app_value(name, val)
     end
 

data/vendors/Rakefile

@@ -9,7 +9,7 @@ WARNING = <<-EOS.freeze
 EOS
 
 
-JRUBYC_VERSION     = '9.1.17.0'
+JRUBYC_VERSION     = '9.2.0.0'
 
 EXAMPLES           = '3.1'
 HOME_DIR = ENV['HOME']
@@ -29,7 +29,7 @@ file "jruby-complete-#{JRUBYC_VERSION}.jar" do
   rescue
     warn(WARNING)
   end
-  check_sha256("jruby-complete-#{JRUBYC_VERSION}.jar", "bdf1a7ca08161d42262b3dad5888ba6fecaf9a2da7ff9170489224f3525cb457")
+  check_sha256("jruby-complete-#{JRUBYC_VERSION}.jar", "0db6726861b57e927c3a49725c30278795434c8b27a4520013efb4aabdc59def")
 end
 
 directory "../lib/ruby"

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: jruby_art
 version: !ruby/object:Gem::Version
-  version: 1.4.9
+  version: 1.5.0
 platform: ruby
 authors:
 - Jeremy Ashkenas
@@ -10,7 +10,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2018-04-23 00:00:00.000000000 Z
+date: 2018-05-31 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rake