masterview 0.1.5 → 0.2.0

data/RELEASE_NOTES

@@ -1,15 +1,105 @@
 = MasterView - Rails-optimized (x)html friendly template engine 
 
-== Recent changes
-
-MasterView now by default generates five masterview template files instead of one, though you can specify the --single-file option to only generate one file. Using one masterview template file gives the most DRY implementation but since all the views are in one file, it can become a point of contention and is a little more difficult for designers to work with. This Version 0.1.0 upgrade fixes that by generating one masterview template for each action (list, new, edit, show, destroy). The layout and message partials are defined in the list template and are imported into the other files so that you can have a complete page rendering when working with style and design of page. Similarly new defines the form partial which is imported into edit, and show defines a _show partial which is imported into destroy.
-
-One can edit the layout or other partials in the file they are defined in, so for instance to edit the layout, edit the list template and once finished, you can trigger the other templates to be rebuilt with the current information. MasterView now contains an MasterView admin controller/view to visually see all the status and details about the templates. You can rebuild any out of sync templates from this page. Alternatively you can view and rebuild templates from the command line as well using the built in rake commands (mv:list, mv:list_all, mv:rebuild TEMPLATE=foo.html, mv:rebuild_all).
-
-To make it easy to add additional actions which also import the layout, MasterView now has a way to generate a starter template file for your action by simply choosing from which other template file you want to import the layout from. For instance say you want to add an action called hello to your Product controller. Find the masterview template you want to get the layout imported from which could be (product_list.html, product_new.html, product_edit.html, ...), you can choose any of the templates that have the layout you want (it doesn't matter whether they defined the layout or simply imported it. To generate the starter template go to the MasterView Admin page http://yourserver/masterview and click copy link next to the appropriate template. On the next screen indicate the name of the action you wish to add (in this case 'hello') and click the submit button. MasterView generates a starter template file product_hello.html which imports the layout from the template file you chose and it creates some placeholder divs in the template that you can edit to add your hello view code. Alternatively there is also a rake mv:copy_layout TEMPLATE=product_list.html ACTION=hello command to allow you to do the same thing via command line.
-
-Note that you don't have to use the starter or generated files to use MasterView (you can just add MasterView attribute directives manually), but I found that once you had things started and wanted to reuse that same information, that having an automated way to get the layout imported makes it much easier and quicker to get things going. You can also change the default action div that is generated by simply creating your own file in app/views/masterview/admin/empty.rhtml which if found the copy_layout will use it, otherwise it uses the one from the gem/plugin.
- 
+== Recent changes (Release 0.2.0)
+
+Release 0.2.0 features a number of significant improvements.
+
+MasterView templates can now be compiled directly into the Rails
+view cache, just like .rhtml files in your app/views directory.
+Output generation of .rhtml files from a MasterView template
+is now optional.
+
+A keyword substitution mechanism is now supported for the
+mv:generate and mv:import group of template processing directives
+to enable you to more easily specify standard output file names
+derived from the template filename and relative path.
+Template markup of the form:
+
+  mv:generate="{template_path}"
+
+avoids having to replicate the name of the template file itself
+or its relative path within the masterview templates directory.
+See the MasterView User's Guide and Directives Reference for details.
+
+A new configuration facility has been added to allow you to
+customize the MasterView configuration using settings
+files in your rails app config directory, following the
+same approach as the Rails framework itself.
+See the new Configuration Guide documentation for details.
+
+Configuration settings for controlling logging level have been added.
+The MasterView admin controller is now disabled by default.
+Use the config.enable_admin_pages setting to enable
+(usually want only in your config/masterview/environments/development.rb).
+
+The documentation has been reworked and enhanced to provide
+improved documentation on installation and usage, along with
+a new Configuration Guide describing how to customize the
+MasterView configuration.
+
+UPGRADE NOTES: If you have customized your MasterView configuration
+in the init.rb file of your existing plugin installation, you *MUST* 
+migrate your configuration to the new settings file configuration mechanism
+(config/masterview/settings.rb and environment settings files).
+
+Also note that a directive was renamed from gen_render to gen_partial to 
+more clearly represent the functionality and eliminate future confusion.
+Be sure to change any references to gen_render to gen_partial.
+
+The default location for MasterView templates is now the standard Rails 
+app/views directory.  Either move your existing templates into app/views 
+or update the MasterView config.template_src_dir_path setting in your
+config/masterview/settings.rb to reference your existing templates source 
+directory.
+
+== Recent changes (Release 0.1.0)
+
+MasterView now by default generates five masterview template files instead 
+of one, though you can specify the --single-file option to only generate 
+one file. Using one masterview template file gives the most DRY implementation 
+but since all the views are in one file, it can become a point of contention 
+and is a little more difficult for designers to work with. 
+This Version 0.1.0 upgrade fixes that by generating one masterview template 
+for each action (list, new, edit, show, destroy). The layout and message 
+partials are defined in the list template and are imported into the other 
+files so that you can have a complete page rendering when working with style 
+and design of page. Similarly new defines the form partial which is imported 
+into edit, and show defines a _show partial which is imported into destroy.
+
+One can edit the layout or other partials in the file they are defined in, 
+so for instance to edit the layout, edit the list template and once finished, 
+you can trigger the other templates to be rebuilt with the current information. 
+MasterView now contains an MasterView admin controller/view to visually see 
+all the status and details about the templates. You can rebuild any out of sync 
+templates from this page. Alternatively you can view and rebuild templates from 
+the command line as well using the built in rake commands (mv:list, mv:list_all, 
+mv:rebuild TEMPLATE=foo.html, mv:rebuild_all).
+
+To make it easy to add additional actions which also import the layout, 
+MasterView now has a way to generate a starter template file for your action 
+by simply choosing from which other template file you want to import the layout 
+from. For instance say you want to add an action called hello to your Product 
+controller. Find the masterview template you want to get the layout imported 
+from which could be (product_list.html, product_new.html, product_edit.html, ...), 
+you can choose any of the templates that have the layout you want (it doesn't 
+matter whether they defined the layout or simply imported it. To generate the 
+starter template go to the MasterView Admin page http://yourserver/masterview 
+and click copy link next to the appropriate template. On the next screen indicate 
+the name of the action you wish to add (in this case 'hello') and click the submit 
+button. MasterView generates a starter template file product_hello.html which 
+imports the layout from the template file you chose and it creates some 
+placeholder divs in the template that you can edit to add your hello view code. 
+Alternatively there is also a 
+    rake mv:copy_layout TEMPLATE=product_list.html ACTION=hello 
+command to allow you to do the same thing via command line.
+
+Note that you don't have to use the starter or generated files to use MasterView 
+(you can just add MasterView attribute directives manually), but I found that 
+once you had things started and wanted to reuse that same information, that 
+having an automated way to get the layout imported makes it much easier and 
+quicker to get things going. You can also change the default action div that is 
+generated by simply creating your own file in app/views/masterview/admin/empty.rhtml 
+which if found the copy_layout will use it, otherwise it uses the one from the gem/plugin. 
 
 == Description
 
@@ -18,14 +108,20 @@ It is designed to use the full power and productivity of rails including
 layouts, partials, and rails html helpers while still being editable/styleable 
 in a WYSIWYG HTML editor.  
 
-MasterView is distributed as a gem or a plugin. You may install it as a gem and then generate a lightweight plugin which mainly refers to the gem *or* you can simply install as a plugin which is self contained. I personally prefer installing as a gem for ease of management, however if you are running at a shared hosting environment you might not have authority to install this gem so you may install as a self contained plugin.
+MasterView is distributed as a gem or a plugin. You may install it as a gem and 
+then generate a lightweight plugin which mainly refers to the gem *or* you can 
+simply install as a plugin which is self contained. I personally prefer installing 
+as a gem for ease of management, however if you are running at a shared hosting 
+environment you might not have authority to install this gem so you may install 
+as a self contained plugin.
 
 If you are interested in the background story behind all this, it is at the end of this page.
 
 Author:: Jeff Barczewski
 Email:: jeff.barczewski @ gmail.com
-Rubyforge project:: masterview
+Primary developers:: Jeff Barczewski, Deb Lewis
 Website:: http://masterview.org
+Rubyforge project:: masterview
 License:: MIT open source license like Rails
 
 == Goals
@@ -48,44 +144,29 @@ Optional::
 	tidy (gem) and tidy library - if these are installed you can use tidy to cleanup html into valid xhtml for use by MasterView
 	log4r (gem) - if this gem is installed then MasterView will use it for logging otherwise it defaults to using built in Logger.
 
-== Installation
-
-Install in one of the two following ways depending on whether you can use gems or not. 
-
-=== Installation using gems (if you are able to use gems)
-
-If you can use gems you may simply do the following
-
-gem install masterview_gem_pack
+== User Documentation
 
-Now your gem is installed and you can skip these steps in the future. After creating your rails directory, change directory to it and run the following to create a very lightweight plugin instance for this application mainly consisting of an init.rb file which will get loaded at runtime. This init.rb refers to the gem for everything but allows you to override any constants or setup that has been provided. See MasterView module masterview.rb for a list of the available constants.
+MasterView documentation is available online at the MasterView site:
+  http://www.masterview.org 
+and on the rubyforge project
+  http://rubyforge.org/projects/masterview/
 
-script/generate masterview_plugin
-
-After this MasterView is ready for use. Skip down to the Usage section for more details. 
-
-=== Installation without using gems, install as plugin
+== Installation
 
-script/plugin install svn://rubyforge.org/var/svn/masterview/tags/latest
+Detailed installation instructions for installing the masterview gems
+or a self-contained copy of the plugin is provided in the MasterView
+Installation Guide.
 
-This will copy entire MasterView system into your vendor/plugin/masterview directory. You may tweak its init.rb to override any MasterView constants at runtime. See MasterView module masterview.rb for a list of available constants. Note that if you don't have svn (subversion) installed, you may also retrieve the plugin package (masterview_plugin.tgz or masterview_plugin.zip) from http://rubyforge.org/projects/masterview and simply extract into vendor/plugins/masterview 
+The Configuration Guide describes how to customize the configuration
+of the MasterView template engine for your application.
 
 == Usage
 
-You may add MasterView attributes to existing (x)html or you may use the masterview generator to create a complete working application. The generator can create controllers, models, and the MasterView template file similar to how the built-in generator works. Simply change directory to your rails application and run the following
-
-script/generate masterview YourModelName [YourControllerName] [--style [cssStylesheet]] [--single-file] [--show-all | --show-only list] 
-
-The generator by default will generate five masterview template files, one for each distinct page, list, new, edit, show, and destroy. They exist in the app/views/masterview directory with the filename controller_action.html. The layout and message partial are defined in the list template file and imported into the others. Similarly the new template defines the form partial which is imported into edit, and finally the show file defines a _show partial which is imported into destroy. Thus there is one definition of each part (layout and partial) and they are imported into the other files where needed to provide accurate WYSIWYG design time editing. By generating separate files, teams can work on a project easier, however MasterView also supports generating all parts to a single file for the ultimate in DRY.
-
-By adding the --single-file switch MasterView will create a single file and to make it easier to use this template at design time, some design time css stylesheets are included in the file to hide all sections except one. By default the NEW section is the only one shown. Other options are --show-all which makes all sections visible or [--show-only list] which shows only the LIST section. When you are editing the masterview file you may comment/uncomment one of the other css files to show a different section. The --style param allows you to suppress default style generation and specify an existing stylesheet to use, if you exlude the stylesheet none will be used, if you include this option multiple times with different stylesheets each will be used.
-
-Once it is done generating, the generated MasterView template file will be created in app/views/masterview/controller.html. This file is html and can be edited with any standard html editor. The rails specific logic is contained in simple attributes which are ignored by html editors. The syntax for these attributes is heavily derived from the rails helper tags themselves so it should feel natural to the rails developer.
-
-Another interesting thing to know is that while all of the pages for this Model have been bundled up into a few html file for ease of editing, at runtime these templates gets rendered into the exact same layouts and partials that you would use if you were building from scratch. Its jsut that now you can see what your pages will render like in your wysiwyg html editor and change and layout accordingly. Additionally MasterView supplies some javascript to show only one action view at time (list, new, show, edit, destroy) so you can view in your browser without running in Rails. Dummy html can be included to improve the accuracy of the page which can be easily removed at runtime. To make it easier to work with in an editor, design time stylesheets are included in the file to allow you to hide all sections except the one you are working on, simply uncomment the appropriate stylesheet for the section you would like to work with.
-
-MasterView is designed to be easy for a developer and designer to work together. By keeping the template in an html friendly format, designers can apply style, layout changes, wording changes, without causing havoc on the rails view code. The designer can be involved at anytime during the development cycle including being able to change style and layout after the system is built. This is great for allowing design or wording changes without reinvolving the developers. One can even start from a designer created prototype and add MasterView tags to make it become real. Whichever way you prefer to work, MasterView accomodates you.
-
-With Version 0.1.0 a MasterView admin controller/view was added to provide a birds-eye view of all your masterview templates, the status of those templates (OK, Invalid xhtml, Conflicts, Imports outdated), the details regarding the status, and the ultimate erb files generated from each template. By default the MasterView admin controller is enabled by the plugin and is available at http://yourserver/masterview This controller can easily be disabled if not wanted by setting the EnableMasterViewAdminPages = false in the vendor/plugins/masterview/init.rb file. Additionally all of the power of the MasterView admin controller is available via a set of rake commands as well. rake mv:list mv:list_all mv:rebuild mv:rebuild_all mv:copy_layout. rake -T will give you further information about these commands.
+The MasterView User's Guide and a complete Directives Reference are provided
+in the MasterView user documentation.  MasterView templates can be
+created by hand simply by adding masterview directives markup to
+an (x)html template, or generated for typical Rails controller/view
+scenarios using the supplied masterview generator developer tool.
 
-Since it can be difficult to import a layout by hand into a new file, the MasterView admin controller has a link where you can copy the layout into a new file by providing the new files Action. It will take the layout from the template chosen and create a new file controller_action.html with the layout imported and a shell for the new Action code. You can also do this from command line using rake mv:copy_layout TEMPLATE=foo_list.html ACTION=newaction command.
+A MasterView Admin controller can optionally be activated in your application
+to assist you during development with creating and managing your templates.

data/Rakefile

@@ -10,8 +10,6 @@ require 'rake/contrib/rubyforgepublisher'
 require 'rake/contrib/xforge'
 require 'rake/clean'
 
-require 'gmailer'
-
 #require 'archive/tar/minitar'
 #require 'zlib'
 
@@ -25,37 +23,107 @@ RUBY_FORGE_GROUPID = "1290"
 
 Main_dir  = Dir.getwd
 
-desc "Default Task"
+desc "Default Task: run all tests"
 task :default => [ :test ]
 
-desc "Delete tar.gz / zip / rdoc"
-task :cleanup => [ :rm_packages, :clobber_rdoc ]
+task :install => [:package] do
+  `gem install pkg/#{PKG_FILE_NAME}.gem`
+end
+
+desc "Delete tar.gz / zip / gem / rdoc / tmp"
+task :cleanup => [ :rm_packages, 'doc:clobber_rdoc', 'dev:cleanup', 'test:cleanup' ]
+
+
+#==============================================================================
+# Test tasks
+#==============================================================================
+
+desc 'Run all tests'
+task :test do
+  Rake::Task["test:units"].invoke       rescue got_error = true
+  #Rake::Task["test:functionals"].invoke rescue got_error = true
+  #??Rake::Task["test:cleanup"].invoke       rescue got_error = true
+  raise "Test failures" if got_error
+end
 
-# Run the unit tests
-Rake::TestTask.new(:test) do |t|
+# Run all unit tests
+namespace 'test' do
+Rake::TestTask.new(:units) do |t|
   t.libs << "lib"
   t.libs << "test"
-  t.pattern = 'test/*_test.rb'
+  t.pattern = 'test/unit/*_test.rb'
   t.verbose = false
 end
+end
 
-# Run parser on masterview html files
-desc "Run parser on masterview html files"
-task :mvparse do
-  TmpOutputDir = 'tmp/views'
-  filelist = Dir.glob('examples/**/*.html')
-  filelist.each do |file|
-    MasterView::Parser.parse_file( file, TmpOutputDir, :tidy => true )
-  end
+desc 'Clean up tmp files from running tests'
+namespace 'test' do
+task :cleanup do
+  FileUtils.remove_dir('test/tmp', true)
+end
 end
 
 
-task :install => [:package] do
-  `gem install pkg/#{PKG_FILE_NAME}.gem`
+#==============================================================================
+# Documentation Tasks
+#==============================================================================
+
+# Generate the RDoc documentation
+namespace 'doc' do
+Rake::RDocTask.new { |rdoc|
+  rdoc.rdoc_dir = 'doc/api'
+  rdoc.title    = "MasterView Template Engine"
+  rdoc.options << '--line-numbers' << '--inline-source'
+  rdoc.rdoc_files.include('README')
+  rdoc.rdoc_files.include('RELEASE_NOTES')
+  rdoc.rdoc_files.include('lib/**/*.rb')
+}
+end
+
+#==============================================================================
+# Development Utilities Tasks
+#==============================================================================
+
+desc 'Install MasterView gems locally from pkg dir'
+namespace 'dev' do
+task :install_local_gems do
+  pkg_build = ENV['PKG_BUILD'] ? '.' + ENV['PKG_BUILD'] : ''
+  pkg_version = MasterView::VERSION::STRING + pkg_build
+  `gem install pkg/masterview-#{pkg_version}.gem --local -f`
+  `gem install pkg/masterview_generator-#{pkg_version}.gem --local -f`
+  `gem install pkg/masterview_plugin_generator-#{pkg_version}.gem --local -f`
+  `gem install pkg/masterview_gem_pack-#{pkg_version}.gem --local -f`
+end
+end
+
+desc 'Uninstall all MasterView gems'
+namespace 'dev' do
+task :uninstall_gems do
+  `gem uninstall masterview -a -x -i`
+end
 end
 
-task :syntax do 
-  filelist = Dir.glob('**/*.rb')
+
+desc 'Run parser on masterview html templates in examples'
+namespace 'dev' do
+task :mvparse_examples do
+  template_mio_tree = MasterView::FileMIOTree.new('examples', '.html', :logging => true )
+  output_mio_tree = MasterView::FileMIOTree.new('tmp/views', '.rhtml', :logging => true )
+  template_mio_tree.find(:pattern => '*.html') do |mio|
+    MasterView::Parser.parse_mio( mio, output_mio_tree )
+  end
+end
+end
+
+# Run syntax check on all ruby code files
+desc 'Run syntax check on all ruby code files'
+namespace 'dev' do
+task :check_syntax do 
+  #WAS: filelist = Dir.glob('**/*.rb')
+  #skip: generators - erb-ized code templates confuse the parser
+  filelist = [ 'init.rb', 'lib/masterview.rb' ]
+  filelist.concat Dir.glob('lib/**/*.rb')
+  filelist.concat Dir.glob('test/**/*.rb')
   filelist.each do |file|
     output = `ruby -c #{file}`
     unless output =~ /Syntax OK/
@@ -64,26 +132,29 @@ task :syntax do
       return 
     end
   end
+  puts "#{filelist.length} files checked"
   puts 'Syntax OK'  
 end
+end
 
-# Genereate the RDoc documentation
-Rake::RDocTask.new { |rdoc|
-  rdoc.rdoc_dir = 'doc'
-  rdoc.title    = "MasterView Template Engine"
-  rdoc.options << '--line-numbers' << '--inline-source'
-  rdoc.rdoc_files.include('README')
-  rdoc.rdoc_files.include('RELEASE_NOTES')
-  rdoc.rdoc_files.include('lib/**/*.rb')
-}
-
-task :lines do
+# Count LOC in plugin lib
+desc 'Count LOC'
+namespace 'dev' do
+task :count_loc do
+  files = 0
   lines = 0
   codelines = 0
-  Dir.foreach("lib") { |file_name| 
-    next unless file_name =~ /.*rb/
+  
+  #VER1 WAS: Dir.foreach("lib") { |file_name| 
+  #VER1 WAS:   next unless file_name =~ /.*rb/
+  #VER1 WAS:   f = File.open("lib/" + file_name)
+  filelist = [ 'init.rb', 'lib/masterview.rb' ]
+  filelist.concat Dir.glob('lib/**/*.rb')
+  #filelist.concat Dir.glob('test**/*.rb')
+  filelist.each { |file_name|
     
-    f = File.open("lib/" + file_name)
+    f = File.open(file_name)
+    files += 1
 
     while line = f.gets
       lines += 1
@@ -92,10 +163,22 @@ task :lines do
       codelines += 1
     end
   }
-  puts "Lines #{lines}, LOC #{codelines}"
+  puts "Lines #{lines}, LOC #{codelines} in #{files} files"
+end
+end
+
+desc 'Remove tmp files from running dev utilities'
+namespace 'dev' do
+task :cleanup do
+  FileUtils.remove_dir('tmp', true)
+end
 end
 
 
+#==============================================================================
+# Build/Release Tasks
+#==============================================================================
+
 # Publish beta gem  
 #desc "Publish the gem"
 #task :publish => [:rdoc, :package] do
@@ -119,27 +202,92 @@ task :verify_gmail do
   raise "GMAIL_PASSWORD environment variable not set!" unless ENV['GMAIL_PASSWORD']
 end
 
+def copy_if_different(src,dst)
+  return if File.exist?(src) and File.exist?(dst) and File.read(src) == File.read(dst)
+  FileUtils.cp src, dst
+end
+
+desc 'Copy duplicated files - copy files that are duplicated between packages'
+task :copy_duplicated_files do
+  copy_if_different 'init.rb', 'generators/masterview_plugin/templates/init.rb'
+  copy_if_different 'tasks/masterview.rake', 'generators/masterview_plugin/templates/masterview.rake'
+  copy_if_different 'lib/masterview/extras/app/views/masterview/admin/empty.rhtml', 'generators/masterview_plugin/templates/empty.rhtml'
+  copy_if_different 'examples/rails_app_config/masterview/settings.rb', 'generators/masterview_plugin/templates/settings.rb'
+  copy_if_different 'examples/rails_app_config/masterview/environment/development.rb', 'generators/masterview_plugin/templates/development.rb'
+  copy_if_different 'examples/rails_app_config/masterview/environment/production.rb', 'generators/masterview_plugin/templates/production.rb'
+end
 
 desc 'Build all packages'
-task :package => ['masterview_plugin:package', 
-                      'masterview:package', 
-                      'masterview_generator:package',
-                      'masterview_plugin_generator:package',
-                      'masterview_gem_pack:package']
+task :package => [
+        :copy_duplicated_files,
+        # gems (runtime, mv generator, mv plugin generator, 3-in-1 supersaver)
+        'masterview:package', 
+        'masterview_generator:package',
+        'masterview_plugin_generator:package',
+        'masterview_gem_pack:package',
+        # zip/gzip of full masterview
+        'masterview_plugin:package'
+        ]
 
 desc 'Re-build all packages'
-task :repackage => ['masterview_plugin:repackage', 
-                        'masterview:repackage', 
-                        'masterview_generator:repackage',
-                        'masterview_plugin_generator:repackage',
-                        'masterview_gem_pack:repackage']
+task :repackage => [
+        :copy_duplicated_files,
+        # gems (runtime, mv generator, mv plugin generator, 3-in-1 supersaver)
+        'masterview:repackage', 
+        'masterview_generator:repackage',
+        'masterview_plugin_generator:repackage',
+        'masterview_gem_pack:repackage',
+        # zip/gzip of full masterview
+        'masterview_plugin:repackage'
+        ]
 
 desc 'Release all files'
-task :release_files => ['masterview_plugin:release_files',
-                            'masterview:release_files',
-                            'masterview_generator:release_files',
-                            'masterview_plugin_generator:release_files',
-                            'masterview_gem_pack:release_files']
+task :release_files => [
+        # gems (runtime, mv generator, mv plugin generator, 3-in-1 supersaver)
+        'masterview:release_files',
+        'masterview_generator:release_files',
+        'masterview_plugin_generator:release_files',
+        'masterview_gem_pack:release_files',
+        # zip/gzip of full masterview
+        'masterview_plugin:release_files'
+        ]
+
+desc 'Remove all tar.gz / zip / gem build pkg files'
+task :rm_packages do
+  FileUtils.remove_dir('pkg', true)
+end
+
+####
+#ISSUE: jeff - we don't include that top-level index.html in any of the packages?!
+####
+PKG_FILES_RELEASE_DOCS = [
+      "[A-Z]*"   # README, RELEASE_NOTES, CHANGELOG, MIT_LICENSE, TODO
+      ]
+
+PKG_FILES_RUNTIME = [
+      "lib/**/*",
+      "directives/**/*",  #SHOULD THIS GO AWAY (??)
+      "Rakefile", 
+      "init.rb"
+    ]
+PKG_FILES_MV_GENERATOR = [
+      "generators/masterview/**/*"   # generator for creating app template scaffold
+      ]
+PKG_FILES_MV_PLUGIN_GENERATOR = [
+      "generators/masterview_plugin/**/*"  # generator for creating vendor/plugins stub for gem install
+      ]
+
+PKG_FILES_DOCS = [  # docs and examples, actually
+      "doc/*",
+      "doc/stylesheets/*",
+      "examples/**/*"
+    ]
+PKG_FILES_TESTS = [
+      "test/**/*"
+    ]
+PKG_FILES_EXCLUDE_PATTERN = /\bCVS\b|~$|\.svn|semantic.cache/
+
+RAKE_PROCESSOR = RUBY_PLATFORM =~ /mswin32/ ? 'rake.cmd' : 'rake'  # sigh
 
 namespace 'masterview_plugin' do
   module MasterViewComplete
@@ -149,16 +297,8 @@ namespace 'masterview_plugin' do
     PKG_FILE_NAME   = "#{PKG_NAME}-#{PKG_VERSION}"
     PKG_DESTINATION = ENV["RAILS_PKG_DESTINATION"] || "../#{PKG_NAME}"
     RELEASE_NAME  = "REL #{PKG_VERSION}"
-    PKG_FILES = FileList[
-      "lib/**/*",
-      "generators/masterview/**/*", #exclude the masterview_plugin generator, not needed for non-gem install
-      "directives/**/*",
-      "test/**/*", 
-      "example/**/*",
-      "[A-Z]*", 
-      "Rakefile", 
-      "init.rb"
-    ].exclude(/\bCVS\b|~$|\.svn|semantic.cache/)
+    PKG_INCLUDES = PKG_FILES_RUNTIME + PKG_FILES_MV_GENERATOR + PKG_FILES_DOCS + PKG_FILES_TESTS + PKG_FILES_RELEASE_DOCS
+    PKG_FILES = FileList.new( PKG_INCLUDES ).exclude( PKG_FILES_EXCLUDE_PATTERN )
 
     spec = Gem::Specification.new do |s|
       s.name = PKG_NAME
@@ -226,9 +366,8 @@ namespace 'masterview_gem_pack' do
     PKG_FILE_NAME   = "#{PKG_NAME}-#{PKG_VERSION}"
     PKG_DESTINATION = ENV["RAILS_PKG_DESTINATION"] || "../#{PKG_NAME}"
     RELEASE_NAME  = "REL #{PKG_VERSION}"
-    PKG_FILES = FileList[
-      "[A-Z]*", 
-    ].exclude(/\bCVS\b|~$|\.svn|semantic.cache/)
+    PKG_INCLUDES = PKG_FILES_RELEASE_DOCS
+    PKG_FILES = FileList.new( PKG_INCLUDES ).exclude( PKG_FILES_EXCLUDE_PATTERN )
 
     spec = Gem::Specification.new do |s|
       s.name = PKG_NAME
@@ -299,15 +438,8 @@ namespace 'masterview' do
     PKG_FILE_NAME   = "#{PKG_NAME}-#{PKG_VERSION}"
     PKG_DESTINATION = ENV["RAILS_PKG_DESTINATION"] || "../#{PKG_NAME}"
     RELEASE_NAME  = "REL #{PKG_VERSION}"
-    PKG_FILES = FileList[
-      "lib/**/*",
-      "directives/**/*",
-      "test/**/*", 
-      "example/**/*",
-      "[A-Z]*", 
-      "Rakefile", 
-      "init.rb"
-    ].exclude(/\bCVS\b|~$|\.svn|semantic.cache/)
+    PKG_INCLUDES = PKG_FILES_RUNTIME + PKG_FILES_DOCS + PKG_FILES_TESTS + PKG_FILES_RELEASE_DOCS
+    PKG_FILES = FileList.new( PKG_INCLUDES ).exclude( PKG_FILES_EXCLUDE_PATTERN )
 
     spec = Gem::Specification.new do |s|
       s.name = PKG_NAME
@@ -378,12 +510,14 @@ namespace 'masterview_generator' do
     PKG_FILE_NAME   = "#{PKG_NAME}-#{PKG_VERSION}"
     PKG_DESTINATION = ENV["RAILS_PKG_DESTINATION"] || "../#{PKG_NAME}"
     RELEASE_NAME  = "REL #{PKG_VERSION}"
-
+    #PKG_INCLUDES = PKG_FILES_MV_GENERATOR
+    #PKG_FILES = FileList.new( PKG_INCLUDES ).exclude( PKG_FILES_EXCLUDE_PATTERN )
+    
     desc "Package masterview_generator"
     task :package do
       work_dir = Dir.getwd
       Dir.chdir 'generators/masterview'
-      system( "rake package" )
+      system( "#{RAKE_PROCESSOR} package" )
       Dir.chdir work_dir
     end
 
@@ -391,7 +525,7 @@ namespace 'masterview_generator' do
     task :repackage do
       work_dir = Dir.getwd
       Dir.chdir 'generators/masterview'
-      system( "rake repackage" )
+      system( "#{RAKE_PROCESSOR} repackage" )
       Dir.chdir work_dir
     end
 
@@ -442,16 +576,14 @@ namespace 'masterview_plugin_generator' do
     PKG_FILE_NAME   = "#{PKG_NAME}-#{PKG_VERSION}"
     PKG_DESTINATION = ENV["RAILS_PKG_DESTINATION"] || "../#{PKG_NAME}"
     RELEASE_NAME  = "REL #{PKG_VERSION}"
-    PKG_FILES = FileList[
-      "generators/masterview_plugin/**/*",
-      "[A-Z]*" 
-    ].exclude(/\bCVS\b|~$|\.svn|semantic.cache/)
+    PKG_INCLUDES = PKG_FILES_MV_PLUGIN_GENERATOR + PKG_FILES_RELEASE_DOCS
+    PKG_FILES = FileList.new( PKG_INCLUDES ).exclude( PKG_FILES_EXCLUDE_PATTERN )
 
     desc "Package masterview_generator"
     task :package do
       work_dir = Dir.getwd
       Dir.chdir 'generators/masterview_plugin'
-      system( "rake package" )
+      system( "#{RAKE_PROCESSOR} package" )
       Dir.chdir work_dir
     end
 
@@ -459,7 +591,7 @@ namespace 'masterview_plugin_generator' do
     task :repackage do
       work_dir = Dir.getwd
       Dir.chdir 'generators/masterview_plugin'
-      system( "rake repackage" )
+      system( "#{RAKE_PROCESSOR} repackage" )
       Dir.chdir work_dir
     end
 
@@ -502,8 +634,6 @@ namespace 'masterview_plugin_generator' do
 end
 
 
-
-
 desc "Publish news on RubyForge"
 task :publish_news => [ :verify_rubyforge, :tar, :gem, :demotar] do
   Rake::XForge::NewsPublisher.new(Ruby_PDF) do |news|
@@ -527,12 +657,11 @@ end
 desc "Post a release announcement via GMail."
 #task :email_announcement => [ :verify_gmail, :tar, :gem, :demotar] do
 task :email_announcement => [ :verify_gmail ] do
+  require 'gmailer'
   GMailer.connect(ENV["GMAIL_USER"], ENV["GMAIL_PASSWORD"]) do |gmail|
     gmail.send  :to       => "ruby-talk@ruby-lang.org",
                 :subject  => "[ANN] PDF::Writer #{PDF::Writer::VERSION}",
                 :body     => File.read("Release-Announcement")
   end
-end
-
-
 
+end