Kouhei Sutou
null+****@clear*****
Tue Mar 7 13:59:02 JST 2017
Kouhei Sutou 2017-03-07 13:59:02 +0900 (Tue, 07 Mar 2017) New Revision: e76d06c9384f68054480e67ee23bdb7b68ead54f https://github.com/ranguba/groonga-client-model/commit/e76d06c9384f68054480e67ee23bdb7b68ead54f Message: Share common path Modified files: lib/groonga_client_model/migrator.rb lib/groonga_client_model/railties/groonga.rake lib/rails/generators/groonga_client_model/migration_generator.rb Modified: lib/groonga_client_model/migrator.rb (+4 -0) =================================================================== --- lib/groonga_client_model/migrator.rb 2017-03-07 12:54:45 +0900 (42ac196) +++ lib/groonga_client_model/migrator.rb 2017-03-07 13:59:02 +0900 (081ec5e) @@ -22,6 +22,10 @@ module GroongaClientModel def next_migration_number(number) [Time.now.utc.strftime("%Y%m%d%H%M%S"), "%.14d" % number].max end + + def default_search_path + "db/groonga/migrate" + end end attr_accessor :output Modified: lib/groonga_client_model/railties/groonga.rake (+2 -1) =================================================================== --- lib/groonga_client_model/railties/groonga.rake 2017-03-07 12:54:45 +0900 (320c3d2) +++ lib/groonga_client_model/railties/groonga.rake 2017-03-07 13:59:02 +0900 (7f21af1) @@ -37,7 +37,8 @@ namespace :groonga do desc "Migrate the Groonga database" task migrate: ["config:load"] do - Rails.application.paths["db/groonga/migrate"] ||= "db/groonga/migrate" + Rails.application.paths["db/groonga/migrate"] ||= + GroongaClientModel::Migrator.default_search_path migration_paths = Rails.application.paths["db/groonga/migrate"].to_a version = nil version = Integer(ENV["VERSION"]) if ENV["VERSION"] Modified: lib/rails/generators/groonga_client_model/migration_generator.rb (+2 -1) =================================================================== --- lib/rails/generators/groonga_client_model/migration_generator.rb 2017-03-07 12:54:45 +0900 (361707b) +++ lib/rails/generators/groonga_client_model/migration_generator.rb 2017-03-07 13:59:02 +0900 (e56ecc0) @@ -54,7 +54,8 @@ module GroongaClientModel IllegalMigrationNameError.validate(file_name) decide_template(file_name) migration_template(@migration_template, - File.join("db/groonga/migrate", "#{file_name}.rb")) + File.join(Migrator.default_search_path, + "#{file_name}.rb")) end private -------------- next part -------------- HTML����������������������������...Download