ltsview 0.0.4 → 0.0.5

checksums.yaml

@@ -0,0 +1,7 @@
+---
+SHA1:
+  metadata.gz: 657a07f57fd26826905e4f22654eeb5e737ad673
+  data.tar.gz: 1c43a50c9da07ad74406dc650c9988b0af0a63a3
+SHA512:
+  metadata.gz: ade6f1fc0ff6ad56efb37ce270dfe1adf19a6b79ec09f4433cd92cae75d104e5a29034d86e66f205f63036936453a8e8a4717330d8f1c3051462dcdd3e5d6e3f
+  data.tar.gz: 5d65deb2d6514e80634f09f16738bc727162c4e98e8aed9b811a2ee02eb799d9ea2f78ca75859ba5c22839f208b5e6adc054883b967a9af3bc9644dbbf8a7e8f

data/.travis.yml

@@ -1,5 +1,6 @@
 language: ruby
 rvm:
+  - "1.8.7"
   - "1.9.3"
   - "2.0.0"
-script: bundle exec rake test
+script: bundle exec rake spec

data/README.md

@@ -3,7 +3,7 @@ Ltsview
 
 Ltsview - Labeled Tab Separated Value manipulator Viewer
 
-[![Build Status](https://travis-ci.org/naoto/ltsview.png?branch=master)](https://secure.travis-ci.org/naoto/ltsview)
+[![Build Status](https://travis-ci.org/naoto/ltsview.png?branch=master)](https://travis-ci.org/naoto/ltsview)
 [![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)
 [![Coverage Status](https://coveralls.io/repos/naoto/ltsview/badge.png?branch=master)](https://coveralls.io/r/naoto/ltsview)
@@ -12,7 +12,7 @@ Ltsview - Labeled Tab Separated Value manipulator Viewer
 ## Requirements
 
  * OSX or Ubuntu
- * Ruby 1.9.3 or later
+ * Ruby 1.8.7 or 1.9.3 or 2.0.0
 
 ## Installation
 

data/Rakefile

@@ -1,10 +1,13 @@
 #!/usr/bin/env rake
-require 'rake'
-require 'rake/testtask'
+require 'bundler/gem_tasks'
 
-Rake::TestTask.new do |t|
-  t.pattern = 'spec/**/*_spec.rb'
-  t.libs.push 'spec'
-  t.libs.push 'lib'
+# RSpec
+require 'rspec/core/rake_task'
+RSpec::Core::RakeTask.new(:spec) do |spec|
+  if RUBY_VERSION < '1.9'
+    spec.pattern = 'spec/ltsview187/*_spec.rb'
+  else
+    spec.pattern = 'spec/ltsview/*_spec.rb'
+  end
 end
-
+task :default => :spec

data/lib/ltsview/parse.rb

@@ -3,18 +3,19 @@ module Ltsview
 
     def initialize(options)
       @options = {
-        mode:       :yaml,
-        color:      true,
-        file:       nil,
-        keys:       nil,
-        ignore_key: nil,
-        regex:      nil
+        :mode =>       :yaml,
+        :color =>      true,
+        :file =>       nil,
+        :keys =>       nil,
+        :ignore_key => nil,
+        :regex =>      nil
       }
       option_parse options
     end
 
     def print
       file_or_stdin do |ltsv|
+        next if ltsv.nil?
         line = formatter(filter(ltsv))
         puts "#{tag}#{line}" unless line.nil?
         $stdout.flush
@@ -27,7 +28,10 @@ module Ltsview
        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('-r', '--regexp VAL', /\A([^:]+):(.*)/){ |k,x,y| 
+         @options[:regex] = k.split(":", 2)
+         #@options[:regex] = {:key => key.to_sym, :value => val}
+       }
        option.on('-j', '--json') { |v| @options[:mode] = :json }
        option.on('-l', '--ltsv') { |v| @options[:mode] = :ltsv }
        option.on('-t', '--tag VAL'){ |v| @options[:tag] = v }
@@ -47,7 +51,7 @@ module Ltsview
 
      def stdin_load
        $stdin.each_line do |line|
-         yield LTSV.parse(line.chomp).first
+         yield LTSV.parse(line.chomp).first unless line.nil?
        end
      end
 
@@ -73,7 +77,7 @@ module Ltsview
      end
 
      def matcher(ltsv)
-       if !@options[:regex].nil? && ltsv[@options[:regex][:key]] !~ /(#{@options[:regex][:value]})/
+       if !@options[:regex].nil? && ltsv[@options[:regex].first.to_sym] !~ /(#{@options[:regex].last})/
          ltsv = {}
        end
        ltsv

data/lib/ltsview/version.rb

@@ -1,3 +1,3 @@
 module Ltsview
-  VERSION = "0.0.4"
+  VERSION = "0.0.5"
 end

data/lib/ltsview.rb

@@ -2,12 +2,18 @@ require "ltsview/version"
 
 module Ltsview
   # Your code goes here...
+  require 'rubygems'
 
   require 'ltsv'
   require 'coderay'
   require 'optparse'
   require 'yaml'
-  require 'json'
+
+  if RUBY_VERSION < '1.9'
+    require 'json/pure'
+  else
+    require 'json'
+  end
 
   require 'ltsview/parse'
   require 'ltsview/core_ext/hash'

data/ltsview.gemspec

@@ -19,10 +19,12 @@ Gem::Specification.new do |gem|
 
   gem.add_runtime_dependency 'ltsv'
   gem.add_runtime_dependency 'coderay'
+  gem.add_runtime_dependency 'json' if RUBY_VERSION < '1.9'
 
+  gem.add_development_dependency 'bundler', "~> 1.3"
   gem.add_development_dependency 'rake'
   gem.add_development_dependency 'rspec'
-
   gem.add_development_dependency 'coveralls'
 
+
 end

data/spec/{parse_spec.rb → ltsview/parse_spec.rb}

@@ -11,9 +11,9 @@ describe Ltsview::Parse do
         $stdin << "hoge:fuga hago\tfoo:barbaz\n"
         $stdin.rewind
         parse.print
-      }.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")
+      }.should eq("\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) {
@@ -21,7 +21,7 @@ describe Ltsview::Parse do
         $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")
+      }.should eq("{\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
 
     it 'should get non-colored ltsv' do
@@ -31,7 +31,7 @@ describe Ltsview::Parse do
         $stdin << "hoge:fuga hago\tfoo:barbaz\n"
         $stdin.rewind
         parse.print
-      }.must_equal("hoge:fuga hago\tfoo:barbaz\n")
+      }.should eq("hoge:fuga hago\tfoo:barbaz\n")
     end
   end
 
@@ -43,7 +43,7 @@ describe Ltsview::Parse do
         $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")
+      }.should eq("@[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
 
@@ -52,7 +52,7 @@ describe Ltsview::Parse do
       parse = Ltsview::Parse.new(['-f','spec/test.ltsv'])
       capture(:stdout){
         parse.print
-      }.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")
+      }.should eq("\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
 
@@ -65,7 +65,7 @@ describe Ltsview::Parse do
         $stdin << "hoge:fuga hago\tfoo:barbaz\n"
         $stdin.rewind
         parse.print
-      }.must_equal("\e[45m---\e[0m\n\e[1;32m:foo\e[0m: \e[1;33m\e[41mbarbaz\e[0m\n")
+      }.should eq("\e[45m---\e[0m\n\e[1;32m:foo\e[0m: \e[1;33m\e[41mbarbaz\e[0m\n")
     end
   end
 
@@ -77,20 +77,20 @@ describe Ltsview::Parse do
         $stdin << "hoge:fuga hago\tfoo:barbaz\n"
         $stdin.rewind
         parse.print
-      }.must_equal("\e[45m---\e[0m\n\e[1;32m:hoge\e[0m: \e[1;33m\e[41mfuga hago\e[0m\n")
+      }.should eq("\e[45m---\e[0m\n\e[1;32m:hoge\e[0m: \e[1;33m\e[41mfuga hago\e[0m\n")
     end
   end
 
   describe 'when regex matche' do
     it 'should by regex matcher' do
       parse = Ltsview::Parse.new(['-r', 'foo:^fuga'])
-      capture(:stdout){
-        $stdin = StringIO.new
-        $stdin << "hago:fuga hago\tfoo:barbaz\n"
-        $stdin << "hago:fuga2 hago\tfoo:fugabarbaz\n"
-        $stdin.rewind
-        parse.print
-      }.must_equal("\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")
+        capture(:stdout){
+          $stdin = StringIO.new
+          $stdin << "hago:fuga hago\tfoo:barbaz\n"
+          $stdin << "hago:fuga2 hago\tfoo:fugabarbaz\n"
+          $stdin.rewind
+          parse.print
+        }.should eq("\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
 
@@ -102,7 +102,7 @@ describe Ltsview::Parse do
         $stdin << "hoge:fuga hago\tfoo:barbaz\n"
         $stdin.rewind
         parse.print
-      }.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")
+      }.should eq("\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
@@ -112,7 +112,7 @@ describe Ltsview::Parse do
         $stdin << "hoge:fuga hago\tfoo:barbaz\n"
         $stdin.rewind
         parse.print
-      }.must_equal("---\n:hoge: fuga hago\n:foo: barbaz\n")
+      }.should eq("---\n:hoge: fuga hago\n:foo: barbaz\n")
     end
 
   end

data/spec/ltsview187/parse_spec.rb

@@ -0,0 +1,121 @@
+require 'spec_helper'
+require 'ltsview/parse'
+
+describe Ltsview::Parse do
+
+  describe 'when encode stdin text line' do
+    it 'should get yaml' do
+      parse = Ltsview::Parse.new(ARGV)
+      capture(:stdout) {
+        $stdin = StringIO.new
+        $stdin << "hoge:fuga hago\tfoo:barbaz\n"
+        $stdin.rewind
+        parse.print
+      }.match(/\e\[45m---\e\[0m\s?\n\e\[1;32m:(hoge|foo)\e\[0m: \e\[1;33m\e\[41m(fuga hago|barbaz)\e\[0m\n\e\[1;32m:(foo|hoge)\e\[0m: \e\[1;33m\e\[41m(barbaz|fuga hago)\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
+      }.should match(/\{\e\[35m"(hoge|foo)"\e\[0m:\e\[32m\e\[1;32m"\e\[0m\e\[32m(fuga hago|barbaz)\e\[1;32m"\e\[0m\e\[32m\e\[0m,\e\[35m"(foo|hoge)"\e\[0m:\e\[32m\e\[1;32m"\e\[0m\e\[32m(barbaz|fuga hago)\e\[1;32m"\e\[0m\e\[32m\e\[0m\}\n/)
+    end
+
+    it 'should get non-colored ltsv' do
+      parse = Ltsview::Parse.new(['-l'])
+      capture(:stdout) {
+        $stdin = StringIO.new
+        $stdin << "hoge:fuga hago\tfoo:barbaz\n"
+        $stdin.rewind
+        parse.print
+      }.should match(/(hoge:fuga hago|foo:barbaz)\t(foo:barbaz|hoge:fuga hago)\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
+      }.should match(/@\[test\.tag\] \e\[45m---\e\[0m\s?\n\e\[1;32m:(hoge|foo)\e\[0m: \e\[1;33m\e\[41m(fuga hago|barbaz)\e\[0m\n\e\[1;32m:(foo|hoge)\e\[0m: \e\[1;33m\e\[41m(barbaz|fuga hago)\e\[0m\n/)
+    end
+  end
+
+  describe 'when encode ltsv format file' do
+    it 'should load ltsv' do
+      parse = Ltsview::Parse.new(['-f','spec/test.ltsv'])
+      capture(:stdout){
+        parse.print
+      }.should match(/\e\[45m---\e\[0m\s?\n\e\[1;32m:(hoge|foo)\e\[0m: \e\[1;33m\e\[41m(fuga hago|barbaz)\e\[0m\n\e\[1;32m:(foo|hoge)\e\[0m: \e\[1;33m\e\[41m(barbaz|fuga hago)\e\[0m\n/)
+    end
+  end
+
+
+  describe 'when key select' do
+    it 'should by key select' do
+      parse = Ltsview::Parse.new(['-k','foo'])
+      capture(:stdout){
+        $stdin = StringIO.new
+        $stdin << "hoge:fuga hago\tfoo:barbaz\n"
+        $stdin.rewind
+        parse.print
+      }.should match(/\e\[45m---\e\[0m\s?\n\e\[1;32m:foo\e\[0m: \e\[1;33m\e\[41mbarbaz\e\[0m\n/)
+    end
+  end
+
+  describe 'when ignore key select' do
+    it 'should by igonore key select' do
+      parse = Ltsview::Parse.new(['-i','foo'])
+      capture(:stdout){
+        $stdin = StringIO.new
+        $stdin << "hoge:fuga hago\tfoo:barbaz\n"
+        $stdin.rewind
+        parse.print
+      }.should match(/\e\[45m---\e\[0m\s?\n\e\[1;32m:hoge\e\[0m: \e\[1;33m\e\[41mfuga hago\e\[0m\n/)
+    end
+  end
+
+  describe 'when regex matche' do
+    it 'should by regex matcher' do
+      parse = Ltsview::Parse.new(['-r', 'foo:^fuga'])
+        capture(:stdout){
+          $stdin = StringIO.new
+          $stdin << "hago:fuga hago\tfoo:barbaz\n"
+          $stdin << "hago:fuga2 hago\tfoo:fugabarbaz\n"
+          $stdin.rewind
+          parse.print
+        }.should match(/\e\[45m---\e\[0m \n\e\[1;32m:(foo|hago)\e\[0m: \e\[1;33m\e\[41m(fugabarbaz|fuga2 hago)\e\[0m\n\e\[1;32m:(hago|foo)\e\[0m: \e\[1;33m\e\[41m(fuga2 hago|fugabarbaz)\e\[0m\n/)
+    end
+  end
+
+  describe 'when color mode' do
+    it 'should by default color mode on' do
+      parse = Ltsview::Parse.new(ARGV)
+      capture(:stdout){
+        $stdin = StringIO.new
+        $stdin << "hoge:fuga hago\tfoo:barbaz\n"
+        $stdin.rewind
+        parse.print
+      }.should match(/\e\[45m---\e\[0m\s?\n\e\[1;32m:(hoge|foo)\e\[0m: \e\[1;33m\e\[41m(fuga hago|barbaz)\e\[0m\n\e\[1;32m:(foo|hoge)\e\[0m: \e\[1;33m\e\[41m(barbaz|fuga hago)\e\[0m\n/)
+    end
+
+    it 'should by color mode off' do
+      parse = Ltsview::Parse.new(['--no-colors'])
+      capture(:stdout){
+        $stdin = StringIO.new
+        $stdin << "hoge:fuga hago\tfoo:barbaz\n"
+        $stdin.rewind
+        parse.print
+      }.should match(/---\s?\n:(hoge|foo): (fuga hago|barbaz)\n:(foo|hoge): (barbaz|fuga hago)\n/)
+    end
+
+  end
+
+end
+

data/spec/spec_helper.rb

@@ -1,14 +1,10 @@
 require 'rubygems'
-require 'bundler/setup'
-
-require 'minitest/unit'
-require 'minitest/autorun'
-
-require 'ltsview'
 
 require 'coveralls'
 Coveralls.wear!
 
+require 'ltsview'
+
 def capture(stream)
   begin
     stream = stream.to_s

metadata

@@ -1,94 +1,97 @@
 --- !ruby/object:Gem::Specification
 name: ltsview
 version: !ruby/object:Gem::Version
-  version: 0.0.4
-  prerelease: 
+  version: 0.0.5
 platform: ruby
 authors:
 - Naoto SHINGAKI
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-05-04 00:00:00.000000000 Z
+date: 2013-05-14 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: ltsv
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - '>='
       - !ruby/object:Gem::Version
         version: '0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - '>='
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
   name: coderay
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - '>='
       - !ruby/object:Gem::Version
         version: '0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     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.3'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ~>
+      - !ruby/object:Gem::Version
+        version: '1.3'
 - !ruby/object:Gem::Dependency
   name: rake
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - '>='
       - !ruby/object:Gem::Version
         version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - '>='
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
   name: rspec
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - '>='
       - !ruby/object:Gem::Version
         version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - '>='
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
   name: coveralls
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - '>='
       - !ruby/object:Gem::Version
         version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - '>='
       - !ruby/object:Gem::Version
         version: '0'
 description: Ltsview - Labeled Tab Separated Value manipulator Viewer
@@ -111,34 +114,35 @@ files:
 - lib/ltsview/parse.rb
 - lib/ltsview/version.rb
 - ltsview.gemspec
-- spec/parse_spec.rb
+- spec/ltsview/parse_spec.rb
+- spec/ltsview187/parse_spec.rb
 - spec/spec_helper.rb
 - spec/test.ltsv
 homepage: https://github.com/naoto/ltsview
 licenses: []
+metadata: {}
 post_install_message: 
 rdoc_options: []
 require_paths:
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement
-  none: false
   requirements:
-  - - ! '>='
+  - - '>='
     - !ruby/object:Gem::Version
       version: '0'
 required_rubygems_version: !ruby/object:Gem::Requirement
-  none: false
   requirements:
-  - - ! '>='
+  - - '>='
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 1.8.23
+rubygems_version: 2.0.0
 signing_key: 
-specification_version: 3
+specification_version: 4
 summary: Ltsview - Labeled Tab Separated Value manipulator Viewer
 test_files:
-- spec/parse_spec.rb
+- spec/ltsview/parse_spec.rb
+- spec/ltsview187/parse_spec.rb
 - spec/spec_helper.rb
 - spec/test.ltsv