Merge pull request #425 from SUSE/remove-i18n_boot_initializer

Remove i18n boot initializer
SUSE · Jun 26, 2019 · f06fa3c · f06fa3c
2 parents 7553c20 + e2862f7
commit f06fa3c
Show file tree

Hide file tree

Showing 15 changed files with 44 additions and 13 deletions.
diff --git a/bin/rmt-cli b/bin/rmt-cli
@@ -12,19 +12,12 @@ require 'active_record'
 require 'erb'
 require 'yaml'
 require 'rmt/config'
-require 'fast_gettext'
 require 'initializers/rmt_fast_gettext'
+require 'initializers/rmt_fast_gettext_cli_locale'
 
 relative_load_paths = %w[lib lib/rmt app/models app/services].map { |dir| File.join(rmt_path, dir) }
 ActiveSupport::Dependencies.autoload_paths += relative_load_paths
 
-# rubocop:disable Style/MixinUsage
-include FastGettext::Translation
-# rubocop:enable Style/MixinUsage
-
-locale = (ENV['LANG'] || ENV['LC_CTYPE']).to_s.match(/^([a-z]{2,}(_[A-Z]{2,})?)/).to_a[1] || :en
-FastGettext.set_locale(locale.to_sym)
-
 if RMT::CLI::Base.process_user_name == 'root'
   # set group and then user, otherwise user cannot change group
   Process::Sys.setegid(Etc.getgrnam(RMT::DEFAULT_GROUP).gid)

diff --git a/bin/rmt-data-import b/bin/rmt-data-import
@@ -5,7 +5,6 @@ RMT_PATH = File.expand_path('..', __dir__)
 
 # Load initial configuration for rmt
 require_relative "#{RMT_PATH}/config/boot"
-require_relative "#{RMT_PATH}/config/boot_cli_i18n"
 
 # Add rmt_path to library load path
 $LOAD_PATH.unshift File.join(RMT_PATH, 'lib')
@@ -19,6 +18,8 @@ require 'yaml'
 require 'rmt/config'
 require 'csv'
 require 'json'
+require 'initializers/rmt_fast_gettext'
+require 'initializers/rmt_fast_gettext_cli_locale'
 require 'rmt/cli/smt_importer'
 
 no_systems = false

diff --git a/docker-compose-test.yml b/docker-compose-test.yml
@@ -22,6 +22,7 @@ services:
     privileged: true
     volumes:
       - /space/oscbuild:/oscbuild:cached
+      - ./:/tmp/workdir:ro
     build:
       context: .
       dockerfile: integration/Dockerfile.test

diff --git a/features/import_spec.rb b/features/import_spec.rb
@@ -0,0 +1,15 @@
+require File.expand_path('../support/command_rspec_helper', __FILE__)
+
+describe 'rmt data importer' do
+  describe 'import repo from smt' do
+    before do
+      command '/usr/bin/rmt-data-import --no-systems --no-hwinfo -d /tmp/rmt-server/spec/fixtures/files/dummy_export'
+    end
+    after do
+      `/usr/bin/rmt-cli repos disable 3114`
+    end
+    it do
+      expect(`/usr/bin/rmt-cli repos list`).to include('3114', '| Mirror')
+    end
+  end
+end
diff --git a/integration/Dockerfile.test b/integration/Dockerfile.test
@@ -31,7 +31,7 @@ RUN sh integration/create-rmt-conf.sh
 RUN mkdir -p /var/lib/rmt/
 RUN printf "$SYSTEM_UUID" >> /var/lib/rmt/system_uuid
 
-ADD . /tmp/rmt-server
+COPY ./ /tmp/rmt-server
 RUN NOKOGIRI_USE_SYSTEM_LIBRARIES=1 bundle install
 
 CMD dockerize -wait tcp://$MYSQL_HOST:3306 -timeout 60s true
diff --git a/integration/run.sh b/integration/run.sh
@@ -1,4 +1,10 @@
 #!/bin/sh -xe
+
+# update project
+rm -r /tmp/rmt-server/*
+cp -r /tmp/workdir/* /tmp/rmt-server
+chown -R scc /tmp/rmt-server
+
 make dist
 mkdir ~/obs
 cd ~/obs

diff --git a/lib/initializers/rmt_fast_gettext.rb b/lib/initializers/rmt_fast_gettext.rb
@@ -1,4 +1,10 @@
 # Configure fast_gettext for i18n.
+require 'fast_gettext'
+
+# rubocop:disable Style/MixinUsage
+include FastGettext::Translation
+# rubocop:enable Style/MixinUsage
+
 rmt_path = File.expand_path('../../', __dir__)
 FastGettext.add_text_domain('rmt', path: File.join(rmt_path, 'locale'), type: :po, ignore_fuzzy: true, report_warning: false)
 FastGettext.default_locale = :en

diff --git a/lib/initializers/rmt_fast_gettext_cli_locale.rb b/lib/initializers/rmt_fast_gettext_cli_locale.rb
@@ -0,0 +1,4 @@
+# :nocov:
+locale = (ENV['LANG'] || ENV['LC_CTYPE']).to_s.match(/^([a-z]{2,}(_[A-Z]{2,})?)/).to_a[1] || :en
+FastGettext.set_locale(locale.to_sym)
+# :nocov:
diff --git a/lib/rmt.rb b/lib/rmt.rb
@@ -1,5 +1,5 @@
 module RMT
-  VERSION ||= '2.2.0'.freeze
+  VERSION ||= '2.2.1'.freeze
 
   DEFAULT_USER = '_rmt'.freeze
   DEFAULT_GROUP = 'nginx'.freeze

diff --git a/lib/rmt/cli/smt_importer.rb b/lib/rmt/cli/smt_importer.rb
@@ -1,7 +1,6 @@
 require 'csv'
 require 'ostruct'
 
-
 class SMTImporter
   attr_accessor :data_dir
   attr_accessor :no_systems

diff --git a/package/obs/rmt-server.changes b/package/obs/rmt-server.changes
@@ -1,3 +1,8 @@
+-------------------------------------------------------------------
+Wed Jun 26 12:14:44 UTC 2019 - Serhii Kotov <skotov@suse.com>
+- Version 2.2.1
+- Fix dependency to removed boot_cli_i18n file (bsc#1136020) 
+
 -------------------------------------------------------------------
 Fri Jun 14 14:37:57 UTC 2019 - Ivan Kapelyukhin <ikapelyukhin@suse.com>
 

diff --git a/package/obs/rmt-server.spec b/package/obs/rmt-server.spec
@@ -25,7 +25,7 @@
 %define ruby_version %{rb_default_ruby_suffix}
 
 Name:           rmt-server
-Version:        2.2.0
+Version:        2.2.1
 Release:        0
 Summary:        Repository mirroring tool and registration proxy for SCC
 License:        GPL-2.0-or-later

diff --git a/spec/fixtures/files/dummy_export/activations.csv b/spec/fixtures/files/dummy_export/activations.csv
diff --git a/spec/fixtures/files/dummy_export/enabled_custom_repos.csv b/spec/fixtures/files/dummy_export/enabled_custom_repos.csv
diff --git a/spec/fixtures/files/dummy_export/enabled_repos.csv b/spec/fixtures/files/dummy_export/enabled_repos.csv
@@ -0,0 +1 @@
+3114