standalone_migrations 0.4.5 → 0.4.7

data/README.markdown

@@ -12,6 +12,7 @@ Add to `Rakefile` in your projects base directory:
         # t.migrations = "db/migrations"
         # t.config = "db/config.yml"
         # t.schema = "db/schema.rb"
+        # t.sub_namespace = "dbname"
         # t.env = "DB"
         # t.default_env = "development"
         # t.verbose = true
@@ -77,6 +78,27 @@ If you're lazy and want to just execute raw SQL:
 
     rake db:migrate:up VERSION=20081220234130
 
+## Sub-namespacing
+
+When working with multiple databases in a single application it is convenient
+to have separate sets of tasks for each database. This is accomplished with
+sub_namespace parameter - for example, given the following declaration:
+
+    MigratorTasks.new do |t|
+      t.migrations = "db/migrate/widgets"
+      t.sub_namespace = "widgets"
+      ...
+    end
+
+The following tasks will be created:
+
+    db:widgets:new_migration
+    db:widgets:migrate
+    ...
+
+And migrations for this database would be created in db/migrate/widgets
+subdirectory.
+
 Contributors
 ============
 This work is based on [Lincoln Stoll's blog post](http://lstoll.net/2008/04/stand-alone-activerecord-migrations/) and [David Welton's post](http://journal.dedasys.com/2007/01/28/using-migrations-outside-of-rails).
@@ -86,4 +108,4 @@ This work is based on [Lincoln Stoll's blog post](http://lstoll.net/2008/04/stan
  - [Eric Lindvall](http://bitmonkey.net)
  - [Steve Hodgkiss](http://stevehodgkiss.com/)
  - [Rich Meyers](https://github.com/richmeyers)
- - [Wes Bailey](http://exposinggotchas.blogspot.com/)
+ - [Wes Bailey](http://exposinggotchas.blogspot.com/)

data/Rakefile

@@ -1,12 +1,29 @@
 task :default => :spec
-require 'rspec/core/rake_task'
-RSpec::Core::RakeTask.new {|t| t.rspec_opts = ['--color']}
+
+begin
+  require 'rspec/core/rake_task'
+rescue LoadError => e
+  $stderr.puts "RSpec 2, or one of its dependencies, is not available:"
+  $stderr.puts "#{e.class}: #{e.message}"
+  $stderr.puts "Install it with: sudo gem install rspec"
+  $stderr.puts "Test-related tasks will not be available."
+  $stderr.puts "If you have RSpec 1 installed you can try running the tests with:"
+  $stderr.puts "  spec spec"
+  $stderr.puts "However, RSpec 1 is not officially supported."
+else
+  RSpec::Core::RakeTask.new {|t| t.rspec_opts = ['--color']}
+end
 
 # rake install -> install gem locally (for tests)
 # rake release -> push to github and release to gemcutter
 # rake version:bump:patch -> increase version and add a git-tag
 begin
   require 'jeweler'
+rescue LoadError => e
+  $stderr.puts "Jeweler, or one of its dependencies, is not available:"
+  $stderr.puts "#{e.class}: #{e.message}"
+  $stderr.puts "Install it with: sudo gem install jeweler"
+else
   Jeweler::Tasks.new do |gem|
     gem.name = 'standalone_migrations'
     gem.summary = "A thin wrapper to use Rails Migrations in non Rails projects"
@@ -18,6 +35,4 @@ begin
   end
 
   Jeweler::GemcutterTasks.new
-rescue LoadError
-  puts "Jeweler, or one of its dependencies, is not available. Install it with: sudo gem install jeweler"
 end

data/VERSION

@@ -1 +1 @@
-0.4.5
+0.4.7

data/lib/tasks/standalone_migrations.rb

@@ -5,7 +5,8 @@ require 'logger'
 class MigratorTasks < ::Rake::TaskLib
   DefaultEnv = 'development'
 
-  attr_accessor :name, :base, :vendor, :config, :schema, :env, :current_env, :verbose, :log_level, :logger
+  attr_accessor :name, :base, :vendor, :config, :schema, :env, :current_env
+  attr_accessor :verbose, :log_level, :logger, :sub_namespace
   attr_reader :migrations
 
   def initialize(name = :migrator)
@@ -32,266 +33,279 @@ class MigratorTasks < ::Rake::TaskLib
 
   def define
     namespace :db do
-      def ar_init(connect = true)
-        require 'active_record'
-        self.current_env = ENV[@env] || DefaultEnv
-
-        if @config.is_a?(Hash)
-          ActiveRecord::Base.configurations = @config
-        else
-          require 'erb'
-          ActiveRecord::Base.configurations = YAML::load(ERB.new(IO.read(@config)).result)
+      if sub_namespace
+        namespace sub_namespace do
+          define_tasks
         end
-        ActiveRecord::Base.establish_connection(current_env) if connect
-        if @logger
-          logger = @logger
-        else
-          logger = Logger.new($stderr)
-          logger.level = @log_level
-        end
-        ActiveRecord::Base.logger = logger
+      else
+        define_tasks
       end
+    end
+  end
 
-      task :ar_init do
-        ar_init
-      end
+  def define_tasks
+    sub_namespace_with_separator = sub_namespace ? "#{sub_namespace}:" : ''
 
-      desc "Migrate the database using the scripts in the migrations directory. Target specific version with VERSION=x. Turn off output with VERBOSE=false."
-      task :migrate => :ar_init do
-        require "#{@vendor}/migration_helpers/init"
-        ActiveRecord::Migration.verbose = ENV['VERBOSE'] || @verbose
-        @migrations.each do |path|
-          ActiveRecord::Migrator.migrate(path, ENV["VERSION"] ? ENV["VERSION"].to_i : nil)
-        end
-        Rake::Task["db:schema:dump"].execute
+    def ar_init(connect = true)
+      require 'active_record'
+      self.current_env = ENV[@env] || DefaultEnv
+
+      if @config.is_a?(Hash)
+        ActiveRecord::Base.configurations = @config
+      else
+        require 'erb'
+        ActiveRecord::Base.configurations = YAML::load(ERB.new(IO.read(@config)).result)
       end
+      ActiveRecord::Base.establish_connection(current_env) if connect
+      if @logger
+        logger = @logger
+      else
+        logger = Logger.new($stderr)
+        logger.level = @log_level
+      end
+      ActiveRecord::Base.logger = logger
+    end
+
+    task :ar_init do
+      ar_init
+    end
 
-      desc "Retrieves the current schema version number"
-      task :version => :ar_init do
-        puts "Current version: #{ActiveRecord::Migrator.current_version}"
+    desc "Migrate the database using the scripts in the migrations directory. Target specific version with VERSION=x. Turn off output with VERBOSE=false."
+    task :migrate => :ar_init do
+      require "#{@vendor}/migration_helpers/init"
+      ActiveRecord::Migration.verbose = ENV['VERBOSE'] || @verbose
+      @migrations.each do |path|
+        ActiveRecord::Migrator.migrate(path, ENV["VERSION"] ? ENV["VERSION"].to_i : nil)
       end
+      Rake::Task["db:#{sub_namespace_with_separator}schema:dump"].execute
+    end
 
+    desc "Retrieves the current schema version number"
+    task :version => :ar_init do
+      puts "Current version: #{ActiveRecord::Migrator.current_version}"
+    end
 
-      def create_database(config)
-        begin
-          if config['adapter'] =~ /sqlite/
-            if File.exist?(config['database'])
-              $stderr.puts "#{config['database']} already exists"
-            else
-              begin
-                # Create the SQLite database
-                ActiveRecord::Base.establish_connection(config)
-                ActiveRecord::Base.connection
-              rescue Exception => e
-                $stderr.puts e, *(e.backtrace)
-                $stderr.puts "Couldn't create database for #{config.inspect}"
-              end
-            end
-            return # Skip the else clause of begin/rescue
+
+    def create_database(config)
+      begin
+        if config['adapter'] =~ /sqlite/
+          if File.exist?(config['database'])
+            $stderr.puts "#{config['database']} already exists"
           else
-            ActiveRecord::Base.establish_connection(config)
-            ActiveRecord::Base.connection
-          end
-        rescue
-          case config['adapter']
-            when /mysql/
-              @charset = ENV['CHARSET'] || 'utf8'
-              @collation = ENV['COLLATION'] || 'utf8_unicode_ci'
-              creation_options = {:charset => (config['charset'] || @charset), :collation => (config['collation'] || @collation)}
-              error_class = config['adapter'] =~ /mysql2/ ? Mysql2::Error : Mysql::Error
-              access_denied_error = 1045
-              begin
-                ActiveRecord::Base.establish_connection(config.merge('database' => nil))
-                ActiveRecord::Base.connection.create_database(config['database'], creation_options)
-                ActiveRecord::Base.establish_connection(config)
-              rescue error_class => sqlerr
-                if sqlerr.errno == access_denied_error
-                  print "#{sqlerr.error}. \nPlease provide the root password for your mysql installation\n>"
-                  root_password = $stdin.gets.strip
-                  grant_statement = "GRANT ALL PRIVILEGES ON #{config['database']}.* " \
-              "TO '#{config['username']}'@'localhost' " \
-              "IDENTIFIED BY '#{config['password']}' WITH GRANT OPTION;"
-                  ActiveRecord::Base.establish_connection(config.merge(
-                                                              'database' => nil, 'username' => 'root', 'password' => root_password))
-                  ActiveRecord::Base.connection.create_database(config['database'], creation_options)
-                  ActiveRecord::Base.connection.execute grant_statement
-                  ActiveRecord::Base.establish_connection(config)
-                else
-                  $stderr.puts sqlerr.error
-                  $stderr.puts "Couldn't create database for #{config.inspect}, charset: #{config['charset'] || @charset}, collation: #{config['collation'] || @collation}"
-                  $stderr.puts "(if you set the charset manually, make sure you have a matching collation)" if config['charset']
-                end
-              end
-            when 'postgresql'
-              @encoding = config['encoding'] || ENV['CHARSET'] || 'utf8'
-              begin
-                ActiveRecord::Base.establish_connection(config.merge('database' => 'postgres', 'schema_search_path' => 'public'))
-                ActiveRecord::Base.connection.create_database(config['database'], config.merge('encoding' => @encoding))
-                ActiveRecord::Base.establish_connection(config)
-              rescue Exception => e
-                $stderr.puts e, *(e.backtrace)
-                $stderr.puts "Couldn't create database for #{config.inspect}"
-              end
+            begin
+              # Create the SQLite database
+              ActiveRecord::Base.establish_connection(config)
+              ActiveRecord::Base.connection
+            rescue Exception => e
+              $stderr.puts e, *(e.backtrace)
+              $stderr.puts "Couldn't create database for #{config.inspect}"
+            end
           end
+          return # Skip the else clause of begin/rescue
         else
-          $stderr.puts "#{config['database']} already exists" unless config['adapter'] =~ /sqlite/
+          ActiveRecord::Base.establish_connection(config)
+          ActiveRecord::Base.connection
         end
-      end
-
-      desc 'Create the database from config/database.yml for the current DATABASE_ENV'
-      task :create do
-        ar_init(false)
-        config = ActiveRecord::Base.configurations[self.current_env]
-        create_database config
-      end
-
-      def drop_database(config)
+      rescue
         case config['adapter']
           when /mysql/
-            ActiveRecord::Base.establish_connection(config)
-            ActiveRecord::Base.connection.drop_database config['database']
-          when /^sqlite/
-            require 'pathname'
-            path = Pathname.new(config['database'])
-            file = path.absolute? ? path.to_s : File.join(@base, path)
-            FileUtils.rm(file)
+            @charset = ENV['CHARSET'] || 'utf8'
+            @collation = ENV['COLLATION'] || 'utf8_unicode_ci'
+            creation_options = {:charset => (config['charset'] || @charset), :collation => (config['collation'] || @collation)}
+            error_class = config['adapter'] =~ /mysql2/ ? Mysql2::Error : Mysql::Error
+            access_denied_error = 1045
+            begin
+              ActiveRecord::Base.establish_connection(config.merge('database' => nil))
+              ActiveRecord::Base.connection.create_database(config['database'], creation_options)
+              ActiveRecord::Base.establish_connection(config)
+            rescue error_class => sqlerr
+              if sqlerr.errno == access_denied_error
+                print "#{sqlerr.error}. \nPlease provide the root password for your mysql installation\n>"
+                root_password = $stdin.gets.strip
+                grant_statement = "GRANT ALL PRIVILEGES ON #{config['database']}.* " \
+            "TO '#{config['username']}'@'localhost' " \
+            "IDENTIFIED BY '#{config['password']}' WITH GRANT OPTION;"
+                ActiveRecord::Base.establish_connection(config.merge(
+                                                            'database' => nil, 'username' => 'root', 'password' => root_password))
+                ActiveRecord::Base.connection.create_database(config['database'], creation_options)
+                ActiveRecord::Base.connection.execute grant_statement
+                ActiveRecord::Base.establish_connection(config)
+              else
+                $stderr.puts sqlerr.error
+                $stderr.puts "Couldn't create database for #{config.inspect}, charset: #{config['charset'] || @charset}, collation: #{config['collation'] || @collation}"
+                $stderr.puts "(if you set the charset manually, make sure you have a matching collation)" if config['charset']
+              end
+            end
           when 'postgresql'
-            ActiveRecord::Base.establish_connection(config.merge('database' => 'postgres', 'schema_search_path' => 'public'))
-            ActiveRecord::Base.connection.drop_database config['database']
+            @encoding = config['encoding'] || ENV['CHARSET'] || 'utf8'
+            begin
+              ActiveRecord::Base.establish_connection(config.merge('database' => 'postgres', 'schema_search_path' => 'public'))
+              ActiveRecord::Base.connection.create_database(config['database'], config.merge('encoding' => @encoding))
+              ActiveRecord::Base.establish_connection(config)
+            rescue Exception => e
+              $stderr.puts e, *(e.backtrace)
+              $stderr.puts "Couldn't create database for #{config.inspect}"
+            end
         end
+      else
+        $stderr.puts "#{config['database']} already exists" unless config['adapter'] =~ /sqlite/
       end
+    end
+
+    desc 'Create the database from config/database.yml for the current DATABASE_ENV'
+    task :create do
+      ar_init(false)
+      config = ActiveRecord::Base.configurations[self.current_env]
+      create_database config
+    end
 
-      desc 'Drops the database for the current DATABASE_ENV'
-      task :drop => :ar_init do
-        config = ActiveRecord::Base.configurations[current_env]
-        drop_database(config)
+    def drop_database(config)
+      case config['adapter']
+        when /mysql/
+          ActiveRecord::Base.establish_connection(config)
+          ActiveRecord::Base.connection.drop_database config['database']
+        when /^sqlite/
+          require 'pathname'
+          path = Pathname.new(config['database'])
+          file = path.absolute? ? path.to_s : File.join(@base, path)
+          FileUtils.rm(file)
+        when 'postgresql'
+          ActiveRecord::Base.establish_connection(config.merge('database' => 'postgres', 'schema_search_path' => 'public'))
+          ActiveRecord::Base.connection.drop_database config['database']
       end
+    end
+
+    desc 'Drops the database for the current DATABASE_ENV'
+    task :drop => :ar_init do
+      config = ActiveRecord::Base.configurations[current_env]
+      drop_database(config)
+    end
 
-      namespace :migrate do
-        [:up, :down].each do |direction|
-          desc "Runs the '#{direction}' for a given migration VERSION."
-          task direction => :ar_init do
-            ActiveRecord::Migration.verbose = @verbose
-            version = ENV["VERSION"].to_i
-            raise "VERSION is required (must be a number)" if version == 0
-            migration_path = nil
-            if @migrations.length == 1
-              migration_path = @migrations.first
-            else
-              @migrations.each do |path|
-                Dir[File.join(path, '*.rb')].each do |file|
-                  if File.basename(file).match(/^\d+/)[0] == version.to_s
-                    migration_path = path
-                    break
-                  end
+    namespace :migrate do
+      [:up, :down].each do |direction|
+        desc "Runs the '#{direction}' for a given migration VERSION."
+        task direction => :ar_init do
+          ActiveRecord::Migration.verbose = @verbose
+          version = ENV["VERSION"].to_i
+          raise "VERSION is required (must be a number)" if version == 0
+          migration_path = nil
+          if @migrations.length == 1
+            migration_path = @migrations.first
+          else
+            @migrations.each do |path|
+              Dir[File.join(path, '*.rb')].each do |file|
+                if File.basename(file).match(/^\d+/)[0] == version.to_s
+                  migration_path = path
+                  break
                 end
               end
-              raise "Migration #{version} wasn't found on paths #{@migrations.join(', ')}" if migration_path.nil?
             end
-            ActiveRecord::Migrator.run(direction, migration_path, version)
-            Rake::Task["db:schema:dump"].execute
+            raise "Migration #{version} wasn't found on paths #{@migrations.join(', ')}" if migration_path.nil?
           end
+          ActiveRecord::Migrator.run(direction, migration_path, version)
+          Rake::Task["db:#{sub_namespace_with_separator}schema:dump"].execute
         end
       end
+    end
 
-      desc "Raises an error if there are pending migrations"
-      task :abort_if_pending_migrations => :ar_init do
-        @migrations.each do |path|
-          pending_migrations = ActiveRecord::Migrator.new(:up, path).pending_migrations
+    desc "Raises an error if there are pending migrations"
+    task :abort_if_pending_migrations => :ar_init do
+      @migrations.each do |path|
+        pending_migrations = ActiveRecord::Migrator.new(:up, path).pending_migrations
 
-          if pending_migrations.any?
-            puts "You have #{pending_migrations.size} pending migrations:"
-            pending_migrations.each do |pending_migration|
-              puts '  %4d %s' % [pending_migration.version, pending_migration.name]
-            end
-            abort %{Run "rake db:migrate" to update your database then try again.}
+        if pending_migrations.any?
+          puts "You have #{pending_migrations.size} pending migrations:"
+          pending_migrations.each do |pending_migration|
+            puts '  %4d %s' % [pending_migration.version, pending_migration.name]
           end
+          abort %{Run "rake db:migrate" to update your database then try again.}
         end
       end
+    end
 
-      namespace :schema do
-        desc "Create schema.rb file that can be portably used against any DB supported by AR"
-        task :dump => :ar_init do
-          if schema_file = ENV['SCHEMA'] || @schema
-            require 'active_record/schema_dumper'
-            File.open(schema_file, "w") do |file|
-              ActiveRecord::SchemaDumper.dump(ActiveRecord::Base.connection, file)
-            end
+    namespace :schema do
+      desc "Create schema.rb file that can be portably used against any DB supported by AR"
+      task :dump => :ar_init do
+        if schema_file = ENV['SCHEMA'] || @schema
+          require 'active_record/schema_dumper'
+          File.open(schema_file, "w") do |file|
+            ActiveRecord::SchemaDumper.dump(ActiveRecord::Base.connection, file)
           end
         end
+      end
 
-        desc "Load a ar_schema.rb file into the database"
-        task :load => :ar_init do
-          file = ENV['SCHEMA'] || @schema
-          load(file)
-        end
+      desc "Load a ar_schema.rb file into the database"
+      task :load => :ar_init do
+        file = ENV['SCHEMA'] || @schema
+        load(file)
       end
+    end
 
-      namespace :test do
-        desc "Recreate the test database from the current schema.rb"
-        task :load => ['db:ar_init', 'db:test:purge'] do
-          ActiveRecord::Base.establish_connection(:test)
-          ActiveRecord::Schema.verbose = false
-          Rake::Task["db:schema:load"].invoke
-        end
+    namespace :test do
+      desc "Recreate the test database from the current schema.rb"
+      task :load => ["db:#{sub_namespace_with_separator}ar_init", "db:#{sub_namespace_with_separator}test:purge"] do
+        ActiveRecord::Base.establish_connection(:test)
+        ActiveRecord::Schema.verbose = false
+        Rake::Task["db:#{sub_namespace_with_separator}schema:load"].invoke
+      end
 
-        desc "Empty the test database"
-        task :purge => 'db:ar_init' do
-          config = ActiveRecord::Base.configurations['test']
-          case config["adapter"]
-            when "mysql"
-              ActiveRecord::Base.establish_connection(:test)
-              ActiveRecord::Base.connection.recreate_database(config["database"], config)
-            when "postgresql" #TODO i doubt this will work <-> methods are not defined
-              ActiveRecord::Base.clear_active_connections!
-              drop_database(config)
-              create_database(config)
-            when "sqlite", "sqlite3"
-              db_file = config["database"] || config["dbfile"]
-              File.delete(db_file) if File.exist?(db_file)
-            when "sqlserver"
-              drop_script = "#{config["host"]}.#{config["database"]}.DP1".gsub(/\\/, '-')
-              `osql -E -S #{config["host"]} -d #{config["database"]} -i db\\#{drop_script}`
-              `osql -E -S #{config["host"]} -d #{config["database"]} -i db\\test_structure.sql`
-            when "oci", "oracle"
-              ActiveRecord::Base.establish_connection(:test)
-              ActiveRecord::Base.connection.structure_drop.split(";\n\n").each do |ddl|
-                ActiveRecord::Base.connection.execute(ddl)
-              end
-            when "firebird"
-              ActiveRecord::Base.establish_connection(:test)
-              ActiveRecord::Base.connection.recreate_database!
-            else
-              raise "Task not supported by #{config["adapter"].inspect}"
-          end
+      desc "Empty the test database"
+      task :purge => "db:#{sub_namespace_with_separator}ar_init" do
+        config = ActiveRecord::Base.configurations['test']
+        case config["adapter"]
+          when "mysql"
+            ActiveRecord::Base.establish_connection(:test)
+            ActiveRecord::Base.connection.recreate_database(config["database"], config)
+          when "postgresql" #TODO i doubt this will work <-> methods are not defined
+            ActiveRecord::Base.clear_active_connections!
+            drop_database(config)
+            create_database(config)
+          when "sqlite", "sqlite3"
+            db_file = config["database"] || config["dbfile"]
+            File.delete(db_file) if File.exist?(db_file)
+          when "sqlserver"
+            drop_script = "#{config["host"]}.#{config["database"]}.DP1".gsub(/\\/, '-')
+            `osql -E -S #{config["host"]} -d #{config["database"]} -i db\\#{drop_script}`
+            `osql -E -S #{config["host"]} -d #{config["database"]} -i db\\test_structure.sql`
+          when "oci", "oracle"
+            ActiveRecord::Base.establish_connection(:test)
+            ActiveRecord::Base.connection.structure_drop.split(";\n\n").each do |ddl|
+              ActiveRecord::Base.connection.execute(ddl)
+            end
+          when "firebird"
+            ActiveRecord::Base.establish_connection(:test)
+            ActiveRecord::Base.connection.recreate_database!
+          else
+            raise "Task not supported by #{config["adapter"].inspect}"
         end
-
-        desc 'Check for pending migrations and load the test schema'
-        task :prepare => ['db:abort_if_pending_migrations', 'db:test:load']
       end
 
-      desc 'generate a model=name field="field1:type field2:type"'
-      task :generate do
-        ts = Time.now.strftime '%Y%m%d%H%%M%S'
+      desc 'Check for pending migrations and load the test schema'
+      task :prepare => ["db:#{sub_namespace_with_separator}abort_if_pending_migrations", "db:#{sub_namespace_with_separator}test:load"]
+    end
 
-        if ENV['model']
-          table_name = ENV['model']
-        else
-          print 'model name> '
-          table_name = $stdin.gets.strip
-        end
+    desc 'generate a model=name field="field1:type field2:type"'
+    task :generate do
+      ts = Time.now.strftime '%Y%m%d%H%%M%S'
+
+      if ENV['model']
+        table_name = ENV['model']
+      else
+        print 'model name> '
+        table_name = $stdin.gets.strip
+      end
 
-        raise ArgumentError, 'must provide a name for the model to generate' if table_name.empty?
+      raise ArgumentError, 'must provide a name for the model to generate' if table_name.empty?
 
-        create_table_str = "create_table :#{table_name} do |t|"
+      create_table_str = "create_table :#{table_name} do |t|"
 
-        fields = ENV['fields'] if ENV['fields']
+      fields = ENV['fields'] if ENV['fields']
 
-        columns = ENV.has_key?('fields') ? ENV['fields'].split.map { |v| "t.#{v.sub(/:/, ' :')}" }.join("\n#{' '*6}") : nil
+      columns = ENV.has_key?('fields') ? ENV['fields'].split.map { |v| "t.#{v.sub(/:/, ' :')}" }.join("\n#{' '*6}") : nil
 
-        create_table_str << "\n      #{columns}" if columns
+      create_table_str << "\n      #{columns}" if columns
 
-        contents = <<-MIGRATION
+      contents = <<-MIGRATION
 class Create#{class_name table_name} < ActiveRecord::Migration
   def self.up
     #{create_table_str}   
@@ -305,18 +319,18 @@ class Create#{class_name table_name} < ActiveRecord::Migration
 end
         MIGRATION
 
-        create_file @migrations.first, file_name("create_#{table_name}"), contents
-      end
+      create_file @migrations.first, file_name("create_#{table_name}"), contents
+    end
 
-      desc "Create a new migration"
-      task :new_migration do |t|
-        unless migration = ENV['name']
-          puts "Error: must provide name of migration to generate."
-          puts "For example: rake #{t.name} name=add_field_to_form"
-          abort
-        end
+    desc "Create a new migration"
+    task :new_migration do |t|
+      unless migration = ENV['name']
+        puts "Error: must provide name of migration to generate."
+        puts "For example: rake #{t.name} name=add_field_to_form"
+        abort
+      end
 
-        file_contents = <<eof
+      file_contents = <<eof
 class #{class_name migration} < ActiveRecord::Migration
   def self.up
   end
@@ -327,10 +341,9 @@ class #{class_name migration} < ActiveRecord::Migration
 end
 eof
 
-        create_file @migrations.first, file_name(migration), file_contents
+      create_file @migrations.first, file_name(migration), file_contents
 
-        puts "Created migration #{file_name migration}"
-      end
+      puts "Created migration #{file_name migration}"
     end
   end
 

data/spec/standalone_migrations_spec.rb

@@ -28,8 +28,9 @@ describe 'Standalone migrations' do
     `cd spec/tmp && #{cmd} 2>&1`
   end
 
-  def make_migration(name)
-    migration = run("rake db:new_migration name=#{name}").match(%r{db/migrations/\d+.*.rb})[0]
+  def make_migration(name, options={})
+    task_name = options[:task_name] || 'db:new_migration'
+    migration = run("rake #{task_name} name=#{name}").match(%r{db/migrations/\d+.*.rb})[0]
     content = read(migration)
     content.sub!(/def self.down.*?\send/m, "def self.down;puts 'DOWN-#{name}';end")
     content.sub!(/def self.up.*?\send/m, "def self.up;puts 'UP-#{name}';end")
@@ -37,6 +38,11 @@ describe 'Standalone migrations' do
     migration.match(/\d{14}/)[0]
   end
 
+  def make_sub_namespaced_migration(namespace, name)
+    # specify complete task name here to avoid conditionals in make_migration
+    make_migration(name, :task_name => "db:#{namespace}:new_migration")
+  end
+
   def write_rakefile(config=nil)
     write 'Rakefile', <<-TXT
       $LOAD_PATH.unshift '#{File.expand_path('lib')}'
@@ -119,6 +125,24 @@ end
         run("rake db:new_migration name=test_abc").should =~ %r{Created migration .*db/migrations/\d+_test_abc\.rb}
       end
     end
+
+    context 'sub-namespaced task' do
+      before do
+        write_rakefile %{t.sub_namespace = "widgets"}
+      end
+      it "fails if i do not add a name" do
+        run("rake db:widgets:new_migration").should_not =~ /SUCCESS/
+      end
+
+      it "generates a new migration with this name and timestamp" do
+        run("rake db:widgets:new_migration name=test_widget").should =~ %r{Created migration .*spec/tmp/db/migrations/\d+_test_widget\.rb}
+        run("ls db/migrations").should =~ /^\d+_test_widget.rb$/
+      end
+
+      it 'does not create top level db:new_migration task' do
+        run('rake db:new_migration').should =~ /Don't know how to build task 'db:new_migration'/
+      end
+    end
   end
 
   describe 'db:version' do
@@ -151,6 +175,22 @@ end
         result.should =~ /Migrating to CreateTests2 \(2010/
       end
     end
+
+    context 'sub-namespaced task' do
+      before do
+        write_rakefile %{t.sub_namespace = "widgets"}
+      end
+      it 'runs the migrations' do
+        run("rake db:widgets:new_migration name=new_widget")
+        result = run("rake db:widgets:migrate")
+        result.should =~ /SUCCESS/
+        result.should =~ /Migrating to NewWidget \(#{Time.now.year}/
+      end
+
+      it 'does not create top level db:new_migration task' do
+        run('rake db:migrate').should =~ /Don't know how to build task 'db:migrate'/
+      end
+    end
   end
 
   describe 'db:migrate:down' do
@@ -193,6 +233,23 @@ end
         result.should =~ /wasn't found on path/
       end
     end
+
+    context 'sub-namespaced task' do
+      before do
+        write_rakefile %{t.sub_namespace = "widgets"}
+      end
+      it 'migrates down' do
+        make_sub_namespaced_migration('widgets', 'widget_xxx')
+        sleep 1
+        version = make_sub_namespaced_migration('widgets', 'widget_yyy')
+        run 'rake db:widgets:migrate'
+
+        result = run("rake db:widgets:migrate:down VERSION=#{version}")
+        result.should =~ /SUCCESS/
+        result.should_not =~ /DOWN-widget_xxx/
+        result.should =~ /DOWN-widget_yyy/
+      end
+    end
   end
 
   describe 'db:migrate:up' do
@@ -232,6 +289,22 @@ end
         result.should =~ /wasn't found on path/
       end
     end
+
+    context 'sub-namespaced task' do
+      before do
+        write_rakefile %{t.sub_namespace = "widgets"}
+      end
+      it 'migrates up' do
+        make_sub_namespaced_migration('widgets', 'widget_xxx')
+        run 'rake db:widgets:migrate'
+        sleep 1
+        version = make_sub_namespaced_migration('widgets', 'widget_yyy')
+        result = run("rake db:widgets:migrate:up VERSION=#{version}")
+        result.should =~ /SUCCESS/
+        result.should_not =~ /UP-widget_xxx/
+        result.should =~ /UP-widget_yyy/
+      end
+    end
   end
 
   describe 'schema:dump' do

data/standalone_migrations.gemspec

@@ -5,11 +5,11 @@
 
 Gem::Specification.new do |s|
   s.name = %q{standalone_migrations}
-  s.version = "0.4.5"
+  s.version = "0.4.7"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["Todd Huss", "Michael Grosser"]
-  s.date = %q{2011-04-01}
+  s.date = %q{2011-04-19}
   s.email = %q{thuss@gabrito.com}
   s.extra_rdoc_files = [
     "README.markdown"
@@ -28,13 +28,14 @@ Gem::Specification.new do |s|
   ]
   s.homepage = %q{http://github.com/thuss/standalone-migrations}
   s.require_paths = ["lib"]
-  s.rubygems_version = %q{1.6.2}
+  s.rubygems_version = %q{1.3.7}
   s.summary = %q{A thin wrapper to use Rails Migrations in non Rails projects}
   s.test_files = [
     "spec/standalone_migrations_spec.rb"
   ]
 
   if s.respond_to? :specification_version then
+    current_version = Gem::Specification::CURRENT_SPECIFICATION_VERSION
     s.specification_version = 3
 
     if Gem::Version.new(Gem::VERSION) >= Gem::Version.new('1.2.0') then

metadata

@@ -1,8 +1,12 @@
 --- !ruby/object:Gem::Specification 
 name: standalone_migrations
 version: !ruby/object:Gem::Version 
-  prerelease: 
-  version: 0.4.5
+  prerelease: false
+  segments: 
+  - 0
+  - 4
+  - 7
+  version: 0.4.7
 platform: ruby
 authors: 
 - Todd Huss
@@ -11,7 +15,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2011-04-01 00:00:00 -07:00
+date: 2011-04-19 00:00:00 -07:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -22,6 +26,8 @@ dependencies:
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
+        segments: 
+        - 0
         version: "0"
   type: :runtime
   version_requirements: *id001
@@ -33,6 +39,8 @@ dependencies:
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
+        segments: 
+        - 0
         version: "0"
   type: :runtime
   version_requirements: *id002
@@ -69,17 +77,21 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements: 
   - - ">="
     - !ruby/object:Gem::Version 
+      segments: 
+      - 0
       version: "0"
 required_rubygems_version: !ruby/object:Gem::Requirement 
   none: false
   requirements: 
   - - ">="
     - !ruby/object:Gem::Version 
+      segments: 
+      - 0
       version: "0"
 requirements: []
 
 rubyforge_project: 
-rubygems_version: 1.6.2
+rubygems_version: 1.3.7
 signing_key: 
 specification_version: 3
 summary: A thin wrapper to use Rails Migrations in non Rails projects