chirp 0.1.0 → 0.2.0

data/History.txt

@@ -1,5 +1,12 @@
-== 1.0.0 / 2007-11-09
+== 0.1.0 / 2007-11-09
 
-* 1 major enhancement
-  * Birthday!
+* Revive the project
+* Initial update, very basic features
+
+=== 0.2.0 / 2007-11-21:
+
+* Added in ability to process multiple files
+* Redid the event model
+* Added tests
+* Added examples
 

data/Manifest.txt

@@ -4,4 +4,52 @@ README.txt
 Rakefile
 bin/chirp
 lib/chirp.rb
-test/test_chirp.rb
+lib/chirp/application.rb
+lib/chirp/statement.rb
+test/test_statement.rb
+test/test_application.rb
+test/span.dir/output
+test/span.dir/input
+test/span.dir/program.chirp
+test/match.dir/output
+test/match.dir/program.chirp
+test/match.dir/input
+test/span2.dir/output
+test/span2.dir/input
+test/span2.dir/program.chirp
+test/line_no.dir/output
+test/line_no.dir/input
+test/line_no.dir/program.chirp
+test/inplace.dir/output
+test/inplace.dir/input
+test/inplace.dir/program.chirp
+test/inplace.dir/a.txt
+test/inplace.dir/b.txt
+test/beforeafter.dir/output
+test/beforeafter.dir/input
+test/beforeafter.dir/program.chirp
+test/action.dir/output
+test/action.dir/input
+test/action.dir/program.chirp
+test/fields.dir/output
+test/fields.dir/input
+test/fields.dir/program.chirp
+test/fields_sep.dir/output
+test/fields_sep.dir/input
+test/fields_sep.dir/program.chirp
+test/string.dir/output
+test/string.dir/input
+test/string.dir/program.chirp
+test/files.dir/output
+test/files.dir/input
+test/files.dir/program.chirp
+test/files.dir/b.txt
+test/files.dir/a.txt
+test/files.dir/c.stuff
+test/files.dir/a.ignore
+test/proc.dir/output
+test/proc.dir/input
+test/proc.dir/program.chirp
+test/account.dir/program.chirp
+test/account.dir/output
+test/account.dir/input

data/README.txt

@@ -1,14 +1,14 @@
 chirp
-    by FIX (your name)
-    FIX (url)
+    by Russ Olsen
+    http://chirp.rubyforge.org
 
 == DESCRIPTION:
   
-FIX (describe your package)
+Chirp is a Ruby based DSL inspiried by awk.
 
 == FEATURES/PROBLEMS:
   
-* FIX (list of features or problems)
+* Need to add documentation
 
 == SYNOPSIS:
 

data/Rakefile

@@ -6,9 +6,9 @@ require './lib/chirp.rb'
 
 Hoe.new('chirp', Chirp::VERSION) do |p|
   p.rubyforge_name = 'chirp'
-  # p.author = 'FIX'
-  # p.email = 'FIX'
-  # p.summary = 'FIX'
+  p.author = 'Russ Olsen'
+  p.email = 'russ@russolsen.com'
+  p.summary = 'Chirp is a Ruby based text processing DSL similar to awk'
   # p.description = p.paragraphs_of('README.txt', 2..5).join("\n\n")
   # p.url = p.paragraphs_of('README.txt', 0).first.split(/\n/)[1..-1]
   p.changes = p.paragraphs_of('History.txt', 0..1).join("\n\n")

data/bin/chirp

@@ -0,0 +1,42 @@
+require 'optparse'
+require 'pp'
+
+begin
+  require 'chirp'
+rescue LoadError
+  require 'rubygems'
+  require 'chirp'
+end
+
+program_text=nil
+verbose=false
+
+option_parser = OptionParser.new do |op|
+  op.banner = "Usage: $0 [-v] [-e chirp_program_text] [chirp_program_file] [input_file ...]"
+
+  op.on('-p', '--program [chirp-program-text]',
+        'Execute this Chirp program') do |string|
+    program_text = string
+  end
+
+  op.on('-v', '--verbose',
+        'Produce lots out debugging output') do
+    verbose=true
+  end
+end
+
+files=option_parser.parse(ARGV)
+
+if files.empty? and program_text.nil?
+  STDERR.puts option_parser.banner
+  Kernel.exit(1)
+end
+
+program_text = File.read(files.shift) unless program_text
+
+app =  Chirp::Application.new(program_text, verbose)
+app.files(files)
+app.evaluate
+
+
+

data/lib/chirp.rb

@@ -4,229 +4,11 @@
 # Chirp is distributed under the same license as Ruby itself.
 #
 
-require 'pathname'
-require 'pp'
-require 'ftools'
-require 'tempfile'
-require 'forwardable'
+ChirpLibDir=File.dirname(__FILE__)
 
-module Chirp
-
-  VERSION = '0.1.0'
-
-  def Chirp.application
-    @application ||= Chirp::Application.new
-  end
-
-  class PatternAction
-    attr_reader :block
-
-    def initialize(re, block)
-      @re = re
-      @block = block
-    end
-
-    def matches(file, line, line_no)
-      @re =~ line
-    end
-  end
-
-  class LineNumberAction
-    attr_reader :block
-
-    def initialize(number, block)
-      @number = number
-      @block = block
-    end
-
-    def matches(file, line, line_no)
-      line_no == @number
-    end
-  end
-
-
-  def Chirp.field_separator=(value)
-    application.field_separator=value
-  end
-
-  def Chirp.field_separator
-    application.field_separator
-  end
-
-  def Chirp.line
-    application.line
-  end
-
-  def Chirp.fields
-    application.fields
-  end
-
-  def Chirp.line_no
-    application.line_no
-  end
-
-  def Chirp.file
-    application.file
-  end
-
-  def Chirp.edit_in_place=(value)
-    application.edit_in_place = value
-  end
-
-  def Chirp.files=(value)
-    application.files=value
-  end
-
-  def Chirp.pattern( re, &block )
-    application.pattern(re, block)
-  end
+require "#{ChirpLibDir}/chirp/statement"
+require "#{ChirpLibDir}/chirp/application"
 
-  def Chirp.line_number( n, &block )
-    application.line_number(n, block)
-  end
-
-  def Chirp.before &block
-    application.before(block)
-  end
-
-  def Chirp.before_file &block
-    application.before_file(block)
-  end
-
-  def Chirp.after_file &block
-    application.after_file(block)
-  end
-
-  def Chirp.after &block
-    application.after(block)
-  end
-
-  class Application
-
-    attr_accessor :field_separator
-    attr_reader :fields, :line, :line_no, :file
-  
-    def initialize
-      @before_actions=[]
-      @before_file_actions=[]
-      @pattern_actions=[]
-      @after_file_actions=[]
-      @after_actions=[]
-    end
-
-    def files=(glob)
-      if glob.respond_to? :[]
-	@glob=glob
-      else
-	@glob = [ glob ]
-      end
-    end
-
-    def edit_in_place=(value)
-      @edit_in_place=value
-    end
-
-    def has_run?
-      @has_run
-    end
-    
-    def run
-      @has_run = true
-      @before_actions.each do |action|
-        action.call
-      end
-  
-      if not @glob
-        process_stream
-      elsif @edit_in_place
-	process_edits(@glob)
-      else
-        process_streams(@glob) 
-      end
-  
-      @after_actions.each do |action|
-        action.call
-      end
-        
-    end
-
-    def process_edits(glob)
-      glob.each do |path_pattern|
-	  Dir.glob(path_pattern) do |path|
-	    puts path
-	    next if not Pathname.new(path).file?
-	    backup_path = path + ".bak"
-	    File.copy(path, backup_path)
-	    open(backup_path,"r") do |in_stream|
-	      open(path, "w") { |out_stream| process_stream(in_stream, out_stream, path) } 
-	    end
-	  end
-      end
-    end
-
-    def process_streams(glob)
-      glob.each do |path_pattern|
-	Dir.glob(path_pattern) do |path|
-	    open(path,"r") { |stream| process_stream(stream, STDOUT, path) }
-	end
-      end
-    end
-
-    def process_stream(in_stream=STDIN, out_stream=STDOUT, name='')
-      @file=name
-      old_stdout, $stdout = $stdout, out_stream
-      run_before_file_actions(name)
-      @line_no = 1
-      while not in_stream.eof?
-        @line = in_stream.readline.chomp
-        @fields=line.split(@field_separator)
-        @pattern_actions.each do |pa|
-    	  if pa.matches(name, @line, @line_no)
-            Chirp.module_eval &pa.block
-  	  end
-        end
-	@line_no += 1
-      end
-      run_after_file_actions(name)
-      $stdout = old_stdout
-    end
-
-    def run_before_file_actions(name)
-      @before_file_actions.each { |a| a.call(name) }
-    end
-
-    def run_after_file_actions(name)
-      @after_file_actions.each { |a| a.call(name) }
-    end
-
-    def pattern(re, block)
-      @pattern_actions << PatternAction.new(re, block)
-    end
-  
-    def line_number(n, block)
-      @pattern_actions << LineNumberAction.new(n, block)
-    end
-  
-    def before(block)
-      @before_actions << block
-    end
-  
-    def before_file(block)
-      @before_file_actions << block
-    end
-  
-    def after_file(block)
-      @after_file_actions << block
-    end
-  
-    def after(block)
-      @after_actions << block
-    end
-  end
-end
-  
-at_exit do
-  Chirp::application.run if not Chirp::application.has_run?
+module Chirp
+  VERSION = '0.2.0'
 end
-
-

data/lib/chirp/application.rb

@@ -0,0 +1,252 @@
+#
+# Copyright 2006-2007 Russell Olsen
+# Chirp is distributed under the same license as Ruby itself.
+#
+
+require 'pathname'
+require 'ftools'
+require 'fileutils'
+
+module Chirp
+  def self.redirect_io_and_run(input, output=$stdout, &block)
+    old_stdout, $stdout = $stdout, output
+    old_stdin, $stdin = $stdin, input
+    begin
+      block.call
+    ensure
+      $stdin, $stdout = old_stdin, old_stdout
+    end
+  end
+
+  class Context
+    include FileUtils
+
+    attr_accessor :field_separator, :line, :line_no, :path, :paths
+    attr_writer :fields, :contents
+
+    def initialize(field_separator)
+      @field_separator = field_separator
+    end
+
+    def execute(action)
+      instance_eval(&action)
+    end
+  
+    def get_binding
+      binding
+    end
+
+    def fields
+      @fields || @fields = line.split(@field_separator)
+    end
+  
+    def contents
+      @contents || @contents = File.read(@file)
+    end
+  end
+
+  class Action
+    def initialize(context, &block)
+      @context = context
+      @block = block
+    end
+
+    def evaluate(path)
+      @context.path = path
+      @context.execute(@block)
+    end
+
+    def evaluate_paths(paths)
+      @context.paths = paths
+      @context.execute(@block)
+    end
+
+  end
+
+  class PathAction
+    DEFAULT_ACTION = lambda {puts line}
+
+    attr_accessor :verbose
+
+    def initialize(glob, context, &block)
+      @glob = glob
+      @context = context
+      @edit_in_place = false
+      @before_actions = []
+      @match_statements=[]
+      @after_actions = []
+      @field_separator = /[ \t]/
+      instance_eval(&block)
+    end
+ 
+    def field_separator(sep=nil)
+      @field_separator=sep
+    end
+
+    def edit_in_place(new_value=true)
+      @edit_in_place = new_value
+    end
+
+    def evaluate_paths(paths)
+      @context.paths = paths
+      paths.each do |path|         
+        evaluate_path(path)
+      end
+    end
+
+    def line(arg1=nil, arg2=nil, &block)
+      action = block || DEFAULT_ACTION
+
+      if arg1.nil? and arg2.nil?
+        @match_statements << Statement.new( MatchPredicate.new(/.*/), action)
+      elsif arg2.nil?
+        @match_statements << Statement.new( predicate_for(arg1), action)
+      else
+        @match_statements << Statement.new(
+          SpanPredicate.new(predicate_for(arg1), predicate_for(arg2)), action)
+      end
+    end
+
+    def before(&block)
+      @before_actions << block
+    end
+  
+    def after(&block)
+      @after_actions << block
+    end
+
+    def applies_to(path)
+      File.fnmatch(@glob, path)
+    end
+
+    def evaluate_path(path)
+      return nil unless applies_to(path)
+      unless @edit_in_place
+        File.open(path) do |in_stream|
+          Chirp::redirect_io_and_run(in_stream, $stdout) {evaluate(path)}
+        end
+      else
+        backup_path = path + ".bak"
+        File.copy(path, backup_path)
+        File.open(backup_path) do |in_stream|
+          File.open(path, 'w') do |out_stream|
+            Chirp::redirect_io_and_run(in_stream, out_stream) {evaluate(path)}
+          end
+        end
+      end
+    end
+
+    def evaluate(path)
+      @context.path = path
+      @context.field_separator = @field_separator
+      @before_actions.each {|a| @context.execute(a)}
+      unless @match_statements.empty?
+        @context.line_no = 1
+        while not $stdin.eof?
+          @context.fields=nil
+          @context.line = $stdin.readline.chomp
+          @match_statements.each do |statement|
+            statement.evaluate(@context)
+          end
+          @context.line_no += 1
+        end
+      end
+      @context.contents = nil
+      @after_actions.each {|a| @context.execute(a)}
+    end
+
+    def predicate_for(arg)
+      return LineNumberPredicate.new(arg) if arg.kind_of?(Numeric)
+      return StringPredicate.new(arg) if arg.kind_of?(String)
+      return MatchPredicate.new(arg) if arg.kind_of?(Regexp)
+      return RangePredicate.new(arg) if arg.kind_of?(Range)
+      return LambdaPredicate.new(arg) if arg.kind_of?(Proc)
+      raise "Unknown argument: #{arg}"
+    end
+  end
+
+
+
+  class Application
+
+    DEFAULT_ACTION = lambda {puts line}
+
+    attr_accessor :verbose
+
+    def initialize(program_string, verbose=false)
+      @glob = nil
+      @actions=[]
+      @verbose=verbose
+      @context = Chirp::Context.new(/[ \t]/)
+      self.program=program_string if program_string
+    end
+
+    def setup(args)
+      self.program=File.read(args[0])
+    end
+
+    def program=(chirp_program_string)
+      instance_eval(chirp_program_string, 'user program')
+    end
+
+    def run(&block)
+      @actions << Action.new(@context, &block)
+    end
+
+    def file(glob='*', &block)
+      @actions << PathAction.new(glob, @context, &block)
+    end
+
+    def files(args)
+      @glob = args unless args.empty?
+      @glob
+    end
+
+    def evaluate(in_stream=$stdin, out_stream=$stdout)
+      log('Running Chirp program')
+      Chirp::redirect_io_and_run(in_stream, out_stream) do
+        log('Running before actions')  
+        if not @glob
+          process_stream(in_stream, out_stream, '-')
+        else
+          process_files(@glob) 
+        end  
+        log('Running after actions')
+      end
+      log('Chirp program done')
+    end
+
+    def process_stream(in_stream, outstream, name)
+      @actions.each do |path_action|
+        Chirp::redirect_io_and_run(in_stream, outstream) do
+          path_action.evaluate(name)
+        end
+      end
+    end
+
+    def process_files(globs)
+      @actions.each do |action|
+        paths = expand_globs(globs)
+        action.evaluate_paths(paths)
+      end
+    end
+
+    def log(*args)
+      return unless @verbose
+      STDERR.puts args.join(' ')
+    end
+
+    def expand_globs(globs)
+      results = []
+      globs.each do |path_pattern|
+        this_glob_results = []
+        Dir.glob(path_pattern) do |path|
+	  this_glob_results << path if Pathname.new(path).file?
+        end
+        this_glob_results.sort!
+        results << this_glob_results
+      end
+      results.flatten!
+    end
+  end
+end