filewatch-ext 0.1.4 → 0.2.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: f4686023797b04eae09ab5bec38217d1165d3b25
-  data.tar.gz: 4a09a85762f5d60cf45997e4ee67bfb0c36299fb
+  metadata.gz: cc1631829006d12daf285a4bb9c69a0cd10046b0
+  data.tar.gz: f7c888de7dbdcef2e7b9fe4feccb0d40a779b024
 SHA512:
-  metadata.gz: f94fb66a38aaf7362462b540117c5e782d306db617b35475983064766dfc855c3036aaecaa49ef922b4dfc08e486b3902e9d912d5641f43604d36868247dda83
-  data.tar.gz: 4b72a4ae0e6bc4a573749206a977b53faa36cdee65668995a468695fbe1b10b0159bed321379c14117b416bc6c0587d291c3433bcd9dc67404e26339f9966f44
+  metadata.gz: 8b1834ba248c5ad86782e84e6ae298e943961b08f3ad7c08c6f79b41ffa6b7d302404f7c3fc0372028660ea3e414d22f1518ebcc72b26ecf4f9b756aaff6d50c
+  data.tar.gz: 1da4321b826abfed34c76af4a3e6d23a026b23c5fe8aa66e5611c17eb2dfa49e17106e8958e49495a60c56b3337650f36d854d0a9b077a6e9a3327e2cfdf42f8

metadata

@@ -1,84 +1,40 @@
 --- !ruby/object:Gem::Specification
 name: filewatch-ext
 version: !ruby/object:Gem::Version
-  version: 0.1.4
+  version: 0.2.0
 platform: ruby
 authors:
-- Dietmar Duft
+- dduft
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-04-14 00:00:00.000000000 Z
+date: 2014-12-18 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: filewatch
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: 0.5.1
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: 0.5.1
-- !ruby/object:Gem::Dependency
-  name: simple_xlsx_reader
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - ~>
-      - !ruby/object:Gem::Version
-        version: 0.9.8
-  type: :runtime
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - ~>
-      - !ruby/object:Gem::Version
-        version: 0.9.8
-- !ruby/object:Gem::Dependency
-  name: axlsx
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - ~>
-      - !ruby/object:Gem::Version
-        version: 2.0.1
-  type: :runtime
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - ~>
-      - !ruby/object:Gem::Version
-        version: 2.0.1
-- !ruby/object:Gem::Dependency
-  name: spreadsheet
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - ~>
-      - !ruby/object:Gem::Version
-        version: 0.9.7
-  type: :runtime
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - ~>
-      - !ruby/object:Gem::Version
-        version: 0.9.7
-description: Extensions for ruby-filewatcher, like xls, xlsx
+description: Extensions for ruby-filewatcher
 email:
 - dietmar@signifydata.com
 executables: []
 extensions: []
 extra_rdoc_files: []
 files:
-- lib/filewatch/winhelper.rb
-- lib/filewatch/ext/tailbase.rb
-- lib/filewatch/ext/filetail.rb
-- lib/filewatch/ext/xlsxtail.rb
-- lib/filewatch/ext/xlstail.rb
 - lib/JRubyFileExtension.jar
+- lib/filewatch/ext/filetail.rb
+- lib/filewatch/ext/tailbase.rb
+- lib/filewatch/winhelper.rb
 homepage: https://bitbucket.org/signify/ruby-filewatch-ext
 licenses:
 - MIT
@@ -90,19 +46,18 @@ require_paths:
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
-  - - '>='
+  - - ">="
     - !ruby/object:Gem::Version
       version: '0'
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
-  - - '>='
+  - - ">="
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.0.3
+rubygems_version: 2.2.2
 signing_key: 
 specification_version: 4
 summary: filewatch extensions
 test_files: []
-has_rdoc: 

data/lib/filewatch/ext/xlstail.rb

@@ -1,153 +0,0 @@
-require "filewatch/ext/tailbase"
-require "spreadsheet"
-
-module FileWatch::Ext
-  class XlsTail < FileWatch::Ext::TailBase
-
-    public
-    def initialize(opts={})
-      @pos = {}
-      super
-    end
-
-    public
-    def subscribe(&block)
-      # subscribe(stat_interval = 1, discover_interval = 5, &block)
-      @watch.subscribe(@opts[:stat_interval],
-                       @opts[:discover_interval]) do |event, path|
-        case event
-        when :create, :create_initial
-          if @files.member?(path)
-            @logger.debug("#{event} for #{path}: already exists in @files")
-            next
-          end
-          if _open_file(path, event)
-            _read_file(path, &block)
-          end
-        when :modify
-          @logger.debug(":modify for #{path}")
-        when :delete
-          @logger.debug(":delete for #{path}, deleted from @files")
-
-          _progressdb_delete(path, &block) if @opts[:progressdb] && @opts[:progressdb_del]
-
-          @files.delete(path)
-          _sincedb_delete(path)
-          @statcache.delete(path)
-        else
-          @logger.warn("unknown event type #{event} for #{path}")
-        end
-      end # @watch.subscribe
-    end # def each
-
-    private
-    def get_size(path)
-      workbook = Spreadsheet.open(path)
-      pos = 0
-      workbook.worksheets.each do |worksheet|
-        pos += worksheet.rows.length
-      end
-      @size = pos
-    end
-
-    private
-    def _open_file(path, event)
-      @logger.debug("_open_file: #{path}: opening")
-      begin
-        #Spreadsheet.client_encoding = 'UTF-8'
-        @files[path] = Spreadsheet.open(path)
-      rescue
-        # don't emit this message too often. if a file that we can't
-        # read is changing a lot, we'll try to open it more often,
-        # and might be spammy.
-        now = Time.now.to_i
-        if now - @lastwarn[path] > OPEN_WARN_INTERVAL
-          @logger.warn("failed to open #{path}: #{$!}")
-          @lastwarn[path] = now
-        else
-          @logger.debug("(warn supressed) failed to open #{path}: #{$!}")
-        end
-        #@files.delete(path)
-        return false
-      end
-
-      stat = File::Stat.new(path)
-      size = get_size(path)
-
-      if @iswindows
-        fileId = Winhelper.GetWindowsUniqueFileIdentifier(path)
-        inode = [fileId, stat.dev_major, stat.dev_minor]
-      else
-        inode = [stat.ino.to_s, stat.dev_major, stat.dev_minor]
-      end
-
-      @statcache[path] = inode
-
-      if @sincedb.member?(inode)
-        last_size = @sincedb[inode][:pos]
-        @logger.debug("#{path}: sincedb last value #{@sincedb[inode]}, cur size #{size}")
-        if last_size <= size
-          @logger.debug("#{path}: sincedb: seeking to #{last_size}")
-          @pos[path] = last_size
-        else
-          @logger.debug("#{path}: last value size is greater than current value, starting over")
-          @sincedb[inode] = {:size => size, :pos => 0}
-        end
-      elsif event == :create_initial && @files[path]
-        # TODO(sissel): Allow starting at beginning of the file.
-        if @opts[:start_new_files_at] == :beginning
-          @logger.debug("#{path}: initial create, no sincedb, seeking to beginning of file")
-          @pos[path] = 0
-          @sincedb[inode] = {:size => size, :pos => 0}
-        else
-          # seek to end
-          @logger.debug("#{path}: initial create, no sincedb, seeking to end #{size}")
-          @pos[path] = size
-          @sincedb[inode] = {:size => size, :pos => size}
-        end
-      elsif event == :create
-        @pos[path] = 0
-        @sincedb[inode] = {:size => size, :pos => 0}
-      else
-        @logger.debug("#{path}: staying at position 0, no sincedb")
-      end
-
-      return true
-    end # def _open_file
-
-    private
-    def _read_file(path, &block)
-      changed = false
-      pos = 0
-
-      worksheets = @files[path].worksheets
-
-      worksheets.each_with_index do |worksheet, index_sheet|
-
-        worksheet.each_with_index do |row, index_row|
-          pos += 1
-
-          if pos > @pos[path]
-            changed = true
-
-            sheet_name = worksheet.name.empty? ? "Sheet#{index_sheet+1}" : worksheet.name
-
-            if pos == @size #end of file is reached
-              data = {:row => row, :wsname => sheet_name, :eof => true}
-            else
-              data = {:row => row, :wsname => sheet_name, :eof => false}
-            end
-
-            yield(path, data, :log)
-
-            @pos[path] = pos
-            @sincedb[@statcache[path]][:pos] = pos
-            _check_sincedb(false, path, &block)
-          end
-        end
-      end
-      _check_sincedb(true, path, &block) if changed
-    end # def _read_file
-
-  end # class Tail
-end # module FileWatch

data/lib/filewatch/ext/xlsxtail.rb

@@ -1,151 +0,0 @@
-require "filewatch/ext/tailbase"
-require "simple_xlsx_reader"
-
-module FileWatch::Ext
-  class XlsxTail < FileWatch::Ext::TailBase
-
-    public
-    def initialize(opts={})
-      @pos = {}
-      super
-    end
-
-    public
-    def subscribe(&block)
-      # subscribe(stat_interval = 1, discover_interval = 5, &block)
-      @watch.subscribe(@opts[:stat_interval],
-                       @opts[:discover_interval]) do |event, path|
-        case event
-        when :create, :create_initial
-          if @files.member?(path)
-            @logger.debug("#{event} for #{path}: already exists in @files")
-            next
-          end
-          if _open_file(path, event)
-            _read_file(path, &block)
-          end
-        when :modify
-          @logger.debug(":modify for #{path}")
-        when :delete
-          @logger.debug(":delete for #{path}, deleted from @files")
-
-          _progressdb_delete(path, &block) if @opts[:progressdb] && @opts[:progressdb_del]
-
-          @files.delete(path)
-          _sincedb_delete(path)
-          @statcache.delete(path)
-        else
-          @logger.warn("unknown event type #{event} for #{path}")
-        end
-      end # @watch.subscribe
-    end # def each
-
-    private
-    def get_size(path)
-      doc = SimpleXlsxReader.open(path)
-      pos = 0
-      doc.sheets.each do |worksheet|
-        pos += worksheet.rows.length
-      end
-      @size = pos
-    end
-
-    private
-    def _open_file(path, event)
-      @logger.debug("_open_file: #{path}: opening")
-      begin
-        @files[path] = SimpleXlsxReader.open(path)
-      rescue
-        # don't emit this message too often. if a file that we can't
-        # read is changing a lot, we'll try to open it more often,
-        # and might be spammy.
-        now = Time.now.to_i
-        if now - @lastwarn[path] > OPEN_WARN_INTERVAL
-          @logger.warn("failed to open #{path}: #{$!}")
-          @lastwarn[path] = now
-        else
-          @logger.debug("(warn supressed) failed to open #{path}: #{$!}")
-        end
-        #@files.delete(path)
-        return false
-      end
-
-      stat = File::Stat.new(path)
-      size = get_size(path)
-
-      if @iswindows
-        fileId = Winhelper.GetWindowsUniqueFileIdentifier(path)
-        inode = [fileId, stat.dev_major, stat.dev_minor]
-      else
-        inode = [stat.ino.to_s, stat.dev_major, stat.dev_minor]
-      end
-
-      @statcache[path] = inode
-
-      if @sincedb.member?(inode)
-        last_size = @sincedb[inode][:pos]
-        @logger.debug("#{path}: sincedb last value #{@sincedb[inode]}, cur size #{size}")
-        if last_size <= size
-          @logger.debug("#{path}: sincedb: seeking to #{last_size}")
-          @pos[path] = last_size
-        else
-          @logger.debug("#{path}: last value size is greater than current value, starting over")
-          @sincedb[inode] = {:size => size, :pos => 0}
-        end
-      elsif event == :create_initial && @files[path]
-        # TODO(sissel): Allow starting at beginning of the file.
-        if @opts[:start_new_files_at] == :beginning
-          @logger.debug("#{path}: initial create, no sincedb, seeking to beginning of file")
-          @pos[path] = 0
-          @sincedb[inode] = {:size => size, :pos => 0}
-        else
-          # seek to end
-          @logger.debug("#{path}: initial create, no sincedb, seeking to end #{size}")
-          @pos[path] = size
-          @sincedb[inode] = {:size => size, :pos => size}
-        end
-      elsif event == :create
-        @pos[path] = 0
-        @sincedb[inode] = {:size => size, :pos => 0}
-      else
-        @logger.debug("#{path}: staying at position 0, no sincedb")
-      end
-
-      return true
-    end # def _open_file
-
-    private
-    def _read_file(path, &block)
-      changed = false
-      pos = 0
-
-      worksheets = @files[path].sheets
-
-      worksheets.each_with_index do |worksheet, index_sheet|
-
-        worksheet.rows.each_with_index do |row, index_row|
-          pos += 1
-
-          if pos > @pos[path]
-            changed = true
-            sheet_name = worksheet.name.empty? ? "Sheet#{index_sheet+1}" : worksheet.name
-
-            if pos == @size #end of file is reached
-              data = {:row => row, :wsname => sheet_name, :eof => true}
-            else
-              data = {:row => row, :wsname => sheet_name, :eof => false}
-            end
-
-            yield(path, data, :log)
-
-            @pos[path] = pos
-            @sincedb[@statcache[path]][:pos] = pos
-            _check_sincedb(false, path, &block)
-          end
-        end
-      end
-      _check_sincedb(true, path, &block) if changed
-    end # def _read_file
-
-  end # class Tail
-end # module FileWatch