sql_migrations 1.1.0 → 2.0.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 5c161cf11a737f57288204c4743855bb7ea87d47
-  data.tar.gz: 1d0760c754c81ee792c2dd6630182d6f20e82f24
+  metadata.gz: 42c3ea2365d623408c9e3f9d5ceb34b46921b900
+  data.tar.gz: 2531176c8a89bdeac22974ecd785610e3ca49a02
 SHA512:
-  metadata.gz: dad9f6a31134633ac2f14aa74e208dd96292358f34f7214a7ae1230d416ce991b1df78c27691d58a366ff6af67e336d9970f924688bd7d02f0d4d4866de06e32
-  data.tar.gz: d8ec3f6f6c0bfb69ea0bff00176bb0f24cb33fc8f61e7bad4b9bfe8b560d5fd623e6a40a028aa9673ea5865c9ceedf6e23026851682342dda5819d0fdd93e470
+  metadata.gz: da725a80819cd777113d9b186196bfb5f658f6bf852957da9393e07dfe02ded1b34babddab5f1a78d2cc11385fcad8a30cfe990f0f3e33eba216ed3a90c80910
+  data.tar.gz: ee34ca3da429f23d42fd71d5e232583413b75c31a309c9681cc848a534b8ea038d8bdfdf14280e826abac7de99cae549b125509d2d9492c6ed191ce446d37921

data/README.md

@@ -22,9 +22,11 @@ For example, if you work on old Zend 1 project, and you want to take benefit fro
 1.  First - install Ruby environment, with `rbenv` or `rvm`.
 2.  If your project is not using ruby, create your Gemfile:
 
-        source 'https://rubygems.org'
-        gem 'mysql2'
-        gem 'sql_migrations'
+    ```ruby
+    source 'https://rubygems.org'
+    gem 'mysql2'
+    gem 'sql_migrations'
+    ```
 
     It is possible to use all database adapters that are supported by `Sequel`. 
     Adapters supported by `Sequel`, by now, are:
@@ -36,60 +38,66 @@ For example, if you work on old Zend 1 project, and you want to take benefit fro
 
     If you are using PostgreSQL use
 
-        gem 'pg'
+    ```ruby
+    gem 'pg'
+    ```
 
 3.  Run `bundle install`
 
 4.  Create database config file in `db/config/databases.yml`
 
-        default:
-          development:
-            adapter: mysql2
-            encoding: utf8
-            database: test_db_dev
-            username: test_user
-            password: test_pass
-            host: 192.168.1.1
-            test:
-            adapter: mysql2
-            encoding: utf8
-            database: test_db_test
-            username: test_user
-            password: test_pass
-            host: 192.168.1.1
-          
-          production:
-            adapter: mysql2
-            encoding: utf8
-            database: test_db_prod
-            username: test_user
-            password: test_pass
-            host: 192.168.1.100
-          second_db:
-          development:
-            adapter: mysql2
-            encoding: utf8
-            database: second_db_dev
-            username: test_user
-            password: test_pass
-            host: 127.0.0.1
-            test:
-            adapter: mysql2
-            encoding: utf8
-            database: second_db_test
-            username: test_user
-            password: test_pass
-            host: 127.0.0.1
-
-    Note that you need to define `default` databases set.
+    ```yaml
+    default:
+      development:
+        adapter: mysql2
+        encoding: utf8
+        database: test_db_dev
+        username: test_user
+        password: test_pass
+        host: 192.168.1.1
+        test:
+        adapter: mysql2
+        encoding: utf8
+        database: test_db_test
+        username: test_user
+        password: test_pass
+        host: 192.168.1.1
+      
+      production:
+        adapter: mysql2
+        encoding: utf8
+        database: test_db_prod
+        username: test_user
+        password: test_pass
+        host: 192.168.1.100
+      second_db:
+      development:
+        adapter: mysql2
+        encoding: utf8
+        database: second_db_dev
+        username: test_user
+        password: test_pass
+        host: 127.0.0.1
+        test:
+        adapter: mysql2
+        encoding: utf8
+        database: second_db_test
+        username: test_user
+        password: test_pass
+        host: 127.0.0.1
+    ```
+
+    Note that you need to define `default` database configuration.
 
 4.  Migrations/seed/fixtures are executed using rake tasks. So you will need to create `Rakefile`:
 
-        require 'bundler'
-        Bundler.require
+    ```ruby
+    require 'bundler'
+    Bundler.require
 
-        SqlMigrations.load!('db/config/databases.yml')
-        SqlMigrations.load_tasks
+    SqlMigrations::Config.load!('db/config/databases.yml')
+    SqlMigrations.load_tasks
+    ```
 
 5.  It's ready !
   
@@ -176,7 +184,7 @@ For example, if you work on old Zend 1 project, and you want to take benefit fro
 
 ## TODO
 
-1.  Tests
+1.  More tests
 2.  Generator for `databases.yml`
 3.  Generator for migrations
 

data/lib/sql_migrations.rb

@@ -6,7 +6,7 @@ require 'time'
 
 require 'sql_migrations/version'
 require 'sql_migrations/database'
-require 'sql_migrations/supervisor'
+require 'sql_migrations/config'
 require 'sql_migrations/sql_script'
 require 'sql_migrations/migration'
 require 'sql_migrations/seed'
@@ -14,7 +14,6 @@ require 'sql_migrations/fixture'
 
 module SqlMigrations
   class << self
-    attr_reader :options
 
     def load_tasks
       load "sql_migrations/tasks/migrate.rake"
@@ -23,8 +22,33 @@ module SqlMigrations
       load "sql_migrations/tasks/list.rake"
     end
 
-    def load!(config_file)
-      @options = YAML::load_file(config_file)
+    def migrate
+      databases { |db| db.execute_migrations }
+    end
+
+    def seed
+      databases { |db| db.seed_database      }
+    end
+
+    def seed_test
+      databases { |db| db.seed_with_fixtures }
+    end
+
+    def list_files
+      Config.new.databases.each do |db_config|
+        name = db_config[:name]
+        Migration.find(name).each { |migration| puts migration }
+        Seed.find(name).each      { |seed|      puts seed      }
+        Fixture.find(name).each   { |fixture|   puts fixture   }
+      end
+    end
+
+    private
+    def databases
+      Config.new.databases.each do |db_config|
+        db = Database.new(db_config)
+        yield db
+      end
     end
   end
 end

data/lib/sql_migrations/config.rb

@@ -0,0 +1,38 @@
+module SqlMigrations
+  class Config
+
+    class << self
+      attr_reader :options
+
+      def load!(config_file)
+        @options = YAML::load_file(config_file)
+      end
+    end
+
+    def initialize
+      @env = (ENV['ENV'] ||= "development").to_sym
+      @options = self.class.options
+      @databases = get_databases_from_config
+    end
+
+    def databases
+      @databases.map do |db|
+        db_options = @options[db.to_s][@env.to_s]
+        unless db_options
+          raise "Configuration for #{db} in environment #{@env} not found !"
+        end
+        db_options.merge!(name: db)
+      end
+    end
+
+    private
+    def get_databases_from_config
+      databases = @options.map { |k, v| k.to_sym }
+      unless databases.include?(:default)
+        raise "Default database configuration not found !"
+      end
+      databases
+    end
+
+  end
+end

data/lib/sql_migrations/database.rb

@@ -2,7 +2,7 @@ module SqlMigrations
   class Database
 
     SCHEMA_TABLE = :sqlmigrations_schema
-    attr_reader :db
+    attr_reader :db, :name
 
     def initialize(options)
       @name = options[:name] || :default

data/lib/sql_migrations/sql_script.rb

@@ -16,7 +16,7 @@ module SqlMigrations
 
     def execute(db)
       @database = db
-      return unless is_new?
+      return false unless is_new?
       begin
         @database.db.transaction do
           @benchmark = Benchmark.measure do
@@ -27,7 +27,7 @@ module SqlMigrations
         puts "[-] Error while executing #{@type} #{@name} !"
         raise
       else
-        on_success
+        true & on_success
       end
     end
 

data/lib/sql_migrations/tasks/list.rake

@@ -2,7 +2,7 @@ namespace :sqlmigrations do
   namespace :files do
     desc "List found migration and seed files"
     task :list do
-      SqlMigrations::Supervisor.new.list_files
+      SqlMigrations.list_files
     end
   end
 end

data/lib/sql_migrations/tasks/migrate.rake

@@ -2,7 +2,7 @@ namespace :sqlmigrations do
   namespace :db do
     desc "Run migrations"
     task :migrate do
-      SqlMigrations::Supervisor.new.migrate
+      SqlMigrations.migrate
     end
   end
 end

data/lib/sql_migrations/tasks/seed.rake

@@ -2,7 +2,7 @@ namespace :sqlmigrations do
   namespace :db do
     desc "Seed database"
     task :seed do
-      SqlMigrations::Supervisor.new.seed
+      SqlMigrations.seed
     end
   end
 end

data/lib/sql_migrations/tasks/seed_test.rake

@@ -3,7 +3,7 @@ namespace :sqlmigrations do
     namespace :test do
       desc "Seed test database with fixtures"
       task :seed do
-        SqlMigrations::Supervisor.new.seed_test
+        SqlMigrations.seed_test
       end
     end
   end

data/lib/sql_migrations/version.rb

@@ -1,3 +1,3 @@
 module SqlMigrations
-  VERSION = "1.1.0"
+  VERSION = "2.0.0"
 end

data/spec/features/migration_order_spec.rb

@@ -0,0 +1,49 @@
+describe 'migrations valid order support engine' do
+  before do
+    $stdout = StringIO.new
+    Dir.mkdir('/migrations')
+    File.open('/migrations/20150305_154010_test_migration.sql', 'w') do |f|
+      f.puts "CREATE TABLE test_table(col_int INTEGER, col_str STRING)"
+    end
+
+    @database  = SqlMigrations::Database.new(name: :default, 'adapter' => :sqlite)
+    migration = SqlMigrations::Migration.find([ :default ]).first
+    migration.execute(@database)
+
+    File.open('/migrations/20150305_154011_test2_migration.sql', 'w') do |f|
+      f.puts "CREATE TABLE test_table2(col_int2 INTEGER, col_str2 STRING)"
+    end
+    File.open('/migrations/20150305_154012_test3_migration.sql', 'w') do |f|
+      f.puts "CREATE TABLE test_table3(col_int3 INTEGER, col_str3 STRING)"
+    end
+    @migrations = SqlMigrations::Migration.find([ :default ])
+  end
+
+
+  it 'should find all migrations' do
+    expect(@migrations.count).to be 3
+  end
+
+  it 'should execute only two migrations' do
+    statuses = @migrations.map do |migration|
+      migration.execute(@database)
+    end
+    expect(statuses[0]).to be false
+    expect(statuses[1]).to be true
+    expect(statuses[2]).to be true
+  end
+
+  it 'should create all tables' do
+    database = SqlMigrations::Database.new(name: :default, 'adapter' => :sqlite)
+    @migrations.each { |migration| migration.execute(@database) }
+    expect(@sqlite_db.table_exists?(:test_table)).to be true
+    expect(@sqlite_db[:test_table].columns).to include(:col_int)
+    expect(@sqlite_db[:test_table].columns).to include(:col_str)
+    expect(@sqlite_db.table_exists?(:test_table2)).to be true
+    expect(@sqlite_db[:test_table2].columns).to include(:col_int2)
+    expect(@sqlite_db[:test_table2].columns).to include(:col_str2)
+    expect(@sqlite_db.table_exists?(:test_table3)).to be true
+    expect(@sqlite_db[:test_table3].columns).to include(:col_int3)
+    expect(@sqlite_db[:test_table3].columns).to include(:col_str3)
+  end
+end

data/spec/features/sql_scripts_spec.rb

@@ -15,13 +15,13 @@ describe 'sql scripts' do
       f.puts "INSERT INTO second_test_table(col_int2, col_str2) VALUES(456, 'test_string2')"
     end
     File.open('/fixtures/20150305_154010_test_test_seed', 'w') do |f|
-      f.puts "INSERT INTO first_test_table(col_int1, col_str1) VALUES(2123, '2test_string1')"
-      f.puts "INSERT INTO second_test_table(col_int2, col_str2) VALUES(2456, '2test_string2')"
+      f.puts "INSERT INTO first_test2_table(col_int1, col_str1) VALUES(2123, '2test_string1')"
+      f.puts "INSERT INTO second_test2_table(col_int2, col_str2) VALUES(2456, '2test_string2')"
     end
   end
 
   it 'should be found' do
-    expect { SqlMigrations::Supervisor.new.list_files }.to \
+    expect { SqlMigrations.list_files }.to \
       output("Migration first_test_migration for db: default, datetime: 20150305154010\n" +
              "Migration second_test_migration for db: default, datetime: 20150305154011\n" +
              "Seed data test_seed, datetime: 20150305154010\n").to_stdout

data/spec/spec_helper.rb

@@ -6,7 +6,7 @@ RSpec.configure do |config|
   config.before do
     @sqlite_db = Sequel.sqlite
     allow(SqlMigrations::Database).to receive(:connect) { @sqlite_db }
-    allow(SqlMigrations).to receive(:options) { { default: { development: {}}} }
+    allow(SqlMigrations::Config).to receive(:options) { { "default" => { "development" => {}}} }
     MemFs.activate!
   end
 

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: sql_migrations
 version: !ruby/object:Gem::Version
-  version: 1.1.0
+  version: 2.0.0
 platform: ruby
 authors:
 - Grzegorz Bizon
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-03-06 00:00:00.000000000 Z
+date: 2015-03-13 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rspec
@@ -109,17 +109,18 @@ files:
 - README.md
 - Rakefile
 - lib/sql_migrations.rb
+- lib/sql_migrations/config.rb
 - lib/sql_migrations/database.rb
 - lib/sql_migrations/fixture.rb
 - lib/sql_migrations/migration.rb
 - lib/sql_migrations/seed.rb
 - lib/sql_migrations/sql_script.rb
-- lib/sql_migrations/supervisor.rb
 - lib/sql_migrations/tasks/list.rake
 - lib/sql_migrations/tasks/migrate.rake
 - lib/sql_migrations/tasks/seed.rake
 - lib/sql_migrations/tasks/seed_test.rake
 - lib/sql_migrations/version.rb
+- spec/features/migration_order_spec.rb
 - spec/features/migration_spec.rb
 - spec/features/schema_table_spec.rb
 - spec/features/sql_scripts_spec.rb
@@ -150,6 +151,7 @@ signing_key:
 specification_version: 4
 summary: Simple standalone migrations you can use with plain SQL
 test_files:
+- spec/features/migration_order_spec.rb
 - spec/features/migration_spec.rb
 - spec/features/schema_table_spec.rb
 - spec/features/sql_scripts_spec.rb

data/lib/sql_migrations/supervisor.rb

@@ -1,50 +0,0 @@
-module SqlMigrations
-  class Supervisor
-
-    def initialize
-      @env = (ENV['ENV'] ||= "development").to_sym
-      @options = SqlMigrations.options
-      @databases = get_databases_from_config
-    end
-
-    def migrate
-      databases_run { |db| db.execute_migrations }
-    end
-
-    def seed
-      databases_run { |db| db.seed_database      }
-    end
-
-    def seed_test
-      databases_run { |db| db.seed_with_fixtures }
-    end
-
-    def list_files
-      Migration.find(@databases).each { |migration| puts migration }
-      Seed.find(@databases).each      { |seed|      puts seed      }
-      Fixture.find(@databases).each   { |fixture|   puts fixture   }
-    end
-
-    private
-    def get_databases_from_config
-      databases = @options.map { |k, v| k.to_sym }
-      unless databases.include?(:default)
-        raise "Default database configuration not found !"
-      end
-      databases
-    end
-
-    def databases_run
-      @databases.each do |db|
-        db_options = @options[db.to_s][@env.to_s]
-        db_options.merge!(name: db)
-        if db_options
-          yield Database.new(db_options)
-        else
-          raise "Configuration for #{db} in environment #{@env} not found !"
-        end
-      end
-    end
-
-  end
-end