foreman_enc_hostgrouponly 1.0.0 → 1.0.1

data/README.md

@@ -1,19 +1,28 @@
 # ForemanEncHostgrouponly
 
-*Introdction here*
+This rails engine/plugin to Foreman leverages the existing ENC functionality meanwhile only return data that being overriden in hostgroup. This would allow user sepereate ENC/classes and data management so data could be managed in an auditable manner.
+
 
 ## Installation
 
 See [How_to_Install_a_Plugin](http://projects.theforeman.org/projects/foreman/wiki/How_to_Install_a_Plugin)
 for how to install Foreman plugins
 
-## Usage
+The gem name is "foreman_enc_hostgrouponly". 
+
+## Compatibility
 
-*Usage here*
+| Foreman Version | Plugin Version |
+| --------------- | --------------:|
+| >= 1.5          | 1.0.0          |
+
+## Usage
+There is a new setting under `Settings -> General`
 
-## TODO
+| Setting | Description |
+| ------- | ----------- |
+| `enc_hostgrouponly` | Setting this to `true` will let ENC return host group parameters only  Default: `false` |
 
-*Todo list here*
 
 ## Contributing
 
@@ -21,7 +30,7 @@ Fork and send a Pull Request. Thanks!
 
 ## Copyright
 
-Copyright (c) *year* *your name*
+Copyright (c) *2014* *Huai Jiang*
 
 This program is free software: you can redistribute it and/or modify
 it under the terms of the GNU General Public License as published by

data/lib/foreman_enc_hostgrouponly/engine.rb

@@ -1,13 +1,8 @@
-require 'deface'
 require 'foreman_enc_hostgrouponly_patch'
 
 module ForemanEncHostgrouponly
   class Engine < ::Rails::Engine
 
-    #config.autoload_paths += Dir["#{config.root}/app/controllers/concerns"]
-    #config.autoload_paths += Dir["#{config.root}/app/helpers/concerns"]
-    #config.autoload_paths += Dir["#{config.root}/app/models/concerns"]
-    #config.autoload_paths += Dir["#{config.root}/app/overrides"]
 
     # Load this before the Foreman config initizializers, so that the Setting.descendants
     # list includes the plugin STI setting class
@@ -25,8 +20,6 @@ module ForemanEncHostgrouponly
     #Include concerns in this config.to_prepare block
     config.to_prepare do
       begin
-   #     Host::Managed.send(:include, ForemanEncHostgrouponly::HostExtensions)
-   #     HostsHelper.send(:include, ForemanEncHostgrouponly::HostsHelperExtensions)
          Classification::ClassParam.send(:include, ForemanEncHostgrouponlyPatch)
       rescue => e
         puts e.backtrace

data/lib/foreman_enc_hostgrouponly/version.rb

@@ -1,3 +1,3 @@
 module ForemanEncHostgrouponly
-  VERSION = "1.0.0"
+  VERSION = "1.0.1"
 end

data/lib/foreman_enc_hostgrouponly_patch.rb

@@ -16,32 +16,29 @@ module ForemanEncHostgrouponlyPatch
         Rails.logger.debug "ForemanEncHostgrouponlyPatch: return host group parameters only"
         h = {}
         begin
-          hostgroup_matches.each do |hostgroup_match|
-            LookupValue.where(:match => hostgroup_match).where(:lookup_key_id => class_parameters.map(&:id)).each do |value|
-                key = class_parameters.detect{|k| k.id == value.lookup_key_id }
-                Rails.logger.debug "ForemanEncHostgrouponlyPatch: detect host group parameters (#{key.to_s})"
-                klass_id = key.environment_classes.first.puppetclass_id
-                h[klass_id] ||= []
-                h[klass_id] << key
-              end
-          end
-          h
-        rescue => e
-          Rails.logger.error "ForemanEncHostgrouponlyPatch: return host group parameters only (#{e.to_s})"
-        end
-      end
-
-      def hostgroup_match
-        hostgroup_matches = []
+         hostgroup_matches = []
           possible_value_orders.each do |rule|
             match = Array.wrap(rule).map do |element|
-                "#{element}#{LookupKey::EQ_DELM}#{attr_to_value(element)}"
+              "#{element}#{LookupKey::EQ_DELM}#{attr_to_value(element)}"
             end if Array.wrap(rule).include?("hostgroup")
             if match
-                hostgroup_matches << match.join(LookupKey::KEY_DELM)
+              hostgroup_matches << match.join(LookupKey::KEY_DELM)
             end
           end
-        hostgroup_matches
+
+          hostgroup_matches.each do |hostgroup_match|
+            LookupValue.where(:match => hostgroup_match).where(:lookup_key_id => class_parameters.map(&:id)).each do |value|
+              key = class_parameters.detect{|k| k.id == value.lookup_key_id }
+              Rails.logger.debug "ForemanEncHostgrouponlyPatch: detect host group parameters (#{key.to_s})"
+              klass_id = key.environment_classes.first.puppetclass_id
+              h[klass_id] ||= []
+              h[klass_id] << key
+            end
+          end
+        h
+        rescue => e
+          Rails.logger.error "ForemanEncHostgrouponly: skipping engine hook (#{e.to_s})"
+        end
       end
 
   end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: foreman_enc_hostgrouponly
 version: !ruby/object:Gem::Version
-  version: 1.0.0
+  version: 1.0.1
   prerelease: 
 platform: ruby
 authors:
@@ -9,24 +9,8 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-09-23 00:00:00.000000000 Z
-dependencies:
-- !ruby/object:Gem::Dependency
-  name: deface
-  requirement: !ruby/object:Gem::Requirement
-    none: false
-    requirements:
-    - - ! '>='
-      - !ruby/object:Gem::Version
-        version: '0'
-  type: :runtime
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    none: false
-    requirements:
-    - - ! '>='
-      - !ruby/object:Gem::Version
-        version: '0'
+date: 2014-09-24 00:00:00.000000000 Z
+dependencies: []
 description: get hostgroup param only
 email:
 - huajiang@ebay.com