jf 0.1.0 → 0.5.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 5c106e76fda90f38051a08e4b26911dbb04c0151
-  data.tar.gz: 4a941b6174a9427aa18681d85edc11d76712bd14
+  metadata.gz: 384e6c5133e5bb542ed6a71d9f1f9e6e368d9b44
+  data.tar.gz: b437306e0bf1241df7f5a955f1b4f25bfe72878e
 SHA512:
-  metadata.gz: e13dda0f05c5b5a437b95bf63e183748243b5d349b4450ce1e0143e6ab1208cdd1ccf42aa90e9cf1ee51df6bc7572689a65485573e6b9bd938aad00e613a8863
-  data.tar.gz: 8d0a312b3e6e4ff402b47bfe448feb43d56343268a1ee65fcbeea6a7435d5fe1a305990f211ef78b81bb21dc7db23d6c3242c1a6bf29e51d0ad5f687ea56531a
+  metadata.gz: e5a7f2a6e9006a159c665b29b9e2b9fc4e33c752d2642afd424ed04dd2daad55d35f2a53a8ea8de9ceb24127f69b9d895e94891b85995b0053bc5cc75d1f773d
+  data.tar.gz: 65955f60ef83882d6634e082bf4e3b7e5e67ffa1dd72f28f32a8da0261cf8762d7720604162b3084c6fb8c8a0cca2ea71dd9abb07115756c613af17b97b621c5

data/.gitignore

@@ -8,3 +8,4 @@
 /spec/reports/
 /tmp/
 .tags
+.tags1

data/README.md

@@ -1,4 +1,4 @@
-Jf
+JF
 =====
 
 Dead simple JSON Formatter
@@ -6,10 +6,15 @@ Dead simple JSON Formatter
 ## Example
 
 ```
-$ jf [--git-diff|--minify|-i] raw.json # Attach format to a json file.
-$ jf .                                 # Attach format to all of json files under the current directory.
-$ cat raw.json | jf                    # Output pretty json for the received STDIN.
+$ jf raw.json [--gitdiff|--minify|-i] # Attach format to a json file.
+$ jf .                                # Attach format to all of json files under the current directory.
+$ cat raw.json | jf                   # Output pretty json for the received STDIN.
 > (print pretty json)
+
+# Merge options
+$ jf origin.json --merge target.json                          # Push the object of inside of target.json back to the origin.json.
+$ jf origin.json --merge target.json --after key1             # Push the object of inside of target.json to "key1" object of origin.json.
+$ jf origin.json --merge target.json --after key1.innerkey1.0 # Push the object of inside of target.json to "origin[:key1][:innerkey1][:deep][0]".
 ```
 
 ## Options
@@ -35,4 +40,3 @@ Bug reports and pull requests are welcome on GitHub at https://github.com/timaki
 ## License
 
 The gem is available as open source under the terms of the [MIT License](http://opensource.org/licenses/MIT).
-

data/bin/jf

@@ -3,7 +3,7 @@
 require "jf"
 require 'optparse'
 
-ARG_OPTIONS = ["i:", "git-diff", "minify"]
+# ARG_OPTIONS = ["i:", "git-diff", "minify", "merge:"]
 
 module InputProxy
   def stdin?
@@ -14,7 +14,17 @@ module InputProxy
 end
 
 Target = Struct.new("Target", :is_stdin, :body)
-target = InputProxy.stdin? ? Target.new(true, $stdin.readlines.join("\n")) : Target.new(false, ARGV.last)
-opts = ARGV.getopts(*ARG_OPTIONS)
+target = InputProxy.stdin? ? Target.new(true, $stdin.readlines.join("\n")) : Target.new(false, ARGV[0])
 
-Jf.execute(target, opts)
+option={}
+OptionParser.new do |opt|
+  opt.on('-i', '--indent=VALUE') {|v| option[:indent] = v }
+  opt.on('',   '--gitdiff')     {|v| option["git-diff"] = v }
+  opt.on('',   '--minify')       {|v| option[:minify] = v }
+  opt.on('',   '--merge=VALUE')  {|v| option[:merge] = v }
+  opt.on('',   '--key=VALUE')  {|v| option[:key] = v }
+
+  opt.parse!(ARGV)
+end
+
+Jf.execute(target, option)

data/jf.gemspec

@@ -10,7 +10,7 @@ Gem::Specification.new do |spec|
   spec.email         = ["timaki.st@gmail.com"]
 
   spec.summary       = "JSON formatter on CLI with dead simple command."
-  spec.description   = "Format JSON under current dir with dead simple command"
+  spec.description   = "Format JSON with dead simple command"
   spec.homepage      = "https://github.com/timakin/jf"
   spec.license       = "MIT"
 

data/lib/ext.rb

@@ -0,0 +1,74 @@
+class String
+  def numstr_to_i
+    is_int?(self) ? self.to_i : self
+  end
+
+  def is_int?(str)
+    Integer(str)
+    true
+  rescue ArgumentError
+    false
+  end
+end
+
+class Array
+  def one?
+    self.size == 1
+  end
+end
+
+class Hash
+  def slice(*keys)
+    keys.map! { |key| convert_key(key) } if respond_to?(:convert_key, true)
+    keys.each_with_object(self.class.new) { |k, hash| hash[k] = self[k] if has_key?(k) }
+  end
+
+  def slice!(*keys)
+    keys.map! { |key| convert_key(key) } if respond_to?(:convert_key, true)
+    omit = slice(*self.keys - keys)
+    hash = slice(*keys)
+    hash.default      = default
+    hash.default_proc = default_proc if default_proc
+    replace(hash)
+    omit
+  end
+
+  def extract!(*keys)
+    keys.each_with_object(self.class.new) { |key, result| result[key] = delete(key) if has_key?(key) }
+  end
+
+  def insert_after(key, obj)
+    splitter = self.keys.index(key)
+    before_keys = self.keys[0..splitter]
+    before = self.extract!(*before_keys)
+    after = self.slice!(*before_keys)
+    merged = before.merge(obj).merge(after)
+    merged
+  end
+
+  def deep_merge(*keys, val)
+    merge_target = keys.inject(self) { |h, k| h[k.numstr_to_i] }
+    if keys.one?
+      self[keys.last] = merge_target.merge(val)
+    else
+      if merge_target.kind_of?(Array)
+        merge_to_array(*keys, merge_target, val)
+      else
+        merge_to_hash(*keys, merge_target, val)
+      end
+    end
+    self
+  end
+
+  private
+
+  def merge_to_array(*keys, target, val)
+    last_key = keys.pop
+    keys.inject(self) { |h, k| h[k.numstr_to_i] }[last_key.numstr_to_i] = target.push(val)
+  end
+
+  def merge_to_hash(*keys, target, val)
+    last_key = keys.pop
+    keys.inject(self) { |h, k| h[k.numstr_to_i] }[last_key.numstr_to_i] = target.merge(val)
+  end
+end

data/lib/jf.rb

@@ -1,4 +1,5 @@
 require "jf/version"
+require "ext"
 require 'json'
 
 class FileParseError < StandardError; end
@@ -11,7 +12,7 @@ module Jf
     end
 
     if File.exists?(target.body)
-      paths = opts["git-diff"] ? get_diff_list.split(/$/).map(&:strip) : get_path_list(target.body)
+      paths = opts[:gitdiff] ? get_diff_list.split(/$/).map(&:strip) : get_path_list(target.body)
     else
       assert_file_not_found
       exit
@@ -20,7 +21,13 @@ module Jf
     for path in paths
       next if is_not_json(path)
       begin
-        opts["minify"] ? minify(path) : rewrite(path, opts)
+        if opts[:minify]
+          minify(path)
+        elsif opts[:merge]
+          merge(path, opts)
+        else
+          rewrite(path, opts)
+        end
       rescue FileParseError => e
         assert_parse_failed
         next
@@ -38,11 +45,24 @@ module Jf
 
   def self.apply_format(target, opts)
     data_hash = JSON.parse(target)
-    indent = opts["i"] != nil ? " " * opts["i"].to_i : "  "
+    indent = opts[:indent] != nil ? " " * opts[:indent].to_i : "  "
     formatted = JSON.pretty_generate(data_hash, {:indent => indent}).gsub /^$\n/, ''
     return formatted
   end
 
+  def self.merge(origin, opts)
+    origin_json = JSON.parse(File.read(origin))
+    target_json = JSON.parse(File.read(opts[:merge]))
+    if opts[:key]
+      target_keys = opts[:key].split(".")
+      origin_json = origin_json.deep_merge(*target_keys, target_json)
+    else
+      origin_json = origin_json.merge(target_json)
+    end
+    File.write(origin, origin_json.to_json)
+    rewrite(origin, opts)
+  end
+
   def self.rewrite(path, opts)
     File.write(path, apply_format(File.read(path).force_encoding("UTF-8"), opts))
   end

data/lib/jf/version.rb

@@ -1,3 +1,3 @@
 module Jf
-  VERSION = "0.1.0"
+  VERSION = "0.5.0"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: jf
 version: !ruby/object:Gem::Version
-  version: 0.1.0
+  version: 0.5.0
 platform: ruby
 authors:
 - timakin
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-06-04 00:00:00.000000000 Z
+date: 2016-07-31 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -38,7 +38,7 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: '10.0'
-description: Format JSON under current dir with dead simple command
+description: Format JSON with dead simple command
 email:
 - timaki.st@gmail.com
 executables:
@@ -56,6 +56,7 @@ files:
 - bin/jf
 - bin/setup
 - jf.gemspec
+- lib/ext.rb
 - lib/jf.rb
 - lib/jf/version.rb
 homepage: https://github.com/timakin/jf