secondbase 2.0.0 → 2.1.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 957af9b02d7c9c9661dbf3068c11e3071a9f16e7
-  data.tar.gz: 4ff4ac5bec6b6eaee9f398e14f267b854894e954
+  metadata.gz: 78a47d016139857a1c9b4167e4b2960dd833ba78
+  data.tar.gz: 7bf629b8e5bb03a805c67ffc04daee46d4635be2
 SHA512:
-  metadata.gz: 157600ae2064ec41999df39dae6a01f14be0771056a1bdddd1d53f80300b8a65325552aaf49c5b95f4db7d44154806e99e0e09ec1c2f70d7eb185cc8db266271
-  data.tar.gz: 47a3bd10685228413f56559ce91353ef0bb10962facee6e282a3958fd661c521abce4ab953e38f205e19fea0200499365f613ae3afe4f50947f79f6557c6695b
+  metadata.gz: e300a7436d8528aa1342b4b5a9aa14a0d129668b38dace6a9c27bb1cd4bf4272fb8e6d2f899eead5c2fc8afd1b0b47aab80b46af49d56b8237b8fd223e40409b
+  data.tar.gz: 78f37cc71147a09b0fcac2f6582a0ce5d36f30286a68ce7b549b436b6d161dceea51b0b8a3a0fe3e715d0f388a7b212c8a4c601ffaed42d11921ec0f9dde5e71

data/README.md

@@ -34,7 +34,7 @@ secondbase:
 
 #### Database Tasks
 
-SecondBase aims to work seamlessly within your Rails application. When it makes sense, we run a mirrored `db:second_base` task for matching ActiveRecord base database task. For example:
+SecondBase aims to work seamlessly within your Rails application. When it makes sense, we run a mirrored `db:second_base` task for matching ActiveRecord base database task. These can all be deactivated by setting `config.second_base.run_with_db_tasks = false` in your Application's configuration. For example:
 
 ```shell
 $ rake db:create

data/VERSION

@@ -1 +1 @@
-2.0.0
+2.1.0

data/lib/second_base/databases.rake

@@ -113,7 +113,7 @@ end
   test:purge test:load_schema test:load_structure test:prepare
 }.each do |name|
   task = Rake::Task["db:#{name}"] rescue nil
-  next unless task
+  next unless task && SecondBase::Railtie.run_with_db_tasks?
   task.enhance do
     Rake::Task["db:load_config"].invoke
     Rake::Task["db:second_base:#{name}"].invoke

data/lib/second_base/databases_rails_five.rake

@@ -14,7 +14,7 @@ end
   drop:_unsafe
 }.each do |name|
   task = Rake::Task["db:#{name}"] rescue nil
-  next unless task
+  next unless task && SecondBase::Railtie.run_with_db_tasks?
   task.enhance do
     Rake::Task["db:load_config"].invoke
     Rake::Task["db:second_base:#{name}"].invoke

data/lib/second_base/databases_rails_four.rake

@@ -14,7 +14,7 @@ end
   drop
 }.each do |name|
   task = Rake::Task["db:#{name}"] rescue nil
-  next unless task
+  next unless task && SecondBase::Railtie.run_with_db_tasks?
   task.enhance do
     Rake::Task["db:load_config"].invoke
     Rake::Task["db:second_base:#{name}"].invoke

data/lib/second_base/railtie.rb

@@ -4,6 +4,7 @@ module SecondBase
     config.second_base = ActiveSupport::OrderedOptions.new
     config.second_base.path = 'db/secondbase'
     config.second_base.config_key = 'secondbase'
+    config.second_base.run_with_db_tasks = true
 
     config.after_initialize do |app|
       secondbase_dir = app.root.join(config.second_base.path)
@@ -38,6 +39,10 @@ module SecondBase
       config.second_base.config_key
     end
 
+    def run_with_db_tasks?
+      config.second_base.run_with_db_tasks
+    end
+
     def fullpath(extra=nil)
       path = Rails.root.join(config.second_base.path)
       (extra ? path.join(path, extra) : path).to_s

data/test/cases/dbtask_test.rb

@@ -207,9 +207,19 @@ class DbTaskTest < SecondBase::TestCase
     assert_match(/version: 20151202075826/, run_secondbase(:version))
   end
 
+  def test_secondbase_db_tasks_disabled
+    refute_dummy_databases
+    run_db :create, :stdout, false
+    assert_dummy_created_but_not_secondbase
+  end
 
   private
 
+  def assert_dummy_created_but_not_secondbase
+    assert_equal 'base.sqlite3', dummy_database_sqlite
+    refute_match(/secondbase_test/, `mysql -uroot -e "SHOW DATABASES"`)
+  end
+
   def assert_no_tables
     if ActiveRecord::Base.connection.respond_to? :data_sources
       assert_equal [], ActiveRecord::Base.connection.data_sources

data/test/dummy_apps/rails_five/init.rb

@@ -33,7 +33,9 @@ module Dummy
 
     config.active_record.schema_format = ENV['SCHEMA_FORMAT'] ? :sql : :ruby
 
-
+    if ENV['WITH_SECONDBASE_TASKS'].present?
+      config.second_base.run_with_db_tasks = ENV['WITH_SECONDBASE_TASKS'] == 'true'
+    end
   end
 end
 

data/test/dummy_apps/rails_four/init.rb

@@ -33,7 +33,9 @@ module Dummy
 
     config.active_record.schema_format = ENV['SCHEMA_FORMAT'] ? :sql : :ruby
 
-
+    if ENV['WITH_SECONDBASE_TASKS'].present?
+      config.second_base.run_with_db_tasks = ENV['WITH_SECONDBASE_TASKS'] == 'true'
+    end
   end
 end
 

data/test/test_helpers/dummy_app_helpers.rb

@@ -66,9 +66,9 @@ module SecondBase
       'rake'
     end
 
-    def run_db(args, stream=:stdout)
+    def run_db(args, stream=:stdout, with_secondbase_tasks=true)
       capture(stream) do
-        Dir.chdir(dummy_root) { Kernel.system "#{run_cmd} db:#{args}" }
+        Dir.chdir(dummy_root) { Kernel.system "env WITH_SECONDBASE_TASKS=#{with_secondbase_tasks} #{run_cmd} db:#{args}" }
       end
     end
 

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: secondbase
 version: !ruby/object:Gem::Version
-  version: 2.0.0
+  version: 2.1.0
 platform: ruby
 authors:
 - Karle Durante
@@ -10,7 +10,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-05-11 00:00:00.000000000 Z
+date: 2016-05-14 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails