puppet_factset 0.3.0 → 0.4.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: b4a6717d77c082bdc0dd85ce3cdafe30d02d0e7d
-  data.tar.gz: 4af78d58b9b1ed249ceff348003b83d240b86a0f
+  metadata.gz: 48b580ff5dc4c047ca6e9440475f930e6d0a862e
+  data.tar.gz: ae9d7f14350fc87c0910fd3a16aa4b960b0aef8a
 SHA512:
-  metadata.gz: 16e681ca99696a96928d7f50d72fa0eca89d049135ab959384dac59127b0be7284773fdd2ef025ebe847a87d37f144008e1dd22250b8290c6b1aa27ae475535d
-  data.tar.gz: 58c291dbf9e943dd33cadf8687bac54a07c84d6d55e36b47cc05448045c1cbdd73b3e7b6ffa4a0b28b54989a406280a0e79f3483cc9427b475d29544ad0e9bab
+  metadata.gz: 13239c7af64c5e01953c285572b84eca39f47580721226a7b7aa65c6f0ecf8ed87eda76ce67f6923d227d028b5983b65dc434e7a27bf63cf1cf04f15fb002921
+  data.tar.gz: 4e33159277ce2e35c5a32270a65c5e3b0aa08a40a871e9f0d8968fc283b310655c29beae3caa9b37f04cb61061f8115417dd1b952d63eccb9074e79e8f31eb0d

data/README.md

@@ -71,6 +71,30 @@ factsets = PuppetFactset::factsets
 
 * The `factsets` array will be sorted A-Z
 
+## Merging additional facts/handling external facts
+Sometimes you need to ensure that a fact is present without worrying to much about its real-world value, for example external facts or custom in-module facts that do things such as query for the system for package versions, etc.
+
+`puppet_factset` will automatically merge the hiera data found in all `.json` files found inside the `spec/merge_facts` directory, relative to the current working directory into factset data for each OS when accessed via the above API (the factset files themselves are unchanged).
+
+#### Worked example
+
+```json
+spec/merge_facts/extra_fact.json
+{
+  "extra_fact": "hello"
+}
+```
+
+
+```ruby
+require 'puppet_factset'
+fact_hash = PuppetFactset::factset_hash(system_name)
+puts fact_hash["extra_fact"]  # from your json file
+puts fact_hash["osfamily"]    # from the facts shipped inside this gem
+```
+
+Note that its possible to silently override shipped factsets using this method as well.  I regard this as a feature.
+
 ## Development
 
 * RSpec tests are provided, please ensure these pass before and after adding any ruby code to the project

data/lib/puppet_factset.rb

@@ -2,6 +2,9 @@ require "puppet_factset/version"
 require "json"
 
 module PuppetFactset
+
+  MERGE_FACTS_DIR = File.join("spec", "merge_facts")
+
   # Return the name of the directory holding the factsets
   def self.factset_dir
     File.expand_path(File.join(File.dirname(__FILE__), '..', 'res', 'factset'))
@@ -11,6 +14,8 @@ module PuppetFactset
   def self.factset_hash(factset_name)
     data = JSON.parse(File.read(File.join(factset_dir(), "#{factset_name}.json")))
 
+    merge_facts(data["values"])
+
     # The facts are tucked away inside the 'values' element so just return that
     data["values"]
   end
@@ -21,4 +26,18 @@ module PuppetFactset
       File.basename(f).gsub('.json','')
     }.sort
   end
+
+  # If a directory exists at `merge_facts` relative to the current directory then
+  # all JSON files present in this directory will be loaded and merged into passed
+  # in factset
+  #
+  # @param factset Hash of facts (will be modified in-place)
+  def self.merge_facts(factset)
+    Dir["#{MERGE_FACTS_DIR}/*.json"].each { |json_file|
+      puts json_file
+      facts = JSON.parse(File.read(json_file))
+      puts facts
+      factset.merge!(facts)
+    }
+  end
 end

data/lib/puppet_factset/version.rb

@@ -1,3 +1,3 @@
 module PuppetFactset
-  VERSION = "0.3.0"
+  VERSION = "0.4.0"
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: puppet_factset
 version: !ruby/object:Gem::Version
-  version: 0.3.0
+  version: 0.4.0
 platform: ruby
 authors:
 - Geoff Williams
@@ -10,7 +10,7 @@ authors:
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2017-04-16 00:00:00.000000000 Z
+date: 2017-04-23 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler