msgpack-inspect 0.1.2 → 0.1.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 6e91d7d7767afb363718c4d91b9eb5b3777d1ba6
-  data.tar.gz: 5ddb504a62ad2ef03baa4fa5f0155ad301c9a769
+  metadata.gz: 56c1643fed6f78a15d1504da7a41d211c26d97bd
+  data.tar.gz: 5a13789e05e563e1e4591f4bd924873617da314e
 SHA512:
-  metadata.gz: ba04b57ddfac50103b15bacf1ed8dd3d82bad41a0cd0b1d6d61136ef0622f01c482fa73e42bfa967e990ece5d3b68e4fc77da7d617a1201f51ce6ab744abddfe
-  data.tar.gz: 7bdb948ec679f023f568b4b10d9a6f4718e3f402365612e742f4662628be64c4198e05e4188046ff3508857b19f094f9997ee408a831b75b56b32996676ffcd0
+  metadata.gz: 27ae13a9338558e17e318a0a220d5bdeb7cc0237bba61c1351fe03e4962898de0e7c1a181e6533dabdc61f4390198206e5809d3075e65eb67e7195211be3e65c
+  data.tar.gz: 40f96ca5d376e78a9973ad01ae0a1c885c2b1becf99453ca2bbb2f3f59e917e9e6cbe6562f7c50f248f5e9737b64cf737f99c18830bfe590137e730ca3d356e7

data/README.md

@@ -4,17 +4,9 @@ This is a command line tool to inspect/show a data serialized by [MessagePack](h
 
 ## Installation
 
-Add this line to your application's Gemfile:
+Executable binary files are available from [releases](https://github.com/tagomoris/msgpack-inspect/releases). Download a file for your platform, and use it.
 
-```ruby
-gem 'msgpack-inspect'
-```
-
-And then execute:
-
-    $ bundle
-
-Or install it yourself as:
+Otherwise, you can install rubygem version on your CRuby runtime:
 
     $ gem install msgpack-inspect
 
@@ -25,11 +17,14 @@ Usage: msgpack-inspect [options] FILE
 
 Options:
 
-    -f, --format FORMAT              output format of inspection result (yaml/json) [default: yaml]
+    -f, --format FORMAT              output format of inspection result (yaml/json/jsonl) [default: yaml]
     -r, --require LIB                ruby file path to require (to load ext type definitions)
+    -v, --version                    Show version of this software
     -h, --help                       Show this message
 ```
 
+`-r` option is available oly with rubygem version, and unavailable with mruby binary release.
+
 FILE is a file which msgpack binary stored. Specify `-` to inspect data from STDIN.
 This command shows the all data contained in specified format (YAML in default).
 

data/Rakefile

@@ -62,7 +62,6 @@ task :release => :compile do
 
         Dir.chdir(arch) do
           arch_release = "#{app_name}-#{arch}"
-          puts "current dir #{Dir.pwd}"
           puts "Writing #{release_path}/#{arch_release}.tgz"
           `tar czf #{release_path}/#{arch_release}.tgz *`
         end

data/lib/msgpack/inspect/command.rb

@@ -13,7 +13,7 @@ module MessagePack
         opts.separator ""
         opts.separator "Options:"
         opts.separator ""
-        opts.on("-f", "--format FORMAT", "output format of inspection result (yaml/json) [default: yaml]") do |v|
+        opts.on("-f", "--format FORMAT", "output format of inspection result (#{MessagePack::Inspect::FORMATS.compact.join('/')}) [default: yaml]") do |v|
           format = v.to_sym
         end
         opts.on("-r", "--require LIB", "ruby file path to require (to load ext type definitions)") do |path|

data/lib/msgpack/inspect/inspector.rb

@@ -3,33 +3,42 @@ module MessagePack
     class Inspector
       FORMATS = [:yaml, :json, :jsonl, nil] # nil is for test (without stream dump)
 
-      def initialize(io, format = :yaml, opt)
+      def initialize(io, format = :yaml, opt={})
         # return_values: false, output_io: STDOUT
         @io = io
         @format = format
         @streamer = MessagePack::Inspect::Streamer.get(@format)
-        @return_values = opt.fetch(:return_values, false)
-        @output_io = opt.fetch(:output_io, STDOUT)
+        @return_values = opt[:return_values] || false
+        @output_io = opt[:output_io] || STDOUT
       end
 
       def inspect
         data = []
         @streamer.objects(@output_io, 0) do
           i = 0
-          until @io.eof?
-            @streamer.object(@output_io, 1, i) do
-              obj = dig(1)
-              data << obj if @return_values
+          begin
+            while true
+              first_byte = @io.read(1)
+              break if first_byte.nil? && @io.eof?
+              # breaking out of @streamer.object before writing object-start bytes into STDOUT
+              @streamer.object(@output_io, 1, i) do
+                obj = dig(1, true, first_byte)
+                data << obj if @return_values
+              end
+              i += 1
             end
-            i += 1
+          rescue EOFError
+            # end of input
           end
         end
         @return_values ? data : nil
       end
 
-      def dig(depth, heading = true)
-        header_byte = @io.read(1)
+      def dig(depth, heading = true, first_byte = nil)
+        header_byte = first_byte || @io.read(1)
         # TODO: error handling for header_byte:nil or raised exception
+        raise EOFError if header_byte.nil? && @io.eof?
+
         header = header_byte.b
         fmt = parse_header(header)
         node = MessagePack::Inspect::Node.new(fmt, header)

data/lib/msgpack/inspect/node.rb

@@ -149,7 +149,9 @@ module MessagePack
           v1 = io.read(4)
           v2 = io.read(4)
           @data = hex(v1) + hex(v2)
-          @value = (v1.unpack('N').first << 32) | v2.unpack('N').first
+          # mruby doesn't have Bignum, and Float doesn't support #|
+          # @value = (v1.unpack('N').first << 32) | v2.unpack('N').first
+          @value = (v1.unpack('N').first << 32) + v2.unpack('N').first
         when :int8
           v = io.read(1)
           @data = hex(v)
@@ -176,11 +178,18 @@ module MessagePack
           v1 = io.read(4)
           v2 = io.read(4)
           @data = hex(v1) + hex(v2)
-          n = (v1.unpack('N').first << 32) | v2.unpack('N').first
-          @value = if n & 0x8000_0000_0000_0000 > 0 # negative
-                     n - MAX_INT64
-                   else
-                     n
+          # mruby doesn't have Bignum, and Float doesn't support #|
+          # n = (v1.unpack('N').first << 32) | v2.unpack('N').first
+          # @value = if n & 0x8000_0000_0000_0000 > 0 # negative
+          #            n - MAX_INT64
+          #          else
+          #            n
+          #          end
+          upper = v1.unpack('N').first
+          @value = if upper & 0x8000_0000 > 0 # negative
+                     (upper << 32) + v2.unpack('N').first - MAX_INT64
+                   else # positive
+                     (upper << 32) + v2.unpack('N').first
                    end
         else
           raise "unknown int format #{@format}"
@@ -220,8 +229,8 @@ module MessagePack
         if [:fixstr, :str8, :str16, :str32].include?(@format)
           begin
             @value = v.force_encoding('UTF-8')
-          rescue
-            @error = $!.message
+          rescue => e
+            @error = e.message
           end
         else
           @value = v.b

data/lib/msgpack/inspect/version.rb

@@ -1,5 +1,5 @@
 module MessagePack
   module Inspect
-    VERSION = "0.1.2"
+    VERSION = "0.1.3"
   end
 end

data/mrbgem.rake

@@ -1,10 +1,19 @@
-require_relative 'mrblib/msgpack/inspect/version'
+require_relative 'lib/msgpack/inspect/version' # mrblib/msgpack/inspect/version is symlink to that file
 
 spec = MRuby::Gem::Specification.new('msgpack-inspect') do |spec|
+  spec.rbfiles = [
+    "mrblib/msgpack/inspect/version.rb",
+    "mrblib/msgpack/inspect/node.rb",
+    "mrblib/msgpack/inspect/streamer.rb",
+    "mrblib/msgpack/inspect/inspector.rb",
+    "mrblib/msgpack/inspect.rb",
+    "mrblib/msgpack-inspect.rb",
+  ]
   spec.bins    = ['msgpack-inspect']
   spec.add_dependency 'mruby-io', mgem: 'mruby-io'
-  spec.add_dependency 'mruby-print', :core => 'mruby-print'
-  spec.add_dependency 'mruby-mtest', :mgem => 'mruby-mtest'
+  spec.add_dependency 'mruby-pack', mgem: 'mruby-pack'
+  spec.add_dependency 'mruby-print', core: 'mruby-print'
+  spec.add_dependency 'mruby-mtest', mgem: 'mruby-mtest'
 end
 
 spec.license = 'Apache-2.0'

data/mrblib/msgpack-inspect.rb

@@ -1,9 +1,20 @@
+class String
+  # It's only for mruby... Encoding of String are defined by MRB_UTF8_STRING (or undef it) on build time.
+  # Default is disabled, and this tool is built under that configuration.
+  def force_encoding(encoding)
+    self
+  end
+  def b
+    self
+  end
+end
+
 def show_usage
   msg = <<-EOL
 Usage: msgpack-inspect [options] FILE"
 
 Options:
-  -f, --format FORMAT   Output format of inspection result (yaml/json) [default: yaml]
+  -f, --format FORMAT   Output format of inspection result (#{MessagePack::Inspect::FORMATS.reject{|v| v.nil? }.join('/')}) [default: yaml]
   -r, --require LIB     (Not supported in binary executable)
   -h, --help            Show this message
   -v, --version         Show version of this software
@@ -36,7 +47,7 @@ def __main__(argv)
       arg = argv.shift
       if arg == '--'
         parsing_option = false
-      elsif arg.start_with?('-')
+      elsif arg[0] == '-' && arg.length > 1
         show_usage
         raise "Unknown option specified: #{arg}"
       else
@@ -62,5 +73,5 @@ def __main__(argv)
     show_usage
     raise "Unsupported format: #{format}"
   end
-  puts MessagePack::Inspect.inspect(io).dump(format)
+  MessagePack::Inspect.inspect(io, format).inspect
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: msgpack-inspect
 version: !ruby/object:Gem::Version
-  version: 0.1.2
+  version: 0.1.3
 platform: ruby
 authors:
 - TAGOMORI Satoshi