dm-migrations 1.0.2 → 1.1.0.rc1

data/Gemfile

@@ -1,110 +1,42 @@
-# If you're working on more than one datamapper gem at a time, then it's
-# recommended to create a local Gemfile and use this instead of the git
-# sources. This will make sure that you are  developing against your
-# other local datamapper sources that you currently work on. Gemfile.local
-# will behave identically to the standard Gemfile apart from the fact that
-# it fetches the datamapper gems from local paths. This means that you can use
-# the same environment variables, like ADAPTER(S) or PLUGIN(S) when running
-# bundle commands. Gemfile.local is added to .gitignore, so you don't need to
-# worry about accidentally checking local development paths into git.
-# In order to create a local Gemfile, all you need to do is run:
-#
-#   bundle exec rake local_gemfile
-#
-# This will give you a Gemfile.local file that points to your local clones of
-# the various datamapper gems. It's assumed that all datamapper repo clones
-# reside in the same directory. You can use the Gemfile.local like so for
-# running any bundle command:
-#
-#   BUNDLE_GEMFILE=Gemfile.local bundle foo
-#
-# You can also specify which adapter(s) should be part of the bundle by setting
-# an environment variable. This of course also works when using the Gemfile.local
-#
-#   bundle foo                        # dm-sqlite-adapter
-#   ADAPTER=mysql bundle foo          # dm-mysql-adapter
-#   ADAPTERS=sqlite,mysql bundle foo  # dm-sqlite-adapter and dm-mysql-adapter
-#
-# Of course you can also use the ADAPTER(S) variable when using the Gemfile.local
-# and running specs against selected adapters.
-#
-# For easily working with adapters supported on your machine, it's recommended
-# that you first install all adapters that you are planning to use or work on
-# by doing something like
-#
-#   ADAPTERS=sqlite,mysql,postgres bundle install
-#
-# This will clone the various repositories and make them available to bundler.
-# Once you have them installed you can easily switch between adapters for the
-# various development tasks. Running something like
-#
-#   ADAPTER=mysql bundle exec rake spec
-#
-# will make sure that the dm-mysql-adapter is part of the bundle, and will be used
-# when running the specs.
-#
-# You can also specify which plugin(s) should be part of the bundle by setting
-# an environment variable. This also works when using the Gemfile.local
-#
-#   bundle foo                                 # dm-migrations
-#   PLUGINS=dm-validations bundle foo          # dm-migrations and dm-validations
-#   PLUGINS=dm-validations,dm-types bundle foo # dm-migrations, dm-validations and dm-types
-#
-# Of course you can combine the PLUGIN(S) and ADAPTER(S) env vars to run specs
-# for certain adapter/plugin combinations.
-#
-# Finally, to speed up running specs and other tasks, it's recommended to run
-#
-#   bundle lock
-#
-# after running 'bundle install' for the first time. This will make 'bundle exec' run
-# a lot faster compared to the unlocked version. With an unlocked bundle you would
-# typically just run 'bundle install' from time to time to fetch the latest sources from
-# upstream. When you locked your bundle, you need to run
-#
-#   bundle install --relock
-#
-# to make sure to fetch the latest updates and then lock the bundle again. Gemfile.lock
-# is added to the .gitignore file, so you don't need to worry about accidentally checking
-# it into version control.
+require 'pathname'
 
 source 'http://rubygems.org'
 
-DATAMAPPER = 'git://github.com/datamapper'
-DM_VERSION = '~> 1.0.2'
+SOURCE       = ENV.fetch('SOURCE', :git).to_sym
+REPO_POSTFIX = SOURCE == :path ? ''                                : '.git'
+DATAMAPPER   = SOURCE == :path ? Pathname(__FILE__).dirname.parent : 'http://github.com/datamapper'
+DM_VERSION   = '~> 1.1.0.rc1'
 
-group :runtime do # Runtime dependencies (as in the gemspec)
+group :runtime do
 
   if ENV['EXTLIB']
-    gem 'extlib',        '~> 0.9.15', :git => "#{DATAMAPPER}/extlib.git"
+    gem 'extlib', '~> 0.9.15', SOURCE => "#{DATAMAPPER}/extlib#{REPO_POSTFIX}", :require => nil
   else
-    gem 'activesupport', '~> 3.0.0',  :git => 'git://github.com/rails/rails.git', :branch => '3-0-stable', :require => nil
+    gem 'activesupport', '~> 3.0.4', :require => nil
+    gem 'i18n',          '~> 0.5.0'
   end
 
-  gem 'dm-core', DM_VERSION, :git => "#{DATAMAPPER}/dm-core.git"
+  gem 'dm-core', DM_VERSION, SOURCE => "#{DATAMAPPER}/dm-core#{REPO_POSTFIX}"
 
 end
 
-group(:development) do # Development dependencies (as in the gemspec)
+group :development do
 
-  gem 'rake',           '~> 0.8.7'
-  gem 'rspec',          '~> 1.3', :git => 'git://github.com/snusnu/rspec', :branch => 'heckle_fix_plus_gemfile'
-  gem 'jeweler',        '~> 1.4'
+  gem 'jeweler', '~> 1.5.2'
+  gem 'rake',    '~> 0.8.7'
+  gem 'rspec',   '~> 1.3.1'
 
 end
 
-group :quality do # These gems contain rake tasks that check the quality of the source code
+group :quality do
 
-  gem 'metric_fu',      '~> 1.3'
-  gem 'rcov',           '~> 0.9.8'
-  gem 'reek',           '~> 1.2.8'
-  gem 'roodi',          '~> 2.1'
-  gem 'yard',           '~> 0.5'
-  gem 'yardstick',      '~> 0.1'
+  gem 'rcov',      '~> 0.9.9', :platforms => :mri_18
+  gem 'yard',      '~> 0.6'
+  gem 'yardstick', '~> 0.2'
 
 end
 
-group :datamapper do # We need this because we want to pin these dependencies to their git master sources
+group :datamapper do
 
   adapters = ENV['ADAPTER'] || ENV['ADAPTERS']
   adapters = adapters.to_s.tr(',', ' ').split.uniq - %w[ in_memory ]
@@ -114,27 +46,27 @@ group :datamapper do # We need this because we want to pin these dependencies to
 
   if (do_adapters = DM_DO_ADAPTERS & adapters).any?
     options = {}
-    options[:git] = "#{DATAMAPPER}/do.git" if ENV['DO_GIT'] == 'true'
+    options[:git] = "#{DATAMAPPER}/do#{REPO_POSTFIX}" if ENV['DO_GIT'] == 'true'
 
-    gem 'data_objects',  DO_VERSION, options.dup
+    gem 'data_objects', DO_VERSION, options.dup
 
     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"
+    gem 'dm-do-adapter', DM_VERSION, SOURCE => "#{DATAMAPPER}/dm-do-adapter#{REPO_POSTFIX}"
   end
 
   adapters.each do |adapter|
-    gem "dm-#{adapter}-adapter", DM_VERSION, :git => "#{DATAMAPPER}/dm-#{adapter}-adapter.git"
+    gem "dm-#{adapter}-adapter", DM_VERSION, SOURCE => "#{DATAMAPPER}/dm-#{adapter}-adapter#{REPO_POSTFIX}"
   end
 
   plugins = ENV['PLUGINS'] || ENV['PLUGIN']
   plugins = plugins.to_s.tr(',', ' ').split.uniq
 
   plugins.each do |plugin|
-    gem plugin, DM_VERSION, :git => "#{DATAMAPPER}/#{plugin}.git"
+    gem plugin, DM_VERSION, SOURCE => "#{DATAMAPPER}/#{plugin}#{REPO_POSTFIX}"
   end
 
 end

data/LICENSE

@@ -1,4 +1,4 @@
-Copyright (c) 2010 Paul Sadauskas
+Copyright (c) 2011 Paul Sadauskas
 
 Permission is hereby granted, free of charge, to any person obtaining
 a copy of this software and associated documentation files (the

data/README.rdoc

@@ -1,3 +1,39 @@
 = dm-migrations
 
 DataMapper plugin for writing and specing migrations.
+
+== Example
+
+  require 'dm-migrations/migration_runner'
+
+  DataMapper.setup(:default, "sqlite3::memory")
+
+  DataMapper::Logger.new(STDOUT, :debug)
+  DataMapper.logger.debug( "Starting Migration" )
+
+  migration 1, :create_people_table do
+    up do
+      create_table :people do
+        column :id,   Integer, :serial => true
+        column :desc, String
+      end
+    end
+
+    down do
+      drop_table :people
+    end
+  end
+
+  migration 2, :make_desc_text do
+    up do
+      modify_table :people do
+        # You currently have to use the underlying DB type here, rather than
+        # a DataMapper type
+        change_column :desc, 'text'
+      end
+    end
+  end
+
+  migrate_up!
+
+For more, see the examples directory.

data/Rakefile

@@ -2,7 +2,7 @@ require 'rubygems'
 require 'rake'
 
 begin
-  gem 'jeweler', '~> 1.4'
+  gem 'jeweler', '~> 1.5.2'
   require 'jeweler'
 
   Jeweler::Tasks.new do |gem|
@@ -15,15 +15,11 @@ begin
     gem.has_rdoc    = 'yard'
 
     gem.rubyforge_project = 'datamapper'
-
-    gem.add_dependency 'dm-core', '~> 1.0.2'
-
-    gem.add_development_dependency 'rspec', '~> 1.3'
   end
 
   Jeweler::GemcutterTasks.new
 
   FileList['tasks/**/*.rake'].each { |task| import task }
 rescue LoadError
-  puts 'Jeweler (or a dependency) not available. Install it with: gem install jeweler'
+  puts 'Jeweler (or a dependency) not available. Install it with: gem install jeweler -v 1.5.2'
 end

data/VERSION

@@ -1 +1 @@
-1.0.2
+1.1.0.rc1

data/dm-migrations.gemspec

@@ -1,123 +1,130 @@
 # Generated by jeweler
 # DO NOT EDIT THIS FILE DIRECTLY
-# Instead, edit Jeweler::Tasks in Rakefile, and run the gemspec command
+# Instead, edit Jeweler::Tasks in Rakefile, and run 'rake gemspec'
 # -*- encoding: utf-8 -*-
 
 Gem::Specification.new do |s|
   s.name = %q{dm-migrations}
-  s.version = "1.0.2"
+  s.version = "1.1.0.rc1"
 
-  s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
+  s.required_rubygems_version = Gem::Requirement.new("> 1.3.1") if s.respond_to? :required_rubygems_version=
   s.authors = ["Paul Sadauskas"]
-  s.date = %q{2010-09-07}
+  s.date = %q{2011-02-28}
   s.description = %q{DataMapper plugin for writing and speccing migrations}
   s.email = %q{psadauskas [a] gmail [d] com}
   s.extra_rdoc_files = [
     "LICENSE",
-     "README.rdoc"
+    "README.rdoc"
   ]
   s.files = [
-    ".gitignore",
-     "Gemfile",
-     "LICENSE",
-     "README.rdoc",
-     "Rakefile",
-     "VERSION",
-     "db/migrations/1_create_people_table.rb",
-     "db/migrations/2_add_dob_to_people.rb",
-     "db/migrations/config.rb",
-     "dm-migrations.gemspec",
-     "examples/sample_migration.rb",
-     "examples/sample_migration_spec.rb",
-     "lib/dm-migrations.rb",
-     "lib/dm-migrations/adapters/dm-do-adapter.rb",
-     "lib/dm-migrations/adapters/dm-mysql-adapter.rb",
-     "lib/dm-migrations/adapters/dm-oracle-adapter.rb",
-     "lib/dm-migrations/adapters/dm-postgres-adapter.rb",
-     "lib/dm-migrations/adapters/dm-sqlite-adapter.rb",
-     "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",
-     "lib/dm-migrations/sql/column.rb",
-     "lib/dm-migrations/sql/mysql.rb",
-     "lib/dm-migrations/sql/postgres.rb",
-     "lib/dm-migrations/sql/sqlite.rb",
-     "lib/dm-migrations/sql/table.rb",
-     "lib/dm-migrations/sql/table_creator.rb",
-     "lib/dm-migrations/sql/table_modifier.rb",
-     "lib/spec/example/migration_example_group.rb",
-     "lib/spec/matchers/migration_matchers.rb",
-     "spec/integration/auto_migration_spec.rb",
-     "spec/integration/migration_runner_spec.rb",
-     "spec/integration/migration_spec.rb",
-     "spec/integration/sql_spec.rb",
-     "spec/isolated/require_after_setup_spec.rb",
-     "spec/isolated/require_before_setup_spec.rb",
-     "spec/isolated/require_spec.rb",
-     "spec/rcov.opts",
-     "spec/spec.opts",
-     "spec/spec_helper.rb",
-     "spec/unit/migration_spec.rb",
-     "spec/unit/sql/column_spec.rb",
-     "spec/unit/sql/postgres_spec.rb",
-     "spec/unit/sql/sqlite_extensions_spec.rb",
-     "spec/unit/sql/table_creator_spec.rb",
-     "spec/unit/sql/table_modifier_spec.rb",
-     "spec/unit/sql/table_spec.rb",
-     "spec/unit/sql_spec.rb",
-     "tasks/ci.rake",
-     "tasks/local_gemfile.rake",
-     "tasks/metrics.rake",
-     "tasks/spec.rake",
-     "tasks/yard.rake",
-     "tasks/yardstick.rake"
+    "Gemfile",
+    "LICENSE",
+    "README.rdoc",
+    "Rakefile",
+    "VERSION",
+    "db/migrations/1_create_people_table.rb",
+    "db/migrations/2_add_dob_to_people.rb",
+    "db/migrations/config.rb",
+    "dm-migrations.gemspec",
+    "examples/sample_migration.rb",
+    "examples/sample_migration_spec.rb",
+    "lib/dm-migrations.rb",
+    "lib/dm-migrations/adapters/dm-do-adapter.rb",
+    "lib/dm-migrations/adapters/dm-mysql-adapter.rb",
+    "lib/dm-migrations/adapters/dm-oracle-adapter.rb",
+    "lib/dm-migrations/adapters/dm-postgres-adapter.rb",
+    "lib/dm-migrations/adapters/dm-sqlite-adapter.rb",
+    "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",
+    "lib/dm-migrations/sql/column.rb",
+    "lib/dm-migrations/sql/mysql.rb",
+    "lib/dm-migrations/sql/postgres.rb",
+    "lib/dm-migrations/sql/sqlite.rb",
+    "lib/dm-migrations/sql/table.rb",
+    "lib/dm-migrations/sql/table_creator.rb",
+    "lib/dm-migrations/sql/table_modifier.rb",
+    "lib/spec/example/migration_example_group.rb",
+    "lib/spec/matchers/migration_matchers.rb",
+    "spec/integration/auto_migration_spec.rb",
+    "spec/integration/auto_upgrade_spec.rb",
+    "spec/integration/migration_runner_spec.rb",
+    "spec/integration/migration_spec.rb",
+    "spec/integration/sql_spec.rb",
+    "spec/isolated/require_after_setup_spec.rb",
+    "spec/isolated/require_before_setup_spec.rb",
+    "spec/isolated/require_spec.rb",
+    "spec/rcov.opts",
+    "spec/spec.opts",
+    "spec/spec_helper.rb",
+    "spec/unit/migration_spec.rb",
+    "spec/unit/sql/column_spec.rb",
+    "spec/unit/sql/postgres_spec.rb",
+    "spec/unit/sql/sqlite_extensions_spec.rb",
+    "spec/unit/sql/table_creator_spec.rb",
+    "spec/unit/sql/table_modifier_spec.rb",
+    "spec/unit/sql/table_spec.rb",
+    "spec/unit/sql_spec.rb",
+    "tasks/spec.rake",
+    "tasks/yard.rake",
+    "tasks/yardstick.rake"
   ]
-  s.has_rdoc = %q{yard}
   s.homepage = %q{http://github.com/datamapper/dm-migrations}
-  s.rdoc_options = ["--charset=UTF-8"]
   s.require_paths = ["lib"]
   s.rubyforge_project = %q{datamapper}
-  s.rubygems_version = %q{1.3.7}
+  s.rubygems_version = %q{1.5.2}
   s.summary = %q{DataMapper plugin for writing and speccing migrations}
   s.test_files = [
+    "examples/sample_migration.rb",
+    "examples/sample_migration_spec.rb",
     "spec/integration/auto_migration_spec.rb",
-     "spec/integration/migration_runner_spec.rb",
-     "spec/integration/migration_spec.rb",
-     "spec/integration/sql_spec.rb",
-     "spec/isolated/require_after_setup_spec.rb",
-     "spec/isolated/require_before_setup_spec.rb",
-     "spec/isolated/require_spec.rb",
-     "spec/spec_helper.rb",
-     "spec/unit/migration_spec.rb",
-     "spec/unit/sql/column_spec.rb",
-     "spec/unit/sql/postgres_spec.rb",
-     "spec/unit/sql/sqlite_extensions_spec.rb",
-     "spec/unit/sql/table_creator_spec.rb",
-     "spec/unit/sql/table_modifier_spec.rb",
-     "spec/unit/sql/table_spec.rb",
-     "spec/unit/sql_spec.rb",
-     "examples/sample_migration.rb",
-     "examples/sample_migration_spec.rb"
+    "spec/integration/auto_upgrade_spec.rb",
+    "spec/integration/migration_runner_spec.rb",
+    "spec/integration/migration_spec.rb",
+    "spec/integration/sql_spec.rb",
+    "spec/isolated/require_after_setup_spec.rb",
+    "spec/isolated/require_before_setup_spec.rb",
+    "spec/isolated/require_spec.rb",
+    "spec/spec_helper.rb",
+    "spec/unit/migration_spec.rb",
+    "spec/unit/sql/column_spec.rb",
+    "spec/unit/sql/postgres_spec.rb",
+    "spec/unit/sql/sqlite_extensions_spec.rb",
+    "spec/unit/sql/table_creator_spec.rb",
+    "spec/unit/sql/table_modifier_spec.rb",
+    "spec/unit/sql/table_spec.rb",
+    "spec/unit/sql_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
-      s.add_runtime_dependency(%q<dm-core>, ["~> 1.0.2"])
-      s.add_development_dependency(%q<rspec>, ["~> 1.3"])
+      s.add_runtime_dependency(%q<activesupport>, ["~> 3.0.4"])
+      s.add_runtime_dependency(%q<i18n>, ["~> 0.5.0"])
+      s.add_runtime_dependency(%q<dm-core>, ["~> 1.1.0.rc1"])
+      s.add_development_dependency(%q<jeweler>, ["~> 1.5.2"])
+      s.add_development_dependency(%q<rake>, ["~> 0.8.7"])
+      s.add_development_dependency(%q<rspec>, ["~> 1.3.1"])
     else
-      s.add_dependency(%q<dm-core>, ["~> 1.0.2"])
-      s.add_dependency(%q<rspec>, ["~> 1.3"])
+      s.add_dependency(%q<activesupport>, ["~> 3.0.4"])
+      s.add_dependency(%q<i18n>, ["~> 0.5.0"])
+      s.add_dependency(%q<dm-core>, ["~> 1.1.0.rc1"])
+      s.add_dependency(%q<jeweler>, ["~> 1.5.2"])
+      s.add_dependency(%q<rake>, ["~> 0.8.7"])
+      s.add_dependency(%q<rspec>, ["~> 1.3.1"])
     end
   else
-    s.add_dependency(%q<dm-core>, ["~> 1.0.2"])
-    s.add_dependency(%q<rspec>, ["~> 1.3"])
+    s.add_dependency(%q<activesupport>, ["~> 3.0.4"])
+    s.add_dependency(%q<i18n>, ["~> 0.5.0"])
+    s.add_dependency(%q<dm-core>, ["~> 1.1.0.rc1"])
+    s.add_dependency(%q<jeweler>, ["~> 1.5.2"])
+    s.add_dependency(%q<rake>, ["~> 0.8.7"])
+    s.add_dependency(%q<rspec>, ["~> 1.3.1"])
   end
 end
 

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

@@ -69,6 +69,14 @@ module DataMapper
             command   = connection.create_command(statement)
             command.execute_non_query
 
+            # For simple :index => true columns, add an appropriate index.
+            # Upgrading doesn't know how to deal with complex indexes yet.
+            if property.options[:index] === true
+              statement = create_index_statement(model, property.name, [property.field])
+              command   = connection.create_command(statement)
+              command.execute_non_query
+            end
+
             property
           end.compact
         end
@@ -156,13 +164,20 @@ module DataMapper
           table_name = model.storage_name(name)
 
           indexes(model).map do |index_name, fields|
-            <<-SQL.compress_lines
-              CREATE INDEX #{quote_name("index_#{table_name}_#{index_name}")} ON
-              #{quote_name(table_name)} (#{fields.map { |field| quote_name(field) }.join(', ')})
-            SQL
+            create_index_statement(model, index_name, fields)
           end
         end
 
+        # @api private
+        def create_index_statement(model, index_name, fields)
+          table_name = model.storage_name(name)
+
+          <<-SQL.compress_lines
+            CREATE INDEX #{quote_name("index_#{table_name}_#{index_name}")} ON
+            #{quote_name(table_name)} (#{fields.map { |field| quote_name(field) }.join(', ')})
+          SQL
+        end
+
         # @api private
         def create_unique_index_statements(model)
           name           = self.name
@@ -181,10 +196,9 @@ module DataMapper
         # @api private
         def property_schema_hash(property)
           primitive = property.primitive
-          type      = property.type
           type_map  = self.class.type_map
 
-          schema = (type_map[property.class] || type_map[primitive] || type_map[type]).merge(:name => property.field)
+          schema = (type_map[property.class] || type_map[primitive]).merge(:name => property.field)
 
           schema_primitive = schema[:primitive]
 

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

@@ -31,6 +31,8 @@ module DataMapper
       module SQL #:nodoc:
 #        private  ## This cannot be private for current migrations
 
+        VALUE_METHOD = RUBY_PLATFORM[/java/] ? :variable_value : :value
+
         # @api private
         def supports_serial?
           true
@@ -95,7 +97,7 @@ module DataMapper
         # @api private
         def show_variable(name)
           result = select('SHOW VARIABLES LIKE ?', name).first
-          result ? result.value.freeze : nil
+          result ? result.send(VALUE_METHOD).freeze : nil
         end
 
         private

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

@@ -63,6 +63,12 @@ module DataMapper
         select(statement, schema_name, oracle_upcase(storage_name))
       end
 
+      def drop_table_statement(model)
+        table_name = quote_name(model.storage_name(name))
+        "DROP TABLE #{table_name} CASCADE CONSTRAINTS"
+      end
+
+
       # @api semipublic
       def create_model_storage(model)
         name       = self.name

data/lib/dm-migrations/migration_runner.rb

@@ -76,7 +76,7 @@ module DataMapper
     end
 
     def migrations
-      @migrations ||= []
+      @@migrations ||= []
     end
 
   end

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

@@ -1,5 +1,7 @@
 require 'dm-migrations/sql/table'
 
+require 'fileutils'
+
 module SQL
   module Sqlite
 
@@ -13,7 +15,7 @@ module SQL
 
     def recreate_database
       DataMapper.logger.info "Dropping #{@uri.path}"
-      system "rm #{@uri.path}"
+      FileUtils.rm_f(@uri.path)
       # do nothing, sqlite will automatically create the database file
     end
 

data/spec/integration/auto_migration_spec.rb

@@ -208,10 +208,10 @@ describe DataMapper::Migrations do
 
             options.only(:min, :max).each do |key, value|
               it "should allow the #{key} value #{value} to be stored" do
-                pending_if "#{value} causes problem with JRuby 1.5.2 parser", RUBY_ENGINE == 'jruby' && value == -9223372036854775808 do
+                pending_if "#{value} causes problem with JRuby 1.5.2 parser", RUBY_PLATFORM[/java/] && JRUBY_VERSION < '1.5.6' && value == -9223372036854775808 do
                   lambda {
                     resource = @model.create(@property => value)
-                    @model.first(@property => value).should eql(resource)
+                    @model.first(@property => value).should == resource
                   }.should_not raise_error
                 end
               end
@@ -366,7 +366,7 @@ describe DataMapper::Migrations do
 
             options.only(:min, :max).each do |key, value|
               it "should allow the #{key} value #{value} to be stored" do
-                pending_if "#{value} causes problem with JRuby 1.5.2 parser", RUBY_ENGINE == 'jruby' && value == -9223372036854775808 do
+                pending_if "#{value} causes problem with JRuby 1.5.2 parser", RUBY_PLATFORM =~ /java/ && value == -9223372036854775808 do
                   lambda {
                     resource = @model.create(@property => value)
                     @model.first(@property => value).should eql(resource)
@@ -528,7 +528,7 @@ describe DataMapper::Migrations do
 
             options.only(:min, :max).each do |key, value|
               it "should allow the #{key} value #{value} to be stored" do
-                pending_if "#{value} causes problem with JRuby 1.5.2 parser", RUBY_ENGINE == 'jruby' && value == -9223372036854775808 do
+                pending_if "#{value} causes problem with JRuby 1.5.2 parser", RUBY_PLATFORM =~ /java/ && value == -9223372036854775808 do
                   lambda {
                     resource = @model.create(@property => value)
                     @model.first(@property => value).should eql(resource)

data/spec/integration/auto_upgrade_spec.rb

@@ -0,0 +1,40 @@
+require 'spec_helper'
+
+require 'dm-migrations/auto_migration'
+
+describe DataMapper::Migrations do
+  def capture_log(mod)
+    original, mod.logger = mod.logger, DataObjects::Logger.new(@log = StringIO.new, :debug)
+    yield
+  ensure
+    @log.rewind
+    @output = @log.readlines.map do |line|
+      line.chomp.gsub(/\A.+?~ \(\d+\.?\d*\)\s+/, '')
+    end
+
+    mod.logger = original
+  end
+
+  supported_by :postgres do
+    before :all do
+      module ::Blog
+        class Article
+          include DataMapper::Resource
+
+          property :id, Serial
+        end
+      end
+
+      @model = ::Blog::Article
+    end
+
+    describe '#auto_upgrade' do
+      it 'should create an index' do
+        @model.auto_migrate!
+        @property = @model.property(:name, String, :index => true)
+        @response = capture_log(DataObjects::Postgres) { @model.auto_upgrade! }
+        @output[-2].should == "CREATE INDEX \"index_blog_articles_name\" ON \"blog_articles\" (\"name\")"
+      end
+    end
+  end
+end

data/spec/integration/migration_runner_spec.rb

@@ -12,7 +12,7 @@ describe 'The migration runner' do
     describe 'empty migration runner' do
       it "should return an empty array if no migrations have been defined" do
         migrations.should be_kind_of(Array)
-        migrations.should have(0).item
+        migrations.size.should == 0
       end
     end
 
@@ -32,7 +32,7 @@ describe 'The migration runner' do
 
         it 'should create a new migration object, and add it to the list of migrations' do
           migrations.should be_kind_of(Array)
-          migrations.should have(1).item
+          migrations.size.should == 1
           migrations.first.name.should == "create_people_table"
         end
 
@@ -40,7 +40,7 @@ describe 'The migration runner' do
           migration( 2, :add_dob_to_people) { }
           migration( 2, :add_favorite_pet_to_people) { }
           migration( 3, :add_something_else_to_people) { }
-          migrations.should have(4).items
+          migrations.size.should == 4
         end
 
         it 'should raise an error on adding with a duplicated name' do

data/spec/integration/sql_spec.rb

@@ -46,7 +46,7 @@ describe "SQL generation" do
 
       it "should have an array of columns" do
         @creator.instance_eval("@columns").should be_kind_of(Array)
-        @creator.instance_eval("@columns").should have(3).items
+        @creator.instance_eval("@columns").size.should == 3
         @creator.instance_eval("@columns").first.should be_kind_of(DataMapper::Migration::TableCreator::Column)
       end
 

data/spec/unit/sql/postgres_spec.rb

@@ -19,7 +19,7 @@ describe "Postgres Extensions" do
   end
 
   it 'should create a table object from the name' do
-    table = mock('SQLite3 Table')
+    table = mock('Postgres Table')
     SQL::Postgres::Table.should_receive(:new).with(@pe, 'users').and_return(table)
 
     @pe.table('users').should == table
@@ -46,7 +46,7 @@ describe "Postgres Extensions" do
       SQL::Postgres::Table.new(@adapter, 'users')
     end
 
-    it 'should create SQLite3 Column objects from the returned column structs' do
+    it 'should create Postgres Column objects from the returned column structs' do
       SQL::Postgres::Column.should_receive(:new).with(@cs1).and_return(@col1)
       SQL::Postgres::Column.should_receive(:new).with(@cs2).and_return(@col2)
       SQL::Postgres::Table.new(@adapter, 'users')

data/spec/unit/sql/sqlite_extensions_spec.rb

@@ -32,7 +32,7 @@ describe "SQLite3 Extensions" do
     end
 
     it 'should rm the db file' do
-      @se.should_receive(:system).with('rm /foo/bar.db')
+      FileUtils.should_receive(:rm_f).with('/foo/bar.db')
       @se.recreate_database
     end
 

data/tasks/spec.rake

@@ -35,7 +35,4 @@ rescue LoadError
   end
 end
 
-task :spec => :check_dependencies
-task :rcov => :check_dependencies
-
 task :default => :spec

metadata

@@ -1,12 +1,8 @@
 --- !ruby/object:Gem::Specification 
 name: dm-migrations
 version: !ruby/object:Gem::Version 
-  prerelease: false
-  segments: 
-  - 1
-  - 0
-  - 2
-  version: 1.0.2
+  prerelease: 6
+  version: 1.1.0.rc1
 platform: ruby
 authors: 
 - Paul Sadauskas
@@ -14,38 +10,75 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-09-07 00:00:00 -07:00
+date: 2011-02-28 00:00:00 -08:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
-  name: dm-core
-  prerelease: false
+  name: activesupport
   requirement: &id001 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ~>
       - !ruby/object:Gem::Version 
-        segments: 
-        - 1
-        - 0
-        - 2
-        version: 1.0.2
+        version: 3.0.4
   type: :runtime
+  prerelease: false
   version_requirements: *id001
 - !ruby/object:Gem::Dependency 
-  name: rspec
-  prerelease: false
+  name: i18n
   requirement: &id002 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ~>
       - !ruby/object:Gem::Version 
-        segments: 
-        - 1
-        - 3
-        version: "1.3"
-  type: :development
+        version: 0.5.0
+  type: :runtime
+  prerelease: false
   version_requirements: *id002
+- !ruby/object:Gem::Dependency 
+  name: dm-core
+  requirement: &id003 !ruby/object:Gem::Requirement 
+    none: false
+    requirements: 
+    - - ~>
+      - !ruby/object:Gem::Version 
+        version: 1.1.0.rc1
+  type: :runtime
+  prerelease: false
+  version_requirements: *id003
+- !ruby/object:Gem::Dependency 
+  name: jeweler
+  requirement: &id004 !ruby/object:Gem::Requirement 
+    none: false
+    requirements: 
+    - - ~>
+      - !ruby/object:Gem::Version 
+        version: 1.5.2
+  type: :development
+  prerelease: false
+  version_requirements: *id004
+- !ruby/object:Gem::Dependency 
+  name: rake
+  requirement: &id005 !ruby/object:Gem::Requirement 
+    none: false
+    requirements: 
+    - - ~>
+      - !ruby/object:Gem::Version 
+        version: 0.8.7
+  type: :development
+  prerelease: false
+  version_requirements: *id005
+- !ruby/object:Gem::Dependency 
+  name: rspec
+  requirement: &id006 !ruby/object:Gem::Requirement 
+    none: false
+    requirements: 
+    - - ~>
+      - !ruby/object:Gem::Version 
+        version: 1.3.1
+  type: :development
+  prerelease: false
+  version_requirements: *id006
 description: DataMapper plugin for writing and speccing migrations
 email: psadauskas [a] gmail [d] com
 executables: []
@@ -56,7 +89,6 @@ extra_rdoc_files:
 - LICENSE
 - README.rdoc
 files: 
-- .gitignore
 - Gemfile
 - LICENSE
 - README.rdoc
@@ -91,6 +123,7 @@ files:
 - lib/spec/example/migration_example_group.rb
 - lib/spec/matchers/migration_matchers.rb
 - spec/integration/auto_migration_spec.rb
+- spec/integration/auto_upgrade_spec.rb
 - spec/integration/migration_runner_spec.rb
 - spec/integration/migration_spec.rb
 - spec/integration/sql_spec.rb
@@ -108,19 +141,16 @@ files:
 - spec/unit/sql/table_modifier_spec.rb
 - spec/unit/sql/table_spec.rb
 - spec/unit/sql_spec.rb
-- tasks/ci.rake
-- tasks/local_gemfile.rake
-- tasks/metrics.rake
 - tasks/spec.rake
 - tasks/yard.rake
 - tasks/yardstick.rake
-has_rdoc: yard
+has_rdoc: true
 homepage: http://github.com/datamapper/dm-migrations
 licenses: []
 
 post_install_message: 
-rdoc_options: 
-- --charset=UTF-8
+rdoc_options: []
+
 require_paths: 
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement 
@@ -128,26 +158,25 @@ 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"
+      version: 1.3.1
 requirements: []
 
 rubyforge_project: datamapper
-rubygems_version: 1.3.7
+rubygems_version: 1.5.2
 signing_key: 
 specification_version: 3
 summary: DataMapper plugin for writing and speccing migrations
 test_files: 
+- examples/sample_migration.rb
+- examples/sample_migration_spec.rb
 - spec/integration/auto_migration_spec.rb
+- spec/integration/auto_upgrade_spec.rb
 - spec/integration/migration_runner_spec.rb
 - spec/integration/migration_spec.rb
 - spec/integration/sql_spec.rb
@@ -163,5 +192,3 @@ test_files:
 - spec/unit/sql/table_modifier_spec.rb
 - spec/unit/sql/table_spec.rb
 - spec/unit/sql_spec.rb
-- examples/sample_migration.rb
-- examples/sample_migration_spec.rb

data/.gitignore

@@ -1,37 +0,0 @@
-## MAC OS
-.DS_Store
-
-## TEXTMATE
-*.tmproj
-tmtags
-
-## EMACS
-*~
-\#*
-.\#*
-
-## VIM
-*.swp
-
-## Rubinius
-*.rbc
-
-## PROJECT::GENERAL
-*.gem
-coverage
-rdoc
-pkg
-tmp
-doc
-log
-.yardoc
-measurements
-
-## BUNDLER
-.bundle
-Gemfile.local
-Gemfile.lock
-Gemfile.local.lock
-
-## PROJECT::SPECIFIC
-spec/db/

data/tasks/ci.rake

@@ -1 +0,0 @@
-task :ci => [ :verify_measurements, 'metrics:all' ]

data/tasks/local_gemfile.rake

@@ -1,16 +0,0 @@
-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
-
-  root.join('Gemfile.local').open('w') do |f|
-    root.join('Gemfile').open.each do |line|
-      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
-
-end

data/tasks/metrics.rake

@@ -1,36 +0,0 @@
-begin
-  require 'metric_fu'
-rescue LoadError
-  namespace :metrics do
-    task :all do
-      abort 'metric_fu is not available. In order to run metrics:all, you must: gem install metric_fu'
-    end
-  end
-end
-
-begin
-  require 'reek/adapters/rake_task'
-
-  Reek::RakeTask.new do |t|
-    t.fail_on_error = true
-    t.verbose       = false
-    t.source_files  = 'lib/**/*.rb'
-  end
-rescue LoadError
-  task :reek do
-    abort 'Reek is not available. In order to run reek, you must: gem install reek'
-  end
-end
-
-begin
-  require 'roodi'
-  require 'roodi_task'
-
-  RoodiTask.new do |t|
-    t.verbose = false
-  end
-rescue LoadError
-  task :roodi do
-    abort 'Roodi is not available. In order to run roodi, you must: gem install roodi'
-  end
-end