dm-migrations 0.9.7 → 0.9.8

data/History.txt

@@ -1 +1,3 @@
+=== 0.9.8 / 2008-12-07
 
+* No changes this version

data/Manifest.txt

@@ -36,3 +36,6 @@ 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/db.rb
+tasks/install.rb
+tasks/spec.rb

data/Rakefile

@@ -1,81 +1,25 @@
-require 'rubygems'
-require 'spec'
-require 'spec/rake/spectask'
 require 'pathname'
+require 'rubygems'
+
+ROOT    = Pathname(__FILE__).dirname.expand_path
+JRUBY   = RUBY_PLATFORM =~ /java/
+WINDOWS = Gem.win_platform?
+SUDO    = (WINDOWS || JRUBY) ? '' : ('sudo' unless ENV['SUDOLESS'])
 
-ROOT = Pathname(__FILE__).dirname.expand_path
 require ROOT + 'lib/dm-migrations/version'
 
-AUTHOR = "Paul Sadauskas"
-EMAIL  = "psadauskas@gmail.com"
-GEM_NAME = "dm-migrations"
+AUTHOR = 'Paul Sadauskas'
+EMAIL  = 'psadauskas [a] gmail [d] com'
+GEM_NAME = 'dm-migrations'
 GEM_VERSION = DataMapper::Migration::VERSION
-GEM_DEPENDENCIES = [["dm-core", '~>0.9.7']]
-GEM_CLEAN = ["log", "pkg"]
-GEM_EXTRAS = { :has_rdoc => true, :extra_rdoc_files => %w[ README.txt LICENSE TODO ] }
-
-PROJECT_NAME = "datamapper"
-PROJECT_URL  = "http://github.com/sam/dm-more/tree/master/dm-migrations"
-PROJECT_DESCRIPTION = PROJECT_SUMMARY = "DataMapper plugin for writing and speccing migrations"
-
-require ROOT.parent + 'tasks/hoe'
-
-task :default => [ :spec ]
-
-WIN32 = (RUBY_PLATFORM =~ /win32|mingw|cygwin/) rescue nil
-SUDO  = WIN32 ? '' : ('sudo' unless ENV['SUDOLESS'])
-
-desc "Install #{GEM_NAME} #{GEM_VERSION} (default ruby)"
-task :install => [ :package ] do
-  sh "#{SUDO} gem install --local pkg/#{GEM_NAME}-#{GEM_VERSION} --no-update-sources", :verbose => false
-end
-
-desc "Uninstall #{GEM_NAME} #{GEM_VERSION} (default ruby)"
-task :uninstall => [ :clobber ] do
-  sh "#{SUDO} gem uninstall #{GEM_NAME} -v#{GEM_VERSION} -I -x", :verbose => false
-end
-
-namespace :jruby do
-  desc "Install #{GEM_NAME} #{GEM_VERSION} with JRuby"
-  task :install => [ :package ] do
-    sh %{#{SUDO} jruby -S gem install --local pkg/#{GEM_NAME}-#{GEM_VERSION} --no-update-sources}, :verbose => false
-  end
-end
-
-desc 'Run specifications'
-Spec::Rake::SpecTask.new(:spec) do |t|
-  t.spec_opts << '--options' << 'spec/spec.opts' if File.exists?('spec/spec.opts')
-  t.spec_files = Pathname.glob((ROOT + 'spec/**/*_spec.rb').to_s)
-
-  begin
-    t.rcov = ENV.has_key?('NO_RCOV') ? ENV['NO_RCOV'] != 'true' : true
-    t.rcov_opts << '--exclude' << 'spec'
-    t.rcov_opts << '--text-summary'
-    t.rcov_opts << '--sort' << 'coverage' << '--sort-reverse'
-  rescue Exception
-    # rcov not installed
-  end
-end
-
-namespace :db do
-
-  # pass the relative path to the migrations directory by MIGRATION_DIR
-  task :setup_migration_dir do
-    unless defined?(MIGRATION_DIR)
-      migration_dir = ENV["MIGRATION_DIR"] || File.join("db", "migrations")
-      MIGRATION_DIR = File.expand_path(File.join(File.dirname(__FILE__), migration_dir))
-    end
-    FileUtils.mkdir_p MIGRATION_DIR
-  end
-
-  # set DIRECTION to migrate down
-  desc "Run your system's migrations"
-  task :migrate => [:setup_migration_dir] do
-    require File.expand_path(File.join(File.dirname(__FILE__), "lib", "migration_runner.rb"))
-    require File.expand_path(File.join(MIGRATION_DIR, "config.rb"))
+GEM_DEPENDENCIES = [['dm-core', "~>#{GEM_VERSION}"]]
+GEM_CLEAN = %w[ log pkg coverage ]
+GEM_EXTRAS = { :has_rdoc => true, :extra_rdoc_files => %w[ README.txt LICENSE TODO History.txt ] }
 
-    Dir[File.join(MIGRATION_DIR, "*.rb")].each { |file| require file }
+PROJECT_NAME = 'datamapper'
+PROJECT_URL  = "http://github.com/sam/dm-more/tree/master/#{GEM_NAME}"
+PROJECT_DESCRIPTION = PROJECT_SUMMARY = 'DataMapper plugin for writing and speccing migrations'
 
-    ENV["DIRECTION"] != "down" ? migrate_up! : migrate_down!
-  end
+[ ROOT, ROOT.parent ].each do |dir|
+  Pathname.glob(dir.join('tasks/**/*.rb').to_s).each { |f| require f }
 end

data/TODO

@@ -1,8 +0,0 @@
-TODO
-====
-
-
-
----
-TODO tickets may also be found in the DataMapper Issue Tracker:
-http://wm.lighthouseapp.com/projects/4819-datamapper/overview

data/lib/dm-migrations/version.rb

@@ -1,5 +1,5 @@
 module DataMapper
   class Migration
-    VERSION = "0.9.7"
+    VERSION = '0.9.8'
   end
 end

data/lib/migration.rb

@@ -1,5 +1,5 @@
 require 'rubygems'
-gem 'dm-core', '~>0.9.7'
+gem 'dm-core', '~>0.9.8'
 require 'dm-core'
 require 'benchmark'
 require File.dirname(__FILE__) + '/sql'
@@ -196,19 +196,21 @@ module DataMapper
 
     # Quoted table name, for the adapter
     def migration_info_table
-      @migration_info_table ||= @adapter.send(:quote_table_name, 'migration_info')
+      @migration_info_table ||= quote_table_name('migration_info')
     end
 
     # Quoted `migration_name` column, for the adapter
     def migration_name_column
-      @migration_name_column ||= @adapter.send(:quote_column_name, 'migration_name')
+      @migration_name_column ||= quote_column_name('migration_name')
     end
 
     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_table_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_column_name, column_name.to_s)
     end
   end

data/spec/integration/migration_runner_spec.rb

@@ -1,8 +1,7 @@
 require 'pathname'
 require Pathname(__FILE__).dirname.expand_path.parent + 'spec_helper'
 
-[:sqlite3, :mysql, :postgres].each do |adapter|
-  next unless eval("HAS_#{adapter.to_s.upcase}")
+ADAPTERS.each do |adapter|
   describe "Using Adapter #{adapter}, " do
     describe 'empty migration runner' do
       it "should return an empty array if no migrations have been defined" do

data/spec/integration/migration_spec.rb

@@ -1,8 +1,7 @@
 require 'pathname'
 require Pathname(__FILE__).dirname.expand_path.parent + 'spec_helper'
 
-[:sqlite3, :mysql, :postgres].each do |adapter|
-  next unless eval("HAS_#{adapter.to_s.upcase}")
+ADAPTERS.each do |adapter|
   describe "Using Adapter #{adapter}, " do
     describe DataMapper::Migration, 'interface' do
       before do
@@ -51,25 +50,15 @@ require Pathname(__FILE__).dirname.expand_path.parent + 'spec_helper'
         [m1, m2, m3, m4].sort.should == [m1, m3, m2, m4]
       end
 
-      if HAS_SQLITE3
-        it "should extend with SQL::Sqlite3 when adapter is Sqlite3Adapter" do
-          migration = DataMapper::Migration.new(1, :sqlite3_adapter_test, :database => :sqlite3) { }
-          (class << migration.adapter; self; end).included_modules.should include(SQL::Sqlite3)
-        end
-      end
-
-      if HAS_MYSQL
-        it "should extend with SQL::Mysql when adapter is MysqlAdapter" do
-          migration = DataMapper::Migration.new(1, :mysql_adapter_test, :database => :mysql) { }
-          (class << migration.adapter; self; end).included_modules.should include(SQL::Mysql)
-        end
-      end
+      expected_module = {
+        :sqlite3  => lambda { SQL::Sqlite3 },
+        :mysql    => lambda { SQL::Mysql },
+        :postgres => lambda { SQL::Postgresql }
+      }[adapter][]
 
-      if HAS_POSTGRES
-        it "should extend with SQL::Postgres when adapter is PostgresAdapter" do
-          migration = DataMapper::Migration.new(1, :postgres_adapter_test, :database => :postgres) { }
-          (class << migration.adapter; self; end).included_modules.should include(SQL::Postgresql)
-        end
+      it "should extend with #{expected_module} when adapter is #{adapter}" do
+        migration = DataMapper::Migration.new(1, :"#{adapter}_adapter_test", :database => adapter) { }
+        (class << migration.adapter; self; end).included_modules.should include(expected_module)
       end
     end
 

data/spec/integration/sql_spec.rb

@@ -1,8 +1,7 @@
 require 'pathname'
 require Pathname(__FILE__).dirname.expand_path.parent + 'spec_helper'
 
-[:sqlite3, :mysql, :postgres].each do |adapter|
-  next unless eval("HAS_#{adapter.to_s.upcase}")
+ADAPTERS.each do |adapter|
   describe "Using Adapter #{adapter}," do
     describe DataMapper::Migration, "#create_table helper" do
       before do
@@ -111,12 +110,12 @@ require Pathname(__FILE__).dirname.expand_path.parent + 'spec_helper'
         @migration.send(:needs_down?).should be_true
       end
 
-      it "should properly quote the migration_info table for use in queries" do
-        @migration.send(:migration_info_table).should == '"migration_info"'
+      it "should properly quote the migration_info table via the adapter for use in queries" do
+        @migration.send(:migration_info_table).should == @migration.quote_table_name("migration_info")
       end
 
-      it "should properly quote the migration_info.migration_name column for use in queries" do
-        @migration.send(:migration_name_column).should == '"migration_name"'
+      it "should properly quote the migration_info.migration_name column via the adapter for use in queries" do
+        @migration.send(:migration_name_column).should == @migration.quote_column_name("migration_name")
       end
 
       it "should properly quote the migration's name for use in queries"

data/spec/spec.opts

@@ -1,2 +1 @@
 --colour
---format progress

data/spec/spec_helper.rb

@@ -1,30 +1,27 @@
+require 'pathname'
 require 'rubygems'
-gem 'rspec', '>=1.1.3'
+
+gem 'rspec', '~>1.1.11'
 require 'spec'
-require 'pathname'
+
 require Pathname(__FILE__).dirname.parent.expand_path + 'lib/dm-migrations'
 require Pathname(__FILE__).dirname.parent.expand_path + 'lib/migration_runner'
 
+ADAPTERS = []
 def load_driver(name, default_uri)
-  #return false if ENV['ADAPTER'] != name.to_s
-
-  lib = "do_#{name}"
-
   begin
-    gem lib, '~>0.9.7'
-    require lib
     DataMapper.setup(name, default_uri)
     DataMapper::Repository.adapters[:default] =  DataMapper::Repository.adapters[name]
-    puts "Loaded #{name}"
+    ADAPTERS << name
     true
-  rescue Gem::LoadError => e
-    warn "Could not load #{lib}: #{e}"
+  rescue LoadError => e
+    warn "Could not load do_#{name}: #{e}"
     false
   end
 end
 
-ENV['ADAPTER'] ||= 'sqlite3'
+#ENV['ADAPTER'] ||= 'sqlite3'
 
-HAS_SQLITE3  = load_driver(:sqlite3,  'sqlite3::memory:')
-HAS_MYSQL    = load_driver(:mysql,    'mysql://localhost/dm_core_test')
-HAS_POSTGRES = load_driver(:postgres, 'postgres://postgres@localhost/dm_core_test')
+load_driver(:sqlite3,  'sqlite3::memory:')
+load_driver(:mysql,    'mysql://localhost/dm_core_test')
+load_driver(:postgres, 'postgres://postgres@localhost/dm_core_test')

data/tasks/db.rb

@@ -0,0 +1,22 @@
+namespace :db do
+
+  # pass the relative path to the migrations directory by MIGRATION_DIR
+  task :setup_migration_dir do
+    unless defined?(MIGRATION_DIR)
+      migration_dir = ENV["MIGRATION_DIR"] || File.join("db", "migrations")
+      MIGRATION_DIR = File.expand_path(File.join(File.dirname(__FILE__), migration_dir))
+    end
+    FileUtils.mkdir_p MIGRATION_DIR
+  end
+
+  # set DIRECTION to migrate down
+  desc "Run your system's migrations"
+  task :migrate => [:setup_migration_dir] do
+    require File.expand_path(File.join(File.dirname(__FILE__), "lib", "migration_runner.rb"))
+    require File.expand_path(File.join(MIGRATION_DIR, "config.rb"))
+
+    Dir[File.join(MIGRATION_DIR, "*.rb")].each { |file| require file }
+
+    ENV["DIRECTION"] != "down" ? migrate_up! : migrate_down!
+  end
+end

data/tasks/install.rb

@@ -0,0 +1,13 @@
+def sudo_gem(cmd)
+  sh "#{SUDO} #{RUBY} -S gem #{cmd}", :verbose => false
+end
+
+desc "Install #{GEM_NAME} #{GEM_VERSION}"
+task :install => [ :package ] do
+  sudo_gem "install --local pkg/#{GEM_NAME}-#{GEM_VERSION} --no-update-sources"
+end
+
+desc "Uninstall #{GEM_NAME} #{GEM_VERSION}"
+task :uninstall => [ :clobber ] do
+  sudo_gem "uninstall #{GEM_NAME} -v#{GEM_VERSION} -Ix"
+end

data/tasks/spec.rb

@@ -0,0 +1,25 @@
+begin
+  gem 'rspec', '~>1.1.11'
+  require 'spec'
+  require 'spec/rake/spectask'
+
+  task :default => [ :spec ]
+
+  desc 'Run specifications'
+  Spec::Rake::SpecTask.new(:spec) do |t|
+    t.spec_opts << '--options' << 'spec/spec.opts' if File.exists?('spec/spec.opts')
+    t.spec_files = Pathname.glob((ROOT + 'spec/**/*_spec.rb').to_s)
+
+    begin
+      gem 'rcov', '~>0.8'
+      t.rcov = JRUBY ? false : (ENV.has_key?('NO_RCOV') ? ENV['NO_RCOV'] != 'true' : true)
+      t.rcov_opts << '--exclude' << 'spec'
+      t.rcov_opts << '--text-summary'
+      t.rcov_opts << '--sort' << 'coverage' << '--sort-reverse'
+    rescue LoadError
+      # rcov not installed
+    end
+  end
+rescue LoadError
+  # rspec not installed
+end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: dm-migrations
 version: !ruby/object:Gem::Version 
-  version: 0.9.7
+  version: 0.9.8
 platform: ruby
 authors: 
 - Paul Sadauskas
@@ -9,7 +9,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2008-11-18 00:00:00 -08:00
+date: 2008-12-07 00:00:00 -08:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -20,21 +20,11 @@ dependencies:
     requirements: 
     - - ~>
       - !ruby/object:Gem::Version 
-        version: 0.9.7
-    version: 
-- !ruby/object:Gem::Dependency 
-  name: hoe
-  type: :development
-  version_requirement: 
-  version_requirements: !ruby/object:Gem::Requirement 
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
-        version: 1.8.2
+        version: 0.9.8
     version: 
 description: DataMapper plugin for writing and speccing migrations
 email: 
-- psadauskas@gmail.com
+- psadauskas [a] gmail [d] com
 executables: []
 
 extensions: []
@@ -43,6 +33,7 @@ extra_rdoc_files:
 - README.txt
 - LICENSE
 - TODO
+- History.txt
 files: 
 - History.txt
 - LICENSE
@@ -82,6 +73,9 @@ files:
 - spec/unit/sql/table_modifier_spec.rb
 - spec/unit/sql/table_spec.rb
 - spec/unit/sql_spec.rb
+- tasks/db.rb
+- tasks/install.rb
+- tasks/spec.rb
 has_rdoc: true
 homepage: http://github.com/sam/dm-more/tree/master/dm-migrations
 post_install_message: