lazibi 0.1.13 → 0.1.14

data/.autotest

@@ -1,2 +1,44 @@
-require 'autotest/redgreen'
-require 'autotest/growl'
+require 'autotest/growl'
+
+# Just like Autotest::Fixtures, but for specs
+module Autotest::SpecFixtures
+  Autotest.add_hook :initialize do |at|
+    at.test_mappings['^spec/fixtures/(.*)s.yml'] = proc { |filename, matches|
+      at.files_matching(/spec\/\w+\/#{matches[1]}(_\w+)?.*_spec.rb$/)
+    }
+  end
+end
+
+# Just like Autotest::RedGreen, but for specs
+module Autotest::SpecRedGreen
+  BAR = "=" * 80
+
+  Autotest.add_hook :ran_command do |at|
+    # TODO: submit a patch for RedGreen to make the match and code configurable
+    if at.results.last.match(/^(\d+) examples?, (\d+) failures?$/)
+      code = ($2 != "0") ? 31 : 32
+      puts "\e[#{code}m#{BAR}\e[0m\n\n" 
+    end
+  end
+end
+
+# Speak failures via Apple's speech synth
+
+module Autotest::Speak
+  def self.speak message
+#    system %(osascript -e 'say "#{message}"')
+  end
+
+  Autotest.add_hook :red do |at|
+    failures = at.files_to_test.size
+    speak "#{failures} example#{failures == 0 || failures > 1 ? 's' : nil} failed." 
+  end
+
+  # Autotest.add_hook :green do |at|
+  #   speak "Specs passed." 
+  # end
+
+  Autotest.add_hook :all_good do |at|
+    speak "All specs passed." 
+  end
+end

data/History.txt

@@ -1,10 +1,19 @@
+== 0.1.14 2007-06-29
+
+* Features
+  * Completely re-factored source code
+  * Move from unit test to rspec, reused _all_ the previous fixtures and test cases
+  * The engine can hook any filters with complete configuration
+  * Designed with future easy custom pre-processor filters plugin in mind
+  * Ruby based configuration file
+
 == 0.1.13 2007-06-22
 
 * Bugs
   * {} and lambda syntax for optioanl_do 
   * correctly parse inline def; end
 
-Features
+* Features
   * Passed all spec tests for RSpec with optional_do filter on
   
 == 0.1.12 2007-06-21

data/Manifest.txt

@@ -5,100 +5,123 @@ Manifest.txt
 README.txt
 Rakefile
 bin/lazibi
-coverage/index.html
-coverage/lib-helper-parser_helper_rb.html
-coverage/lib-helper-task_helper_rb.html
-coverage/lib-lazibi-version_rb.html
-coverage/lib-lazibi_rb.html
-coverage/lib-parser_rb.html
-coverage/lib-task_rb.html
-lib/helper/app_helper.rb
-lib/helper/parser_helper.rb
+config/lazibi_config_template.rb
+lib/core/beautify_engine.rb
+lib/core/default_engine.rb
+lib/core/engine_base.rb
+lib/filter/beautify_filter.rb
+lib/filter/filter_base.rb
+lib/filter/optional_do_filter.rb
+lib/filter/optional_end_filter.rb
+lib/filter/syntax_guard_filter.rb
+lib/helper/application_helper.rb
+lib/helper/beautify_filter_helper.rb
+lib/helper/filter_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/clean/comment_break.txt
-test/fixtures/clean/complex_string.txt
-test/fixtures/clean/end_concat.txt
-test/fixtures/clean/long_indent.txt
-test/fixtures/clean/mixed_re.txt
-test/fixtures/clean/only_if.txt
-test/fixtures/clean/re.txt
-test/fixtures/clean/semi_colon_after_end.txt
-test/fixtures/clean/sep_line.txt
-test/fixtures/clean/unless_problem.txt
-test/fixtures/functional/ruby/brackets_block.txt
-test/fixtures/functional/ruby/classical.txt
-test/fixtures/functional/ruby/describe.txt
-test/fixtures/functional/ruby/do_block.txt
-test/fixtures/functional/ruby/lambda.txt
-test/fixtures/functional/ruby/square_brackets.txt
-test/fixtures/functional/simply/brackets_block.txt
-test/fixtures/functional/simply/classical.txt
-test/fixtures/functional/simply/describe.txt
-test/fixtures/functional/simply/do_block.txt
-test/fixtures/functional/simply/lambda.txt
-test/fixtures/functional/simply/square_brackets.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/comment_after_end.txt
-test/fixtures/meta/eval_code.txt
-test/fixtures/meta/here_doc.txt
-test/fixtures/meta/inline_do_end.txt
-test/fixtures/meta/inline_end.txt
-test/fixtures/meta/loop.txt
-test/fixtures/meta/middle.txt
-test/fixtures/meta/multi_blocks.txt
-test/fixtures/meta/nested_comment.txt
-test/fixtures/meta/optional_do.txt
-test/fixtures/meta/optional_do_with_nasty_chars.txt
-test/fixtures/meta/partial_method.txt
-test/fixtures/meta/single_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/comment_after_end.txt
-test/fixtures/real/comment_after_end_expected.txt
-test/fixtures/real/comment_break.txt
-test/fixtures/real/complex_string.txt
-test/fixtures/real/end_concat.txt
-test/fixtures/real/eval_code.txt
-test/fixtures/real/general_eval.txt
-test/fixtures/real/here_doc.txt
-test/fixtures/real/inline_do_end.txt
-test/fixtures/real/inline_end.txt
-test/fixtures/real/javascript.txt
-test/fixtures/real/long_indent.txt
-test/fixtures/real/loop.txt
-test/fixtures/real/middle.txt
-test/fixtures/real/mixed_re.txt
-test/fixtures/real/multi_blocks.txt
-test/fixtures/real/nested_comment.txt
-test/fixtures/real/only_if.txt
-test/fixtures/real/optional_do.txt
-test/fixtures/real/optional_do_with_nasty_chars.txt
-test/fixtures/real/partial_method.txt
-test/fixtures/real/re.txt
-test/fixtures/real/semi_colon_after_end.txt
-test/fixtures/real/sep_line.txt
-test/fixtures/real/single_method.txt
-test/fixtures/real/strange_syntax_1.txt
-test/fixtures/real/two_methods.txt
-test/fixtures/real/unless_problem.txt
-test/test_functional.rb
-test/test_helper.rb
-test/test_unit.rb
-website/index.html
-website/index.txt
-website/javascripts/rounded_corners_lite.inc.js
-website/stylesheets/screen.css
-website/template.rhtml
+spec/core/beautify_engine_spec.rb
+spec/core/default_engine_spec.rb
+spec/core/engine_base_spec.rb
+spec/filter/beautify_filter_spec.rb
+spec/filter/filter_spec_helper.rb
+spec/filter/optional_do_filter_spec.rb
+spec/filter/optional_end_filter_spec.rb
+spec/filter/syntax_guard_filter_spec.rb
+spec/fixtures/beautify/metas/square_brackets.txt
+spec/fixtures/beautify/rbs/square_brackets.txt
+spec/fixtures/clean/comment_break.txt
+spec/fixtures/clean/complex_string.txt
+spec/fixtures/clean/end_concat.txt
+spec/fixtures/clean/long_indent.txt
+spec/fixtures/clean/mixed_re.txt
+spec/fixtures/clean/only_if.txt
+spec/fixtures/clean/re.txt
+spec/fixtures/clean/semi_colon_after_end.txt
+spec/fixtures/clean/sep_line.txt
+spec/fixtures/clean/unless_problem.txt
+spec/fixtures/meta/basic_class.txt
+spec/fixtures/meta/case.txt
+spec/fixtures/meta/class_with_def.txt
+spec/fixtures/meta/comment.txt
+spec/fixtures/meta/comment_after_end.txt
+spec/fixtures/meta/eval_code.txt
+spec/fixtures/meta/here_doc.txt
+spec/fixtures/meta/inline_do_end.txt
+spec/fixtures/meta/inline_end.txt
+spec/fixtures/meta/loop.txt
+spec/fixtures/meta/middle.txt
+spec/fixtures/meta/multi_blocks.txt
+spec/fixtures/meta/nested_comment.txt
+spec/fixtures/meta/optional_do.txt
+spec/fixtures/meta/optional_do_with_nasty_chars.txt
+spec/fixtures/meta/partial_method.txt
+spec/fixtures/meta/single_method.txt
+spec/fixtures/meta/two_methods.txt
+spec/fixtures/optional_do/metas/brackets_block.txt
+spec/fixtures/optional_do/metas/classical.txt
+spec/fixtures/optional_do/metas/describe.txt
+spec/fixtures/optional_do/metas/do_block.txt
+spec/fixtures/optional_do/metas/lambda.txt
+spec/fixtures/optional_do/metas/square_brackets.txt
+spec/fixtures/optional_do/rbs/brackets_block.txt
+spec/fixtures/optional_do/rbs/classical.txt
+spec/fixtures/optional_do/rbs/describe.txt
+spec/fixtures/optional_do/rbs/do_block.txt
+spec/fixtures/optional_do/rbs/lambda.txt
+spec/fixtures/optional_do/rbs/square_brackets.txt
+spec/fixtures/real/basic_class.txt
+spec/fixtures/real/case.txt
+spec/fixtures/real/class_with_def.txt
+spec/fixtures/real/comment.txt
+spec/fixtures/real/comment_after_end.txt
+spec/fixtures/real/comment_after_end_expected.txt
+spec/fixtures/real/comment_break.txt
+spec/fixtures/real/complex_string.txt
+spec/fixtures/real/end_concat.txt
+spec/fixtures/real/eval_code.txt
+spec/fixtures/real/general_eval.txt
+spec/fixtures/real/here_doc.txt
+spec/fixtures/real/inline_do_end.txt
+spec/fixtures/real/inline_end.txt
+spec/fixtures/real/javascript.txt
+spec/fixtures/real/long_indent.txt
+spec/fixtures/real/loop.txt
+spec/fixtures/real/middle.txt
+spec/fixtures/real/mixed_re.txt
+spec/fixtures/real/multi_blocks.txt
+spec/fixtures/real/nested_comment.txt
+spec/fixtures/real/only_if.txt
+spec/fixtures/real/optional_do.txt
+spec/fixtures/real/optional_do_with_nasty_chars.txt
+spec/fixtures/real/partial_method.txt
+spec/fixtures/real/re.txt
+spec/fixtures/real/semi_colon_after_end.txt
+spec/fixtures/real/sep_line.txt
+spec/fixtures/real/single_method.txt
+spec/fixtures/real/strange_syntax_1.txt
+spec/fixtures/real/two_methods.txt
+spec/fixtures/real/unless_problem.txt
+spec/helper/filter_helper_spec.rb
+spec/helper/task_helper_spec.rb
+spec/lazibi_spec.rb
+spec/spec_helper.rb
+webgen/src/code/examples/migration.py.rb
+webgen/src/code/examples/rspec.py.rb
+webgen/src/css/blossom_base.css
+webgen/src/css/blossom_v05.css
+webgen/src/css/code.css
+webgen/src/css/hack.css
+webgen/src/css/print.css
+webgen/src/default.template
+webgen/src/development.page
+webgen/src/documentation.page
+webgen/src/faq.page
+webgen/src/images/cover_landscape.jpg
+webgen/src/images/example_picture03.jpg
+webgen/src/images/example_picture04.jpg
+webgen/src/index.page
+webgen/src/installation.page

data/README.txt

@@ -1,133 +1,12 @@
 == Welcome to Lazibi
 
-Lazibi is a preprocessor that allows you to use Python style indentation in Ruby. 
+Lazibi is a pre-processor that allows one to use Python style indenting in Ruby.
 
-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 in real time.
+== Documentation
 
-== Examples
-
-Sweeter RSpec [ Thanks Jay ]
-
-  describe Bowling
-    before(:each)
-      @bowling = Bowling.new
-
-    it "should score 0 for gutter game"
-      20.times { @bowling.hit(0) }
-      @bowling.score.should == 0
-
-More DIY Rails controller
-
-  class AuctionsController < ApplicationController
-
-    def index
-      @auctions = Auction.paginate :page => params[:page]
-      
-      respond_to do |format|
-        format.html # index.rhtml
-        format.xml  { render :xml => @auctions.to_xml }
-
-
-Even sexier migrations ( with sexy_migration Rails plugin )
-
-  class CreateOrders < ActiveRecord::Migration  
-    def self.up
-      create_table :orders do
-        fkey    :user
-        fkey    :auction
-        integer :bid_type
-        timestamps!
-
-    def self.down
-      drop_table :orders
-
-== Download
-
-  gem install lazibi
-  svn checkout svn://rubyforge.org/var/svn/lazibi/trunk lazibi
-
-== Usage
-
-Bootstrap
-
-  mkdir shiny_project
-  cd shiny_project
-  # put trunk in real
-  svn co $svn_path/shiny_project/trunk real
-  lazibi
-
-Make sure everything still works
-
-  _start_a_new_terminal_
-  cd shiny_project/real
-  rake test / autotest
+  rake webgen
   
-Start hacking in meta :/
-
-  cd shiny_project
-  $your_editor meta
-
-== Tips
-
-=== Manually create meta files
-
-* Bootstrap your project as usual, just don't run lazibi
-
-* setup environment
-
-    mkdir .backup
-    mkdir meta
-  
-* run lazibi
-
-* 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:
-    - ^vendor
-    - ^tmp
-    - etc
-    
-=== RSpec taste
-
-* Optional do is only enabled for spec directory. You can customize this behavior by editing .lazibi config file.
-
-    filters:
-      optional_do:
-        - ^spec
-        - ^test
-        - etc
-
-* Personally I would not recommend using this filter outside the context of RSpec
-  * It's not well tested
-  * Anything more complex then simple description will get unreadable
-  
-== 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 pretty well using TDD.
-
-A few projects are used as test code:
-  ActiveRecord, ActionMailer, ActionPack, ActiveSupport, Mongrel, RSpec, redMine.
-
-Lazibi was used to generate .py.rb files from these projects, and then to .rb files back ( this is the default process ). Tests were then run to ensure compatibility.
-
-== Known issues
-
-Here docs, eval, javascript related libs, and complex string evaluation are currently not supported. 
-Ruby code with above syntax will be preserved as is. So your code should still works, just no parse. In other words, if you don't want your code to be parsed, simply add a dummy here doc string...
-
-== Talk
-
-http://groups.google.com/group/lazibi-talk
-
-== To Do
-
-* Maybe a custom filter for RSpec runner? Still learning though...
-* Two way sync between real and meta
+open webgen/output/index.html in your browser
 
 == Author
 * Jinjing (mailto:nfjinjing@gmail.com)

data/Rakefile

@@ -8,13 +8,14 @@ require 'rake/rdoctask'
 require 'rake/contrib/rubyforgepublisher'
 require 'fileutils'
 require 'hoe'
+require 'spec/rake/spectask'
 
 include FileUtils
 require File.join(File.dirname(__FILE__), 'lib', 'lazibi', 'version')
 
 AUTHOR = 'Jinjing'  # can also be an array of Authors
 EMAIL = "nfjinjing@gmail.com"
-DESCRIPTION = "Python like syntax for Ruby"
+DESCRIPTION = "Python like indenting for Ruby"
 GEM_NAME = 'lazibi' # what ppl will type to install your gem
 
 @config_file = "~/.rubyforge/user-config.yml"
@@ -44,7 +45,7 @@ REV = nil
 # UNCOMMENT IF REQUIRED: 
 # REV = `svn info`.each {|line| if line =~ /^Revision:/ then k,v = line.split(': '); break v.chomp; else next; end} rescue nil
 VERS = Lazibi::VERSION::STRING + (REV ? ".#{REV}" : "")
-CLEAN.include ['**/.*.sw?', '*.gem', '.config', '**/.DS_Store']
+CLEAN.include ['**/.*.sw?', '*.gem', '.config', '**/.DS_Store', 'webgen/output', 'coverage']
 RDOC_OPTS = ['--quiet', '--title', 'lazibi documentation',
     "--opname", "index.html",
     "--line-numbers", 
@@ -71,7 +72,7 @@ hoe = Hoe.new(GEM_NAME, VERS) do |p|
   
   # == Optional
   p.changes = p.paragraphs_of("History.txt", 0..1).join("\n\n")
-  #p.extra_deps = []     # An array of rubygem dependencies [name, version], e.g. [ ['active_support', '>= 1.3.1'] ]
+  p.extra_deps = [ ['hoe', '>= 1.2.1'], ['webgen', '>= 0.4.4'], ['activesupport', '>=1.4.2']]     # An array of rubygem dependencies [name, version], e.g. [ ['active_support', '>= 1.3.1'] ]
   #p.spec_extras = {}    # A hash of extra values to set in the gemspec.
 end
 
@@ -80,22 +81,21 @@ PATH    = (RUBYFORGE_PROJECT == GEM_NAME) ? RUBYFORGE_PROJECT : "#{RUBYFORGE_PRO
 hoe.remote_rdoc_dir = File.join(PATH.gsub(/^#{RUBYFORGE_PROJECT}\/?/,''), 'rdoc')
 
 desc 'Generate website files'
-task :website_generate do
-  Dir['website/**/*.txt'].each do |txt|
-    sh %{ ruby scripts/rdoc2html #{txt} > #{txt.gsub(/txt$/,'html')} }
-  end
+task :webgen_main do
+  sh %{ rm -rf webgen/output}
+  sh %{ webgen -d webgen}
 end
 
 desc 'Upload website files to rubyforge'
 task :website_upload do
   host = "#{rubyforge_username}@rubyforge.org"
   remote_dir = "/var/www/gforge-projects/#{PATH}/"
-  local_dir = 'website'
+  local_dir = 'webgen/output'
   sh %{rsync -aCv #{local_dir}/ #{host}:#{remote_dir}}
 end
 
 desc 'Generate and upload website files'
-task :website => [:website_generate, :website_upload, :publish_docs]
+task :website => [:webgen, :website_upload]
 
 desc 'Release the website and new gem version'
 task :deploy => [:check_version, :website, :release] do
@@ -107,7 +107,7 @@ task :deploy => [:check_version, :website, :release] do
 end
 
 desc 'Runs tasks website_generate and install_gem as a local deployment of the gem'
-task :local_deploy => [:website_generate, :install_gem]
+task :local_deploy => [:webgen, :install_gem]
 
 task :check_version do
   unless ENV['VERSION']
@@ -121,3 +121,13 @@ task :check_version do
 end
 
 
+desc "Run all specs with RCov"
+Spec::Rake::SpecTask.new('specs_with_rcov') do |t|
+  t.spec_files = FileList['spec/**/*.rb']
+  t.rcov = true
+  t.rcov_opts = ['--exclude', 'spec']
+end
+
+task :webgen => [:webgen_main, :specs_with_rcov] do
+  sh %{mv coverage webgen/output}
+end