desert 0.1.1 → 0.2.0

data/CHANGES

@@ -1,3 +1,8 @@
+0.2.0
+- Works with edge Rails
+- Removed Desert::Plugin#up_to_date?
+- Removed Migrator#latest_version
+
 0.1.1
 - Works with edge Rails
 - Fixed double loading issue with not fully expanded load_paths.

data/README

@@ -74,4 +74,16 @@ You can run your plugin tests/specs like so:
   rake desert:testspec:plugins PLUGIN=spiffy
 
 Leaving off the PLUGIN environment variable will cause it to run all the test/specs for
-all installed plugins, which may not be what you want.
+all installed plugins, which may not be what you want.
+
+== Running Desert tests
+
+Desert is a library that heavily monkey patches Rails. To ensure that Desert works with
+multiple versions of Rails, its tests are run against the supported versions of Rails.
+
+To set up the different supported versions of Rails, run `rake install_dependencies`.
+
+This will clone the Rails git repo and export the supported versions of rails into the
+respective directories.
+
+`rake update_dependencies` will update the clones repo on your machine.

data/Rakefile

@@ -26,7 +26,7 @@ task(:tag_release) do
 end
 
 PKG_NAME = "desert"
-PKG_VERSION = "0.1.1"
+PKG_VERSION = "0.2.0"
 PKG_FILES = FileList[
   '[A-Z]*',
   '*.rb',
@@ -52,7 +52,6 @@ spec = Gem::Specification.new do |s|
 
   s.test_files = Dir.glob('spec/*_spec.rb')
   s.require_path = 'lib'
-  s.autorequire = 'desert'
   s.author = "Pivotal Labs"
   s.email = "opensource@pivotallabs.com"
   s.homepage = "http://pivotallabs.com"
@@ -68,4 +67,27 @@ def tag_release
   dashed_version = PKG_VERSION.gsub('.', '-')
   svn_user = "#{ENV["SVN_USER"]}@" || ""
   `svn cp svn+ssh://#{svn_user}rubyforge.org/var/svn/pivotalrb/desert/trunk svn+ssh://#{svn_user}rubyforge.org/var/svn/pivotalrb/desert/tags/REL-#{dashed_version} -m 'Version #{PKG_VERSION}'`
-end
+end
+
+desc "Install dependencies to run the build. This task uses Git."
+task(:install_dependencies) do
+  require "lib/desert/supported_rails_versions"
+  system("git clone git://github.com/rails/rails.git spec/rails_root/vendor/rails_versions/edge")
+  Dir.chdir("spec/rails_root/vendor/rails_versions/edge") do
+    begin
+      Desert::SUPPORTED_RAILS_VERSIONS.each do |version, data|
+        unless version == 'edge'
+          system("git checkout #{data['git_tag']}")
+          system("cp -R ../edge ../#{version}")
+        end
+      end
+    ensure
+      system("git checkout master")
+    end
+  end
+end
+
+desc "Updates the dependencies to run the build. This task uses Git."
+task(:update_dependencies) do
+  system "cd spec/rails_root/vendor/edge_rails; git pull origin"
+end

data/lib/desert.rb

@@ -4,29 +4,11 @@ require "action_controller"
 require "action_mailer"
 
 dir = File.dirname(__FILE__)
+require "#{dir}/desert/supported_rails_versions"
 require "#{dir}/desert/plugin"
 require "#{dir}/desert/manager"
 require "#{dir}/desert/version_checker"
-
-if Desert::VersionChecker.rails_version_is_below_1990?
-  require "#{dir}/desert/rails/1.x/initializer"
-else
-  require "#{dir}/desert/rails/2.x/plugin"
-end
-require "#{dir}/desert/rails/dependencies"
-require "#{dir}/desert/rails/migration"
-require "#{dir}/desert/rails/migrator"
-require "#{dir}/desert/ruby/object"
-
-require "#{dir}/desert/rails/route_set"
-
-require "#{dir}/desert/plugin_migrations/migrator"
-require "#{dir}/desert/plugin_migrations/extensions/schema_statements"
-
-require "#{dir}/desert/plugin_templates/action_controller"
-if Desert::VersionChecker.rails_version_is_below_rc2?
-  require "#{dir}/desert/plugin_templates/1.x/action_mailer"
-else
-  require "#{dir}/desert/plugin_templates/2.x/action_mailer"
-end
-require "#{dir}/desert/plugin_templates/action_view"
+require "#{dir}/desert/rails"
+require "#{dir}/desert/ruby"
+require "#{dir}/desert/plugin_migrations"
+require "#{dir}/desert/plugin_templates"

data/lib/desert/plugin.rb

@@ -61,12 +61,6 @@ module Desert
       @migration ||= PluginAWeek::PluginMigrations::Migrator.new(:up, migration_path)
     end
 
-    def up_to_date?
-      with_current_plugin do
-        migration.latest_version <= migration.current_version
-      end
-    end
-
     def with_current_plugin
       old_plugin = PluginAWeek::PluginMigrations::Migrator.current_plugin
       begin

data/lib/desert/plugin_migrations.rb

@@ -0,0 +1,3 @@
+dir = File.dirname(__FILE__)
+require "#{dir}/plugin_migrations/migrator"
+require "#{dir}/plugin_migrations/extensions/schema_statements"

data/lib/desert/plugin_migrations/extensions/1.0/schema_statements.rb

@@ -0,0 +1,34 @@
+ActiveRecord::ConnectionAdapters::SchemaStatements.module_eval do
+  def initialize_schema_information_with_plugins
+    initialize_schema_information_without_plugins
+
+    begin
+      execute "CREATE TABLE #{PluginAWeek::PluginMigrations::Migrator.schema_info_table_name} (plugin_name #{type_to_sql(:string)}, version #{type_to_sql(:integer)})"
+    rescue ActiveRecord::StatementInvalid
+      # Schema has been initialized
+    end
+  end
+  alias_method_chain :initialize_schema_information, :plugins
+
+  def dump_schema_information_with_plugins
+    schema_information = []
+
+    dump = dump_schema_information_without_plugins
+    schema_information << dump if dump
+
+    begin
+      plugins = ActiveRecord::Base.connection.select_all("SELECT * FROM #{PluginAWeek::PluginMigrations::Migrator.schema_info_table_name}")
+      plugins.each do |plugin|
+        if (version = plugin['version'].to_i) > 0
+          plugin_name = ActiveRecord::Base.quote_value(plugin['plugin_name'])
+          schema_information << "INSERT INTO #{PluginAWeek::PluginMigrations::Migrator.schema_info_table_name} (plugin_name, version) VALUES (#{plugin_name}, #{version})"
+        end
+      end
+    rescue ActiveRecord::StatementInvalid
+      # No Schema Info
+    end
+
+    schema_information.join(";\n")
+  end
+  alias_method_chain :dump_schema_information, :plugins
+end

data/lib/desert/plugin_migrations/extensions/2.1/schema_statements.rb

@@ -0,0 +1,12 @@
+ActiveRecord::ConnectionAdapters::SchemaStatements.module_eval do
+  def initialize_schema_migrations_table_with_plugins
+    initialize_schema_migrations_table_without_plugins
+
+    begin
+      execute "CREATE TABLE #{PluginAWeek::PluginMigrations::Migrator.schema_info_table_name} (plugin_name #{type_to_sql(:string)}, version #{type_to_sql(:integer)})"
+    rescue ActiveRecord::StatementInvalid
+      # Schema has been initialized
+    end
+  end
+  alias_method_chain :initialize_schema_migrations_table, :plugins
+end

data/lib/desert/plugin_migrations/extensions/schema_statements.rb

@@ -1,38 +1,6 @@
-module ActiveRecord #:nodoc:
-  module ConnectionAdapters #:nodoc:
-    module SchemaStatements #:nodoc:
-      def initialize_schema_information_with_plugins
-        initialize_schema_information_without_plugins
-        
-        begin
-          execute "CREATE TABLE #{PluginAWeek::PluginMigrations::Migrator.schema_info_table_name} (plugin_name #{type_to_sql(:string)}, version #{type_to_sql(:integer)})"
-        rescue ActiveRecord::StatementInvalid
-          # Schema has been initialized
-        end
-      end
-      alias_method_chain :initialize_schema_information, :plugins
-      
-      def dump_schema_information_with_plugins
-        schema_information = []
-        
-        dump = dump_schema_information_without_plugins
-        schema_information << dump if dump
-        
-        begin
-          plugins = ActiveRecord::Base.connection.select_all("SELECT * FROM #{PluginAWeek::PluginMigrations::Migrator.schema_info_table_name}")
-          plugins.each do |plugin|
-            if (version = plugin['version'].to_i) > 0
-              plugin_name = ActiveRecord::Base.quote_value(plugin['plugin_name'])
-              schema_information << "INSERT INTO #{PluginAWeek::PluginMigrations::Migrator.schema_info_table_name} (plugin_name, version) VALUES (#{plugin_name}, #{version})"
-            end
-          end
-        rescue ActiveRecord::StatementInvalid 
-          # No Schema Info
-        end
-        
-        schema_information.join(";\n")
-      end
-      alias_method_chain :dump_schema_information, :plugins
-    end
-  end
+dir = File.dirname(__FILE__)
+if ActiveRecord::ConnectionAdapters::SchemaStatements.instance_methods.include?('initialize_schema_information')
+  require "#{dir}/1.0/schema_statements"
+else
+  require "#{dir}/2.1/schema_statements"
 end

data/lib/desert/plugin_migrations/migrator.rb

@@ -10,12 +10,16 @@ module PluginAWeek #:nodoc:
         # Runs the migrations from a plugin, up (or down) to the version given
         def migrate_plugin(plugin, version = nil)
           self.current_plugin = plugin
+          if ActiveRecord::Base.connection.respond_to?(:initialize_schema_migrations_table)
+            ActiveRecord::Base.connection.initialize_schema_migrations_table
+          end
           migrate(plugin.migration_path, version)
         end
 
         def schema_info_table_name #:nodoc:
           ActiveRecord::Base.table_name_prefix + 'plugin_schema_info' + ActiveRecord::Base.table_name_suffix
         end
+        alias_method :schema_migrations_table_name, :schema_info_table_name
 
         def current_version #:nodoc:
           result = ActiveRecord::Base.connection.select_one("SELECT version FROM #{schema_info_table_name} WHERE plugin_name = '#{current_plugin.name}'")
@@ -38,6 +42,7 @@ module PluginAWeek #:nodoc:
           ActiveRecord::Base.connection.update("UPDATE #{self.class.schema_info_table_name} SET version = #{version} WHERE plugin_name = '#{current_plugin.name}'")
         end
       end
+      alias_method :record_version_state_after_migrating, :set_schema_version
     end
   end
 end

data/lib/desert/plugin_templates.rb

@@ -0,0 +1,8 @@
+dir = File.dirname(__FILE__)
+require "#{dir}/plugin_templates/action_controller"
+if Desert::VersionChecker.rails_version_is_below_rc2?
+  require "#{dir}/plugin_templates/1.2.0/action_mailer"
+else
+  require "#{dir}/plugin_templates/2.0.0/action_mailer"
+end
+require "#{dir}/plugin_templates/action_view"

data/lib/desert/rails.rb

@@ -0,0 +1,10 @@
+dir = File.dirname(__FILE__)
+if Desert::VersionChecker.rails_version_is_below_1990?
+  require "#{dir}/rails/1.2.0/initializer"
+else
+  require "#{dir}/rails/2.0.0/plugin"
+end
+require "#{dir}/rails/dependencies"
+require "#{dir}/rails/migration"
+
+require "#{dir}/rails/route_set"

data/lib/desert/ruby.rb

@@ -0,0 +1,2 @@
+dir = File.dirname(__FILE__)
+require "#{dir}/ruby/object"

data/lib/desert/supported_rails_versions.rb

@@ -0,0 +1,8 @@
+module Desert
+  SUPPORTED_RAILS_VERSIONS = {
+    "1.2.5" => {'version' => '1.2.5', 'git_tag' => 'v1.2.5'},
+    "1.99.0" => {'version' => '1.99.0', 'git_tag' => 'v2.0.0_RC1'},
+    "2.0.2" => {'version' => '2.0.2', 'git_tag' => 'v2.0.2'},
+    "edge" => {'version' => 'edge', 'git_tag' => 'master'},
+  }
+end

data/scratch.rb

@@ -0,0 +1,2 @@
+require "rubygems"
+require "rr"

metadata

@@ -1,79 +1,85 @@
 --- !ruby/object:Gem::Specification 
-rubygems_version: 0.9.4
-specification_version: 1
 name: desert
 version: !ruby/object:Gem::Version 
-  version: 0.1.1
-date: 2008-03-18 00:00:00 -07:00
-summary: Desert is a component framework for Rails that allows your plugins to be packaged as mini Rails apps.
-require_paths: 
-- lib
-email: opensource@pivotallabs.com
-homepage: http://pivotallabs.com
-rubyforge_project: pivotalrb
-description: Desert is a component framework for Rails that allows your plugins to be packaged as mini Rails apps.
-autorequire: desert
-default_executable: 
-bindir: bin
-has_rdoc: true
-required_ruby_version: !ruby/object:Gem::Version::Requirement 
-  requirements: 
-  - - ">"
-    - !ruby/object:Gem::Version 
-      version: 0.0.0
-  version: 
+  version: 0.2.0
 platform: ruby
-signing_key: 
-cert_chain: 
-post_install_message: 
 authors: 
 - Pivotal Labs
+autorequire: 
+bindir: bin
+cert_chain: []
+
+date: 2008-04-26 00:00:00 -07:00
+default_executable: 
+dependencies: []
+
+description: Desert is a component framework for Rails that allows your plugins to be packaged as mini Rails apps.
+email: opensource@pivotallabs.com
+executables: []
+
+extensions: []
+
+extra_rdoc_files: 
+- README
+- CHANGES
 files: 
+- Rakefile
 - CHANGES
 - MIT-LICENSE
 - README
-- Rakefile
+- scratch.rb
 - init.rb
-- lib/desert.rb
-- lib/generators/desert_plugin/templates/routes.rb
-- lib/generators/desert_plugin/templates/spec_helper.rb
-- lib/generators/desert_plugin/templates/plugin_migration.rb
-- lib/generators/desert_plugin/desert_plugin_generator.rb
-- lib/desert/plugin_templates/1.x/action_mailer.rb
+- lib/desert/manager.rb
+- lib/desert/version_checker.rb
+- lib/desert/plugin.rb
+- lib/desert/plugin_templates/1.2.0/action_mailer.rb
 - lib/desert/plugin_templates/action_view.rb
-- lib/desert/plugin_templates/2.x/action_mailer.rb
+- lib/desert/plugin_templates/2.0.0/action_mailer.rb
 - lib/desert/plugin_templates/action_controller.rb
-- lib/desert/manager.rb
-- lib/desert/rails/1.x/initializer.rb
-- lib/desert/rails/migration.rb
-- lib/desert/rails/migrator.rb
-- lib/desert/rails/2.x/plugin.rb
+- lib/desert/rails.rb
+- lib/desert/supported_rails_versions.rb
+- lib/desert/plugin_migrations/migrator.rb
+- lib/desert/plugin_migrations/extensions/2.1/schema_statements.rb
+- lib/desert/plugin_migrations/extensions/1.0/schema_statements.rb
+- lib/desert/plugin_migrations/extensions/schema_statements.rb
+- lib/desert/rails/1.2.0/initializer.rb
+- lib/desert/rails/2.0.0/plugin.rb
 - lib/desert/rails/route_set.rb
+- lib/desert/rails/migration.rb
 - lib/desert/rails/dependencies.rb
-- lib/desert/version_checker.rb
+- lib/desert/plugin_templates.rb
+- lib/desert/plugin_migrations.rb
+- lib/desert/ruby.rb
 - lib/desert/ruby/object.rb
-- lib/desert/plugin_migrations/migrator.rb
-- lib/desert/plugin_migrations/extensions/schema_statements.rb
-- lib/desert/plugin.rb
-- lib/generators/desert_plugin
-- lib/generators/desert_plugin/templates
-- lib/generators/desert_plugin/templates/empty_file
-- lib/generators/desert_plugin/USAGE
-test_files: []
-
+- lib/desert.rb
+has_rdoc: true
+homepage: http://pivotallabs.com
+post_install_message: 
 rdoc_options: 
 - --main
 - README
 - --inline-source
 - --line-numbers
-extra_rdoc_files: 
-- README
-- CHANGES
-executables: []
-
-extensions: []
-
+require_paths: 
+- lib
+required_ruby_version: !ruby/object:Gem::Requirement 
+  requirements: 
+  - - ">="
+    - !ruby/object:Gem::Version 
+      version: "0"
+  version: 
+required_rubygems_version: !ruby/object:Gem::Requirement 
+  requirements: 
+  - - ">="
+    - !ruby/object:Gem::Version 
+      version: "0"
+  version: 
 requirements: []
 
-dependencies: []
+rubyforge_project: pivotalrb
+rubygems_version: 1.1.0
+signing_key: 
+specification_version: 2
+summary: Desert is a component framework for Rails that allows your plugins to be packaged as mini Rails apps.
+test_files: []
 

data/lib/desert/rails/migrator.rb

@@ -1,14 +0,0 @@
-class ActiveRecord::Migrator
-  module DesertMigrator
-    def latest_version
-      return 0 if migration_classes.empty?
-      migration_classes.last.first
-    end
-
-    def migration_classes_with_caching
-      @migration_classes ||= migration_classes_without_caching
-    end
-  end
-  include DesertMigrator
-  alias_method_chain :migration_classes, :caching
-end

data/lib/generators/desert_plugin/USAGE

@@ -1,14 +0,0 @@
-NAME
-     desert_plugin - creates a directory structure and starter files for a new desert plugin
-
-SYNOPSIS
-     desert_plugin [plugin name]
-
-DESCRIPTION
-     |-- vendor
-        `-- plugins
-           `-- [plugin name]
-
-EXAMPLE
-      ./script/generate desert_plugin spiffy
-

data/lib/generators/desert_plugin/desert_plugin_generator.rb

@@ -1,40 +0,0 @@
-class DesertPluginGenerator < Rails::Generator::NamedBase
-  def manifest
-    record do |m|
-      m.directory "vendor/plugins/#{file_name}"
-
-      m.directory "vendor/plugins/#{file_name}/app"
-      m.directory "vendor/plugins/#{file_name}/app/controllers"
-      m.directory "vendor/plugins/#{file_name}/app/helpers"
-      m.directory "vendor/plugins/#{file_name}/app/models"
-      m.directory "vendor/plugins/#{file_name}/app/views"
-
-      m.directory "vendor/plugins/#{file_name}/config"
-      m.template "routes.rb", "vendor/plugins/#{file_name}/config/routes.rb"
-      map_route_from_plugin(m)
-
-      m.directory "vendor/plugins/#{file_name}/db"
-      m.directory "vendor/plugins/#{file_name}/db/migrate"
-      m.template "plugin_migration.rb", "vendor/plugins/#{file_name}/db/migrate/001_init_#{file_name}_plugin.rb" 
-
-      m.directory "vendor/plugins/#{file_name}/lib"
-
-      m.directory "vendor/plugins/#{file_name}/spec"
-      m.directory "vendor/plugins/#{file_name}/spec/controllers"
-      m.directory "vendor/plugins/#{file_name}/spec/fixtures"
-      m.directory "vendor/plugins/#{file_name}/spec/models"
-      m.directory "vendor/plugins/#{file_name}/spec/views"
-      m.file "spec_helper.rb", "vendor/plugins/#{file_name}/spec/spec_helper.rb" 
-
-      m.file "empty_file", "vendor/plugins/#{file_name}/init.rb"
-    end
-  end
-
-  def map_route_from_plugin(m)
-    logger.route "adding map.routes_from_plugin(:#{file_name}) to top of routes.rb"
-    sentinel = 'ActionController::Routing::Routes.draw do |map|'
-    m.gsub_file 'config/routes.rb', /(#{Regexp.escape(sentinel)})/mi do |match|
-      "#{match}\n    map.routes_from_plugin(:#{file_name})\n"
-    end
-  end
-end

data/lib/generators/desert_plugin/templates/plugin_migration.rb

@@ -1,11 +0,0 @@
-class Init<%= class_name %>Plugin < ActiveRecord::Migration
-  def self.up
-    create_table "<%= plural_name %>", :force => true do |t|
-      t.column "some_<%= file_name %>_column", :string
-    end
-  end
-
-  def self.down
-    drop_table :<%= plural_name %>
-  end
-end

data/lib/generators/desert_plugin/templates/routes.rb

@@ -1 +0,0 @@
-resources :<%= plural_name %>

data/lib/generators/desert_plugin/templates/spec_helper.rb

@@ -1,8 +0,0 @@
-ENV["RAILS_ENV"] = "test"
-require File.expand_path(File.dirname(__FILE__) + "/../../../../config/environment")
-require 'spec'
-require 'spec/rails'
-
-Spec::Runner.configure do |config|
-  config.fixture_path = "#{File.dirname(__FILE__)}/../spec/fixtures"
-end