pl-puppetdb-ruby 2.0.2 → 2.0.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
-SHA1:
-  metadata.gz: 75cced7d7b22d31de2105b1dd6d92d1c044f4c4f
-  data.tar.gz: 9c53a504d40409c7816a050d8c05f5038560c794
+SHA256:
+  metadata.gz: ededdeb26d38775d65bf3138883b529b2a9f18c62aa2eae05534431a066e05fe
+  data.tar.gz: 1cc1e91a547e8918bf5cd2fe63bdde5328435c4b0565acf75fb25c5f0e7cfbc7
 SHA512:
-  metadata.gz: ef08c4aa79fc2cc2a1c044d008f6b38c4f01e4bbb99b78120e55a6077935b86ebe0d26b3d1dd5c8582497ac8cd3d0ca2f40ca334fe2cc7b062478ff55e79bdc9
-  data.tar.gz: 17b50659d9fb6149c4802de705bedb83d38b63c702481a31994dc084109cde7e0d39648f12a6656a7dc2f7e3ae86a20a6d6b46c1fe6fe90250dae3b1d8f686e4
+  metadata.gz: 8a55abd3d564556d92ab4fb853207daf26fa6b4c18c9ceaed933f64e482689be761bc3f05c15bc8e253cbd49144166c7c5293de01abeee50dccde57bf0633462
+  data.tar.gz: aec5e7c3d2f79477610d8eada1e483a0fc995f51509808ac21a1b21c028c3f0ffe42ff8b6af29add88bcde0e7dda6407e2379c0c4d88b0f7dadd1945f5bb79f0

data/lib/puppetdb/client.rb

@@ -146,13 +146,11 @@ module PuppetDB
 
     def export(filename, opts = {})
       self.class.base_uri(@servers.first)
-      path = "/pdb/admin/v#{@admin_api_version}/archive"
+      anonymization_profile = opts.delete(:anonymization_profile) || 'none'
+      path = "/pdb/admin/v#{@admin_api_version}/archive?anonymization_profile=#{anonymization_profile}"
 
-      # Allow opts to override anonymization_profile, but enforce
-      # stream_body to avoid using memory
-      params = { anonymization_profile: 'none' }.
-               merge(opts).
-               merge(stream_body: true)
+      # Enforce stream_body to avoid using memory
+      params = opts.merge(stream_body: true)
 
       File.open(filename, 'w') do |file|
         self.class.get(path, params) do |fragment|

data/lib/puppetdb/config.rb

@@ -1,4 +1,5 @@
 require 'json'
+require 'rbconfig'
 
 class PuppetDB::Config
   def initialize(overrides = nil, load_files = false)
@@ -8,12 +9,28 @@ class PuppetDB::Config
     @load_files = load_files
   end
 
+  def windows?
+    @is_windows ||= (RbConfig::CONFIG['host_os'] =~ %r{mswin|mingw|cygwin})
+    @is_windows
+  end
+
   def load_file(path)
-    File.open(path) { |f| JSON.parse(f.read, symbolize_names: true)[:puppetdb] }
+    loaded_conf = File.open(path) { |f| JSON.parse(f.read, symbolize_names: true)[:puppetdb] }
+
+    # Munge token-file into token_file for better readability in Ruby
+    if loaded_conf[:'token-file']
+      loaded_conf[:token_file] = loaded_conf.delete(:'token-file')
+    end
+
+    loaded_conf
   end
 
   def puppetlabs_root
-    '/etc/puppetlabs'
+    if windows?
+      'C:\ProgramData\PuppetLabs'
+    else
+      '/etc/puppetlabs'
+    end
   end
 
   def global_conf
@@ -29,7 +46,7 @@ class PuppetDB::Config
   end
 
   def default_cacert
-    "#{puppetlabs_root}/puppet/ssl/certs/ca.pem"
+    File.join(puppetlabs_root, 'puppet', 'ssl', 'certs', 'ca.pem')
   end
 
   def defaults

data/lib/puppetdb/version.rb

@@ -1,3 +1,3 @@
 module PuppetDB
-  VERSION = '2.0.2'.freeze
+  VERSION = '2.0.3'.freeze
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: pl-puppetdb-ruby
 version: !ruby/object:Gem::Version
-  version: 2.0.2
+  version: 2.0.3
 platform: ruby
 authors:
 - Austin Blatt
@@ -11,7 +11,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2019-04-29 00:00:00.000000000 Z
+date: 2019-10-07 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: httparty
@@ -129,7 +129,7 @@ files:
 - lib/puppetdb/version.rb
 homepage: https://github.com/austb/puppetdb-ruby
 licenses:
-- apache
+- Apache-2.0
 metadata: {}
 post_install_message: 
 rdoc_options: []
@@ -146,8 +146,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubyforge_project: 
-rubygems_version: 2.6.14.1
+rubygems_version: 3.0.3
 signing_key: 
 specification_version: 4
 summary: Simple Ruby client library for PuppetDB API