xlgrep 0.0.2 → 0.0.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 3f21c1e8346914b720e2a6541e519d6a87df463a
-  data.tar.gz: d64b40c205c85ee67df865f49fab835312e59e5b
+  metadata.gz: bfeb38151e8a2c8b11cd8017c2d8e37f1426c1c1
+  data.tar.gz: b4946644f38765a04f90324579a0462edbc5c2c7
 SHA512:
-  metadata.gz: 4eb942e0eb42bb9075f9de93dcbc8236b795fa8a3089b2ffa8cbfd0f7a7c1630bb7b4f2e997ca375a787c4e81e756bd40429e1d61e9c29d8999f50efcad97ab8
-  data.tar.gz: a46ab34db12afe0b90d8c2673bd3363338af5c63ba332156865c09335ea598d1ad61cf3ed7c23234867f077eb277fc64ae530736b9639497a93c2cf607650df3
+  metadata.gz: 05c6ff8ece6dab044c8ce937de0409b7ba63e47a9ab0a91e16aa4a3fd2ea0649fd0122fe4d4ed829933b4bd91acee1b88813d4cb93396139ee42dc207e3ba609
+  data.tar.gz: c200dd85818e5571a868d30c17f7354f0a585dbbe6b22d3b73d8abd8e44ab17880449fb89cf789e6a3e886047911c480987dbdfc26d7e101f1211563fb35e30a

data/bin/xlgrep

@@ -2,16 +2,4 @@
 
 require 'xlgrep'
 
-r = Xlgrep.invalid_json(ARGV)
-
-require 'shellwords'
-include Shellwords
-
-r.each do |obj|
-  puts "-" * 80
-  puts "file    : " << obj[:file]
-  puts "sheet   : " << obj[:sheet]
-  puts "position: " << obj[:x] << obj[:y].to_s
-  puts "cell    : " << obj[:data]
-  puts "msg     : " << obj[:msg]
-end
+Xlgrep.invalid_json(ARGV)

data/lib/xlgrep.rb

@@ -4,6 +4,7 @@ module Xlgrep
 
   autoload :Context    , "xlgrep/context"
   autoload :InvalidJson, "xlgrep/invalid_json"
+  autoload :SimpleFormatter, "xlgrep/simple_formatter"
 
   class << self
     def method_missing(name, *args, &block)
@@ -20,6 +21,4 @@ module Xlgrep
     end
   end
 
-
-
 end

data/lib/xlgrep/context.rb

@@ -1,9 +1,13 @@
+require 'xlgrep'
+
 require 'roo'
+require 'highline'
 
 module Xlgrep
   class Context
-    def initialize(predicates)
+    def initialize(predicates, formatter = nil)
       @predicates = predicates
+      @formatter = formatter || SimpleFormatter.new
     end
 
     def book_for(file)
@@ -13,10 +17,11 @@ module Xlgrep
     BASE_CHAR_ORDER = 'A'.ord
 
     def execute(files)
-      result = []
       files.each do |f|
         book = book_for(f)
         book.sheets.each do |sheet|
+          print_status("loading #{f} #{sheet}")
+
           book.default_sheet = sheet
           (book.first_row..book.last_row).each do |r|
             cells = book.row(r)
@@ -25,19 +30,32 @@ module Xlgrep
                 pred.match(cell) do |msg|
                   a, b = idx.divmod(26) # ('A'..'Z').length => 26
                   x = (a > 0 ? (BASE_CHAR_ORDER + a).chr : "") + (BASE_CHAR_ORDER + b).chr
-                  result << {
+                  print_status("")
+                  @formatter.process({
                     file: f, sheet: sheet,
                     x: x, y: r,
                     data: cell,
                     msg: msg
-                  }
+                  })
+                  print_status("loading #{f} #{sheet}")
                 end
               end
             end
           end
         end
+        # print_status(" loaded #{f}")
+        # puts
       end
-      result
+      print_status("")
+      self
+    end
+
+    def print_status(s)
+      return unless $stdout.tty?
+      cols, rows = HighLine::SystemExtensions.terminal_size # [columns, lines]
+      slen = cols - s.bytesize
+      slen = 0 if slen < 0
+      $stdout.print("\r" + s + (" " * slen))
     end
 
   end

data/lib/xlgrep/invalid_json.rb

@@ -1,3 +1,5 @@
+require 'xlgrep'
+
 require 'json'
 
 module Xlgrep
@@ -5,9 +7,9 @@ module Xlgrep
     class << self
 
       def match(str)
-        if str =~ /\A\{.*\}\Z|\A\[.*\]\Z/
+        if str =~ /\A[\s\n\r]*(?:\{.*\}|\[.*\])[\s\n\r]*\Z/
           begin
-            JSON.parse(str)
+            JSON.parse(str.strip)
           rescue JSON::ParserError => e
             yield(e.message)
           end

data/lib/xlgrep/simple_formatter.rb

@@ -0,0 +1,18 @@
+require 'xlgrep'
+
+module Xlgrep
+  class SimpleFormatter
+    def initialize(io = nil)
+      @io = io || $stdout
+    end
+
+    def process(obj)
+      @io.puts "-" * 80
+      @io.puts "file    : " << obj[:file]
+      @io.puts "sheet   : " << obj[:sheet]
+      @io.puts "position: " << obj[:x] << obj[:y].to_s
+      @io.puts "cell    : " << obj[:data]
+      @io.puts "msg     : " << obj[:msg]
+    end
+  end
+end

data/lib/xlgrep/version.rb

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

data/spec/xlgrep_spec.rb

@@ -9,12 +9,20 @@ describe Xlgrep do
     Dir.chdir(File.expand_path("..", __FILE__)) do
       r = Xlgrep.invalid_json(Dir.glob("examples/**/*.*"))
       r.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}'"},
-        {file: "examples/json_example.xlsx", sheet: "invalid Array" , x: "B", y: 2, data: "['foo', 1]"    , msg: "399: unexpected token at ''foo', 1]'"},
-        {file: "examples/json_example.xlsx", sheet: "invalid Array" , x: "B", y: 3, data: "[\"foo\", 1, ]", msg: "399: unexpected token at ']'"},
-        {file: "examples/json_example.xlsx", sheet: "invalid Array" , x: "B", y: 4, data: "[\"foo\": 1]"  , msg: "399: unexpected token at ': 1]'"}
+        {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}'"},
+        {file: "examples/json_example.xlsx", sheet: "invalid Object", x: "B", y: 5, data: "\n\n{\"foo\", 1}", msg: "757: unexpected token at '{\"foo\", 1}'"},
+        {file: "examples/json_example.xlsx", sheet: "invalid Object", x: "B", y: 6, data: "  {\"foo\", 1}"  , msg: "757: unexpected token at '{\"foo\", 1}'"},
+        {file: "examples/json_example.xlsx", sheet: "invalid Object", x: "B", y: 7, data: "{\"foo\", 1}  "  , msg: "757: unexpected token at '{\"foo\", 1}'"},
+        {file: "examples/json_example.xlsx", sheet: "invalid Object", x: "B", y: 8, data: "{\"foo\", 1}\n\n", msg: "757: unexpected token at '{\"foo\", 1}'"},
+        {file: "examples/json_example.xlsx", sheet: "invalid Array" , x: "B", y: 2, data: "['foo', 1]"      , msg: "399: unexpected token at ''foo', 1]'"},
+        {file: "examples/json_example.xlsx", sheet: "invalid Array" , x: "B", y: 3, data: "[\"foo\", 1, ]"  , msg: "399: unexpected token at ']'"},
+        {file: "examples/json_example.xlsx", sheet: "invalid Array" , x: "B", y: 4, data: "[\"foo\": 1]"    , msg: "399: unexpected token at ': 1]'"},
+        {file: "examples/json_example.xlsx", sheet: "invalid Array" , x: "B", y: 5, data: "\n\n[\"foo\": 1]", msg: "399: unexpected token at ': 1]'"},
+        {file: "examples/json_example.xlsx", sheet: "invalid Array" , x: "B", y: 6, data: "  [\"foo\": 1]"  , msg: "399: unexpected token at ': 1]'"},
+        {file: "examples/json_example.xlsx", sheet: "invalid Array" , x: "B", y: 7, data: "[\"foo\": 1]  "  , msg: "399: unexpected token at ': 1]'"},
+        {file: "examples/json_example.xlsx", sheet: "invalid Array" , x: "B", y: 8, data: "[\"foo\": 1]\n\n", msg: "399: unexpected token at ': 1]'"},
       ]
     end
   end

data/xlgrep.gemspec

@@ -19,6 +19,7 @@ Gem::Specification.new do |spec|
   spec.require_paths = ["lib"]
 
   spec.add_runtime_dependency "roo", "~> 1.12.2"
+  spec.add_runtime_dependency "highline"
 
   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.2
+  version: 0.0.3
 platform: ruby
 authors:
 - akima
@@ -24,6 +24,20 @@ dependencies:
     - - ~>
       - !ruby/object:Gem::Version
         version: 1.12.2
+- !ruby/object:Gem::Dependency
+  name: highline
+  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
@@ -85,6 +99,7 @@ files:
 - lib/xlgrep.rb
 - lib/xlgrep/context.rb
 - lib/xlgrep/invalid_json.rb
+- lib/xlgrep/simple_formatter.rb
 - lib/xlgrep/version.rb
 - spec/examples/json_example.xlsx
 - spec/spec_helper.rb