sql_migrations 2.1.0 → 2.1.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 3702a8ae9daa08ef8d63fff9cde70358adea5bc8
-  data.tar.gz: 8b081cb7388452a405898aac0a72e1d01c70222b
+  metadata.gz: fc164b4988352478c077939a9ed77564a15d52eb
+  data.tar.gz: 7c8dd94fd00064b7888154aa374568131813d3e9
 SHA512:
-  metadata.gz: 4e69925c88ca6bdcec48b4422c86b80b87899469ac06e7ecc84d5f0c068eb1b10f5847d59d64a366a0ba6d02960f180569a71d9e88542c19d2d1b7ea33ab6287
-  data.tar.gz: 82a75cd5b16f8b02ab6dc7de8384add3c3e401e5468104c7c9a94763e2af9cfdc19072c2af3ffa25c491cbac3c1238eae26414809494f8241fee0844ef32e9b8
+  metadata.gz: 43bfdee3da5cdd107dd72cd2eef9ef57a65a87abcb76c04b4735915b3ade80dae99e92880294eed5ac6c20a6abddab8c195085b0a44e03763ffed3517b8063e0
+  data.tar.gz: 55bf6583e6875822d9bec006c6027001f111d235621210715a837607e515db9cea4de462828f918231c312f16412cfc021c346a518b2b5c877d56a1549d01604

data/README.md

@@ -105,7 +105,7 @@ 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/seed/fixtures can be executed using rake tasks. So you will need to create `Rakefile`:
+4.  Migrations/seeds/fixtures can be executed using rake tasks. So you will need to create `Rakefile`:
 
     ```ruby
     require 'bundler'
@@ -147,7 +147,7 @@ For example, if you work on old Zend 1 project, and you want to take benefit fro
 
 ## Usage
 
-1.  Valid migration/seed/fixture file names match against regexp `/(\d{8})_(\d{6})_(.*)?\.sql/`. So valid filenames would be:
+1.  Valid migration/seeds/fixture file names match against regexp `/(\d{8})_(\d{6})_(.*)?\.sql/`. So valid filenames would be:
 
 
         20150303_180100_test_migration.sql
@@ -163,7 +163,7 @@ For example, if you work on old Zend 1 project, and you want to take benefit fro
             20150303_180100_test_migration.sql
           fixtures/
             20150303_180100_fixture1.sql
-          seed/
+          seeds/
             20150303_180100_whatever_description_of_seed.sql
 
     If you want to use multiple databases, create also database directories:
@@ -175,7 +175,7 @@ For example, if you work on old Zend 1 project, and you want to take benefit fro
           fixtures/
             default/
             second_db/
-          seed/
+          seeds/
             default/
             second_db/
 

data/lib/sql_migrations/find_scripts.rb

@@ -14,6 +14,8 @@ module SqlMigrations
         files
       end
 
+      private
+
       def match_file(db_dir, type, path)
         # parent_dir/base_dir/filename_that_matches_regexp.sql
         _filename, base_dir, parent_dir  = path.split(File::SEPARATOR).last(3).reverse
@@ -23,7 +25,7 @@ module SqlMigrations
         return nil unless file_parameters
 
         # Only files that lay in specific directory structure will do
-        file_database = file_match_directories(parent_dir, base_dir, db_dir, type)
+        file_database = file_match_directories(parent_dir, base_dir, db_dir, "#{type}s")
         return nil unless file_database
 
         { date: file_parameters[1], time: file_parameters[2],

data/lib/sql_migrations/migration.rb

@@ -3,7 +3,7 @@ module SqlMigrations
   #
   class Migration < SqlScript
     def self.find(db_name)
-      super(db_name, :migrations)
+      super(db_name, :migration)
     end
 
     def to_s

data/lib/sql_migrations/version.rb

@@ -1,5 +1,5 @@
 # SqlMigrations
 #
 module SqlMigrations
-  VERSION = '2.1.0'
+  VERSION = '2.1.1'
 end

data/spec/features/fixture_spec.rb

@@ -0,0 +1,22 @@
+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/migration_multistatement_spec.rb

@@ -15,7 +15,6 @@ describe 'multistatement migration' do
   end
 
   it 'should be properly executed' do
-    $stdout = StringIO.new
     database = SqlMigrations::Database.new(:default, adapter: :sqlite)
     @migration.execute(database)
     expect(@sqlite_db.table_exists?(:multi_test_table1)).to be true

data/spec/features/migration_order_spec.rb

@@ -1,7 +1,6 @@
 describe 'migrations valid order support engine' do
   before do
     allow(SqlMigrations::Config).to receive(:databases) { { default: { development: {} } } }
-    $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)'

data/spec/features/migration_spec.rb

@@ -25,9 +25,8 @@ describe 'migration' do
   end
 
   it 'should be properly executed' do
-    $stdout = StringIO.new
     database = SqlMigrations::Database.new(:default, adapter: :sqlite)
-    @migration.execute(database)
+    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)

data/spec/features/seed_spec.rb

@@ -0,0 +1,21 @@
+describe 'seed' do
+  before do
+    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
+    Dir.mkdir('/seeds')
+    File.open('/seeds/20150305_154011_test_seed.sql', 'w') do |f|
+      f.puts 'INSERT INTO test_table VALUES(10, "test_string")'
+    end
+    allow(SqlMigrations::Config).to receive(:databases) { { default: { development: {} } } }
+    database = SqlMigrations::Database.new(:default, adapter: :sqlite)
+    database.execute_migrations
+    database.seed_database
+  end
+
+  it 'should be properly execute' do
+    expect(@sqlite_db.table_exists?(:test_table)).to be true
+    expect(@sqlite_db[:test_table].first).to eq(col_int: 10, col_str: 'test_string')
+  end
+end

data/spec/features/sql_scripts_spec.rb

@@ -2,8 +2,8 @@
 describe 'sql scripts' do
   before do
     Dir.mkdir('/migrations')
-    Dir.mkdir('/seed')
     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)'
@@ -11,11 +11,11 @@ describe 'sql scripts' do
     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('/seed/20150305_154010_test_seed.sql', 'w') do |f|
+    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/20150305_154010_test_test_seed', 'w') do |f|
+    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
@@ -39,6 +39,7 @@ describe 'sql scripts' do
              "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

data/spec/spec_helper.rb

@@ -1,5 +1,8 @@
 require 'bundler/setup'
 require 'memfs'
+require 'simplecov'
+
+SimpleCov.start
 Bundler.require
 
 RSpec.configure do |config|
@@ -13,9 +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
   end
 
   config.after do
+    $stdout, @stdout = @stdout, nil   # Reassign STDOUT
     MemFs.deactivate!
   end
 end

data/sql_migrations.gemspec

@@ -22,8 +22,9 @@ Gem::Specification.new do |spec|
   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 'simplecov', '~> 0.10.0'
   spec.add_dependency             'bundler', '~> 1.7'
   spec.add_dependency             'rake',    '~> 10.0'
-  spec.add_dependency             'sequel',  '~> 4.19.0'
+  spec.add_dependency             'sequel',  '~> 4.22.0'
   # rubocop:enable Style/SingleSpaceBeforeFirstArg
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: sql_migrations
 version: !ruby/object:Gem::Version
-  version: 2.1.0
+  version: 2.1.1
 platform: ruby
 authors:
 - Grzegorz Bizon
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-05-14 00:00:00.000000000 Z
+date: 2015-05-18 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rspec
@@ -66,6 +66,20 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: 0.31.0
+- !ruby/object:Gem::Dependency
+  name: simplecov
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: 0.10.0
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: 0.10.0
 - !ruby/object:Gem::Dependency
   name: bundler
   requirement: !ruby/object:Gem::Requirement
@@ -100,14 +114,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 4.19.0
+        version: 4.22.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 4.19.0
+        version: 4.22.0
 description: 
 email:
 - grzegorz.bizon@ntsn.pl
@@ -137,10 +151,12 @@ files:
 - lib/sql_migrations/tasks/seed_test.rake
 - lib/sql_migrations/version.rb
 - spec/features/config_spec.rb
+- spec/features/fixture_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/seed_spec.rb
 - spec/features/sql_scripts_spec.rb
 - spec/spec_helper.rb
 - sql_migrations.gemspec
@@ -170,10 +186,12 @@ 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/migration_multistatement_spec.rb
 - spec/features/migration_order_spec.rb
 - spec/features/migration_spec.rb
 - spec/features/schema_table_spec.rb
+- spec/features/seed_spec.rb
 - spec/features/sql_scripts_spec.rb
 - spec/spec_helper.rb
 has_rdoc: