merb-admin 0.8.1 → 0.8.3

data/lib/merb-admin/merbtasks.rb

@@ -1,103 +1,103 @@
-namespace :slices do
-  namespace :"merb-admin" do
-
-    desc "Install MerbAdmin"
-    task :install => [:preflight, :setup_directories, :copy_assets, :migrate]
-
-    desc "Test for any dependencies"
-    task :preflight do # see slicetasks.rb
-    end
-
-    desc "Setup directories"
-    task :setup_directories do
-      puts "Creating directories for host application"
-      MerbAdmin.mirrored_components.each do |type|
-        if File.directory?(MerbAdmin.dir_for(type))
-          if !File.directory?(dst_path = MerbAdmin.app_dir_for(type))
-            relative_path = dst_path.relative_path_from(Merb.root)
-            puts "- creating directory :#{type} #{File.basename(Merb.root) / relative_path}"
-            mkdir_p(dst_path)
-          end
-        end
-      end
-    end
-
-    # desc "Copy stub files to host application"
-    # task :stubs do
-    #   puts "Copying stubs for MerbAdmin - resolves any collisions"
-    #   copied, preserved = MerbAdmin.mirror_stubs!
-    #   puts "- no files to copy" if copied.empty? && preserved.empty?
-    #   copied.each { |f| puts "- copied #{f}" }
-    #   preserved.each { |f| puts "! preserved override as #{f}" }
-    # end
-
-    # desc "Copy stub files and views to host application"
-    # task :patch => [ "stubs", "freeze:views" ]
-
-    desc "Copy public assets to host application"
-    task :copy_assets do
-      puts "Copying assets for MerbAdmin - resolves any collisions"
-      copied, preserved = MerbAdmin.mirror_public!
-      puts "- no files to copy" if copied.empty? && preserved.empty?
-      copied.each { |f| puts "- copied #{f}" }
-      preserved.each { |f| puts "! preserved override as #{f}" }
-    end
-
-    desc "Migrate the database"
-    task :migrate do # see slicetasks.rb
-    end
-
-    desc "Freeze MerbAdmin into your app (only merb-admin/app)"
-    task :freeze => [ "freeze:app" ]
-
-    namespace :freeze do
-
-      # desc "Freezes MerbAdmin by installing the gem into application/gems"
-      # task :gem do
-      #   ENV["GEM"] ||= "merb-admin"
-      #   Rake::Task['slices:install_as_gem'].invoke
-      # end
-
-      desc "Freezes MerbAdmin by copying all files from merb-admin/app to your application"
-      task :app do
-        puts "Copying all merb-admin/app files to your application - resolves any collisions"
-        copied, preserved = MerbAdmin.mirror_app!
-        puts "- no files to copy" if copied.empty? && preserved.empty?
-        copied.each { |f| puts "- copied #{f}" }
-        preserved.each { |f| puts "! preserved override as #{f}" }
-      end
-
-      desc "Freeze all views into your application for easy modification"
-      task :views do
-        puts "Copying all view templates to your application - resolves any collisions"
-        copied, preserved = MerbAdmin.mirror_files_for :view
-        puts "- no files to copy" if copied.empty? && preserved.empty?
-        copied.each { |f| puts "- copied #{f}" }
-        preserved.each { |f| puts "! preserved override as #{f}" }
-      end
-
-      desc "Freeze all models into your application for easy modification"
-      task :models do
-        puts "Copying all models to your application - resolves any collisions"
-        copied, preserved = MerbAdmin.mirror_files_for :model
-        puts "- no files to copy" if copied.empty? && preserved.empty?
-        copied.each { |f| puts "- copied #{f}" }
-        preserved.each { |f| puts "! preserved override as #{f}" }
-      end
-
-      desc "Freezes MerbAdmin as a gem and copies over merb-admin/app"
-      task :app_with_gem => [:gem, :app]
-
-      desc "Freezes MerbAdmin by unpacking all files into your application"
-      task :unpack do
-        puts "Unpacking MerbAdmin files to your application - resolves any collisions"
-        copied, preserved = MerbAdmin.unpack_slice!
-        puts "- no files to copy" if copied.empty? && preserved.empty?
-        copied.each { |f| puts "- copied #{f}" }
-        preserved.each { |f| puts "! preserved override as #{f}" }
-      end
-
-    end
-
-  end
-end
+namespace :slices do
+  namespace :"merb-admin" do
+
+    desc "Install MerbAdmin"
+    task :install => [:preflight, :setup_directories, :copy_assets, :migrate]
+
+    desc "Test for any dependencies"
+    task :preflight do # see slicetasks.rb
+    end
+
+    desc "Setup directories"
+    task :setup_directories do
+      puts "Creating directories for host application"
+      MerbAdmin.mirrored_components.each do |type|
+        if File.directory?(MerbAdmin.dir_for(type))
+          if !File.directory?(dst_path = MerbAdmin.app_dir_for(type))
+            relative_path = dst_path.relative_path_from(Merb.root)
+            puts "- creating directory :#{type} #{File.basename(Merb.root) / relative_path}"
+            mkdir_p(dst_path)
+          end
+        end
+      end
+    end
+
+    # desc "Copy stub files to host application"
+    # task :stubs do
+    #   puts "Copying stubs for MerbAdmin - resolves any collisions"
+    #   copied, preserved = MerbAdmin.mirror_stubs!
+    #   puts "- no files to copy" if copied.empty? && preserved.empty?
+    #   copied.each { |f| puts "- copied #{f}" }
+    #   preserved.each { |f| puts "! preserved override as #{f}" }
+    # end
+
+    # desc "Copy stub files and views to host application"
+    # task :patch => [ "stubs", "freeze:views" ]
+
+    desc "Copy public assets to host application"
+    task :copy_assets do
+      puts "Copying assets for MerbAdmin - resolves any collisions"
+      copied, preserved = MerbAdmin.mirror_public!
+      puts "- no files to copy" if copied.empty? && preserved.empty?
+      copied.each { |f| puts "- copied #{f}" }
+      preserved.each { |f| puts "! preserved override as #{f}" }
+    end
+
+    desc "Migrate the database"
+    task :migrate do # see slicetasks.rb
+    end
+
+    desc "Freeze MerbAdmin into your app (only merb-admin/app)"
+    task :freeze => [ "freeze:app" ]
+
+    namespace :freeze do
+
+      # desc "Freezes MerbAdmin by installing the gem into application/gems"
+      # task :gem do
+      #   ENV["GEM"] ||= "merb-admin"
+      #   Rake::Task['slices:install_as_gem'].invoke
+      # end
+
+      desc "Freezes MerbAdmin by copying all files from merb-admin/app to your application"
+      task :app do
+        puts "Copying all merb-admin/app files to your application - resolves any collisions"
+        copied, preserved = MerbAdmin.mirror_app!
+        puts "- no files to copy" if copied.empty? && preserved.empty?
+        copied.each { |f| puts "- copied #{f}" }
+        preserved.each { |f| puts "! preserved override as #{f}" }
+      end
+
+      desc "Freeze all views into your application for easy modification"
+      task :views do
+        puts "Copying all view templates to your application - resolves any collisions"
+        copied, preserved = MerbAdmin.mirror_files_for :view
+        puts "- no files to copy" if copied.empty? && preserved.empty?
+        copied.each { |f| puts "- copied #{f}" }
+        preserved.each { |f| puts "! preserved override as #{f}" }
+      end
+
+      desc "Freeze all models into your application for easy modification"
+      task :models do
+        puts "Copying all models to your application - resolves any collisions"
+        copied, preserved = MerbAdmin.mirror_files_for :model
+        puts "- no files to copy" if copied.empty? && preserved.empty?
+        copied.each { |f| puts "- copied #{f}" }
+        preserved.each { |f| puts "! preserved override as #{f}" }
+      end
+
+      desc "Freezes MerbAdmin as a gem and copies over merb-admin/app"
+      task :app_with_gem => [:gem, :app]
+
+      desc "Freezes MerbAdmin by unpacking all files into your application"
+      task :unpack do
+        puts "Unpacking MerbAdmin files to your application - resolves any collisions"
+        copied, preserved = MerbAdmin.unpack_slice!
+        puts "- no files to copy" if copied.empty? && preserved.empty?
+        copied.each { |f| puts "- copied #{f}" }
+        preserved.each { |f| puts "! preserved override as #{f}" }
+      end
+
+    end
+
+  end
+end

data/lib/merb-admin/slicetasks.rb

@@ -1,174 +1,174 @@
-require 'abstract_model'
-
-namespace :slices do
-  namespace :"merb-admin" do
-
-    # # Uncomment the following lines and edit the pre defined tasks
-    #
-    # # implement this to test for structural/code dependencies
-    # # like certain directories or availability of other files
-    # desc "Test for any dependencies"
-    # task :preflight do
-    # end
-    #
-    # # implement this to perform any database related setup steps
-    # desc "Migrate the database"
-    # task :migrate do
-    # end
-
-    desc "Copies sample models, copies and runs sample migrations, and loads sample data into your app"
-    task :activerecord => ["activerecord:copy_sample_models", "activerecord:copy_sample_migrations", "activerecord:migrate", "load_sample_data"]
-    namespace :activerecord do
-      desc "Copies sample models into your app"
-      task :copy_sample_models do
-        copy_models(:activerecord)
-      end
-
-      desc "Copies sample migrations into your app"
-      task :copy_sample_migrations do
-        copy_migrations(:activerecord)
-      end
-
-      desc "Migrate the database to the latest version"
-      task :migrate do
-        Rake::Task["db:migrate"].reenable
-        Rake::Task["db:migrate"].invoke
-      end
-    end
-
-    desc "Copies sample models, runs sample migrations, and loads sample data into your app"
-    task :datamapper => ["datamapper:copy_sample_models", "datamapper:migrate", "load_sample_data"]
-    namespace :datamapper do
-      desc "Copies sample models into your app"
-      task :copy_sample_models do
-        copy_models(:datamapper)
-      end
-
-      desc "Perform non destructive automigration"
-      task :migrate do
-        Rake::Task["db:automigrate"].reenable
-        Rake::Task["db:automigrate"].invoke
-      end
-    end
-
-    desc "Copies sample models, copies and runs sample migrations, and loads sample data"
-    task :sequel => ["sequel:copy_sample_models", "sequel:copy_sample_migrations", "sequel:migrate", "load_sample_data"]
-    namespace :sequel do
-      desc "Copies sample models into your app"
-      task :copy_sample_models do
-        copy_models(:sequel)
-      end
-
-      desc "Copies sample migrations into your app"
-      task :copy_sample_migrations do
-        copy_migrations(:sequel)
-      end
-
-      desc "Perform migration using migrations in schema/migrations"
-      task :migrate do
-        require 'sequel/extensions/migration'
-        Rake::Task["sequel:db:migrate"].reenable
-        Rake::Task["sequel:db:migrate"].invoke
-      end
-    end
-
-    desc "Loads sample data into your app"
-    task :load_sample_data do
-      load_data
-    end
-
-  end
-end
-
-private
-
-def load_data
-  begin
-    require "mlb"
-  rescue LoadError => e
-    puts "LoadError: #{e}"
-    puts "gem install mlb -s http://gemcutter.org"
-    return
-  end
-
-  require_models
-
-  puts "Loading current MLB leagues, divisions, teams, and players"
-  MLB::Team.all.each do |mlb_team|
-    unless league = MerbAdmin::AbstractModel.new("League").first(:conditions => ["name = ?", mlb_team.league])
-      league = MerbAdmin::AbstractModel.new("League").create(:name => mlb_team.league)
-    end
-    unless division = MerbAdmin::AbstractModel.new("Division").first(:conditions => ["name = ?", mlb_team.division])
-      division = MerbAdmin::AbstractModel.new("Division").create(:name => mlb_team.division, :league => league)
-    end
-    unless team = MerbAdmin::AbstractModel.new("Team").first(:conditions => ["name = ?", mlb_team.name])
-      team = MerbAdmin::AbstractModel.new("Team").create(:name => mlb_team.name, :logo_url => mlb_team.logo_url, :manager => mlb_team.manager, :ballpark => mlb_team.ballpark, :mascot => mlb_team.mascot, :founded => mlb_team.founded, :wins => mlb_team.wins, :losses => mlb_team.losses, :win_percentage => ("%.3f" % (mlb_team.wins.to_f / (mlb_team.wins + mlb_team.losses))).to_f, :division => division, :league => league)
-    end
-    mlb_team.players.reject{|player| player.number.nil?}.each do |player|
-      MerbAdmin::AbstractModel.new("Player").create(:name => player.name, :number => player.number, :position => player.position, :team => team)
-    end
-  end
-end
-
-def copy_models(orm = nil)
-  orm ||= set_orm
-  puts "Copying sample #{orm} models into host application - resolves any collisions"
-  seen, copied, duplicated = [], [], []
-  Dir.glob(File.dirname(__FILE__) / ".." / ".." / "spec" / "models" / orm.to_s.downcase / MerbAdmin.glob_for(:model)).each do |source_filename|
-    next if seen.include?(source_filename)
-    destination_filename = Merb.dir_for(:model) / File.basename(source_filename)
-    mirror_file(source_filename, destination_filename, copied, duplicated)
-    seen << source_filename
-  end
-  copied.each { |f| puts "- copied #{f}" }
-  duplicated.each { |f| puts "! duplicated override as #{f}" }
-end
-
-def copy_migrations(orm = nil)
-  orm ||= set_orm
-  puts "Copying sample #{orm} migrations into host application - resolves any collisions"
-  seen, copied, duplicated = [], [], []
-  Dir.glob(File.dirname(__FILE__) / ".." / ".." / "spec" / "migrations" / orm.to_s.downcase / "*.rb").each do |source_filename|
-    next if seen.include?(source_filename)
-    destination_filename = Merb.root / "schema" / "migrations" / File.basename(source_filename)
-    mirror_file(source_filename, destination_filename, copied, duplicated)
-    seen << source_filename
-  end
-  copied.each { |f| puts "- copied #{f}" }
-  duplicated.each { |f| puts "! duplicated override as #{f}" }
-end
-
-def require_models
-  Dir.glob(Merb.dir_for(:model) / Merb.glob_for(:model)).each do |model_filename|
-    require model_filename
-  end
-end
-
-def set_orm(orm = nil)
-  orm || ENV['MERB_ORM'] || (Merb.orm != :none ? Merb.orm : nil) || :activerecord
-end
-
-def mirror_file(source, dest, copied = [], duplicated = [], postfix = '_override')
-  base, rest = split_name(source)
-  dst_dir = File.dirname(dest)
-  dup_path = dst_dir / "#{base}#{postfix}.#{rest}"
-  if File.file?(source)
-    FileUtils.mkdir_p(dst_dir) unless File.directory?(dst_dir)
-    if File.exists?(dest) && !File.exists?(dup_path) && !FileUtils.identical?(source, dest)
-      # copy app-level override to *_override.ext
-      FileUtils.copy_entry(dest, dup_path, false, false, true)
-      duplicated << dup_path.relative_path_from(Merb.root)
-    end
-    # copy gem-level original to location
-    if !File.exists?(dest) || (File.exists?(dest) && !FileUtils.identical?(source, dest))
-      FileUtils.copy_entry(source, dest, false, false, true)
-      copied << dest.relative_path_from(Merb.root)
-    end
-  end
-end
-
-def split_name(name)
-  file_name = File.basename(name)
-  mres = /^([^\/\.]+)\.(.+)$/i.match(file_name)
-  mres.nil? ? [file_name, ''] : [mres[1], mres[2]]
-end
+require 'abstract_model'
+
+namespace :slices do
+  namespace :"merb-admin" do
+
+    # # Uncomment the following lines and edit the pre defined tasks
+    #
+    # # implement this to test for structural/code dependencies
+    # # like certain directories or availability of other files
+    # desc "Test for any dependencies"
+    # task :preflight do
+    # end
+    #
+    # # implement this to perform any database related setup steps
+    # desc "Migrate the database"
+    # task :migrate do
+    # end
+
+    desc "Copies sample models, copies and runs sample migrations, and loads sample data into your app"
+    task :activerecord => ["activerecord:copy_sample_models", "activerecord:copy_sample_migrations", "activerecord:migrate", "load_sample_data"]
+    namespace :activerecord do
+      desc "Copies sample models into your app"
+      task :copy_sample_models do
+        copy_models(:activerecord)
+      end
+
+      desc "Copies sample migrations into your app"
+      task :copy_sample_migrations do
+        copy_migrations(:activerecord)
+      end
+
+      desc "Migrate the database to the latest version"
+      task :migrate do
+        Rake::Task["db:migrate"].reenable
+        Rake::Task["db:migrate"].invoke
+      end
+    end
+
+    desc "Copies sample models, runs sample migrations, and loads sample data into your app"
+    task :datamapper => ["datamapper:copy_sample_models", "datamapper:migrate", "load_sample_data"]
+    namespace :datamapper do
+      desc "Copies sample models into your app"
+      task :copy_sample_models do
+        copy_models(:datamapper)
+      end
+
+      desc "Perform non destructive automigration"
+      task :migrate do
+        Rake::Task["db:automigrate"].reenable
+        Rake::Task["db:automigrate"].invoke
+      end
+    end
+
+    desc "Copies sample models, copies and runs sample migrations, and loads sample data"
+    task :sequel => ["sequel:copy_sample_models", "sequel:copy_sample_migrations", "sequel:migrate", "load_sample_data"]
+    namespace :sequel do
+      desc "Copies sample models into your app"
+      task :copy_sample_models do
+        copy_models(:sequel)
+      end
+
+      desc "Copies sample migrations into your app"
+      task :copy_sample_migrations do
+        copy_migrations(:sequel)
+      end
+
+      desc "Perform migration using migrations in schema/migrations"
+      task :migrate do
+        require 'sequel/extensions/migration'
+        Rake::Task["sequel:db:migrate"].reenable
+        Rake::Task["sequel:db:migrate"].invoke
+      end
+    end
+
+    desc "Loads sample data into your app"
+    task :load_sample_data do
+      load_data
+    end
+
+  end
+end
+
+private
+
+def load_data
+  begin
+    require "mlb"
+  rescue LoadError => e
+    puts "LoadError: #{e}"
+    puts "gem install mlb -s http://gemcutter.org"
+    return
+  end
+
+  require_models
+
+  puts "Loading current MLB leagues, divisions, teams, and players"
+  MLB::Team.all.each do |mlb_team|
+    unless league = MerbAdmin::AbstractModel.new("League").first(:conditions => ["name = ?", mlb_team.league])
+      league = MerbAdmin::AbstractModel.new("League").create(:name => mlb_team.league)
+    end
+    unless division = MerbAdmin::AbstractModel.new("Division").first(:conditions => ["name = ?", mlb_team.division])
+      division = MerbAdmin::AbstractModel.new("Division").create(:name => mlb_team.division, :league => league)
+    end
+    unless team = MerbAdmin::AbstractModel.new("Team").first(:conditions => ["name = ?", mlb_team.name])
+      team = MerbAdmin::AbstractModel.new("Team").create(:name => mlb_team.name, :logo_url => mlb_team.logo_url, :manager => mlb_team.manager, :ballpark => mlb_team.ballpark, :mascot => mlb_team.mascot, :founded => mlb_team.founded, :wins => mlb_team.wins, :losses => mlb_team.losses, :win_percentage => ("%.3f" % (mlb_team.wins.to_f / (mlb_team.wins + mlb_team.losses))).to_f, :division => division, :league => league)
+    end
+    mlb_team.players.reject{|player| player.number.nil?}.each do |player|
+      MerbAdmin::AbstractModel.new("Player").create(:name => player.name, :number => player.number, :position => player.position, :team => team)
+    end
+  end
+end
+
+def copy_models(orm = nil)
+  orm ||= set_orm
+  puts "Copying sample #{orm} models into host application - resolves any collisions"
+  seen, copied, duplicated = [], [], []
+  Dir.glob(File.dirname(__FILE__) / ".." / ".." / "spec" / "models" / orm.to_s.downcase / MerbAdmin.glob_for(:model)).each do |source_filename|
+    next if seen.include?(source_filename)
+    destination_filename = Merb.dir_for(:model) / File.basename(source_filename)
+    mirror_file(source_filename, destination_filename, copied, duplicated)
+    seen << source_filename
+  end
+  copied.each { |f| puts "- copied #{f}" }
+  duplicated.each { |f| puts "! duplicated override as #{f}" }
+end
+
+def copy_migrations(orm = nil)
+  orm ||= set_orm
+  puts "Copying sample #{orm} migrations into host application - resolves any collisions"
+  seen, copied, duplicated = [], [], []
+  Dir.glob(File.dirname(__FILE__) / ".." / ".." / "spec" / "migrations" / orm.to_s.downcase / "*.rb").each do |source_filename|
+    next if seen.include?(source_filename)
+    destination_filename = Merb.root / "schema" / "migrations" / File.basename(source_filename)
+    mirror_file(source_filename, destination_filename, copied, duplicated)
+    seen << source_filename
+  end
+  copied.each { |f| puts "- copied #{f}" }
+  duplicated.each { |f| puts "! duplicated override as #{f}" }
+end
+
+def require_models
+  Dir.glob(Merb.dir_for(:model) / Merb.glob_for(:model)).each do |model_filename|
+    require model_filename
+  end
+end
+
+def set_orm(orm = nil)
+  orm || ENV['MERB_ORM'] || (Merb.orm != :none ? Merb.orm : nil) || :activerecord
+end
+
+def mirror_file(source, dest, copied = [], duplicated = [], postfix = '_override')
+  base, rest = split_name(source)
+  dst_dir = File.dirname(dest)
+  dup_path = dst_dir / "#{base}#{postfix}.#{rest}"
+  if File.file?(source)
+    FileUtils.mkdir_p(dst_dir) unless File.directory?(dst_dir)
+    if File.exists?(dest) && !File.exists?(dup_path) && !FileUtils.identical?(source, dest)
+      # copy app-level override to *_override.ext
+      FileUtils.copy_entry(dest, dup_path, false, false, true)
+      duplicated << dup_path.relative_path_from(Merb.root)
+    end
+    # copy gem-level original to location
+    if !File.exists?(dest) || (File.exists?(dest) && !FileUtils.identical?(source, dest))
+      FileUtils.copy_entry(source, dest, false, false, true)
+      copied << dest.relative_path_from(Merb.root)
+    end
+  end
+end
+
+def split_name(name)
+  file_name = File.basename(name)
+  mres = /^([^\/\.]+)\.(.+)$/i.match(file_name)
+  mres.nil? ? [file_name, ''] : [mres[1], mres[2]]
+end