msgpack-inspect 0.1.1 → 0.1.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: d5a3c533c3c23728a626a5f6a92b0ded176cf1cb
-  data.tar.gz: 2a5d4ed28d7d5d02886d3a80ae88571ea966b450
+  metadata.gz: 6e91d7d7767afb363718c4d91b9eb5b3777d1ba6
+  data.tar.gz: 5ddb504a62ad2ef03baa4fa5f0155ad301c9a769
 SHA512:
-  metadata.gz: f0748e0b795f82c17b95e44a065e59cea0a7cb23347d1503af7b551320f5c221e5440f468ef023075b460b643aaf9b5871acb63b9dacb1c82d033924d05433da
-  data.tar.gz: d827254fb029595163b033a211bdda005be4fc3eea5b41beb016f8d46f1c690d0284964057113c1d1416e7efb0ee072249a22e2a204dece8a1e62332f75cdf4c
+  metadata.gz: ba04b57ddfac50103b15bacf1ed8dd3d82bad41a0cd0b1d6d61136ef0622f01c482fa73e42bfa967e990ece5d3b68e4fc77da7d617a1201f51ce6ab744abddfe
+  data.tar.gz: 7bdb948ec679f023f568b4b10d9a6f4718e3f402365612e742f4662628be64c4198e05e4188046ff3508857b19f094f9997ee408a831b75b56b32996676ffcd0

data/.gitignore

@@ -7,3 +7,5 @@
 /pkg/
 /spec/reports/
 /tmp/
+/mruby/
+/releases/

data/.travis.yml

@@ -1,11 +1,10 @@
 language: ruby
 
 rvm:
-  - 2.3
+  - 2.3.1
 
-os:
-  - linux
-  - osx
+script:
+  - bundle exec rake test
 
 sudo: false
 

data/Dockerfile

@@ -0,0 +1 @@
+FROM hone/mruby-cli

data/README.md

@@ -45,9 +45,45 @@ This command shows the all data contained in specified format (YAML in default).
   :value: true
 ```
 
+## Example
+
+This is a example to inspect a data from STDIN.
+The data corresponds to `{"compact":true,"schema":0}` in JSON.
+
+```
+$ printf "\x82\xa7compact\xc3\xa6schema\x00" | msgpack-inspect -
+---
+- :format: :fixmap
+  :header: '82'
+  :length: 2
+  :children:
+  - :key:
+      :format: :fixstr
+      :header: a7
+      :length: 7
+      :data: 636f6d70616374
+      :value: compact
+    :value:
+      :format: :true
+      :header: c3
+      :data: c3
+      :value: true
+  - :key:
+      :format: :fixstr
+      :header: a6
+      :length: 6
+      :data: 736368656d61
+      :value: schema
+    :value:
+      :format: :fixint
+      :header: '00'
+      :data: '00'
+      :value: 0
+```
+
 TODO: show more example
 
 ## Contributing
 
-Bug reports and pull requests are welcome on GitHub at [https://github.com/tafomoris/msgpack-inspect].
+Bug reports and pull requests are welcome on GitHub at [https://github.com/tagomoris/msgpack-inspect].
 

data/Rakefile

@@ -1,18 +1,130 @@
-require "bundler/gem_tasks"
-
 require 'fileutils'
-require 'rake/testtask'
-require 'rake/clean'
 
-Rake::TestTask.new(:test) do |t|
-  # To run test for only one file (or file path pattern)
-  #  $ bundle exec rake test TEST=test/test_specified_path.rb
-  #  $ bundle exec rake test TEST=test/test_*.rb
-  t.libs << "test"
-  t.test_files = Dir["test/**/test_*.rb"].sort
-  t.verbose = true
-  t.warning = true
-  t.ruby_opts = ["-Eascii-8bit:ascii-8bit"]
+MRUBY_VERSION="1.2.0"
+
+file :mruby do
+  #sh "git clone --depth=1 https://github.com/mruby/mruby"
+  sh "curl -L --fail --retry 3 --retry-delay 1 https://github.com/mruby/mruby/archive/#{MRUBY_VERSION}.tar.gz -s -o - | tar zxf -"
+  FileUtils.mv("mruby-#{MRUBY_VERSION}", "mruby")
+end
+
+APP_NAME=ENV["APP_NAME"] || "msgpack-inspect"
+APP_ROOT=ENV["APP_ROOT"] || Dir.pwd
+# avoid redefining constants in mruby Rakefile
+mruby_root=File.expand_path(ENV["MRUBY_ROOT"] || "#{APP_ROOT}/mruby")
+mruby_config=File.expand_path(ENV["MRUBY_CONFIG"] || "build_config.rb")
+ENV['MRUBY_ROOT'] = mruby_root
+ENV['MRUBY_CONFIG'] = mruby_config
+Rake::Task[:mruby].invoke unless Dir.exist?(mruby_root)
+load "#{mruby_root}/Rakefile"
+Rake::Task['test'].clear # to clear test task of mruby/Rakefile
+
+desc "compile binary"
+task :compile => [:all] do
+  Dir.chdir(mruby_root) do
+    MRuby.each_target do |target|
+      `#{target.cc.command} --version`
+      abort("Command #{target.cc.command} for #{target.name} is missing.") unless $?.success?
+    end
+    %W(#{mruby_root}/build/x86_64-pc-linux-gnu/bin/#{APP_NAME} #{mruby_root}/build/i686-pc-linux-gnu/#{APP_NAME}).each do |bin|
+      sh "strip --strip-unneeded #{bin}" if File.exist?(bin)
+    end
+  end
+end
+
+desc "cleanup"
+task :clean do
+  Dir.chdir(mruby_root) do
+    sh "rake deep_clean"
+  end
+end
+
+desc "generate a release tarball"
+task :release => :compile do
+  require 'tmpdir'
+
+  Dir.chdir(mruby_root) do
+  # since we're in the mruby/
+  release_dir  = "releases/v#{APP_VERSION}"
+  release_path = Dir.pwd + "/../#{release_dir}"
+  app_name     = "#{APP_NAME}-#{APP_VERSION}"
+  FileUtils.mkdir_p(release_path)
+
+  Dir.mktmpdir do |tmp_dir|
+    Dir.chdir(tmp_dir) do
+      MRuby.each_target do |target|
+        next if name == "host"
+
+        arch = name
+        bin  = "#{build_dir}/bin/#{exefile(APP_NAME)}"
+        FileUtils.mkdir_p(name)
+        FileUtils.cp(bin, name)
+
+        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
+      end
+
+      puts "Writing #{release_dir}/#{app_name}.tgz"
+      `tar czf #{release_path}/#{app_name}.tgz *`
+    end
+  end
+  end
+end
+
+namespace :local do
+  desc "show version"
+  task :version do
+    puts "#{APP_NAME} #{APP_VERSION}"
+  end
+end
+
+def is_in_a_docker_container?
+  `test -f /proc/self/cgroup && grep -q docker /proc/self/cgroup`
+  $?.success?
+end
+
+Rake.application.tasks.each do |task|
+  next if ENV["MRUBY_CLI_LOCAL"]
+  unless task.name.start_with?("local:") || task.name == 'test'
+    # Inspired by rake-hooks
+    # https://github.com/guillermo/rake-hooks
+    old_task = Rake.application.instance_variable_get('@tasks').delete(task.name)
+    desc old_task.full_comment
+    task old_task.name => old_task.prerequisites do
+      abort("Not running in docker, you should type \"docker-compose run <task>\".")         unless is_in_a_docker_container?
+      old_task.invoke
+    end
+  end
+end
+
+if is_in_a_docker_container?
+  load File.join(File.expand_path(File.dirname(__FILE__)), "mrbgem.rake")
+
+  current_gem = MRuby::Gem.current
+  app_version = MRuby::Gem.current.version
+  APP_VERSION = (app_version.nil? || app_version.empty?) ? "unknown" : app_version
+
+  task default: :compile
+else
+  Rake::Task['release'].clear # to clear release tasks to create mruby binary
+  require "bundler/gem_tasks"
+  require 'rake/testtask'
+  # require 'rake/clean'
+
+  Rake::TestTask.new(:test) do |t|
+    # To run test for only one file (or file path pattern)
+    #  $ bundle exec rake test TEST=test/test_specified_path.rb
+    #  $ bundle exec rake test TEST=test/test_*.rb
+    t.libs << "test"
+    t.test_files = Dir["test/**/test_*.rb"].sort
+    t.verbose = true
+    t.warning = true
+    t.ruby_opts = ["-Eascii-8bit:ascii-8bit"]
+  end
+  task default: [:test, :release]
 end
 
-task :default => :test

data/build_config.rb

@@ -0,0 +1,94 @@
+def gem_config(conf)
+  #conf.gembox 'default'
+
+  # be sure to include this gem (the cli app)
+  conf.gem File.expand_path(File.dirname(__FILE__))
+end
+
+MRuby::Build.new do |conf|
+  toolchain :clang
+
+  conf.enable_bintest
+  conf.enable_debug
+  conf.enable_test
+
+  gem_config(conf)
+end
+
+MRuby::Build.new('x86_64-pc-linux-gnu') do |conf|
+  toolchain :gcc
+
+  gem_config(conf)
+end
+
+MRuby::CrossBuild.new('i686-pc-linux-gnu') do |conf|
+  toolchain :gcc
+
+  [conf.cc, conf.cxx, conf.linker].each do |cc|
+    cc.flags << "-m32"
+  end
+
+  gem_config(conf)
+end
+
+MRuby::CrossBuild.new('x86_64-apple-darwin14') do |conf|
+  toolchain :clang
+
+  [conf.cc, conf.linker].each do |cc|
+    cc.command = 'x86_64-apple-darwin14-clang'
+  end
+  conf.cxx.command      = 'x86_64-apple-darwin14-clang++'
+  conf.archiver.command = 'x86_64-apple-darwin14-ar'
+
+  conf.build_target     = 'x86_64-pc-linux-gnu'
+  conf.host_target      = 'x86_64-apple-darwin14'
+
+  gem_config(conf)
+end
+
+MRuby::CrossBuild.new('i386-apple-darwin14') do |conf|
+  toolchain :clang
+
+  [conf.cc, conf.linker].each do |cc|
+    cc.command = 'i386-apple-darwin14-clang'
+  end
+  conf.cxx.command      = 'i386-apple-darwin14-clang++'
+  conf.archiver.command = 'i386-apple-darwin14-ar'
+
+  conf.build_target     = 'i386-pc-linux-gnu'
+  conf.host_target      = 'i386-apple-darwin14'
+
+  gem_config(conf)
+end
+
+MRuby::CrossBuild.new('x86_64-w64-mingw32') do |conf|
+  toolchain :gcc
+
+  [conf.cc, conf.linker].each do |cc|
+    cc.command = 'x86_64-w64-mingw32-gcc'
+  end
+  conf.cxx.command      = 'x86_64-w64-mingw32-g++'
+  conf.archiver.command = 'x86_64-w64-mingw32-gcc-ar'
+  conf.exts.executable  = ".exe"
+
+  conf.build_target     = 'x86_64-pc-linux-gnu'
+  conf.host_target      = 'x86_64-w64-mingw32'
+
+  gem_config(conf)
+end
+
+MRuby::CrossBuild.new('i686-w64-mingw32') do |conf|
+  toolchain :gcc
+
+  [conf.cc, conf.linker].each do |cc|
+    cc.command = 'i686-w64-mingw32-gcc'
+  end
+  conf.cxx.command      = 'i686-w64-mingw32-g++'
+  conf.archiver.command = 'i686-w64-mingw32-gcc-ar'
+  conf.exts.executable  = ".exe"
+
+  conf.build_target     = 'i686-pc-linux-gnu'
+  conf.host_target      = 'i686-w64-mingw32'
+
+  gem_config(conf)
+end

data/docker-compose.yml

@@ -0,0 +1,23 @@
+compile: &defaults
+  build: .
+  volumes:
+    - .:/home/mruby/code:rw
+  command: rake compile
+test:
+  <<: *defaults
+  command: rake test
+bintest:
+  <<: *defaults
+  command: rake test:bintest
+mtest:
+  <<: *defaults
+  command: rake test:mtest
+clean:
+  <<: *defaults
+  command: rake clean
+shell:
+  <<: *defaults
+  command: bash
+release:
+  <<: *defaults
+  command: rake release

data/exe/msgpack-inspect

@@ -1,5 +1,6 @@
 #!/usr/bin/env ruby
 
+begin; require 'msgpack'; rescue LoadError; end
 here = File.dirname(__FILE__)
 $LOAD_PATH << File.expand_path(File.join(here, '..', 'lib'))
 require 'msgpack/inspect/command'

data/lib/msgpack/inspect.rb

@@ -1,13 +1,14 @@
 require "msgpack/inspect/version"
+require "msgpack/inspect/node"
+require "msgpack/inspect/streamer"
 require "msgpack/inspect/inspector"
 
 module MessagePack
   module Inspect
     FORMATS = MessagePack::Inspect::Inspector::FORMATS
 
-    # MessagePack::Inspect.inspect(io).dump(format)
-    def self.inspect(io)
-      MessagePack::Inspect::Inspector.new(io)
+    def self.inspect(io, format)
+      MessagePack::Inspect::Inspector.new(io, format).inspect
     end
   end
 end

data/lib/msgpack/inspect/command.rb

@@ -1,5 +1,6 @@
 require 'optparse'
 require 'msgpack/inspect'
+require 'msgpack/inspect/version'
 
 module MessagePack
   module Inspect
@@ -18,6 +19,10 @@ module MessagePack
         opts.on("-r", "--require LIB", "ruby file path to require (to load ext type definitions)") do |path|
           require path
         end
+        opts.on("-v", "--version", "Show version of this software") do
+          puts "msgpack-inspect #{MessagePack::Inspect::VERSION}"
+          exit
+        end
         opts.on_tail("-h", "--help", "Show this message") do
           puts opts
           exit
@@ -36,7 +41,8 @@ module MessagePack
           exit 1
         end
 
-        puts MessagePack::Inspect.inspect(io).dump(format)
+        # puts MessagePack::Inspect.inspect(io).dump(format)
+        puts MessagePack::Inspect.inspect(io, format)
       end
     end
   end

data/lib/msgpack/inspect/example.json

@@ -0,0 +1,48 @@
+[
+  { "format": "fixarray",
+    "header": "ff",
+    "length": 3,
+    "children": [
+      { "format": "string",
+        "header": "e0",
+        "length": 10,
+        "data": "0102030405060708090a",
+        "value": "aaaaaaaaaa"
+      },
+      { "format": "int",
+        "header": "10",
+        "data": "10",
+        "value": 10
+      },
+      { "format": "nil",
+        "header": "a0",
+        "data": "a0",
+        "value": null
+      }
+    ]
+  },
+  { "format": "fixmap",
+    "header": "ff",
+    "length": 2,
+    "children": [
+      { "key":
+        { "format": "nil",
+          "data": "a0"
+        },
+        "value":
+        { "format": "nil",
+          "data": "a0"
+        }
+      },
+      { "key":
+        { "format": "nil",
+          "data": "a0"
+        },
+        "value":
+        { "format": "nil",
+          "data": "a0"
+        }
+      }
+    ]
+  }
+]