binp 3.0.0 → 4.0.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 5de1859ad3bbdf310f87399636229f383e4f40dd5e85624d61ae65d6ac52c3ed
-  data.tar.gz: ac7a4cc8b986aa22022e6b3205d9d11d0c06d83504c2ca30b0788a3f7356993e
+  metadata.gz: 737c05ad3f05c0d57238526b2456d36e3a0fb1de14909d64fffa15942bfc76eb
+  data.tar.gz: 30c2ad4ec1b7a6cf12b772a85a4a811a5c22da0db93544346761584028fd3ff8
 SHA512:
-  metadata.gz: 651c3478c7d470f7e25fcaa7f1ef15a9c508a92ee8835e5c9a05380f2662e211036195172e80499df85d0a6ee61503dbcc22db554207781fda2b1e3769e00b1d
-  data.tar.gz: 150b67bc6b8a9502bf7a204e63afb3d6260f7c536cd5f4a89dd24090155678fb1d1a1f886c0bb4ba2fd99437e507cfb41e8a16f67ba685268b52e92de8f26816
+  metadata.gz: 19085d777a54bd338c9e12868ad3041a57540e568ba7cd36c9c1dae393235187fa5f9240708f5a517ff42e4f9a063ba5121d8a0dd49af4c56404dd6cd4b7a6ce
+  data.tar.gz: 6967cd575f2897023570563fc6985981b02b75dc7c62da6b807bafad938166875891f6f333c8270263273ba0a35681887a204b390b6f0c96bfe782dba5631564

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    binp (3.0.0)
+    binp (4.0.0)
       formatador
 
 GEM

data/example/example_01.yaml

@@ -59,6 +59,8 @@
   size: 1
   type: UINT8
   endianness: BIG
+  value_label:
+    136: one hundred thirty six
 - name: FLAGS
   offset: 31
   type: FLAGS

data/lib/binp.rb

@@ -8,7 +8,7 @@ class BinParser
       if e['type'] == BinParserElement::Type::FLAGS
         e = BinParserElement.get_flags(uint8_array, e)
       else
-        e['value'] = BinParserElement.get_value(uint8_array, e['offset'], e['size'], e['type'], e['endianness'])
+        e['value'] = BinParserElement.get_value(uint8_array, e['offset'], e['size'], e['type'], e['endianness'], e['value_label'])
       end
       e
     }
@@ -79,11 +79,15 @@ class BinParserElement
     'C' * size
   end
 
-  def self.get_value(uint8_array, offset, size, type, endianness)
+  def self.get_value(uint8_array, offset, size, type, endianness, value_labels={})
     target = uint8_array.slice(offset, size)
     pack_template_string = calculate_pack_template_string(size)
     unpack_template_string = calculate_unpack_template_string(type, endianness)
-    target.pack(pack_template_string).unpack(unpack_template_string)[0]
+    value = target.pack(pack_template_string).unpack(unpack_template_string)[0]
+
+    # value_label が設定されている数値であれば、それに置き換える
+    value_labels ||= {}
+    value_labels.fetch(value, value)
   end
 
   def self.get_flags(uint8_array, config)

data/lib/binp/cli/main.rb

@@ -42,10 +42,31 @@ class Main
         all: false
     }
     op = OptionParser.new
+    op.banner = 'Usage: binp [options] FILE'
 
     op.on('-c VALUE', '--config VALUE', '設定ファイルパス') { |v| options[:config] = v }
     op.on('-a', '--all', 'name, value 以外のすべての項目(endianness, offset, size, type)を表示する') { |v| options[:all] = true }
-    op.parse!(argv)
+    begin
+      op.parse!(argv)
+    rescue OptionParser::InvalidOption => e
+      STDERR.puts 'ERROR: オプションのパースに失敗しました。'
+      STDERR.puts op.to_s
+      exit(1);
+    end
+
+    # 必須オプション `-c` のチェック
+    unless options[:config]
+      STDERR.puts 'ERROR: 必須オプション `-c, --config` が指定されていません。'
+      STDERR.puts op.to_s
+      exit(1);
+    end
+
+    # ファイル指定があるかのチェック
+    if argv.size == 0
+      STDERR.puts 'ERROR: FILE が指定されていません。'
+      STDERR.puts op.to_s
+      exit(1);
+    end
 
     [options, argv]
   end

data/lib/binp/version.rb

@@ -1,3 +1,3 @@
 module Binp
-  VERSION = "3.0.0"
+  VERSION = "4.0.0"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: binp
 version: !ruby/object:Gem::Version
-  version: 3.0.0
+  version: 4.0.0
 platform: ruby
 authors:
 - mikoto2000
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2020-08-30 00:00:00.000000000 Z
+date: 2021-02-21 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: formatador
@@ -100,7 +100,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.1.2
+rubygems_version: 3.1.4
 signing_key: 
 specification_version: 4
 summary: binary file parser.