foreman_omaha 1.0.0 → 2.0.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 6ad84de9035d283fda62edcb31c461f88ef3811ce4caa64c2f7b299ec9c20474
-  data.tar.gz: 3884e00feb8dff9ca2409006709f344e7085085b11e923058188101b8a196022
+  metadata.gz: 7d8c9488f648e7425b5ba2acf08a407e653a670247f2d2f0d1e523ed5269f5ca
+  data.tar.gz: 340dae98a746ac79888fb44cb939545bf971e97941034d6edeb0aee250b97a28
 SHA512:
-  metadata.gz: c0a3e1ffe8c2d3fee38ccc48edfed5ed12e9416fd123378c08f92772386efec252bcf5f2615539d1667292c439e95535f06133700df04f94529a482a6068cdf6
-  data.tar.gz: efd82da861cc6e7a6515136df34c4cfc46cd6eb7b6d3a5f480468778bdce57fcab7142c0d0cb9f50587cfda96f26f7bfbddc301681101e22e2424cc35eb667ce
+  metadata.gz: accbd7e167c73ed028e36f493fe740cc3a1df3ae175c55c278288d5db23c194ce24b0adbbc37d21c1044a32d0ab3c41a43c656d40c70b079d3ae4d140394fdc8
+  data.tar.gz: 837d798f8867213463f2140b70c20e76b16f21ea88cba53b687547bcde42a41fe02c45ab1f12c91970c3e8f4a87be52912f1f213b96f1bda6f8da2b7e18f5176

data/README.md

@@ -10,6 +10,7 @@ Foreman core already supports deploying CoreOS hosts and is great for on-premise
 | --------------- | -------------- |
 | >= 1.12         | ~> 0.0         |
 | >= 1.17         | ~> 1.0         |
+| >= 1.18         | ~> 2.0         |
 
 ## Installation
 

data/app/controllers/omaha_groups_controller.rb

@@ -16,8 +16,6 @@ class OmahaGroupsController < ApplicationController
     @oem_distribution = ForemanOmaha::Charts::OemDistribution.new(@omaha_group.hosts)
   end
 
-  private
-
   def model_of_controller
     ::ForemanOmaha::OmahaGroup
   end

data/app/controllers/omaha_reports_controller.rb

@@ -8,6 +8,7 @@ class OmahaReportsController < ApplicationController
   end
 
   def index
+    @host = resource_finder(Host.authorized(:view_hosts), params[:host_id]) if params[:host_id]
     @omaha_reports = resource_base_search_and_page(:host)
   end
 

data/app/models/foreman_omaha/omaha_group.rb

@@ -22,7 +22,12 @@ module ForemanOmaha
     end
 
     def latest_operatingsystem
-      operatingsystems.order(:major, :minor).last
+      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
     end
 
     private
@@ -30,5 +35,9 @@ 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/services/foreman_omaha/fact_parser.rb

@@ -37,7 +37,7 @@ module ForemanOmaha
       os = previous_version.deep_clone(
         :include => [:ptables, :media, :os_default_templates, :architectures]
       )
-      os.update_attributes(attrs)
+      os.update(attrs)
       os
     end
 

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

@@ -1,15 +1,6 @@
 <% javascript 'foreman_omaha/application' %>
 <% javascript 'charts' %>
-<div class="container-fluid">
-  <div class="row">
-    <div class="col-md-12">
-      <ol class="breadcrumb">
-        <li class="breadcrumb-item"><%= link_to_if_authorized(_("Omaha Groups"), hash_for_omaha_groups_path) %></li>
-        <li class="breadcrumb-item active"><strong><%= @omaha_group.name %></strong></li>
-      </ol>
-    </div>
-  </div>
-</div>
+<% title @omaha_group.name %>
 <div class="container-fluid container-cards-pf">
   <!-- status cards -->
   <div class="row row-cards-pf">
@@ -134,7 +125,7 @@
         </div>
         <div class="card-pf-body">
           <% if @out_of_sync.count > 0 %>
-            <table class="table table-striped table-condensed table-fixed">
+            <table class="<%=table_css_classes 'table-condensed table-fixed' %>">
               <thead>
                 <tr>
                   <th><%= _('Host') %></th>

data/app/views/omaha_hosts/index.html.erb

@@ -20,7 +20,7 @@
               <% if host.operatingsystem %>
                 <div class="list-view-pf-additional-info-item">
                   <%= icon(host.operatingsystem, :size => '16x16') %>&nbsp;
-                  <%= link_to_if_authorized(host.operatingsystem.release, hash_for_edit_operatingsystem_path(host.operatingsystem)) %>
+                  <%= link_to_if_authorized(host.omaha_facet.version, hash_for_edit_operatingsystem_path(host.operatingsystem)) %>
                 </div>
               <% end %>
               <div class="list-view-pf-additional-info-item" style="white-space: nowrap;">

data/app/views/omaha_hosts/welcome.html.erb

@@ -4,7 +4,7 @@
     <%= icon_text('screen', '', :kind => 'pficon') %>
   </div>
   <h1><%= _('Omaha Hosts') %></h1>
-  <p><%= _("You don't have any visible hosts that have reported to Foreman. CoreOS Hosts can be added and provisioned from Foreman and configured to report to Foreman.") %></p>
+  <p><%= _("You don't have any visible hosts that have reported to Foreman. Container Linux Hosts can be added and provisioned from Foreman or just configured to report to Foreman.") %></p>
   <p><%= link_to _('Learn more about this in the documentation.'), 'https://github.com/theforeman/foreman_omaha', :rel => 'external' %></p>
   <div class="blank-slate-pf-main-action">
     <%= new_link(_('Create Host'), { :controller => :hosts, :action => :new }, { :class => 'btn-lg' }) %>

data/app/views/omaha_reports/index.html.erb

@@ -1,2 +1,18 @@
+<%= breadcrumbs(
+    items: [
+    {
+      caption: _('Hosts'),
+      url: (url_for(hosts_path) if authorized_for(hash_for_hosts_path))
+    },
+    {
+      caption: @host.name,
+      url: (host_path(@host) if authorized_for(hash_for_host_path(@host)))
+    },
+    {
+      caption: _('Omaha Reports'),
+      url: url_for(host_omaha_reports_path(@host))
+    },
+  ]
+) if @host %>
 <% title _("Omaha Reports") %>
 <%= render :partial => 'list' %>

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

@@ -1,5 +1,6 @@
 <%= javascript 'reports' %>
 <% title "#{@omaha_report.host}"%>
+<% breadcrumbs(switchable: false) %>
 
 <p class='ra'> <%= _("Reported at %s ") % @omaha_report.reported_at %> </p>
 <% if @offset > 10 %>

data/app/views/omaha_reports/welcome.html.erb

@@ -4,9 +4,9 @@
   </div>
   <h1><%= _('Omaha Reports') %></h1>
   <p>
-  <%= _("You don't seem to have any omaha reports.") %></br>
-  <%= _('If you wish to configure CoreOS to forward reports to Foreman, please follow') %>
-  <%= link_to _("the documentation"), 'https://github.com/timogoebel/foreman_omaha', :rel => "external" %>.
+  <%= _("You don't seem to have any Omaha reports.") %></br>
+  <%= _('If you wish to configure Container Linux to forward reports to Foreman, please follow') %>
+  <%= link_to _("the documentation"), 'https://github.com/theforeman/foreman_omaha', :rel => 'external' %>.
   </p>
   <div class="blank-slate-pf-main-action">
     <%= link_to _('Documentation'), 'https://github.com/theforeman/foreman_omaha', :rel => 'external', :class => 'btn btn-primary btn-lg' %>

data/lib/foreman_omaha/engine.rb

@@ -18,7 +18,7 @@ module ForemanOmaha
 
     initializer 'foreman_omaha.register_plugin', :before => :finisher_hook do |_app|
       Foreman::Plugin.register :foreman_omaha do
-        requires_foreman '>= 1.17'
+        requires_foreman '>= 1.18'
 
         apipie_documented_controllers ["#{ForemanOmaha::Engine.root}/app/controllers/api/v2/*.rb"]
 
@@ -114,20 +114,6 @@ module ForemanOmaha
       end
     end
 
-    # Precompile any JS, Stylesheet or Image files under app/assets/
-    assets_to_precompile =
-      Dir.chdir(root) do
-        Dir['app/assets/javascripts/**/*', 'app/assets/images/**/*', 'app/assets/stylesheets/**/*'].map do |f|
-          f.split(File::SEPARATOR, 4).last
-        end
-      end
-    initializer 'foreman_omaha.assets.precompile' do |app|
-      app.config.assets.precompile += assets_to_precompile
-    end
-    initializer 'foreman_omaha.configure_assets', group: :assets do
-      SETTINGS[:foreman_omaha] = { assets: { precompile: assets_to_precompile } }
-    end
-
     rake_tasks do
       Rake::Task['db:seed'].enhance do
         ForemanOmaha::Engine.load_seed
@@ -135,7 +121,7 @@ module ForemanOmaha
     end
 
     initializer 'foreman_omaha.register_gettext', after: :load_config_initializers do |_app|
-      locale_dir = File.join(File.expand_path('../../..', __FILE__), 'locale')
+      locale_dir = File.join(File.expand_path('../..', __dir__), 'locale')
       locale_domain = 'foreman_omaha'
       Foreman::Gettext::Support.add_text_domain locale_domain, locale_dir
     end

data/lib/foreman_omaha/version.rb

@@ -1,3 +1,3 @@
 module ForemanOmaha
-  VERSION = '1.0.0'.freeze
+  VERSION = '2.0.0'.freeze
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: foreman_omaha
 version: !ruby/object:Gem::Version
-  version: 1.0.0
+  version: 2.0.0
 platform: ruby
 authors:
 - Timo Goebel
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2018-01-15 00:00:00.000000000 Z
+date: 2018-06-29 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: jquery-matchheight-rails
@@ -44,14 +44,14 @@ dependencies:
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 0.52.0
+        version: 0.54.0
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 0.52.0
+        version: 0.54.0
 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:
@@ -174,22 +174,22 @@ signing_key:
 specification_version: 4
 summary: This plug-in adds support for the Omaha procotol to The Foreman.
 test_files:
-- test/factories/feature.rb
-- test/factories/foreman_omaha_factories.rb
-- test/factories/host.rb
-- test/factories/smart_proxy.rb
-- test/functional/api/v2/omaha_groups_controller_test.rb
-- test/functional/api/v2/omaha_reports_controller_test.rb
-- test/functional/omaha_groups_controller_test.rb
-- test/functional/omaha_hosts_controller_test.rb
-- test/functional/omaha_reports_controller_test.rb
-- test/test_plugin_helper.rb
+- test/unit/omaha_fact_parser_test.rb
+- test/unit/charts/version_distribution_test.rb
 - test/unit/charts/oem_distribution_test.rb
 - test/unit/charts/status_distribution_test.rb
-- test/unit/charts/version_distribution_test.rb
 - test/unit/group_version_breakdown_test.rb
-- test/unit/host_status/omaha_status_test.rb
 - test/unit/host_test.rb
-- test/unit/omaha_fact_parser_test.rb
-- test/unit/omaha_report_test.rb
+- test/unit/host_status/omaha_status_test.rb
 - test/unit/renderer_test.rb
+- test/unit/omaha_report_test.rb
+- test/factories/smart_proxy.rb
+- test/factories/feature.rb
+- test/factories/host.rb
+- test/factories/foreman_omaha_factories.rb
+- test/test_plugin_helper.rb
+- test/functional/omaha_groups_controller_test.rb
+- test/functional/omaha_hosts_controller_test.rb
+- test/functional/api/v2/omaha_groups_controller_test.rb
+- test/functional/api/v2/omaha_reports_controller_test.rb
+- test/functional/omaha_reports_controller_test.rb