lazibi 0.1.4 → 0.1.5

data/History.txt

@@ -1,5 +1,10 @@
 == 0.1.4 2007-06-15
 
+* Use beautifier to pre-format ruby scripts
+* Completely compatible with Rails projects now, no fix anymore :]
+
+== 0.1.4 2007-06-15
+
 * Added case syntax support, with test case
 
 == 0.1.3 2007-06-14

data/Manifest.txt

@@ -4,19 +4,29 @@ Manifest.txt
 README.txt
 Rakefile
 bin/lazibi
+lib/helper/parser_helper.rb
+lib/helper/task_helper.rb
 lib/lazibi.rb
 lib/lazibi/version.rb
+lib/parser.rb
+lib/task.rb
+lib/vendor/beautifier.rb
+scripts/rdoc2html
 scripts/txt2html
 test/fixtures/meta/basic_class.txt
+test/fixtures/meta/case.txt
 test/fixtures/meta/class_with_def.txt
 test/fixtures/meta/comment.txt
+test/fixtures/meta/inline_end.txt
 test/fixtures/meta/middle.txt
 test/fixtures/meta/nested_comment.txt
 test/fixtures/meta/partial_method.txt
 test/fixtures/meta/two_methods.txt
 test/fixtures/real/basic_class.txt
+test/fixtures/real/case.txt
 test/fixtures/real/class_with_def.txt
 test/fixtures/real/comment.txt
+test/fixtures/real/inline_end.txt
 test/fixtures/real/middle.txt
 test/fixtures/real/nested_comment.txt
 test/fixtures/real/partial_method.txt

data/README.txt

@@ -63,22 +63,13 @@ Make sure everything still works
   cd shiny_project/real
   rake test / autotest
   
-Start hacking ruby/python :/
+Start hacking ruby/python in meta :/
 
   cd shiny_project
   $your_editor meta
 
 == Tips
 
-=== Rails fix
-
-After bootstrap, edit config/boot.py.rb in meta
-
-  STDERR.puts %(Cannot find gem for Rails ~>#{version}.0:
-    Install the missing gem with 'gem install -v=#{version} rails', or
-    change environment.rb to define RAILS_GEM_VERSION with your desired version.
-    )
-
 === Manually create meta files
 
 * Bootstrap your project as usual, just don't run lazibi
@@ -92,6 +83,14 @@ After bootstrap, edit config/boot.py.rb in meta
 
 * create .py.rb files in corresponding directories inside 'meta', .rb files will be created and updated in 'real' as usual
 
+=== Prevent certain directories from being parsed during bootstrap ( default is ^vendor )
+
+* Create .lazibi in project/real path
+
+    exclude:
+    - pattern_1
+    - pattern_2
+    - for_example_^vendor
 
 == Known issues
 

data/bin/lazibi

@@ -4,5 +4,5 @@ $:.unshift(File.dirname(__FILE__) + '/../lib')
 
 require 'lazibi'
 
-r = Lazibi::Lazibi.new
+r = Lazibi::Runner.new
 r.run

data/lib/helper/parser_helper.rb

@@ -0,0 +1,46 @@
+module Lazibi
+  module ParserHelper
+
+    def get_indent( line )
+      line =~ /( *)/
+      $1.size
+    end
+
+    def get_rest( line )
+      line =~/( *)/
+      $'
+    end
+
+    def begin_keys
+      s = %w( module def class if begin for while unless do case )
+        m = ['\sdo\s*$|\sdo\s+(\|[^|]+\|)']
+        s.map!{|key| "^#{key}\\b"}
+
+        Regexp.new(s.concat(m).join('|'))
+    end
+
+    def middle_keys
+      s = %w( rescue else ensure elsif when )
+        s.map!{|key| "^#{key}\\b"}
+        Regexp.new(s.join('|'))
+    end
+
+    def end_keys
+      /^end\b/
+    end
+
+    def start_anchor?( str )
+      str.gsub! /"[^"]+"|'[^']+'/, ''
+      return false if str =~ /^#/
+      return true if str =~ begin_keys
+    end
+
+    def middle_anchor?( str )
+      str =~ middle_keys
+    end
+
+    def end_anchor?(str)
+      str =~ end_keys
+    end
+  end
+end

data/lib/helper/task_helper.rb

@@ -0,0 +1,43 @@
+module Lazibi
+  module TaskHelper
+
+    def skip_path?(path)
+      return false if @config[:exclude].nil?
+      @config[:exclude].each do |f|
+        offset = 'meta'.size + 1
+        return true if path[offset..-1] =~ Regexp.new(f)
+      end
+      false
+    end
+
+    def convert_path( path )
+      if path =~ /.*[.]py[.]rb/
+        from = 'meta'
+        to = 'real'
+        old_ext = '.py.rb'
+        new_ext = '.rb'
+      else
+        from = 'real'
+        to = 'meta'
+        old_ext = '.rb'
+        new_ext = '.py.rb'
+      end
+
+      dir_name = File.dirname path
+      base_name = File.basename path, old_ext
+
+      new_dir_name = to + dir_name[from.size..-1]
+      new_path = File.join new_dir_name, base_name + new_ext
+    end
+
+
+    def get_metas
+      meta_files = File.join('meta', "**", "*.py.rb")
+      metas = {}
+      Dir.glob(meta_files).each do |t|
+        metas[t] = File.mtime t
+      end
+      metas
+    end
+  end
+end

data/lib/lazibi/version.rb

@@ -2,7 +2,7 @@ module Lazibi #:nodoc:
   module VERSION #:nodoc:
     MAJOR = 0
     MINOR = 1
-    TINY  = 4
+    TINY  = 5
 
     STRING = [MAJOR, MINOR, TINY].join('.')
   end

data/lib/lazibi.rb

@@ -1,276 +1,30 @@
 require 'fileutils'
 require 'find'
 require 'yaml'
+require 'parser'
+require 'task'
+require 'lazibi/version'
 
 module Lazibi
-  class Lazibi
-    attr :config
-  
-    def load_config
-      @config = {}
-      default = {:exclude => ['^vendor']}
-      if File.exists? '.lazibi'
-        f = open '.lazibi'
-        h = YAML.load(f)
-        for k in h.keys
-          begin
-            @config[k.to_sym] = h[k]
-          rescue
-            raise "wrong pattern #{h[k]}"
-          end
-        end
-      end
-      @config = default
-    end
-        
-        
-    def init_meta
-      # backup real
-      real_dir = 'real'
-      if File.directory? real_dir
-        backup_dir = '.backup'
-        unless File.exists? backup_dir
-          FileUtils.cp_r real_dir, backup_dir
-        end
-      else
-        raise 'No directory named "real"'
-      end
-    
-      # generate meta
-      meta_dir = 'meta'
-      if File.exists? meta_dir
-        if File.directory? meta_dir
-          FileUtils.rm_rf meta_dir
-        else
-          raise 'meta directory is reserved for instiki'
-        end
-      end
-      
-    
-      puts "Generating meta files:"
-      puts "-" * 40
-      Dir.glob(File.join('real', '**', '*.rb')) do |f|
-        if skip_path? f
-          puts "- #{f}"
-          next
-        end
-        
-        next unless File.file? f
-        next if f =~ /.*[.]py[.]rb$/
-        py_path = convert_path f
-        dir_name = File.dirname py_path      
-      
-        puts '  ' + py_path
-        FileUtils.mkdir_p dir_name
-        make_py f, py_path
-      end
-  
-      puts "-" * 40
-    end
-
-
-    def skip_path?(path)
-      return false if @config[:exclude].nil?
-      @config[:exclude].each do |f|
-        offset = 'meta'.size + 1
-        return true if path[offset..-1] =~ Regexp.new(f)
-      end
-      false
-    end
-
-    def convert_path( path )
-      if path =~ /.*[.]py[.]rb/
-        from = 'meta'
-        to = 'real'
-        old_ext = '.py.rb'
-        new_ext = '.rb'
-      else
-        from = 'real'
-        to = 'meta'
-        old_ext = '.rb'
-        new_ext = '.py.rb'
-      end
-    
-      dir_name = File.dirname path
-      base_name = File.basename path, old_ext
+  class Runner
+    include Parser
+    include Task
     
-      new_dir_name = to + dir_name[from.size..-1]
-      new_path = File.join new_dir_name, base_name + new_ext
-    end
-      
-    def make_py( rb_path, py_path )
-      rb = open(rb_path).read
-    
-      py_file = open(py_path, 'w')
-      py_file.write(to_py(rb))
-      py_file.close
-    end
-    
-    def to_py( rb )
-      py = []
-      rb.split("\n").each do |l|
-        if l.strip =~ /^end$/
-          next
-        end
-        s = l
-        if l.rstrip[-4..-1] == ' end'
-          s = l.rstrip[0...-3].rstrip
-        end
-        
-        py << s
-      end
-    
-      py.join("\n")
-    end
-    
-  
     def run
-      load_config
-      init_meta unless File.exists? '.backup'
-      @metas = {}
-      while true
-        current_metas = get_metas
-        current_metas.each_pair do |meta, m_time|        
-          if @metas[meta] != m_time
-            update_rb meta
-            puts "+ #{meta}..."
-          end
-        end
-        @metas = current_metas
-        sleep 1
-      end
-    end
-  
-    def get_metas
-      meta_files = File.join('meta', "**", "*.py.rb")
-      metas = {}
-      Dir.glob(meta_files).each do |t|
-        metas[t] = File.mtime t
-      end
-      metas
-    end
-  
-    def update_rb( meta_name )
-      meta = open(meta_name)
-      real_name = convert_path meta_name
-      begin
-        real_rb = open( real_name, 'w' )
-        real_rb.write(to_rb(meta.read))
-      rescue Exception => e
-        puts e
-      ensure
-        real_rb.close unless real_rb.nil?
-      end
-      meta.close
-    end
-  
-    def to_rb( content )
-      insert_end content
-    end
-  
-    def insert_end( content )
-      @lines = content.split("\n")
-      progress = 0
-      while progress < @lines.size
-        lines = @lines[progress..-1]
-        lines.each_index do |index|
-          l = lines[index]
-          if start_anchor?(get_rest(l))
-            relative_index_for_end = find_end( lines[index..-1], get_indent(l))
-            unless relative_index_for_end
-              progress += 1
-              break
-            end
-            index_for_end = relative_index_for_end + index
-            lines[index_for_end] = lines[index_for_end] + "\n" +  ' ' * get_indent(l) + "end"
-            head = @lines[0...progress]
-            tail = lines[index..-1].join("\n").split("\n")
-            @lines = head + tail
-            progress += 1
-            break
-          end
-          progress += 1
-        end
-      end
-        
-      result = @lines.join("\n")
-    end
-  
-    def find_end( lines, indent  )
-      return 0 if lines.size == 1
-    
-      anchor = 0
-    
-      lines = lines[1..-1]
-      lines.each_index do |i|
-        l = lines[i]
-        next if l.strip == ''
-        if l.strip =~ /^#/
-          if get_indent(l) > indent
-            anchor = i + 1
-          end
-          next
-        end
-        return anchor if get_indent(l) < indent
-        if get_indent(l) == indent
-          rest = get_rest l
-          if middle_anchor? rest
-            anchor = i + 1
-            next
-          elsif end_anchor? rest
-            return false
-          else
-            return anchor
-          end
-        end
-        anchor =  i + 1
-      end
-      return anchor
-    end
-  
-    def get_indent( line )
-      line =~ /( *)/
-      $1.size
-    end
-
-    def get_rest( line )
-      line =~/( *)/
-      $'
-    end
-  
-    def begin_keys
-      s = %w( module def class if begin for while unless do case )
-      m = ['\sdo\s*$|\sdo\s+(\|[^|]+\|)']
-      s.map!{|key| "^#{key}\\b"}
-    
-      Regexp.new(s.concat(m).join('|'))
-    end
-      
-    
-  
-    def middle_keys
-      s = %w( rescue else ensure elsif when )
-      s.map!{|key| "^#{key}\\b"}    
-      Regexp.new(s.join('|'))
-    end
-  
-    def end_keys
-      /^end\b/
-    end
-    
-    def start_anchor?( str )
-      str.gsub! /"[^"]+"|'[^']+'/, ''
-      return false if str =~ /^#/
-      return true if str =~ begin_keys
-    end
-  
-    def middle_anchor?( str )
-      str =~ middle_keys
-    end
-  
-    def end_anchor?(str)
-      str =~ end_keys
+       load_config
+       init_meta unless File.exists? '.backup'
+       @metas = {}
+       while true
+         current_metas = get_metas
+         current_metas.each_pair do |meta, m_time|        
+           if @metas[meta] != m_time
+             update_rb meta
+             puts "+ #{meta}..."
+           end
+         end
+         @metas = current_metas
+         sleep 1
+       end
     end
   end
-end
-require 'lazibi/version'
+end

data/lib/parser.rb

@@ -0,0 +1,93 @@
+$:.unshift(File.dirname(__FILE__) + '/helper')
+
+require 'parser_helper'
+
+module Lazibi
+  module Parser
+    include ParserHelper
+
+    def to_py( rb )
+      py = []
+      rb.split("\n").each do |l|
+        if l.strip =~ /^end$/
+          next
+        end
+        s = l
+        if l.rstrip[-4..-1] == ' end'
+          s = l.rstrip[0...-3].rstrip
+        end
+
+        py << s
+      end
+
+      py.join("\n")
+    end
+
+    def to_rb( content )
+      insert_end content
+    end
+
+
+    # private
+
+    def insert_end( content )
+      @lines = content.split("\n")
+      progress = 0
+      while progress < @lines.size
+        lines = @lines[progress..-1]
+        lines.each_index do |index|
+          l = lines[index]
+          if start_anchor?(get_rest(l))
+            relative_index_for_end = find_end( lines[index..-1], get_indent(l))
+            unless relative_index_for_end
+              progress += 1
+              break
+            end
+            index_for_end = relative_index_for_end + index
+            lines[index_for_end] = lines[index_for_end] + "\n" +  ' ' * get_indent(l) + "end"
+            head = @lines[0...progress]
+            tail = lines[index..-1].join("\n").split("\n")
+            @lines = head + tail
+            progress += 1
+            break
+          end
+          progress += 1
+        end
+      end
+
+      result = @lines.join("\n")
+    end
+
+    def find_end( lines, indent  )
+      return 0 if lines.size == 1
+
+      anchor = 0
+
+      lines = lines[1..-1]
+      lines.each_index do |i|
+        l = lines[i]
+        next if l.strip == ''
+        if l.strip =~ /^#/
+          if get_indent(l) > indent
+            anchor = i + 1
+          end
+          next
+        end
+        return anchor if get_indent(l) < indent
+        if get_indent(l) == indent
+          rest = get_rest l
+          if middle_anchor? rest
+            anchor = i + 1
+            next
+          elsif end_anchor? rest
+            return false
+          else
+            return anchor
+          end
+        end
+        anchor =  i + 1
+      end
+      return anchor
+    end
+  end
+end

data/lib/task.rb

@@ -0,0 +1,97 @@
+$:.unshift(File.dirname(__FILE__) + '/helper')
+$:.unshift(File.dirname(__FILE__) + '/vendor')
+
+require 'task_helper'
+require 'beautifier'
+
+module Lazibi
+  module Task
+    include TaskHelper
+
+    def load_config
+      @config = {}
+      default = {:exclude => ['^vendor']}
+      if File.exists? '.lazibi'
+        f = open '.lazibi'
+        h = YAML.load(f)
+        for k in h.keys
+          begin
+            @config[k.to_sym] = h[k]
+          rescue
+            raise "wrong pattern #{h[k]}"
+          end
+        end
+      end
+      @config = default
+    end
+
+
+    def init_meta
+      # backup real
+      real_dir = 'real'
+      if File.directory? real_dir
+        backup_dir = '.backup'
+        unless File.exists? backup_dir
+          FileUtils.cp_r real_dir, backup_dir
+        end
+      else
+        raise 'No directory named "real"'
+      end
+
+      # generate meta
+      meta_dir = 'meta'
+      if File.exists? meta_dir
+        if File.directory? meta_dir
+          FileUtils.rm_rf meta_dir
+        else
+          raise 'meta directory is reserved for instiki'
+        end
+      end
+
+
+      puts "Generating meta files:"
+      puts "-" * 40
+      Dir.glob(File.join('real', '**', '*.rb')) do |f|
+        if skip_path? f
+          puts "- #{f}"
+          next
+        end
+
+        next unless File.file? f
+        next if f =~ /.*[.]py[.]rb$/
+        py_path = convert_path f
+        dir_name = File.dirname py_path
+
+        puts '  ' + py_path
+        FileUtils.mkdir_p dir_name
+        make_py f, py_path, beautify = true
+      end
+
+      puts "-" * 40
+    end
+
+    def make_py( rb_path, py_path, beautify = false )
+      rb = open(rb_path).read
+
+      py_file = open(py_path, 'w')
+      rb = Beautifier::ruby rb if beautify
+      py_file.write(to_py(rb))
+      py_file.close
+    end
+
+
+    def update_rb( meta_name )
+      meta = open(meta_name)
+      real_name = convert_path meta_name
+      begin
+        real_rb = open( real_name, 'w' )
+        real_rb.write(to_rb(meta.read))
+      rescue Exception => e
+        puts e
+      ensure
+        real_rb.close unless real_rb.nil?
+      end
+      meta.close
+    end
+  end
+end

data/lib/vendor/beautifier.rb

@@ -0,0 +1,135 @@
+# Ruby beautifier, version 1.3, 04/03/2006
+# Copyright (c) 2006, P. Lutus
+# TextMate modifications by T. Burks
+# Released under the GPL
+# Modified for lazibi by Jinjing
+
+module Beautifier
+
+  $tabSize = 2
+  $tabStr = " "
+
+  # indent regexp tests
+
+  $indentExp = [
+    /^module\b/,
+    /(=\s*|^)if\b/,
+    /(=\s*|^)until\b/,
+    /(=\s*|^)for\b/,
+    /(=\s*|^)unless\b/,
+    /(=\s*|^)while\b/,
+    /(=\s*|^)begin\b/,
+    /(=\s*|^)case\b/,
+    /\bthen\b/,
+    /^class\b/,
+    /^rescue\b/,
+    /^def\b/,
+    /\bdo\b/,
+    /^else\b/,
+    /^elsif\b/,
+    /^ensure\b/,
+    /\bwhen\b/,
+    /\{[^\}]*$/,
+    /\[[^\]]*$/
+  ]
+
+  # outdent regexp tests
+
+  $outdentExp = [
+    /^rescue\b/,
+    /^ensure\b/,
+    /^elsif\b/,
+    /^end\b/,
+    /^else\b/,
+    /\bwhen\b/,
+    /^[^\{]*\}/,
+    /^[^\[]*\]/
+  ]
+
+  def self.makeTab(tab)
+    return (tab < 0) ? "":$tabStr * $tabSize * tab
+  end
+
+  def self.addLine(line,tab)
+    line.strip!
+    line = makeTab(tab)+line if line.length > 0
+    return line + "\n"
+  end
+
+  def self.ruby( source )
+    commentBlock = false
+    multiLineArray = Array.new
+    multiLineStr = ""
+    tab = 0
+    dest = ""
+    source.split("\n").each do |line|
+      # combine continuing lines
+      if(!(line =~ /^\s*#/) && line =~ /[^\\]\\\s*$/)
+        multiLineArray.push line
+        multiLineStr += line.sub(/^(.*)\\\s*$/,"\\1")
+        next
+      end
+
+      # add final line
+      if(multiLineStr.length > 0)
+        multiLineArray.push line
+        multiLineStr += line.sub(/^(.*)\\\s*$/,"\\1")
+      end
+
+      tline = ((multiLineStr.length > 0)?multiLineStr:line).strip
+      if(tline =~ /^=begin/)
+        commentBlock = true
+      end
+      if(commentBlock)
+        # add the line unchanged
+        dest += line + "\n"
+      else
+        commentLine = (tline =~ /^#/)
+        if(!commentLine)
+          # throw out sequences that will
+          # only sow confusion
+          tline.gsub!(/\/.*?\//,"")
+          tline.gsub!(/%r\{.*?\}/,"")
+          tline.gsub!(/%r(.).*?\1/,"")
+          tline.gsub!(/\\\"/,"'")
+          tline.gsub!(/".*?"/,"\"\"")
+          tline.gsub!(/'.*?'/,"''")
+          tline.gsub!(/#\{.*?\}/,"")
+          $outdentExp.each do |re|
+            if(tline =~ re)
+              tab -= 1
+              break
+            end
+          end
+        end
+        if (multiLineArray.length > 0)
+          multiLineArray.each do |ml|
+            dest += addLine(ml,tab)
+          end
+          multiLineArray.clear
+          multiLineStr = ""
+        else
+          dest += addLine(line,tab)
+        end
+        if(!commentLine)
+          $indentExp.each do |re|
+            if(tline =~ re && !(tline =~ /\s+end\s*$/))
+              tab += 1
+              break
+            end
+          end
+        end
+      end
+      if(tline =~ /^=end/)
+        commentBlock = false
+      end
+    end
+    # STDOUT.write(dest)
+    # uncomment this to complain about mismatched blocks
+    # if(tab != 0)
+    #   STDERR.puts "Indentation error: #{tab}"
+    #
+
+    dest
+  end
+end

data/scripts/rdoc2html

@@ -0,0 +1,74 @@
+#!/usr/bin/env ruby
+
+
+require 'rubygems'
+require 'syntax/convertors/html'
+require 'erb'
+require 'rdoc/markup/simple_markup'
+require 'rdoc/markup/simple_markup/to_html'
+
+require File.dirname(__FILE__) + '/../lib/lazibi/version.rb'
+
+version  = Lazibi::VERSION::STRING
+download = 'http://rubyforge.org/projects/lazibi'
+
+class Fixnum
+  def ordinal
+    # teens
+    return 'th' if (10..19).include?(self % 100)
+    # others
+    case self % 10
+    when 1: return 'st'
+    when 2: return 'nd'
+    when 3: return 'rd'
+    else    return 'th'
+    end
+  end
+end
+
+class Time
+  def pretty
+    return "#{mday}#{mday.ordinal} #{strftime('%B')} #{year}"
+  end
+end
+
+def convert_syntax(syntax, source)
+  return Syntax::Convertors::HTML.for_syntax(syntax).convert(source).gsub(%r!^<pre>|</pre>$!,'')
+end
+
+if ARGV.length >= 1
+  src, template = ARGV
+  template ||= File.dirname(__FILE__) + '/../website/template.rhtml'
+  
+else
+  puts("Usage: #{File.split($0).last} source.txt [template.rhtml] > output.html")
+  exit!
+end
+
+template = ERB.new(File.open(template).read)
+
+title = nil
+body = nil
+p = SM::SimpleMarkup.new
+h = SM::ToHtml.new
+File.open(src) do |fsrc|
+  title_text = fsrc.readline
+  body_text = fsrc.read
+  syntax_items = []
+  body_text.gsub!(%r!<(pre|code)[^>]*?syntax=['"]([^'"]+)[^>]*>(.*?)</
>!m){
+    ident = syntax_items.length
+    element, syntax, source = $1, $2, $3
+    syntax_items << "<#{element} class='syntax'>#{convert_syntax(syntax, source)}</#{element}>"
+    "syntax-temp-#{ident}"
+  }
+  title = p.convert(title_text, h).gsub(%r!<.*?>!,'').strip
+  body = p.convert(body_text, h)
+  body.gsub!(%r!(?:<pre><code>)?syntax-temp-(d+)(?:</code></pre>)?!){ syntax_items[$1.to_i] }
+end
+
+
+stat = File.stat(src)
+created = stat.ctime
+modified = stat.mtime
+
+$stdout << template.result(binding)

data/test/fixtures/meta/case.txt

@@ -0,0 +1,7 @@
+case abc
+when 'a'
+  puts 'a'
+when 'b'
+  puts 'b'
+else
+  puts 'c'

data/test/fixtures/meta/inline_end.txt

@@ -0,0 +1,3 @@
+def abc
+
+def def abc end

data/test/fixtures/real/case.txt

@@ -0,0 +1,8 @@
+case abc
+when 'a'
+  puts 'a'
+when 'b'
+  puts 'b'
+else
+  puts 'c'
+end

data/test/fixtures/real/inline_end.txt

@@ -0,0 +1,3 @@
+def abc end
+
+def def abc end end

data/test/test_unit.rb

@@ -4,31 +4,29 @@ require 'pp'
 class TestLazibi < Test::Unit::TestCase
   attr :fixtures, :expected
 
-  include Lazibi    
-  
   def setup
-    
+
     # load fixtures
     @meta = {}
     @real = {}
 
     fixture_dir = File.dirname(__FILE__) + '/fixtures/meta'
-  
+
     Dir.open(fixture_dir).each do |fn|
       next unless fn =~ /[.]txt$/
       @meta[fn.scan(/(.*)[.]/).to_s.to_sym] = File.read(fixture_dir + "/#{fn}")
     end
-  
+
     expected_dir = File.dirname(__FILE__) + '/fixtures/real'
     Dir.open(expected_dir).each do |fn|
       next unless fn =~ /[.]txt$/
       @real[fn.scan(/(.*)[.]/).to_s.to_sym] = File.read(expected_dir + "/#{fn}")
     end
-    
-    @r = Lazibi.new
+
+    @r = Lazibi::Runner.new
   end
-    
-  
+
+
   def test_start_anchor?
     assert @r.start_anchor?( 'class' )
     assert @r.start_anchor?( 'do |abc| ')
@@ -36,13 +34,13 @@ class TestLazibi < Test::Unit::TestCase
     assert !@r.start_anchor?( '"abc do "')
     assert !@r.start_anchor?( '"abc do  |"')
   end
-  
+
   def test_middle_anchor?
     assert !@r.middle_anchor?( '' )
     assert @r.middle_anchor?( 'rescue' )
   end
-  
-  def test_find_
+
+  def test_find_end
     assert_find :basic_class, 0, 0
     assert_find :class_with_def, 0, 1
     assert_find :class_with_def, 0, 1
@@ -52,47 +50,47 @@ class TestLazibi < Test::Unit::TestCase
     assert_find :partial_method, 2, 0
     assert_find :middle, 0, 1
   end
-  
+
   def test_convert_path
     assert @r.convert_path( 'meta/abc.py.rb' ) == 'real/abc.rb', @r.convert_path('meta/abc.rb')
     assert @r.convert_path( 'real/abc.rb' ) == 'meta/abc.py.rb'
     assert @r.convert_path( 'meta/lib/abc.py.rb' ) == 'real/lib/abc.rb'
   end
-  
+
   def test_convert_content
     @meta.keys.reject{|k| ['partial_method', 'inline_end'].include? k.to_s }.each do |k|
       assert_convert k
     end
   end
-  
+
   def test_to_rb
     assert_to_rb :partial_method
   end
-  
-  def test_to_py 
+
+  def test_to_py
     assert_to_py :inline_end
   end
-    
-  
+
+
   private
-    def assert_find( name, indent, end_i )
-      assert_equal @r.find_end(@meta[name].split("\n"), indent), end_i
-    end
-    
-    def assert_to_rb( name )
-      assert_equal @r.to_rb( @meta[name]), @real[name], name
-    end
-      
-    def assert_to_py( name )
-      assert_equal @r.to_py( @real[name]), @meta[name], name
-    end
-      
-    def assert_convert( name )
-      assert_to_rb(name)
-      assert_to_py(name)
-    end
-      
-    def assert_identity( s )
-      assert_equal @r.to_rb( @r.to_py( s ) ), s    
-    end
+  def assert_find( name, indent, end_i )
+    assert_equal @r.find_end(@meta[name].split("\n"), indent), end_i
+  end
+
+  def assert_to_rb( name )
+    assert_equal @r.to_rb( @meta[name]), @real[name], name
+  end
+
+  def assert_to_py( name )
+    assert_equal @r.to_py( @real[name]), @meta[name], name
+  end
+
+  def assert_convert( name )
+    assert_to_rb(name)
+    assert_to_py(name)
+  end
+
+  def assert_identity( s )
+    assert_equal @r.to_rb( @r.to_py( s ) ), s
+  end
 end

data/website/index.html

@@ -33,7 +33,7 @@
     <h1>Welcome to Lazibi</h1>
     <div id="version" class="clickable" onclick='document.location = "http://rubyforge.org/projects/lazibi"; return false'>
       <p>Get Version</p>
-      <a href="http://rubyforge.org/projects/lazibi" class="numbers">0.1.4</a>
+      <a href="http://rubyforge.org/projects/lazibi" class="numbers">0.1.5</a>
     </div>
     <p>
 Lazibi is a meta language which allows you to use Python like syntax (
@@ -109,23 +109,13 @@ Make sure everything still works
   rake test / autotest
 </pre>
 <p>
-Start hacking ruby/python :/
+Start hacking ruby/python in meta :/
 </p>
 <pre>
   cd shiny_project
   $your_editor meta
 </pre>
 <h2>Tips</h2>
-<h3>Rails fix</h3>
-<p>
-After bootstrap, edit config/boot.py.rb in meta
-</p>
-<pre>
-  STDERR.puts %(Cannot find gem for Rails ~&gt;#{version}.0:
-    Install the missing gem with 'gem install -v=#{version} rails', or
-    change environment.rb to define RAILS_GEM_VERSION with your desired version.
-    )
-</pre>
 <h3>Manually create meta files</h3>
 <ul>
 <li>Bootstrap your project as usual, just don&#8217;t run lazibi
@@ -144,6 +134,18 @@ After bootstrap, edit config/boot.py.rb in meta
 <li>create .py.rb files in corresponding directories inside &#8216;meta&#8217;,
 .rb files will be created and updated in &#8216;real&#8217; as usual
 
+</li>
+</ul>
+<h3>Prevent certain directories from being parsed during bootstrap ( default is ^vendor )</h3>
+<ul>
+<li>Create .lazibi in project/real path
+
+<pre>
+  exclude:
+  - pattern_1
+  - pattern_2
+  - for_example_^vendor
+</pre>
 </li>
 </ul>
 <h2>Known issues</h2>
@@ -174,7 +176,7 @@ Released under the MIT license (included)
 </p>
 
     <p class="coda">
-      <a href="mailto:nfjinjing@gmail.com">Jinjing</a>, 15th June 2007<br>
+      <a href="mailto:nfjinjing@gmail.com">Jinjing</a>, 16th June 2007<br>
       Theme extended from <a href="http://rb2js.rubyforge.org/">Paul Battley</a>
     </p>
 </div>

data/website/index.txt

@@ -63,22 +63,13 @@ Make sure everything still works
   cd shiny_project/real
   rake test / autotest
   
-Start hacking ruby/python :/
+Start hacking ruby/python in meta :/
 
   cd shiny_project
   $your_editor meta
 
 == Tips
 
-=== Rails fix
-
-After bootstrap, edit config/boot.py.rb in meta
-
-  STDERR.puts %(Cannot find gem for Rails ~>#{version}.0:
-    Install the missing gem with 'gem install -v=#{version} rails', or
-    change environment.rb to define RAILS_GEM_VERSION with your desired version.
-    )
-
 === Manually create meta files
 
 * Bootstrap your project as usual, just don't run lazibi
@@ -92,6 +83,14 @@ After bootstrap, edit config/boot.py.rb in meta
 
 * create .py.rb files in corresponding directories inside 'meta', .rb files will be created and updated in 'real' as usual
 
+=== Prevent certain directories from being parsed during bootstrap ( default is ^vendor )
+
+* Create .lazibi in project/real path
+
+    exclude:
+    - pattern_1
+    - pattern_2
+    - for_example_^vendor
 
 == Known issues
 

data/website/stylesheets/screen.css

@@ -1,21 +1,22 @@
 body {
-  background-color: #E1D1F1;
+	background-color: #fff; color: #333;
   font-family: "Georgia", sans-serif;
   font-size: 16px;
   line-height: 1.6em;
   padding: 1.6em 0 0 0;
-  color: #333;
 }
 h1, h2, h3, h4, h5, h6 {
-  color: #444;
 }
+
 h1 { 
+	background: #eef;
   font-family: sans-serif;
   font-weight: normal;
   font-size: 4em;
   line-height: 0.8em;
   letter-spacing: -0.1ex;
 	margin: 5px;
+	padding: 20px 20px 10px 20px;
 }
 li {
   padding: 0;
@@ -23,11 +24,12 @@ li {
   list-style-type: square;
 }
 a {
-  color: #5E5AFF;
-	background-color: #DAC;
   font-weight: normal;
   text-decoration: underline;
 }
+
+a { color: #000; }
+
 blockquote {
   font-size: 90%;
   font-style: italic;
@@ -79,11 +81,11 @@ td {
 }
 pre, code {
   font-family: monospace;
+	background: #eee;
   font-size: 90%;
   line-height: 1.4em;
-  color: #ff8;
-  background-color: #111;
   padding: 2px 10px 2px 10px;
+#	border: 1px solid;
 }
 .comment { color: #aaa; font-style: italic; }
 .keyword { color: #eff; font-weight: bold; }
@@ -101,8 +103,8 @@ pre, code {
   text-align: right;
   font-family: sans-serif;
   font-weight: normal;
-  background-color: #B3ABFF;
-  color: #141331;
+#  background-color: #B3ABFF;
+#  color: #141331;
   padding: 15px 20px 10px 20px;
   margin: 0 auto;
 	margin-top: 15px;
@@ -119,16 +121,16 @@ pre, code {
 
 #version p {
   text-decoration: none;
-	color: #141331;
-	background-color: #B3ABFF;
+#	color: #141331;
+#	background-color: #B3ABFF;
 	margin: 0;
 	padding: 0;
 }
 
 #version a {
   text-decoration: none;
-	color: #141331;
-	background-color: #B3ABFF;
+#	color: #141331;
+#	background-color: #B3ABFF;
 }
 
 .clickable {

metadata

@@ -3,8 +3,8 @@ rubygems_version: 0.9.3
 specification_version: 1
 name: lazibi
 version: !ruby/object:Gem::Version 
-  version: 0.1.4
-date: 2007-06-15 00:00:00 +08:00
+  version: 0.1.5
+date: 2007-06-16 00:00:00 +08:00
 summary: Python like syntax for Ruby
 require_paths: 
 - lib
@@ -35,19 +35,29 @@ files:
 - README.txt
 - Rakefile
 - bin/lazibi
+- lib/helper/parser_helper.rb
+- lib/helper/task_helper.rb
 - lib/lazibi.rb
 - lib/lazibi/version.rb
+- lib/parser.rb
+- lib/task.rb
+- lib/vendor/beautifier.rb
+- scripts/rdoc2html
 - scripts/txt2html
 - test/fixtures/meta/basic_class.txt
+- test/fixtures/meta/case.txt
 - test/fixtures/meta/class_with_def.txt
 - test/fixtures/meta/comment.txt
+- test/fixtures/meta/inline_end.txt
 - test/fixtures/meta/middle.txt
 - test/fixtures/meta/nested_comment.txt
 - test/fixtures/meta/partial_method.txt
 - test/fixtures/meta/two_methods.txt
 - test/fixtures/real/basic_class.txt
+- test/fixtures/real/case.txt
 - test/fixtures/real/class_with_def.txt
 - test/fixtures/real/comment.txt
+- test/fixtures/real/inline_end.txt
 - test/fixtures/real/middle.txt
 - test/fixtures/real/nested_comment.txt
 - test/fixtures/real/partial_method.txt
@@ -71,15 +81,19 @@ extra_rdoc_files:
 - Manifest.txt
 - README.txt
 - test/fixtures/meta/basic_class.txt
+- test/fixtures/meta/case.txt
 - test/fixtures/meta/class_with_def.txt
 - test/fixtures/meta/comment.txt
+- test/fixtures/meta/inline_end.txt
 - test/fixtures/meta/middle.txt
 - test/fixtures/meta/nested_comment.txt
 - test/fixtures/meta/partial_method.txt
 - test/fixtures/meta/two_methods.txt
 - test/fixtures/real/basic_class.txt
+- test/fixtures/real/case.txt
 - test/fixtures/real/class_with_def.txt
 - test/fixtures/real/comment.txt
+- test/fixtures/real/inline_end.txt
 - test/fixtures/real/middle.txt
 - test/fixtures/real/nested_comment.txt
 - test/fixtures/real/partial_method.txt