dm-migrations 1.0.0 → 1.0.1

data/.gitignore

@@ -31,6 +31,7 @@ measurements
 .bundle
 Gemfile.local
 Gemfile.lock
+Gemfile.local.lock
 
 ## PROJECT::SPECIFIC
 spec/db/

data/Gemfile

@@ -71,14 +71,14 @@
 source 'http://rubygems.org'
 
 DATAMAPPER = 'git://github.com/datamapper'
-DM_VERSION = '~> 1.0.0'
+DM_VERSION = '~> 1.0.1'
 
 group :runtime do # Runtime dependencies (as in the gemspec)
 
   if ENV['EXTLIB']
-    gem 'extlib',        '~> 0.9.15',      :git => "#{DATAMAPPER}/extlib.git"
+    gem 'extlib',        '~> 0.9.15', :git => "#{DATAMAPPER}/extlib.git"
   else
-    gem 'activesupport', '~> 3.0.0.beta3', :git => 'git://github.com/rails/rails.git', :require => nil
+    gem 'activesupport', '~> 3.0.0',  :git => 'git://github.com/rails/rails.git', :branch => '3-0-stable', :require => nil
   end
 
   gem 'dm-core', DM_VERSION, :git => "#{DATAMAPPER}/dm-core.git"
@@ -88,7 +88,7 @@ end
 group(:development) do # Development dependencies (as in the gemspec)
 
   gem 'rake',           '~> 0.8.7'
-  gem 'rspec',          '~> 1.3'
+  gem 'rspec',          '~> 1.3', :git => 'git://github.com/snusnu/rspec', :branch => 'heckle_fix_plus_gemfile'
   gem 'jeweler',        '~> 1.4'
 
 end
@@ -107,32 +107,31 @@ end
 group :datamapper do # We need this because we want to pin these dependencies to their git master sources
 
   adapters = ENV['ADAPTER'] || ENV['ADAPTERS']
-  adapters = adapters.to_s.gsub(',',' ').split(' ') - ['in_memory']
+  adapters = adapters.to_s.tr(',', ' ').split.uniq - %w[ in_memory ]
 
-  unless adapters.empty?
+  DO_VERSION     = '~> 0.10.2'
+  DM_DO_ADAPTERS = %w[ sqlite postgres mysql oracle sqlserver ]
 
-    DO_VERSION     = '~> 0.10.3'
-    DM_DO_ADAPTERS = %w[sqlite postgres mysql oracle sqlserver]
+  if (do_adapters = DM_DO_ADAPTERS & adapters).any?
+    options = {}
+    options[:git] = "#{DATAMAPPER}/do.git" if ENV['DO_GIT'] == 'true'
 
-    gem 'data_objects',  DO_VERSION, :git => "#{DATAMAPPER}/do.git"
+    gem 'data_objects',  DO_VERSION, options.dup
 
-    adapters.each do |adapter|
-      if DM_DO_ADAPTERS.any? { |dm_do_adapter| dm_do_adapter =~ /#{adapter}/  }
-        adapter = 'sqlite3' if adapter == 'sqlite'
-        gem "do_#{adapter}", DO_VERSION, :git => "#{DATAMAPPER}/do.git"
-      end
+    do_adapters.each do |adapter|
+      adapter = 'sqlite3' if adapter == 'sqlite'
+      gem "do_#{adapter}", DO_VERSION, options.dup
     end
 
     gem 'dm-do-adapter', DM_VERSION, :git => "#{DATAMAPPER}/dm-do-adapter.git"
+  end
 
-    adapters.each do |adapter|
-      gem "dm-#{adapter}-adapter", DM_VERSION, :git => "#{DATAMAPPER}/dm-#{adapter}-adapter.git"
-    end
-
+  adapters.each do |adapter|
+    gem "dm-#{adapter}-adapter", DM_VERSION, :git => "#{DATAMAPPER}/dm-#{adapter}-adapter.git"
   end
 
   plugins = ENV['PLUGINS'] || ENV['PLUGIN']
-  plugins = (plugins.to_s.gsub(',',' ').split(' ') + ['dm-migrations']).uniq
+  plugins = plugins.to_s.tr(',', ' ').split.uniq
 
   plugins.each do |plugin|
     gem plugin, DM_VERSION, :git => "#{DATAMAPPER}/#{plugin}.git"

data/Rakefile

@@ -15,7 +15,7 @@ begin
 
     gem.rubyforge_project = 'datamapper'
 
-    gem.add_dependency 'dm-core', '~> 1.0.0'
+    gem.add_dependency 'dm-core', '~> 1.0.1'
 
     gem.add_development_dependency 'rspec', '~> 1.3'
   end

data/VERSION

@@ -1 +1 @@
-1.0.0
+1.0.1

data/dm-migrations.gemspec

@@ -5,11 +5,11 @@
 
 Gem::Specification.new do |s|
   s.name = %q{dm-migrations}
-  s.version = "1.0.0"
+  s.version = "1.0.1"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["Paul Sadauskas"]
-  s.date = %q{2010-06-08}
+  s.date = %q{2010-09-07}
   s.description = %q{DataMapper plugin for writing and speccing migrations}
   s.email = %q{psadauskas [a] gmail [d] com}
   s.extra_rdoc_files = [
@@ -38,6 +38,7 @@ Gem::Specification.new do |s|
      "lib/dm-migrations/adapters/dm-sqlserver-adapter.rb",
      "lib/dm-migrations/adapters/dm-yaml-adapter.rb",
      "lib/dm-migrations/auto_migration.rb",
+     "lib/dm-migrations/exceptions/duplicate_migration.rb",
      "lib/dm-migrations/migration.rb",
      "lib/dm-migrations/migration_runner.rb",
      "lib/dm-migrations/sql.rb",
@@ -107,14 +108,14 @@ Gem::Specification.new do |s|
     s.specification_version = 3
 
     if Gem::Version.new(Gem::VERSION) >= Gem::Version.new('1.2.0') then
-      s.add_runtime_dependency(%q<dm-core>, ["~> 1.0.0"])
+      s.add_runtime_dependency(%q<dm-core>, ["~> 1.0.1"])
       s.add_development_dependency(%q<rspec>, ["~> 1.3"])
     else
-      s.add_dependency(%q<dm-core>, ["~> 1.0.0"])
+      s.add_dependency(%q<dm-core>, ["~> 1.0.1"])
       s.add_dependency(%q<rspec>, ["~> 1.3"])
     end
   else
-    s.add_dependency(%q<dm-core>, ["~> 1.0.0"])
+    s.add_dependency(%q<dm-core>, ["~> 1.0.1"])
     s.add_dependency(%q<rspec>, ["~> 1.3"])
   end
 end

data/lib/dm-migrations/adapters/dm-do-adapter.rb

@@ -126,7 +126,7 @@ module DataMapper
 
         # @api private
         def alter_table_add_column_statement(connection, table_name, schema_hash)
-          "ALTER TABLE #{quote_name(table_name)} ADD COLUMN #{property_schema_statement(connection, schema_hash)}"
+          "ALTER TABLE #{quote_name(table_name)} #{add_column_statement} #{property_schema_statement(connection, schema_hash)}"
         end
 
         # @api private
@@ -204,11 +204,7 @@ module DataMapper
             # remove the default if the property does not allow nil
             schema.delete(:default) unless schema[:allow_nil]
           else
-            schema[:default] = if type.respond_to?(:dump)
-              type.dump(default, property)
-            else
-              default
-            end
+            schema[:default] = property.dump(default)
           end
 
           schema
@@ -243,6 +239,11 @@ module DataMapper
         def unique_indexes(model)
           model.properties(name).unique_indexes
         end
+
+        # @api private
+        def add_column_statement
+          'ADD COLUMN'
+        end
       end # module SQL
 
       include SQL

data/lib/dm-migrations/adapters/dm-oracle-adapter.rb

@@ -256,6 +256,11 @@ module DataMapper
           "#{table_name[0,self.class::IDENTIFIER_MAX_LENGTH-4]}_pkt"
         end
 
+        # @api private
+        def add_column_statement
+          'ADD'
+        end
+
       end # module SQL
 
       include SQL

data/lib/dm-migrations/auto_migration.rb

@@ -187,7 +187,7 @@ module DataMapper
       end
       DataMapper::Model.append_extensions(Model)
       Adapters::AbstractAdapter.descendants.each do |adapter_class|
-        Adapters.include_migration_api(ActiveSupport::Inflector.demodulize(adapter_class.name))
+        Adapters.include_migration_api(DataMapper::Inflector.demodulize(adapter_class.name))
       end
     end
 

data/lib/dm-migrations/exceptions/duplicate_migration.rb

@@ -0,0 +1,6 @@
+module DataMapper
+  module Migrations
+    class DuplicateMigration < StandardError
+    end
+  end
+end

data/lib/dm-migrations/migration.rb

@@ -1,40 +1,84 @@
-require 'benchmark'
-
+require 'dm-migrations/exceptions/duplicate_migration'
 require 'dm-migrations/sql'
 
-module DataMapper
-  class DuplicateMigrationNameError < StandardError
-    def initialize(migration)
-      super("Duplicate Migration Name: '#{migration.name}', version: #{migration.position}")
-    end
-  end
+require 'benchmark'
 
+module DataMapper
   class Migration
     include SQL
 
-    attr_accessor :position, :name, :database, :adapter
-
-    def initialize( position, name, opts = {}, &block )
-      @position, @name = position, name
-      @options = opts
-
-      @database = DataMapper.repository(@options[:database] || :default)
-      @adapter = @database.adapter
-
-      case @adapter.class.to_s
-      when /Sqlite/   then @adapter.extend(SQL::Sqlite)
-      when /Mysql/    then @adapter.extend(SQL::Mysql)
-      when /Postgres/ then @adapter.extend(SQL::Postgres)
+    # The position or version the migration belongs to
+    attr_reader :position
+
+    # The name of the migration
+    attr_reader :name
+
+    # The repository the migration operates on
+    attr_reader :repository
+
+    #
+    # Creates a new migration.
+    #
+    # @param [Symbol, String, Integer] position
+    #   The position or version the migration belongs to.
+    #
+    # @param [Symbol] name
+    #   The name of the migration.
+    #
+    # @param [Hash] options
+    #   Additional options for the migration.
+    #
+    # @option options [Boolean] :verbose (true)
+    #   Enables or disables verbose output.
+    #
+    # @option options [Symbol] :repository (:default)
+    #   The DataMapper repository the migration will operate on.
+    #
+    def initialize(position, name, options = {}, &block)
+      @position    = position
+      @name        = name
+      @options     = options
+      @verbose     = options.fetch(:verbose, true)
+      @up_action   = nil
+      @down_action = nil
+
+      @repository = if options.key?(:database)
+        warn 'Using the :database option with migrations is deprecated, use :repository instead'
+        options[:database]
       else
-        raise "Unsupported Migration Adapter #{@adapter.class}"
+        options.fetch(:repository, :default)
       end
 
-      @verbose = @options.has_key?(:verbose) ? @options[:verbose] : true
+      instance_eval(&block)
+    end
 
-      @up_action   = lambda {}
-      @down_action = lambda {}
+    #
+    # The repository the migration will operate on.
+    #
+    # @return [Symbol, nil]
+    #   The name of the DataMapper repository the migration will run against.
+    #
+    # @deprecated Use {#repository} instead.
+    #
+    # @since 1.0.1.
+    #
+    def database
+      warn "Using the DataMapper::Migration#database method is deprecated, use #repository instead"
+      @repository
+    end
 
-      instance_eval &block
+    #
+    # The adapter the migration will use.
+    #
+    # @return [DataMapper::Adapter]
+    #   The adapter the migration will operate on.
+    #
+    # @since 1.0.1
+    #
+    def adapter
+      setup! unless setup?
+
+      @adapter
     end
 
     # define the actions that should be performed on an up migration
@@ -50,50 +94,60 @@ module DataMapper
     # perform the migration by running the code in the #up block
     def perform_up
       result = nil
+
       if needs_up?
         # TODO: fix this so it only does transactions for databases that support create/drop
         # database.transaction.commit do
+        if @up_action
           say_with_time "== Performing Up Migration ##{position}: #{name}", 0 do
             result = @up_action.call
           end
-          update_migration_info(:up)
+        end
+
+        update_migration_info(:up)
         # end
       end
+
       result
     end
 
     # un-do the migration by running the code in the #down block
     def perform_down
       result = nil
+
       if needs_down?
         # TODO: fix this so it only does transactions for databases that support create/drop
         # database.transaction.commit do
+        if @down_action
           say_with_time "== Performing Down Migration ##{position}: #{name}", 0 do
             result = @down_action.call
           end
-          update_migration_info(:down)
+        end
+
+        update_migration_info(:down)
         # end
       end
+
       result
     end
 
     # execute raw SQL
     def execute(sql, *bind_values)
       say_with_time(sql) do
-        @adapter.execute(sql, *bind_values)
+        adapter.execute(sql, *bind_values)
       end
     end
 
     def create_table(table_name, opts = {}, &block)
-      execute TableCreator.new(@adapter, table_name, opts, &block).to_sql
+      execute TableCreator.new(adapter, table_name, opts, &block).to_sql
     end
 
     def drop_table(table_name, opts = {})
-      execute "DROP TABLE #{@adapter.send(:quote_name, table_name.to_s)}"
+      execute "DROP TABLE #{adapter.send(:quote_name, table_name.to_s)}"
     end
 
     def modify_table(table_name, opts = {}, &block)
-      TableModifier.new(@adapter, table_name, opts, &block).statements.each do |sql|
+      TableModifier.new(adapter, table_name, opts, &block).statements.each do |sql|
         execute(sql)
       end
     end
@@ -177,7 +231,7 @@ module DataMapper
     # Fetch the record for this migration out of the migration_info table
     def migration_record
       return [] unless migration_info_table_exists?
-      @adapter.select("SELECT #{migration_name_column} FROM #{migration_info_table} WHERE #{migration_name_column} = #{quoted_name}")
+      adapter.select("SELECT #{migration_name_column} FROM #{migration_info_table} WHERE #{migration_name_column} = #{quoted_name}")
     end
 
     # True if the migration needs to be run
@@ -204,12 +258,43 @@ module DataMapper
 
     def quote_table_name(table_name)
       # TODO: Fix this for 1.9 - can't use this hack to access a private method
-      @adapter.send(:quote_name, table_name.to_s)
+      adapter.send(:quote_name, table_name.to_s)
     end
 
     def quote_column_name(column_name)
       # TODO: Fix this for 1.9 - can't use this hack to access a private method
-      @adapter.send(:quote_name, column_name.to_s)
+      adapter.send(:quote_name, column_name.to_s)
+    end
+
+    protected
+
+    #
+    # Determines whether the migration has been setup.
+    #
+    # @return [Boolean]
+    #   Specifies whether the migration has been setup.
+    #
+    # @since 1.0.1
+    #
+    def setup?
+      !(@adapter.nil?)
+    end
+
+    #
+    # Sets up the migration.
+    #
+    # @since 1.0.1
+    #
+    def setup!
+      @adapter = DataMapper.repository(@repository).adapter
+
+      case @adapter.class.name
+      when /Sqlite/   then @adapter.extend(SQL::Sqlite)
+      when /Mysql/    then @adapter.extend(SQL::Mysql)
+      when /Postgres/ then @adapter.extend(SQL::Postgres)
+      else
+        raise(RuntimeError,"Unsupported Migration Adapter #{@adapter.class}",caller)
+      end
     end
   end
 end

data/lib/dm-migrations/sql/table_creator.rb

@@ -1,5 +1,10 @@
+require 'dm-core'
+
 module SQL
   class TableCreator
+
+    extend DataMapper::Property::Lookup
+
     attr_accessor :table_name, :opts
 
     def initialize(adapter, table_name, opts = {}, &block)

data/spec/integration/auto_migration_spec.rb

@@ -15,6 +15,17 @@ describe DataMapper::Migrations do
     mod.logger = original
   end
 
+  before :all do
+    class DataMapper::Property::NumericString < DataMapper::Property::String
+      default 0
+
+      def dump(value)
+        return if value.nil?
+        value.to_s
+      end
+    end
+  end
+
   supported_by :mysql do
     before :all do
       module ::Blog
@@ -197,10 +208,12 @@ describe DataMapper::Migrations do
 
             options.only(:min, :max).each do |key, value|
               it "should allow the #{key} value #{value} to be stored" do
-                lambda {
-                  resource = @model.create(@property => value)
-                  @model.first(@property => value).should eql(resource)
-                }.should_not raise_error
+                pending_if "#{value} causes problem with JRuby 1.5.2 parser", RUBY_ENGINE == 'jruby' && value == -9223372036854775808 do
+                  lambda {
+                    resource = @model.create(@property => value)
+                    @model.first(@property => value).should eql(resource)
+                  }.should_not raise_error
+                end
               end
             end
           end
@@ -230,7 +243,7 @@ describe DataMapper::Migrations do
 
           describe "with a length of #{length}" do
             before :all do
-              @property = @model.property(:body, DataMapper::Types::Text, options)
+              @property = @model.property(:body, DataMapper::Property::Text, options)
 
               @response = capture_log(DataObjects::Mysql) { @model.auto_migrate! }
             end
@@ -277,6 +290,19 @@ describe DataMapper::Migrations do
           end
         end
       end
+
+      describe 'NumericString property' do
+        before :all do
+          @model.property(:id,     DataMapper::Property::Serial)
+          @model.property(:number, DataMapper::Property::NumericString)
+
+          @response = capture_log(DataObjects::Mysql) { @model.auto_migrate! }
+        end
+
+        it "should create a VARCHAR(50) column with a default of '0'" do
+          @output.last.should =~ %r{\ACREATE TABLE `blog_articles` \(`id` INT\(10\) UNSIGNED NOT NULL AUTO_INCREMENT, `number` VARCHAR\(50\) DEFAULT '0', PRIMARY KEY\(`id`\)\) ENGINE = InnoDB CHARACTER SET [a-z\d]+ COLLATE (?:[a-z\d](?:_?[a-z\d]+)*)\z}
+        end
+      end
     end
   end
 
@@ -340,10 +366,12 @@ describe DataMapper::Migrations do
 
             options.only(:min, :max).each do |key, value|
               it "should allow the #{key} value #{value} to be stored" do
-                lambda {
-                  resource = @model.create(@property => value)
-                  @model.first(@property => value).should eql(resource)
-                }.should_not raise_error
+                pending_if "#{value} causes problem with JRuby 1.5.2 parser", RUBY_ENGINE == 'jruby' && value == -9223372036854775808 do
+                  lambda {
+                    resource = @model.create(@property => value)
+                    @model.first(@property => value).should eql(resource)
+                  }.should_not raise_error
+                end
               end
             end
           end
@@ -420,6 +448,19 @@ describe DataMapper::Migrations do
           end
         end
       end
+
+      describe 'NumericString property' do
+        before :all do
+          @model.property(:id,     DataMapper::Property::Serial)
+          @model.property(:number, DataMapper::Property::NumericString)
+
+          @response = capture_log(DataObjects::Postgres) { @model.auto_migrate! }
+        end
+
+        it "should create a VARCHAR(50) column with a default of '0'" do
+          @output[-2].should == "CREATE TABLE \"blog_articles\" (\"id\" SERIAL NOT NULL, \"number\" VARCHAR(50) DEFAULT '0', PRIMARY KEY(\"id\"))"
+        end
+      end
     end
   end
 
@@ -487,10 +528,12 @@ describe DataMapper::Migrations do
 
             options.only(:min, :max).each do |key, value|
               it "should allow the #{key} value #{value} to be stored" do
-                lambda {
-                  resource = @model.create(@property => value)
-                  @model.first(@property => value).should eql(resource)
-                }.should_not raise_error
+                pending_if "#{value} causes problem with JRuby 1.5.2 parser", RUBY_ENGINE == 'jruby' && value == -9223372036854775808 do
+                  lambda {
+                    resource = @model.create(@property => value)
+                    @model.first(@property => value).should eql(resource)
+                  }.should_not raise_error
+                end
               end
             end
           end

data/spec/integration/migration_spec.rb

@@ -16,24 +16,30 @@ describe "A Migration" do
 
       it "should have a postition attribute" do
         @migration.should respond_to(:position)
-        @migration.should respond_to(:position=)
+
         @migration.position.should == 1
       end
 
       it "should have a name attribute" do
         @migration.should respond_to(:name)
-        @migration.should respond_to(:name=)
+
         @migration.name.should == :create_people_table
       end
 
-      it "should have a :database option" do
-        adapter = DataMapper::Spec.adapter(:alternate)
-        m = DataMapper::Migration.new(2, :create_dogs_table, :database => :alternate) {}
-        m.instance_variable_get(:@adapter).should == adapter
+      it "should have a :repository option" do
+        m = DataMapper::Migration.new(2, :create_dogs_table, :repository => :alternate) {}
+
+        m.instance_variable_get(:@repository).should == :alternate
+      end
+
+      it "should use the default repository by default" do
+        @migration.instance_variable_get(:@repository).should == :default
       end
 
-      it "should use the default database by default" do
-        @migration.instance_variable_get(:@database).name.should == :default
+      it "should still support a :database option" do
+        m = DataMapper::Migration.new(2, :create_legacy_table, :database => :legacy) {}
+
+        m.instance_variable_get(:@repository).should == :legacy
       end
 
       it "should have a verbose option" do

data/spec/spec_helper.rb

@@ -4,10 +4,12 @@ require 'dm-migrations/migration_runner'
 require 'dm-core/spec/setup'
 require 'dm-core/spec/lib/adapter_helpers'
 require 'dm-core/spec/lib/spec_helper'
+require 'dm-core/spec/lib/pending_helpers'
 
 Spec::Runner.configure do |config|
 
   config.extend(DataMapper::Spec::Adapters::Helpers)
+  config.include(DataMapper::Spec::PendingHelpers)
 
   config.after :all do
     DataMapper::Spec.cleanup_models

data/spec/unit/migration_spec.rb

@@ -29,31 +29,16 @@ describe 'Migration' do
         @m.instance_variable_get(:@options).should == {}
       end
 
-      it 'should set @database from the default repository if no :database option is given' do
-        DataMapper.should_receive(:repository).with(:default).and_return(@repo)
-        DataMapper::Migration.new(1, :do_nothing, {}) {}
-      end
+      it 'should set @repository from the default repository if no :repository option is given' do
+        m = DataMapper::Migration.new(1, :do_nothing, {}) {}
 
-      it 'should set @database to the repository specified with the :database option' do
-        DataMapper.should_receive(:repository).with(:foobar).and_return(@repo)
-        DataMapper::Migration.new(1, :do_nothing, :database => :foobar) {}
+        m.instance_variable_get(:@repository).should == :default
       end
 
-      it 'should determine the class of the adapter to be extended' do
-        @adapter.should_receive(:class).and_return(DataMapper::Spec.adapter.class)
-        DataMapper::Migration.new(1, :do_nothing, {}) {}
-      end
-
-      it 'should extend the adapter with the right module' do
-        @adapter.should_receive(:extend).with(SQL.const_get(DataMapper::Spec.adapter_name.capitalize))
-        DataMapper::Migration.new(1, :do_nothing, {}) {}
-      end
+      it 'should set @repository to the specified :repository option' do
+        m = DataMapper::Migration.new(1, :do_nothing, :repository => :foobar) {}
 
-      it 'should raise "Unsupported adapter" on an unknown adapter' do
-        @adapter.should_receive(:class).any_number_of_times.and_return("InvalidAdapter")
-        lambda {
-          DataMapper::Migration.new(1, :do_nothing, {}) {}
-        }.should raise_error
+        m.instance_variable_get(:@repository).should == :foobar
       end
 
       it 'should set @verbose from the options hash' do
@@ -65,12 +50,12 @@ describe 'Migration' do
         @m.instance_variable_get(:@verbose).should be(true)
       end
 
-      it 'should set the @up_action to an empty block' do
-        @m.instance_variable_get(:@up_action).should be_kind_of(Proc)
+      it 'should set the @up_action to nil' do
+        @m.instance_variable_get(:@up_action).should be_nil
       end
 
-      it 'should set the @down_action to an empty block' do
-        @m.instance_variable_get(:@down_action).should be_kind_of(Proc)
+      it 'should set the @down_action to nil' do
+        @m.instance_variable_get(:@down_action).should be_nil
       end
 
       it 'should evaluate the given block'
@@ -89,6 +74,30 @@ describe 'Migration' do
       @m.instance_variable_get(:@down_action).should == action
     end
 
+    describe 'adapter' do
+      before(:each) do
+        @m.instance_variable_set(:@adapter, nil)
+      end
+
+      it 'should determine the class of the adapter to be extended' do
+        @adapter.should_receive(:class).and_return(DataMapper::Spec.adapter.class)
+
+        @m.adapter
+      end
+
+      it 'should extend the adapter with the right module' do
+        @adapter.should_receive(:extend).with(SQL.const_get(DataMapper::Spec.adapter_name.capitalize))
+
+        @m.adapter
+      end
+
+      it 'should raise "Unsupported adapter" on an unknown adapter' do
+        @adapter.should_receive(:class).any_number_of_times.and_return("InvalidAdapter")
+
+        lambda { @m.adapter }.should raise_error
+      end
+    end
+
     describe 'perform_up' do
       before do
         @up_action = mock('proc', :call => true)

data/tasks/local_gemfile.rake

@@ -1,16 +1,14 @@
 desc "Support bundling from local source code (allows BUNDLE_GEMFILE=Gemfile.local bundle foo)"
 task :local_gemfile do |t|
 
-  root              = Pathname(__FILE__).dirname.parent
-  datamapper        = root.parent
-
-  source_regex     = /DATAMAPPER = 'git:\/\/github.com\/datamapper'/
-  gem_source_regex = /:git => \"#\{DATAMAPPER\}\/(.+?)(?:\.git)?\"/
+  root       = Pathname(__FILE__).dirname.parent
+  datamapper = root.parent
 
   root.join('Gemfile.local').open('w') do |f|
     root.join('Gemfile').open.each do |line|
-      line.sub!(source_regex,     "DATAMAPPER = '#{datamapper}'")
-      line.sub!(gem_source_regex, ':path => "#{DATAMAPPER}/\1"')
+      line.sub!(/DATAMAPPER = 'git:\/\/github.com\/datamapper'/, "DATAMAPPER = '#{datamapper}'")
+      line.sub!(/:git => \"#\{DATAMAPPER\}\/(.+?)(?:\.git)?\"/,  ':path => "#{DATAMAPPER}/\1"')
+      line.sub!(/do_options\[:git\] = \"#\{DATAMAPPER\}\/(.+?)(?:\.git)?\"/,  'do_options[:path] = "#{DATAMAPPER}/\1"')
       f.puts line
     end
   end

metadata

@@ -1,13 +1,12 @@
 --- !ruby/object:Gem::Specification 
 name: dm-migrations
 version: !ruby/object:Gem::Version 
-  hash: 23
   prerelease: false
   segments: 
   - 1
   - 0
-  - 0
-  version: 1.0.0
+  - 1
+  version: 1.0.1
 platform: ruby
 authors: 
 - Paul Sadauskas
@@ -15,7 +14,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-06-08 00:00:00 -07:00
+date: 2010-09-07 00:00:00 -07:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -26,12 +25,11 @@ dependencies:
     requirements: 
     - - ~>
       - !ruby/object:Gem::Version 
-        hash: 23
         segments: 
         - 1
         - 0
-        - 0
-        version: 1.0.0
+        - 1
+        version: 1.0.1
   type: :runtime
   version_requirements: *id001
 - !ruby/object:Gem::Dependency 
@@ -42,7 +40,6 @@ dependencies:
     requirements: 
     - - ~>
       - !ruby/object:Gem::Version 
-        hash: 9
         segments: 
         - 1
         - 3
@@ -80,6 +77,7 @@ files:
 - lib/dm-migrations/adapters/dm-sqlserver-adapter.rb
 - lib/dm-migrations/adapters/dm-yaml-adapter.rb
 - lib/dm-migrations/auto_migration.rb
+- lib/dm-migrations/exceptions/duplicate_migration.rb
 - lib/dm-migrations/migration.rb
 - lib/dm-migrations/migration_runner.rb
 - lib/dm-migrations/sql.rb
@@ -130,7 +128,6 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements: 
   - - ">="
     - !ruby/object:Gem::Version 
-      hash: 3
       segments: 
       - 0
       version: "0"
@@ -139,7 +136,6 @@ required_rubygems_version: !ruby/object:Gem::Requirement
   requirements: 
   - - ">="
     - !ruby/object:Gem::Version 
-      hash: 3
       segments: 
       - 0
       version: "0"