Merge branch 'release/v0.0.8'

Author: madAle

lib/fancybox2/migrations/runner.rb

@@ -3,14 +3,14 @@ module Migrations
     class Runner
       include Exceptions
 
-      VERSION_REGEXP = /^(\d{14})/.freeze
+      VERSION_REGEXP = /^(\d+)/.freeze
 
       class << self
 
         def extract_and_validate_version_from(migration_name)
           version = migration_name.to_s.scan(VERSION_REGEXP).flatten.first
           unless version
-            raise ArgumentError, 'migration version must be a 14 digits integer'
+            raise ArgumentError, 'migration name must start with an integer number e.g: 02_do_something.rb'
           end
 
           version.to_i
@@ -24,7 +24,7 @@ def initialize(files_path)
 
         load_migrations
       end
-      
+
       # @param from a valid migration name or version
       # @param to a valid migration name or version
       def run(from: nil, to: nil)
@@ -40,13 +40,13 @@ def run(from: nil, to: nil)
 
       def load_migrations
         # Load files from files_path and create classes
-        @migrations = Dir[File.join(File.expand_path(files_path), '**', '*.rb')].sort.map do |f_path|
-          migration_name = File.basename(f_path)
+        @migrations = Dir[File.join(File.expand_path(files_path), '**', '*.rb')].map do |file_path|
+          migration_name = File.basename(file_path)
           klass = Class.new(Base)
-          klass.class_eval(File.read(f_path), f_path)
+          klass.class_eval(File.read(file_path), file_path)
           klass.freeze
           klass.new migration_name
-        end
+        end.sort_by { |migration| migration.version }
       end
 
       # Select migrations to run depending given a starting and an ending one

lib/fancybox2/version.rb

@@ -1,5 +1,5 @@
 # frozen_string_literal: true
 
 module Fancybox2
-  VERSION = '0.0.7'
+  VERSION = '0.0.8'
 end