Spider - fix numerous parser warnings

Fixed indentation, removed unused code, added some extra error information.

Author: samaaron

app/server/ruby/core.rb

@@ -34,20 +34,6 @@
 
 require 'wavefile'
 
-os = case RUBY_PLATFORM
-     when /.*arm.*-linux.*/
-       :raspberry
-     when /.*linux.*/
-       :linux
-     when /.*darwin.*/
-       :osx
-     when /.*mingw.*/
-       :windows
-     else
-       RUBY_PLATFORM
-     end
-
-
 $:.unshift "#{File.expand_path("../rb-native", __FILE__)}/#{ruby_api}/"
 
 module SonicPi
@@ -485,10 +471,6 @@ def filter(&block)
         self.class.new(@map.filter(&block))
       end
 
-      def select(&block)
-        self.class.new(@map.select(&block))
-      end
-
       def flatten(*args)
         @map.flatten(*args)
       end

app/server/ruby/lib/sonicpi/lang/core.rb

@@ -3743,7 +3743,6 @@ def with_bpm_mul(mul, &block)
       def use_bpm_mul(mul, &block)
         raise ArgumentError, "use_bpm_mul must not be called with a block. Perhaps you meant with_bpm_mul" if block
         raise ArgumentError, "use_bpm_mul's mul should be a positive value. You tried to use: #{mul}" unless mul > 0
-        new_bpm = __get_spider_bpm * mul.to_f
         __layer_spider_time_density!(mul)
       end
       doc name:           :use_bpm_mul,
@@ -3925,7 +3924,7 @@ def current_bpm_mode
 
 
 
-        def current_bpm
+      def current_bpm
         __get_spider_bpm
       end
       doc name:          :current_bpm,

app/server/ruby/lib/sonicpi/runtime.rb

@@ -382,7 +382,6 @@ def __current_sched_ahead_time
 
     def __schedule_delayed_blocks_and_messages!
       delayed_messages = __system_thread_locals.get(:sonic_pi_local_spider_delayed_messages, [])
-      delayed_blocks = __system_thread_locals.get(:sonic_pi_local_spider_delayed_blocks, [])
       __system_thread_locals.set_local(:sonic_pi_local_spider_delayed_messages, [])
       __system_thread_locals.set_local(:sonic_pi_local_spider_delayed_blocks, [])
       if (delayed_messages && (!delayed_messages.empty?) && (!__system_thread_locals.get(:sonic_pi_spider_silent)))
@@ -399,17 +398,7 @@ def __schedule_delayed_blocks_and_messages!
         Thread.new do
             Kernel.sleep(sleep_time) if sleep_time > 0
           __msg_queue.push msg
-
-            #We're now in sync with the sched_ahead time
-
-          # delayed_blocks.each do |b|
-          #   begin
-          #     b.call
-          #   rescue => e
-          #     log e.backtrace
-          #   end
-          # end
-
+          #We're now in sync with the sched_ahead time
         end
       end
     end

app/server/ruby/lib/sonicpi/scsynthexternal.rb

@@ -155,7 +155,6 @@ def wait_for_boot
       puts "scsynth boot - Waiting for the SuperCollider Server to have booted..."
       p = Promise.new
 
-      booted = false
       connected = false
 
       boot_s = OSC::UDPServer.new(0) do |a, b, info|
@@ -180,7 +179,7 @@ def wait_for_boot
       begin
         p.get(30)
       rescue Exception => e
-        puts "scsynth boot - Unable to connect to SuperCollider Audio Server. Exiting..."
+        puts "scsynth boot - Unable to connect to SuperCollider Audio Server (#{e.message}). Exiting..."
         exit
       ensure
         t.kill

app/server/ruby/lib/sonicpi/tau_api.rb

@@ -120,6 +120,7 @@ def link_get_time_at_beat(beat, quantum = 4)
     def link_get_clock_time_at_beat(beat, quantum = 4)
       link_time = link_get_time_at_beat(beat, quantum)
       t_with_delta = (link_time + @link_time_delta_micros_prom.get) / 1_000_000.0
+      t_with_delta
     end
 
     def link_get_beat_at_clock_time(clock_time, quantum = 4)
@@ -200,32 +201,32 @@ def initialize_link_info!
     def add_incoming_api_handlers!
       @tau_comms.add_method("/link-tempo-change") do |args|
         @incoming_tempo_change_cv.broadcast
-        gui_id = args[0]
+        _gui_id = args[0]
         tempo = args[1].to_f
         @tempo = tempo
       end
 
       @tau_comms.add_method("/midi-ins") do |args|
-        gui_id = args[0]
+        _gui_id = args[0]
         ins = args[1..-1]
         @updated_midi_ins_handler.call(ins)
       end
 
       @tau_comms.add_method("/midi-outs") do |args|
-        gui_id = args[0]
+        _gui_id = args[0]
         outs = args[1..-1]
         @updated_midi_outs_handler.call(outs)
       end
 
       @tau_comms.add_method("/tau-api-reply") do |args|
-        gui_id = args[0]
+        _gui_id = args[0]
         key = args[1]
         payload = args[2..-1]
         @tau_api_events.async_event(key, payload)
       end
 
       @tau_comms.add_method("/internal-cue") do |args|
-        gui_id = args[0]
+        _gui_id = args[0]
         path = args[1]
         args = args[2..-1]
         @internal_cue_handler.call(path, args)
@@ -236,7 +237,7 @@ def add_incoming_api_handlers!
       end
 
       @tau_comms.add_method("/external-osc-cue") do |args|
-        gui_id = args[0]
+        _gui_id = args[0]
         ip = args[0]
         port = args[1]
         address = args[2]

app/server/ruby/lib/sonicpi/tau_comms.rb

@@ -101,7 +101,6 @@ def tau_ready?
     def wait_for_tau!
       p = Promise.new
 
-      booted = false
       connected = false
 
       boot_s = OSC::UDPServer.new(0) do |a, b, info|
@@ -125,7 +124,7 @@ def wait_for_tau!
       begin
         p.get(30)
       rescue Exception => e
-        STDOUT.puts "TauComms - Unable to connect to tau. Exiting..."
+        STDOUT.puts "TauComms - Unable to connect to tau (#{e.message}). Exiting..."
         exit
       ensure
         t.kill

app/server/ruby/lib/sonicpi/util.rb

@@ -22,7 +22,7 @@ module Util
     when /.*arm.*-linux.*/
       @@os = :raspberry
     when /aarch64.*linux.*/
-       @@os = :raspberry
+      @@os = :raspberry
     when /.*linux.*/
       @@os = :linux
     when /.*darwin.*/
@@ -101,7 +101,7 @@ def raspberry_pi_3bplus_64?
       os == :raspberry && @@raspberry_pi_3bplus_64
     end
 
-   def raspberry_pi_4_1gb?
+    def raspberry_pi_4_1gb?
       os == :raspberry && @@raspberry_pi_4_1gb
     end
 
@@ -125,23 +125,23 @@ def raspberry_pi_4_2gb_64?
       os == :raspberry && @@raspberry_pi_4_2gb_64
     end
 
-      def raspberry_pi_4_4gb_64?
+    def raspberry_pi_4_4gb_64?
       os == :raspberry && @@raspberry_pi_4_4gb_64
     end
 
-     def raspberry_pi_4_8gb_64?
+    def raspberry_pi_4_8gb_64?
       os == :raspberry && @@raspberry_pi_4_8gb_64
     end
 
-      def raspberry_pi_400?
+    def raspberry_pi_400?
       os == :raspberry && @@raspberry_pi_400
     end
 
-     def raspberry_pi_400_64?
+    def raspberry_pi_400_64?
       os == :raspberry && @@raspberry_pi_400_64
     end
 
-   def unify_tilde_dir(path)
+    def unify_tilde_dir(path)
       if os == :windows
         path
       else
@@ -154,14 +154,14 @@ def num_buffers_for_current_os
     end
 
     def num_audio_busses_for_current_os
-        1024
+      1024
     end
 
     def default_sched_ahead_time
       if raspberry_pi_2?
         2
       elsif  raspberry_pi_3? or raspberry_pi_3bplus? \
-         or raspberry_pi_3_64? or raspberry_pi_3bplus_64?
+        or raspberry_pi_3_64? or raspberry_pi_3bplus_64?
         1.5
       else
         0.5
@@ -197,11 +197,11 @@ def host_platform_desc
           "Raspberry Pi 4B:4Gb 64bit OS"
         elsif raspberry_pi_4_8gb_64?
           "Raspberry Pi 4B:8Gb 64bit OS"
-         elsif raspberry_pi_400?
+        elsif raspberry_pi_400?
           "Raspberry Pi 400:4Gb"
         elsif raspberry_pi_400_64?
           "Raspberry Pi 400:4Gb 64bit OS"
-       else
+        else
           "Raspberry Pi"
         end
       when :linux
@@ -215,7 +215,7 @@ def host_platform_desc
 
     def default_control_delta
       if raspberry_pi?
-          0.013
+        0.013
       else
         0.005
       end
@@ -270,10 +270,10 @@ def __exe_fix(path)
     def fetch_url(url, anonymous_uuid=true)
       begin
 
-          params = {:ruby_platform => RUBY_PLATFORM,
-                    :ruby_version => RUBY_VERSION,
-                    :ruby_patchlevel => RUBY_PATCHLEVEL,
-                    :sonic_pi_version => @version.to_s}
+        params = {:ruby_platform => RUBY_PLATFORM,
+          :ruby_version => RUBY_VERSION,
+          :ruby_patchlevel => RUBY_PATCHLEVEL,
+          :sonic_pi_version => @version.to_s}
 
         params[:uuid] = global_uuid if anonymous_uuid
 
@@ -359,19 +359,19 @@ def resolve_synth_opts_hash_or_array(opts)
 
     def truthy?(val)
 
-        case val
-        when Numeric
-          return val != 0
-        when NilClass
-          return false
-        when TrueClass
-          return true
-        when FalseClass
-          return false
-        when Proc
-          new_v = val.call
-          return truthy?(new_v)
-        end
+      case val
+      when Numeric
+        return val != 0
+      when NilClass
+        return false
+      when TrueClass
+        return true
+      when FalseClass
+        return false
+      when Proc
+        new_v = val.call
+        return truthy?(new_v)
+      end
     end
 
     def zipmap(a, b)

app/server/ruby/test/setup_test.rb

@@ -121,33 +121,33 @@ def initialize
         end
       end
 
-      external_osc_cue_handler = lambda do |time, ip, port, address, args|
-        address = "/#{address}" unless address.start_with?("/")
-        address = "/osc:#{host}:#{port}#{address}"
-        p = 0
-        d = 0
-        b = 0
-        m = 60
-        @register_cue_event_lambda.call(Time.now, p, @system_init_thread_id, d, b, m, address, args, 0)
-      end
-
-      internal_cue_handler = lambda do |path, args|
-        p = 0
-        d = 0
-        b = 0
-        m = 60
-        @register_cue_event_lambda.call(Time.now, p, @system_init_thread_id, d, b, m, address, args, 0)
-      end
-
-      updated_midi_ins_handler = lambda do |ins|
-        desc = ins.join("\n")
-        __msg_queue.push({:type => :midi_in_ports, :val => desc})
-      end
-
-      updated_midi_outs_handler = lambda do |outs|
-        desc = outs.join("\n")
-        __msg_queue.push({:type => :midi_out_ports, :val => desc})
-      end
+      # external_osc_cue_handler = lambda do |time, ip, port, address, args|
+      #   address = "/#{address}" unless address.start_with?("/")
+      #   address = "/osc:#{host}:#{port}#{address}"
+      #   p = 0
+      #   d = 0
+      #   b = 0
+      #   m = 60
+      #   @register_cue_event_lambda.call(Time.now, p, @system_init_thread_id, d, b, m, address, args, 0)
+      # end
+
+      # internal_cue_handler = lambda do |path, args|
+      #   p = 0
+      #   d = 0
+      #   b = 0
+      #   m = 60
+      #   @register_cue_event_lambda.call(Time.now, p, @system_init_thread_id, d, b, m, address, args, 0)
+      # end
+
+      # updated_midi_ins_handler = lambda do |ins|
+      #   desc = ins.join("\n")
+      #   __msg_queue.push({:type => :midi_in_ports, :val => desc})
+      # end
+
+      # updated_midi_outs_handler = lambda do |outs|
+      #   desc = outs.join("\n")
+      #   __msg_queue.push({:type => :midi_out_ports, :val => desc})
+      # end
 
       # @tau_api = TauAPI.new(ports,
       #                       {