foreman_puppet 5.0.0 → 5.1.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: ad8bedb9a6b0aa20d769da8ad51d57891e3c77da03ed70f2a90cdf9fe7af3ffa
-  data.tar.gz: 17d3af41d610400ba081936f7b151d9329ae26b1fd311c81eaf5925a23366841
+  metadata.gz: e2d266777270f646110ea8caf84b754adbb7ff030cbf0b7770c903c0dcebda07
+  data.tar.gz: 64a320d05f07a4c9162b940b64b7cce83116b21138f66aed721a4ca2c5b5701a
 SHA512:
-  metadata.gz: a87e47f5a35f3a45bb6ac4a77f591ee0b85c37f6736972afd97559d35f4c752a7647c0958b3f7a131ef45b75b54b0f1f2cc104b6a6e4d78a847162a54de73d8f
-  data.tar.gz: 3a9c0f4ef48ce2e69e46dd1bbe54a488911e9d97261429f2d6d1f01fb48f53679a651beebb5e94a6bcc1c8159319241d260e342327ff018b9e9c3c8f1bb93281
+  metadata.gz: '0755581750978e000fcfa59d3a92e3557f515fad48220189000deca9168dee7e2dd12076ce1c96773bf53e931674c1e07b419f631ce760243f7b74c5aebe414a'
+  data.tar.gz: 687891997eb4c629b533235a80cd9077b8548f6d48058b042c71bb854650029632bead4cbdfa01295a1fe1ba6a368bf3f4ccc2ddcec5605d35570557c235dc8c

data/README.md

@@ -31,17 +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.3        | ~> 4.0       | Required                                 |
-| >= 3.2        | ~> 3.0       | Required                                 |
+| >= 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/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/app/models/foreman_puppet/puppetclass.rb

@@ -15,8 +15,8 @@ module ForemanPuppet
     before_destroy EnsureNotUsedBy.new(:hosts, :hostgroups)
     has_many :environment_classes, dependent: :destroy, inverse_of: :puppetclass
     has_many :environments, -> { distinct }, through: :environment_classes
-    has_many :organizations, -> { distinct.reorder(nil) }, through: :environments
-    has_many :locations, -> { distinct.reorder(nil) }, through: :environments
+    has_many :organizations, -> { distinct.reorder(:id) }, through: :environments
+    has_many :locations, -> { distinct.reorder(:id) }, through: :environments
 
     # rubocop:disable Rails/HasAndBelongsToMany
     has_and_belongs_to_many :operatingsystems

data/lib/foreman_puppet/register.rb

@@ -227,7 +227,7 @@ Foreman::Plugin.register :foreman_puppet do
   end
   extend_page 'hosts/_list' do |context|
     context.with_profile :puppet, _('Puppet'), default: true do
-      add_pagelet :hosts_table_column_header, key: :environment, label: s_('Environment name'), sortable: true, width: '10%', class: 'hidden-xs'
+      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

data/lib/foreman_puppet/version.rb

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