rubocop cleanup

This commit is contained in:
Priit Tark 2015-01-19 14:57:41 +02:00
parent 3d3d634882
commit 1acaafd922
4 changed files with 14 additions and 12 deletions

View file

@ -5,6 +5,8 @@ AllCops:
- 'Guardfile'
# stuff generated by AR and rails
- 'db/schema.rb'
- 'db/whois_schema.rb'
- 'db/api_log_schema.rb'
- 'db/migrate/*'
# epp support files until 'complexity issues' will be solved
- 'spec/support/epp.rb'

View file

@ -2,7 +2,7 @@ namespace :api_log do
namespace :test do
namespace :schema do
# desc 'Dump additional database schema'
task :dump => [:environment] do
task dump: [:environment] do
filename = "#{Rails.root}/db/api_log_schema.rb"
File.open(filename, 'w:utf-8') do |file|
ActiveRecord::Base.establish_connection("api_log_#{Rails.env}".to_sym)
@ -11,21 +11,21 @@ namespace :api_log do
end
# desc 'Purge and load foo_test schema'
task :load => [:environment] do
task load: [:environment] do
# like db:test:purge
abcs = ActiveRecord::Base.configurations
ActiveRecord::Base.clear_all_connections!
ActiveRecord::Base.connection.drop_database("api_log_test")
ActiveRecord::Base.connection.create_database("api_log_test", abcs["api_log_test"])
ActiveRecord::Base.connection.drop_database('api_log_test')
ActiveRecord::Base.connection.create_database('api_log_test', abcs['api_log_test'])
# like db:test:load_schema
ActiveRecord::Base.establish_connection("api_log_test")
ActiveRecord::Base.establish_connection('api_log_test')
ActiveRecord::Schema.verbose = false
load("#{Rails.root}/db/api_log_schema.rb")
end
task :reload => [:environment] do
task reload: [:environment] do
Rake::Task['api_log:test:schema:dump'].invoke
Rake::Task['api_log:test:schema:load'].invoke
end

View file

@ -16,14 +16,14 @@ namespace :db do
namespace :all do
desc 'Create all databases: registry, api_log and whois'
task :setup => [:environment] do
task setup: [:environment] do
Rake::Task['db:all:create'].invoke
Rake::Task['db:all:schema:load'].invoke
Rake::Task['db:seed'].invoke
end
desc 'Create all databases: registry, api_log and whois'
task :create => [:environment] do
task create: [:environment] do
databases.each do |name|
begin
conf = ActiveRecord::Base.configurations
@ -37,7 +37,7 @@ namespace :db do
namespace :schema do
desc 'Schema load for all databases: registry, api_log and whois'
task :load => [:environment] do
task load: [:environment] do
databases.each do |name|
begin
puts "\n---------------------------- #{name} ----------------------------------------\n"
@ -54,7 +54,7 @@ namespace :db do
end
desc 'Schema load for all databases: registry, api_log and whois'
task :dump => [:environment] do
task dump: [:environment] do
databases.each do |name|
begin
puts "\n---------------------------- #{name} ----------------------------------------\n"

View file

@ -40,6 +40,6 @@ begin
`kill #{pid}`
end
end
rescue LoadError
# rspec gem not loaded, probably we are in production machine
rescue LoadError => e
puts e # rspec gem not loaded, probably we are in production machine
end