foreman_discovery 1.4.0.rc3 → 1.4.0.rc4

checksums.yaml

@@ -1,15 +1,7 @@
 ---
-!binary "U0hBMQ==":
-  metadata.gz: !binary |-
-    ODU0YmFjMjdiMDU4NzI3YTdmNTcxYmFiYmY5NDRkM2E0MTY3NjIxMA==
-  data.tar.gz: !binary |-
-    N2IwODQ5YTBjMTBkNTQ0NzA3MDYzNGJjMzNhZjNiY2E2ODM2ZmE1OQ==
+SHA1:
+  metadata.gz: 4106b050ad142a2bdf51a3d0502efa0842136b33
+  data.tar.gz: 931495a77ba85f9429b87560241687b11f307c96
 SHA512:
-  metadata.gz: !binary |-
-    NzI3MDM5NDk4NTM3ZTdkMzBlZGYzNjM4ZTg3OGIyZDE2ZDYxYWFkODJhMDYy
-    YWI2N2M1YzZkM2ZhMjdhZGIzOGVlMGVkYjg5Yzg4YjM5MGNiYjdjMzcxOTQy
-    NzY0YjhkNDk0YmFhNjNlODc4M2VmNWNmYzI5NmNiYzk1ZDU1ZmU=
-  data.tar.gz: !binary |-
-    OTk1YmJmYmYxZTk3ZmU4YzA3NTdlMjA4NjUyY2ZhYjM3YTA2MmY4ZTY3ZmE5
-    NGY0ODAxODAxNzg1NDk2ZjE0MDIxZWMwZGQzODg4MTdhNzJmMDE0MTQ3ZjMz
-    YjQxMjRlODdlYmQ3OWVhYTdlMTEzZWU1OTMxOTQzNWVmNWY1YjE=
+  metadata.gz: d1e1efbdccbc1c6917f4f4cde2e3af3d543295b0a2002ef2ea6308aca499bcf684eece46fb587f103c385cd5b8d697046d49192c9800eb599eb4172a74dd35ad
+  data.tar.gz: c45046a056199bcda6188e14c09409ff69388ea2efa7e261537bc6ec860de9fb6a53d1535e756e54ad2a93865ddba02e2600bbdd07d9736e9fd028ed501f37eb

data/app/lib/puppet_fact_parser_extensions.rb

@@ -18,7 +18,9 @@ module PuppetFactParserExtensions
   # search for IP of interface with primary interface macaddress (ipaddress fact does not have to be interface used for boot)
   def ip_with_discovery_fact
     facts[:interfaces].split(',').each do |interface|
-      return facts["ipaddress_#{interface}"] if facts["macaddress_#{interface}"] == facts[discovery_mac_fact_name]
+      if facts["macaddress_#{interface}"].try(:downcase) == facts[discovery_mac_fact_name].try(:downcase)
+        return facts["ipaddress_#{interface}"]
+      end
     end
     ip_without_discovery_fact # fallback if IP was not found
   end

data/lib/foreman_discovery/engine.rb

@@ -73,9 +73,16 @@ module ForemanDiscovery
     end
     # Include extensions to models in this config.to_prepare block
     config.to_prepare do
+
+      begin
+        require_dependency 'puppet_fact_parser'
+        ::PuppetFactParser.send :include, PuppetFactParserExtensions
+      rescue LoadError
+        Rails.logger.warn 'PuppetFactParser not found, not loading Parser extensions'
+      end
+
       # Include host extensions
       ::Host::Managed.send :include, Host::ManagedExtensions
-      ::PuppetFactParser.send :include, PuppetFactParserExtensions if defined? PuppetFactParser
     end
 
     rake_tasks do

data/lib/foreman_discovery/version.rb

@@ -1,3 +1,3 @@
 module ForemanDiscovery
-  VERSION = "1.4.0.rc3"
+  VERSION = "1.4.0.rc4"
 end

metadata

@@ -1,44 +1,44 @@
 --- !ruby/object:Gem::Specification
 name: foreman_discovery
 version: !ruby/object:Gem::Version
-  version: 1.4.0.rc3
+  version: 1.4.0.rc4
 platform: ruby
 authors:
 - Greg Sutcliffe
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-09-23 00:00:00.000000000 Z
+date: 2014-10-01 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: open4
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ! '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ! '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
   name: ftools
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ! '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ! '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
-description: ! 'MaaS Discovery Plugin engine for Foreman '
+description: 'MaaS Discovery Plugin engine for Foreman '
 email: gsutclif@redhat.com
 executables: []
 extensions: []
@@ -129,24 +129,25 @@ require_paths:
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
-  - - ! '>='
+  - - ">="
     - !ruby/object:Gem::Version
       version: '0'
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
-  - - ! '>'
+  - - ">"
     - !ruby/object:Gem::Version
       version: 1.3.1
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.2.1
+rubygems_version: 2.2.0
 signing_key: 
 specification_version: 4
 summary: MaaS Discovery Plugin for Foreman
 test_files:
-- test/test_plugin_helper.rb
 - test/functional/discovered_hosts_controller_test.rb
-- test/test_helper.rb
-- test/unit/facts.json
 - test/unit/setting_discovered_test.rb
+- test/unit/facts.json
 - test/unit/host_discovered_test.rb
+- test/test_plugin_helper.rb
+- test/test_helper.rb
+has_rdoc: