xail 0.0.2 → 0.0.3

data/TODO.md

@@ -0,0 +1,8 @@
+# To-dos
+
+* support explicitly listing streams, especially multiple streams
+* curses UI to show rate for the stream and for groups
+* support for sub-line filters (and, generally, for multi-part input and
+output)
+
+

data/examples/logview.xail.rb

@@ -13,11 +13,10 @@ group('fatal') {
 
 group('error') {
   contains 'error', 'exception'
-  red
   bold
 }
 
 group('warning') {
   contains 'warn'
   yellow
-}
+}

data/lib/xail.rb

@@ -16,17 +16,7 @@ A Ruby utility for performing basic stream processing, directly focused on incre
 
 
   def Xail.run(configuration)
-
-    begin
-      extend Xail::DSL
-
-      eval(configuration)
-      filter = filter_in_scope
-
-      if !has_final
-        filter << PassThroughFilter.new
-      end
-    end
+    filter = Xail.build_from_config(configuration)
 
     stream = $stdin
     stream.each() do |line|

data/lib/xail/config.rb

@@ -2,18 +2,35 @@
 require 'xail/filter'
 
 module Xail
+  def self.build_from_config(configuration)
+    begin
+      extend Xail::DSL
+      eval(configuration)
+
+      filter = filter_in_scope
+
+      if !has_final
+        filter << PassThroughFilter.new
+      end
+    end
+
+    return filter
+  end
+
   module DSL
     def get_binding
       binding
     end
 
     def filter_scope(compound)
+      # add this compound filter to the filter currently in scope
       filter_in_scope << compound
-      @filter_stack << compound
-
-      yield
 
-      @filter_stack.pop
+      if block_given?
+        @filter_stack << compound
+        yield
+        @filter_stack.pop
+      end
     end
 
     def filter(&block)
@@ -24,16 +41,9 @@ module Xail
       end
     end
 
-    # TODO add support for explicitly listing sources
-    #def stream(name, source = null)
-    #  source ||= name
-    #end
-
     def group(name, &filters)
       # TODO intergrate with UX
-      filter_scope(FilterComposition.new) {
-        filters.yield
-      }
+      filter_scope(FilterComposition.new, &filters)
     end
 
     attr :has_final
@@ -55,15 +65,13 @@ module Xail
 
     def method_missing(name, *args, &block)
       abort "internal error #{name} #{args} #{block}" unless name
+
       filterClass = FilterRegistry::get_filter(name.downcase)
-      filter_scope(filterClass.new(*args)) do
-        block.yield if block
-      end
-      filter_in_scope << filter
+      filter_scope(filterClass.new(*args), &block)
 
-    # short circuit the stream line stop exception so we can catch it
-    # in xail main
     rescue StreamLineStop => stop
+      # short circuit the stream line stop exception so we can catch it
+      # in xail main
       raise stop
 
     rescue UnknownFilter => error
@@ -73,4 +81,4 @@ module Xail
       abort "#{filter_in_scope} will not accept #{name} as subfilter: #{error}"
     end
   end
-end
+end

data/lib/xail/filter.rb

@@ -70,6 +70,8 @@ module Xail
   #
 
   class AbstractCompoundFilter < AbstractFilter
+    attr_reader :filters
+
     def initialize
       @filters = []
     end
@@ -280,4 +282,4 @@ module Xail
   class Underscore < AbstractColorFilter; end
   class Negative   < AbstractColorFilter; end
   class Dark       < AbstractColorFilter; end
-end
+end

data/lib/xail/ui.rb

@@ -1,12 +1,7 @@
 module Xail
   class UI
-    def write_line()
-
-    end
-
-    def write_status_line()
-
-    end
+    # TODO
+    # do I really have to use curses?
   end
 end
 

data/lib/xail/version.rb

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

data/spec/config_spec.rb

@@ -0,0 +1,17 @@
+require 'xail/config'
+
+include Xail
+
+describe Config do
+  it "should support a trivial filter" do
+    filter = build_from_config <<-CONF
+      group('main') {
+        contains 'cat'
+        red
+      }
+    CONF
+
+    filter.streamLine('dog').should eq('dog')
+    filter.streamLine('cat').should eq("\e[31mcat\e[0m")
+  end
+end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: xail
 version: !ruby/object:Gem::Version
-  version: 0.0.2
+  version: 0.0.3
   prerelease: 
 platform: ruby
 authors:
@@ -9,11 +9,11 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-02-24 00:00:00.000000000Z
+date: 2012-02-26 00:00:00.000000000Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rspec
-  requirement: &70300575161740 !ruby/object:Gem::Requirement
+  requirement: &70282585842340 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -21,10 +21,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *70300575161740
+  version_requirements: *70282585842340
 - !ruby/object:Gem::Dependency
   name: trollop
-  requirement: &70300575161280 !ruby/object:Gem::Requirement
+  requirement: &70282585841900 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -32,10 +32,10 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *70300575161280
+  version_requirements: *70282585841900
 - !ruby/object:Gem::Dependency
   name: term-ansicolor
-  requirement: &70300575160760 !ruby/object:Gem::Requirement
+  requirement: &70282585841400 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -43,7 +43,7 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *70300575160760
+  version_requirements: *70282585841400
 description: A lightweight Ruby DSL for building text-stream filters
 email:
 - wiktor@tumblr.com
@@ -56,6 +56,7 @@ files:
 - Gemfile
 - README.md
 - Rakefile
+- TODO.md
 - bin/xail
 - examples/customfilter.xail.rb
 - examples/logview.xail.rb
@@ -65,6 +66,7 @@ files:
 - lib/xail/filter.rb
 - lib/xail/ui.rb
 - lib/xail/version.rb
+- spec/config_spec.rb
 - spec/filter_spec.rb
 - xail.gemspec
 homepage: ''
@@ -92,4 +94,5 @@ signing_key:
 specification_version: 3
 summary: tail for winners
 test_files:
+- spec/config_spec.rb
 - spec/filter_spec.rb