facterdb 0.5.1 → 0.5.2

data/lib/facterdb.rb

@@ -5,7 +5,7 @@ module FacterDB
 
   # @return [String] -  returns a giant incomprehensible string of concatenated json data
   def self.database
-    @database ||= "[#{facterdb_fact_files.map { |f| File.read(f) }.join(',')}]\n"
+    @database ||= "[#{facterdb_fact_files.map { |f| read_json_file(f) }.join(',')}]\n"
   end
 
   # @return [Boolean] - returns true if we should use the default facterdb database, false otherwise
@@ -15,6 +15,25 @@ module FacterDB
     ENV['FACTERDB_SKIP_DEFAULTDB'].nil?
   end
 
+  # @return [Boolean] - returns true if we should inject the source file name and file path into the json factsets.
+  # The default is false.
+  def self.inject_source?
+    !ENV['FACTERDB_INJECT_SOURCE'].nil?
+  end
+
+  def self.read_json_file(f)
+    content = File.read(f)
+    return content unless inject_source?
+    # Find the opening brace
+    first_brace = content.index('{')
+    return content if first_brace.nil?
+    # Inject source file information
+    json_injection =  "\"_facterdb_filename\": #{File.basename(f).to_json}, "
+    json_injection += "\"_facterdb_path\": #{File.expand_path(f).to_json}, "
+    content.insert(first_brace + 1, json_injection)
+  end
+  private_class_method :read_json_file
+
   # @return [Array[String]] -  list of all files found in the default facterdb facts path
   def self.default_fact_files
     return [] unless use_defaultdb?

data/lib/facterdb/version.rb

@@ -1,5 +1,5 @@
 module FacterDB
   module Version
-    STRING = '0.5.1'
+    STRING = '0.5.2'
   end
 end

data/spec/facterdb_spec.rb

@@ -5,7 +5,6 @@ describe 'FacterDB' do
   describe 'database' do
 
     before(:each) do
-      stub_const("File::PATH_SEPARATOR", ":")
       ENV['FACTERDB_SKIP_DEFAULTDB'] = nil
       FacterDB.instance_variable_set(:@database, nil)
     end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: facterdb
 version: !ruby/object:Gem::Version
-  version: 0.5.1
+  version: 0.5.2
 platform: ruby
 authors:
 - Mickaël Canévet
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2018-03-06 00:00:00.000000000 Z
+date: 2018-04-30 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: coveralls
@@ -123,6 +123,7 @@ extensions: []
 extra_rdoc_files: []
 files:
 - ".gitignore"
+- ".gitmodules"
 - ".travis.yml"
 - CHANGELOG.md
 - Gemfile
@@ -205,6 +206,7 @@ files:
 - facts/1.6/ubuntu-15.10-x86_64.facts
 - facts/1.6/ubuntu-16.04-i386.facts
 - facts/1.6/ubuntu-16.04-x86_64.facts
+- facts/1.6/ubuntu-18.04-x86_64.facts
 - facts/1.7/amazon-2017-x86_64.facts
 - facts/1.7/archlinux-i386.facts
 - facts/1.7/archlinux-x86_64.facts
@@ -278,6 +280,7 @@ files:
 - facts/1.7/ubuntu-15.10-x86_64.facts
 - facts/1.7/ubuntu-16.04-i386.facts
 - facts/1.7/ubuntu-16.04-x86_64.facts
+- facts/1.7/ubuntu-18.04-x86_64.facts
 - facts/2.0/amazon-2017-x86_64.facts
 - facts/2.0/archlinux-i386.facts
 - facts/2.0/archlinux-x86_64.facts
@@ -366,6 +369,7 @@ files:
 - facts/2.0/ubuntu-15.10-x86_64.facts
 - facts/2.0/ubuntu-16.04-i386.facts
 - facts/2.0/ubuntu-16.04-x86_64.facts
+- facts/2.0/ubuntu-18.04-x86_64.facts
 - facts/2.1/amazon-2017-x86_64.facts
 - facts/2.1/archlinux-i386.facts
 - facts/2.1/archlinux-x86_64.facts
@@ -454,6 +458,7 @@ files:
 - facts/2.1/ubuntu-15.10-x86_64.facts
 - facts/2.1/ubuntu-16.04-i386.facts
 - facts/2.1/ubuntu-16.04-x86_64.facts
+- facts/2.1/ubuntu-18.04-x86_64.facts
 - facts/2.1/windows-10-i386.facts
 - facts/2.1/windows-10-x86_64.facts
 - facts/2.1/windows-2008 r2-x86_64.facts
@@ -552,6 +557,7 @@ files:
 - facts/2.2/ubuntu-15.10-x86_64.facts
 - facts/2.2/ubuntu-16.04-i386.facts
 - facts/2.2/ubuntu-16.04-x86_64.facts
+- facts/2.2/ubuntu-18.04-x86_64.facts
 - facts/2.2/windows-10-i386.facts
 - facts/2.2/windows-10-x86_64.facts
 - facts/2.2/windows-2008 r2-x86_64.facts
@@ -650,6 +656,7 @@ files:
 - facts/2.3/ubuntu-15.10-x86_64.facts
 - facts/2.3/ubuntu-16.04-i386.facts
 - facts/2.3/ubuntu-16.04-x86_64.facts
+- facts/2.3/ubuntu-18.04-x86_64.facts
 - facts/2.3/windows-10-i386.facts
 - facts/2.3/windows-10-x86_64.facts
 - facts/2.3/windows-2008 r2-x86_64.facts
@@ -752,6 +759,7 @@ files:
 - facts/2.4/ubuntu-15.10-x86_64.facts
 - facts/2.4/ubuntu-16.04-i386.facts
 - facts/2.4/ubuntu-16.04-x86_64.facts
+- facts/2.4/ubuntu-18.04-x86_64.facts
 - facts/2.4/windows-10-i386.facts
 - facts/2.4/windows-10-x86_64.facts
 - facts/2.4/windows-2008 r2-x86_64.facts
@@ -815,6 +823,7 @@ files:
 - facts/2.5/ubuntu-14.04-x86_64.facts
 - facts/2.5/ubuntu-16.04-i386.facts
 - facts/2.5/ubuntu-16.04-x86_64.facts
+- facts/2.5/ubuntu-18.04-x86_64.facts
 - facts/2.5/windows-10-i386.facts
 - facts/2.5/windows-10-x86_64.facts
 - facts/2.5/windows-2008 r2-x86_64.facts
@@ -1273,6 +1282,8 @@ files:
 - facts/3.9/freebsd-10-amd64.facts
 - facts/3.9/freebsd-11-amd64.facts
 - facts/3.9/opensuse-42-x86_64.facts
+- facts/3.9/solaris-10-i386.facts
+- facts/3.9/solaris-10-x86_64.facts
 - facts/Gemfile
 - facts/Vagrantfile
 - facts/Windows_README.md
@@ -1289,6 +1300,11 @@ files:
 - facts/windows_packer/scripts/postunattend.xml
 - facts/windows_packer/scripts/provision.ps1
 - facts/windows_packer/vagrant_templates/vagrantfile-windows.template
+- hugo/archetypes/default.md
+- hugo/config.toml
+- hugo/content/.placeholder
+- images/facterdb.png
+- images/facterdb.svg
 - lib/facterdb.rb
 - lib/facterdb/bin.rb
 - lib/facterdb/version.rb