standalone_migrations 1.0.2 → 1.0.3

data/Gemfile

@@ -8,3 +8,4 @@ group :dev do
   gem 'rspec', '~>2'
   gem 'jeweler'
 end
+

data/README.markdown

@@ -1,4 +1,4 @@
-Rails migrations in non-Rails (and non Ruby) projects.  
+Rails migrations in non-Rails (and non Ruby) projects.
 
 WHAT'S NEW
 ==========
@@ -70,7 +70,7 @@ The general form is:
     rake db:generate model="model_name" fields="type:column_name0 type:column_name1 ... type:column_namen"
 
 You can have as many fields as you would like.
-    
+
 An example to create a Person table with 3 columns (and it will automatically add the t.timestamps line)
 
     rake db:generate model="Person" fields="string:first_name string:last_name integer:age"
@@ -82,7 +82,7 @@ This will create a migration in db/migrate/
         create_table :Person do |t|
           t.string :first_name
           t.string :last_name
-          t.integer :age   
+          t.integer :age
           t.timestamps
         end
       end
@@ -108,14 +108,32 @@ This will create a migration in db/migrate/
 ### To execute a specific up/down of one single migration
 
     rake db:migrate:up VERSION=20081220234130
-    
+
 ### To revert your last migration
 
     rake db:rollback
 
 ### To revert your last 3 migrations
 
-    rake db:rollback STEP=3    
+    rake db:rollback STEP=3
+
+### Custom configuration
+
+By default, Standalone Migrations will assume there exists a "db/"
+directory in your project. But if for some reason you need a specific
+directory structure to work with, you can use a configuration file
+named .standalone_migrations in the root of your project containing
+the following:
+
+    db:
+        seeds: db/seeds.rb
+        migrate: db/migrate
+        schema: db/schema.rb
+    config:
+        database: db/config.yml
+
+These are the configurable options available. You can omit any of
+the keys and Standalone Migrations will assume the default values. 
 
 Contributors
 ============
@@ -127,6 +145,7 @@ Contributors
  - [Rich Meyers](https://github.com/richmeyers)
  - [Wes Bailey](http://exposinggotchas.blogspot.com/)
  - [Robert J. Berger](http://blog.ibd.com/)
- - [Federico Builes](http://mheroin.com)
+ - [Federico Builes](http://mheroin.com/)
+ - [Ricardo Valeriano](http://ricardovaleriano.com/)
 
 This work is originally 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).

data/Rakefile

@@ -7,6 +7,17 @@ task :all do
   sh "AR='~>3.1.0.rc4' bundle update activerecord && bundle exec rake"
 end
 
+task :specs => ["specs:nodb"]
+namespace :specs do
+  require 'rspec/core/rake_task'
+  RSpec::Core::RakeTask.new "nodb" do |t|
+    t.pattern = "spec/standalone_migrations/**/*_spec.rb"
+  end
+
+  desc "run alls sepcs including those which uses database"
+  task :all => [:default, :nodb]
+end
+
 # rake install -> install gem locally (for tests)
 # rake release -> push to github and release to gemcutter
 # rake version:bump:patch -> increase version and add a git-tag

data/VERSION

@@ -1 +1 @@
-1.0.1
+1.0.3

data/lib/standalone_migrations/configurator.rb

@@ -0,0 +1,48 @@
+module StandaloneMigrations
+  class Configurator
+
+    def initialize(options = {})
+      defaults = {
+        :config       => "db/config.yml",
+        :migrate_dir  => "db/migrate",
+        :seeds        => "db/seeds.rb",
+        :schema       => "db/schema.rb"
+      }
+      @options = load_from_file || defaults.merge(options)
+    end
+
+    def config
+      @options[:config]
+    end
+
+    def migrate_dir
+      @options[:migrate_dir]
+    end
+
+    def seeds
+      @options[:seeds]
+    end
+
+    def schema
+      @options[:schema]
+    end
+
+    private
+
+    def configuration_file
+      ".standalone_migrations"
+    end
+
+    def load_from_file
+      return nil unless File.exists? configuration_file
+      config = YAML.load( IO.read(configuration_file) ) 
+      {
+        :config       => config[:config][:database],
+        :migrate_dir  => config[:db][:migrate],
+        :seeds        => config[:db][:seeds],
+        :schema       => config[:db][:schema]
+      }
+    end
+
+  end
+end

data/lib/tasks/standalone_migrations.rb

@@ -1,14 +1,17 @@
 require 'active_support/all'
 require 'active_record'
 require 'pathname'
+require 'standalone_migrations/configurator'
 
 # earlier versions used migrations from db/migrations, so warn users about the change
 if File.directory?('db/migrations')
   puts "DEPRECATED move your migrations into db/migrate"
 end
 
+configurator = StandaloneMigrations::Configurator.new
+
 DB_CONFIG = YAML.load(
-  ERB.new(File.read('db/config.yml')).result
+  ERB.new(File.read(configurator.config)).result
 ).with_indifferent_access
 
 module Rails
@@ -26,7 +29,13 @@ module Rails
     s = "fake_app"
 
     def s.paths
-      Dir.glob('db/*').inject({}){|hash,x|hash[x]=[x]; hash}
+      configurator = StandaloneMigrations::Configurator.new
+
+      {
+        "db/migrate"   => [configurator.migrate_dir],
+        "db/seeds.rb"  => [configurator.seeds],
+        "db/schema.rb" => [configurator.schema]
+      } 
     end
 
     def s.config
@@ -36,8 +45,11 @@ module Rails
       end
       s
     end
+
+    def s.load_seed; end        # no-op, needed for db:reset
     s
   end
+
 end
 
 task(:rails_env){}
@@ -68,8 +80,13 @@ class #{class_name migration} < ActiveRecord::Migration
   end
 end
 eof
-    create_file file_name(migration), file_contents
-    puts "Created migration #{file_name migration}"
+    filename = migration.underscore
+    create_file file_name(filename), file_contents
+    puts "Created migration #{file_name filename}"
+  end
+
+  def configurator
+    StandaloneMigrations::Configurator.new
   end
 
   def create_file file, contents
@@ -79,7 +96,7 @@ eof
   end
 
   def file_name migration
-    File.join 'db/migrate', "#{Time.now.utc.strftime '%Y%m%d%H%M%S'}_#{migration}.rb"
+    File.join configurator.migrate_dir, "#{Time.now.utc.strftime '%Y%m%d%H%M%S'}_#{migration}.rb"
   end
 
   def class_name str

data/spec/spec_helper.rb

@@ -0,0 +1,3 @@
+$: << File.join(File.expand_path('../', __FILE__), 'lib')
+
+require 'standalone_migrations/configurator'

data/spec/standalone_migrations/configurator_spec.rb

@@ -0,0 +1,114 @@
+require 'spec_helper'
+require 'yaml'
+
+module StandaloneMigrations
+  describe Configurator, "which allows define custom dirs and files to work with your migrations" do
+
+    context "default values when .standalone_configurations is missing" do
+
+      let(:configurator) do
+        Configurator.new
+      end
+
+      it "use config/database.yml" do
+        configurator.config.should == 'db/config.yml'
+      end
+
+      it "use db/migrate dir" do
+        configurator.migrate_dir.should == 'db/migrate'
+      end
+
+      it "use db/seeds.rb" do
+        configurator.seeds.should == "db/seeds.rb"
+      end
+
+      it "use db/schema.rb" do
+        configurator.schema.should == "db/schema.rb"
+      end
+
+    end
+
+    context "passing configurations as a parameter" do
+
+      let(:args) do
+        {
+          :config       => "custom/config/database.yml",
+          :migrate_dir  => "custom/db/migrate",
+          :seeds        => "custom/db/seeds.rb",
+          :schema       => "custom/db/schema.rb"
+        }
+      end
+
+      let(:configurator) do
+        Configurator.new args
+      end
+
+      it "use custom config" do
+        configurator.config.should == args[:config]
+      end
+
+      it "use custom migrate dir" do
+        configurator.migrate_dir.should == args[:migrate_dir]
+      end
+
+      it "use custom seeds" do
+        configurator.seeds.should == args[:seeds]
+      end
+
+      it "use custom schema" do
+        configurator.schema.should == args[:schema]
+      end
+
+    end
+
+    context "using a .standalone_migrations file with configurations" do
+
+      before(:all) do
+        @original_dir = Dir.pwd
+        Dir.chdir File.expand_path("../", __FILE__)
+      end
+
+      let(:yaml_hash) do
+        {
+          :db => {
+            :seeds    => "file/db/seeds.rb",
+            :migrate  => "file/db/migrate",
+            :schema   => "file/db/schema.rb"
+          },
+          :config => {
+            :database => "file/config/database.yml"
+          }
+        }
+      end
+
+      let(:configurator) do
+        file = ".standalone_migrations"
+        File.open(file, "w") { |file| file.write(yaml_hash.to_yaml) }
+
+        Configurator.new
+      end
+
+      it "use custom config from file" do
+        configurator.config.should == yaml_hash[:config][:database]
+      end
+
+      it "use custom migrate dir from file" do
+        configurator.migrate_dir.should == yaml_hash[:db][:migrate]
+      end
+
+      it "use custom seeds from file" do
+        configurator.seeds.should == yaml_hash[:db][:seeds]
+      end
+
+      it "use custom schema from file" do
+        configurator.schema.should == yaml_hash[:db][:schema]
+      end
+
+      after(:all) do
+        File.delete ".standalone_migrations"
+        Dir.chdir @original_dir
+      end
+
+    end
+  end
+end

data/spec/standalone_migrations_spec.rb

@@ -110,6 +110,11 @@ test:
       run("rake db:new_migration name=test_abc").should =~ %r{Created migration db/migrate/\d+_test_abc\.rb}
       run("ls db/migrate").should =~ /^\d+_test_abc.rb$/
     end
+
+    it "generates a new migration with the name converted to the Rails migration format" do
+      run("rake db:new_migration name=MyNiceModel").should =~ %r{Created migration db/migrate/\d+_my_nice_model\.rb}
+      run("ls db/migrate").should =~ /^\d+_my_nice_model.rb$/
+    end
   end
 
   describe 'db:version' do
@@ -169,30 +174,30 @@ test:
       lambda{ run("rake db:migrate:up") }.should raise_error(/VERSION/)
     end
   end
-  
+
   describe 'db:rollback' do
     it "does nothing when no migrations have been run" do
       run("rake db:version").should =~ /version: 0/
       run("rake db:rollback").should == ''
-      run("rake db:version").should =~ /version: 0/      
+      run("rake db:version").should =~ /version: 0/
     end
-    
-    it "rolls back the last migration if one has been applied" do     
-      write_multiple_migrations      
-      run("rake db:migrate")      
+
+    it "rolls back the last migration if one has been applied" do
+      write_multiple_migrations
+      run("rake db:migrate")
       run("rake db:version").should =~ /version: 20100509095816/
       run("rake db:rollback").should =~ /revert/
       run("rake db:version").should =~ /version: 20100509095815/
     end
-    
+
     it "rolls back multiple migrations if the STEP argument is given" do
-      write_multiple_migrations      
-      run("rake db:migrate")      
+      write_multiple_migrations
+      run("rake db:migrate")
       run("rake db:version").should =~ /version: 20100509095816/
       run("rake db:rollback STEP=2") =~ /revert/
       run("rake db:version").should =~ /version: 0/
     end
-  end  
+  end
 
   describe 'schema:dump' do
     it "dumps the schema" do
@@ -248,7 +253,7 @@ test:
       run('rake db:test:purge')
     end
   end
-  
+
   describe 'db:migrate when environment is specified' do
     it "runs when using the DB environment variable" do
       make_migration('yyy')
@@ -256,9 +261,9 @@ test:
       run('rake db:version DB=test').should_not =~ /version: 0/
       run('rake db:version').should =~ /version: 0/
     end
-    
+
     it "should error on an invalid database" do
       lambda{ run("rake db:create DB=nonexistent")}.should raise_error(/rake aborted/)
-    end    
+    end
   end
 end

data/standalone_migrations.gemspec

@@ -5,11 +5,11 @@
 
 Gem::Specification.new do |s|
   s.name = "standalone_migrations"
-  s.version = "1.0.2"
+  s.version = "1.0.3"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["Todd Huss", "Michael Grosser"]
-  s.date = "2011-10-29"
+  s.date = "2011-11-01"
   s.email = "thuss@gabrito.com"
   s.extra_rdoc_files = [
     "README.markdown"
@@ -21,7 +21,10 @@ Gem::Specification.new do |s|
     "README.markdown",
     "Rakefile",
     "VERSION",
+    "lib/standalone_migrations/configurator.rb",
     "lib/tasks/standalone_migrations.rb",
+    "spec/spec_helper.rb",
+    "spec/standalone_migrations/configurator_spec.rb",
     "spec/standalone_migrations_spec.rb",
     "standalone_migrations.gemspec",
     "vendor/migration_helpers/MIT-LICENSE",

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: standalone_migrations
 version: !ruby/object:Gem::Version
-  version: 1.0.2
+  version: 1.0.3
   prerelease: 
 platform: ruby
 authors:
@@ -10,11 +10,11 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2011-10-29 00:00:00.000000000Z
+date: 2011-11-01 00:00:00.000000000Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rake
-  requirement: &70165700211020 !ruby/object:Gem::Requirement
+  requirement: &70305689446500 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -22,10 +22,10 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *70165700211020
+  version_requirements: *70305689446500
 - !ruby/object:Gem::Dependency
   name: activerecord
-  requirement: &70165700210100 !ruby/object:Gem::Requirement
+  requirement: &70305689445960 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -33,7 +33,7 @@ dependencies:
         version: '3'
   type: :runtime
   prerelease: false
-  version_requirements: *70165700210100
+  version_requirements: *70305689445960
 description: 
 email: thuss@gabrito.com
 executables: []
@@ -47,7 +47,10 @@ files:
 - README.markdown
 - Rakefile
 - VERSION
+- lib/standalone_migrations/configurator.rb
 - lib/tasks/standalone_migrations.rb
+- spec/spec_helper.rb
+- spec/standalone_migrations/configurator_spec.rb
 - spec/standalone_migrations_spec.rb
 - standalone_migrations.gemspec
 - vendor/migration_helpers/MIT-LICENSE