standalone_migrations 0.4.1 → 0.4.2

data/VERSION

@@ -1 +1 @@
-0.4.1
+0.4.2

data/lib/tasks/standalone_migrations.rb

@@ -5,7 +5,7 @@ require 'logger'
 class MigratorTasks < ::Rake::TaskLib
   attr_accessor :name, :base, :vendor, :config, :schema, :env, :default_env, :verbose, :log_level, :logger
   attr_reader :migrations
-  
+
   def initialize(name = :migrator)
     @name = name
     base = File.expand_path('.')
@@ -21,14 +21,14 @@ class MigratorTasks < ::Rake::TaskLib
     @log_level = Logger::ERROR
     yield self if block_given?
     # Add to load_path every "lib/" directory in vendor
-    Dir["#{vendor}/**/lib"].each{|p| $LOAD_PATH << p }
+    Dir["#{vendor}/**/lib"].each { |p| $LOAD_PATH << p }
     define
   end
-  
+
   def migrations=(*value)
     @migrations = value.flatten
   end
-  
+
   def define
     namespace :db do
       task :ar_init do
@@ -39,7 +39,6 @@ class MigratorTasks < ::Rake::TaskLib
           ActiveRecord::Base.configurations = @config
         else
           require 'erb'
-          
           ActiveRecord::Base.configurations = YAML::load(ERB.new(IO.read(@config)).result)
         end
         ActiveRecord::Base.establish_connection(ENV[@env])
@@ -53,7 +52,7 @@ class MigratorTasks < ::Rake::TaskLib
       end
 
       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
+      task :migrate => :ar_init do
         require "#{@vendor}/migration_helpers/init"
         ActiveRecord::Migration.verbose = ENV['VERBOSE'] || @verbose
         @migrations.each do |path|
@@ -67,45 +66,98 @@ class MigratorTasks < ::Rake::TaskLib
         puts "Current version: #{ActiveRecord::Migrator.current_version}"
       end
 
-      def create_database config
-        options = {:charset => 'utf8', :collation => 'utf8_unicode_ci'}
-
-        create_db = lambda do |config|
-          ActiveRecord::Base.establish_connection config.merge('database' => nil)
-          ActiveRecord::Base.connection.create_database config['database'], options
-          ActiveRecord::Base.establish_connection config
-        end
-
+      def create_database(config)
         begin
-          create_db.call config
-        rescue Mysql::Error => sqlerr
-          if sqlerr.errno == 1405
-            print "#{sqlerr.error}. \nPlease provide the root password for your mysql installation\n>"
-            root_password = $stdin.gets.strip
-
-            grant_statement = <<-SQL
-              GRANT ALL PRIVILEGES ON #{config['database']}.* 
-                TO '#{config['username']}'@'localhost'
-                IDENTIFIED BY '#{config['password']}' WITH GRANT OPTION;
-            SQL
-
-            create_db.call config.merge('database' => nil, 'username' => 'root', 'password' => root_password)
+          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
           else
-            $stderr.puts sqlerr.error
-            $stderr.puts "Couldn't create database for #{config.inspect}, charset: utf8, collation: utf8_unicode_ci"
-            $stderr.puts "(if you set the charset manually, make sure you have a matching collation)" if config['charset']
+            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
           end
+        else
+          $stderr.puts "#{config['database']} already exists"
         end
       end
 
       desc 'Create the database from config/database.yml for the current DATABASE_ENV'
       task :create => :ar_init do
-        create_database ActiveRecord::Base.configurations[self.default_env]
+        config = ActiveRecord::Base.configurations[self.default_env]
+        create_database config
+      end
+
+      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
-        ActiveRecord::Base.connection.drop_database ActiveRecord::Base.configurations[self.default_env]['database']
+        config = ActiveRecord::Base.configurations[self.default_env]
+        drop_database(config)
       end
 
       namespace :migrate do
@@ -134,12 +186,12 @@ class MigratorTasks < ::Rake::TaskLib
           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
-          
+
           if pending_migrations.any?
             puts "You have #{pending_migrations.size} pending migrations:"
             pending_migrations.each do |pending_migration|
@@ -180,33 +232,33 @@ class MigratorTasks < ::Rake::TaskLib
         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}"
+            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
         end
-    
+
         desc 'Check for pending migrations and load the test schema'
         task :prepare => ['db:abort_if_pending_migrations', 'db:test:load']
       end
@@ -214,7 +266,7 @@ class MigratorTasks < ::Rake::TaskLib
       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
@@ -228,7 +280,7 @@ class MigratorTasks < ::Rake::TaskLib
 
         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
 
@@ -244,9 +296,9 @@ class Create#{class_name table_name} < ActiveRecord::Migration
     drop_table :#{table_name}
   end
 end
-MIGRATION
+        MIGRATION
 
-      create_file @migrations.first, file_name("create_#{table_name}"), contents
+        create_file @migrations.first, file_name("create_#{table_name}"), contents
       end
 
       desc "Create a new migration"
@@ -276,12 +328,12 @@ eof
   end
 
   def class_name str
-    str.split('_').map {|s| s.capitalize}.join
+    str.split('_').map { |s| s.capitalize }.join
   end
 
   def create_file path, file, contents
     FileUtils.mkdir_p path unless File.exists? path
-    File.open(file, 'w') {|f| f.write contents}
+    File.open(file, 'w') { |f| f.write contents }
   end
 
   def file_name migration

data/spec/standalone_migrations_spec.rb

@@ -4,7 +4,7 @@ describe 'Standalone migrations' do
     file = tmp_file(file)
     folder = File.dirname(file)
     `mkdir -p #{folder}` unless File.exist?(folder)
-    File.open(file,'w'){|f| f.write content}
+    File.open(file, 'w') { |f| f.write content }
   end
 
   def read(file)
@@ -12,7 +12,7 @@ describe 'Standalone migrations' do
   end
 
   def migration(name)
-    m = `cd spec/tmp/db/migrations && ls`.split("\n").detect{|m| m =~ name}
+    m = `cd spec/tmp/db/migrations && ls`.split("\n").detect { |m| m =~ name }
     m ? "db/migrations/#{m}" : m
   end
 
@@ -32,7 +32,7 @@ describe 'Standalone migrations' do
     write(migration, content)
     migration.match(/\d{14}/)[0]
   end
-  
+
   def write_rakefile(config=nil)
     write 'Rakefile', <<-TXT
       $LOAD_PATH.unshift '#{File.expand_path('lib')}'
@@ -47,7 +47,7 @@ describe 'Standalone migrations' do
       end
     TXT
   end
-  
+
   def write_multiple_migrations
     write_rakefile %{t.migrations = "db/migrations", "db/migrations2"}
     write "db/migrations/20100509095815_create_tests.rb", <<-TXT
@@ -60,7 +60,7 @@ def self.down
   puts "DOWN-CreateTests"
 end
 end
-TXT
+    TXT
     write "db/migrations2/20100509095816_create_tests2.rb", <<-TXT
 class CreateTests2 < ActiveRecord::Migration
 def self.up
@@ -71,7 +71,7 @@ def self.down
   puts "DOWN-CreateTests2"
 end
 end
-TXT
+    TXT
   end
 
   before do
@@ -88,6 +88,13 @@ TXT
     TXT
   end
 
+  describe 'db:create and drop' do
+    it "should create the database and drop the database that was created" do
+      run("rake db:create").should =~ /SUCCESS/
+      run("rake db:drop").should =~ /SUCCESS/
+    end
+  end
+
   describe 'db:new_migration' do
     context "single migration path" do
       it "fails if i do not add a name" do
@@ -99,7 +106,7 @@ TXT
         run("ls db/migrations").should =~ /^\d+_test_abc.rb$/
       end
     end
-    
+
     context "multiple migration paths" do
       before do
         write_rakefile %{t.migrations = "db/migrations", "db/migrations2"}
@@ -129,7 +136,7 @@ TXT
         result.should =~ /Migrating to Xxx \(#{Time.now.year}/
       end
     end
-    
+
     context "multiple migration paths" do
       before do
         write_multiple_migrations
@@ -162,19 +169,19 @@ TXT
         result.should_not =~ /SUCCESS/
       end
     end
-    
+
     context "multiple migration paths" do
       before do
         write_multiple_migrations
       end
-      
+
       it "runs down on the correct path" do
         run 'rake db:migrate'
         result = run 'rake db:migrate:down VERSION=20100509095815'
         result.should =~ /DOWN-CreateTests/
         result.should_not =~ /DOWN-CreateTests2/
       end
-      
+
       it "fails if migration number isn't found" do
         run 'rake db:migrate'
         result = run 'rake db:migrate:down VERSION=20100509095820'
@@ -203,18 +210,18 @@ TXT
         result.should_not =~ /SUCCESS/
       end
     end
-  
+
     context "multiple migration paths" do
       before do
         write_multiple_migrations
       end
-      
+
       it "runs down on the correct path" do
         result = run 'rake db:migrate:up VERSION=20100509095815'
         result.should =~ /UP-CreateTests/
         result.should_not =~ /UP-CreateTests2/
       end
-      
+
       it "fails if migration number isn't found" do
         result = run 'rake db:migrate:up VERSION=20100509095820'
         result.should_not =~ /SUCCESS/

data/standalone_migrations.gemspec

@@ -5,11 +5,11 @@
 
 Gem::Specification.new do |s|
   s.name = %q{standalone_migrations}
-  s.version = "0.4.1"
+  s.version = "0.4.2"
 
   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-02-16}
+  s.date = %q{2011-02-21}
   s.email = %q{thuss@gabrito.com}
   s.extra_rdoc_files = [
     "README.markdown"
@@ -28,14 +28,13 @@ Gem::Specification.new do |s|
   ]
   s.homepage = %q{http://github.com/thuss/standalone-migrations}
   s.require_paths = ["lib"]
-  s.rubygems_version = %q{1.3.7}
+  s.rubygems_version = %q{1.5.2}
   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,12 +1,8 @@
 --- !ruby/object:Gem::Specification 
 name: standalone_migrations
 version: !ruby/object:Gem::Version 
-  prerelease: false
-  segments: 
-  - 0
-  - 4
-  - 1
-  version: 0.4.1
+  prerelease: 
+  version: 0.4.2
 platform: ruby
 authors: 
 - Todd Huss
@@ -15,7 +11,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2011-02-16 00:00:00 -08:00
+date: 2011-02-21 00:00:00 -08:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -26,8 +22,6 @@ dependencies:
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
-        segments: 
-        - 0
         version: "0"
   type: :runtime
   version_requirements: *id001
@@ -39,8 +33,6 @@ dependencies:
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
-        segments: 
-        - 0
         version: "0"
   type: :runtime
   version_requirements: *id002
@@ -77,21 +69,17 @@ 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.3.7
+rubygems_version: 1.5.2
 signing_key: 
 specification_version: 3
 summary: A thin wrapper to use Rails Migrations in non Rails projects