katello 3.0.2 → 3.1.0.rc1

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

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

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

@@ -1,7 +1,7 @@
 namespace :katello do
   namespace :upgrades do
     namespace '2.4' do
-      task :import_rpms => ["environment"]  do
+      task :import_rpms => ["environment"] do
         User.current = User.anonymous_api_admin
 
         puts _("Importing Rpms")

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

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

data/lib/katello/tasks/upgrades/3.0/add_export_distributor.rake

@@ -1,7 +1,7 @@
 namespace :katello do
   namespace :upgrades do
     namespace '3.0' do
-      task :add_export_distributor => ["environment"]  do
+      task :add_export_distributor => ["environment"] do
         User.current = User.anonymous_api_admin
         puts _("Refreshing existing repositories to add export distributor")
 

data/lib/katello/tasks/upgrades/3.0/update_subscription_facet_backend_data.rake

@@ -1,7 +1,7 @@
 namespace :katello do
   namespace :upgrades do
     namespace '3.0' do
-      task :update_subscription_facet_backend_data => ["environment"]  do
+      task :update_subscription_facet_backend_data => ["environment"] do
         User.current = User.anonymous_api_admin
         puts _("Updating backend data for subscription facets")
 

data/lib/katello/tasks/yard.rake

@@ -1,9 +1,9 @@
 begin
   require 'yard'
   YARD::Rake::YardocTask.new do |t|
-    t.files   = ['app/**/*.rb' ]   # optional
+    t.files   = ['app/**/*.rb'] # optional
     t.options = ['--output-dir=yard']
   end
-rescue LoadError
+rescue LoadError # rubocop:disable Lint/HandleExceptions
   # yard not present, skipping this definition
 end

data/lib/katello/version.rb

@@ -1,3 +1,3 @@
 module Katello
-  VERSION = "3.0.2"
+  VERSION = "3.1.0.rc1".freeze
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: katello
 version: !ruby/object:Gem::Version
-  version: 3.0.2
+  version: 3.1.0.rc1
 platform: ruby
 authors:
 - N/A
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-07-06 00:00:00.000000000 Z
+date: 2016-06-23 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails
@@ -447,6 +447,7 @@ files:
 - app/controllers/katello/api/v2/gpg_keys_controller.rb
 - app/controllers/katello/api/v2/host_autocomplete_controller.rb
 - app/controllers/katello/api/v2/host_collections_controller.rb
+- app/controllers/katello/api/v2/host_contents_controller.rb
 - app/controllers/katello/api/v2/host_errata_controller.rb
 - app/controllers/katello/api/v2/host_packages_controller.rb
 - app/controllers/katello/api/v2/host_subscriptions_controller.rb
@@ -673,6 +674,7 @@ files:
 - app/lib/actions/middleware/remote_action.rb
 - app/lib/actions/pulp/abstract.rb
 - app/lib/actions/pulp/abstract_async_task.rb
+- app/lib/actions/pulp/abstract_async_task_group.rb
 - app/lib/actions/pulp/consumer.rb
 - app/lib/actions/pulp/consumer/abstract_content_action.rb
 - app/lib/actions/pulp/consumer/content_install.rb
@@ -873,8 +875,6 @@ files:
 - app/models/katello/host_installed_package.rb
 - app/models/katello/hypervisor.rb
 - app/models/katello/installed_package.rb
-- app/models/katello/job.rb
-- app/models/katello/job_task.rb
 - app/models/katello/key_host_collection.rb
 - app/models/katello/kt_environment.rb
 - app/models/katello/model.rb
@@ -910,7 +910,7 @@ files:
 - app/models/katello/system_activation_key.rb
 - app/models/katello/system_repository.rb
 - app/models/katello/task_status.rb
-- app/models/setting/katello.rb
+- app/models/setting/content.rb
 - app/overrides/add_about_page.rb
 - app/overrides/add_activation_keys_input.rb
 - app/overrides/add_organization_attributes.rb
@@ -1045,6 +1045,7 @@ files:
 - app/views/katello/api/v2/host_errata/system_task.json.rabl
 - app/views/katello/api/v2/host_packages/base.json.rabl
 - app/views/katello/api/v2/host_packages/index.json.rabl
+- app/views/katello/api/v2/host_subscriptions/available_release_versions.json.rabl
 - app/views/katello/api/v2/host_subscriptions/content_override.json.rabl
 - app/views/katello/api/v2/host_subscriptions/events.json.rabl
 - app/views/katello/api/v2/host_subscriptions/index.json.rabl
@@ -1129,15 +1130,10 @@ files:
 - app/views/katello/api/v2/systems/package_profile.json.rabl
 - app/views/katello/api/v2/systems/pools.json.rabl
 - app/views/katello/api/v2/systems/regenerate_identity_certificates.json.rabl
-- app/views/katello/api/v2/systems/releases.json.rabl
 - app/views/katello/api/v2/systems/remove_host_collections.json.rabl
 - app/views/katello/api/v2/systems/show.json.rabl
 - app/views/katello/api/v2/systems/subscriptions.json.rabl
 - app/views/katello/api/v2/systems/upload_package_profile.json.rabl
-- app/views/katello/api/v2/systems_bulk_actions/applicable_errata.json.rabl
-- app/views/katello/api/v2/systems_bulk_actions/available_incremental_updates.json.rabl
-- app/views/katello/api/v2/systems_bulk_actions/erratum.json.rabl
-- app/views/katello/api/v2/systems_bulk_actions/job.json.rabl
 - app/views/katello/api/v2/tasks/index.json.rabl
 - app/views/katello/api/v2/tasks/show.json.rabl
 - app/views/katello/api/v2/tasks/task_status_show.json.rabl
@@ -1196,6 +1192,7 @@ files:
 - config/initializers/rabl_init.rb
 - config/initializers/runcible.rb
 - config/katello.yaml.example
+- config/katello.yml
 - config/locales/README
 - config/locales/bn.yml
 - config/locales/compare_upstream.sh
@@ -1336,8 +1333,11 @@ files:
 - db/migrate/20160404132250_remove_katello_from_notification_name.rb
 - db/migrate/20160413230128_add_kickstart_repository_to_hosts_and_hostgroups.rb
 - db/migrate/20160426145517_move_host_description_to_host_comment.rb
+- db/migrate/20160505181337_rename_katello_settings.rb
+- db/migrate/20160520175340_add_host_applicable_package.rb
 - db/migrate/20160530184400_add_repo_id_indexes.rb
-- db/migrate/20160619223332_fix_viewer_role.rb
+- db/migrate/20160605160933_remove_jobs.rb
+- db/migrate/20160605162929_remove_system_smart_proxy.rb
 - db/seeds.d/101-locations.rb
 - db/seeds.d/102-organizations.rb
 - db/seeds.d/103-provisioning_templates.rb
@@ -1962,14 +1962,13 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '0'
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
-  - - ">="
+  - - ">"
     - !ruby/object:Gem::Version
-      version: '0'
+      version: 1.3.1
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.4.6
+rubygems_version: 2.2.5
 signing_key: 
 specification_version: 4
 summary: ''
 test_files: []
-has_rdoc: 

data/app/models/katello/job.rb

@@ -1,197 +0,0 @@
-module Katello
-  class Job < Katello::Model
-    self.include_root_in_json = false
-
-    include Glue
-
-    belongs_to :job_owner, :polymorphic => true
-
-    has_many :job_tasks, :class_name => "Katello::JobTask", :dependent => :destroy
-    has_many :task_statuses, :through => :job_tasks
-
-    validates_lengths_from_database
-
-    class << self
-      def refresh_tasks(ids)
-        unless ids.nil? || ids.empty?
-          uuids = TaskStatus.where(:id => ids).pluck(:uuid)
-          uuids.each do |uuid|
-            pulp_task = Katello.pulp_server.resources.task.poll(uuid)
-            PulpTaskStatus.dump_state(pulp_task, TaskStatus.find_by(:uuid => pulp_task[:task_id]))
-          end
-        end
-      end
-
-      def refresh_for_owner(owner)
-        # retrieve any 'in progress' tasks associated with the owner (e.g. system group)
-        task_status_table = Katello::TaskStatus.table_name
-        job_table = Katello::Job.table_name
-        job_task_table = Katello::JobTask.table_name
-
-        tasks = TaskStatus.where("#{task_status_table}.state" => [:waiting, :running]).where(
-            "#{job_table}.job_owner_id" => owner.id, "#{job_table}.job_owner_type" => owner.class.name).joins(
-            "INNER JOIN #{job_task_table} ON #{job_task_table}.task_status_id = #{task_status_table}.id").joins(
-            "INNER JOIN #{job_table} ON #{job_table}.id = #{job_task_table}.job_id")
-
-        ids = tasks.select("#{task_status_table}.id").collect { |row| row[:id] }
-
-        # refresh the tasks via pulp
-        refresh_tasks(ids) unless ids.empty?
-
-        # retrieve the jobs for the current owner (e.g. system group)
-        Job.where(:job_owner_id => owner.id, :job_owner_type => owner.class.name)
-      end
-    end
-
-    def create_tasks(organization, pulp_tasks, task_type, parameters)
-      # create an array of task status objects
-
-      tasks = []
-      pulp_tasks.each do |task|
-        # if the task was returned with a UUID belonging to a system, associate that system with the task
-        unless task[:call_request_tags].blank?
-          uuid = task[:call_request_tags].first.split('pulp:consumer:').last
-          system = System.where(:uuid => uuid).first
-        end
-
-        task_status = PulpTaskStatus.new(
-            :organization => organization,
-            :task_owner => system,
-            :task_type => task_type,
-            :parameters => parameters
-        )
-        task_status.merge_pulp_task!(task)
-        task_status.save!
-        tasks.push(task_status)
-      end
-
-      # add the task statuses to the job
-      unless tasks.empty?
-        self.task_statuses = tasks
-        self.save!
-      end
-
-      tasks
-    end
-
-    def as_json(_options = {})
-      first_task = self.task_statuses.first
-      #check for first task
-      if first_task.nil?
-        return {:id => self.id, :state => 'error', :status_message => 'No tasks in job.'}
-      else
-        #since this is a collection of tasks, where
-        # the type and parameters will all be the same
-        #  lets not return them in each task object, but instead
-        #  put them in the job
-        tasks = self.task_statuses.collect do |t|
-          {
-            :id => t.id,
-            :result => t.result,
-            :progress => t.progress,
-            :state => t.state,
-            :uuid => t.uuid,
-            :start_time => t.start_time,
-            :finish_time => t.finish_time
-          }
-        end
-        return {
-          :id => self.id,
-          :pulp_id => self.pulp_id,
-          :created_at => first_task.created_at,
-          :task_type => first_task.task_type,
-          :parameters => first_task.parameters,
-          :tasks => tasks,
-
-          :state => self.state,
-          :finish_time => self.finish_time,
-          :status_message => self.status_message
-        }
-      end
-    end
-
-    def messages
-      # Return a hash of the messages that may be rendered to the user to represent the status of the job.
-      first_task = self.task_statuses.first
-      #check for first task
-      if first_task.nil?
-        return {:id => self.id}
-      else
-        return {
-          :task_type => TaskStatus::TYPES[first_task.task_type][:english_name],
-          :summary_message => summary_message(first_task),
-          :requested_action_message => requested_action_message(first_task),
-          :pending_action_message => (pending_action_message(first_task) if state == :running),
-          :parameters_message => parameters_message(first_task)
-        }
-      end
-    end
-
-    def finish_time
-      self.task_statuses.order('finish_time DESC').last.finish_time
-    end
-
-    def pending?
-      self.state == :running || self.state == :waiting
-    end
-
-    def state
-      # determine the overall status of the job by evaluating the status of it's tasks
-      # - running (aka installing), if 1 or more tasks are waiting or running
-      # - error, if waiting+running is 0 and at least 1 error has occurred
-      # - finished, otherwise...
-      running = 0
-      error = 0
-      self.task_statuses.each do |task|
-        if task.state == TaskStatus::Status::WAITING.to_s || task.state == TaskStatus::Status::RUNNING.to_s
-          running += 1
-        elsif task.state == TaskStatus::Status::ERROR.to_s
-          error += 1
-        end
-      end
-
-      state = :finished  # assume the job is finished, by default
-      if (running > 0)
-        state = :running
-      elsif (error > 0)
-        state = :error
-      end
-      state
-    end
-
-    def status_message
-      first_task = self.task_statuses.first
-      details = TaskStatus::TYPES[first_task.task_type]
-      details[:event_messages][self.state].first
-    end
-
-    private
-
-    def pending_action_message(task)
-      task.pending_message
-    end
-
-    def requested_action_message(task)
-      task.message
-    end
-
-    def parameters_message(_task)
-      first_task = self.task_statuses.first
-      first_task.humanize_parameters unless first_task.nil?
-    end
-
-    def summary_message(_task)
-      summary = ""
-      first_task = self.task_statuses.first
-      unless first_task.nil?
-        job_template = TaskStatus::TYPES[first_task.task_type]
-        if job_template[:user_message]
-          summary = job_template[:user_message] % first_task.user.login
-        else
-          summary = job_template[:english_name]
-        end
-      end
-      summary
-    end
-  end
-end

data/app/models/katello/job_task.rb

@@ -1,10 +0,0 @@
-module Katello
-  class JobTask < Katello::Model
-    self.include_root_in_json = false
-
-    belongs_to :job, :inverse_of => :job_tasks
-    belongs_to :task_status, :inverse_of => :job_task
-
-    validates_lengths_from_database
-  end
-end

data/app/views/katello/api/v2/systems_bulk_actions/applicable_errata.json.rabl

@@ -1,7 +0,0 @@
-object false
-
-extends "katello/api/v2/common/metadata"
-
-node :results do
-  partial("katello/api/v2/systems_bulk_actions/erratum", :object => @collection[:results])
-end

data/app/views/katello/api/v2/systems_bulk_actions/available_incremental_updates.json.rabl

@@ -1,21 +0,0 @@
-collection @collection
-
-child :content_view_version => :content_view_version do
-  attributes :name, :id, :version
-
-  child :content_view => :content_view do
-    attributes :id, :name, :label
-  end
-end
-
-child :environments => :environments do
-  attributes :name, :id
-end
-
-attributes :next_version, :content_host_count
-
-child :components => :components do
-  attributes :name, :id
-  attributes :next_incremental_version => :next_version
-  attributes :content_view_id
-end

data/app/views/katello/api/v2/systems_bulk_actions/erratum.json.rabl

@@ -1,7 +0,0 @@
-extends "katello/api/v2/errata/show"
-
-node :applicable_consumers do |erratum|
-  erratum.hosts_available.where(:host_id => @systems.map(&:host_id)).
-  select(["#{Katello::Host::ContentFacet.table_name}.uuid", "#{Host.table_name}.name"]).
-  collect { |system| {:name => system.name, :uuid => system.uuid} }
-end

data/app/views/katello/api/v2/systems_bulk_actions/job.json.rabl

@@ -1 +0,0 @@
-attributes :id

data/db/migrate/20160619223332_fix_viewer_role.rb

@@ -1,41 +0,0 @@
-class FixViewerRole < ActiveRecord::Migration
-  class Role < ActiveRecord::Base
-    has_many :filters
-  end
-
-  class Filter < ActiveRecord::Base
-    belongs_to :role
-    has_many :filterings, :dependent => :destroy
-    has_many :permissions, :through => :filterings
-
-    scope :unlimited, -> { where(:search => nil, :taxonomy_search => nil) }
-
-    def resource_type
-      type = @resource_type || permissions.first.try(:resource_type)
-      type.blank? ? nil : type
-    end
-  end
-
-  class Filtering < ActiveRecord::Base
-    belongs_to :filter
-    belongs_to :permission
-  end
-
-  class Permission < ActiveRecord::Base
-  end
-
-  def change
-    viewer = Role.find_by name: 'Viewer'
-    view_permission = Permission.find_by name: 'view_content_views'
-
-    unless viewer.nil?
-      filters = viewer.filters.unlimited.select { |filter| filter.resource_type == 'Katello::ContentView' }
-      unless filters.empty?
-        filters.each do |filter|
-          unwanted_filterings = filter.filterings.select { |filtering| filtering.permission_id != view_permission.id }
-          filter.filterings.delete(unwanted_filterings)
-        end
-      end
-    end
-  end
-end