foreman_omaha 5.0.1 → 5.1.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 4de0935e85838acb0fdd917072c2619b9fb24eb9496f8075ecf5addc0c517e4f
-  data.tar.gz: '0047259a6a55630216f155c2751c391256fddb5b11d8f47a2494d647283b4a62'
+  metadata.gz: 991466be3a58e6ec0a11da16ccbc0af98cedc117f4def524948a64e96504f0db
+  data.tar.gz: e511bc47ecc16080e2ba16cc399d32d8c46d02212aa6ccccee075dccd5ea0d18
 SHA512:
-  metadata.gz: d1aa36e5c03a1104802f968f9417217ffcb67c628aefba80efc4ecadd6ba940275d0c08ce9c2a490ec8ddb66782f8bf366945732506ad3244ef3f0e849667447
-  data.tar.gz: 32bf0acccb2ebd329f66651874fa1b68822851c7c1c9ce8d85b0c45e29505455b1fd2be09e59c0564f5173f1ddca8940c81dda13f2848817c777ebaaaf6805dd
+  metadata.gz: de3df0f800c907f7cbfdccde128e11e57b7415c72a39c517d5c4021fd7bfa0321a8cddcfea276b285adeeb8bbae387f5398cde569ff49d3c5c6c46a01dea5db9
+  data.tar.gz: 599c02b711439bae7aea6559948b50eafdac63a8374c62500c428d0effac14683c88745fb16bb79108011fdb64f6f9a31081a1baa816a6143037f2edb45aede4

data/app/controllers/api/v2/omaha_reports_controller.rb

@@ -72,8 +72,9 @@ module Api
         ::ForemanOmaha::OmahaReport
       end
 
-      def resource_scope(options = {})
-        super(options.merge(:permission => :view_omaha_reports)).my_reports
+      def resource_scope(*args, **options)
+        options[:permission] = :view_omaha_reports
+        super(*args, **options).my_reports
       end
 
       def action_permission

data/app/controllers/omaha_hosts_controller.rb

@@ -29,12 +29,12 @@ class OmahaHostsController < ApplicationController
     not_found
   end
 
-  protected
-
   def model_of_controller
     ::Host::Managed
   end
 
+  protected
+
   def resource_base
     super.joins(:omaha_facet)
   end

data/app/graphql/foreman_omaha/types/omaha_group.rb

@@ -3,6 +3,7 @@
 module ForemanOmaha
   module Types
     class OmahaGroup < ::Types::BaseObject
+      graphql_name 'ForemanOmaha_OmahaGroup'
       model_class ForemanOmaha::OmahaGroup
       description 'An Omaha Group'
 
@@ -12,10 +13,6 @@ module ForemanOmaha
       field :uuid, String
 
       has_many :hosts, ::Types::Host
-
-      def self.graphql_definition
-        super.tap { |type| type.instance_variable_set(:@name, 'ForemanOmaha::OmahaGroup') }
-      end
     end
   end
 end

data/app/graphql/foreman_omaha/types/omaha_report.rb

@@ -3,6 +3,7 @@
 module ForemanOmaha
   module Types
     class OmahaReport < ::Types::BaseObject
+      graphql_name 'ForemanOmaha_OmahaReport'
       model_class ForemanOmaha::OmahaReport
       description 'An Omaha Report'
 
@@ -12,10 +13,6 @@ module ForemanOmaha
       field :omaha_version, String
 
       belongs_to :host, ::Types::Host
-
-      def self.graphql_definition
-        super.tap { |type| type.instance_variable_set(:@name, 'ForemanOmaha::OmahaReport') }
-      end
     end
   end
 end

data/app/models/foreman_omaha/omaha_facet.rb

@@ -11,7 +11,7 @@ module ForemanOmaha
 
     belongs_to :omaha_group, :inverse_of => :omaha_facets, :class_name => 'ForemanOmaha::OmahaGroup'
 
-    scope :out_of_sync, ->(*args) { where(['last_report < ?', (args.first || (30 + Setting[:outofsync_interval]).minutes.ago)]) }
+    scope :out_of_sync, ->(*args) { where(['last_report < ?', args.first || (30 + Setting[:outofsync_interval]).minutes.ago]) }
 
     validates_lengths_from_database
 

data/app/models/foreman_omaha/omaha_group.rb

@@ -26,12 +26,7 @@ module ForemanOmaha
     end
 
     def latest_operatingsystem
-      case database_adapter_type
-      when :postgresql
-        operatingsystems.reorder('').order('major::text::integer DESC').order('minor::text::float DESC').limit(1).last
-      else
-        operatingsystems.reorder('').order(:major, :minor).last
-      end
+      operatingsystems.reorder('').order(:major, :minor).last
     end
 
     private
@@ -39,9 +34,5 @@ module ForemanOmaha
     def ensure_uuid
       self.uuid ||= SecureRandom.uuid
     end
-
-    def database_adapter_type
-      ActiveRecord::Base.connection.adapter_name.downcase.to_sym
-    end
   end
 end

data/app/models/{host_status → foreman_omaha}/omaha_status.rb

@@ -1,7 +1,7 @@
 # frozen_string_literal: true
 
-module HostStatus
-  class OmahaStatus < HostStatus::Status
+module ForemanOmaha
+  class OmahaStatus < ::HostStatus::Status
     def self.status_name
       N_('Omaha Status')
     end
@@ -17,13 +17,13 @@ module HostStatus
 
       case host.omaha_facet.status.to_sym
       when :complete, :downloaded, :downloading, :installed
-        HostStatus::Global::OK
+        ::HostStatus::Global::OK
       when :instance_hold
-        HostStatus::Global::WARN
+        ::HostStatus::Global::WARN
       when :error
-        HostStatus::Global::ERROR
+        ::HostStatus::Global::ERROR
       else
-        HostStatus::Global::OK
+        ::HostStatus::Global::OK
       end
     end
 

data/app/views/omaha_groups/show.html.erb

@@ -1,5 +1,4 @@
 <% javascript 'foreman_omaha/application' %>
-<% javascript 'charts' %>
 <% title @omaha_group.name %>
 <%= breadcrumbs(
     items: [

data/config/routes.rb

@@ -6,7 +6,7 @@ Rails.application.routes.draw do
                      :defaults => { :apiv => 'v2' },
                      :apiv => /v1|v2/,
                      :constraints => ApiConstraints.new(:version => 2, :default => true) do
-      constraints(:id => /[^\/]+/) do
+      constraints(:id => %r{[^/]+}) do
         resources :omaha_reports, :only => [:index, :show, :destroy] do
           get :last, :on => :collection
         end
@@ -34,9 +34,9 @@ Rails.application.routes.draw do
     end
   end
 
-  constraints(:id => /[^\/]+/) do
+  constraints(:id => %r{[^/]+}) do
     resources :hosts do
-      constraints(:host_id => /[^\/]+/) do
+      constraints(:host_id => %r{[^/]+}) do
         resources :omaha_reports, :only => [:index, :show]
       end
     end

data/lib/foreman_omaha/engine.rb

@@ -19,99 +19,101 @@ module ForemanOmaha
       end
     end
 
-    initializer 'foreman_omaha.register_plugin', :before => :finisher_hook do |_app|
-      Foreman::Plugin.register :foreman_omaha do
-        requires_foreman '>= 3.0'
-
-        automatic_assets(false)
-        precompile_assets(['foreman_omaha/version_breakdown.css', 'foreman_omaha/application.js'])
-
-        apipie_documented_controllers ["#{ForemanOmaha::Engine.root}/app/controllers/api/v2/*.rb"]
-
-        register_custom_status HostStatus::OmahaStatus
-
-        # Add permissions
-        security_block :foreman_omaha do
-          permission :view_omaha_reports, {
-            :omaha_reports => [:index, :show, :auto_complete_search],
-            :'api/v2/omaha_reports' => [:index, :show, :last]
-          }, :resource_type => 'ForemanOmaha::OmahaReport'
-
-          permission :destroy_omaha_reports, {
-            :omaha_reports => [:destroy],
-            :'api/v2/omaha_reports' => [:destroy]
-          }, :resource_type => 'ForemanOmaha::OmahaReport'
-
-          permission :upload_omaha_reports, {
-            :omaha_reports => [:create],
-            :'api/v2/omaha_reports' => [:create]
-          }, :resource_type => 'ForemanOmaha::OmahaReport'
-
-          permission :view_omaha_groups, {
-            :omaha_groups => [:index, :auto_complete_search, :show],
-            :'api/v2/omaha_groups' => [:index, :show]
-          }, :resource_type => 'ForemanOmaha::OmahaGroup'
+    initializer 'foreman_omaha.register_plugin', :before => :finisher_hook do |app|
+      app.reloader.to_prepare do
+        Foreman::Plugin.register :foreman_omaha do
+          requires_foreman '>= 3.0'
+
+          automatic_assets(false)
+          precompile_assets(['foreman_omaha/version_breakdown.css', 'foreman_omaha/application.js'])
+
+          apipie_documented_controllers ["#{ForemanOmaha::Engine.root}/app/controllers/api/v2/*.rb"]
+
+          register_custom_status ForemanOmaha::OmahaStatus
+
+          # Add permissions
+          security_block :foreman_omaha do
+            permission :view_omaha_reports, {
+              :omaha_reports => [:index, :show, :auto_complete_search],
+              :'api/v2/omaha_reports' => [:index, :show, :last]
+            }, :resource_type => 'ForemanOmaha::OmahaReport'
+
+            permission :destroy_omaha_reports, {
+              :omaha_reports => [:destroy],
+              :'api/v2/omaha_reports' => [:destroy]
+            }, :resource_type => 'ForemanOmaha::OmahaReport'
+
+            permission :upload_omaha_reports, {
+              :omaha_reports => [:create],
+              :'api/v2/omaha_reports' => [:create]
+            }, :resource_type => 'ForemanOmaha::OmahaReport'
+
+            permission :view_omaha_groups, {
+              :omaha_groups => [:index, :auto_complete_search, :show],
+              :'api/v2/omaha_groups' => [:index, :show]
+            }, :resource_type => 'ForemanOmaha::OmahaGroup'
+          end
+
+          role 'Omaha reports viewer',
+               [:view_omaha_reports],
+               'Role granting permissions to view Omaha reports.'
+          role 'Omaha reports manager',
+               [:view_omaha_reports, :destroy_omaha_reports, :upload_omaha_reports],
+               'Role granting permissions to manage Omaha reports.'
+
+          # add menu entry
+          menu :top_menu, :omaha_reports,
+               :url_hash => { controller: :omaha_reports, action: :index },
+               :caption => N_('Omaha Reports'),
+               :parent => :monitor_menu,
+               :after => :reports
+
+          menu :top_menu, :omaha_hosts,
+               :url_hash => { :controller => :omaha_hosts, :action => :index },
+               :caption => N_('Omaha Hosts'),
+               :parent => :hosts_menu,
+               :after => :hosts
+
+          divider :top_menu, :caption => N_('Omaha'), :parent => :configure_menu, :last => true
+
+          menu :top_menu, :omaha_groups,
+               :url_hash => { :controller => :omaha_groups, :action => :index },
+               :caption => N_('Omaha Groups'),
+               :parent => :configure_menu,
+               :last => :true
+
+          # Omaha Facet
+          register_facet(ForemanOmaha::OmahaFacet, :omaha_facet) do
+            api_view :list => 'foreman_omaha/api/v2/omaha_facets/base_with_root', :single => 'foreman_omaha/api/v2/omaha_facets/show'
+          end
+
+          # extend host show page
+          extend_page('hosts/show') do |context|
+            context.add_pagelet :main_tabs,
+                                :name => N_('Omaha'),
+                                :partial => 'hosts/omaha_tab',
+                                :onlyif => proc(&:omaha_facet)
+          end
+
+          add_controller_action_scope('HostsController', :index) { |base_scope| base_scope.includes(:omaha_facet) }
+
+          # add renderer extensions
+          extend_template_helpers ForemanOmaha::TemplateRendererHelper
+          allowed_template_helpers :transpile_container_linux_config
+
+          register_graphql_query_field :omaha_group, 'ForemanOmaha::Types::OmahaGroup', :record_field
+          register_graphql_query_field :omaha_groups, 'ForemanOmaha::Types::OmahaGroup', :collection_field
+
+          register_graphql_query_field :omaha_report, 'ForemanOmaha::Types::OmahaReport', :record_field
+          register_graphql_query_field :omaha_reports, 'ForemanOmaha::Types::OmahaReport', :collection_field
         end
 
-        role 'Omaha reports viewer',
-             [:view_omaha_reports],
-             'Role granting permissions to view Omaha reports.'
-        role 'Omaha reports manager',
-             [:view_omaha_reports, :destroy_omaha_reports, :upload_omaha_reports],
-             'Role granting permissions to manage Omaha reports.'
-
-        # add menu entry
-        menu :top_menu, :omaha_reports,
-             :url_hash => { controller: :omaha_reports, action: :index },
-             :caption => N_('Omaha Reports'),
-             :parent => :monitor_menu,
-             :after => :reports
-
-        menu :top_menu, :omaha_hosts,
-             :url_hash => { :controller => :omaha_hosts, :action => :index },
-             :caption => N_('Omaha Hosts'),
-             :parent => :hosts_menu,
-             :after => :hosts
-
-        divider :top_menu, :caption => N_('Omaha'), :parent => :configure_menu, :last => true
-
-        menu :top_menu, :omaha_groups,
-             :url_hash => { :controller => :omaha_groups, :action => :index },
-             :caption => N_('Omaha Groups'),
-             :parent => :configure_menu,
-             :last => :true
-
-        # Omaha Facet
-        register_facet(ForemanOmaha::OmahaFacet, :omaha_facet) do
-          api_view :list => 'foreman_omaha/api/v2/omaha_facets/base_with_root', :single => 'foreman_omaha/api/v2/omaha_facets/show'
-        end
-
-        # extend host show page
-        extend_page('hosts/show') do |context|
-          context.add_pagelet :main_tabs,
-                              :name => N_('Omaha'),
-                              :partial => 'hosts/omaha_tab',
-                              :onlyif => proc { |host| host.omaha_facet }
-        end
-
-        add_controller_action_scope('HostsController', :index) { |base_scope| base_scope.includes(:omaha_facet) }
-
-        # add renderer extensions
-        extend_template_helpers ForemanOmaha::TemplateRendererHelper
-        allowed_template_helpers :transpile_container_linux_config
-
-        register_graphql_query_field :omaha_group, 'ForemanOmaha::Types::OmahaGroup', :record_field
-        register_graphql_query_field :omaha_groups, 'ForemanOmaha::Types::OmahaGroup', :collection_field
-
-        register_graphql_query_field :omaha_report, 'ForemanOmaha::Types::OmahaReport', :record_field
-        register_graphql_query_field :omaha_reports, 'ForemanOmaha::Types::OmahaReport', :collection_field
+        # Extend built in permissions
+        Foreman::AccessControl.permission(:view_hosts).actions.concat [
+          'omaha_hosts/index',
+          'omaha_hosts/auto_complete_search'
+        ]
       end
-
-      # Extend built in permissions
-      Foreman::AccessControl.permission(:view_hosts).actions.concat [
-        'omaha_hosts/index',
-        'omaha_hosts/auto_complete_search'
-      ]
     end
 
     # Include concerns in this config.to_prepare block

data/lib/foreman_omaha/version.rb

@@ -1,5 +1,5 @@
 # frozen_string_literal: true
 
 module ForemanOmaha
-  VERSION = '5.0.1'
+  VERSION = '5.1.0'
 end

data/lib/tasks/foreman_omaha_tasks.rake

@@ -23,7 +23,7 @@ namespace :test do
 end
 
 namespace :foreman_omaha do
-  task :rubocop do
+  task rubocop: :environment do
     begin
       require 'rubocop/rake_task'
       RuboCop::RakeTask.new(:rubocop_foreman_omaha) do |task|

data/test/unit/host_status/omaha_status_test.rb

@@ -4,7 +4,7 @@ require 'test_plugin_helper'
 
 class OmahaStatusTest < ActiveSupport::TestCase
   let(:host) { FactoryBot.build_stubbed(:host, :with_omaha_facet) }
-  let(:status) { HostStatus::OmahaStatus.new }
+  let(:status) { ForemanOmaha::OmahaStatus.new }
 
   setup do
     User.current = FactoryBot.create(:user, :admin)

data/test/unit/omaha_group_test.rb

@@ -0,0 +1,37 @@
+# frozen_string_literal: true
+
+require 'test_plugin_helper'
+
+class OmahaGroupTest < ActiveSupport::TestCase
+  setup do
+    User.current = FactoryBot.create(:user, :admin)
+  end
+
+  let(:omaha_group) { FactoryBot.create(:omaha_group, :uuid => 'stable', :name => 'Stable') }
+  let(:releases) { ['1520.5.0', '1520.6.0', '1465.8.0'].map { |release| Gem::Version.new(release) } }
+  let(:operatingsystems) do
+    releases.map do |semver|
+      FactoryBot.create(
+        :coreos,
+        :with_associations,
+        :major => semver.segments.first,
+        :minor => semver.segments.last(2).join('.'),
+        :release_name => 'stable',
+        :title => "CoreOS #{semver}"
+      )
+    end
+  end
+
+  context 'with operatingsystems' do
+    setup do
+      operatingsystems
+    end
+
+    test 'return latest operating system' do
+      latest_operatingsystem = omaha_group.latest_operatingsystem
+
+      assert_equal '1520', latest_operatingsystem.major
+      assert_equal '6.0', latest_operatingsystem.minor
+    end
+  end
+end

metadata

@@ -1,14 +1,13 @@
 --- !ruby/object:Gem::Specification
 name: foreman_omaha
 version: !ruby/object:Gem::Version
-  version: 5.0.1
+  version: 5.1.0
 platform: ruby
 authors:
 - Timo Goebel
-autorequire:
 bindir: bin
 cert_chain: []
-date: 2022-05-24 00:00:00.000000000 Z
+date: 1980-01-02 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: jquery-matchheight-rails
@@ -39,61 +38,19 @@ dependencies:
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
-  name: rubocop
+  name: theforeman-rubocop
   requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: 0.80.0
-  type: :development
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: 0.80.0
-- !ruby/object:Gem::Dependency
-  name: rubocop-minitest
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: 0.7.0
-  type: :development
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.7.0
-- !ruby/object:Gem::Dependency
-  name: rubocop-performance
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: 1.5.2
+        version: 0.1.2
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 1.5.2
-- !ruby/object:Gem::Dependency
-  name: rubocop-rails
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: 2.4.2
-  type: :development
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: 2.4.2
+        version: 0.1.2
 description: This plug-in adds support for the Omaha procotol to The Foreman. It allows
   you to better manage and update your CoreOS servers.
 email:
@@ -128,7 +85,7 @@ files:
 - app/models/foreman_omaha/omaha_facet.rb
 - app/models/foreman_omaha/omaha_group.rb
 - app/models/foreman_omaha/omaha_report.rb
-- app/models/host_status/omaha_status.rb
+- app/models/foreman_omaha/omaha_status.rb
 - app/services/foreman_omaha/charts/oem_distribution.rb
 - app/services/foreman_omaha/charts/status_distribution.rb
 - app/services/foreman_omaha/charts/version_distribution.rb
@@ -198,13 +155,13 @@ files:
 - test/unit/host_status/omaha_status_test.rb
 - test/unit/host_test.rb
 - test/unit/omaha_fact_parser_test.rb
+- test/unit/omaha_group_test.rb
 - test/unit/omaha_report_test.rb
 - test/unit/renderer_test.rb
 homepage: http://github.com/theforeman/foreman_omaha
 licenses:
 - GPL-3
 metadata: {}
-post_install_message:
 rdoc_options: []
 require_paths:
 - lib
@@ -212,15 +169,14 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
-      version: '0'
+      version: '3.0'
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.3.3
-signing_key:
+rubygems_version: 4.0.16
 specification_version: 4
 summary: This plug-in adds support for the Omaha procotol to The Foreman.
 test_files:
@@ -246,5 +202,6 @@ test_files:
 - test/unit/host_status/omaha_status_test.rb
 - test/unit/host_test.rb
 - test/unit/omaha_fact_parser_test.rb
+- test/unit/omaha_group_test.rb
 - test/unit/omaha_report_test.rb
 - test/unit/renderer_test.rb