puppet_facts 0.1.0 → 0.2.1

data/CHANGELOG.md

@@ -0,0 +1,11 @@
+2014-08-07 Release 0.2.1
+
+Bugfixes:
+- Rename opensuse- to sles- in PE3.3.
+
+2014-08-07 Release 0.2.0
+
+Features:
+- Add `on_pe_supported_platforms` to take an argument of target platforms
+- Add `on_pe_unsupported_platforms` to perform the inverse
+- Add ability to only check PE versions that match metadata requirements

data/lib/puppet_facts.rb

@@ -1,4 +1,7 @@
 require 'json'
+require 'puppet'
+# From puppet
+require 'semver'
 
 module PuppetFacts
 
@@ -15,17 +18,45 @@ module PuppetFacts
     PuppetFacts.pe_platforms[pe_version]
   end
 
-  def on_pe_supported_platforms
-    # This should filter based on set_pe_supported_platforms
+  def on_pe_supported_platforms(targets=nil)
+    targets = Array(targets) if targets
+
+    # TODO This should filter based on set_pe_supported_platforms
     facts = PuppetFacts.pe_platform_facts
     sup_facts = Hash.new
-    #TODO how do we compare against this?
-    #  "name": "pe",
-    #  "version_requirement": "3.2.x"
-    #  "version_requirement": ">= 3.2.0 < 3.4.0"
     facts.each do |pe_ver,platforms|
-      sup_facts[pe_ver] = platforms.select do |platform, facts|
-        PuppetFacts.meta_supported_platforms.include?(platform)
+      pe_semver = "#{pe_ver.sub(/^PE/,'')}.0"
+      if SemVer[PuppetFacts.get_pe_requirement] === SemVer.new(pe_semver)
+        sup_facts[pe_ver] = platforms.select do |platform, facts|
+          if targets
+            PuppetFacts.meta_supported_platforms.include?(platform) && targets.include?(platform)
+          else
+            PuppetFacts.meta_supported_platforms.include?(platform)
+          end
+        end
+      end
+    end
+    sup_facts
+  end
+
+  # We need the inverse, this is kind of ugly. I don't want to cram it into the
+  # other method however.
+  def on_pe_unsupported_platforms(targets=nil)
+    targets = Array(targets) if targets
+
+    # TODO This should filter based on set_pe_supported_platforms
+    facts = PuppetFacts.pe_platform_facts
+    sup_facts = Hash.new
+    facts.each do |pe_ver,platforms|
+      pe_semver = "#{pe_ver.sub(/^PE/,'')}.0"
+      if SemVer[PuppetFacts.get_pe_requirement] === SemVer.new(pe_semver)
+        sup_facts[pe_ver] = platforms.select do |platform, facts|
+          if targets
+            ! PuppetFacts.meta_supported_platforms.include?(platform) && ! targets.include?(platform)
+          else
+            ! PuppetFacts.meta_supported_platforms.include?(platform)
+          end
+        end
       end
     end
     sup_facts
@@ -44,15 +75,20 @@ module PuppetFacts
   def self.pe_versions
     @pe_versions ||= get_pe_versions
   end
+
+  # @api private
   def self.get_pe_versions
     @pe_dirs.collect do |dir|
       File.basename(dir)
     end
   end
 
+  # @api private
   def self.pe_platforms
     @pe_platforms ||= get_pe_platforms
   end
+
+  # @api private
   def self.get_pe_platforms
     @pe_dirs.inject({}) do |memo,pe_dir|
       pe_version = File.basename(pe_dir)
@@ -66,18 +102,24 @@ module PuppetFacts
     end
   end
 
+  # @api private
   def self.pe_facts_paths
     @pe_facts_paths ||= get_pe_facts_paths
   end
+
+  # @api private
   def self.get_pe_facts_paths
     @pe_dirs.collect do |dir|
       Dir[File.join(dir,"*")]
     end.flatten
   end
 
+  # @api private
   def self.pe_platform_facts
     @pe_platform_facts ||= get_pe_platform_facts
   end
+
+  # @api private
   def self.get_pe_platform_facts
     pe_facts_paths.inject({}) do |memo,file|
       pe_platform = File.basename(file.gsub(/\.facts/, ''))
@@ -92,10 +134,12 @@ module PuppetFacts
     end
   end
 
+  # @api private
   def self.meta_supported_platforms
     @meta_supported_platforms ||= get_meta_supported_platforms
   end
 
+  # @api private
   def self.meta_to_facts(input)
     meta_to_facts = {
       'RedHat' => 'redhat',
@@ -118,12 +162,10 @@ module PuppetFacts
     end
   end
 
+  # @api private
   def self.get_meta_supported_platforms
-    if ! File.file?('metadata.json')
-      fail StandardError, "Can't find metadata.json... dunno why"
-    end
-    metadata = JSON.parse(File.read('metadata.json'))
-    if metadata.nil? or metadata['operatingsystem_support'].nil?
+    metadata = get_metadata
+    if metadata['operatingsystem_support'].nil?
       fail StandardError, "Unknown operatingsystem support"
     end
     os_sup = metadata['operatingsystem_support']
@@ -140,4 +182,31 @@ module PuppetFacts
       end
     end.flatten
   end
+
+  # @api private
+  def self.get_metadata
+    if ! File.file?('metadata.json')
+      fail StandardError, "Can't find metadata.json... dunno why"
+    end
+    metadata = JSON.parse(File.read('metadata.json'))
+    if metadata.nil?
+      fail StandardError, "Metadata is empty"
+    end
+    metadata
+  end
+
+  # @api private
+  def self.get_pe_requirement
+    metadata = get_metadata
+    if metadata['requirements'].nil?
+      fail StandardError, 'No requirements in metadata'
+    end
+    pe_requirement = metadata['requirements'].select do |x|
+      x['name'] == 'pe'
+    end
+    if pe_requirement.empty?
+      fail StandardError, 'No PE requirement found in metadata'
+    end
+    pe_requirement.first['version_requirement']
+  end
 end

data/lib/puppet_facts/version.rb

@@ -1,5 +1,5 @@
 module PuppetFacts
   module Version
-    STRING = '0.1.0'
+    STRING = '0.2.1'
   end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: puppet_facts
 version: !ruby/object:Gem::Version
-  version: 0.1.0
+  version: 0.2.1
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-07-28 00:00:00.000000000 Z
+date: 2014-08-07 00:00:00.000000000 Z
 dependencies: []
 description: Contains facts from many PE and POSS systems
 email:
@@ -19,6 +19,7 @@ extensions: []
 extra_rdoc_files: []
 files:
 - 3.6/ubuntu-1404-x86_64.facts
+- CHANGELOG.md
 - PE2.8/centos-5-i386.facts
 - PE2.8/centos-5-x86_64.facts
 - PE2.8/centos-6-i386.facts
@@ -129,8 +130,6 @@ files:
 - PE3.3/debian-6-x86_64.facts
 - PE3.3/debian-7-i386.facts
 - PE3.3/debian-7-x86_64.facts
-- PE3.3/opensuse-11-i386.facts
-- PE3.3/opensuse-11-x86_64.facts
 - PE3.3/oracle-5-i386.facts
 - PE3.3/oracle-5-x86_64.facts
 - PE3.3/oracle-6-i386.facts
@@ -144,6 +143,8 @@ files:
 - PE3.3/scientific-5-x86_64.facts
 - PE3.3/scientific-6-i386.facts
 - PE3.3/scientific-6-x86_64.facts
+- PE3.3/sles-11-i386.facts
+- PE3.3/sles-11-x86_64.facts
 - PE3.3/ubuntu-1004-i386.facts
 - PE3.3/ubuntu-1004-x86_64.facts
 - PE3.3/ubuntu-1204-i386.facts