katello 3.0.2 → 3.1.0.rc1

data/lib/katello/permissions/content_host_permissions.rb

@@ -3,7 +3,7 @@ require 'katello/plugin.rb'
 Foreman::Plugin.find(:katello).security_block :content_hosts do
   permission :view_content_hosts,
              {
-               'katello/content_hosts'        => [:auto_complete_search],
+               'katello/content_hosts' => [:auto_complete_search],
                'katello/api/v2/systems' => [:index, :show, :errata, :package_profile, :product_content,
                                             :report, :releases, :available_host_collections],
                'katello/api/v2/host_collections' => [:systems]

data/lib/katello/tasks/clean_backend_objects.rake

@@ -3,7 +3,6 @@ namespace :katello do
   task :clean_backend_objects => ["environment"] do
     def cleanup_systems
       Katello::System.find_each do |system|
-
         if system.uuid.nil?
           cp_fail = true
           pulp_fail = true
@@ -24,11 +23,11 @@ namespace :katello do
     def test_method
       yield
       false
-    rescue RestClient::ResourceNotFound => e
+    rescue RestClient::ResourceNotFound
       true
-    rescue RestClient::Gone => e
+    rescue RestClient::Gone
       true
-    rescue RestClient::Conflict => e
+    rescue RestClient::Conflict
       true
     end
 
@@ -39,7 +38,7 @@ namespace :katello do
       # for more information
       cp_consumers = ::Katello::Resources::Candlepin::Consumer.get({})
       cp_consumers.reject! { |consumer| consumer['type']['label'] == 'uebercert' }
-      cp_consumer_ids = cp_consumers.map {|cons| cons["uuid"]}
+      cp_consumer_ids = cp_consumers.map { |cons| cons["uuid"] }
       katello_consumer_ids = ::Katello::System.pluck(:uuid)
       deletable_ids = cp_consumer_ids - katello_consumer_ids
       deletable_ids.each do |consumer_id|
@@ -50,7 +49,7 @@ namespace :katello do
         end
         begin
           Katello.pulp_server.extensions.consumer.delete(consumer_id)
-        rescue RestClient::ResourceNotFound => e
+        rescue RestClient::ResourceNotFound # rubocop:disable Lint/HandleExceptions
           #do nothing
         rescue RestClient::Exception => e
           p "exception when destroying pulp consumer #{consumer_id}:#{e.inspect}"

data/lib/katello/tasks/delete_orphaned_content.rake

@@ -1,5 +1,5 @@
 namespace :katello do
-  task :delete_orphaned_content => ["environment"]  do
+  task :delete_orphaned_content => ["environment"] do
     User.current = User.anonymous_admin
     Katello::Repository.delete_orphaned_content
     puts _("Orphaned content deletion started in background.")

data/lib/katello/tasks/jenkins.rake

@@ -1,7 +1,6 @@
 require File.expand_path("../engine", File.dirname(__FILE__))
 
 begin
-
   namespace :jenkins do
     task :katello do
       Rake::Task['jenkins:setup:minitest'].invoke
@@ -18,7 +17,6 @@ begin
       Rake::Task['rake:test:katello:test'].invoke
     end
   end
-
-rescue LoadError
+rescue LoadError # rubocop:disable Lint/HandleExceptions
   # ci/reporter/rake/rspec not present, skipping this definition
 end

data/lib/katello/tasks/jshint.rake

@@ -12,38 +12,37 @@ if Rails.env.development?
     ].join(",")
 
     Jshintrb::JshintTask.new :jshint do |t|
-      t.pattern         = 'app/assets/javascripts/**/*.js'
+      t.pattern = 'app/assets/javascripts/**/*.js'
       t.exclude_pattern = "{#{vendor_files}}.js"
-      t.globals         = {
-          "KT"      => true,
-          "Katello" => true,
-          "angular" => false,
+      t.globals = {
+        "KT"      => true,
+        "Katello" => true,
+        "angular" => false
       }
-      t.options         = {
-          :bitwise   => true,
-          :curly     => true,
-          :eqeqeq    => true,
-          :forin     => true,
-          :immed     => true,
-          :latedef   => false, # TODO: reenable this and fix
-          :newcap    => false,
-          :noarg     => true,
-          :noempty   => true,
-          :nonew     => true,
-          :plusplus  => true,
-          :regexp    => true,
-          :undef     => false,
-          :strict    => false,
-          :trailing  => true,
-          :browser   => true,
-          :jquery    => true,
-          :passfail  => false,
-          :white     => false,
-          :sub       => true,
-          :lastsemic => true,
-          :smarttabs => true
+      t.options = {
+        :bitwise   => true,
+        :curly     => true,
+        :eqeqeq    => true,
+        :forin     => true,
+        :immed     => true,
+        :latedef   => false, # TODO: reenable this and fix
+        :newcap    => false,
+        :noarg     => true,
+        :noempty   => true,
+        :nonew     => true,
+        :plusplus  => true,
+        :regexp    => true,
+        :undef     => false,
+        :strict    => false,
+        :trailing  => true,
+        :browser   => true,
+        :jquery    => true,
+        :passfail  => false,
+        :white     => false,
+        :sub       => true,
+        :lastsemic => true,
+        :smarttabs => true
       }
-
     end
   rescue LoadError
     warn "install jshintrb gem"

data/lib/katello/tasks/jsroutes.rake

@@ -1,5 +1,5 @@
 desc 'Regenerates js routes'
 task :jsroutes => :environment do
-  JsRoutes.generate!(Rails.root.join('app', 'assets', 'javascripts', 'common', 'routes.js'), :namespace => 'KT.routes', :exclude =>[ /^admin_/])
-  JsRoutes.generate!(Rails.root.join('app', 'assets', 'javascripts', 'common', 'bastion-routes.js'), :namespace => 'BASTION.KT.routes', :exclude =>[ /^admin_/], :camel_case => true)
+  JsRoutes.generate!(Rails.root.join('app', 'assets', 'javascripts', 'common', 'routes.js'), :namespace => 'KT.routes', :exclude => [/^admin_/])
+  JsRoutes.generate!(Rails.root.join('app', 'assets', 'javascripts', 'common', 'bastion-routes.js'), :namespace => 'BASTION.KT.routes', :exclude => [/^admin_/], :camel_case => true)
 end

data/lib/katello/tasks/regenerate_repo_metadata.rake

@@ -1,16 +1,14 @@
 namespace :katello do
-  task :regenerate_repo_metadata => ["environment"]  do
+  task :regenerate_repo_metadata => ["environment"] do
     User.current = User.first #set a user for orchestration
-    tasks = []
     puts "Regenerating repository information for all repositories:\n"
 
     Katello::Repository.all.each_with_index do |repo, i|
-      puts "Regenerating #{i+1}/#{repos.count} (#{repo.pulp_id})\n"
-      Katello::PulpTaskStatus::wait_for_tasks(repo.generate_metadata(:force_regeneration => true))
+      puts "Regenerating #{i + 1}/#{repos.count} (#{repo.pulp_id})\n"
+      Katello::PulpTaskStatus.wait_for_tasks(repo.generate_metadata(:force_regeneration => true))
     end
   end
 
-
   task :refresh_pulp_repo_details => ["environment"] do
     User.current = User.first
     Katello::Product.all.each do |product|

data/lib/katello/tasks/reindex.rake

@@ -1,23 +1,24 @@
 namespace :katello do
   class ReindexHelper
-    LOG_FILE = "#{Rails.root}/log/reindex.log"
+    LOG_FILE = "#{Rails.root}/log/reindex.log".freeze
 
     attr_accessor :reindex_logger
-    def get_logger
-      unless self.reindex_logger
-        self.reindex_logger = Logger.new(LOG_FILE)
-        self.reindex_logger.formatter = Logger::Formatter.new
-        self.reindex_logger.level = Logger::DEBUG
+
+    def reindex_logger
+      unless @reindex_logger
+        @reindex_logger = Logger.new(LOG_FILE)
+        @reindex_logger.formatter = Logger::Formatter.new
+        @reindex_logger.level = Logger::DEBUG
       end
-      self.reindex_logger
+      @reindex_logger
     end
 
     def log(message, options = {})
       puts message if options[:console]
       if options[:error]
-        get_logger.error(message)
+        reindex_logger.error(message)
       else
-        get_logger.info("#{message}")
+        reindex_logger.info("#{message}")
       end
     end
 
@@ -27,15 +28,15 @@ namespace :katello do
 
     def fetch_resource
       return yield
-    rescue RestClient::ResourceNotFound, RestClient::BadRequest => e
-        #ignore
+    rescue RestClient::ResourceNotFound, RestClient::BadRequest => _ # rubocop:disable Lint/HandleExceptions
+      # ignore
     end
 
     def index_objects(object_class)
       log("Re-indexing #{object_class.name}", :console => true)
       begin
         yield
-      rescue Exception => e
+      rescue => _
         if object_class.ancestors.include?(Katello::Glue::Pulp::PulpContentUnit)
           report_bad_backend_class(object_class.name)
         else
@@ -43,7 +44,7 @@ namespace :katello do
           object_class.each do |object|
             begin
               object.update_index
-            rescue Exception => e
+            rescue => e
               bad_objects << [object, e]
             end
           end
@@ -101,7 +102,7 @@ namespace :katello do
   end
 
   desc "Regenerates the search indicies for various Katello objects"
-  task :reindex => ["environment", "katello:check_ping"]  do
+  task :reindex => ["environment", "katello:check_ping"] do
     User.current = User.anonymous_admin #set a user for orchestration
 
     Dir.glob(Katello::Engine.root.to_s + '/app/models/katello/*.rb').each { |file| require file }
@@ -120,12 +121,12 @@ namespace :katello do
 
       begin
         model.index.import(objects) if objects.count > 0
-      rescue Exception => e
+      rescue => e
         bad_objects = []
         objects.each do |object|
           begin
             object.update_index
-          rescue Exception => e
+          rescue => e
             bad_objects << [object, e]
           end
         end

data/lib/katello/tasks/rubocop.rake

@@ -1,7 +1,6 @@
 require File.expand_path("../engine", File.dirname(__FILE__))
 
 namespace :katello do
-
   desc "Runs Rubocop style checker on Katello code"
   task :rubocop do
     system("cd #{Katello::Engine.root} && bundle exec rubocop")
@@ -13,7 +12,6 @@ namespace :katello do
             --require rubocop/formatter/checkstyle_formatter \
             --format RuboCop::Formatter::CheckstyleFormatter \
             --no-color --out rubocop.xml")
-    exit($?.exitstatus)
+    exit($CHILD_STATUS.exitstatus)
   end
-
 end

data/lib/katello/tasks/setup.rake

@@ -1,19 +1,18 @@
 namespace :katello do
-
   namespace :reset_backends do
     service_stop = "sudo /sbin/service %s status > /dev/null && sudo /sbin/service %s stop"
     service_start = "sudo /sbin/service %s start"
 
     task :pulp do
-      SERVICES = %w(httpd pulp_workers pulp_resource_manager pulp_celerybeat)
+      SERVICES = %w(httpd pulp_workers pulp_resource_manager pulp_celerybeat).freeze
       system(service_stop.gsub("%s", "mongod"))
 
-      SERVICES.each{|s| system(service_stop.gsub("%s", s)) }
+      SERVICES.each { |s| system(service_stop.gsub("%s", s)) }
       system("sudo rm -rf /var/lib/mongodb/pulp_database*")
       system(service_start.gsub("%s", "mongod"))
       sleep(10)
       fail "Cannot migrate pulp database" unless system("sudo -u apache /usr/bin/pulp-manage-db")
-      SERVICES.each{|s| system(service_start.gsub("%s", s)) }
+      SERVICES.each { |s| system(service_start.gsub("%s", s)) }
       puts "Pulp database reset."
     end
 

data/lib/katello/tasks/test.rake

@@ -1,16 +1,13 @@
 require File.expand_path("../engine", File.dirname(__FILE__))
 
 namespace :test do
-
   namespace :katello do
-
     desc "Run the Katello plugin spec test suite."
     task :spec => ['db:test:prepare'] do
-
       spec_task = Rake::TestTask.new('katello_spec_task') do |t|
         t.libs << ["test", "#{Katello::Engine.root}/test", "spec", "#{Katello::Engine.root}/spec"]
         t.test_files = [
-          "#{Katello::Engine.root}/spec/**/*_spec.rb",
+          "#{Katello::Engine.root}/spec/**/*_spec.rb"
         ]
         t.verbose = true
       end
@@ -19,32 +16,28 @@ namespace :test do
     end
 
     namespace :spec do
-
       desc "Run the Katello plugin spec test suite."
       task :routing => ['db:test:prepare'] do
-
         spec_task = Rake::TestTask.new('katello_spec_task') do |t|
           t.libs << ["test", "#{Katello::Engine.root}/test", "spec", "#{Katello::Engine.root}/spec"]
           t.test_files = [
-            "#{Katello::Engine.root}/spec/routing/**/*_spec.rb",
+            "#{Katello::Engine.root}/spec/routing/**/*_spec.rb"
           ]
           t.verbose = true
         end
 
         Rake::Task[spec_task.name].invoke
       end
-
     end
 
     desc "Run the Katello plugin unit test suite."
     task :test => ['db:test:prepare'] do
-
       test_task = Rake::TestTask.new('katello_test_task') do |t|
         t.libs << ["test", "#{Katello::Engine.root}/test"]
         t.test_files = [
           "#{Katello::Engine.root}/test/models/**/*_test.rb",
           "#{Katello::Engine.root}/test/controllers/**/*_test.rb",
-          "#{Katello::Engine.root}/test/**/*_test.rb",
+          "#{Katello::Engine.root}/test/**/*_test.rb"
         ]
         t.verbose = true
       end
@@ -53,14 +46,12 @@ namespace :test do
     end
 
     namespace :test do
-
       desc "Run the Katello plugin unit models test suite."
       task :models => ['db:test:prepare'] do
-
         test_task = Rake::TestTask.new('katello_models_test_task') do |t|
           t.libs << ["test", "#{Katello::Engine.root}/test"]
           t.test_files = [
-            "#{Katello::Engine.root}/test/models/**/*_test.rb",
+            "#{Katello::Engine.root}/test/models/**/*_test.rb"
           ]
           t.verbose = true
         end
@@ -70,11 +61,10 @@ namespace :test do
 
       desc "Run the Katello plugin unit actions test suite."
       task :actions => ['db:test:prepare'] do
-
         test_task = Rake::TestTask.new('katello_actions_test_task') do |t|
           t.libs << ["test", "#{Katello::Engine.root}/test"]
           t.test_files = [
-            "#{Katello::Engine.root}/test/actions/**/*_test.rb",
+            "#{Katello::Engine.root}/test/actions/**/*_test.rb"
           ]
           t.verbose = true
         end
@@ -84,11 +74,10 @@ namespace :test do
 
       desc "Run the Katello plugin unit controllers test suite."
       task :controllers => ['db:test:prepare'] do
-
         test_task = Rake::TestTask.new('katello_controllers_test_task') do |t|
           t.libs << ["test", "#{Katello::Engine.root}/test"]
           t.test_files = [
-            "#{Katello::Engine.root}/test/controllers/**/*_test.rb",
+            "#{Katello::Engine.root}/test/controllers/**/*_test.rb"
           ]
           t.verbose = true
         end
@@ -98,11 +87,10 @@ namespace :test do
 
       desc "Run the Katello plugin unit glue test suite."
       task :glue => ['db:test:prepare'] do
-
         test_task = Rake::TestTask.new('katello_glue_test_task') do |t|
           t.libs << ["test", "#{Katello::Engine.root}/test"]
           t.test_files = [
-            "#{Katello::Engine.root}/test/glue/**/*_test.rb",
+            "#{Katello::Engine.root}/test/glue/**/*_test.rb"
           ]
           t.verbose = true
         end
@@ -112,18 +100,16 @@ namespace :test do
 
       desc "Run the Katello plugin unit lib test suite."
       task :lib => ['db:test:prepare'] do
-
         test_task = Rake::TestTask.new('katello_lib_test_task') do |t|
           t.libs << ["test", "#{Katello::Engine.root}/test"]
           t.test_files = [
-            "#{Katello::Engine.root}/test/lib/**/*_test.rb",
+            "#{Katello::Engine.root}/test/lib/**/*_test.rb"
           ]
           t.verbose = true
         end
 
         Rake::Task[test_task.name].invoke
       end
-
     end
   end
 
@@ -132,7 +118,6 @@ namespace :test do
     Rake::Task['test:katello:spec'].invoke
     Rake::Task['test:katello:test'].invoke
   end
-
 end
 
 Rake::Task[:test].enhance do

data/lib/katello/tasks/upgrades/2.4/import_distributions.rake

@@ -1,8 +1,7 @@
 namespace :katello do
   namespace :upgrades do
     namespace '2.4' do
-      task :import_distributions => ["environment"]  do
-
+      task :import_distributions => ["environment"] do
         User.current = User.anonymous_api_admin
         puts _("Importing distribution data into repositories")
         Katello::Repository.import_distributions

data/lib/katello/tasks/upgrades/2.4/import_package_groups.rake

@@ -1,8 +1,7 @@
 namespace :katello do
   namespace :upgrades do
     namespace '2.4' do
-      task :import_package_groups => ["environment"]  do
-
+      task :import_package_groups => ["environment"] do
         User.current = User.anonymous_api_admin
         puts _("Importing Package Groups")
         Katello::PackageGroup.import_all