foreman_custom_tab 0.1.1 → 0.2.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 1ccbccc92505f23d7321d8abe5aabaa51aa8de8b
-  data.tar.gz: 4570d2c5e548fdf8afeeb5c4eb3c4edaa2d07968
+  metadata.gz: 45ffcb2d4091bf3844ae1e1681d3857d3e47853a
+  data.tar.gz: 81883825ea4cdd6b5dea970e73fb2f62694a8abc
 SHA512:
-  metadata.gz: 2ad9b056e8ba6eabb6d112f279de450f0b4274fac85f9009ef0cb25c845725794c92328284eea8040bc70ad87af1cfe6f026b44cd34da639b858ba520ff78ac3
-  data.tar.gz: b4db88c4325ff99d035c197e7758dd36adaa59db1c2d57b203d891ab81716161f53594bedea2815670432ebfc126dfe2806438eeb7f6a4140b4d57b8b4cacb52
+  metadata.gz: ae87d56ebb27965d13b7f0b1265985e98997f8450c1823317053779de2eb9d935eac9ac7b885cd0561a33e641fe1201f62cdee8d3d3fce8e7f074880d06f012d
+  data.tar.gz: 701e58f41f59625499ca75941b1eedc9c74b06a1fdf0df472f8ea872ae4e82a967e710bb304024d6263f15b654bf9b2a3c4a1c4aa1c8fa9c793f460efd504871

data/README.md

@@ -14,7 +14,7 @@ bundle update foreman_custom_tab
 
 ## Configuration
 
-If there is no configuration file then the tab should not appear on the detailed hosts screen, but if 
+If there is no configuration file then the tab should not appear on the detailed hosts screen, but if
 there is one and it is empty then it will appear without any fields. To setup the configuration file create
 a new file named 'foreman_custom_tab.yaml' at the location /etc/foreman/plugins/
 
@@ -23,16 +23,19 @@ The keys are the display title and the values are the methods that are actually
 Example configuration:
 
 ```
+---
 :custom_tab:
-  :fields:
-    'Host Name': name
-    'MAC Address': mac
-    'IP Address': ip
-    'Architecture': arch
-    'Certificate Name': certname
-    'OS Title': operatingsystem.title
-    'OS Type': operatingsystem.type
   :title: foo
+  :fields:
+    Host Name: name
+    MAC Address: mac
+    IP Address: ip
+    Architecture: arch
+    Certificate Name: certname
+    OS Title: operatingsystem.title
+    OS Type: operatingsystem.type
+    Puppet Version: facts[puppetversion]
+    Ruby Version: facts.fetch(rubyversion)
 ```
 
 ## Verify the Custom Tab is loaded
@@ -49,7 +52,7 @@ Note: foreman running locally (i.e not installed via rpm/debian package) does no
 
 ## Notes
 
-This project is still incomplete and in development. 
+This project is still incomplete and in development.
 
 Copyright (c) 2017 Joe Lyons Stannard III
 
@@ -65,4 +68,3 @@ GNU General Public License for more details.
 
 You should have received a copy of the GNU General Public License
 along with this program.  If not, see <http://www.gnu.org/licenses/>.
-

data/app/helpers/concerns/foreman_custom_tab/hosts_helper_extensions.rb

@@ -6,10 +6,15 @@ module ForemanCustomTab
       fields = []
       config_fields = SETTINGS[:custom_tab][:fields] || []
       config_fields.each do |key, value|
-        host_attr_val = nil
         # chain the method calls for attibutes like operatingsystem.title
-        value.split('.').each_with_index do |method, index|
-          host_attr_val = index.eql?(0) ? host.try(method) : host_attr_val.try(method)
+        host_attr_val = value.split('.').inject(host) do |memo, method|
+          if m = method.match(/(.*)\((.*)\)/)
+            memo.try(*[m[1], *m[2].split(/,\s?/)])
+          elsif m = method.match(/(.*)\[(.*)\]/)
+            memo.try(m[1]).try('[]', m[2])
+          else
+            memo.try(method)
+          end
         end
         fields += [[_(key.to_s), host_attr_val]] if host_attr_val.present?
       end

data/lib/foreman_custom_tab/version.rb

@@ -1,3 +1,3 @@
 module ForemanCustomTab
-  VERSION = '0.1.1'.freeze
+  VERSION = '0.2.0'.freeze
 end

data/test/test_plugin_helper.rb

@@ -6,7 +6,8 @@ SETTINGS[:custom_tab] = { fields: { 'Host Name' => 'name',
                                     'Architecture' => 'arch',
                                     'Certificate Name' => 'certname',
                                     'OS Title' => 'operatingsystem.title',
-                                    'OS Type' => 'operatingsystem.type' },
+                                    'OS Type' => 'operatingsystem.type',
+                                    'Puppet Version' => 'facts[puppetversion]' },
                           title: 'foo' }
 
 # This calls the main test_helper in Foreman-core

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: foreman_custom_tab
 version: !ruby/object:Gem::Version
-  version: 0.1.1
+  version: 0.2.0
 platform: ruby
 authors:
 - Joe Stannard
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2017-12-19 00:00:00.000000000 Z
+date: 2018-01-03 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: deface