xlgrep 0.0.3 → 0.0.4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: bfeb38151e8a2c8b11cd8017c2d8e37f1426c1c1
-  data.tar.gz: b4946644f38765a04f90324579a0462edbc5c2c7
+  metadata.gz: da79ac328f63cdd9700cf2dd26b300c7f91016e4
+  data.tar.gz: 8aa823fe2d96c12df0bb3ba1d19f2bed366835a2
 SHA512:
-  metadata.gz: 05c6ff8ece6dab044c8ce937de0409b7ba63e47a9ab0a91e16aa4a3fd2ea0649fd0122fe4d4ed829933b4bd91acee1b88813d4cb93396139ee42dc207e3ba609
-  data.tar.gz: c200dd85818e5571a868d30c17f7354f0a585dbbe6b22d3b73d8abd8e44ab17880449fb89cf789e6a3e886047911c480987dbdfc26d7e101f1211563fb35e30a
+  metadata.gz: be59a3bb9517df737cd87445db72e20e8d34a8146c8470d383b528629ae603025ac85afa29e8c09751b922afef186a11b82deadf267ab9088f3ad4a4ea705118
+  data.tar.gz: 9b4c10783560c7f146fd1fa7f90b301b9b9625c3899703151e68ff4ab606108d67312f01ca3c5a9c7b1b7fb95887cb1ff4e1830c188786f06157919cab8d21a1

data/bin/xlgrep

@@ -2,4 +2,42 @@
 
 require 'xlgrep'
 
-Xlgrep.invalid_json(ARGV)
+require 'trollop'
+opts = Trollop::options do
+  version "xlgrep-#{Xlgrep::VERSION}"
+
+  banner <<-EOS
+xlgrep scans your spreadsheet files for EXCEL, OpenOffice, Google spreadsheets, Excelx, LibreOffice and CSV
+
+Usage:
+       xlgrep <keyword> <filenames>+
+   OR  xlgrep [options] <filenames>+
+
+where [options] are:
+EOS
+
+  opt :regexp, "use ruby Regexp", type: :string
+  opt :json  , "use json validator"
+end
+
+predicates = []
+opts.each do |key, val|
+  pred =
+    case key
+    when :json   then Xlgrep::InvalidJson if val
+    when :regexp then Xlgrep::Regexp.new(val) if val
+    end
+  next unless pred
+  predicates << pred
+end
+
+if predicates.empty?
+  if ARGV.first && !File.exist?(ARGV.first)
+    predicates << Xlgrep::Regexp.new(ARGV.shift)
+  else
+    puts "no option given, see `xlgrep --help`"
+    exit(1)
+  end
+end
+
+Xlgrep.run(predicates, ARGV)

data/lib/xlgrep.rb

@@ -3,7 +3,11 @@ require "xlgrep/version"
 module Xlgrep
 
   autoload :Context    , "xlgrep/context"
+
   autoload :InvalidJson, "xlgrep/invalid_json"
+  autoload :Regexp     , "xlgrep/regexp"
+
+  autoload :ResultBuffer   , "xlgrep/result_buffer"
   autoload :SimpleFormatter, "xlgrep/simple_formatter"
 
   class << self
@@ -16,8 +20,8 @@ module Xlgrep
       end
     end
 
-    def run(predicates, files)
-      Context.new(predicates).execute(files)
+    def run(predicates, files, formatter = nil)
+      Context.new(predicates, formatter).execute(files)
     end
   end
 

data/lib/xlgrep/context.rb

@@ -12,6 +12,13 @@ module Xlgrep
 
     def book_for(file)
       Roo::Spreadsheet.open(file)
+    rescue => e
+      if e.is_a?(NoMethodError) && (e.message =~ /for nil:NilClass/)
+        $stderr.puts("SKIP #{file} unsupported file")
+      else
+        $stderr.puts("SKIP #{file} [#{e.class}] #{e.message}")
+      end
+      return nil
     end
 
     BASE_CHAR_ORDER = 'A'.ord
@@ -19,6 +26,7 @@ module Xlgrep
     def execute(files)
       files.each do |f|
         book = book_for(f)
+        next unless book
         book.sheets.each do |sheet|
           print_status("loading #{f} #{sheet}")
 

data/lib/xlgrep/regexp.rb

@@ -0,0 +1,17 @@
+require 'xlgrep'
+
+require 'json'
+
+module Xlgrep
+  class Regexp
+    def initialize(expression)
+      @impl = /#{expression}/
+    end
+
+    def match(str)
+      if str =~ @impl
+        yield("MATCH")
+      end
+    end
+  end
+end

data/lib/xlgrep/result_buffer.rb

@@ -0,0 +1,15 @@
+require 'xlgrep'
+
+module Xlgrep
+  class ResultBuffer
+
+    attr_reader :result
+    def initialize
+      @result = []
+    end
+
+    def process(obj)
+      @result << obj
+    end
+  end
+end

data/lib/xlgrep/version.rb

@@ -1,3 +1,3 @@
 module Xlgrep
-  VERSION = "0.0.3"
+  VERSION = "0.0.4"
 end

data/spec/xlgrep_spec.rb

@@ -1,3 +1,4 @@
+# -*- coding: utf-8 -*-
 require 'spec_helper'
 
 describe Xlgrep do
@@ -5,10 +6,12 @@ describe Xlgrep do
     Xlgrep::VERSION.should_not be_nil
   end
 
-  it 'should do something useful' do
+  let(:buffer){  Xlgrep::ResultBuffer.new }
+
+  it '.invalid_json' do
     Dir.chdir(File.expand_path("..", __FILE__)) do
-      r = Xlgrep.invalid_json(Dir.glob("examples/**/*.*"))
-      r.should == [
+      Xlgrep.run([Xlgrep::InvalidJson], Dir.glob("examples/**/*.*"), buffer)
+      buffer.result.should == [
         {file: "examples/json_example.xlsx", sheet: "invalid Object", x: "B", y: 2, data: "{'foo': 1}"      , msg: "757: unexpected token at '{'foo': 1}'"},
         {file: "examples/json_example.xlsx", sheet: "invalid Object", x: "B", y: 3, data: "{\"foo\": 1, }"  , msg: "757: unexpected token at '{\"foo\": 1, }'"},
         {file: "examples/json_example.xlsx", sheet: "invalid Object", x: "B", y: 4, data: "{\"foo\", 1}"    , msg: "757: unexpected token at '{\"foo\", 1}'"},
@@ -26,4 +29,19 @@ describe Xlgrep do
       ]
     end
   end
+
+  it '.regexp' do
+    Dir.chdir(File.expand_path("..", __FILE__)) do
+      Xlgrep.run([Xlgrep::Regexp.new("[A-Z]")], Dir.glob("examples/**/*.*"), buffer)
+      buffer.result.should == [
+        {:file=>"examples/json_example.xlsx", :sheet=>"invalid Object", :x=>"A", :y=>1, :msg=>"MATCH", :data=>"OK"},
+        {:file=>"examples/json_example.xlsx", :sheet=>"invalid Object", :x=>"B", :y=>1, :msg=>"MATCH", :data=>"NG"},
+        {:file=>"examples/json_example.xlsx", :sheet=>"invalid Object", :x=>"C", :y=>2, :msg=>"MATCH", :data=>"JSONでは文字列のリテラルとしてシングルクォーテーションは使えません"},
+        {:file=>"examples/json_example.xlsx", :sheet=>"invalid Array" , :x=>"A", :y=>1, :msg=>"MATCH", :data=>"OK"},
+        {:file=>"examples/json_example.xlsx", :sheet=>"invalid Array" , :x=>"B", :y=>1, :msg=>"MATCH", :data=>"NG"},
+        {:file=>"examples/json_example.xlsx", :sheet=>"invalid Array" , :x=>"C", :y=>2, :msg=>"MATCH", :data=>"JSONでは文字列のリテラルとしてシングルクォーテーションは使えません"},
+      ]
+    end
+  end
+
 end

data/xlgrep.gemspec

@@ -20,6 +20,7 @@ Gem::Specification.new do |spec|
 
   spec.add_runtime_dependency "roo", "~> 1.12.2"
   spec.add_runtime_dependency "highline"
+  spec.add_runtime_dependency "trollop"
 
   spec.add_development_dependency "bundler", "~> 1.3"
   spec.add_development_dependency "rake"

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: xlgrep
 version: !ruby/object:Gem::Version
-  version: 0.0.3
+  version: 0.0.4
 platform: ruby
 authors:
 - akima
@@ -38,6 +38,20 @@ dependencies:
     - - '>='
       - !ruby/object:Gem::Version
         version: '0'
+- !ruby/object:Gem::Dependency
+  name: trollop
+  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
@@ -99,6 +113,8 @@ files:
 - lib/xlgrep.rb
 - lib/xlgrep/context.rb
 - lib/xlgrep/invalid_json.rb
+- lib/xlgrep/regexp.rb
+- lib/xlgrep/result_buffer.rb
 - lib/xlgrep/simple_formatter.rb
 - lib/xlgrep/version.rb
 - spec/examples/json_example.xlsx