puppetdb_foreman 0.1.2 → 0.1.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 8a81b111e883eae3b66330a375019b9f65227baa
-  data.tar.gz: 3611a9e15096142d581d8c35eef162b23050d0d1
+  metadata.gz: 43c606bf582d08e8291a8b683cef9646123cef58
+  data.tar.gz: 56cecd8257e72267d52d04641f934d63573e236a
 SHA512:
-  metadata.gz: ca1268d68b4d4fc521f4bd6cc79efdb2bb9a3e0823067a1ad50b8c52b6dfa2268a9dd968b729b82baf6b3614b03a5cdb865d8e612e63fd4ca579aed914e6e1dc
-  data.tar.gz: 23f80d5b4ae21f6ecfc96630f7d36699d1ce5a11144347fe2f0e33ffab154a37fd1bbcad52bb71f6056fc0bab9f7bf96802283a878bd2cdf6f84cfc243508940
+  metadata.gz: 43b4d5fac5e312bacdab1719059b2391b689871fafe74e95fd55675c176fab1b8801067a3b893b2cd1e1ac54e3530691b2d2f029c934d50c16949e381ebf1e2f
+  data.tar.gz: 227b396f7c800b06c9a7a3085d8501fc1b611720b6dda5c78203a5965099d5ca963f2017c20ebee5bd3782b2e5b0ae989c55942a7bb7240ea107d362549b9260

data/app/models/puppetdb_foreman/host_extensions.rb

@@ -7,9 +7,9 @@ module PuppetdbForeman
 
       def deactivate_host
         logger.debug "Deactivating host #{name} in Puppetdb"
-        return false unless configured?
+        return false unless puppetdb_configured?
 
-        if enabled?
+        if puppetdb_enabled?
           begin
             uri = URI.parse(Setting[:puppetdb_address])
             req = Net::HTTP::Post.new(uri.path)
@@ -39,14 +39,14 @@ module PuppetdbForeman
 
       private
 
-      def configured?
-        if enabled? && Setting[:puppetdb_address].blank?
+      def puppetdb_configured?
+        if puppetdb_enabled? && Setting[:puppetdb_address].blank?
           errors.add(:base, _("PuppetDB plugin is enabled but not configured. Please configure it before trying to delete a host."))
         end
         errors.empty?
       end
 
-      def enabled?
+      def puppetdb_enabled?
         [true, 'true'].include? Setting[:puppetdb_enabled]
       end
     end

data/lib/puppetdb_foreman/engine.rb

@@ -20,13 +20,7 @@ module PuppetdbForeman
     end
 
     config.to_prepare do
-      if SETTINGS[:version].to_s.to_f >= 1.2
-        # Foreman 1.2
-        Host::Managed.send :include, PuppetdbForeman::HostExtensions
-      else
-        # Foreman < 1.2
-        Host.send :include, PuppetdbForeman::HostExtensions
-      end
+      Host::Managed.send :include, PuppetdbForeman::HostExtensions
     end
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: puppetdb_foreman
 version: !ruby/object:Gem::Version
-  version: 0.1.2
+  version: 0.1.3
 platform: ruby
 authors:
 - Daniel Lobato Garcia
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-11-11 00:00:00.000000000 Z
+date: 2015-10-25 00:00:00.000000000 Z
 dependencies: []
 description: 'Disable hosts on PuppetDB after they are deleted or built in Foreman,
   and proxy the PuppetDB dashboard to Foreman. Follow https://github.com/theforeman/puppetdb_foreman
@@ -36,12 +36,12 @@ 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: '0'
 requirements: []
@@ -51,4 +51,3 @@ signing_key:
 specification_version: 4
 summary: This is a Foreman plugin to interact with PuppetDB.
 test_files: []
-has_rdoc: