From 9c0b7a211a72120207c76da342d97886a5266b94 Mon Sep 17 00:00:00 2001 From: Priit Tark Date: Mon, 19 Jan 2015 13:26:07 +0200 Subject: [PATCH 1/5] Added Rails 4.2 and ruby 2.2.0 upgrade to changelog --- CHANGELOG.md | 1 + 1 file changed, 1 insertion(+) diff --git a/CHANGELOG.md b/CHANGELOG.md index a326afc18..d051baedf 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -20,6 +20,7 @@ * Registry api log and whois database added, please update your database.yml, you can view updated config at config/database-example.yml +* Upgraded to Rails 4.2 and ruby 2.2.0, be sure you have ruby 2.2.0 in your rbenv 14.01.2015 From feaf01d4d8f438e439db7e39a3c8cff11c3d8934 Mon Sep 17 00:00:00 2001 From: Priit Tark Date: Mon, 19 Jan 2015 13:27:08 +0200 Subject: [PATCH 2/5] Added info about to upgrade deb Passenger --- CHANGELOG.md | 1 + 1 file changed, 1 insertion(+) diff --git a/CHANGELOG.md b/CHANGELOG.md index d051baedf..995c8ec75 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -21,6 +21,7 @@ * Registry api log and whois database added, please update your database.yml, you can view updated config at config/database-example.yml * Upgraded to Rails 4.2 and ruby 2.2.0, be sure you have ruby 2.2.0 in your rbenv + NB! Update you passenger deb install, it should have recent fix for ruby 2.2.0 14.01.2015 From 3d3d634882284686ce56d070bae9972ef446a181 Mon Sep 17 00:00:00 2001 From: Priit Tark Date: Mon, 19 Jan 2015 14:29:53 +0200 Subject: [PATCH 3/5] added epp branch --- app/views/layouts/login.haml | 2 +- config/deploy.rb | 8 ++++++++ 2 files changed, 9 insertions(+), 1 deletion(-) diff --git a/app/views/layouts/login.haml b/app/views/layouts/login.haml index e1cc4226e..68d2506dd 100644 --- a/app/views/layouts/login.haml +++ b/app/views/layouts/login.haml @@ -1,5 +1,5 @@ !!! -%html{:lang => "en"} +%html{:lang => I18n.locale.to_s} %head %meta{:charset => "utf-8"}/ %meta{:content => "IE=edge", "http-equiv" => "X-UA-Compatible"}/ diff --git a/config/deploy.rb b/config/deploy.rb index 8742d69d0..0884e6140 100644 --- a/config/deploy.rb +++ b/config/deploy.rb @@ -17,6 +17,14 @@ set :deploy_to, '$HOME/registry' set :repository, 'https://github.com/domify/registry' # dev repo set :branch, 'master' +# alpha branch +task :epp do + set :domain, 'registry-st' + set :deploy_to, '$HOME/epp' + set :repository, 'https://github.com/domify/registry' # dev repo + set :branch, 'master' +end + # staging task :st do set :domain, 'registry-st' From 1acaafd922cebfe4928b9f41e605e6a738d5b41f Mon Sep 17 00:00:00 2001 From: Priit Tark Date: Mon, 19 Jan 2015 14:57:41 +0200 Subject: [PATCH 4/5] rubocop cleanup --- .rubocop.yml | 2 ++ lib/tasks/api_log.rake | 12 ++++++------ lib/tasks/db.rake | 8 ++++---- lib/tasks/test.rake | 4 ++-- 4 files changed, 14 insertions(+), 12 deletions(-) diff --git a/.rubocop.yml b/.rubocop.yml index edf06c38d..97dd92102 100644 --- a/.rubocop.yml +++ b/.rubocop.yml @@ -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' diff --git a/lib/tasks/api_log.rake b/lib/tasks/api_log.rake index b077cd0db..c3cb347bc 100644 --- a/lib/tasks/api_log.rake +++ b/lib/tasks/api_log.rake @@ -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 diff --git a/lib/tasks/db.rake b/lib/tasks/db.rake index cef6b0ae1..4c627ea95 100644 --- a/lib/tasks/db.rake +++ b/lib/tasks/db.rake @@ -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" diff --git a/lib/tasks/test.rake b/lib/tasks/test.rake index f4133c46b..e8dc5ccfa 100644 --- a/lib/tasks/test.rake +++ b/lib/tasks/test.rake @@ -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 From f5fea7c0a6b04fe6d0bfa33edc375955e0ba6f35 Mon Sep 17 00:00:00 2001 From: Priit Tark Date: Mon, 19 Jan 2015 15:08:33 +0200 Subject: [PATCH 5/5] added application yml to robot --- bin/robot | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/bin/robot b/bin/robot index 7db17d810..9962dcea3 100755 --- a/bin/robot +++ b/bin/robot @@ -15,7 +15,7 @@ export RAILS_ENV=test # cd to Rails root directory cd "$(dirname "$0")"; cd .. -# cp config/secrets-example.yml config/secrets.yml +cp config/application-example.yml config/application.yml # create manually config/database.yml bundle install