jruby_art 1.6.2 → 1.6.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 443300fba760cfb50be5e64c0d6a0a0ff31189822f994d587f3ba0208850228c
-  data.tar.gz: 4517ebb6f1340100d8e176c43b071658c2c729966074736a733ef5e006549317
+  metadata.gz: d3fce16d7ae699cd0405549cb031efa21dbf2e417edb1f775241eb295bd85c6a
+  data.tar.gz: 7791e73a66dcbfb6d49822263eeafd9d4329509a6d10608f2e7da8d884335411
 SHA512:
-  metadata.gz: 6b7308d84b502727eba4abc7e593e8359794ea1837aea4f527497af9d9b34fdd318289879ea235c48220c8a8df125d275b9463f91244e99572404763435340ca
-  data.tar.gz: 99fdc0eb2718da4cc5b78055e579713e5eee308974aa59c9c3926b3d554aff9e7635ef72c6ffef9f401afccee14e6a09f895aef634a404af6f2de5c753f3d30a
+  metadata.gz: e9874edf4dd007634b58e6c6027175360c1752d9107f6bc615f2ec3b41bb370d9b3c0c967b3bc1a1541961947e50f0cb1b2ef002f4fe1d177f28821bc01e0792
+  data.tar.gz: 1909fba27f21f5da2ebcbf799e3e16e2edb28fc9fc8ee0cb277654462414bcc7aa00bc0a4154b3900eaff2c8662d35d06d97d88dc93f7bf5f39b3a0f0d141059

data/lib/jruby_art/installer.rb

@@ -1,7 +1,7 @@
 # frozen_string_literal: false
 
 require 'yaml'
-VERSION = '3.4'.freeze # processing version
+VERSION = '3.5.3'.freeze # processing version
 HOME = ENV['HOME']
 # Abstract Installer class
 class Installer

data/lib/jruby_art/runner.rb

@@ -151,7 +151,12 @@ module Processing
     end
 
     def show_version
-      puts format('JRubyArt version %s', JRubyArt::VERSION)
+      require 'erb'
+      template = ERB.new <<-EOF
+        JRubyArt version <%= JRubyArt::VERSION %>
+        Ruby version <%= RUBY_VERSION %>
+      EOF
+      puts template.result(binding)
     end
 
     private

data/lib/jruby_art/version.rb

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

data/library/slider/slider.rb

@@ -1,6 +1,6 @@
 # frozen_string_literal: true
 # Here's a little library for quickly hooking up in sketch sliders.
-# Copyright (c) 2016-18 Martin Prout.
+# Copyright (c) 2016-19 Martin Prout.
 
 java_import 'monkstone.slider.CustomHorizontalSlider'
 java_import 'monkstone.slider.CustomVerticalSlider'

data/vendors/Rakefile

@@ -1,17 +1,16 @@
 require 'rake/clean'
 
-WARNING = <<-EOS.freeze
+WARNING = <<-WARN.freeze
    WARNING: you may not have wget installed, you could just download
    the correct version of jruby-complete to the vendors folder, and
    re-run k9 setup install instead of installing wget. Some systems
    may also require 'sudo' access to install, NB: this is untested....
 
-EOS
+WARN
 
+JRUBYC_VERSION     = '9.2.6.0'.freeze
 
-JRUBYC_VERSION     = '9.2.4.0'
-
-EXAMPLES           = '3.2'
+EXAMPLES           = '3.2'.freeze
 HOME_DIR = ENV['HOME']
 MAC_OR_LINUX = /linux|mac|darwin/ =~ RbConfig::CONFIG['host_os']
 
@@ -26,14 +25,14 @@ file "jruby-complete-#{JRUBYC_VERSION}.jar.sha256" do
   end
 end
 
-desc "get sha256"
-task :get_sha256 => ["jruby-complete-#{JRUBYC_VERSION}.jar.sha256"]
+desc 'get sha256'
+task get_sha256: ["jruby-complete-#{JRUBYC_VERSION}.jar.sha256"]
 
-desc "download, and copy to jruby_art"
-task :default => [:get_sha256, :download, :copy_ruby]
+desc 'download, and copy to jruby_art'
+task default: %i[get_sha256 download copy_ruby]
 
-desc "download JRuby upstream sources"
-task :download => ["jruby-complete-#{JRUBYC_VERSION}.jar"]
+desc 'download JRuby upstream sources'
+task download: ["jruby-complete-#{JRUBYC_VERSION}.jar"]
 
 file "jruby-complete-#{JRUBYC_VERSION}.jar" do
   begin
@@ -41,36 +40,36 @@ file "jruby-complete-#{JRUBYC_VERSION}.jar" do
   rescue
     warn(WARNING)
   end
-  value=File.read("jruby-complete-#{JRUBYC_VERSION}.jar.sha256")
+  value = File.read("jruby-complete-#{JRUBYC_VERSION}.jar.sha256")
   check_sha256("jruby-complete-#{JRUBYC_VERSION}.jar", value)
 end
 
-directory "../lib/ruby"
+directory '../lib/ruby'
 
-desc "copy jruby-complete"
-task :copy_ruby => ["../lib/ruby"] do
+desc 'copy jruby-complete'
+task copy_ruby: ['../lib/ruby'] do
   sh "cp -v jruby-complete-#{JRUBYC_VERSION}.jar ../lib/ruby/jruby-complete.jar"
 end
 
 def check_sha256(filename, expected_hash)
-  require "digest"
+  require 'digest'
   sha256 = Digest::SHA256.new
-  File.open(filename, "r") do |f|
-    while buf = f.read(4096)
+  File.open(filename, 'r') do |f|
+    while (buf = f.read(4096))
       sha256.update(buf)
     end
   end
-  if sha256.hexdigest != expected_hash
-    raise "bad sha256 checksum for #{filename} (expected #{expected_hash} got #{sha256.hexdigest})"
-  end
+  next if sha256.hexdigest == expected_hash
+
+  raise "bad sha256 checksum for #{filename} (expected #{expected_hash} got #{sha256.hexdigest})"
 end
 
-desc "download, and copy to jruby_art"
-task :unpack_samples => [:download_examples, :copy_examples]
+desc 'download, and copy to jruby_art'
+task unpack_samples: %i[download_examples copy_examples]
 
 desc 'download and copy examples to user home'
 task :download_examples
-file_name = (MAC_OR_LINUX.nil?) ? "#{EXAMPLES}.zip" : "#{EXAMPLES}.tar.gz"
+file_name = MAC_OR_LINUX.nil? ? "#{EXAMPLES}.zip" : "#{EXAMPLES}.tar.gz"
 file file_name do
   begin
     if MAC_OR_LINUX.nil?
@@ -83,8 +82,8 @@ file file_name do
   end
 end
 
-desc "copy examples"
-task :copy_examples => file_name do
+desc 'copy examples'
+task copy_examples: file_name do
   if MAC_OR_LINUX.nil?
     sh "unzip #{EXAMPLES}.zip"
   else

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: jruby_art
 version: !ruby/object:Gem::Version
-  version: 1.6.2
+  version: 1.6.3
 platform: ruby
 authors:
 - Jeremy Ashkenas
@@ -10,7 +10,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2018-11-16 00:00:00.000000000 Z
+date: 2019-02-12 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rake
@@ -107,8 +107,7 @@ requirements:
 - A decent graphics card
 - java runtime >= 1.8.0_171+
 - processing = 3.4
-rubyforge_project: 
-rubygems_version: 2.7.8
+rubygems_version: 3.0.1
 signing_key: 
 specification_version: 4
 summary: Code as Art, Art as Code. Processing and Ruby are meant for each other.