sql_migrations 2.0.0 → 2.1.0.pre1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 42c3ea2365d623408c9e3f9d5ceb34b46921b900
-  data.tar.gz: 2531176c8a89bdeac22974ecd785610e3ca49a02
+  metadata.gz: c557edf1205471dd615b56dee7ca0afccc72e856
+  data.tar.gz: 2b7490a12ee7fae0ae74dc36d236f2ed17a05b23
 SHA512:
-  metadata.gz: da725a80819cd777113d9b186196bfb5f658f6bf852957da9393e07dfe02ded1b34babddab5f1a78d2cc11385fcad8a30cfe990f0f3e33eba216ed3a90c80910
-  data.tar.gz: ee34ca3da429f23d42fd71d5e232583413b75c31a309c9681cc848a534b8ea038d8bdfdf14280e826abac7de99cae549b125509d2d9492c6ed191ce446d37921
+  metadata.gz: 90e584fecf119bd71eb61a731531e984461e52804f32975697e3f305ad8284c93500a92123349221d32bd0ac221573d93bb33456ca061236fb97549703891c5a
+  data.tar.gz: e5e0cb7a19408dc930d333013e384217cb73b881a0a147687b83cd802409506fc4e301d11229108d84d41c76170f72e42ae32bd8de2bd88771616fe9bf59c655

data/README.md

@@ -10,10 +10,10 @@ This gives you possibility to execute migrations, seed datebase (on production a
 
 ## Why ?
 
-This is particularly useful in old projects that don't have migration support, and you really want to use Continues Delivery strategy. 
+This is particularly useful in old projects that don't have migration support, and you really want to use Continuous Delivery strategy. 
 Without migrations you wouldn't be able to setup your test environment for automated testing (functional tests, unit tests, integration tests).
 
-For example, if you work on old Zend 1 project, and you want to take benefit from using Continues Deployment/Continues Integration mechanisms - you may find this project useful.
+For example, if you work on old Zend 1 project, and you want to take benefit from using Continuous Deployment/Continuous Integration mechanisms - you may find this project useful.
 
 ## Install
 
@@ -55,14 +55,13 @@ For example, if you work on old Zend 1 project, and you want to take benefit fro
         username: test_user
         password: test_pass
         host: 192.168.1.1
-        test:
+      test:
         adapter: mysql2
         encoding: utf8
-        database: test_db_test
-        username: test_user
-        password: test_pass
-        host: 192.168.1.1
-      
+        database: <%= ENV['DB_NAME'] %>
+        username: <%= ENV['DB_USER'] %>
+        password: <%= ENV['DB_PASS'] %>
+        host: <%=     ENV['DB_HOST'] %>
       production:
         adapter: mysql2
         encoding: utf8
@@ -70,7 +69,8 @@ For example, if you work on old Zend 1 project, and you want to take benefit fro
         username: test_user
         password: test_pass
         host: 192.168.1.100
-      second_db:
+        
+    second_db:
       development:
         adapter: mysql2
         encoding: utf8
@@ -78,7 +78,7 @@ For example, if you work on old Zend 1 project, and you want to take benefit fro
         username: test_user
         password: test_pass
         host: 127.0.0.1
-        test:
+      test:
         adapter: mysql2
         encoding: utf8
         database: second_db_test
@@ -89,7 +89,9 @@ For example, if you work on old Zend 1 project, and you want to take benefit fro
 
     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`:
+    As shown above, it is possible to use ERB-like syntax to use environment variables in config.
+
+4.  Migrations/seed/fixtures can be executed using rake tasks. So you will need to create `Rakefile`:
 
     ```ruby
     require 'bundler'

data/lib/sql_migrations/config.rb

@@ -1,11 +1,10 @@
 module SqlMigrations
   class Config
-
     class << self
       attr_reader :options
 
       def load!(config_file)
-        @options = YAML::load_file(config_file)
+        @options = YAML.load(ERB.new(File.new(config_file).read).result)
       end
     end
 
@@ -33,6 +32,5 @@ module SqlMigrations
       end
       databases
     end
-
   end
 end

data/lib/sql_migrations/version.rb

@@ -1,3 +1,3 @@
 module SqlMigrations
-  VERSION = "2.0.0"
+  VERSION = "2.1.0.pre1"
 end

data/spec/features/config_spec.rb

@@ -0,0 +1,16 @@
+describe 'loadable configuration file' do
+  before do
+    File.open('databases.yml', 'w') do |f|
+      f.puts 'default:'
+      f.puts '  test:'
+      f.puts '    adapter: sqlite3'
+      f.puts '    database: <%= ENV["DB_NAME"] %>'
+    end
+  end
+
+  it 'should use environment variables in config' do
+    ENV['DB_NAME'] = 'test_database'
+    SqlMigrations::Config.load! 'databases.yml'
+    expect(SqlMigrations::Config.options['default']['test']['database']).to eq 'test_database'
+  end
+end

data/spec/features/migration_order_spec.rb

@@ -1,5 +1,6 @@
 describe 'migrations valid order support engine' do
   before do
+    allow(SqlMigrations::Config).to receive(:options) { { "default" => { "development" => {}}} }
     $stdout = StringIO.new
     Dir.mkdir('/migrations')
     File.open('/migrations/20150305_154010_test_migration.sql', 'w') do |f|

data/spec/features/migration_spec.rb

@@ -4,6 +4,7 @@ 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(:options) { { "default" => { "development" => {}}} }
     @migration = SqlMigrations::Migration.find([ :default ]).first
   end
 

data/spec/features/schema_table_spec.rb

@@ -1,4 +1,7 @@
 describe 'schema table in database' do
+  before do
+    allow(SqlMigrations::Config).to receive(:options) { { "default" => { "development" => {}}} }
+  end
 
   it 'should be created if it does not exist' do
     expect do
@@ -22,5 +25,4 @@ describe 'schema table in database' do
     end.to output("[+] Connected to database using sqlite adapter\n").to_stdout
     expect(@database.db.table_exists?(:sqlmigrations_schema)).to be true
   end
-
 end

data/spec/features/sql_scripts_spec.rb

@@ -18,6 +18,7 @@ describe 'sql scripts' do
       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
+    allow(SqlMigrations::Config).to receive(:options) { { "default" => { "development" => {}}} }
   end
 
   it 'should be found' do

data/spec/spec_helper.rb

@@ -6,7 +6,6 @@ RSpec.configure do |config|
   config.before do
     @sqlite_db = Sequel.sqlite
     allow(SqlMigrations::Database).to receive(:connect) { @sqlite_db }
-    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: 2.0.0
+  version: 2.1.0.pre1
 platform: ruby
 authors:
 - Grzegorz Bizon
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-03-13 00:00:00.000000000 Z
+date: 2015-05-11 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rspec
@@ -120,6 +120,7 @@ files:
 - 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/migration_order_spec.rb
 - spec/features/migration_spec.rb
 - spec/features/schema_table_spec.rb
@@ -141,9 +142,9 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '0'
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
-  - - ">="
+  - - ">"
     - !ruby/object:Gem::Version
-      version: '0'
+      version: 1.3.1
 requirements: []
 rubyforge_project: 
 rubygems_version: 2.4.5
@@ -151,8 +152,10 @@ signing_key:
 specification_version: 4
 summary: Simple standalone migrations you can use with plain SQL
 test_files:
+- spec/features/config_spec.rb
 - spec/features/migration_order_spec.rb
 - spec/features/migration_spec.rb
 - spec/features/schema_table_spec.rb
 - spec/features/sql_scripts_spec.rb
 - spec/spec_helper.rb
+has_rdoc: