sql_migrations 2.2.1 → 2.4.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: d7eefab432a38d45308f4a3e59cc8516151a6ff7
-  data.tar.gz: acb7edb97f69f2b6d7447306bb024cacb024765f
+  metadata.gz: 4cd2f64f3d6c5864d8a53ee00437de877d31c07d
+  data.tar.gz: 3975b9223a91de17766cb2deb74c733de7717422
 SHA512:
-  metadata.gz: 0c83d6b1ee4783fd09d935be49c812323d331b0023a148a42eda184b9d85afc714aee7f047075c70a51c806e4c1af202df393addf96c7a5da7c4b269ab69b826
-  data.tar.gz: c134ae9d84e65f66d8bbe07273a63531bb2c94c3a8bab4def1ca678325a4461e28a77e4d6d2df8afe24c0fd1f37c9ef9b2b2a4241a3c71f204afcd9c491e7841
+  metadata.gz: e24cc1c8994f34a3c6238a6a7b838a405e4f21c92964671c3b6554d774663df12a140125bc17214d4623aef2da55588c3b814ebe910208424dc11fd2b391701c
+  data.tar.gz: 840fa00ad8010e4c9911328a05d53287660f3f7266598b5e91278eb215c9fea651ec928da23fdb04728766edf24bf848be225e8abc8c3ad8b80bf5016f08422a

data/.rubocop.yml

@@ -4,3 +4,5 @@ Metrics/MethodLength:
   Max: 18
 Style/SignalException:
   Enabled: false
+Style/ModuleFunction:
+  Enabled: false

data/README.md

@@ -5,7 +5,7 @@
 
 Simple standalone migrations you can use with plain SQL.
 
-This gives you possibility to execute migrations, seed datebase (on production and in test environment with fixtures) in non-Ruby projects.
+This gives you possibility to execute migrations, seed datebase (on production and in test environment) in non-Ruby projects.
 `sql-migrations` can work with multiple different databases, and support many db adapters.
 
 ## Why ?
@@ -105,14 +105,14 @@ For example, if you work on old Zend 1 project, and you want to take benefit fro
     If you have multi-statement migrations you should provide `separator` configuration variable in `options` block. `options` key is optional in YAML.
 
 
-4.  Migrations/seeds/fixtures can be executed using rake tasks. So you will need to create `Rakefile`:
+4.  Migrations/seeds can be executed using rake tasks. So you will need to create `Rakefile`:
 
     ```ruby
     require 'bundler'
     Bundler.require
 
     SqlMigrations::Config.load!('db/config/databases.yml')
-    SqlMigrations.load_tasks
+    SqlMigrations.load_tasks!
     ```
 
     You can also create Rake tasks by yourself:
@@ -147,22 +147,19 @@ For example, if you work on old Zend 1 project, and you want to take benefit fro
 
 ## Usage
 
-1.  Valid migration/seeds/fixture file names match against regexp `/(\d{8})_(\d{6})_(.*)?\.sql/`. So valid filenames would be:
+1.  Valid migration/seeds file names match against regexp `/(\d{8})_(\d{6})_(.*)?\.sql/`. So valid filenames would be:
 
 
         20150303_180100_test_migration.sql
         20150303_180100_whatever_description_of_seed.sql
-        20150303_180100_fixture1.sql
 
     You can put plain SQL into that files.
 
-2.  It is possible to create migration files, seed files and fixtures inside following directory structure:
+2.  It is possible to create migration files and seed files inside following directory structure:
 
         db/
           migrations/
             20150303_180100_test_migration.sql
-          fixtures/
-            20150303_180100_fixture1.sql
           seeds/
             20150303_180100_whatever_description_of_seed.sql
 
@@ -172,14 +169,11 @@ For example, if you work on old Zend 1 project, and you want to take benefit fro
           migrations/
             default/
             second_db/
-          fixtures/
-            default/
-            second_db/
           seeds/
             default/
             second_db/
 
-    `default/` directory is optional, you can put migrations/seed data/fixtures for default database in base directories:
+    `default/` directory is optional, you can put migrations/seed data for default database in base directories:
 
         db/
           migrations/
@@ -197,8 +191,7 @@ For example, if you work on old Zend 1 project, and you want to take benefit fro
 
         rake sqlmigrations:db:migrate    # Run migrations
         rake sqlmigrations:db:seed       # Seed database
-        rake sqlmigrations:db:test:seed  # Seed test database with fixtures
-        rake sqlmigrations:files:list    # List found migration and seed files
+        rake sqlmigrations:db:scripts    # List all scripts found
 
 
 5.  Then, run tasks:
@@ -210,15 +203,15 @@ For example, if you work on old Zend 1 project, and you want to take benefit fro
         # this will seed database with initial data
         rake sqlmigrations:db:seed 
 
-        # this will list all migrations/seed files/fixtures that where found
-        rake sqlmigration:files:list    
+        # this will list all migrations/seed files that where found
+        rake sqlmigration:db:scripts
 
 6.  Environment variables
 
     If you want to run migration on different database (for example test) specify ENV:
 
         ENV=test rake sqlmigrations:db:migrate
-        ENV=test rake sqlmigrations:db:test:seed
+        ENV=test rake sqlmigrations:db:seed
 
     or in production:
 

data/Rakefile

@@ -6,8 +6,8 @@ RSpec::Core::RakeTask.new('spec')
 RuboCop::RakeTask.new
 
 task :test do
-  Rake::Task['spec'].invoke
   Rake::Task['rubocop'].invoke
+  Rake::Task['spec'].invoke
 end
 
 task default: :test

data/lib/sql_migrations.rb

@@ -1,57 +1,41 @@
-require 'sequel'
-require 'yaml'
-require 'find'
-require 'benchmark'
-require 'time'
-require 'erb'
-
 require 'sql_migrations/version'
 require 'sql_migrations/database'
 require 'sql_migrations/config'
-require 'sql_migrations/script_file'
-require 'sql_migrations/sql_script'
+require 'sql_migrations/file'
+require 'sql_migrations/script'
 require 'sql_migrations/migration'
 require 'sql_migrations/seed'
-require 'sql_migrations/fixture'
 
 # SqlMigrations
 #
 module SqlMigrations
-  class << self
-    def load_tasks
-      load 'sql_migrations/tasks/migrate.rake'
-      load 'sql_migrations/tasks/seed.rake'
-      load 'sql_migrations/tasks/seed_test.rake'
-      load 'sql_migrations/tasks/list.rake'
-    end
+  extend self
 
-    def migrate
-      databases(&:execute_migrations)
-    end
+  def migrate
+    databases(&:migrate)
+  end
 
-    def seed
-      databases(&:seed_database)
-    end
+  def seed
+    databases(&:seed)
+  end
 
-    def seed_test
-      databases(&:seed_with_fixtures)
+  def scripts
+    Config.databases.each do |name, _config|
+      Migration.find(name).each { |migration| puts migration }
+      Seed.find(name).each      { |seed|      puts seed      }
     end
+  end
 
-    def list_files
-      Config.databases.each do |name, _config|
-        Migration.find(name).each { |migration| puts migration }
-        Seed.find(name).each      { |seed|      puts seed      }
-        Fixture.find(name).each   { |fixture|   puts fixture   }
-      end
+  def databases
+    Config.databases.each do |name, config|
+      db = Database.new(name, config)
+      yield db if block_given?
     end
+  end
 
-    private
-
-    def databases
-      Config.databases.each do |name, config|
-        db = Database.new(name, config)
-        yield db
-      end
-    end
+  def load_tasks!
+    load 'sql_migrations/tasks/migrate.rake'
+    load 'sql_migrations/tasks/seed.rake'
+    load 'sql_migrations/tasks/scripts.rake'
   end
 end

data/lib/sql_migrations/config.rb

@@ -1,54 +1,59 @@
+require 'yaml'
+require 'erb'
+
 module SqlMigrations
-  # Configuration class
+  # Configuration module
   #
-  class Config
-    class << self
-      attr_reader :env
-
-      def load!(config_file, env = nil)
-        @env = (env || ENV['ENV'] || ENV['RAKE_ENV'] || :development).to_sym
-        config = get_config_for_env_from_file(config_file)
-        @databases = config[:databases]
-        @options   = config[:options]
-        { databases: @databases, options: @options }
-      end
+  module Config
+    extend self
+
+    def load!(config_file, env = nil)
+      @env = (env || ENV['ENV'] || ENV['RAKE_ENV'] || :development).to_sym
+      config = get_config_for_env_from_file(config_file)
+      @databases = config[:databases]
+      @options   = config[:options]
+      { databases: @databases, options: @options }
+    end
 
-      def databases
-        get_config_required(:@databases)
-      end
+    def env
+      @env
+    end
 
-      def options
-        get_config_optional(:@options)
-      end
+    def databases
+      get_config_required(:@databases)
+    end
 
-      private
+    def options
+      get_config_optional(:@options)
+    end
 
-      def get_config_required(config_variable)
-        config_value = instance_variable_get(config_variable)
-        if config_value.nil? || config_value.empty?
-          raise "No configuration for `#{config_variable.to_s[1..-1]}` !"
-        end
-        config_value
-      end
+    private
 
-      def get_config_optional(config_variable)
-        config_value = instance_variable_get(config_variable)
-        (config_value.nil? || config_value.empty?) ? {} : config_value
+    def get_config_required(config_variable)
+      config_value = instance_variable_get(config_variable)
+      if config_value.nil? || config_value.empty?
+        raise "No configuration for `#{config_variable.to_s[1..-1]}` !"
       end
+      config_value
+    end
 
-      def get_config_for_env_from_file(file)
-        yaml_hash = YAML.load(ERB.new(File.new(file).read).result)
-        config = symbolize_keys(yaml_hash)[@env]
-        raise LoadError, "No configuration for `#{@env}` environment found !" unless config
-        config
-      end
+    def get_config_optional(config_variable)
+      config_value = instance_variable_get(config_variable)
+      (config_value.nil? || config_value.empty?) ? {} : config_value
+    end
+
+    def get_config_for_env_from_file(file)
+      yaml_hash = YAML.load(ERB.new(::File.new(file).read).result)
+      config = symbolize_keys(yaml_hash)[@env]
+      raise LoadError, "No configuration for `#{@env}` environment found !" unless config
+      config
+    end
 
-      def symbolize_keys(hash)
-        hash.each_with_object({}) do |(key, value), new_hash|
-          new_key = key.is_a?(String) ? key.to_sym : key
-          new_value = value.is_a?(Hash) ? symbolize_keys(value) : value
-          new_hash[new_key] = new_value
-        end
+    def symbolize_keys(hash)
+      hash.each_with_object({}) do |(key, value), new_hash|
+        new_key = key.is_a?(String) ? key.to_sym : key
+        new_value = value.is_a?(Hash) ? symbolize_keys(value) : value
+        new_hash[new_key] = new_value
       end
     end
   end

data/lib/sql_migrations/database.rb

@@ -1,8 +1,10 @@
+require 'sequel'
+
 module SqlMigrations
   # Class that represents database gem will connect to
   #
   class Database
-    SCHEMA_TABLE = :sqlmigrations_schema
+    HISTORY_TABLE = :sqlmigrations_schema
     attr_reader :name, :driver
 
     def initialize(name, options)
@@ -19,38 +21,28 @@ module SqlMigrations
       install_table
     end
 
-    def execute_migrations
+    def migrate
       migrations = Migration.find(@name)
       if !migrations.empty?
         puts "[i] Executing migrations for `#{@name}` database"
         migrations.each { |migration| migration.execute(self) }
       else
-        puts "[i] No new migrations for `#{@name}` database"
+        puts "[i] No migrations for `#{@name}` database"
       end
     end
 
-    def seed_database
+    def seed
       seeds = Seed.find(@name)
       if !seeds.empty?
         puts "[i] Seeding `#{@name}` database"
         seeds.each { |seed| seed.execute(self) }
       else
-        puts "[i] No new seeds for `#{@name}` database"
-      end
-    end
-
-    def seed_with_fixtures
-      fixtures = Fixture.find(@name)
-      if !fixtures.empty?
-        puts "[i] Seeding `#{@name}` database with fixtures"
-        fixtures.each { |fixture| fixture.execute(self) }
-      else
-        puts "[i] No new fixturess for `#{@name}` database"
+        puts "[i] No seeds for `#{@name}` database"
       end
     end
 
-    def schema_dataset
-      @driver[SCHEMA_TABLE]
+    def history
+      @driver[HISTORY_TABLE]
     end
 
     private
@@ -66,17 +58,17 @@ module SqlMigrations
     end
 
     def install_table
-      # Check if we have migrations_schema table present
-      return if @driver.table_exists?(SCHEMA_TABLE)
-      puts "[!] Installing `#{SCHEMA_TABLE}`"
-      @driver.create_table(SCHEMA_TABLE) do
+      return if @driver.table_exists?(HISTORY_TABLE)
+
+      puts "[!] Installing `#{HISTORY_TABLE}` history table"
+      @driver.create_table(HISTORY_TABLE) do
         # rubocop:disable Style/SingleSpaceBeforeFirstArg
         primary_key :id
         Bignum      :time
         DateTime    :executed
         String      :name
         String      :type
-        index      [:time, :type]
+        index       [:time, :type]
         # rubocop:enable Style/SingleSpaceBeforeFirstArg
       end
     end

data/lib/sql_migrations/file.rb

@@ -0,0 +1,67 @@
+module SqlMigrations
+  # Class that represents script file
+  #
+  class File
+    attr_reader :name, :time, :date, :datetime, :database, :type, :path
+
+    def initialize(path, database, type)
+      @path     = path
+      @database = database
+      @type     = type.to_s
+
+      @file, @base, @parent = elements(path)
+      @date, @time, @name = match(@file) if @file
+      @datetime = (@date.to_s + @time.to_s).to_i
+    end
+
+    def valid?
+      [@name, @time, @date, @database, directories?].all?
+    end
+
+    def content
+      ::File.read(@path)
+    end
+
+    def ==(other)
+      datetime == other.datetime
+    end
+
+    def to_s
+      @file.to_s
+    end
+
+    private
+
+    def elements(path)
+      _filename, _base_directory, _parent_directory =
+        path.split(::File::SEPARATOR).last(3).reverse
+    end
+
+    def match(filename)
+      _, date, time, name =
+        filename.match(/^(\d{8})_(\d{6})_(.*)?\.sql$/).to_a
+      [date, time, name]
+    end
+
+    def directories?
+      if @database == :default
+        file_in_type_base_directory? || file_in_database_directory?
+      else
+        file_in_database_directory?
+      end
+    end
+
+    def file_in_type_base_directory?
+      @base == "#{@type}s"
+    end
+
+    def file_in_type_parent_directory?
+      @parent == "#{@type}s"
+    end
+
+    def file_in_database_directory?
+      file_in_type_parent_directory? &&
+        (@base == @database.to_s)
+    end
+  end
+end

data/lib/sql_migrations/migration.rb

@@ -1,13 +1,9 @@
 module SqlMigrations
   # Migration class
   #
-  class Migration < SqlScript
+  class Migration < Script
     def self.find(database_name)
       super(database_name, :migration)
     end
-
-    def to_s
-      "Migration #{@name} for `#{@database_name}` database, datetime: #{@date + @time}"
-    end
   end
 end

data/lib/sql_migrations/script.rb

@@ -0,0 +1,93 @@
+require 'sequel'
+require 'find'
+require 'benchmark'
+require 'time'
+
+module SqlMigrations
+  # SqlScript class
+  #
+  class Script
+    DELEGATED = [:name, :date, :time, :datetime, :type, :content, :path]
+    attr_reader(*DELEGATED)
+
+    def initialize(file)
+      @file = file
+
+      DELEGATED.each do |method|
+        instance_variable_set("@#{method}", file.send(method))
+      end
+    end
+
+    def execute(db)
+      @database = db
+      return false unless new?
+      driver = @database.driver
+      begin
+        driver.transaction do
+          @benchmark = Benchmark.measure do
+            statements.each { |query| driver.run(query) }
+          end
+        end
+      rescue
+        puts "[-] Error while executing #{@type} #{@name} !"
+        raise
+      else
+        true & on_success
+      end
+    end
+
+    def self.find(database, type)
+      files = []
+
+      Find.find(Dir.pwd) do |path|
+        file = File.new(path, database, type)
+
+        raise "Duplicate time for #{type}s: #{files.find { |f| f == file }}, #{file}" if
+          file.valid? && files.include?(file)
+
+        files << file if file.valid?
+      end
+
+      files.sort_by(&:datetime).map { |file| new(file) }
+    end
+
+    def statements
+      separator = Config.options[:separator]
+      if separator
+        statements = @content.split(separator)
+        statements.collect!(&:strip)
+        statements.reject(&:empty?)
+      else
+        [content]
+      end
+    end
+
+    def to_s
+      "#{@type.capitalize} `#{@path}` for `#{@file.database}` database"
+    end
+
+    private
+
+    def new?
+      history = @database.history
+      last = history.order(Sequel.asc(:time)).where(type: @type).last
+      is_new = history.where(time: @datetime, type: @type).count == 0
+
+      if is_new && !last.nil?
+        if last[:time] > @datetime
+          raise "#{@type.capitalize} #{@name} has time BEFORE last one recorded !"
+        end
+      end
+      is_new
+    end
+
+    def on_success
+      puts "[+] Successfully executed #{@type}, name: #{@name}"
+      puts "    #{type.capitalize} file: #{@date}_#{@time}_#{@name}.sql"
+      puts "    Benchmark: #{@benchmark}"
+
+      @database.history.insert(time: @datetime, name: @name,
+                               type: @type, executed: DateTime.now)
+    end
+  end
+end

data/lib/sql_migrations/seed.rb

@@ -1,13 +1,9 @@
 module SqlMigrations
   # Seed class
   #
-  class Seed < SqlScript
+  class Seed < Script
     def self.find(database_name)
       super(database_name, :seed)
     end
-
-    def to_s
-      "Seed data #{@name} for `#{@database_name}` database, datetime: #{@date + @time}"
-    end
   end
 end

data/lib/sql_migrations/tasks/{list.rake → scripts.rake}

@@ -1,8 +1,8 @@
 namespace :sqlmigrations do
-  namespace :files do
+  namespace :db do
     desc 'List found migration and seed files'
-    task :list do
-      SqlMigrations.list_files
+    task :scripts do
+      SqlMigrations.scripts
     end
   end
 end

data/lib/sql_migrations/version.rb

@@ -1,5 +1,5 @@
 # SqlMigrations
 #
 module SqlMigrations
-  VERSION = '2.2.1'
+  VERSION = '2.4.0'
 end

data/spec/features/config_spec.rb

@@ -1,6 +1,6 @@
 describe 'no loadable configuration file' do
   it 'should raise error when config is not loaded' do
-    expect { SqlMigrations.list_files }.to raise_error RuntimeError
+    expect { SqlMigrations.scripts }.to raise_error RuntimeError
   end
 end
 

data/spec/features/{schema_table_spec.rb → history_table_spec.rb}

@@ -1,4 +1,4 @@
-describe 'schema table in database' do
+describe 'history table in database' do
   before do
     allow(SqlMigrations::Config).to receive(:databases) { { default: {} } }
   end
@@ -7,7 +7,7 @@ describe 'schema table in database' do
     expect do
       @database = SqlMigrations::Database.new(:default, adapter: :sqlite)
     end.to output("[+] Connected to `default` database using sqlite adapter\n" \
-                  "[!] Installing `sqlmigrations_schema`\n").to_stdout
+                  "[!] Installing `sqlmigrations_schema` history table\n").to_stdout
     expect(@database.driver.table_exists?(:sqlmigrations_schema)).to be true
   end
 
@@ -19,7 +19,7 @@ describe 'schema table in database' do
       DateTime    :executed
       String      :name
       String      :type
-      index      [:time, :type]
+      index       [:time, :type]
       # rubocop:enable Style/SingleSpaceBeforeFirstArg
     end
     expect do

data/spec/features/migration_order_spec.rb

@@ -6,7 +6,7 @@ describe 'migrations valid order support engine' do
       f.puts 'CREATE TABLE test_table(col_int INTEGER, col_str STRING)'
     end
 
-    @database  = SqlMigrations::Database.new(:default, adapter: :sqlite)
+    @database = SqlMigrations::Database.new(:default, adapter: :sqlite)
     migration = SqlMigrations::Migration.find(:default).first
     migration.execute(@database)
 

data/spec/features/migration_spec.rb

@@ -4,8 +4,10 @@ describe 'migration' do
     File.open('/migrations/20150305_154010_test_migration.sql', 'w') do |f|
       f.puts 'CREATE TABLE test_table(col_int INTEGER, col_str STRING)'
     end
+
     allow(SqlMigrations::Config).to receive(:databases) { { default: { development: {} } } }
     @migration = SqlMigrations::Migration.find(:default).first
+    @database  = SqlMigrations::Database.new(:default, adapter: :sqlite)
   end
 
   it 'should be found and initialized' do
@@ -24,11 +26,28 @@ describe 'migration' do
     expect(@migration.name).to eql('test_migration')
   end
 
-  it 'should be properly executed' do
-    database = SqlMigrations::Database.new(:default, adapter: :sqlite)
-    database.execute_migrations
-    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)
+  context 'executing migrations' do
+    subject { -> { @database.migrate } }
+
+    it 'should be properly executed' do
+      subject.call
+      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)
+    end
+
+    context 'invalid migration' do
+      before do
+        File.open('/migrations/20150825_184010_invalid_migration.sql', 'w') do |f|
+          f.puts 'CREATE this_is_error TABLE invalid'
+        end
+      end
+
+      it 'should print warning about invalid migration' do
+        expect { subject.call }
+          .to output(/Error while executing migration invalid_migration !/).to_stdout
+          .and raise_error(Sequel::DatabaseError)
+      end
+    end
   end
 end

data/spec/features/scripts_spec.rb

@@ -0,0 +1,71 @@
+# rubocop:disable Metrics/LineLength
+describe 'sql scripts' do
+  before do
+    allow(SqlMigrations::Config).to receive(:databases) { { default: {}, test2_db: {} } }
+  end
+
+  context 'valid scripts set' do
+    before do
+      Dir.mkdir('/migrations')
+      Dir.mkdir('/seeds')
+
+      File.open('/migrations/20150305_154010_first_test_migration.sql', 'w') do |f|
+        f.puts 'CREATE TABLE first_test_table(col_int1 INTEGER, col_str1 STRING)'
+      end
+      File.open('/migrations/20150305_154011_second_test_migration.sql', 'w') do |f|
+        f.puts 'CREATE TABLE second_test_table(col_int2 INTEGER, col_str2 STRING)'
+      end
+      File.open('/seeds/20150305_154010_test_seed.sql', 'w') do |f|
+        f.puts 'INSERT INTO first_test_table(col_int1, col_str1) VALUES(123, "test_string1")'
+        f.puts 'INSERT INTO second_test_table(col_int2, col_str2) VALUES(456, "test_string2")'
+      end
+
+      Dir.mkdir('/migrations/test2_db')
+      File.open('/migrations/test2_db/20150511_144000_second_db_test_migration.sql', 'w') do |f|
+        f.puts 'CREATE TABLE second_db_test_table(col_int1 INTEGER, col_str1 STRING)'
+      end
+
+      Dir.mkdir('/migrations/default')
+      File.open('/migrations/default//20150511_144100_default_db_test2_migration.sql', 'w') do |f|
+        f.puts 'CREATE TABLE default_db_test2_table(col_int1 INTEGER, col_str1 STRING)'
+      end
+    end
+
+    it 'should be found' do
+      expect { SqlMigrations.scripts }.to \
+        output("Migration `/migrations/20150305_154010_first_test_migration.sql` for `default` database\n" \
+               "Migration `/migrations/20150305_154011_second_test_migration.sql` for `default` database\n" \
+               "Migration `/migrations/default/20150511_144100_default_db_test2_migration.sql` for `default` database\n" \
+               "Seed `/seeds/20150305_154010_test_seed.sql` for `default` database\n" \
+               "Migration `/migrations/test2_db/20150511_144000_second_db_test_migration.sql` for `test2_db` database\n"
+              ).to_stdout
+    end
+
+    it 'should raise an error if two files of same type with same timestamp are present' do
+      File.open('/migrations/default/20150511_144100_duplicated_timestamp_migration.sql', 'w') do |f|
+        f.puts 'CREATE TABLE duplicated_migration(col_int1 INTEGER)'
+      end
+
+      expect { SqlMigrations.scripts }.to raise_error(RuntimeError, /Duplicate time for migrations: .*/)
+    end
+  end
+
+  context 'invalid files' do
+    before do
+      Dir.mkdir('/migrations')
+      File.open('/migrations/20150511_144100_test_migration.sql', 'w') do |f|
+        f.puts 'CREATE TABLE test_migration(col_int1 INTEGER)'
+      end
+      File.open('/migrations/.20150511_144100_testp_migration.sql.swp', 'w') do |f|
+        f.puts 'CREATE TABLE testd_migration(col_int1 INTEGER)'
+      end
+    end
+
+    it 'should not find .*sw? files' do
+      expect { SqlMigrations.scripts }
+        .to output("Migration `/migrations/20150511_144100_test_migration.sql` for `default` database\n")
+        .to_stdout
+    end
+  end
+end
+# rubocop:enable Metrics/LineLength

data/spec/features/seed_spec.rb

@@ -10,8 +10,8 @@ describe 'seed' do
     end
     allow(SqlMigrations::Config).to receive(:databases) { { default: { development: {} } } }
     database = SqlMigrations::Database.new(:default, adapter: :sqlite)
-    database.execute_migrations
-    database.seed_database
+    database.migrate
+    database.seed
   end
 
   it 'should be properly execute' do

data/spec/spec_helper.rb

@@ -1,9 +1,9 @@
-require 'bundler/setup'
-require 'memfs'
 require 'simplecov'
+require 'memfs'
+require 'pp' # `superclass mismatch for class File` workaround
 
 SimpleCov.start
-Bundler.require
+require 'sql_migrations'
 
 RSpec.configure do |config|
   config.profile_examples = 2
@@ -16,11 +16,11 @@ RSpec.configure do |config|
     MemFs.activate!
     # Reset configuration for every test suite
     SqlMigrations::Config.instance_eval('@databases = nil; @options = nil')
-    @stdout, $stdout = $stdout, StringIO.new  # Catch STDOUT do variable
+    @stdout, $stdout = $stdout, StringIO.new # Catch STDOUT do variable
   end
 
   config.after do
-    $stdout, @stdout = @stdout, nil   # Reassign STDOUT
+    $stdout, @stdout = @stdout, nil # Reassign STDOUT
     MemFs.deactivate!
   end
 end

data/sql_migrations.gemspec

@@ -18,10 +18,10 @@ Gem::Specification.new do |spec|
   spec.require_paths = ['lib']
 
   # rubocop:disable Style/SingleSpaceBeforeFirstArg
-  spec.add_development_dependency 'rspec',   '~> 3.2.0'
+  spec.add_development_dependency 'rspec',   '~> 3.3'
   spec.add_development_dependency 'sqlite3', '~> 1.3.10'
   spec.add_development_dependency 'memfs',   '~> 0.4.3'
-  spec.add_development_dependency 'rubocop', '~> 0.31.0'
+  spec.add_development_dependency 'rubocop', '~> 0.33'
   spec.add_development_dependency 'simplecov', '~> 0.10.0'
   spec.add_dependency             'bundler', '~> 1.7'
   spec.add_dependency             'rake',    '~> 10.0'

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: sql_migrations
 version: !ruby/object:Gem::Version
-  version: 2.2.1
+  version: 2.4.0
 platform: ruby
 authors:
 - Grzegorz Bizon
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-05-19 00:00:00.000000000 Z
+date: 2015-08-27 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rspec
@@ -16,14 +16,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 3.2.0
+        version: '3.3'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 3.2.0
+        version: '3.3'
 - !ruby/object:Gem::Dependency
   name: sqlite3
   requirement: !ruby/object:Gem::Requirement
@@ -58,14 +58,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.31.0
+        version: '0.33'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.31.0
+        version: '0.33'
 - !ruby/object:Gem::Dependency
   name: simplecov
   requirement: !ruby/object:Gem::Requirement
@@ -140,24 +140,21 @@ files:
 - lib/sql_migrations.rb
 - lib/sql_migrations/config.rb
 - lib/sql_migrations/database.rb
-- lib/sql_migrations/fixture.rb
+- lib/sql_migrations/file.rb
 - lib/sql_migrations/migration.rb
-- lib/sql_migrations/script_file.rb
+- lib/sql_migrations/script.rb
 - lib/sql_migrations/seed.rb
-- lib/sql_migrations/sql_script.rb
-- lib/sql_migrations/tasks/list.rake
 - lib/sql_migrations/tasks/migrate.rake
+- lib/sql_migrations/tasks/scripts.rake
 - lib/sql_migrations/tasks/seed.rake
-- lib/sql_migrations/tasks/seed_test.rake
 - lib/sql_migrations/version.rb
 - spec/features/config_spec.rb
-- spec/features/fixture_spec.rb
+- spec/features/history_table_spec.rb
 - spec/features/migration_multistatement_spec.rb
 - spec/features/migration_order_spec.rb
 - spec/features/migration_spec.rb
-- spec/features/schema_table_spec.rb
+- spec/features/scripts_spec.rb
 - spec/features/seed_spec.rb
-- spec/features/sql_scripts_spec.rb
 - spec/spec_helper.rb
 - sql_migrations.gemspec
 homepage: http://github.com/grzesiek/sql_migrations
@@ -186,12 +183,11 @@ specification_version: 4
 summary: Simple standalone migrations you can use with plain SQL
 test_files:
 - spec/features/config_spec.rb
-- spec/features/fixture_spec.rb
+- spec/features/history_table_spec.rb
 - spec/features/migration_multistatement_spec.rb
 - spec/features/migration_order_spec.rb
 - spec/features/migration_spec.rb
-- spec/features/schema_table_spec.rb
+- spec/features/scripts_spec.rb
 - spec/features/seed_spec.rb
-- spec/features/sql_scripts_spec.rb
 - spec/spec_helper.rb
 has_rdoc: 

data/lib/sql_migrations/fixture.rb

@@ -1,13 +0,0 @@
-module SqlMigrations
-  # Fixture class
-  #
-  class Fixture < SqlScript
-    def self.find(database_name)
-      super(database_name, :fixture)
-    end
-
-    def to_s
-      "Fixture #{@name} for `#{@database_name}` database, datetime: #{@date + @time}"
-    end
-  end
-end

data/lib/sql_migrations/script_file.rb

@@ -1,59 +0,0 @@
-module SqlMigrations
-  # Class representing script file
-  #
-  class ScriptFile
-    attr_reader :name, :time, :date, :database_name, :path
-
-    def initialize(path, database_name, type)
-      @filename,
-      @base_directory,
-      @parent_directory   = path_elements(path)
-      @path               = path
-      @type               = type.to_s
-      @database_name      = database_name
-      @date, @time, @name = match_regexp(@filename) if @filename
-    end
-
-    def content
-      File.read(@path)
-    end
-
-    def valid?
-      (@name && @time && @date && @database_name && matches_directories?) ? true : false
-    end
-
-    private
-
-    def path_elements(path)
-      _filename, _base_directory, _parent_directory =
-        path.split(File::SEPARATOR).last(3).reverse
-    end
-
-    def match_regexp(filename)
-      _, date, time, name =
-        filename.match(/(\d{8})_(\d{6})_(.*)?\.sql/).to_a
-      [date, time, name]
-    end
-
-    def matches_directories?
-      if @database_name == :default
-        file_in_type_base_directory? || file_in_database_directory?
-      else
-        file_in_database_directory?
-      end
-    end
-
-    def file_in_type_base_directory?
-      @base_directory == "#{@type}s"
-    end
-
-    def file_in_type_parent_directory?
-      @parent_directory == "#{@type}s"
-    end
-
-    def file_in_database_directory?
-      file_in_type_parent_directory? &&
-        (@base_directory == @database_name.to_s)
-    end
-  end
-end

data/lib/sql_migrations/sql_script.rb

@@ -1,70 +0,0 @@
-module SqlMigrations
-  # SqlScript class
-  #
-  class SqlScript < ScriptFile
-    def initialize(path, database_name, type)
-      super
-      @datetime = (@date.to_s + @time.to_s).to_i
-    end
-
-    def execute(db)
-      @database = db
-      return false unless new?
-      driver = @database.driver
-      begin
-        driver.transaction do
-          @benchmark = Benchmark.measure do
-            statements.each { |query| driver.run(query) }
-          end
-        end
-      rescue
-        puts "[-] Error while executing #{@type} #{@name} !"
-        raise
-      else
-        true & on_success
-      end
-    end
-
-    def statements
-      separator = Config.options[:separator]
-      if separator
-        statements = content.split(separator)
-        statements.collect!(&:strip)
-        statements.reject(&:empty?)
-      else
-        [content]
-      end
-    end
-
-    def self.find(database_name, type)
-      scripts = []
-      Find.find(Dir.pwd) do |path|
-        candidate = new(path, database_name, type)
-        scripts << candidate if candidate.valid?
-      end
-      scripts.sort_by { |file| (file.date + file.time).to_i }
-    end
-
-    private
-
-    def new?
-      schema = @database.schema_dataset
-      last = schema.order(Sequel.asc(:time)).where(type: @type).last
-      is_new = schema.where(time: @datetime, type: @type).count == 0
-      if is_new && !last.nil?
-        if last[:time] > @datetime
-          raise "#{@type.capitalize} #{@name} has time BEFORE last one recorded !"
-        end
-      end
-      is_new
-    end
-
-    def on_success
-      puts "[+] Successfully executed #{@type}, name: #{@name}"
-      puts "    #{@type.capitalize} file: #{@date}_#{@time}_#{@name}.sql"
-      puts "    Benchmark: #{@benchmark}"
-      schema = @database.schema_dataset
-      schema.insert(time: @datetime, name: @name, type: @type, executed: DateTime.now)
-    end
-  end
-end

data/lib/sql_migrations/tasks/seed_test.rake

@@ -1,10 +0,0 @@
-namespace :sqlmigrations do
-  namespace :db do
-    namespace :test do
-      desc 'Seed test database with fixtures'
-      task :seed do
-        SqlMigrations.seed_test
-      end
-    end
-  end
-end

data/spec/features/fixture_spec.rb

@@ -1,22 +0,0 @@
-describe 'fixture' do
-  before do
-    Dir.mkdir('/migrations')
-    File.open('/migrations/20150305_154010_test_migration.sql', 'w') do |f|
-      f.puts 'CREATE TABLE test_table_fixture(col_int INTEGER, col_str STRING)'
-    end
-    Dir.mkdir('/fixtures')
-    File.open('/fixtures/20150305_154012_test_fixture.sql', 'w') do |f|
-      f.puts 'INSERT INTO test_table_fixture VALUES(12, "test_string_fixture")'
-    end
-    allow(SqlMigrations::Config).to receive(:databases) { { default: { development: {} } } }
-    database = SqlMigrations::Database.new(:default, adapter: :sqlite)
-    database.execute_migrations
-    database.seed_with_fixtures
-  end
-
-  it 'should be properly executed' do
-    expect(@sqlite_db.table_exists?(:test_table_fixture)).to be true
-    expect(@sqlite_db[:test_table_fixture].first)
-      .to eq(col_int: 12, col_str: 'test_string_fixture')
-  end
-end

data/spec/features/sql_scripts_spec.rb

@@ -1,47 +0,0 @@
-# rubocop:disable Metrics/LineLength
-describe 'sql scripts' do
-  before do
-    Dir.mkdir('/migrations')
-    Dir.mkdir('/fixtures')
-    Dir.mkdir('/seeds')
-
-    File.open('/migrations/20150305_154010_first_test_migration.sql', 'w') do |f|
-      f.puts 'CREATE TABLE first_test_table(col_int1 INTEGER, col_str1 STRING)'
-    end
-    File.open('/migrations/20150305_154011_second_test_migration.sql', 'w') do |f|
-      f.puts 'CREATE TABLE second_test_table(col_int2 INTEGER, col_str2 STRING)'
-    end
-    File.open('/seeds/20150305_154010_test_seed.sql', 'w') do |f|
-      f.puts 'INSERT INTO first_test_table(col_int1, col_str1) VALUES(123, "test_string1")'
-      f.puts 'INSERT INTO second_test_table(col_int2, col_str2) VALUES(456, "test_string2")'
-    end
-    File.open('/fixtures/20150518_154012_test_fixture.sql', 'w') do |f|
-      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
-
-    Dir.mkdir('/migrations/test2_db')
-    File.open('/migrations/test2_db/20150511_144000_second_db_test_migration.sql', 'w') do |f|
-      f.puts 'CREATE TABLE second_db_test_table(col_int1 INTEGER, col_str1 STRING)'
-    end
-
-    Dir.mkdir('/migrations/default')
-    File.open('/migrations/default//20150511_144100_default_db_test2_migration.sql', 'w') do |f|
-      f.puts 'CREATE TABLE default_db_test2_table(col_int1 INTEGER, col_str1 STRING)'
-    end
-
-    allow(SqlMigrations::Config).to receive(:databases) { { default: {}, test2_db: {} } }
-  end
-
-  it 'should be found' do
-    expect { SqlMigrations.list_files }.to \
-      output("Migration first_test_migration for `default` database, datetime: 20150305154010\n" \
-             "Migration second_test_migration for `default` database, datetime: 20150305154011\n" \
-             "Migration default_db_test2_migration for `default` database, datetime: 20150511144100\n" \
-             "Seed data test_seed for `default` database, datetime: 20150305154010\n" \
-             "Fixture test_fixture for `default` database, datetime: 20150518154012\n" \
-             "Migration second_db_test_migration for `test2_db` database, datetime: 20150511144000\n"
-            ).to_stdout
-  end
-end
-# rubocop:enable Metrics/LineLength