masterview 0.0.10 → 0.0.11

data/CHANGELOG

@@ -1,3 +1,5 @@
+0.0.11 - April 22, 2006 - Changed the main load file to rescue LoadErrors from log4r and tidy
+
 0.0.6 - April 18, 2006 - Working on generator packaging
 
 0.0.5 - April 18, 2006 - Changed packaging

data/README

@@ -43,11 +43,7 @@ Install in one of the two following ways depending on whether you can use gems o
 
 If you can use gems you may simply do the following
 
-gem install masterview
-
-gem install masterview_generator
-
-gem install masterview_plugin_generator
+gem install masterview_gem_pack
 
 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.
 

data/Rakefile

@@ -105,11 +105,11 @@ end
 #  Rake::SshDirPublisher.new("foobar.com", "dist/api/#{PKG_NAME}", "doc").upload
 #end
 
-MASTERVIEW = MetaProject::Project::XForge::RubyForge.new('masterview')
 
 task :verify_rubyforge do
   raise "RUBYFORGE_USER environment variable not set!" unless ENV['RUBYFORGE_USER']
   raise "RUBYFORGE_PASSWORD environment variable not set!" unless ENV['RUBYFORGE_PASSWORD']
+  MASTERVIEW = MetaProject::Project::XForge::RubyForge.new('masterview')
 end
 
 task :verify_gmail do
@@ -119,36 +119,37 @@ end
 
 
 desc 'Build all packages'
-task :package_all => ['masterview_complete:package', 
+task :package => ['masterview_plugin:package', 
                       'masterview:package', 
-                      'masterview_parser:package',
                       'masterview_generator:package',
-                      'masterview_plugin_generator:package']
+                      'masterview_plugin_generator:package',
+                      'masterview_gem_pack:package']
 
 desc 'Re-build all packages'
-task :repackage_all => ['masterview_complete:repackage', 
+task :repackage => ['masterview_plugin:repackage', 
                         'masterview:repackage', 
-                        'masterview_parser:repackage',
                         'masterview_generator:repackage',
-                        'masterview_plugin_generator:repackage']
+                        'masterview_plugin_generator:repackage',
+                        'masterview_gem_pack:repackage']
 
 desc 'Release all files'
-task :release_all_files => ['masterview_complete:release_files',
+task :release_files => ['masterview_plugin:release_files',
                             'masterview:release_files',
                             'masterview_generator:release_files',
-                            'masterview_plugin_generator:release_files']
+                            'masterview_plugin_generator:release_files',
+                            'masterview_gem_pack:release_files']
 
-namespace 'masterview_complete' do
+namespace 'masterview_plugin' do
   module MasterViewComplete
     PKG_BUILD       = ENV['PKG_BUILD'] ? '.' + ENV['PKG_BUILD'] : ''
-    PKG_NAME        = 'masterview_complete'
+    PKG_NAME        = 'masterview_plugin'
     PKG_VERSION     = MasterView::VERSION::STRING + PKG_BUILD
     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/**/*",
+      "generators/masterview/**/*", #exclude the masterview_plugin generator, not needed for non-gem install
       "directives/**/*",
       "test/**/*", 
       "example/**/*",
@@ -215,6 +216,79 @@ namespace 'masterview_complete' do
   end
 end
 
+namespace 'masterview_gem_pack' do
+  module MasterViewGemPack
+    PKG_BUILD       = ENV['PKG_BUILD'] ? '.' + ENV['PKG_BUILD'] : ''
+    PKG_NAME        = 'masterview_gem_pack'
+    PKG_VERSION     = MasterView::VERSION::STRING + PKG_BUILD
+    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/)
+
+    spec = Gem::Specification.new do |s|
+      s.name = PKG_NAME
+      s.version = PKG_VERSION
+      s.summary = "A (x)html friendly template engine for rails with the power of layouts, and partials. This gem package includes the other masterview gems for easy installation"
+      s.has_rdoc = true
+      s.files = PKG_FILES
+      s.require_path = '.'
+      s.extra_rdoc_files = ['README']
+      s.add_dependency( 'masterview' )
+      s.add_dependency( 'masterview_generator' )
+      s.add_dependency( 'masterview_plugin_generator' )
+      s.author = "Jeff Barczewski"
+      s.email = "jeff.barczewski@gmail.com"
+      s.homepage = "http://masterview.org/"  
+    end
+
+    # Create Rubygem package
+    Rake::GemPackageTask.new(spec) do |p|
+      p.gem_spec = spec
+      p.need_tar = false
+      p.need_zip = false
+    end
+
+    desc "Release files on RubyForge."
+    task :release_files => [ :verify_rubyforge ] do 
+      release_files = ["gem"].map { |ext| "pkg/#{PKG_FILE_NAME}.#{ext}" }
+
+      Rake::XForge::Release.new(MASTERVIEW) do |release|
+        release.user_name       = ENV['RUBYFORGE_USER']
+        release.password        = ENV['RUBYFORGE_PASSWORD']
+        release.files           = release_files.to_a
+        release.release_name    = RELEASE_NAME
+        release.package_name    = PKG_NAME
+
+        notes = []
+        File.open("RELEASE_NOTES") do |file|
+          file.each do |line|
+            line.chomp!
+            line.gsub!(/^#.*$/, '') and next
+            notes << line
+          end
+        end
+        release.release_notes   = notes.join("\n")
+
+        changes = []
+        File.open("CHANGELOG") do |file|
+          current = true
+
+          file.each do |line|
+            line.chomp!
+            current = false if current and line =~ /^==/
+            break if line.empty? and not current
+            changes << line
+          end
+        end
+        release.release_changes = changes.join("\n")
+      end
+    end
+  end
+end
+
 namespace 'masterview' do
   module MasterViewGem
     PKG_BUILD       = ENV['PKG_BUILD'] ? '.' + ENV['PKG_BUILD'] : ''
@@ -303,31 +377,20 @@ namespace 'masterview_generator' do
     PKG_DESTINATION = ENV["RAILS_PKG_DESTINATION"] || "../#{PKG_NAME}"
     RELEASE_NAME  = "REL #{PKG_VERSION}"
 
-    PKG_FILES = FileList[
-      "masterview_generator.rb",
-      "templates/**/*",
-      "[A-Z]*" 
-    ].exclude(/\bCVS\b|~$|\.svn|semantic.cache/)
-
-    spec = Gem::Specification.new do |s|
-      s.name = PKG_NAME
-      s.version = PKG_VERSION
-      s.summary = "A (x)html friendly template engine for rails with the power of layouts, and partials. MasterView Generator for GEM"
-      s.has_rdoc = false
-      s.files = PKG_FILES
-      s.require_path = '.'
-      s.autorequire  = 'masterview_generator'
-      s.author = "Jeff Barczewski"
-      s.email = "jeff.barczewski@gmail.com"
-      s.homepage = "http://masterview.org/"  
+    desc "Package masterview_generator"
+    task :package do
+      work_dir = Dir.getwd
+      Dir.chdir 'generators/masterview'
+      system( "rake package" )
+      Dir.chdir work_dir
     end
 
-    # Create Rubygem package
-    Rake::GemPackageTask.new(spec) do |p|
-      p.gem_spec = spec
-      p.need_tar = false
-      p.need_zip = false
-      p.package_dir = '../../pkg'
+    desc "Repackage masterview_generator"
+    task :repackage do
+      work_dir = Dir.getwd
+      Dir.chdir 'generators/masterview'
+      system( "rake repackage" )
+      Dir.chdir work_dir
     end
 
     desc "Release files on RubyForge."
@@ -382,6 +445,22 @@ namespace 'masterview_plugin_generator' do
       "[A-Z]*" 
     ].exclude(/\bCVS\b|~$|\.svn|semantic.cache/)
 
+    desc "Package masterview_generator"
+    task :package do
+      work_dir = Dir.getwd
+      Dir.chdir 'generators/masterview_plugin'
+      system( "rake package" )
+      Dir.chdir work_dir
+    end
+
+    desc "Repackage masterview_generator"
+    task :repackage do
+      work_dir = Dir.getwd
+      Dir.chdir 'generators/masterview_plugin'
+      system( "rake repackage" )
+      Dir.chdir work_dir
+    end
+
     desc "Release files on RubyForge."
     task :release_files => [ :verify_rubyforge ] do 
       release_files = ["gem"].map { |ext| "pkg/#{PKG_FILE_NAME}.#{ext}" }

data/lib/masterview/masterview_version.rb

@@ -2,7 +2,7 @@ module MasterView
   module VERSION #:nodoc:
     MAJOR = 0
     MINOR = 0
-    TINY  = 10
+    TINY  = 11
 
     STRING = [MAJOR, MINOR, TINY].join('.')
   end

data/lib/masterview.rb

@@ -96,8 +96,12 @@ require 'facets/core/string/indent'
 require 'facets/core/string/starts_with'
 
 #optional external gem requires, added functionality when available
-require 'log4r' 
-require 'tidy'
+begin
+  require 'tidy'
+rescue LoadError
+  # Tidy was not available to load
+end
+# log4r is required in section below
 
 #internal requires
 require 'masterview/masterview_version'
@@ -115,12 +119,13 @@ module MasterView
 
   # setup logger
   begin 
+    require 'log4r' 
     include Log4r # will use log4r if available, otherwise default to logger
 
     # Logger which will be used to output debug, warn, and error messages, will use log4r if available, otherwise logger
     Log = Logger.new 'MasterView'
     Log.outputters = Outputter.stdout
-  rescue # else fallback to built in logger 
+  rescue LoadError, NameError # else fallback to built in logger 
     require 'logger'
     Log = Logger.new STDOUT # :nodoc:
   end

metadata

@@ -3,8 +3,8 @@ rubygems_version: 0.8.11
 specification_version: 1
 name: masterview
 version: !ruby/object:Gem::Version 
-  version: 0.0.10
-date: 2006-04-19 00:00:00 -05:00
+  version: 0.0.11
+date: 2006-04-22 00:00:00 -05:00
 summary: A (x)html friendly template engine for rails with the power of layouts, and partials.
 require_paths: 
 - lib