active_record_migrations 4.0.0.1 → 4.0.0.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: cf33226909efd3e751235683e135cb4be1e21429
-  data.tar.gz: 7b53898aeb54800aa143b2aeb87b382b8332a9cf
+  metadata.gz: 655161c611f3a9f7c93e18b12292d40625590f0d
+  data.tar.gz: e29d6f4e20a8870c291875fd41bb687b1324c28f
 SHA512:
-  metadata.gz: 484d935fd8708ab1d067f376e6b0c8a03d30ae641f3abdde7505b67bd635622c5cf0985d3b865c24f7d1ca2fccbdde826aa337064f4594ec04f4e1fbca4dbc2c
-  data.tar.gz: 4d9523e66f9190c893ce5aa5df2bcda2caa648a39a123d04fdb26cb1b673f2f9339609e981b6525d957648d7b47e1ceb4a5e775a266b22f60bc3cfce2524dcae
+  metadata.gz: e1cc63493dfecb61cdea12cc5c99552460f9d24199b5ae1bd3b30c03fb77ac032ea119782d8dbbecee881fe313638123a47e5949048db96d779f5c501a9bfcce
+  data.tar.gz: c1c16b583be55e32cd251d2e920ebc4a07d82290c992f78306d9ea888937716a2fbd0ea8ebd1424ef1e083457c3b1398909611cd04a08637f7e53a278794382e

data/README.md

@@ -23,6 +23,7 @@ Create a Rakefile:
 By default, your database configurations will be read from `db/config.yml` and your migration files
 will be created under `db/migrate`. If you want to keep with the defaults, create your `db/config.yml`:
 
+```yaml
     development:
       adapter: postgresql
       database: my_db
@@ -36,21 +37,24 @@ will be created under `db/migrate`. If you want to keep with the defaults, creat
       database: db/test.sqlite3
       pool: 5
       timeout: 5000
-
-If you prefer to specify your settings in plain Ruby, add this to your Rakefile:
-
-    ```ruby
-    ActiveRecordMigrations.configure do |c|
-      c.database_configuration = {
-        'development' => {'adapter' => 'sqlite3', 'database' => 'db/custom.sqlite3'},
-      }
-      # Other settings:
-      c.schema_format = :sql # default is :ruby
-      # c.yaml_config = 'db/config.yml'
-      # c.environment = ENV['db']
-      # c.db_dir = 'db'
-    end
-    ```
+```
+
+If you prefer to specify your settings in plain Ruby, add this to your Rakefile,
+before calling `ActiveRecordMigrations.load_taks`:
+
+```ruby
+ActiveRecordMigrations.configure do |c|
+  c.database_configuration = {
+    'development' => {'adapter' => 'sqlite3', 'database' => 'db/custom.sqlite3'},
+  }
+  # Other settings:
+  c.schema_format = :sql # default is :ruby
+  # c.yaml_config = 'db/config.yml'
+  # c.environment = ENV['db']
+  # c.db_dir = 'db'
+  # c.migrations_paths = ['db/migrate'] # the first entry will be used by the generator
+end
+```
 
 Take a look at the [Migrations Guide](http://guides.rubyonrails.org/migrations.html) for more details.
 

data/active_record_migrations.gemspec

@@ -20,7 +20,13 @@ Gem::Specification.new do |spec|
 
   spec.add_development_dependency "bundler", "~> 1.3"
   spec.add_dependency "rake"
-  spec.add_dependency "railties", "~> 4.0.0"
-  spec.add_dependency "activerecord", "~> 4.0.0"
+  # spec.add_dependency "railties", "~> 4.0.0"
+  # spec.add_dependency "activerecord", "~> 4.0.0"
+  # We rely on a kind of monkey patch for allowing us to override the migrations path.
+  # So it's better to fix on an specific version of AR and check if the override of
+  # ActiveRecord::Generators::MigrationGenerator#create_migration_file is correct
+  # before upgrading AR dependency. See ARM::Generators::MigrationGenerator impl.
+  spec.add_dependency "railties", "4.0.0"
+  spec.add_dependency "activerecord", "4.0.0"
 end
 

data/lib/active_record_migrations.rb

@@ -1,7 +1,7 @@
 require "active_record_migrations/version"
 require 'active_record'
 require 'active_record/tasks/database_tasks'
-require 'active_record/railtie'
+require 'rails'
 require 'rails/application'
 require_relative 'active_record_migrations/configurations'
 
@@ -16,7 +16,7 @@ module ActiveRecordMigrations
   def self.load_tasks
     create_rails_app_if_not_exists
 
-    ActiveRecord::Railtie.run_tasks_blocks Rails.application
+    load "active_record/railties/databases.rake"
     load 'active_record_migrations/tasks/new_migration.rake'
 
     ActiveRecord::Base.schema_format = configurations.schema_format
@@ -26,6 +26,7 @@ module ActiveRecordMigrations
       configurations.database_configuration
     DatabaseTasks.current_config = configurations.database_configuration[configurations.environment]
     DatabaseTasks.db_dir = configurations.db_dir
+    DatabaseTasks.migrations_paths = configurations.migrations_paths
   end
 
   private

data/lib/active_record_migrations/configurations.rb

@@ -5,12 +5,13 @@ module ActiveRecordMigrations
   class Configurations
     include Singleton
 
-    attr_accessor :yaml_config, :database_configuration, :environment, :db_dir, :schema_format, :seed_loader
+    attr_accessor :yaml_config, :database_configuration, :environment, :db_dir, :migrations_paths, :schema_format, :seed_loader
 
     def initialize
       @yaml_config = 'db/config.yml'
       @environment = ENV['db'] || Rails.env
       @db_dir = 'db'
+      @migrations_paths = ['db/migrate']
       @schema_format = :ruby # or :sql
       @seed_loader = Rails.application
     end

data/lib/active_record_migrations/generators/migration.rb

@@ -0,0 +1,18 @@
+require 'rails/generators/active_record/migration/migration_generator'
+require 'active_record/tasks/database_tasks'
+
+module ActiveRecordMigrations
+  module Generators
+    class MigrationGenerator < ::ActiveRecord::Generators::MigrationGenerator
+      source_root ::ActiveRecord::Generators::MigrationGenerator.source_root
+
+      def create_migration_file
+        set_local_assigns!
+        validate_file_name!
+        dir = ::ActiveRecord::Tasks::DatabaseTasks.migrations_paths.first
+        migration_template @migration_template, "#{dir}/#{file_name}.rb"
+      end
+    end
+  end
+end
+

data/lib/active_record_migrations/tasks/new_migration.rake

@@ -2,16 +2,13 @@ require 'rails/generators'
 require 'active_record'
 require 'active_record/tasks/database_tasks'
 require 'active_record_migrations/configurations'
-
-Rake::Task['db:load_config'].clear
+require 'active_record_migrations/generators/migration'
 
 task environment: 'db:load_config' do
   ActiveRecord::Base.establish_connection ActiveRecord::Tasks::DatabaseTasks.current_config
 end
 
 namespace :db do
-  task(:load_config){} # db tasks depend on load_config
-
   desc "Creates a new migration file with the specified name"
   task :new_migration, :name, :options do |t, args|
     name = args[:name] || ENV['name']
@@ -29,7 +26,9 @@ namespace :db do
     end
     params = [name]
     params.concat options.split(' ') if options
-    Rails::Generators.invoke "active_record:migration", params, behavior: :invoke, destination_root: Rails.root
+    #Rails::Generators.invoke "active_record:migration", params,
+    Rails::Generators.invoke "active_record_migrations:migration", params,
+      behavior: :invoke, destination_root: Rails.root
   end
 end
 

data/lib/active_record_migrations/version.rb

@@ -1,3 +1,3 @@
 module ActiveRecordMigrations
-  VERSION = "4.0.0.1"
+  VERSION = "4.0.0.2"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: active_record_migrations
 version: !ruby/object:Gem::Version
-  version: 4.0.0.1
+  version: 4.0.0.2
 platform: ruby
 authors:
 - Rodrigo Rosenfeld Rosas
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-08-19 00:00:00.000000000 Z
+date: 2013-10-19 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -42,28 +42,28 @@ dependencies:
   name: railties
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - '='
       - !ruby/object:Gem::Version
         version: 4.0.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - '='
       - !ruby/object:Gem::Version
         version: 4.0.0
 - !ruby/object:Gem::Dependency
   name: activerecord
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - '='
       - !ruby/object:Gem::Version
         version: 4.0.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - '='
       - !ruby/object:Gem::Version
         version: 4.0.0
 description: ActiveRecord Stand-alone migrations
@@ -81,6 +81,7 @@ files:
 - active_record_migrations.gemspec
 - lib/active_record_migrations.rb
 - lib/active_record_migrations/configurations.rb
+- lib/active_record_migrations/generators/migration.rb
 - lib/active_record_migrations/tasks/new_migration.rake
 - lib/active_record_migrations/version.rb
 homepage: http://github.com/rosenfeld/active_record_migrations
@@ -103,7 +104,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.0.3
+rubygems_version: 2.1.2
 signing_key: 
 specification_version: 4
 summary: Use AR migrations from outside of a Rails project