Refactor Sketchbook and OS

Author: monkstone

lib/jruby_art/app.rb

@@ -93,9 +93,10 @@ def library_loaded?(library_name)
     # Options are no longer relevant, define post_initialize method to use
     # custom options (see Sandi Metz POODR)
 
-    def initialize
+    def initialize(options = {})
       super()
       $app = self
+      post_initialize(options)
       proxy_java_fields
       mix_proxy_into_inner_classes
       java.lang.Thread.default_uncaught_exception_handler = proc do |_thread_, exception|

lib/jruby_art/config.rb

@@ -13,4 +13,42 @@ module Processing
       warn(format('WARN: you need to set PROCESSING_ROOT in %s', config_path))
     end
   end
+
+  WIN_PATTERNS = [
+    /bccwin/i,
+    /cygwin/i,
+    /djgpp/i,
+    /ming/i,
+    /mswin/i,
+    /wince/i
+  ].freeze
+
+  # This class knows about supported JRubyArt operating systems
+  class HostOS
+    def self.os
+      detect_os = RbConfig::CONFIG['host_os']
+      case detect_os
+      when /mac|darwin/ then :mac
+      when /linux/ then :linux
+      when /solaris|bsd/ then :unix
+      else
+        WIN_PATTERNS.find { |reg| detect_os =~ reg }
+        raise "unsupported os: #{detect_os.inspect}" if Regexp.last_match.nil?
+        :windows
+      end
+    end
+  end
+
+  OS ||= HostOS.os
+end
+
+# This class encapulates knowledge of processing sketchbook structure
+class Sketchbook
+  def self.path
+    File.join(Processing::RP_CONFIG['sketchbook_path'], 'libraries')
+  end
+
+  def self.library(name)
+    Dir["#{path}/#{name}/library/\*.jar"]
+  end
 end

lib/jruby_art/library_loader.rb

@@ -109,7 +109,7 @@ def get_library_directory_path(library_name, extension = nil)
           "#{Processing::RP_CONFIG['PROCESSING_ROOT']}/modes/java/libraries/#{library_name}/library",
           "#{K9_ROOT}/library/#{library_name}/library",
           "#{K9_ROOT}/library/#{library_name}",
-          "#{@sketchbook_library_path}/#{library_name}/library"
+	  "#{Sketchbook.path}/#{library_name}/library"
         ].each do |jpath|
           if File.exist?(jpath) && !Dir.glob(format('%s/*.%s', jpath, ext)).empty?
             return jpath

lib/jruby_art/runner.rb

@@ -136,13 +136,13 @@ def watch_sketch
 
     def install
       require_relative '../jruby_art/installer'
-      JRubyCompleteInstall.new(K9_ROOT, host_os).install
-      UnpackSamples.new(K9_ROOT, host_os).install
+      JRubyCompleteInstall.new(K9_ROOT, OS).install
+      UnpackSamples.new(K9_ROOT, OS).install
     end
 
     def check
       require_relative '../jruby_art/installer'
-      Check.new(K9_ROOT, host_os).install
+      Check.new(K9_ROOT, OS).install
     end
 
     # Show the standard help/usage message.
@@ -183,24 +183,7 @@ def jruby_complete
     end
 
     def libraries
-      %w(video sound).map { |library| sketchbook_library(library) }.flatten
-    end
-
-    def sketchbook_library(name)
-      Dir["#{Processing::RP_CONFIG['sketchbook_path']}/libraries/#{name}/library/\*.jar"]
-    end
-
-    def host_os
-      detect_os = RbConfig::CONFIG['host_os']
-      case detect_os
-      when /mac|darwin/ then :mac
-      when /linux/ then :linux
-      when /solaris|bsd/ then :unix
-      else
-        WIN_PATTERNS.find { |r| detect_os =~ r }
-        raise "unknown os: #{detect_os.inspect}" if Regexp.last_match.nil?
-        :windows
-      end
+      %w(video sound).map { |library| Sketchbook.library(library) }.flatten
     end
   end # class Runner
 end # module Processing