onkyo_eiscp_ruby 2.0.0 → 2.1.5

checksums.yaml

@@ -1,7 +1,7 @@
 ---
-SHA1:
-  metadata.gz: c2f2a55fcfb2dac1b649b3efe36065ea7e0e58af
-  data.tar.gz: 6c0c5f56a5fdaff8c5a3aa6673e9e12cf96bd32a
+SHA256:
+  metadata.gz: d35b01beb072ac7058ef54920b734aff8d4d098ecc702eb9edd21ee818ad7ca0
+  data.tar.gz: f1112ac834d03f1dea2e50aeed301ac8f0e802b55b00b0f317d7802515ffa84e
 SHA512:
-  metadata.gz: 2ee13a3c0b65c4b2b57872a8656ba59e07e9f1f7aaa0f4a7af90a55512f6db50d435333100b8e5ac86ab6adc2e62438649d54639810bb9be231c2275f0524caf
-  data.tar.gz: 7d0ea01812008c6ad24525d358684b84dabe14f8192dfe0f400fb24727fa1988e89374e4c24402ac132b92f723bc67de0a1c0923c27694f5db3571ddb4e63083
+  metadata.gz: f3a50446a0df21efd8dc6b2397daeb0cf791a997e7f0c27bb9d01c98b9e08fdc99cd68176b464882b29acc64a5f9cbe0748da690da51269f10f8f41f3d75dfc7
+  data.tar.gz: 65bafa48d392b8578435f006de9b27b8e58b9f16d7ccd7e2d527b38f23c0e2db187204c79f9c2dfe121021907735b51f73b82cef8fb82789ac362b5c3fec228f

data/README.md

@@ -3,19 +3,24 @@ onkyo_eiscp_ruby
 [![Gem Version](https://badge.fury.io/rb/onkyo_eiscp_ruby.png)](http://badge.fury.io/rb/onkyo_eiscp_ruby)
 [![GitHub version](https://badge.fury.io/gh/mikerodrigues%2Fonkyo_eiscp_ruby.png)](http://badge.fury.io/gh/mikerodrigues%2Fonkyo_eiscp_ruby)
 
-*A Ruby implementation of eISCP for controlling Onkyo receivers.*
+*A Ruby implementation of eISCP (ethernet Integra Serial Control Protocol) for controlling Onkyo receivers.*
 
-**This code is still under heavy development and using it might make you sick.**
+**I'm still sort of updating this code. Please feel free to reach out if there's something you need that it doesn't do, I may be willing to help.**
 
-Automatically discover receivers in the broadcast domain
+**The python version linked below sees much more activity.**
 
-Send commands to receivers and parse returned messages
 
-Open a TCP socket to receive solicited and non-solicited status updates.
+Features
+---------------
+* Automatically discover receivers in the broadcast domain
+
+* Send commands to receivers and parse returned messages
+
+* Open a TCP socket to receive solicited and non-solicited status updates.
 
-Mock reciever (currently only responds to discovery)
+* Mock reciever (currently only responds to discovery)
 
-Human-readable commands
+* Human-readable commands
 
 **Inspired by https://github.com/miracle2k/onkyo-eiscp
 
@@ -38,7 +43,11 @@ What's missing?
 
 Using the Library
 -----------------
-* require the library
+* Install the library
+		
+		gem install onkyo_eiscp_ruby
+
+* Require the library
 
 		require 'eiscp'
 
@@ -160,6 +169,11 @@ Using the Library
 
 		# Set the master volume to 45
 		receiver.master_volume "45"
+		
+		# Change the input to TV/CD
+		# Note: when a command value has more than one name (an array in the YAML file)
+		#       we default to using the first entry. So for `['cd', 'tv', 'cd']` you get:
+		receiver.input_selector "cd"
 ```
 
 * Parse ISCP and human readable strings:

data/VERSION

@@ -1 +1 @@
-2.0.0
+2.1.5

data/bin/mock_receiver.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 require 'socket'
 require_relative './receiver'
 require_relative './message'
@@ -9,7 +11,8 @@ module EISCP
   #
   class MockReceiver
     DISCOVERY_IP = '255.255.255.255'
-    ONKYO_DISCOVERY_RESPONSE =  Message.new('ECN', "TX-NR609/60128/DX/14DAE9E967C8\x19\r\n\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00")
+    ONKYO_DISCOVERY_RESPONSE = Message.new('ECN',
+                                           "TX-NR609/60128/DX/14DAE9E967C8\x19\r\n\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00")
 
     # Create/start the server object.
 

data/bin/onkyo.rb

@@ -1,4 +1,5 @@
 #!/usr/bin/env ruby
+# frozen_string_literal: true
 
 require 'eiscp'
 require 'optparse'
@@ -7,14 +8,13 @@ require 'ostruct'
 # This object parses ARGV and returns an @option hash
 #
 class Options
-  DEFAULT_OPTIONS = { verbose: true, all: false }
+  DEFAULT_OPTIONS = { verbose: true, all: false }.freeze
   USAGE = ' Usage: onkyo_rb [options]'
 
   def self.parse(args)
     @options = OpenStruct.new
 
     options = OptionParser.new do |opts|
-
       opts.banner = USAGE
 
       opts.on '-d', '--discover', 'Find Onkyo Receivers on the local broadcast domain' do |d|
@@ -38,17 +38,16 @@ class Options
       end
 
       opts.on '-m', '--monitor', 'Connect to the first discovered reciever and monitor updates' do |m|
-        @options.monitor = m 
+        @options.monitor = m
       end
-
     end
 
     options.parse!(args)
 
-    if @options.nil? && ARGV == [] then puts options end
+    puts options if @options.nil? && ARGV == []
 
     if @options.discover
-      EISCP::Receiver.discover.each {|rec| puts "#{rec.host}:#{rec.port} - #{rec.model} - #{rec.mac_address}"}
+      EISCP::Receiver.discover.each { |rec| puts "#{rec.host}:#{rec.port} - #{rec.model} - #{rec.mac_address}" }
       exit 0
     end
 
@@ -59,7 +58,7 @@ class Options
 
     if @options.monitor
       begin
-        rec = EISCP::Receiver.new do |reply| 
+        rec = EISCP::Receiver.new do |reply|
           puts "#{Time.now} #{rec.host} "\
                "#{reply.zone}: "\
                "#{reply.command_description || reply.command} "\
@@ -67,9 +66,9 @@ class Options
         end
         rec.thread.join
       rescue Interrupt
-        fail 'Exiting...'
+        raise 'Exiting...'
       rescue Exception => e
-        puts "bummer..."
+        puts 'bummer...'
         puts e
       end
     end
@@ -79,28 +78,25 @@ class Options
       modelsets = []
       EISCP::Receiver.discover.each do |rec|
         models << rec.model
-      end 
+      end
       models.each do |model|
         EISCP::Dictionary.modelsets.each do |modelset, list|
-          if list.select{|x| x.match model}.length > 0
-            modelsets << modelset
-          end
+          modelsets << modelset unless list.select { |x| x.match model }.empty?
         end
       end
       EISCP::Dictionary.zones.each do |zone|
         EISCP::Dictionary.commands[zone].each do |command, command_hash|
-          puts "Command - Description"
+          puts 'Command - Description'
           puts "\n"
           puts "  '#{Dictionary.command_to_name(command)}' - "\
             "#{Dictionary.description_from_command(command)}"
           puts "\n"
-          puts "    Value - Description>"
+          puts '    Value - Description>'
           puts "\n"
-          command_hash[:values].each do |value, attr_hash|
-            if  modelsets.include? attr_hash[:models]
-            puts "      '#{attr_hash[:name]}' - "\
-              " #{attr_hash[:description]}"
-            else  
+          command_hash[:values].each do |_value, attr_hash|
+            if modelsets.include? attr_hash[:models]
+              puts "      '#{EISCP::Dictionary.command_value_to_value_name(command, _value)}' - "\
+                " #{attr_hash[:description]}"
             end
           end
           puts "\n"
@@ -111,16 +107,16 @@ class Options
     if @options.list_all
       EISCP::Dictionary.zones.each do |zone|
         EISCP::Dictionary.commands[zone].each do |command, command_hash|
-          puts "Command - Description"
+          puts 'Command - Description'
           puts "\n"
           puts "  '#{Dictionary.command_to_name(command)}' - "\
             "#{Dictionary.description_from_command(command)}"
           puts "\n"
-          puts "    Value - Description>"
+          puts '    Value - Description>'
           puts "\n"
-          command_hash[:values].each do |value, attr_hash| 
-            puts "      '#{attr_hash[:name]}' - "\
-              " #{attr_hash[:description]}"
+          command_hash[:values].each do |_value, attr_hash|
+            puts "      '#{EISCP::Dictionary.command_value_to_value_name(command, _value)}' - "\
+                " #{attr_hash[:description]}"
           end
           puts "\n"
         end
@@ -143,7 +139,7 @@ receiver = EISCP::Receiver.discover[0]
 receiver.connect
 begin
   command = EISCP::Parser.parse(ARGV.join(' '))
-rescue
+rescue StandardError
   raise "Couldn't parse command"
 end
 reply = receiver.send_recv(command)

data/bin/onkyo_server.rb

@@ -1,4 +1,5 @@
 #!/usr/bin/env ruby
+# frozen_string_literal: true
 
 require 'eiscp/mock_receiver'
 

data/lib/eiscp.rb

@@ -1,7 +1,9 @@
+# frozen_string_literal: true
+
 # Library for controlling Onkyo receivers over TCP/IP.
 #
 module EISCP
-  VERSION = '2.0.0'
+  VERSION = '2.1.5'
 end
 
 require_relative './eiscp/receiver'

data/lib/eiscp/dictionary.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 require_relative './dictionary/dictionary_generators'
 require_relative './dictionary/dictionary_helpers'
 
@@ -12,14 +14,12 @@ module EISCP
     extend DictionaryHelpers
 
     class << self
-      attr_reader :zones
-      attr_reader :modelsets
-      attr_reader :commands
+      attr_reader :zones, :modelsets, :commands
     end
 
     DEFAULT_ZONE = 'main'
-    @yaml_file_path = File.join(File.expand_path(File.dirname(__FILE__)), '../../eiscp-commands.yaml')
-    @commands = YAML.load(File.read(@yaml_file_path))
+    @yaml_file_path = File.join(__dir__, '../../eiscp-commands.yaml')
+    @commands = YAML.safe_load(File.read(@yaml_file_path), permitted_classes: [Symbol])
     @modelsets = @commands[:modelsets]
     @commands.delete(:modelsets)
     @zones = @commands.map { |k, _| k }
@@ -30,11 +30,12 @@ module EISCP
         command = command[0]
         @commands[zone][command][:values].each do |value|
           value = value[0]
-          if value.is_a? Array
+          case value
+          when Array
             @additions << [zone, command, value, create_range_commands(zone, command, value)]
-          elsif value.match(/^(B|T){xx}$/)
+          when /^(B|T){xx}$/
             @additions << [zone, command, value, create_treble_bass_commands(zone, command, value)]
-          elsif value.match(/^{xx}$/)
+          when /^{xx}$/
             @additions << [zone, command, value, create_balance_commands(zone, command, value)]
           else
             next
@@ -44,11 +45,9 @@ module EISCP
     end
 
     @additions.each do |zone, command, value, hash|
-      begin
-        @commands[zone][command][:values].merge! hash
-      rescue
-        puts "Failed to add #{hash} to #{zone}:#{command}:#{value}"
-      end
+      @commands[zone][command][:values].merge! hash
+    rescue StandardError
+      puts "Failed to add #{hash} to #{zone}:#{command}:#{value}"
     end
   end
 end

data/lib/eiscp/dictionary/dictionary_generators.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 require 'yaml'
 
 module EISCP
@@ -19,14 +21,12 @@ module EISCP
         range.each do |number|
           tmp.merge!(number.to_s(16).rjust(2, '0').upcase =>
             {
-              :name => number.to_s,
-              :description =>
-                @commands[zone][command][:values][value][:description].gsub(/\d - \d+/, number.to_s),
-              :models => @commands[zone][command][:values][value][:models]
-            }
-          )
+              name: number.to_s,
+              description: @commands[zone][command][:values][value][:description].gsub(/\d - \d+/, number.to_s),
+              models: @commands[zone][command][:values][value][:models]
+            })
         end
-        return tmp
+        tmp
       end
 
       # Creates hash object for treble and bass commands
@@ -36,14 +36,12 @@ module EISCP
         ['-A', '-8', '-6', '-4', '-2', '00', '+2', '+4', '+6', '+8', '+A'].each do |v|
           tmp.merge!((value[0] + v.to_s) =>
             {
-              :name => value[0].downcase + v,
-              :description =>
-                @commands[zone][command][:values][value[0] + '{xx}'][:description].gsub(/\(.*[\]|\)]$/, v),
-              :models => @commands[zone][command][:values][value[0] + '{xx}'][:models]
-            }
-          )
+              name: value[0].downcase + v,
+              description: @commands[zone][command][:values]["#{value[0]}{xx}"][:description].gsub(/\(.*[\]|)]$/, v),
+              models: @commands[zone][command][:values]["#{value[0]}{xx}"][:models]
+            })
         end
-        return tmp
+        tmp
       end
 
       # Creates hash object for balance commands
@@ -53,14 +51,12 @@ module EISCP
         ['-A', '-8', '-6', '-4', '-2', '00', '+2', '+4', '+6', '+8', '+A'].each do |v|
           tmp.merge!(v.to_s =>
             {
-              :name => v.downcase,
-              :description =>
-                @commands[zone][command][:values]['{xx}'][:description].gsub(/\(.*[\]|\)]$/, v),
-              :models => @commands[zone][command][:values]['{xx}'][:models]
-            }
-          )
+              name: v.downcase,
+              description: @commands[zone][command][:values]['{xx}'][:description].gsub(/\(.*[\]|)]$/, v),
+              models: @commands[zone][command][:values]['{xx}'][:models]
+            })
         end
-        return tmp
+        tmp
       end
     end
   end

data/lib/eiscp/dictionary/dictionary_helpers.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 module EISCP
   module Dictionary
     # This module provides methods to get information from the Dictionary about
@@ -19,9 +21,9 @@ module EISCP
         command = command.upcase
         begin
           zone = zone_from_command(command)
-          return @commands[zone][command][:name]
-        rescue
-          return nil
+          @commands[zone][command][:name]
+        rescue StandardError
+          nil
         end
       end
 
@@ -34,46 +36,50 @@ module EISCP
               return command if attrs[:name] == name
             end
           end
-          return nil
+          nil
 
         else
 
           @commands[command_zone].each_pair do |command, attrs|
             return command if attrs[:name] == name
           end
-          return nil
+          nil
 
         end
       end
 
       # Return a value name from a command and a value
       def command_value_to_value_name(command, value)
-        begin
-          zone = zone_from_command(command)
-          @commands[zone][command][:values][value][:name]
-        rescue
-          nil
+        zone = zone_from_command(command)
+        command_value = @commands[zone][command][:values][value][:name]
+        if command_value.instance_of?(String)
+          command_value
+        elsif command_value.instance_of?(Array)
+          command_value.first
         end
+      rescue StandardError
+        nil
       end
 
       # Return a value from a command and value name
       def command_value_name_to_value(command, value_name)
-        begin
-          zone = zone_from_command(command)
-          @commands[zone][command][:values].each_pair do |k, v|
+        zone = zone_from_command(command)
+        @commands[zone][command][:values].each_pair do |k, v|
+          if v[:name].instance_of?(String)
             return k if v[:name] == value_name.to_s
+          elsif v[:name].instance_of?(Array)
+            return k if v[:name].first == value_name.to_s
           end
-        rescue
-          nil
         end
+        nil
+      rescue StandardError
+        nil
       end
 
       # Return a command description from a command name and zone
       def description_from_command_name(name, zone)
         @commands[zone].each_pair do |command, attrs|
-          if attrs[:name] == name
-            return @commands[zone][command][:description]
-          end
+          return @commands[zone][command][:description] if attrs[:name] == name
         end
         nil
       end
@@ -105,14 +111,11 @@ module EISCP
       # Checks to see if the command is in the Dictionary
       #
       def known_command?(command)
-        begin
-          zone = zone_from_command(command)
-          @commands[zone].include? command
-        rescue
-          return nil
-        end
+        zone = zone_from_command(command)
+        @commands[zone].include? command
+      rescue StandardError
+        nil
       end
     end
-
   end
 end

data/lib/eiscp/message.rb

@@ -1,4 +1,5 @@
-# encoding: utf-8
+# frozen_string_literal: true
+
 require_relative './dictionary'
 require_relative './parser'
 
@@ -14,6 +15,7 @@ module EISCP
   class Message
     # EISCP header
     attr_accessor :header
+
     # ISCP "magic" indicates the start of an eISCP message.
     MAGIC = 'ISCP'
     # eISCP header size, fixed length.
@@ -52,41 +54,38 @@ module EISCP
     # @param [String] value variable length ISCP command value
     # @param [String] unit_type_character override default unit type character, optional
     # @param [String] start_character override default start character, optional
-    def initialize(command: nil, value: nil, terminator:  "\r\n", unit_type: '1', start: '!')
+    def initialize(command: nil, value: '', terminator: "\r\n", unit_type: '1', start: '!')
       unless Dictionary.known_command?(command)
-        #STDERR.puts "Unknown command #{command}"
+        # STDERR.puts "Unknown command #{command}"
       end
 
-      fail 'No value specified.' if value.nil?
-
       @command = command
       @value = value
       @terminator = terminator
       @unit_type = unit_type
       @start = start
       @header = { magic: MAGIC,
-                  header_size:  HEADER_SIZE,
+                  header_size: HEADER_SIZE,
                   data_size: to_iscp.length,
                   version: ISCP_VERSION,
-                  reserved: RESERVED
-      }
+                  reserved: RESERVED }
       begin
         get_human_readable_attrs
-      rescue
-        #STDERR.puts"Couldn't get all human readable attrs"
+      rescue StandardError
+        # STDERR.puts"Couldn't get all human readable attrs"
       end
     end
 
     # Check if two messages are equivalent comparing their ISCP messages.
     #
     def ==(other)
-      to_iscp == other.to_iscp ? true : false
+      to_iscp == other.to_iscp
     end
 
     # Return ISCP Message string
     #
     def to_iscp
-      "#{@start + @unit_type + @command + @value}"
+      (@start + @unit_type + @command + @value).to_s
     end
 
     # Return EISCP Message string

data/lib/eiscp/parser.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 require_relative './parser/eiscp_parser'
 require_relative './parser/iscp_parser'
 require_relative './parser/human_readable_parser'
@@ -17,6 +19,6 @@ module EISCP
       else
         HumanReadableParser.parse(string)
       end
-    end 
+    end
   end
 end

data/lib/eiscp/parser/dynamic_value_parser.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 module EISCP
   module Parser
     module DynamicValueParser

data/lib/eiscp/parser/eiscp_parser.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 require_relative './iscp_parser'
 
 module EISCP
@@ -15,22 +17,26 @@ module EISCP
           unit_type: msg.unit_type,
           start: msg.start
         )
-        packet.header = {
+        packet.header = create_header(array)
+        packet
+      end
+
+      def self.create_header(array)
+        {
           magic: array[0],
           header_size: array[1],
           data_size: array[2],
           version: array[3],
           reserved: array[4]
         }
-        packet
       end
 
       def self.validate(packet)
         packet.header.header_size.size == packet.command.size
       end
+        
     end
 
-    class EISCPParserException < Exception; end
-
+    class EISCPParserException < RuntimeError; end
   end
 end

data/lib/eiscp/parser/human_readable_parser.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 require_relative '../dictionary'
 
 module EISCP
@@ -8,22 +10,20 @@ module EISCP
       def self.parse(string)
         array = string.split(' ')
 
-        if Dictionary.zones.include? array[0]
-          parsed_zone = array.shift
-        else
-          parsed_zone = Dictionary::DEFAULT_ZONE
-        end 
+        parsed_zone = if Dictionary.zones.include? array[0]
+                        array.shift
+                      else
+                        Dictionary::DEFAULT_ZONE
+                      end
 
         command_name = array.shift
-        value_name = array.join(" ")
+        value_name = array.join(' ')
         command = Dictionary.command_name_to_command(command_name, parsed_zone)
         value = Dictionary.command_value_name_to_value(command, value_name)
-        if (command.nil? || value.nil?)
-          return nil
-        end
+        return nil if command.nil? || value.nil?
+
         Message.new(command: command, value: value)
       end
-
     end
   end
 end

data/lib/eiscp/parser/iscp_parser.rb

@@ -1,10 +1,12 @@
+# frozen_string_literal: true
+
 module EISCP
   module Parser
     # This module parses an ISCP string and returns a Message object
     #
     module ISCPParser
       # Regexp for parsing ISCP messages
-      REGEX = /(?<start>!)?(?<unit_type>(\d|x))?(?<command>[A-Z]{3})\s?(?<value>.*?)(?<terminator>[[:cntrl:]]*$)/
+      REGEX = /(?<start>!)?(?<unit_type>(?:\d|x))?(?<command>[A-Z]{3})\s?(?<value>.*?)(?<terminator>[[:cntrl:]]*$)/
       def self.parse(string)
         match = string.match(REGEX)
 
@@ -15,10 +17,7 @@ module EISCP
         hash.delete_if { |_, v| v.nil? || v == '' }
 
         # Convert keys to symbols
-        hash = hash.inject({}) do |memo, (k, v)|
-          memo[k.to_sym] = v
-          memo
-        end
+        hash = hash.transform_keys(&:to_sym)
 
         Message.new(**hash)
       end

data/lib/eiscp/receiver.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 require 'resolv'
 require_relative './receiver/discovery'
 require_relative './receiver/command_methods'
@@ -40,7 +42,6 @@ module EISCP
     # Default Onkyo eISCP port
     ONKYO_PORT = 60_128
 
-
     # Create a new EISCP::Receiver object to communicate with a receiver.
     # If no host is given, use auto discovery and create a
     # receiver object using the first host to respond.
@@ -53,7 +54,7 @@ module EISCP
       # with the Message object that results from a CommandMethod being called.
       # All we're doing here is calling #send_recv
       #
-      command_method_proc = Proc.new {|msg| self.send_recv msg}
+      command_method_proc = proc { |msg| send_recv msg }
       CommandMethods.generate(&command_method_proc)
 
       # This proc sets the four ECN attributes and initiates a connection to the
@@ -64,9 +65,7 @@ module EISCP
         @port  = hash[:port]
         @area  = hash[:area]
         @mac_address = hash[:mac_address]
-        if block_given?
-          connect(&block)
-        end
+        connect(&block) if block_given?
       end
 
       # This lambda sets the host IP after resolving it
@@ -83,12 +82,11 @@ module EISCP
       # Else, use the given host and hash to create a new Receiver object.
       # This is how ::discover creates Receivers.
       #
-      case
-      when host.nil?
+      if host.nil?
         first_found = Receiver.discover[0]
         set_host.call first_found.host
         set_attrs.call first_found.ecn_hash
-      when info_hash.empty?
+      elsif info_hash.empty?
         set_host.call host
         Receiver.discover.each do |receiver|
           receiver.host == @host && set_attrs.call(receiver.ecn_hash)
@@ -99,7 +97,7 @@ module EISCP
       end
     end
 
-    # Manages the thread and uses the same block passed to throgh #connect.
+    # Manages the thread and uses the same block passed to through #connect.
     #
     def update_thread
       # Kill thread if it exists
@@ -114,16 +112,14 @@ module EISCP
     end
     private :update_thread
 
-    # This creates a socket conection to the receiver if one doesn't exist, 
+    # This creates a socket conection to the receiver if one doesn't exist,
     # and updates or sets the callback block if one is passed.
     #
     def connect(&block)
-      begin
-        @socket ||= TCPSocket.new(@host, @port)
-        update_thread(&block)
-      rescue => e
-        puts e
-      end
+      @socket ||= TCPSocket.new(@host, @port)
+      update_thread(&block)
+    rescue StandardError => e
+      puts e
     end
 
     # Disconnect from the receiver by closing the socket and killing the
@@ -137,9 +133,11 @@ module EISCP
     # Sends an EISCP::Message object or string on the network
     #
     def send(eiscp)
-      if eiscp.is_a? EISCP::Message
+      connect if @socket.nil? || @socket.closed?
+      case eiscp
+      when EISCP::Message
         @socket.puts(eiscp.to_eiscp)
-      elsif eiscp.is_a? String
+      when String
         @socket.puts eiscp
       end
     end
@@ -147,18 +145,15 @@ module EISCP
     # Reads the socket and returns and EISCP::Message
     #
     def recv
-      data = ''
+      data = String.new
       data << @socket.gets until data.match(/\r\n$/)
-      message = Parser.parse(data)
-      message
+      Parser.parse(data)
     end
 
     # Sends an EISCP::Message object or string on the network and returns recieved data string.
     #
     def send_recv(eiscp)
-      if eiscp.is_a? String
-        eiscp = Parser.parse(eiscp)
-      end
+      eiscp = Parser.parse(eiscp) if eiscp.is_a? String
       send eiscp
       sleep DEFAULT_TIMEOUT
       Parser.parse("#{eiscp.command}#{@state[eiscp.command]}")
@@ -170,16 +165,15 @@ module EISCP
       { model: @model,
         port: @port,
         area: @area,
-        mac_address: @mac_address
-      }
+        mac_address: @mac_address }
     end
 
-    # This will return a human-readable represantion of the receiver's state. 
+    # This will return a human-readable represantion of the receiver's state.
     #
     def human_readable_state
       hash = {}
-      @state.each do |c, v|
-        hash["#{Dictionary.command_to_name(c)}"] =  "#{Dictionary.command_value_to_value_name(c, v) || v.to_s}"
+      @state.dup.each do |c, v|
+        hash[Dictionary.command_to_name(c).to_s] = (Dictionary.command_value_to_value_name(c, v) || v.to_s).to_s
       end
       hash
     end
@@ -189,18 +183,12 @@ module EISCP
     #
     def update_state
       Thread.new do
-        Dictionary.commands.each do |zone, commands|
+        Dictionary.commands.each do |zone, _commands|
           Dictionary.commands[zone].each do |command, info|
             info[:values].each do |value, _|
-              if value == 'QSTN'
-                send(Parser.parse(command + "QSTN"))
-                # If we send any faster we risk making the stereo drop replies. 
-                # A dropped reply is not necessarily indicative of the
-                # receiver's failure to receive the command and change state
-                # accordingly. In this case, we're only making queries, so we do
-                # want to capture every reply.
-                sleep DEFAULT_TIMEOUT
-              end
+              next unless value == 'QSTN'
+
+              send_recv(Parser.parse("#{command}QSTN"))
             end
           end
         end

data/lib/eiscp/receiver/command_methods.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 require_relative '../parser'
 require_relative '../dictionary'
 
@@ -12,14 +14,12 @@ module EISCP
       def self.generate(&block)
         Dictionary.zones.each do |zone|
           Dictionary.commands[zone].each do |command, _values|
-            begin
-              command_name = Dictionary.command_to_name(command).to_s.gsub(/-/, '_')
-              define_method(command_name) do |v|
-                self.instance_exec Parser.parse(command_name.gsub(/_/, '-') + ' ' + v), &block
-              end
-            rescue => e
-              puts e
+            command_name = Dictionary.command_to_name(command).to_s.gsub(/-/, '_')
+            define_method(command_name) do |v|
+              instance_exec Parser.parse("#{command_name.gsub(/_/, '-')} #{v}"), &block
             end
+          rescue StandardError => e
+            puts e
           end
         end
       end

data/lib/eiscp/receiver/discovery.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 require 'socket'
 require_relative '../message'
 require_relative '../parser'
@@ -31,17 +33,14 @@ module EISCP
         sock.send(ONKYO_MAGIC, 0, '<broadcast>', discovery_port)
         data = []
         loop do
-
-          begin
-            msg, addr = sock.recvfrom_nonblock(1024)
-            data << Receiver.new(addr[2], ecn_string_to_ecn_array(msg))
-          rescue IO::WaitReadable
-            io = IO.select([sock], nil, nil, 0.5)
-            if io.nil?
-              return data
-            else
-              retry
-            end
+          msg, addr = sock.recvfrom_nonblock(1024)
+          data << Receiver.new(addr[2], ecn_string_to_ecn_array(msg))
+        rescue IO::WaitReadable
+          io = IO.select([sock], nil, nil, 0.5)
+          if io.nil?
+            return data
+          else
+            retry
           end
         end
       end

data/onkyo_eiscp_ruby.gemspec

@@ -1,28 +1,29 @@
+# frozen_string_literal: true
+
 Gem::Specification.new do |s|
   s.name         = 'onkyo_eiscp_ruby'
   s.version      = File.read(File.expand_path('VERSION', File.dirname(__FILE__))).strip
-  s.licenses      = ['MIT']
+  s.licenses = ['MIT']
   s.platform     = Gem::Platform::RUBY
   s.summary      = 'Manipulate Onkyo stereos with the eISCP protocol'
   s.files        = Dir.glob('{bin,config,lib,test,doc}/**/*') +
-    ['VERSION', 'onkyo_eiscp_ruby.gemspec', 'eiscp-commands.yaml']
+                   ['VERSION', 'onkyo_eiscp_ruby.gemspec', 'eiscp-commands.yaml']
   s.extra_rdoc_files = ['README.md']
   s.require_path = 'lib'
 
   s.homepage     = 'https://github.com/mikerodrigues/onkyo_eiscp_ruby'
 
-  s.description  = %q(
+  s.description  = '
     Control Onkyo receivers over the network.Use the provided binary or
     require the library for use in your scripts.
-  )
+  '
 
   s.author       = 'Michael Rodrigues'
   s.email        = 'mikebrodrigues@gmail.com'
 
   s.test_files = Dir['test/tc*.rb']
-  s.executables = %w(
+  s.executables = %w[
     onkyo.rb
     onkyo_server.rb
-  )
-
+  ]
 end

data/test/tc_dictionary.rb

@@ -1,4 +1,6 @@
-require_relative '../lib/eiscp/dictionary.rb'
+# frozen_string_literal: true
+
+require_relative '../lib/eiscp/dictionary'
 require 'minitest/autorun'
 
 class TestDictionary < MiniTest::Test

data/test/tc_message.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 require_relative '../lib/eiscp/message'
 require 'minitest/autorun'
 
@@ -6,7 +8,10 @@ class TestMessage <  MiniTest::Test
   DISCOVERY_STRING = DISCOVERY_PACKET.to_eiscp
 
   def test_create_discovery_iscp_message
-    assert_equal(EISCP::Message.new(command: 'ECN', value: 'QSTN', terminator: "\r\n", unit_type: 'x', start: '!').to_iscp, '!xECNQSTN')
+    assert_equal(
+      EISCP::Message.new(command: 'ECN', value: 'QSTN', terminator: "\r\n", unit_type: 'x',
+                         start: '!').to_iscp, '!xECNQSTN'
+    )
   end
 
   def test_create_messages

data/test/tc_parser.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 require_relative '../lib/eiscp/parser'
 require_relative '../lib/eiscp/message'
 require 'minitest/autorun'
@@ -27,7 +29,6 @@ class TestParser < MiniTest::Test
   end
 
   def test_return_nil_for_fake_human_readable
-    assert_equal(EISCP::Parser.parse('fake-command value'), nil)
+    assert_nil(EISCP::Parser.parse('fake-command value'))
   end
-
 end

data/test/tc_receiver.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 require_relative '../lib/eiscp/receiver'
 require 'minitest/autorun'
 

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: onkyo_eiscp_ruby
 version: !ruby/object:Gem::Version
-  version: 2.0.0
+  version: 2.1.5
 platform: ruby
 authors:
 - Michael Rodrigues
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-02-22 00:00:00.000000000 Z
+date: 2021-03-30 00:00:00.000000000 Z
 dependencies: []
 description: "\n    Control Onkyo receivers over the network.Use the provided binary
   or\n    require the library for use in your scripts.\n  "
@@ -63,13 +63,12 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubyforge_project: 
-rubygems_version: 2.4.5
+rubygems_version: 3.2.3
 signing_key: 
 specification_version: 4
 summary: Manipulate Onkyo stereos with the eISCP protocol
 test_files:
-- test/tc_parser.rb
-- test/tc_receiver.rb
 - test/tc_dictionary.rb
 - test/tc_message.rb
+- test/tc_parser.rb
+- test/tc_receiver.rb