json2xxx 0.3.0 → 0.4.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: f677cbf0543705206cad17d0457246b8381b72d7
-  data.tar.gz: b66600d379cf1bf072d9e04c23d8f155e35f7e84
+  metadata.gz: 3bf934f8b2353d7a82b324d092111fdad8a191c0
+  data.tar.gz: fb5481246d8032306c4c64dea83cd628f644d48a
 SHA512:
-  metadata.gz: 36aeadb86de510f13f8842b46edb1e10e7160f1e1c76cf4b1a1a28bb8962cdb4c9cee813c389070dbc80350dcc8f915704b2b136a66b808d34a2f269883b78f5
-  data.tar.gz: 20bc21a32ff42e21ef0842744109fe80c4582ce961acdbdc873b6c80ae602df0a4f0568101cb687d8775434238052dda57929097acb2214552d46ec43a6fd1ec
+  metadata.gz: d1c8b0b0586c5710fb5e16d8e84b54bf8036b2a4268db79ed7ef57736b8b3d671dd37221dda0d63fead0110177eba0aa42b1acaf429965940c9b4965a0a7b93c
+  data.tar.gz: 78e87409e0c446b7116b15ab02a995f05cf4488879d6501c8120cfa7d255b0430ba3c69c1b0a42a6d627bf202dba5183ded5299f52320f99ada252e04d1b24b2

data/json2xxx.gemspec

@@ -21,12 +21,13 @@ Gem::Specification.new do |gem|
   gem.add_dependency 'spreadsheet'
   gem.add_dependency 'tbpgr_utils'
   gem.add_dependency 'hashie'
+  gem.add_dependency 'awesome_print'
 
-  gem.add_development_dependency 'bundler', '~> 1.7.2'
-  gem.add_development_dependency 'pry', '~> 0.10.1'
-  gem.add_development_dependency 'rake', '~> 10.3.2'
-  gem.add_development_dependency 'rspec', '~> 2.4'
-  gem.add_development_dependency 'rubocop', '~> 0.24.1'
-  gem.add_development_dependency 'rubygems-tasks', '~> 0.2'
-  gem.add_development_dependency 'yard', '~> 0.8'
+  gem.add_development_dependency 'bundler'
+  gem.add_development_dependency 'pry'
+  gem.add_development_dependency 'rake'
+  gem.add_development_dependency 'rspec'
+  gem.add_development_dependency 'rubocop'
+  gem.add_development_dependency 'rubygems-tasks'
+  gem.add_development_dependency 'yard'
 end

data/lib/json2xxx.rb

@@ -1,3 +1,4 @@
 require 'json2xxx/version'
 require 'json2xxx/core'
 require 'json2xxx/cli'
+require 'json2xxx/ext/string'

data/lib/json2xxx/cli.rb

@@ -1,22 +1,34 @@
 require "thor"
 require "json"
 require 'yaml'
-require 'hashie'
+require 'pp'
+require 'awesome_print'
 
 module Json2xxx
   class CLI < Thor
 
     include Thor::Actions
-    class_option :fields, aliases: '-f', type: :array, desc: 'default is first data'  
+    class_option :fields, aliases: '-f', type: :array, desc: 'extract fields'
+    class_option :sort, aliases: '-s', type: :string, desc: 'sort'
     def initialize(args = [], options = {}, config = {})
       super(args, options, config)
       @global_options = config[:shell].base.options
       return unless File.pipe?(STDIN)
       @data = parse_json(STDIN.read)
       @core = Core.new
-      unless @global_options['fields'].nil?
+      if @global_options['fields']
         @data = @core.extract(@data, @global_options['fields'])
       end
+      if @global_options['sort']
+        @data = @core.sort(@data, @global_options['sort'])
+      end
+    end
+
+    desc 'delimiter', 'delimiter'
+    class_option :force_quotes, type: :boolean, default: true, desc: 'write quote'
+    class_option :write_header, type: :boolean, default: true, desc: 'write header'
+    def delimiter(delim)
+      puts @core.convert_csv(@data, delim, options['force_quotes'], options['write_header'])
     end
 
     desc 'tsv', 'tsv'
@@ -53,15 +65,22 @@ module Json2xxx
       puts @core.convert_html(@data)
     end
 
+    desc 'hash', 'hash'
+    def hash
+      ap @data, indent: 2, index: false
+    end
+
     desc 'excel', 'excel'
+    option :output, aliases: '-o', type: :string, default: Time.now.strftime("%Y%m%d%H%M%S") + '.xls', desc: 'output file path.'  
     def excel
-      @core.convert_excel(@data)
+      @core.convert_excel(@data, options['output'])
     end
 
     private
 
     def parse_json(buffer)
       begin
+        buffer = buffer.uncolorize
         data = JSON.parse(buffer)
       rescue => e
         data = []

data/lib/json2xxx/core.rb

@@ -1,6 +1,11 @@
-require 'spreadsheet'
 require 'csv'
 require 'tbpgr_utils'
+require 'set'
+require 'hashie'
+
+class HashWrapper < ::Hashie::Mash
+  disable_warnings if respond_to?(:disable_warnings)
+end
 
 module Json2xxx
   class Core
@@ -9,7 +14,7 @@ module Json2xxx
     end
 
     def convert_csv(data, delimiter, force_quotes, write_header)
-      headers = data.first.keys
+      headers = get_keys(data)
       csv = []
       CSV.generate(col_sep: delimiter, force_quotes: force_quotes) do |csv|
         csv << headers if write_header
@@ -22,7 +27,7 @@ module Json2xxx
     end
 
     def convert_markdown(data)
-      headers = data.first.keys
+      headers = get_keys(data)
       result = []
       header = '|' + headers.join('|') + '|' + "\n" + 
       				 '|' + headers.map { |_header| ':--' }.join('|') + '|'
@@ -36,7 +41,7 @@ module Json2xxx
     end
 
     def convert_backlog_wiki(data)
-      headers = data.first.keys
+      headers = get_keys(data)
       result = []
       result << '|~' + headers.join('|') + '|h'
 
@@ -49,9 +54,10 @@ module Json2xxx
       result.join("\n")
     end
 
-    def convert_excel(data)
-      filepath = Time.now.strftime("%Y%m%d%H%M%S") + '.xls'
-      headers = data.first.keys
+    def convert_excel(data, filepath = Time.now.strftime("%Y%m%d%H%M%S") + '.xls')
+      require 'spreadsheet'
+      headers = get_keys(data)
+
       basename = File.basename(filepath, '.*')
       Spreadsheet.client_encoding = 'UTF-8'
       workbook = Spreadsheet::Workbook.new
@@ -74,7 +80,7 @@ module Json2xxx
     end
 
     def convert_html(data)
-      headers = data.first.keys
+      headers = get_keys(data)
       result = []
       result << headers
       data.each do |hash|
@@ -88,17 +94,29 @@ module Json2xxx
 
     def extract(data, fields)
       data.map { |record|
-        record = Hashie::Mash.new(record)
+        record = HashWrapper.new(record)
         fields.inject({}) { |result, field| 
-          result[field] = eval("record.#{field}") 
+          eval_string = field[0] == "[" ? "record#{field}" : "record.#{field}"
+          result[field] = eval(eval_string)
           result
         }
       }
     end
 
+    def sort(data, sort_column)
+      data.sort_by{ |record|
+        record[sort_column]
+      }
+    end
+
+    def get_keys(data)
+      keys = data.inject(Set.new) {|set, record| set.merge(record.keys) }
+      keys.to_a
+    end
+
     def get_json_value(value)
       return '' if value.nil? 
-      return value.to_json if value.class == Array || value.class == Hash || value.class == Hashie::Mash
+      return value.to_json if value.class == Array || value.class == Hash || value.class == HashWrapper
       return value.to_s
     end
   end

data/lib/json2xxx/ext/string.rb

@@ -0,0 +1,7 @@
+class String
+  REGEXP_PATTERN = /\e\[([;\d]+)?m/
+
+  def uncolorize
+    self.gsub(REGEXP_PATTERN, '')
+  end
+end

data/lib/json2xxx/version.rb

@@ -1,4 +1,4 @@
 module Json2xxx
   # json2xxx version
-  VERSION = "0.3.0"
+  VERSION = "0.4.0"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: json2xxx
 version: !ruby/object:Gem::Version
-  version: 0.3.0
+  version: 0.4.0
 platform: ruby
 authors:
 - Hiroshi Toyama
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-01-14 00:00:00.000000000 Z
+date: 2017-03-09 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: thor
@@ -66,104 +66,118 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: '0'
+- !ruby/object:Gem::Dependency
+  name: awesome_print
+  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: bundler
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: 1.7.2
+        version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: 1.7.2
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: pry
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: 0.10.1
+        version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: 0.10.1
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: rake
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: 10.3.2
+        version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: 10.3.2
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: rspec
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: '2.4'
+        version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: '2.4'
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: rubocop
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: 0.24.1
+        version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: 0.24.1
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: rubygems-tasks
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: '0.2'
+        version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: '0.2'
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: yard
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: '0.8'
+        version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: '0.8'
+        version: '0'
 description: json to variety of formats
 email: toyama0919@gmail.com
 executables:
@@ -186,6 +200,7 @@ files:
 - lib/json2xxx.rb
 - lib/json2xxx/cli.rb
 - lib/json2xxx/core.rb
+- lib/json2xxx/ext/string.rb
 - lib/json2xxx/version.rb
 - spec/cli_spec.rb
 - spec/core_spec.rb
@@ -211,7 +226,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.4.2
+rubygems_version: 2.5.1
 signing_key: 
 specification_version: 4
 summary: json to variety of formats
@@ -220,4 +235,3 @@ test_files:
 - spec/core_spec.rb
 - spec/json2xxx_spec.rb
 - spec/spec_helper.rb
-has_rdoc: