active_record_migrations 4.0.0.0.pre.optimistic → 4.0.0.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: f5c8a81eb9fe55bd7b1ef8e4af6126cd8d7771f4
-  data.tar.gz: af1237a86da35f8cb2b7fcafe41040a2a10713d7
+  metadata.gz: cf33226909efd3e751235683e135cb4be1e21429
+  data.tar.gz: 7b53898aeb54800aa143b2aeb87b382b8332a9cf
 SHA512:
-  metadata.gz: 8e613099dcb5eebd5b023188da866fb01260422d938d62646c29cab8a9354d963a1e934074c1f7910ae4df0bb1c40aee21a3fb0d9527c082a744617ba694f45d
-  data.tar.gz: 9c291428efabd3596a3d507b5b8571b29eb22d9ff797c67996b299275fb70d2f98c4fb5f5443c322cf196b4b6a62e13a28d1f8f11d13519c90d45b6b27873ae4
+  metadata.gz: 484d935fd8708ab1d067f376e6b0c8a03d30ae641f3abdde7505b67bd635622c5cf0985d3b865c24f7d1ca2fccbdde826aa337064f4594ec04f4e1fbca4dbc2c
+  data.tar.gz: 4d9523e66f9190c893ce5aa5df2bcda2caa648a39a123d04fdb26cb1b673f2f9339609e981b6525d957648d7b47e1ceb4a5e775a266b22f60bc3cfce2524dcae

data/README.md

@@ -2,19 +2,11 @@
 
 Allows you to use ActiveRecord migrations in non-Rails projects.
 
-This branch is for the _optimistic_ version, assuming the internals of AR migrations we rely on
-won't change until the next major version. However, we can't really promiss the related AR
-migrations code won't change in minor or patch versions of AR. That's why we can't release this
-branch as a final version.
-
-But at least you should be able to try it with basically any AR version in case you have to deal
-with conflicts.
-
 ## Installation
 
 Add this line to your application's Gemfile (run `bundle init` if you don't have one):
 
-    gem 'active_record_migrations', '4.0.0.0.pre.optimistic'
+    gem 'active_record_migrations'
     gem 'sqlite3' # or 'pg', 'mysql2', ...
 
 And then execute:
@@ -31,7 +23,6 @@ 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
@@ -45,24 +36,21 @@ 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,
-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
-```
+
+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
+    ```
 
 Take a look at the [Migrations Guide](http://guides.rubyonrails.org/migrations.html) for more details.
 
@@ -77,13 +65,6 @@ You can specify the environment by setting the `db` environment variable:
 
     rake db:migrate db=production
 
-## Versioning
-
-For final releases, the version follows ActiveRecord versions plus a patch version from our own.
-For instance, if AR version is 4.0.1, this gem will be versioned 4.0.1.x with x starting in 0.
-
-This branch however won't use pessimistic locking so that you have some flexibility if you need.
-
 ## Contributing
 
 1. Fork it
@@ -91,3 +72,4 @@ This branch however won't use pessimistic locking so that you have some flexibil
 3. Commit your changes (`git commit -am 'Add some feature'`)
 4. Push to the branch (`git push origin my-new-feature`)
 5. Create new Pull Request
+

data/active_record_migrations.gemspec

@@ -18,16 +18,9 @@ Gem::Specification.new do |spec|
   spec.test_files    = spec.files.grep(%r{^(test|spec|features)/})
   spec.require_paths = ["lib"]
 
-  spec.add_development_dependency "bundler"
+  spec.add_development_dependency "bundler", "~> 1.3"
   spec.add_dependency "rake"
-  # We rely on a kind of monkey patch for allowing us to override the migrations path.
-  # The final releases 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.
-  # The "optimistic" versions allow more flexibility to support other AR versions but
-  # on the other side we can't really guarantee that it will actually work since it depends
-  # on internal implementation of AR migrations that could change any time.
-  spec.add_dependency "railties", "~> 4.0"
-  spec.add_dependency "activerecord", "~> 4.0"
+  spec.add_dependency "railties", "~> 4.0.0"
+  spec.add_dependency "activerecord", "~> 4.0.0"
 end
 

data/lib/active_record_migrations.rb

@@ -1,9 +1,9 @@
 require "active_record_migrations/version"
 require 'active_record'
 require 'active_record/tasks/database_tasks'
-require 'rails'
+require 'active_record/railtie'
 require 'rails/application'
-require 'active_record_migrations/configurations'
+require_relative 'active_record_migrations/configurations'
 
 module ActiveRecordMigrations
   include ActiveRecord::Tasks
@@ -16,7 +16,7 @@ module ActiveRecordMigrations
   def self.load_tasks
     create_rails_app_if_not_exists
 
-    load "active_record/railties/databases.rake"
+    ActiveRecord::Railtie.run_tasks_blocks Rails.application
     load 'active_record_migrations/tasks/new_migration.rake'
 
     ActiveRecord::Base.schema_format = configurations.schema_format
@@ -26,8 +26,6 @@ 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
-    DatabaseTasks.root = Rails.root
   end
 
   private

data/lib/active_record_migrations/configurations.rb

@@ -1,18 +1,16 @@
 require 'singleton'
 require 'yaml'
-require 'erb'
 
 module ActiveRecordMigrations
   class Configurations
     include Singleton
 
-    attr_accessor :yaml_config, :database_configuration, :environment, :db_dir, :migrations_paths, :schema_format, :seed_loader
+    attr_accessor :yaml_config, :database_configuration, :environment, :db_dir, :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
@@ -20,7 +18,7 @@ module ActiveRecordMigrations
     alias configure instance_eval
 
     def database_configuration
-      @database_configuration ||= YAML.load(ERB.new(File.read @yaml_config).result)
+      @database_configuration ||= YAML.load(File.read @yaml_config)
     end
   end
 end

data/lib/active_record_migrations/tasks/new_migration.rake

@@ -2,13 +2,16 @@ require 'rails/generators'
 require 'active_record'
 require 'active_record/tasks/database_tasks'
 require 'active_record_migrations/configurations'
-require 'active_record_migrations/generators/migration'
+
+Rake::Task['db:load_config'].clear
 
 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']
@@ -26,9 +29,7 @@ namespace :db do
     end
     params = [name]
     params.concat options.split(' ') if options
-    #Rails::Generators.invoke "active_record:migration", params,
-    Rails::Generators.invoke "active_record_migrations:migration", params,
-      behavior: :invoke, destination_root: Rails.root
+    Rails::Generators.invoke "active_record: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.0-optimistic"
+  VERSION = "4.0.0.1"
 end

metadata

@@ -1,71 +1,71 @@
 --- !ruby/object:Gem::Specification
 name: active_record_migrations
 version: !ruby/object:Gem::Version
-  version: 4.0.0.0.pre.optimistic
+  version: 4.0.0.1
 platform: ruby
 authors:
 - Rodrigo Rosenfeld Rosas
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-05-22 00:00:00.000000000 Z
+date: 2013-08-19 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - ~>
       - !ruby/object:Gem::Version
-        version: '0'
+        version: '1.3'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - ~>
       - !ruby/object:Gem::Version
-        version: '0'
+        version: '1.3'
 - !ruby/object:Gem::Dependency
   name: rake
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - '>='
       - !ruby/object:Gem::Version
         version: '0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - '>='
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
   name: railties
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ~>
       - !ruby/object:Gem::Version
-        version: '4.0'
+        version: 4.0.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ~>
       - !ruby/object:Gem::Version
-        version: '4.0'
+        version: 4.0.0
 - !ruby/object:Gem::Dependency
   name: activerecord
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ~>
       - !ruby/object:Gem::Version
-        version: '4.0'
+        version: 4.0.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ~>
       - !ruby/object:Gem::Version
-        version: '4.0'
+        version: 4.0.0
 description: ActiveRecord Stand-alone migrations
 email:
 - rr.rosas@gmail.com
@@ -73,7 +73,7 @@ executables: []
 extensions: []
 extra_rdoc_files: []
 files:
-- ".gitignore"
+- .gitignore
 - Gemfile
 - LICENSE.txt
 - README.md
@@ -81,7 +81,6 @@ 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
@@ -94,19 +93,18 @@ require_paths:
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
-  - - ">="
+  - - '>='
     - !ruby/object:Gem::Version
       version: '0'
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
-  - - ">"
+  - - '>='
     - !ruby/object:Gem::Version
-      version: 1.3.1
+      version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.4.5
+rubygems_version: 2.0.3
 signing_key: 
 specification_version: 4
 summary: Use AR migrations from outside of a Rails project
 test_files: []
-has_rdoc: 

data/lib/active_record_migrations/generators/migration.rb

@@ -1,18 +0,0 @@
-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
-