lazibi 0.1.5 → 0.1.6

data/History.txt

@@ -1,4 +1,9 @@
-== 0.1.4 2007-06-15
+== 0.1.6 2007-06-18
+
+* Patched beautifier to support /\// style RE and %w() %w{}
+* Make Lazibi works with itself again
+
+== 0.1.5 2007-06-15
 
 * Use beautifier to pre-format ruby scripts
 * Completely compatible with Rails projects now, no fix anymore :]

data/lib/helper/parser_helper.rb

@@ -13,16 +13,16 @@ module Lazibi
 
     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"}
+      m = ['\sdo\s*$|\sdo\s+(\|[^|]+\|)']
+      s.map!{|key| "^#{key}\\b"}
 
-        Regexp.new(s.concat(m).join('|'))
+      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('|'))
+      s.map!{|key| "^#{key}\\b"}
+      Regexp.new(s.join('|'))
     end
 
     def end_keys

data/lib/lazibi/version.rb

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

data/lib/lazibi.rb

@@ -9,22 +9,22 @@ module Lazibi
   class Runner
     include Parser
     include Task
-    
+
     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
+      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

data/lib/vendor/beautifier.rb

@@ -88,13 +88,18 @@ module Beautifier
         if(!commentLine)
           # throw out sequences that will
           # only sow confusion
-          tline.gsub!(/\/.*?\//,"")
+          tline.gsub!(/\/.*?[^\\]\//,"")
           tline.gsub!(/%r\{.*?\}/,"")
           tline.gsub!(/%r(.).*?\1/,"")
           tline.gsub!(/\\\"/,"'")
           tline.gsub!(/".*?"/,"\"\"")
           tline.gsub!(/'.*?'/,"''")
           tline.gsub!(/#\{.*?\}/,"")
+
+          # more ..
+          tline.gsub!(/%w\{[^\{]*?\}/, '')
+          tline.gsub!(/%w\([^(]*?\)/, '')
+
           $outdentExp.each do |re|
             if(tline =~ re)
               tab -= 1

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.5</a>
+      <a href="http://rubyforge.org/projects/lazibi" class="numbers">0.1.6</a>
     </div>
     <p>
 Lazibi is a meta language which allows you to use Python like syntax (
@@ -176,7 +176,7 @@ Released under the MIT license (included)
 </p>
 
     <p class="coda">
-      <a href="mailto:nfjinjing@gmail.com">Jinjing</a>, 16th June 2007<br>
+      <a href="mailto:nfjinjing@gmail.com">Jinjing</a>, 18th June 2007<br>
       Theme extended from <a href="http://rb2js.rubyforge.org/">Paul Battley</a>
     </p>
 </div>

metadata

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