diff --git a/.rubocop.yml b/.rubocop.yml index 16450b1d3..ba9acf010 100644 --- a/.rubocop.yml +++ b/.rubocop.yml @@ -5,6 +5,7 @@ AllCops: - 'Guardfile' # stuff generated by AR and rails - 'db/schema.rb' + - 'db/schema-read-only.rb' - 'db/whois_schema.rb' - 'db/api_log_schema.rb' - 'db/migrate/*' diff --git a/app/models/bank_transaction.rb b/app/models/bank_transaction.rb index a5c8da94c..cd94b0220 100644 --- a/app/models/bank_transaction.rb +++ b/app/models/bank_transaction.rb @@ -3,7 +3,7 @@ class BankTransaction < ActiveRecord::Base belongs_to :bank_statement has_one :account_activity - scope :unbinded, -> { + scope :unbinded, lambda { where('id NOT IN (SELECT bank_transaction_id FROM account_activities where bank_transaction_id IS NOT NULL)') } diff --git a/lib/daemons/daemons b/lib/daemons/daemons index f021cee84..42722e47c 100755 --- a/lib/daemons/daemons +++ b/lib/daemons/daemons @@ -1,5 +1,5 @@ #!/usr/bin/env ruby results = [] -Dir[File.dirname(__FILE__) + "/*_ctl"].each {|f| results << `ruby #{f} #{ARGV.first}`} +Dir[File.dirname(__FILE__) + "/*_ctl"].each { |f| results << `ruby #{f} #{ARGV.first}` } results.delete_if { |result| result.nil? || result.empty? } -puts results.join unless results.empty? \ No newline at end of file +puts results.join unless results.empty? diff --git a/lib/daemons/que.rb b/lib/daemons/que.rb index 7586e65b8..c4ad0abf0 100755 --- a/lib/daemons/que.rb +++ b/lib/daemons/que.rb @@ -3,15 +3,16 @@ ENV["RAILS_ENV"] ||= "production" root = File.expand_path(File.dirname(__FILE__)) -root = File.dirname(root) until File.exists?(File.join(root, 'config')) +root = File.dirname(root) until File.exist?(File.join(root, 'config')) Dir.chdir(root) require File.join(root, "config", "environment") -$running = true +@running = true Signal.trap("TERM") do - $running = false + @running = false end -while($running) do +# rubocop: disable Style/WhileUntilDo +while @running do end diff --git a/lib/tasks/db.rake b/lib/tasks/db.rake index 9a91ddfcd..3d80d0f3b 100644 --- a/lib/tasks/db.rake +++ b/lib/tasks/db.rake @@ -22,7 +22,8 @@ end namespace :db do namespace :schema do task load: [:environment, :load_config] do - puts 'Only rake db:structure:load is supported and invoked now. Otherwise zonefile generation does not work nor que.' + puts 'Only rake db:structure:load is supported and invoked. ' \ + 'Otherwise zonefile generation does not work nor que.' Rake::Task["db:structure:load"].invoke end end