binp 1.0.1 → 2.0.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 1a4de217cf49fbe9ad1552cc60a1ae2540bae88b80d0928c68e1cd75420cddd5
-  data.tar.gz: 727df670211100ce6c543a1cef18d79de8c6cd0823a9d5437fecc6a68ee915af
+  metadata.gz: 2d49a717a9a7b1fcd593c87782a690933f3c9a3042bf334dd11599bdec38f2c9
+  data.tar.gz: 9947217a434b646fee53adbe3b5aa36f0be3139fccdd2942ca80ea7efb1a7de8
 SHA512:
-  metadata.gz: 1d04b3140f4ca1141227a9c36cc9a55b3a57b5d1720c9c93a7422d69f3a4949cdd8b4e73364b8f5601e63c019cf7e877f9098a5337f9cba4b456c02db9a7efee
-  data.tar.gz: aa95893807847f192e40f580be9757e30a2fb63c005f0781b0929d5e4e5e6cf61e0762aa9a3b6e43d7c3bf9bc91918a5fac044f82b039d24dd5a05f1f8434947
+  metadata.gz: a9da24affaff3ac7a84476674ebafc5eb13dabba3ada9c2e18ba7e3b1c0a382d008f1bef9405a1c4b8907a4558a9e2ff32461a516d7b5dbeb30c37bea39a3b16
+  data.tar.gz: b2ceebf7ce2c19abe698e45617407acd379818052fdd6b6f3a95ac58a38b63653f4ed34399f68a3bb5c03d47772383ea5a209c96f5c5fc860d85f3e92a0b0207

data/Gemfile.lock

@@ -1,12 +1,14 @@
 PATH
   remote: .
   specs:
-    binp (1.0.1)
+    binp (2.0.0)
+      formatador
 
 GEM
   remote: https://rubygems.org/
   specs:
     docile (1.3.2)
+    formatador (0.2.5)
     power_assert (1.2.0)
     rake (12.3.3)
     simplecov (0.18.5)

data/README.md

@@ -80,7 +80,7 @@ $ ruby binary_parser.rb -c setting.yaml example.bin | jq '.'
 
 # TODO:
 
-- [ ] : テーブル形式で表示
+- [x] : テーブル形式で表示
 - [ ] : 文字列型サポート
     - [ ] : UTF8
 - [ ] : ビットフラグサポート

data/binp.gemspec

@@ -25,6 +25,8 @@ Gem::Specification.new do |spec|
   spec.executables   = spec.files.grep(%r{^exe/}) { |f| File.basename(f) }
   spec.require_paths = ["lib"]
 
+  spec.add_dependency 'formatador'
+
   spec.add_development_dependency 'test-unit'
   spec.add_development_dependency 'simplecov'
 end

data/lib/binp.rb

@@ -40,33 +40,33 @@ class BinParserElement
   # see: https://docs.ruby-lang.org/ja/latest/doc/pack_template.html
   def self.calculate_unpack_template_string(type, endianness)
 
-    # ����ȏ���
+    # 特殊な条件
     case type
     when BinParserElement::Type::UINT16
       if endianness == BinParserElement::Endianness::BIG_ENDIAN
-        # �r�b�O�G���f�B�A���A�����Ȃ� 16 bit ����
+        # ビッグエンディアン、符号なし 16 bit 整数
         return 'n'
       else
-        # ���g���G���f�B�A���A�����Ȃ� 16 bit ����
+        # リトルエンディアン、符号なし 16 bit 整数
         return 'v'
       end
     when BinParserElement::Type::UINT32
       if endianness == BinParserElement::Endianness::BIG_ENDIAN
-        # �r�b�O�G���f�B�A���A�������� 32 bit ����
+        # ビッグエンディアン、符号あり 32 bit 整数
         return 'N'
       else
-        # ���g���G���f�B�A���A�������� 32 bit ����
+        # リトルエンディアン、符号あり 32 bit 整数
         return 'V'
       end
     when BinParserElement::Type::UINT8
-      # �����Ȃ� 8 bit ����
+      # 符号なし 8 bit 整数
       return 'C'
     when BinParserElement::Type::INT8
-      # �������� 8 bit ����
+      # 符号あり 8 bit 整数
       return 'c'
     end
 
-    # ���̑�
+    # その他
     type[:value] + endianness[:value]
   end
 

data/lib/binp/cli/main.rb

@@ -1,4 +1,5 @@
 # encoding: UTF-8
+require 'formatador'
 require 'json'
 require 'optparse'
 require 'yaml'
@@ -18,18 +19,25 @@ class Main
     raw_result = BinParser.parse(uint8_array, config)
 
     # 出力用に加工して出力
-    puts raw_result.map { |e|
+    result = raw_result.map { |e|
       e['type'] = e['type'][:name]
       e['endianness'] = e['endianness'][:name]
       e
-    }.to_json.to_s
+    }
+    if  !opts[:all]
+        result.map! { |e| { 'name' => e['name'], 'value' => e['value']} }
+    end
+    Formatador.display_compact_table(result)
   end
 
   def self.parse_option(argv)
-    options = {}
+    options = {
+        all: false
+    }
     op = OptionParser.new
 
     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)
 
     [options, argv]

data/lib/binp/version.rb

@@ -1,3 +1,3 @@
 module Binp
-  VERSION = "1.0.1"
+  VERSION = "2.0.0"
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: binp
 version: !ruby/object:Gem::Version
-  version: 1.0.1
+  version: 2.0.0
 platform: ruby
 authors:
 - mikoto2000
@@ -10,6 +10,20 @@ bindir: exe
 cert_chain: []
 date: 2020-08-19 00:00:00.000000000 Z
 dependencies:
+- !ruby/object:Gem::Dependency
+  name: formatador
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: test-unit
   requirement: !ruby/object:Gem::Requirement