README.markdown @@ -1,3 +1,8 @@ +- version: 2.0.4 (beta) + - Added a rake task to generate a test_harness (for use in development). From the comatose directory, run: `rake test_harness TARGET=../comatose_test_harness`. This will create an empty rails app, copy this working folder over to vendor/plugins/comatose, install acts_as_list and acts_as_tree, and run any setup needed, like script/generate comatose_migration and rake db:migrate. + - Bugfix in tasks/comatose.rake + - Comatose migration generator now adds the default comatose routes (`map.comatose_admin` and `map.comatose_root ''`) to the top of the routes.rb file. POSSIBLE GOTCHA: `map.comatose_root` should be moved to the bottom of the routes file! + - version: 2.0.3 (beta) - Moving from alpha to beta! - staugaard: Added import and export of pages in admin controller CHANGELOG @@ -8,14 +8,13 @@ Be sure and install the acts_as_tree and acts_as_list plugins! From here you'll want to run: $ ./script/generate comatose_migration + +NOTE: The generator will add the default comatose routes to the top of your routes.rb file. You'll want to move `map.comatose_root ''` to the bottom of your routes block. When that's finished, run: $ rake db:migrate -That's it for the Comatose setup! Now just add the following line to the bottom of your config/routes.rb file: - - map.comatose_admin - map.comatose_root '' +That's it for the Comatose setup! Be sure to read the README file, and the 'Getting Started' guide. They are located at vendor/plugins/comatose/README and http://comatose.rubyforge.org/getting-started-guide respectively. INSTALL @@ -77,7 +77,7 @@ EOGS puts "Update GEMSPEC" end -desc "Builds the admin costumizable layout, the embedded layout have the JS and CSS inlined" +desc "Builds the admin customizable layout, the embedded layout have the JS and CSS inlined" task :build do require 'erb' @@ -120,3 +120,52 @@ task :build do # That's it -- we're done. puts "Finished." end + + +desc "Creates an empty rails application for use as a test harness" +task :test_harness do + target = ENV['TARGET'] + if target.nil? + puts "You must specify a TARGET for the test harness" + exit(1) + else + target = File.expand_path target + if target == File.expand_path(File.dirname(__FILE__)) + puts "You must specify a folder other than this one." + exit(1) + end + end + comatose_plugin_path = target / 'vendor' / 'plugins' / 'comatose' + + puts "Creating test harness at #{ target }" + run_sh "rails -d sqlite3 #{target}" + run_sh "cp -r #{ File.dirname(__FILE__) }/ #{ comatose_plugin_path }" + run_sh "ruby #{ comatose_plugin_path / 'install.rb' }" + run_sh "ruby #{ target / 'script' / 'generate' } comatose_migration" + run_sh "ruby #{ comatose_plugin_path / 'bin' / 'comatose' } --plugin #{ target }" + run_sh "cd #{ target } && rake db:migrate" + + run_sh "cp #{ target / 'db' / 'development.sqlite3' } #{target / 'db' / 'test.sqlite3'}" + run_sh "rm #{ target / 'public' / 'index.html' }" + run_sh "cp #{ comatose_plugin_path / 'views' / 'layouts' / 'comatose_content.html.erb' } #{ target / 'app' / 'views' / 'layouts' / 'comatose_content.html.erb' }" + + # Remove me soon! + run_sh "cd #{ target } && ruby #{ target / 'script' / 'plugin' } install acts_as_tree" + run_sh "cd #{ target } && ruby #{ target / 'script' / 'plugin' } install acts_as_list" + + puts "Done." +end + +class String + def /(str) + File.join(self, str) + end +end + +def run_sh(command) + puts "-------------------------------------------------------------------------------" + puts "Running `#{command}`:" + sh command + puts + puts +end \ No newline at end of file Rakefile @@ -3,5 +3,5 @@ summary: A micro CMS for embedding in Rails applications. homepage: http://comatose.rubyforge.org plugin: git://github.com/darthapo/comatose.git license: MIT -version: 2.0.3 +version: 2.0.4 rails_version: 2+ about.yml @@ -13,21 +13,21 @@ begin opts.on("-g", "--gem", "Initialize to run from gem (DEFAULT)") do |s| options[:action] = :gem - puts "GEM" + puts "Configuring to run from GEM..." end opts.on("-p", "--plugin", "Install as plugin") do |s| options[:action] = :plugin - puts "PLUGIN" + puts "Configuring to run from PLUGIN..." end - opts.on("-u", "--update", "Update current installation (CURRENTLY UNIMPLEMENTED)") do |s| - options[:action] = :update - puts "UPDATE" - end + # opts.on("-u", "--update", "Update current installation (CURRENTLY UNIMPLEMENTED)") do |s| + # options[:action] = :update + # puts "UPDATE" + # end opts.separator "" - opts.separator "Common options:" + opts.separator "Common options:" # No argument, shows at tail. This will print an options summary. # Try it and see! @@ -71,34 +71,34 @@ comatose_initializer_path = RAILS_ROOT / 'config' / 'initializers' / 'comatose.r unless File.exists?( comatose_initializer_path ) File.open(comatose_initializer_path, 'w') do |f| f.write <<-EOT - require 'comatose' - - # 1.) You should add the following snippet to your environment.rb too, probably... - # - # gem 'comatose' - # - # 2.) Following is an example configuration block for Comatose: - # - Comatose.configure do |config| - # Includes AuthenticationSystem in the ComatoseController - #config.includes << :authenticated_system - - # admin - #config.admin_title = "My Content" - #config.admin_sub_title = "Content for the rest of us..." - - # Includes AuthenticationSystem in the ComatoseAdminController - #config.admin_includes << :authenticated_system - - # Calls :login_required as a before_filter - #config.admin_authorization = :login_required - # Returns the author name (login, in this case) for the current user - #config.admin_get_author do - # current_user.login - #end - - # See the getting started guide at http://comatose.rubyforge.org for more... - end +require 'comatose' + +# 1.) You should add the following snippet to your environment.rb too, probably... +# +# gem 'comatose' +# +# 2.) Following is an example configuration block for Comatose: +# +Comatose.configure do |config| + # Includes AuthenticationSystem in the ComatoseController + #config.includes << :authenticated_system + + # admin + #config.admin_title = "My Content" + #config.admin_sub_title = "Content for the rest of us..." + + # Includes AuthenticationSystem in the ComatoseAdminController + #config.admin_includes << :authenticated_system + + # Calls :login_required as a before_filter + #config.admin_authorization = :login_required + # Returns the author name (login, in this case) for the current user + #config.admin_get_author do + # current_user.login + #end + + # See the getting started guide at http://comatose.rubyforge.org for more... +end EOT end else bin/comatose @@ -1,7 +1,7 @@ # Generated on Tue May 20 20:13:12 -0500 2008 Gem::Specification.new do |s| s.name = "comatose" - s.version = "2.0.3" + s.version = "2.0.4" s.date = "2008-10-10" # 2008-05-20 s.summary = "Micro CMS designed for being embedded into existing Rails applications" s.email = "matt@elucidata.net" comatose.gemspec @@ -1,3 +1,15 @@ +class Rails::Generator::Commands::Create + def new_route(name, options='') + sentinel = 'ActionController::Routing::Routes.draw do |map|' + logger.route "map.#{name} #{options}" + unless options[:pretend] + gsub_file 'config/routes.rb', /(#{Regexp.escape(sentinel)})/mi do |match| + "#{match}\n map.#{name} #{options}\n" + end + end + end +end + class ComatoseMigrationGenerator < Rails::Generator::Base @@ -38,6 +50,8 @@ class ComatoseMigrationGenerator < Rails::Generator::Base case @mode when :new m.migration_template 'migration.rb', 'db/migrate', :migration_file_name=>'add_comatose_support', :assigns=>{:class_name=>'AddComatoseSupport'} + m.new_route 'comatose_root', "''" + m.new_route 'comatose_admin' when :upgrade from = @upgrade_from @@ -57,3 +71,4 @@ class ComatoseMigrationGenerator < Rails::Generator::Base end end end + generators/comatose_migration/comatose_migration_generator.rb @@ -1,3 +1,5 @@ +require 'fileutils' + # Copy the images (*.gif) into RAILS_ROOT/public/images/comatose RAILS_ROOT = File.join(File.dirname(__FILE__), '../../../') install.rb @@ -1,4 +1,4 @@ module Comatose - VERSION = "2.0" - VERSION_STRING = "#{VERSION} (uber-alpha)" + VERSION = "2.0.4" + VERSION_STRING = "#{VERSION} (beta)" end \ No newline at end of file lib/comatose/version.rb @@ -1,5 +1,5 @@ begin - require 'comatose' + require 'comatose/version' rescue LoadError $: << File.join(File.dirname(__FILE__), '..', 'lib') end tasks/comatose.rake README.rdoc 57515730d5fc11c405d4aa08573a98e34096f263 M@ McCray darthapo@gmail.com http://github.com/darthapo/comatose/commit/484adfec1985875a0fdab0df15821e972571d0c1 484adfec1985875a0fdab0df15821e972571d0c1 2008-10-30T23:35:02-07:00 2008-10-30T23:35:02-07:00 * Added a rake task to generate a test_harness (for use in development). From the comatose directory, run: `rake test_harness TARGET=../comatose_test_harness`. This will create an empty rails app, copy this working folder over to vendor/plugins/comatose, install acts_as_list and acts_as_tree, and run any setup needed, like script/generate comatose_migration and rake db:migrate. * Bugfix in tasks/comatose.rake * Comatose migration generator now adds the default comatose routes (`map.comatose_admin` and `map.comatose_root ''`) to the top of the routes.rb file. POSSIBLE GOTCHA: `map.comatose_root` should be moved to the bottom of the routes file! ff9895a50e5b8e1724c6ab572955d605ab1a389a M@ McCray darthapo@gmail.com