ltsview 0.0.1 → 0.0.2

data/README.md

@@ -1,7 +1,12 @@
-# Ltsview
+Ltsview
+=================================================================
 
 Ltsview - Labeled Tab Separated Value manipulator Viewer
 
+[![Gem Version](https://badge.fury.io/rb/ltsview.png)](https://badge.fury.io/rb/ltsview)
+[![Code CLimate](https://codeclimate.com/github/naoto/ltsview.png)](https://codeclimate.com/github/naoto/ltsview)
+
+
 ## Requirements
 
  * OSX or Ubuntu

data/lib/ltsview/parse.rb

@@ -2,32 +2,39 @@ module Ltsview
   class Parse
 
     def initialize(options)
-      @color = true
+      @options = {
+        mode:       :yaml,
+        color:      true,
+        file:       nil,
+        keys:       nil,
+        ignore_key: nil,
+        regex:      nil
+      }
       option_parse options
     end
 
     def print
       file_or_stdin do |ltsv|
-        filter(ltsv) do |key, val|
-          puts color key, val
-        end
+        puts "#{tag}#{formatter(filter(ltsv))}"
       end
     end
 
     private
      def option_parse(options)
        option = OptionParser.new(options)
-       option.on('-f', '--file VAL'){ |v| @file = v }
-       option.on('-k', '--keys VAL'){ |v| @keys = v.split(',') }
-       option.on('-i', '--ignore-key VAL'){ |v| @ignore_key = v.split(',') }
-       option.on('-r', '--regexp key:VAL', /\A([^:]+):(.*)/){ |_, k,v| @regex = {key: k.to_sym, value: v} }
-       option.on('--[no-]colors'){ |v| @color = v }
+       option.on('-f', '--file VAL'){ |v| @options[:file] = v }
+       option.on('-k', '--keys VAL'){ |v| @options[:keys] = v.split(',') }
+       option.on('-i', '--ignore-key VAL'){ |v| @options[:ignore_key] = v.split(',') }
+       option.on('-r', '--regexp key:VAL', /\A([^:]+):(.*)/){ |_, k,v| @options[:regex] = {key: k.to_sym, value: v} }
+       option.on('-j', '--json') { |v| @options[:mode] = :json }
+       option.on('-t', '--tag VAL'){ |v| @options[:tag] = v }
+       option.on('--[no-]colors'){ |v| @options[:color] = v }
        option.permute!(options)
      end
 
      def file_or_stdin(&block)
-       if !@file.nil?
-         file_load(@file, &block)
+       if !@options[:file].nil?
+         file_load(@options[:file], &block)
        else 
          stdin_load(&block)
        end
@@ -35,7 +42,7 @@ module Ltsview
 
      def stdin_load
        $stdin.each_line do |line|
-         yield LTSV.parse(line.chomp)
+         yield LTSV.parse(line.chomp).first
        end
      end
 
@@ -46,29 +53,37 @@ module Ltsview
        end
      end
 
+     def formatter(ltsv)
+       color ltsv.send("to_#{@options[:mode]}".to_sym), @options[:mode]
+     end
+
+     def tag
+       "@[#{@options[:tag]}] " if @options[:tag]
+     end
+
      def filter(ltsv)
-       matcher(ltsv).each do |key, val|
-         yield key, val if keys?(key) && !ignore?(key)
+       matcher(ltsv).delete_if do |key, val|
+         !keys?(key) || ignore?(key)
        end
      end
 
      def matcher(ltsv)
-       if !@regex.nil? && ltsv[@regex[:key]] !~ /(#{@regex[:value]})/
+       if !@options[:regex].nil? && ltsv[@options[:regex][:key]] !~ /(#{@options[:regex][:value]})/
          ltsv = {}
        end
        ltsv
      end
 
      def keys?(key)
-       @keys.nil? || @keys.include?(key.to_s)
+       @options[:keys].nil? || @options[:keys].include?(key.to_s)
      end
 
      def ignore?(key)
-       !@ignore_key.nil? && @ignore_key.include?(key.to_s)
+       !@options[:ignore_key].nil? && @options[:ignore_key].include?(key.to_s)
      end
 
-     def color(key, val)
-       @color ? "#{key.to_s.magenta}: #{val.cyan}" : "#{key}: #{val}"
+     def color(ltsv, mode)
+       @options[:color] ? CodeRay.scan(ltsv, mode).term : ltsv
      end
 
   end

data/lib/ltsview/version.rb

@@ -1,3 +1,3 @@
 module Ltsview
-  VERSION = "0.0.1"
+  VERSION = "0.0.2"
 end

data/lib/ltsview.rb

@@ -4,10 +4,10 @@ module Ltsview
   # Your code goes here...
 
   require 'ltsv'
-  require 'colored'
+  require 'coderay'
   require 'optparse'
   require 'yaml'
-  require 'pp'
+  require 'json'
 
   require 'ltsview/parse'
 end

data/ltsview.gemspec

@@ -18,7 +18,7 @@ Gem::Specification.new do |gem|
   gem.require_paths = ["lib"]
 
   gem.add_runtime_dependency 'ltsv'
-  gem.add_runtime_dependency 'colored'
+  gem.add_runtime_dependency 'coderay'
 
   gem.add_development_dependency 'rake'
   gem.add_development_dependency 'rspec'

data/spec/parse_spec.rb

@@ -11,7 +11,29 @@ describe Ltsview::Parse do
         $stdin << "hoge:fuga hago\tfoo:barbaz\n"
         $stdin.rewind
         parse.print
-      }.must_equal("\e[35mhoge\e[0m: \e[36mfuga hago\e[0m\n\e[35mfoo\e[0m: \e[36mbarbaz\e[0m\n")
+      }.must_equal("\e[45m---\e[0m\n\e[1;32m:hoge\e[0m: \e[1;33m\e[41mfuga hago\e[0m\n\e[1;32m:foo\e[0m: \e[1;33m\e[41mbarbaz\e[0m\n")
+    end
+    
+    it 'shoild get json' do
+      parse = Ltsview::Parse.new(['-j'])
+      capture(:stdout) {
+        $stdin = StringIO.new
+        $stdin << "hoge:fuga hago\tfoo:barbaz\n"
+        $stdin.rewind
+        parse.print
+      }.must_equal("{\e[35m\"hoge\"\e[0m:\e[32m\e[1;32m\"\e[0m\e[32mfuga hago\e[1;32m\"\e[0m\e[32m\e[0m,\e[35m\"foo\"\e[0m:\e[32m\e[1;32m\"\e[0m\e[32mbarbaz\e[1;32m\"\e[0m\e[32m\e[0m}\n")
+    end
+  end
+
+  describe 'when appended tag' do
+    it 'should apeended tag' do
+      parse = Ltsview::Parse.new(['-t', 'test.tag'])
+      capture(:stdout) {
+        $stdin = StringIO.new
+        $stdin << "hoge:fuga hago\tfoo:barbaz\n"
+        $stdin.rewind
+        parse.print
+      }.must_equal("@[test.tag] \e[45m---\e[0m\n\e[1;32m:hoge\e[0m: \e[1;33m\e[41mfuga hago\e[0m\n\e[1;32m:foo\e[0m: \e[1;33m\e[41mbarbaz\e[0m\n")
     end
   end
 
@@ -20,7 +42,7 @@ describe Ltsview::Parse do
       parse = Ltsview::Parse.new(['-f','spec/test.ltsv'])
       capture(:stdout){
         parse.print
-      }.must_equal("\e[35mhoge\e[0m: \e[36mfuga hago\e[0m\n\e[35mfoo\e[0m: \e[36mbarbaz\e[0m\n")
+      }.must_equal("\e[45m---\e[0m\n\e[1;32m:hoge\e[0m: \e[1;33m\e[41mfuga hago\e[0m\n\e[1;32m:foo\e[0m: \e[1;33m\e[41mbarbaz\e[0m\n\e[45m---\e[0m {}\n")
     end
   end
 
@@ -33,7 +55,7 @@ describe Ltsview::Parse do
         $stdin << "hoge:fuga hago\tfoo:barbaz\n"
         $stdin.rewind
         parse.print
-      }.must_equal("\e[35mfoo\e[0m: \e[36mbarbaz\e[0m\n")
+      }.must_equal("\e[45m---\e[0m\n\e[1;32m:foo\e[0m: \e[1;33m\e[41mbarbaz\e[0m\n")
     end
   end
 
@@ -45,7 +67,7 @@ describe Ltsview::Parse do
         $stdin << "hoge:fuga hago\tfoo:barbaz\n"
         $stdin.rewind
         parse.print
-      }.must_equal("\e[35mhoge\e[0m: \e[36mfuga hago\e[0m\n")
+      }.must_equal("\e[45m---\e[0m\n\e[1;32m:hoge\e[0m: \e[1;33m\e[41mfuga hago\e[0m\n")
     end
   end
 
@@ -58,7 +80,7 @@ describe Ltsview::Parse do
         $stdin << "hago:fuga2 hago\tfoo:fugabarbaz\n"
         $stdin.rewind
         parse.print
-      }.must_equal("\e[35mhago\e[0m: \e[36mfuga2 hago\e[0m\n\e[35mfoo\e[0m: \e[36mfugabarbaz\e[0m\n")
+      }.must_equal("\e[45m---\e[0m {}\n\e[45m---\e[0m\n\e[1;32m:hago\e[0m: \e[1;33m\e[41mfuga2 hago\e[0m\n\e[1;32m:foo\e[0m: \e[1;33m\e[41mfugabarbaz\e[0m\n")
     end
   end
 
@@ -70,7 +92,7 @@ describe Ltsview::Parse do
         $stdin << "hoge:fuga hago\tfoo:barbaz\n"
         $stdin.rewind
         parse.print
-      }.must_equal("\e[35mhoge\e[0m: \e[36mfuga hago\e[0m\n\e[35mfoo\e[0m: \e[36mbarbaz\e[0m\n")
+      }.must_equal("\e[45m---\e[0m\n\e[1;32m:hoge\e[0m: \e[1;33m\e[41mfuga hago\e[0m\n\e[1;32m:foo\e[0m: \e[1;33m\e[41mbarbaz\e[0m\n")
     end
 
     it 'should by color mode off' do
@@ -80,7 +102,7 @@ describe Ltsview::Parse do
         $stdin << "hoge:fuga hago\tfoo:barbaz\n"
         $stdin.rewind
         parse.print
-      }.must_equal("hoge: fuga hago\nfoo: barbaz\n")
+      }.must_equal("---\n:hoge: fuga hago\n:foo: barbaz\n")
     end
 
   end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: ltsview
 version: !ruby/object:Gem::Version
-  version: 0.0.1
+  version: 0.0.2
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-02-15 00:00:00.000000000 Z
+date: 2013-02-18 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: ltsv
@@ -28,7 +28,7 @@ dependencies:
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
-  name: colored
+  name: coderay
   requirement: !ruby/object:Gem::Requirement
     none: false
     requirements: