lazibi 0.1.6 → 0.1.7

data/History.txt

@@ -1,3 +1,7 @@
+== 0.1.7 2007-06-18
+
+* Bug fix: when .backup exists, code generation stops to work
+
 == 0.1.6 2007-06-18
 
 * Patched beautifier to support /\// style RE and %w() %w{}

data/README.txt

@@ -1,10 +1,10 @@
 == Welcome to Lazibi
 
-Lazibi is a meta language which allows you to use Python like syntax ( tab-indented block ) in 
-Ruby. It's backward compatible with plain Ruby if you indent your blocks properly.
+Lazibi is a preprocessor that allows you to use Python style indenting in Ruby. 
+It tries to be backward compatible with plain Ruby if you like to indent your blocks properly.
 
 The idea is to edit .py.rb files in a meta directory and let the engine generates .rb files in
-the real directory for you.
+the real directory for you in _real time_.
 
 == Examples
 
@@ -92,10 +92,13 @@ Start hacking ruby/python in meta :/
     - pattern_2
     - for_example_^vendor
 
+== In Practice
+
+Lazibi is written using Lazibi itself ( incrementally ). Personally I think autotest from http://www.zenspider.com/ZSS/Products/ZenTest/ is a must have, and Lazibi works best using TDD.
+
 == Known issues
 
-Here document like long strings are likely to screw up code generation, try 
-to indent long strings like the fix for rails
+Here docs are likely to screw up code generation. Give them enough indent so they are treated like normal code inside current code block ;|
 
 == To Do
 

data/lib/helper/parser_helper.rb

@@ -1,3 +1,7 @@
+$:.unshift(File.dirname(__FILE__) + '/../vendor')
+
+require 'beautifier'
+
 module Lazibi
   module ParserHelper
 
@@ -30,8 +34,8 @@ module Lazibi
     end
 
     def start_anchor?( str )
-      str.gsub! /"[^"]+"|'[^']+'/, ''
       return false if str =~ /^#/
+      str = clean_line str
       return true if str =~ begin_keys
     end
 
@@ -42,5 +46,9 @@ module Lazibi
     def end_anchor?(str)
       str =~ end_keys
     end
+
+    def clean_line(line)
+      Beautifier::clean_line line
+    end
   end
 end

data/lib/helper/task_helper.rb

@@ -29,15 +29,5 @@ module Lazibi
       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  = 6
+    TINY  = 7
 
     STRING = [MAJOR, MINOR, TINY].join('.')
   end

data/lib/lazibi.rb

@@ -11,8 +11,9 @@ module Lazibi
     include Task
 
     def run
+      puts '-' * 40
       load_config
-      init_meta unless File.exists? '.backup'
+      init_meta
       @metas = {}
       while true
         current_metas = get_metas

data/lib/task.rb

@@ -32,6 +32,8 @@ module Lazibi
       if File.directory? real_dir
         backup_dir = '.backup'
         unless File.exists? backup_dir
+          puts "backup #{real_dir} to #{backup_dir}"
+          puts "-" * 40
           FileUtils.cp_r real_dir, backup_dir
         end
       else
@@ -40,6 +42,7 @@ module Lazibi
 
       # generate meta
       meta_dir = 'meta'
+      FileUtils.mkdir_p meta_dir
       if File.exists? meta_dir
         if File.directory? meta_dir
           FileUtils.rm_rf meta_dir
@@ -84,6 +87,8 @@ module Lazibi
       meta = open(meta_name)
       real_name = convert_path meta_name
       begin
+        real_path = File.dirname real_name
+        FileUtils.mkdir_p real_path
         real_rb = open( real_name, 'w' )
         real_rb.write(to_rb(meta.read))
       rescue Exception => e
@@ -93,5 +98,15 @@ module Lazibi
       end
       meta.close
     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/vendor/beautifier.rb

@@ -56,6 +56,25 @@ module Beautifier
     return line + "\n"
   end
 
+  def self.clean_line( tline )
+
+    # 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!(/#\{.*?\}/,"")
+
+    # more ..
+    tline.gsub!(/%w\{[^\{]*?\}/, '')
+    tline.gsub!(/%w\([^(]*?\)/, '')
+
+    tline
+  end
+
   def self.ruby( source )
     commentBlock = false
     multiLineArray = Array.new
@@ -88,17 +107,7 @@ module Beautifier
         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!(/#\{.*?\}/,"")
-
-          # more ..
-          tline.gsub!(/%w\{[^\{]*?\}/, '')
-          tline.gsub!(/%w\([^(]*?\)/, '')
+          tline = clean_line(tline)
 
           $outdentExp.each do |re|
             if(tline =~ re)

data/test/test_helper.rb

@@ -1,5 +1,7 @@
 $:.unshift(File.dirname(__FILE__))
 $:.unshift(File.dirname(__FILE__) + '/../lib')
+$:.unshift(File.dirname(__FILE__) + '/../lib/vendor')
 
 require 'test/unit'
-require 'lazibi'
+require 'lazibi'
+require 'beautifier'

data/test/test_unit.rb

@@ -9,9 +9,9 @@ class TestLazibi < Test::Unit::TestCase
     # load fixtures
     @meta = {}
     @real = {}
+    @clean = {}
 
     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}")
@@ -22,6 +22,12 @@ class TestLazibi < Test::Unit::TestCase
       next unless fn =~ /[.]txt$/
       @real[fn.scan(/(.*)[.]/).to_s.to_sym] = File.read(expected_dir + "/#{fn}")
     end
+      
+    clean_dir = File.dirname(__FILE__) + '/fixtures/clean'
+    Dir.open(clean_dir).each do |fn|
+      next unless fn =~ /[.]txt$/
+      @clean[fn.scan(/(.*)[.]/).to_s.to_sym] = File.read(clean_dir + "/#{fn}")
+    end
 
     @r = Lazibi::Runner.new
   end
@@ -70,6 +76,12 @@ class TestLazibi < Test::Unit::TestCase
   def test_to_py
     assert_to_py :inline_end
   end
+    
+  def test_beauty
+    @clean.keys.each do |k|
+      assert_beauty k
+    end
+  end
 
 
   private
@@ -93,4 +105,8 @@ class TestLazibi < Test::Unit::TestCase
   def assert_identity( s )
     assert_equal @r.to_rb( @r.to_py( s ) ), s
   end
+    
+  def assert_beauty( name )
+    assert_equal Beautifier::ruby(@real[name]), @clean[name], name
+  end
 end

data/website/index.html

@@ -33,16 +33,16 @@
     <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.6</a>
+      <a href="http://rubyforge.org/projects/lazibi" class="numbers">0.1.7</a>
     </div>
     <p>
-Lazibi is a meta language which allows you to use Python like syntax (
-tab-indented block ) in Ruby. It&#8217;s backward compatible with plain
-Ruby if you indent your blocks properly.
+Lazibi is a preprocessor that allows you to use Python style indenting in
+Ruby. It tries to be backward compatible with plain Ruby if you like to
+indent your blocks properly.
 </p>
 <p>
 The idea is to edit .py.rb files in a meta directory and let the engine
-generates .rb files in the real directory for you.
+generates .rb files in the real directory for you in _real time_.
 </p>
 <h2>Examples</h2>
 <p>
@@ -148,10 +148,16 @@ Start hacking ruby/python in meta :/
 </pre>
 </li>
 </ul>
+<h2>In Practice</h2>
+<p>
+Lazibi is written using Lazibi itself ( incrementally ). Personally I think
+autotest from http://www.zenspider.com/ZSS/Products/ZenTest/ is a must
+have, and Lazibi works best using TDD.
+</p>
 <h2>Known issues</h2>
 <p>
-Here document like long strings are likely to screw up code generation, try
-to indent long strings like the fix for rails
+Here docs are likely to screw up code generation. Give them enough indent
+so they are treated like normal code inside current code block ;|
 </p>
 <h2>To Do</h2>
 <ul>

data/website/index.txt

@@ -1,10 +1,10 @@
 == Welcome to Lazibi
 
-Lazibi is a meta language which allows you to use Python like syntax ( tab-indented block ) in 
-Ruby. It's backward compatible with plain Ruby if you indent your blocks properly.
+Lazibi is a preprocessor that allows you to use Python style indenting in Ruby. 
+It tries to be backward compatible with plain Ruby if you like to indent your blocks properly.
 
 The idea is to edit .py.rb files in a meta directory and let the engine generates .rb files in
-the real directory for you.
+the real directory for you in _real time_.
 
 == Examples
 
@@ -92,10 +92,13 @@ Start hacking ruby/python in meta :/
     - pattern_2
     - for_example_^vendor
 
+== In Practice
+
+Lazibi is written using Lazibi itself ( incrementally ). Personally I think autotest from http://www.zenspider.com/ZSS/Products/ZenTest/ is a must have, and Lazibi works best using TDD.
+
 == Known issues
 
-Here document like long strings are likely to screw up code generation, try 
-to indent long strings like the fix for rails
+Here docs are likely to screw up code generation. Give them enough indent so they are treated like normal code inside current code block ;|
 
 == To Do
 

metadata

@@ -3,7 +3,7 @@ rubygems_version: 0.9.3
 specification_version: 1
 name: lazibi
 version: !ruby/object:Gem::Version 
-  version: 0.1.6
+  version: 0.1.7
 date: 2007-06-18 00:00:00 +08:00
 summary: Python like syntax for Ruby
 require_paths: