foreman_salt 3.0.1 → 3.0.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: bea1caeb04b5f73dc724c2d4bdd45e46055dbf80
-  data.tar.gz: 21b7646d6d05aea5c7a393e1505910bc08efde11
+  metadata.gz: 044d6bcb7bb23ae885d02d14977aa289a86566ad
+  data.tar.gz: e3fdf276fedaf50ef67ea0128be66aeaa522ee3d
 SHA512:
-  metadata.gz: 7ae9d028461860b4fac00233e19a8de3b74614c92278539d4848649c20fc632987f1cd1f33aa53c3d63c8de9e7831532e0f753f49317fe0147f1c9de2c8e1e3c
-  data.tar.gz: 495c4414f5718ecc4d75ba82bada937b1cf799327f9adebe434a65ead4880eb45c4f79fc2717e5e66357691617e25809e6566409ba67375c9320d704aed0fea2
+  metadata.gz: 9b307a6679849af4beec034ab1a0e1957790845959b18458d483dec84b4d7dbd83fb4515749902d2149b3631be472d5b599d3e214e2a2d7d8dfcc86cc861922c
+  data.tar.gz: ad68170d5cd1c6cde132c80cba7d768d6b0b3d3dcdb5449415d5f37f6ecd75c88eb8883f0dc3742834832442571e8bf80dc19be5f97ffb90490f63a67181b6f2

data/README.md

@@ -1,3 +1,7 @@
+[![Build Status](https://img.shields.io/jenkins/s/http/ci.theforeman.org/test_plugin_foreman_salt_master.svg)](http://ci.theforeman.org/job/test_plugin_foreman_salt_master)
+[![Code Climate](https://codeclimate.com/github/theforeman/foreman_salt/badges/gpa.svg)](https://codeclimate.com/github/theforeman/foreman_salt)
+[![GPL License](https://img.shields.io/github/license/theforeman/foreman_salt.svg)](https://github.com/theforeman/foreman_salt/blob/master/LICENSE)
+
 # Foreman Salt Plug-in
 
 This plug-in adds support for Salt to Foreman. 

data/app/controllers/foreman_salt/minions_controller.rb

@@ -84,3 +84,42 @@ module ForemanSalt
     end
   end
 end
+
+=begin
+Minions controller? BANANA!!!
+
+────────────▀▄───█───▄▀
+───────────▄▄▄█▄▄█▄▄█▄▄▄
+────────▄▀▀═════════════▀▀▄
+───────█═══════════════════█
+──────█═════════════════════█
+─────█════════▄▄▄▄▄▄▄════════█
+────█════════█████████════════█
+────█═══════██▀─────▀██═══════█
+───███████████──█▀█──███████████
+───███████████──▀▀▀──███████████
+────█═══════▀█▄─────▄█▀═══════█
+────█═════════▀█████▀═════════█
+────█═════════════════════════█
+────█═════════════════════════█
+────█═══════█▀█▀█▀█▀█▀█═══════█
+────█═══════▀▄───────▄▀═══════█
+────█═════════▀▄█▄█▄▀═════════█
+────█═════════════════════════█
+───▐▓▓▌═════════════════════▐▓▓▌
+───▐▐▓▓▌▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▐▓▓▌▌
+───█══▐▓▄▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▄▓▌══█
+──█══▌═▐▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▌═▐══█
+──█══█═▐▓▓▓▓▓▓▄▄▄▄▄▄▄▓▓▓▓▓▓▌═█══█
+──█══█═▐▓▓▓▓▓▓▐██▀██▌▓▓▓▓▓▓▌═█══█
+──█══█═▐▓▓▓▓▓▓▓▀▀▀▀▀▓▓▓▓▓▓▓▌═█══█
+──█══█▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓█══█
+─▄█══█▐▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▌█══█▄
+─█████▐▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▌─█████
+─██████▐▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▌─██████
+──▀█▀█──▐▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▌───█▀█▀
+─────────▐▓▓▓▓▓▓▌▐▓▓▓▓▓▓▌
+──────────▐▓▓▓▓▌──▐▓▓▓▓▌
+─────────▄████▀────▀████▄
+─────────▀▀▀▀────────▀▀▀▀
+=end

data/app/helpers/concerns/foreman_salt/layout_helper_extensions.rb

@@ -0,0 +1,20 @@
+module ForemanSalt
+  module LayoutHelperExtensions
+    extend ActiveSupport::Concern
+
+    included do
+      alias_method_chain :authorized_associations_permission_name, :salt
+    end
+
+    # Foreman tries to magically guess permission names, but it doesn't work
+    # with plugins. #11408 ForemanSalt models that require permissions provide
+    # a self.permission_name method
+    def authorized_associations_permission_name_with_salt(klass)
+      if klass.respond_to?(:permission_name)
+        klass.permission_name(:view)
+      else
+        authorized_associations_permission_name_without_salt(klass)
+      end
+    end
+  end
+end

data/app/models/foreman_salt/concerns/host_managed_extensions.rb

@@ -35,7 +35,7 @@ module ForemanSalt
       def salt_modules_for_enc
         return [] unless salt_environment
         modules = salt_modules + (hostgroup ? hostgroup.all_salt_modules : [])
-        ForemanSalt::SaltModule.in_environment(salt_environment).where(:id => modules).pluck(:name).uniq
+        ForemanSalt::SaltModule.in_environment(salt_environment).where(:id => modules).pluck("salt_modules.name").uniq
       end
 
       def salt_master

data/app/models/foreman_salt/salt_environment.rb

@@ -21,6 +21,10 @@ module ForemanSalt
       _('Salt environment')
     end
 
+    def self.permission_name(action)
+      "#{action}_salt_environments"
+    end
+
     private
 
     def remove_from_hosts(state)

data/app/models/foreman_salt/salt_module.rb

@@ -42,5 +42,9 @@ module ForemanSalt
     def self.humanize_class_name(_name = nil)
       _('Salt state')
     end
+
+    def self.permission_name(action)
+      "#{action}_salt_modules"
+    end
   end
 end

data/lib/foreman_salt/engine.rb

@@ -172,6 +172,7 @@ module ForemanSalt
         # Helper Extensions
         ::HostsHelper.send :include, ForemanSalt::HostsHelperExtensions
         ::SmartProxiesHelper.send :include, ForemanSalt::SmartProxiesHelperExtensions
+        ::LayoutHelper.send :include, ForemanSalt::LayoutHelperExtensions
 
         # Model Extensions
         ::Host::Managed.send :include, ForemanSalt::Concerns::HostManagedExtensions

data/lib/foreman_salt/version.rb

@@ -1,3 +1,3 @@
 module ForemanSalt
-  VERSION = '3.0.1'
+  VERSION = '3.0.2'
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: foreman_salt
 version: !ruby/object:Gem::Version
-  version: 3.0.1
+  version: 3.0.2
 platform: ruby
 authors:
 - Stephen Benjamin
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-08-13 00:00:00.000000000 Z
+date: 2015-08-26 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: deface
@@ -67,6 +67,7 @@ files:
 - app/controllers/foreman_salt/salt_modules_controller.rb
 - app/controllers/foreman_salt/state_importer.rb
 - app/helpers/concerns/foreman_salt/hosts_helper_extensions.rb
+- app/helpers/concerns/foreman_salt/layout_helper_extensions.rb
 - app/helpers/concerns/foreman_salt/smart_proxies_helper_extensions.rb
 - app/helpers/foreman_salt/salt_keys_helper.rb
 - app/helpers/foreman_salt/salt_modules_helper.rb