tidy up

Author: monkstone

lib/jruby_art/installer.rb

@@ -1,3 +1,4 @@
+# frozen_string_literal: false
 require 'yaml'
 
 VERSION = '3.1.1' # processing version
@@ -8,51 +9,51 @@ def initialize(os: :linux, jruby: true, root:)
     @os = os
     @jruby = jruby
     @gem_root = root
-    @sketch = "#{ENV['HOME']}/sketchbook" if os == :linux  
+    @sketch = "#{ENV['HOME']}/sketchbook" if os == :linux
     @sketch = "#{ENV['HOME']}/My Documents/Processing" if os == :windows
     @sketch = "#{ENV['HOME']}/Documents/Processing" if os == :mac
   end
-  
+
   def install
     system "cd #{gem_root}/vendors && rake"
     return if root_exist?
     set_processing_root
     warn 'PROCESSING_ROOT set optimistically, run check to confirm'
   end
-  
+
   def install_examples
     system "cd #{gem_root}/vendors && rake unpack_samples"
   end
-  
+
   # Optimistically set processing root
   def set_processing_root
     require 'psych'
     folder = File.expand_path("#{ENV['HOME']}/.jruby_art")
-    Dir.mkdir(folder) unless File.exists? folder
+    Dir.mkdir(folder) unless File.exist? folder
     path = File.join(folder, 'config.yml')
     proot = "#{ENV['HOME']}/processing-#{VERSION}"
     proot = "/Java/Processing-#{VERSION}" if os == :windows
     proot = "/Applications/Processing.app/Contents/Java" if os == :mac
-    data = { 
-      'PROCESSING_ROOT' => proot, 
-      'JRUBY' => "#{jruby}",
+    data = {
+      'PROCESSING_ROOT' => proot,
+      'JRUBY' => jruby.to_s,
       'sketchbook_path' => sketch,
       'MAX_WATCH' => '20'
     }
     open(path, 'w:UTF-8') { |f| f.write(data.to_yaml) }
   end
-  
-  def root_exist?    
+
+  def root_exist?
     return false if config.nil?
-    return File.exists? config['PROCESSING_ROOT']
+    File.exist? config['PROCESSING_ROOT']
   end
-  
+
   def config
     k9config = File.expand_path("#{ENV['HOME']}/.jruby_art/config.yml")
-    return nil unless File.exists? k9config
+    return nil unless File.exist? k9config
     YAML.load_file(k9config)
   end
-  
+
   def check
     show_version
     installed = File.exist? File.join(gem_root, 'lib/ruby/jruby-complete.jar')
@@ -66,10 +67,10 @@ def check
     puts "  jruby-complete installed = #{installed}"
     puts sketchbook
     puts max_watch
- end
- 
- # Display the current version of JRubyArt.
- def show_version
-   puts format('JRubyArt version %s', JRubyArt::VERSION)
- end
+  end
+
+  # Display the current version of JRubyArt.
+  def show_version
+    puts format('JRubyArt version %s', JRubyArt::VERSION)
+  end
 end

lib/jruby_art/runner.rb

@@ -1,4 +1,3 @@
-# encoding: utf-8
 # frozen_string_literal: false
 
 require 'ostruct'
@@ -121,7 +120,6 @@ def watch(sketch, args)
     end
 
     def setup(choice)
-      # proc_root = FileTest.exist?("#{ENV['HOME']}/.jruby_art/config.yml")
       installer = Installer.new(root: K9_ROOT, os: host_os, jruby: true)
       case choice
       when /check/
@@ -133,7 +131,7 @@ def setup(choice)
       else
         puts 'Usage: k9 setup [check | install | unpack_samples]'
       end
-    end    
+    end
 
     # Show the standard help/usage message.
     def show_help
@@ -222,21 +220,5 @@ def host_os
         :windows
       end
     end
-
-    # Optimistically set processing root
-    def set_processing_root
-      require 'psych'
-      @os ||= host_os
-      data = {}
-      path = File.expand_path("#{ENV['HOME']}/.jruby_art/config.yml")
-      if os == :mac
-        data['PROCESSING_ROOT'] = '/Applications/Processing.app/Contents/Java'
-      else
-        root = "#{ENV['HOME']}/processing-3.1.1"
-        data['PROCESSING_ROOT'] = root
-      end
-      data['JRUBY'] = 'true'
-      open(path, 'w:UTF-8') { |f| f.write(data.to_yaml) }
-    end
   end # class Runner
 end # module Processing