From 67b4d1a2e7221eb11f865988337ea22ccfd1fe96 Mon Sep 17 00:00:00 2001 From: Ishotihadus Date: Mon, 16 Jul 2018 02:29:28 +0900 Subject: [PATCH] add usamin support --- exe/mikunyan-image | 7 ++++++- exe/mikunyan-json | 7 ++++++- 2 files changed, 12 insertions(+), 2 deletions(-) diff --git a/exe/mikunyan-image b/exe/mikunyan-image index 8480615..a362516 100755 --- a/exe/mikunyan-image +++ b/exe/mikunyan-image @@ -2,7 +2,12 @@ require 'mikunyan' require 'mikunyan/decoders' require 'fileutils' -require 'json' +begin + require 'usamin' + require 'usamin/overwrite' +rescue LoadError + require 'json' +end opts = {:as_asset => false, :outputdir => nil, :sprite => false, :pretty => false} arg = nil diff --git a/exe/mikunyan-json b/exe/mikunyan-json index e29715b..2fa5189 100755 --- a/exe/mikunyan-json +++ b/exe/mikunyan-json @@ -74,7 +74,12 @@ if opts[:yaml] require 'yaml' puts YAML.dump(assets) else - require 'json' + begin + require 'usamin' + require 'usamin/overwrite' + rescue LoadError + require 'json' + end assets = assets.map{|k, v| [k, obj64(v)]}.to_h if opts[:pretty] puts JSON.pretty_generate(assets)