foreman_puppet 4.1.0 → 5.1.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 745a9b5da4d9e341965da09876aea703a9a9e40f2bfc989f002e1263aa67547b
-  data.tar.gz: 2e80676582c1105c5839682d076f2e03ae6240721e46daf04a7c76e0721aafca
+  metadata.gz: e2d266777270f646110ea8caf84b754adbb7ff030cbf0b7770c903c0dcebda07
+  data.tar.gz: 64a320d05f07a4c9162b940b64b7cce83116b21138f66aed721a4ca2c5b5701a
 SHA512:
-  metadata.gz: a246077d90bf3e91c5963bb603680354ee18c94a0e523067d85683ebd48ee4cd4757e88a8438a456438abd6086a3db88087099e69520bdf79f1213ddddb0b282
-  data.tar.gz: 58f460b97fad16c5d4ca45850d58baf059e70fd72b7ab898369c64200bfe5a3dd3b472d3b52dfdc0f2650061c49604e59a6cafec5b97933ad996d9aed9332640
+  metadata.gz: '0755581750978e000fcfa59d3a92e3557f515fad48220189000deca9168dee7e2dd12076ce1c96773bf53e931674c1e07b419f631ce760243f7b74c5aebe414a'
+  data.tar.gz: 687891997eb4c629b533235a80cd9077b8548f6d48058b042c71bb854650029632bead4cbdfa01295a1fe1ba6a368bf3f4ccc2ddcec5605d35570557c235dc8c

data/README.md

@@ -31,18 +31,15 @@ Some features will remain in core:
 
 ## Compatibility
 
-Foreman 3.0 will be the first release where the Puppet functionality is mostly extracted.
-Therefore, this plugin is only required for 3.0 and onwards.
-You can install it on Foreman 2.5 to prepare for the Foreman update.
-
 |Foreman version|Plugin version|Notes                                     |
 |---------------|--------------|------------------------------------------|
+| >= 3.5        | ~> 5.0       | Required                                 |
 | ~> 3.4        | ~> 4.1       | Required                                 |
 | ~> 3.3        | ~> 4.0       | Required                                 |
 | ~> 3.2        | ~> 3.0       | Required                                 |
 | ~> 3.1        | ~> 2.0       | Required                                 |
 | ~> 3.0        | ~> 1.0       | Required                                 |
-| >= 2.5        | ~> 0.1       | Optional; replaces Core features         |
+| ~> 2.5        | ~> 0.1       | Optional; replaces Core features         |
 | < 2.5         | -            | Not supported (functionality is in Core) |
 
 ## Installation

data/Rakefile

@@ -14,8 +14,6 @@ load 'rails/tasks/engine.rake'
 Bundler::GemHelper.install_tasks
 
 require 'rake/testtask'
-require 'rspec/core'
-require 'rspec/core/rake_task'
 
 Rake::TestTask.new(test: 'app:db:test:prepare') do |t|
   t.libs << 'test'
@@ -25,7 +23,4 @@ Rake::TestTask.new(test: 'app:db:test:prepare') do |t|
   t.verbose = false
 end
 
-desc 'Run all specs in spec directory (excluding plugin specs)'
-RSpec::Core::RakeTask.new(spec: 'app:db:test:prepare')
-
 task default: :test

data/app/graphgl/concerns/foreman_puppet/mutations/hosts/create_extensions.rb

@@ -4,16 +4,20 @@ module ForemanPuppet
   module Mutations
     module Hosts
       module CreateExtensions
-        PUPPET_PARAMS = %i[
-          environment
-          puppetclasses
-        ].freeze
-
         extend ActiveSupport::Concern
 
         included do
+          prepend PatchMethods
+
           argument :environment_id, GraphQL::Types::ID, loads: ForemanPuppet::Types::Environment
           argument :puppetclass_ids, [GraphQL::Types::ID], loads: ForemanPuppet::Types::Puppetclass, as: :puppetclasses
+        end
+
+        module PatchMethods
+          PUPPET_PARAMS = %i[
+            environment
+            puppetclasses
+          ].freeze
 
           private
 

data/app/graphgl/foreman_puppet/types/environment.rb

@@ -1,6 +1,7 @@
 module ForemanPuppet
   module Types
     class Environment < ::Types::BaseObject
+      graphql_name 'ForemanPuppet_Environment'
       model_class ForemanPuppet::Environment
       description 'An Environment'
 
@@ -11,10 +12,6 @@ module ForemanPuppet
       has_many :locations, ::Types::Location
       has_many :organizations, ::Types::Organization
       has_many :puppetclasses, ForemanPuppet::Types::Puppetclass
-
-      def self.graphql_definition
-        super.tap { |type| type.instance_variable_set(:@name, 'ForemanPuppet::Environment') }
-      end
     end
   end
 end

data/app/graphgl/foreman_puppet/types/puppetclass.rb

@@ -1,6 +1,7 @@
 module ForemanPuppet
   module Types
     class Puppetclass < ::Types::BaseObject
+      graphql_name 'ForemanPuppet_Puppetclass'
       model_class ForemanPuppet::Puppetclass
       description 'A Puppetclass'
 
@@ -11,10 +12,6 @@ module ForemanPuppet
       has_many :environments, ForemanPuppet::Types::Environment
       has_many :locations, ::Types::Location
       has_many :organizations, ::Types::Organization
-
-      def self.graphql_definition
-        super.tap { |type| type.instance_variable_set(:@name, 'ForemanPuppet::Puppetclass') }
-      end
     end
   end
 end

data/lib/foreman_puppet/register.rb

@@ -1,5 +1,5 @@
 Foreman::Plugin.register :foreman_puppet do
-  requires_foreman '>= 3.3.0'
+  requires_foreman '>= 3.5.0'
   # Add Global JS file for extending foreman-core components and routes
   register_global_js_file 'global'
 
@@ -225,8 +225,10 @@ Foreman::Plugin.register :foreman_puppet do
         priority: 100
     end
   end
-  extend_page 'hosts/_list' do |cx|
-    cx.add_pagelet :hosts_table_column_header, resource_type: 'host', partial: 'hosts/foreman_puppet/form_list_env_field_header', priority: 100
-    cx.add_pagelet :hosts_table_column_content, resource_type: 'host', partial: 'hosts/foreman_puppet/form_list_env_field_content', priority: 100
+  extend_page 'hosts/_list' do |context|
+    context.with_profile :puppet, _('Puppet'), default: true do
+      add_pagelet :hosts_table_column_header, key: :environment, label: s_('Puppet env'), sortable: true, width: '10%', class: 'hidden-xs'
+      add_pagelet :hosts_table_column_content, key: :environment, callback: ->(host) { host.environment }, class: 'hidden-xs ellipsis'
+    end
   end
 end

data/lib/foreman_puppet/version.rb

@@ -1,3 +1,3 @@
 module ForemanPuppet
-  VERSION = '4.1.0'.freeze
+  VERSION = '5.1.0'.freeze
 end