jruby_art 1.4.1 → 1.4.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 3f5a2a6e4f71fa4b9b431e90623c6813bd8f3c43
-  data.tar.gz: 138573a28fe79c3982c22452369a6379cd77943c
+  metadata.gz: 9400df7764b3a1c10982e7080abd20efaca7a14d
+  data.tar.gz: 73c2580b54abc99a05fd7eb8e2ed8b37bba06e1a
 SHA512:
-  metadata.gz: e167c2fbcb36d8bceba43f6c04ae2f6c0ed5acb4f212435800ca8b3f2e2383a75f051ba07e2deca202b845824f15c7a20169f783f3bdbaa886e35416be1f16b6
-  data.tar.gz: 880b701d19c4235ae7b862069912c2187df92c1f7230c3168b02219467dbec018793a777a9d894c1dec5d713f7317c65733e51d49257635183c8c8e17ce92493
+  metadata.gz: 46276f2ee3ad45d580f2ae3448ddb562780d4564b18f53eb75b22a9ccbc4504f039bf5562c7b2a51d7dd8530a0e25740ec12f40e0cc91fb47ebd16ac8a1351a1
+  data.tar.gz: 7736cb0f6bd17a9b6c836854b8d84f244ccdb02729c5fd106b8727257735e39e5d87d73ab60179b118ee0a88c79f3fabf9088c8e70e698405df656476f47e601

data/lib/jruby_art/installer.rb

@@ -1,33 +1,37 @@
 # frozen_string_literal: false
-require 'yaml'
 
+require 'yaml'
 VERSION = '3.3.6'.freeze # processing version
-
+HOME = ENV['HOME']
 # Abstract Installer class
 class Installer
   attr_reader :os, :sketch, :gem_root, :confd
   def initialize(root, os)
     @os = os
     @gem_root = root
-    @sketch = "#{ENV['HOME']}/sketchbook" if os == :linux
-    @sketch = "#{ENV['HOME']}/My Documents/Processing" if os == :windows
-    @sketch = "#{ENV['HOME']}/Documents/Processing" if os == :mac
-    @confd = "#{ENV['HOME']}/.jruby_art"
+    @sketch = "#{HOME}/sketchbook" if os == :linux
+    @sketch = "#{HOME}/My Documents/Processing" if os == :windows
+    @sketch = "#{HOME}/Documents/Processing" if os == :mac
+    @confd = "#{HOME}/.jruby_art"
   end
 
   # Optimistically set processing root
   def set_processing_root
-    folder = "#{ENV['HOME']}/.jruby_art"
+    folder = "#{HOME}/.jruby_art"
     Dir.mkdir(folder) unless File.exist? folder
     path = File.join(folder, 'config.yml')
-    proot = "#{ENV['HOME']}/processing-#{VERSION}"
+    proot = "#{HOME}/processing-#{VERSION}"
     proot = "/Java/Processing-#{VERSION}" if os == :windows
-    proot = "/Applications/Processing.app/Contents/Java" if os == :mac
-    settings = %w(PROCESSING_ROOT JRUBY sketchbook_path template MAX_WATCH sketch_title width height)
-    values = [proot, true, sketch, 'bare', 32, 'JRubyArt Static Sketch', 600, 600]
+    proot = '/Applications/Processing.app/Contents/Java' if os == :mac
+    settings = %w[
+      PROCESSING_ROOT JRUBY sketchbook_path template MAX_WATCH sketch_title width height
+    ]
+    values = [
+      proot, true, sketch, 'bare', 32, 'JRubyArt Static Sketch', 600, 600
+    ]
     data = settings.zip(values).to_h
     open(path, 'w:UTF-8') { |file| file.write(data.to_yaml) }
-    warn 'PROCESSING_ROOT set optimistically, run check to confirm' 
+    warn 'PROCESSING_ROOT set optimistically, run check to confirm'
   end
 
   def root_exist?

data/lib/jruby_art/native_folder.rb

@@ -4,8 +4,8 @@ require 'rbconfig'
 class NativeFolder
   attr_reader :os, :bit
 
-  WIN_FORMAT = 'windows%d'
-  LINUX_FORMAT = 'linux%d'
+  WIN_FORMAT = 'windows%d'.freeze
+  LINUX_FORMAT = 'linux%d'.freeze
   WIN_PATTERNS = [
     /bccwin/i,
     /cygwin/i,
@@ -22,13 +22,13 @@ class NativeFolder
 
   def name
     return 'macosx' if os =~ /darwin/ || os =~ /mac/
-    return format(WIN_FORMAT, bit) if WIN_PATTERNS.include? os
+    return format(WIN_FORMAT, bit) if WIN_PATTERNS.any? { |pat| pat =~ os }
     return format(LINUX_FORMAT, bit) if os =~ /linux/
   end
 
   def extension
     return '*.so' if os =~ /linux/
-    return '*.dll' if WIN_PATTERNS.include? os
+    return '*.dll' if WIN_PATTERNS.any? { |pat| pat =~ os }
     '*.dylib' # MacOS
   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.1'.freeze
+  VERSION = '1.4.2'.freeze
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: jruby_art
 version: !ruby/object:Gem::Version
-  version: 1.4.1
+  version: 1.4.2
 platform: ruby
 authors:
 - Jeremy Ashkenas
@@ -10,7 +10,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2017-09-07 00:00:00.000000000 Z
+date: 2017-09-13 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rake