intel_hex 0.5.2 → 0.5.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: a67ed5207fb30323f40db0ef565965c501d7d85c3d040bbaf80eec3642c076b0
-  data.tar.gz: 7242a9b940678f30065fbfe71ff5e06c1d8cc953cd63f122eb1b6d9ce0416837
+  metadata.gz: 5d15e5760f2d577b90bcb4265ce05878a505aa0ac0cc613d671324867a821ace
+  data.tar.gz: cc2dea512304abc088412f5c3e3338fec83aaf3208bec0d4a31bfa51b305864f
 SHA512:
-  metadata.gz: e2db72c94bb8b1c062ce981255320f2b7dbb15441acdecc640ea4a4cfa5f411756c0e9ed22a485aef97c773bca82a37f8f0a8c7f4a7d5e2e134c5e5e9b58e3e3
-  data.tar.gz: e3db780d5faaac61770594eb0fe85055619d0bf76844afea4e591167a6d535636f8a610046126176bebbadfdcd60560625af92c308869b1cd25b3321dbc640c9
+  metadata.gz: 2c39cddd4c1166c65d70b29fee0bb65ed0f6cb0a702d176c80bac7f3377925966cfeb73a1766beeb8dd05c4c4e0436e377e02d826031654ad88305108fce67b9
+  data.tar.gz: '04966a59f357db62b1197ee82d5c063f18b115c17496fa1bc8b9429055a6d1b17dc8d45791a20f108484b277f237063748cb32db15b80949b922b544b4ffe43a'

data/bin/intel_hex_reader

@@ -1,4 +1,5 @@
 #!/usr/bin/env ruby
+# frozen_string_literal: true
 
 require 'optparse'
 require 'intel_hex'
@@ -9,30 +10,27 @@ require 'pp'
 }
 
 OptionParser.new do |opts|
-  opts.on('--help', 'Print this help.') { puts; puts opts; puts; exit }
-  opts.on('-f', '--filename=FILE', 'Load the specified file.') { |o| @options[:file] = o }
+  opts.on('--help', 'Print this help.') do
+    puts
+    puts opts
+    puts
+    exit
+  end
+  opts.on('-f', '--filename=FILE', 'Load the specified file.') do |o|
+    @options[:file] = o
+  end
 end.parse!
 
-raise "No file specified" unless @options[:file]
+raise 'No file specified' unless @options[:file]
 
 intel_hex_file = IntelHex::FileReader.new(@options[:file])
 
 intel_hex_file.each_record do |record|
-  case record.type
-  when :data
-    record_data = "data=" + record.data.map { |b| "%02x" % b }.join(" ")
-  when :eof
-    record_data = ""
-  else
-    record_data = "value=" + record.send(data.type)
-  end    
-
-  puts "Record type=%-4s offset=%-4d length=%-4d checksum=%-4d %s" % [
+  puts 'Record type=%-4s offset=%-4d length=%-4d checksum=%-4d %s' % [
     record.type,
     record.offset,
     record.length,
     record.checksum,
-    record_data,
+    record.value_s,
   ]
 end
-

data/lib/intel_hex.rb

@@ -1,6 +1,8 @@
+# frozen_string_literal: true
+
 module IntelHex
 end
 
 require 'intel_hex/version'
 require 'intel_hex/record'
-require 'intel_hex/file_reader'
+require 'intel_hex/file_reader'

data/lib/intel_hex/file_reader.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 module IntelHex
   class FileReader
     def initialize(filename)
@@ -12,7 +14,7 @@ module IntelHex
 
     def each_record
       return to_enum(:each_record) unless block_given?
-  
+
       file = File.open(@filename, 'r')
 
       begin
@@ -25,10 +27,10 @@ module IntelHex
 
       nil
     end
-  
+
     def each_byte_with_address
       return to_enum(:each_byte_with_address) unless block_given?
-  
+
       each_record do |record|
         case record.type
         when :data
@@ -49,4 +51,4 @@ module IntelHex
       nil
     end
   end
-end
+end

data/lib/intel_hex/record.rb

@@ -1,23 +1,27 @@
+# frozen_string_literal: true
+
 module IntelHex
   class MisformattedFileError < RuntimeError; end
-  class InvalidTypeError < RuntimeError; end
-  class InvalidLengthError < RuntimeError; end
-  class InvalidOffsetError < RuntimeError; end
-  class InvalidDataError < RuntimeError; end
-  class InvalidChecksumError < RuntimeError; end
+
+  class ValidationError < StandardError; end
+  class InvalidTypeError < ValidationError; end
+  class InvalidLengthError < ValidationError; end
+  class InvalidOffsetError < ValidationError; end
+  class InvalidDataError < ValidationError; end
+  class InvalidChecksumError < ValidationError; end
 
   class Record
-    TYPES = [
-      :data,
-      :eof,
-      :esa,
-      :ssa,
-      :ela,
-      :sla,
-    ]
-
-    TYPE_MAP = TYPES.each_with_index.inject({}) { |h, (k, i)| h[k] = i; h }
-  
+    TYPES = %i[
+      data
+      eof
+      esa
+      ssa
+      ela
+      sla
+    ].freeze
+
+    TYPE_MAP = TYPES.each_with_index.each_with_object({}) { |(k, i), h| h[k] = i }
+
     TYPE_DATA_LENGTH = {
       data: (1..255),
       eof: 0,
@@ -25,14 +29,14 @@ module IntelHex
       ssa: 4,
       ela: 2,
       sla: 4,
-    }
+    }.freeze
 
     def self.parse(line)
-      raise MisformattedFileError.new("Expected ':' at start of line") unless line[0] == ':'
-      raise MisformattedFileError.new("Line length incorrect") unless line.size >= (1 + 2 + 4 + 2)
+      raise MisformattedFileError, 'Expected \':\' at start of line' unless line[0] == ':'
+      raise MisformattedFileError, 'Line length incorrect' unless line.size >= (1 + 2 + 4 + 2)
 
       length = line[1..2].to_i(16)
-      data_end = (9 + length*2)
+      data_end = (9 + length * 2)
 
       offset = line[3..6].to_i(16)
       type = TYPES[line[7..8].to_i(16)]
@@ -81,7 +85,8 @@ module IntelHex
     attr_reader :checksum
     attr_reader :line
 
-    def initialize(type, length = 0, offset = 0, data = [], checksum=nil, line: nil, validate: false)
+    # rubocop:disable Metrics/ParameterLists
+    def initialize(type, length = 0, offset = 0, data = [], checksum = nil, line: nil, validate: false)
       @type = type
       @length = length
       @offset = offset
@@ -92,17 +97,28 @@ module IntelHex
 
       self.validate if validate
     end
+    # rubocop:enable Metrics/ParameterLists
+
+    def data_s
+      '[' + data.map { |b| '%02x' % b }.join(' ') + ']'
+    end
+
+    def value_s
+      return '' if type == :eof
+
+      "#{type}=#{type == :data ? data_s : send(type)}"
+    end
 
     def to_s
-      "#<#{self.class.name} type=#{type} offset=#{offset} length=#{length}>"
+      "#<#{self.class.name} type=#{type} offset=#{offset} length=#{length} #{value_s}>"
     end
 
     def to_ascii
-      ":%02X%04X%02X%s%02X" % [
+      ':%02X%04X%02X%s%02X' % [
         length,
         offset,
         TYPE_MAP[type],
-        data.map { |b| "%02X" % b }.join,
+        data.map { |b| '%02X' % b }.join,
         checksum,
       ]
     end
@@ -111,7 +127,7 @@ module IntelHex
       return @calculated_checksum if @calculated_checksum
 
       sum = length + ((offset & 0xff00) >> 8) + (offset & 0x00ff) + TYPE_MAP[type]
-      sum += data.inject(0) { |s, n| s += n; s }
+      sum += data.sum
 
       @calculated_checksum = (((sum & 0xff) ^ 0xff) + 1) & 0xff
     end
@@ -122,12 +138,10 @@ module IntelHex
     end
 
     def valid?
-      begin
-        validate
-        return true
-      rescue
-        return false
-      end
+      validate
+      true
+    rescue ValidationError
+      false
     end
 
     def validate
@@ -139,12 +153,14 @@ module IntelHex
     end
 
     def validate_type
-      raise InvalidTypeError.new("Type #{type} is invalid") unless TYPE_MAP.include?(type)
+      return if TYPE_MAP.include?(type)
+
+      raise InvalidTypeError, "Type #{type} is invalid"
     end
 
     def validate_offset
-      raise InvalidOffsetError.new("Offset #{offset} is negative") unless offset >= 0
-      raise InvalidOffsetError.new("Offset #{offset} is too large") unless offset < 2**16
+      raise InvalidOffsetError, "Offset #{offset} is negative" unless offset >= 0
+      raise InvalidOffsetError, "Offset #{offset} is too large" unless offset < 2**16
     end
 
     def validate_length
@@ -157,20 +173,24 @@ module IntelHex
         return if valid_length.include?(length)
       end
 
-      raise InvalidLengthError.new("Length for type #{type} must be #{valid_length}; #{length} given") 
+      raise InvalidLengthError, "Length for type #{type} must be #{valid_length}; #{length} given"
     end
 
     def validate_data
-      raise InvalidDataError.new("Data length #{data.size} does not match length #{length}") unless data.size == length
+      return if data.size == length
+
+      raise InvalidDataError, "Data length #{data.size} does not match length #{length}"
     end
 
     def validate_checksum
-      raise InvalidChecksumError.new("Checksum value #{checksum} does not match expected checksum #{calculate_checksum}") unless calculate_checksum == checksum
+      return if calculate_checksum == checksum
+
+      raise InvalidChecksumError, "Checksum value #{checksum} does not match expected checksum #{calculate_checksum}"
     end
 
     def each_byte_with_address
       return Enumerator.new(self, :each_byte_with_address) unless block_given?
-  
+
       data.each_with_index do |byte, i|
         yield byte, offset + i
       end
@@ -179,12 +199,12 @@ module IntelHex
     end
 
     def data=(value)
-      raise "Incorrect data type" unless value.is_a?(Array)
-      raise InvalidLengthError.new("Data length #{value.size} too large") unless value.size <= 255
+      raise 'Incorrect data type' unless value.is_a?(Array)
+      raise InvalidLengthError, "Data length #{value.size} too large" unless value.size <= 255
+
       @data = value
       @length = data.size
       @checksum = recalculate_checksum
-      nil
     end
 
     def data_to_uint16(offset = 0)
@@ -192,9 +212,9 @@ module IntelHex
     end
 
     def uint16_to_data(value, offset = 0)
-      self.data[(offset...(offset+2))] = [
+      data[(offset...(offset + 2))] = [
         (value & 0xff00) >> 8,
-        value & 0x00ff
+        value & 0x00ff,
       ]
       @length = data.size
       @checksum = recalculate_checksum
@@ -205,24 +225,24 @@ module IntelHex
     end
 
     def uint32_to_data(value, offset = 0)
-      self.data[(offset...(offset+4))] = [
+      data[(offset...(offset + 4))] = [
         (value & 0xff000000) >> 24,
         (value & 0x00ff0000) >> 16,
         (value & 0x0000ff00) >> 8,
-        value & 0x000000ff
+        value & 0x000000ff,
       ]
       @length = data.size
       @checksum = recalculate_checksum
     end
 
-    alias_method :esa, :data_to_uint16
-    alias_method :ssa, :data_to_uint32
-    alias_method :ela, :data_to_uint16
-    alias_method :sla, :data_to_uint32
+    alias esa data_to_uint16
+    alias ssa data_to_uint32
+    alias ela data_to_uint16
+    alias sla data_to_uint32
 
-    alias_method :esa=, :uint16_to_data
-    alias_method :ssa=, :uint32_to_data
-    alias_method :ela=, :uint16_to_data
-    alias_method :sla=, :uint32_to_data
+    alias esa= uint16_to_data
+    alias ssa= uint32_to_data
+    alias ela= uint16_to_data
+    alias sla= uint32_to_data
   end
-end
+end

data/lib/intel_hex/version.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 module IntelHex
-  VERSION = '0.5.2'
+  VERSION = '0.5.3'
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: intel_hex
 version: !ruby/object:Gem::Version
-  version: 0.5.2
+  version: 0.5.3
 platform: ruby
 authors:
 - Jeremy Cole