standalone_migrations 0.3.0 → 0.4.0

data/README.markdown

@@ -23,6 +23,12 @@ Add to `Rakefile` in your projects base directory:
 
 Add database configuration to `db/config.yml` in your projects base directory e.g.:
     development:
+      adapter: sqlite3
+      database: db/development.sqlite3
+      pool: 5
+      timeout: 5000
+
+    production:
       adapter: mysql
       encoding: utf8
       reconnect: false
@@ -32,8 +38,11 @@ Add database configuration to `db/config.yml` in your projects base directory e.
       password:
       socket: /var/run/mysqld/mysqld.sock
 
-    test:
-      ...something similar...
+    test: &test
+      adapter: sqlite3
+      database: db/test.sqlite3
+      pool: 5
+      timeout: 5000
 
 ### To create a new database migration:
 
@@ -62,18 +71,12 @@ If you're lazy and want to just execute raw SQL:
 
 ### To migrate a specific database (for example your "testing" database)
 
-    rake db:migrate RAILS_ENV=test
+    rake db:migrate DB=test
 
 ### To execute a specific up/down of one single migration
 
     rake db:migrate:up VERSION=20081220234130
 
-### To overwrite the default options
-[Possible options](http://github.com/thuss/standalone-migrations/blob/master/tasks/standalone_migrations.rake)
-    MIGRATION_OPTIONS = {:config=>'database/config.yml', ... }
-    gem 'standalone_migrations'
-    require 'tasks/standalone_migrations'
-
 Contributors
 ============
 This work is based on [Lincoln Stoll's blog post](http://lstoll.net/2008/04/stand-alone-activerecord-migrations/) and [David Welton's post](http://journal.dedasys.com/2007/01/28/using-migrations-outside-of-rails).
@@ -81,4 +84,6 @@ This work is based on [Lincoln Stoll's blog post](http://lstoll.net/2008/04/stan
  - [Todd Huss](http://gabrito.com/)
  - [Michael Grosser](http://pragmatig.wordpress.com)
  - [Eric Lindvall](http://bitmonkey.net)
- - [Steve Hodgkiss](http://stevehodgkiss.com/)`s [activerecord-migrator-standalone](http://github.com/stevehodgkiss/activerecord-migrator-standalone)
+ - [Steve Hodgkiss](http://stevehodgkiss.com/)
+ - [Rich Meyers](https://github.com/richmeyers)
+ - [Wes Bailey](http://exposinggotchas.blogspot.com/)

data/Rakefile

@@ -1,6 +1,6 @@
 task :default => :spec
-require 'spec/rake/spectask'
-Spec::Rake::SpecTask.new {|t| t.spec_opts = ['--color']}
+require 'rspec/core/rake_task'
+RSpec::Core::RakeTask.new {|t| t.rspec_opts = ['--color']}
 
 # rake install -> install gem locally (for tests)
 # rake release -> push to github and release to gemcutter

data/VERSION

@@ -1 +1 @@
-0.3.0
+0.4.0

data/lib/tasks/standalone_migrations.rb

@@ -3,7 +3,7 @@ require 'rake/tasklib'
 require 'logger'
 
 class MigratorTasks < ::Rake::TaskLib
-  attr_accessor :name, :base, :vendor, :config, :schema, :env, :default_env, :verbose, :log_level
+  attr_accessor :name, :base, :vendor, :config, :schema, :env, :default_env, :verbose, :log_level, :logger
   attr_reader :migrations
   
   def initialize(name = :migrator)
@@ -36,10 +36,19 @@ class MigratorTasks < ::Rake::TaskLib
         ENV[@env] ||= @default_env
 
         require 'erb'
-        ActiveRecord::Base.configurations = YAML::load(ERB.new(IO.read(@config)).result)
+        
+        if @config.is_a?(Hash)
+          ActiveRecord::Base.configurations = @config
+        else
+          ActiveRecord::Base.configurations = YAML::load(ERB.new(IO.read(@config)).result)
+        end
         ActiveRecord::Base.establish_connection(ENV[@env])
-        logger = Logger.new $stderr
-        logger.level = @log_level
+        if @logger
+          logger = @logger
+        else
+          logger = Logger.new($stderr)
+          logger.level = @log_level
+        end
         ActiveRecord::Base.logger = logger
       end
 
@@ -53,6 +62,52 @@ class MigratorTasks < ::Rake::TaskLib
         Rake::Task["db:schema:dump"].execute
       end
 
+      desc "Retrieves the current schema version number"
+      task :version => :ar_init do
+        puts "Current version: #{ActiveRecord::Migrator.current_version}"
+      end
+
+      def create_database config
+        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
+
+        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)
+          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']
+          end
+        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]
+      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']
+      end
+
       namespace :migrate do
         [:up, :down].each do |direction|
           desc "Runs the '#{direction}' for a given migration VERSION."
@@ -98,9 +153,11 @@ class MigratorTasks < ::Rake::TaskLib
       namespace :schema do
         desc "Create schema.rb file that can be portably used against any DB supported by AR"
         task :dump => :ar_init do
-          require 'active_record/schema_dumper'
-          File.open(ENV['SCHEMA'] || @schema, "w") do |file|
-            ActiveRecord::SchemaDumper.dump(ActiveRecord::Base.connection, file)
+          if schema_file = ENV['SCHEMA'] || @schema
+            require 'active_record/schema_dumper'
+            File.open(schema_file, "w") do |file|
+              ActiveRecord::SchemaDumper.dump(ActiveRecord::Base.connection, file)
+            end
           end
         end
 
@@ -154,6 +211,44 @@ class MigratorTasks < ::Rake::TaskLib
         task :prepare => ['db:abort_if_pending_migrations', 'db:test:load']
       end
 
+      desc 'generate a model=name field="field1:type field2:type"'
+      task :generate do
+        ts = Time.now.strftime '%Y%m%d%H%%M%S'
+        
+        if ENV['model']
+          table_name = ENV['model']
+        else
+          print 'model name> '
+          table_name = $stdin.gets.strip
+        end
+
+        raise ArgumentError, 'must provide a name for the model to generate' if table_name.empty?
+
+        create_table_str = "create_table :#{table_name} do |t|"
+
+        fields = ENV['fields'] if ENV['fields']
+
+        columns = ENV.has_key?('fields') ? ENV['fields'].split.map {|v| "t.#{v.sub(/:/, ' :')}"}.join("\n#{' '*6}") : nil
+
+        create_table_str << "\n      #{columns}" if columns
+
+        contents = <<-MIGRATION
+class Create#{class_name table_name} < ActiveRecord::Migration
+  def self.up
+    #{create_table_str}   
+      t.timestamps
+    end
+  end
+           
+  def self.down
+    drop_table :#{table_name}
+  end
+end
+MIGRATION
+
+      create_file @migrations.first, file_name("create_#{table_name}"), contents
+      end
+
       desc "Create a new migration"
       task :new_migration do |t|
         unless migration = ENV['name']
@@ -162,9 +257,8 @@ class MigratorTasks < ::Rake::TaskLib
           abort
         end
 
-        class_name = migration.split('_').map{|s| s.capitalize }.join
         file_contents = <<eof
-class #{class_name} < ActiveRecord::Migration
+class #{class_name migration} < ActiveRecord::Migration
   def self.up
   end
 
@@ -173,14 +267,24 @@ class #{class_name} < ActiveRecord::Migration
   end
 end
 eof
-        migration_path = @migrations.first
-        FileUtils.mkdir_p(migration_path) unless File.exist?(migration_path)
-        file_name  = "#{migration_path}/#{Time.now.utc.strftime('%Y%m%d%H%M%S')}_#{migration}.rb"
 
-        File.open(file_name, 'w'){|f| f.write file_contents }
+        create_file @migrations.first, file_name(migration), file_contents
 
-        puts "Created migration #{file_name}"
+        puts "Created migration #{file_name migration}"
       end
     end
   end
-end
+
+  def class_name str
+    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}
+  end
+
+  def file_name migration
+    File.join @migrations.first, "#{Time.now.utc.strftime '%Y%m%d%H%M%S'}_#{migration}.rb"
+  end
+end

data/spec/standalone_migrations_spec.rb

@@ -110,6 +110,12 @@ TXT
     end
   end
 
+  describe 'db:version' do
+    it "should start with a new database version" do
+      run("rake db:version").should =~ /Current version: 0/
+    end
+  end
+
   describe 'db:migrate' do
     context "single migration path" do
       it "does nothing when no migrations are present" do
@@ -130,8 +136,8 @@ TXT
       end
       it "runs the migrator on each migration path" do
         result = run("rake db:migrate")
-        result.should =~ /Migrating to CreateTests \(#{Time.now.year}/
-        result.should =~ /Migrating to CreateTests2 \(#{Time.now.year}/
+        result.should =~ /Migrating to CreateTests \(2010/
+        result.should =~ /Migrating to CreateTests2 \(2010/
       end
     end
   end
@@ -265,4 +271,4 @@ TXT
       run('rake db:test:purge').should =~ /SUCCESS/
     end
   end
-end
+end

data/standalone_migrations.gemspec

@@ -1,36 +1,34 @@
 # 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{standalone_migrations}
-  s.version = "0.3.0"
+  s.version = "0.4.0"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["Todd Huss", "Michael Grosser"]
-  s.date = %q{2010-04-12}
+  s.date = %q{2011-02-16}
   s.email = %q{thuss@gabrito.com}
   s.extra_rdoc_files = [
     "README.markdown"
   ]
   s.files = [
-    ".gitignore",
-     "README.markdown",
-     "Rakefile",
-     "VERSION",
-     "lib/tasks/standalone_migrations.rb",
-     "spec/standalone_migrations_spec.rb",
-     "standalone_migrations.gemspec",
-     "vendor/migration_helpers/MIT-LICENSE",
-     "vendor/migration_helpers/README.markdown",
-     "vendor/migration_helpers/init.rb",
-     "vendor/migration_helpers/lib/migration_helper.rb"
+    "README.markdown",
+    "Rakefile",
+    "VERSION",
+    "lib/tasks/standalone_migrations.rb",
+    "spec/standalone_migrations_spec.rb",
+    "standalone_migrations.gemspec",
+    "vendor/migration_helpers/MIT-LICENSE",
+    "vendor/migration_helpers/README.markdown",
+    "vendor/migration_helpers/init.rb",
+    "vendor/migration_helpers/lib/migration_helper.rb"
   ]
   s.homepage = %q{http://github.com/thuss/standalone-migrations}
-  s.rdoc_options = ["--charset=UTF-8"]
   s.require_paths = ["lib"]
-  s.rubygems_version = %q{1.3.6}
+  s.rubygems_version = %q{1.3.7}
   s.summary = %q{A thin wrapper to use Rails Migrations in non Rails projects}
   s.test_files = [
     "spec/standalone_migrations_spec.rb"
@@ -40,7 +38,7 @@ Gem::Specification.new do |s|
     current_version = Gem::Specification::CURRENT_SPECIFICATION_VERSION
     s.specification_version = 3
 
-    if Gem::Version.new(Gem::RubyGemsVersion) >= Gem::Version.new('1.2.0') then
+    if Gem::Version.new(Gem::VERSION) >= Gem::Version.new('1.2.0') then
       s.add_runtime_dependency(%q<rake>, [">= 0"])
       s.add_runtime_dependency(%q<activerecord>, [">= 0"])
     else

metadata

@@ -1,13 +1,12 @@
 --- !ruby/object:Gem::Specification 
 name: standalone_migrations
 version: !ruby/object:Gem::Version 
-  hash: 19
   prerelease: false
   segments: 
   - 0
-  - 3
+  - 4
   - 0
-  version: 0.3.0
+  version: 0.4.0
 platform: ruby
 authors: 
 - Todd Huss
@@ -16,7 +15,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-04-12 00:00:00 -10:00
+date: 2011-02-16 00:00:00 -08:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -27,7 +26,6 @@ dependencies:
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
-        hash: 3
         segments: 
         - 0
         version: "0"
@@ -41,7 +39,6 @@ dependencies:
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
-        hash: 3
         segments: 
         - 0
         version: "0"
@@ -56,7 +53,6 @@ extensions: []
 extra_rdoc_files: 
 - README.markdown
 files: 
-- .gitignore
 - README.markdown
 - Rakefile
 - VERSION
@@ -72,8 +68,8 @@ homepage: http://github.com/thuss/standalone-migrations
 licenses: []
 
 post_install_message: 
-rdoc_options: 
-- --charset=UTF-8
+rdoc_options: []
+
 require_paths: 
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement 
@@ -81,7 +77,6 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements: 
   - - ">="
     - !ruby/object:Gem::Version 
-      hash: 3
       segments: 
       - 0
       version: "0"
@@ -90,7 +85,6 @@ required_rubygems_version: !ruby/object:Gem::Requirement
   requirements: 
   - - ">="
     - !ruby/object:Gem::Version 
-      hash: 3
       segments: 
       - 0
       version: "0"

data/.gitignore

@@ -1,2 +0,0 @@
-schema.rb
-spec/tmp