exedb 0.1.1 → 0.2.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 2edd3f5d079de4f4fe759bc639c12848fdc1b384
-  data.tar.gz: ea2957752bc6856ed29bc50a1813caa977a46bf4
+  metadata.gz: b260ba9f2075f0a3e24dc3329578b8198d75110b
+  data.tar.gz: aea82d16176964d1f1907e39815d2ad4223b1035
 SHA512:
-  metadata.gz: fb50137af58069d48b51c058f876e268ba46913ce5c0ce1b57a39ad2892ae3919775ee21f42ad9858df3177406ffa098e8e97bc41e45db882b1273866ed39b90
-  data.tar.gz: d1dcc865f0751ed9115334b9cd6751c532a63f4c839c6b47d9747e0c5a58a93da4f1c6c2b273fb9d7a5f84eb0c5f86d1c06f62f5e80c0a9cbf83c61812123c54
+  metadata.gz: 74036155baa5670c00ed225ca1299b810fe7c6002801ca1113d5c94adfa4d99566d33d8d08b353d933e36cda8d0e84a118c44b1b55addd4eae2eefca6ea4bea9
+  data.tar.gz: ffa382688d4d13d854fcfaa9e5adc622cbfe5e65229aa336924cc3f87ad64b38c5f3229525c84c0a4a97802ba4406fab22b55a16f8ae348ea7f01248a4df1260

data/Gemfile

@@ -1,3 +1,3 @@
 source :rubygems
 
-gemspec
+gemspec

data/Rakefile

@@ -1,5 +1,9 @@
 require 'rake/testtask'
+require "bundler/setup"
+
 Rake::TestTask.new do |t|
     t.pattern = "spec/*_spec.rb"
+    t.verbose = true
 end
 require "bundler/gem_tasks"
+

data/lib/exedb.rb

@@ -48,9 +48,12 @@ class Exedb
           IO.popen(@update_method){|pipe|
             line=pipe.gets
             while line
-              file.puts line
-              file.flush
-              @content = @content+line
+              line=@transform.call(line) if @transform
+              if line
+                file.puts line
+                file.flush
+                @content = @content+line
+              end
               line=pipe.gets
             end
           }
@@ -60,6 +63,7 @@ class Exedb
           @content=''
           @code=-1
         end
+        @content=@alltransform.call(@content,@code) if @alltransform
         file.write @content
         file.flush
         File.open("#{@path}.code",File::RDWR|File::CREAT, 0644){|code_file|
@@ -76,6 +80,45 @@ class Exedb
     @content
   end
 
+  #
+  # transform each line in command output
+  # if nil is returned, line is skipped
+  #
+  def line_transform(&block)
+    if block
+      obj = Object.new
+      obj.define_singleton_method(:_, &block)
+      @transform=obj.method(:_).to_proc
+    else
+      @transform=nil
+    end
+  end
+
+  #
+  # cancel transformation each line
+  #
+  def no_line_transform
+    @transform=nil    
+  end
+
+  #
+  # transform all command output at end of execution
+  # block is called with parameters: content, return code
+  # returned content replaces original output
+  #
+  def all_transform(&block)
+    if block
+      obj = Object.new
+      obj.define_singleton_method(:_, &block)
+      @alltransform=obj.method(:_).to_proc
+    else
+      @alltransform=nil
+    end
+  end
+
+  def no_all_transform
+    @alltransform=nil
+  end
   #
   # Replace executing command
   #
@@ -178,4 +221,5 @@ protected
       file.flock(File::LOCK_UN)
     }
   end
+
 end

data/lib/exedb/version.rb

@@ -1,3 +1,3 @@
 class Exedb
-  VERSION = "0.1.1"
+  VERSION = "0.2.0"
 end

data/spec/exedb_spec.rb

@@ -45,7 +45,6 @@ describe Exedb do
 
   describe 'parallel istances' do
     before do
-      #!!!warn "BEFORE 2>>>>>>>"
       @db2=Exedb.new
       @db2.update_method="sleep 1;ls -la #{TEST_DIR}"
       @db.update
@@ -53,7 +52,6 @@ describe Exedb do
 
     it 'reads last cached result' do
       sleep 2;
-      #!!!warn ">>>>>>>>>>>>>>>>>>"
       @db2.get.must_match TEST_FILE
     end
 
@@ -109,4 +107,42 @@ describe Exedb do
       t.join
     end
   end
+
+  describe "transforms output" do
+    before do
+      @db.line_transform do |str|
+        return nil unless str =~ /^([d-])/
+        type=$1
+        str =~ /(\S+)$/
+        prefix= type=='-' ? 'FILE: ' : 'DIR:  '
+        return "#{prefix}#{$1}"
+      end
+    end
+
+    it 'transforms output' do
+      @db.get.must_match 'FILE: abc_file'
+    end
+
+    it 'deletes lines in output' do
+      x=@db.get
+      x.lines.count.must_equal 1
+    end
+
+    it 'cancels transformation' do
+      @db.no_line_transform
+      x=@db.get
+      x.lines.count.must_equal 4
+    end
+
+    it 'transforms each line and all output' do
+      @db.all_transform {|str,code| n=str.lines.count; "#{n} lines (#{code})"}
+      @db.get.must_equal "1 lines (0)"
+    end
+
+    it 'transforms all raw output' do
+      @db.no_line_transform
+      @db.all_transform {|str,code| n=str.lines.count; "#{n} lines (#{code})"}
+      @db.get.must_equal "4 lines (0)"
+    end
+  end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: exedb
 version: !ruby/object:Gem::Version
-  version: 0.1.1
+  version: 0.2.0
 platform: ruby
 authors:
 - Sergey Zhumatiy
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-02-06 00:00:00.000000000 Z
+date: 2014-02-07 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler