puppet 4.10.4-x64-mingw32 → 4.10.5-x64-mingw32

data/spec/unit/type/file_spec.rb

@@ -1415,6 +1415,52 @@ describe Puppet::Type.type(:file) do
     end
   end
 
+  describe 'when using source' do
+    # different UTF-8 widths
+    # 1-byte A
+    # 2-byte ۿ - http://www.fileformat.info/info/unicode/char/06ff/index.htm - 0xDB 0xBF / 219 191
+    # 3-byte ᚠ - http://www.fileformat.info/info/unicode/char/16A0/index.htm - 0xE1 0x9A 0xA0 / 225 154 160
+    # 4-byte <U+070E> - http://www.fileformat.info/info/unicode/char/2070E/index.htm - 0xF0 0xA0 0x9C 0x8E / 240 160 156 142
+    let (:mixed_utf8) { "A\u06FF\u16A0\u{2070E}" } # Aۿᚠ<U+070E>
+
+    it 'should allow UTF-8 characters and return a UTF-8 uri' do
+      filename = "/bar #{mixed_utf8}"
+      source = "puppet://foo#{filename}"
+      file[:source] = source
+
+      # intercept the indirector call to provide back mocked metadata for the given URI
+      metadata = stub 'metadata', :source => source
+      metadata.expects(:source=)
+      Puppet::FileServing::Metadata.indirection.expects(:find).with do |path, opts|
+        path == source
+      end.returns metadata
+
+      uri = file.parameters[:source].uri
+      expect(URI.unescape(uri.path)).to eq(filename)
+      expect(uri.path.encoding).to eq(Encoding::UTF_8)
+    end
+
+    it 'should allow UTF-8 characters inside the indirector / terminus code' do
+      filename = "/bar #{mixed_utf8}"
+      source = "puppet://foo#{filename}"
+      file[:source] = source
+
+      # for this test to properly trigger previously errant behavior, the code for
+      # Puppet::FileServing::Metadata.indirection.find must run and produce an
+      # instance of Puppet::Indirector::FileMetadata::Rest that can be amended
+      metadata = stub 'metadata', :source => source
+      metadata.expects(:source=)
+      require 'puppet/indirector/file_metadata/rest'
+      Puppet::Indirector::FileMetadata::Rest.any_instance.expects(:find).with do |req|
+        req.key == filename[1..-1]
+      end.returns(metadata)
+
+      uri = file.parameters[:source].uri
+      expect(URI.unescape(uri.path)).to eq(filename)
+      expect(uri.path.encoding).to eq(Encoding::UTF_8)
+    end
+  end
+
   describe "when using source" do
     before do
       file[:source] = File.expand_path('/one')

data/spec/unit/util_spec.rb

@@ -297,6 +297,14 @@ describe Puppet::Util do
   end
 
   describe "#path_to_uri" do
+    # different UTF-8 widths
+    # 1-byte A
+    # 2-byte ۿ - http://www.fileformat.info/info/unicode/char/06ff/index.htm - 0xDB 0xBF / 219 191
+    # 3-byte ᚠ - http://www.fileformat.info/info/unicode/char/16A0/index.htm - 0xE1 0x9A 0xA0 / 225 154 160
+    # 4-byte ܎ - http://www.fileformat.info/info/unicode/char/2070E/index.htm - 0xF0 0xA0 0x9C 0x8E / 240 160 156 142
+    let (:mixed_utf8) { "A\u06FF\u16A0\u{2070E}" } # Aۿᚠ܎
+    let (:mixed_utf8_urlencoded) { "A%DB%BF%E1%9A%A0%F0%A0%9C%8E" }
+
     %w[. .. foo foo/bar foo/../bar].each do |path|
       it "should reject relative path: #{path}" do
         expect { Puppet::Util.path_to_uri(path) }.to raise_error(Puppet::Error)
@@ -307,6 +315,42 @@ describe Puppet::Util do
       expect(Puppet::Util.path_to_uri("/foo bar").path).to eq("/foo%20bar")
     end
 
+    it "should properly URI encode + and space in path" do
+      expect(Puppet::Util.path_to_uri("/foo+foo bar").path).to eq("/foo+foo%20bar")
+    end
+
+    # reserved characters are different for each part
+    # https://web.archive.org/web/20151229061347/http://blog.lunatech.com/2009/02/03/what-every-web-developer-must-know-about-url-encoding#Thereservedcharactersaredifferentforeachpart
+    # "?" is allowed unescaped anywhere within a query part,
+    # "/" is allowed unescaped anywhere within a query part,
+    # "=" is allowed unescaped anywhere within a path parameter or query parameter value, and within a path segment,
+    # ":@-._~!$&'()*+,;=" are allowed unescaped anywhere within a path segment part,
+    # "/?:@-._~!$&'()*+,;=" are allowed unescaped anywhere within a fragment part.
+    it "should properly URI encode + and space in path and query" do
+      path = "/foo+foo bar?foo+foo bar"
+      uri = Puppet::Util.path_to_uri(path)
+
+      # Ruby 1.9.3 URI#to_s has a bug that returns ASCII always
+      # despite parts being UTF-8 strings
+      expected_encoding = RUBY_VERSION == '1.9.3' ? Encoding::ASCII : Encoding::UTF_8
+
+      expect(uri.to_s.encoding).to eq(expected_encoding)
+      expect(uri.path).to eq("/foo+foo%20bar")
+      # either + or %20 is correct for an encoded space in query
+      # + is usually used for backward compatibility, but %20 is preferred for compat with Uri.unescape
+      expect(uri.query).to eq("foo%2Bfoo%20bar")
+      # complete roundtrip
+      expect(URI.unescape(uri.to_s)).to eq("file:#{path}")
+      expect(URI.unescape(uri.to_s).encoding).to eq(expected_encoding)
+    end
+
+    it "should perform UTF-8 URI escaping" do
+      uri = Puppet::Util.path_to_uri("/#{mixed_utf8}")
+
+      expect(uri.path.encoding).to eq(Encoding::UTF_8)
+      expect(uri.path).to eq("/#{mixed_utf8_urlencoded}")
+    end
+
     describe "when using platform :posix" do
       before :each do
         Puppet.features.stubs(:posix).returns true
@@ -340,7 +384,172 @@ describe Puppet::Util do
         it "should convert UNC #{path} to absolute URI" do
           uri = Puppet::Util.path_to_uri("\\\\server\\#{path}")
           expect(uri.host).to eq('server')
-          expect(uri.path).to eq('/' + path)
+          expect(uri.path).to eq('/' + Puppet::Util.uri_encode(path))
+        end
+      end
+    end
+  end
+
+  describe "#uri_query_encode" do
+    # different UTF-8 widths
+    # 1-byte A
+    # 2-byte ۿ - http://www.fileformat.info/info/unicode/char/06ff/index.htm - 0xDB 0xBF / 219 191
+    # 3-byte ᚠ - http://www.fileformat.info/info/unicode/char/16A0/index.htm - 0xE1 0x9A 0xA0 / 225 154 160
+    # 4-byte 𠜎 - http://www.fileformat.info/info/unicode/char/2070E/index.htm - 0xF0 0xA0 0x9C 0x8E / 240 160 156 142
+    let (:mixed_utf8) { "A\u06FF\u16A0\u{2070E}" } # Aۿᚠ𠜎
+    let (:mixed_utf8_urlencoded) { "A%DB%BF%E1%9A%A0%F0%A0%9C%8E" }
+
+    it "should perform basic URI escaping that includes space and +" do
+      expect(Puppet::Util.uri_query_encode("foo bar+foo")).to eq("foo%20bar%2Bfoo")
+    end
+
+    it "should URI encode any special characters: = + <space> & * and #" do
+      expect(Puppet::Util.uri_query_encode("foo=bar+foo baz&bar=baz qux&special= *&qux=not fragment#")).to eq("foo%3Dbar%2Bfoo%20baz%26bar%3Dbaz%20qux%26special%3D%20%2A%26qux%3Dnot%20fragment%23")
+    end
+
+    [
+      "A\u06FF\u16A0\u{2070E}",
+      "A\u06FF\u16A0\u{2070E}".force_encoding(Encoding::BINARY)
+    ].each do |uri_string|
+      it "should perform UTF-8 URI escaping, even when input strings are not UTF-8" do
+        uri = Puppet::Util.uri_query_encode(mixed_utf8)
+
+        expect(uri.encoding).to eq(Encoding::UTF_8)
+        expect(uri).to eq(mixed_utf8_urlencoded)
+      end
+    end
+
+    it "should be usable by URI::parse" do
+      uri = URI::parse("puppet://server/path?" + Puppet::Util.uri_query_encode(mixed_utf8))
+
+      expect(uri.scheme).to eq('puppet')
+      expect(uri.host).to eq('server')
+      expect(uri.path).to eq('/path')
+      expect(uri.query).to eq(mixed_utf8_urlencoded)
+    end
+
+    it "should be usable by URI::Generic.build" do
+      params = {
+        :scheme => 'file',
+        :host => 'foobar',
+        :path => '/path/to',
+        :query => Puppet::Util.uri_query_encode(mixed_utf8)
+      }
+
+      uri = URI::Generic.build(params)
+
+      expect(uri.scheme).to eq('file')
+      expect(uri.host).to eq('foobar')
+      expect(uri.path).to eq("/path/to")
+      expect(uri.query).to eq(mixed_utf8_urlencoded)
+    end
+  end
+
+  describe "#uri_encode" do
+    # different UTF-8 widths
+    # 1-byte A
+    # 2-byte ۿ - http://www.fileformat.info/info/unicode/char/06ff/index.htm - 0xDB 0xBF / 219 191
+    # 3-byte ᚠ - http://www.fileformat.info/info/unicode/char/16A0/index.htm - 0xE1 0x9A 0xA0 / 225 154 160
+    # 4-byte ܎ - http://www.fileformat.info/info/unicode/char/2070E/index.htm - 0xF0 0xA0 0x9C 0x8E / 240 160 156 142
+    let (:mixed_utf8) { "A\u06FF\u16A0\u{2070E}" } # Aۿᚠ܎
+    let (:mixed_utf8_urlencoded) { "A%DB%BF%E1%9A%A0%F0%A0%9C%8E" }
+
+    it "should perform URI escaping" do
+      expect(Puppet::Util.uri_encode("/foo bar")).to eq("/foo%20bar")
+    end
+
+    [
+      "A\u06FF\u16A0\u{2070E}",
+      "A\u06FF\u16A0\u{2070E}".force_encoding(Encoding::BINARY)
+    ].each do |uri_string|
+      it "should perform UTF-8 URI escaping, even when input strings are not UTF-8" do
+        uri = Puppet::Util.uri_encode(mixed_utf8)
+
+        expect(uri.encoding).to eq(Encoding::UTF_8)
+        expect(uri).to eq(mixed_utf8_urlencoded)
+      end
+    end
+
+    it "should treat & and = as delimiters in a query string, but URI encode other special characters: + <space> * and #" do
+      input = "http://foo.bar.com/path?foo=bar+foo baz&bar=baz qux&special= *&qux=not fragment#"
+      expected_output = "http://foo.bar.com/path?foo=bar%2Bfoo%20baz&bar=baz%20qux&special=%20%2A&qux=not%20fragment%23"
+      expect(Puppet::Util.uri_encode(input)).to eq(expected_output)
+    end
+
+    it "should be usable by URI::parse" do
+      uri = URI::parse(Puppet::Util.uri_encode("puppet://server/path/to/#{mixed_utf8}"))
+
+      expect(uri.scheme).to eq('puppet')
+      expect(uri.host).to eq('server')
+      expect(uri.path).to eq("/path/to/#{mixed_utf8_urlencoded}")
+    end
+
+    it "should be usable by URI::Generic.build" do
+      params = {
+        :scheme => 'file',
+        :host => 'foobar',
+        :path => Puppet::Util.uri_encode("/path/to/#{mixed_utf8}")
+      }
+
+      uri = URI::Generic.build(params)
+
+      expect(uri.scheme).to eq('file')
+      expect(uri.host).to eq('foobar')
+      expect(uri.path).to eq("/path/to/#{mixed_utf8_urlencoded}")
+    end
+
+    describe "when using platform :posix" do
+      before :each do
+        Puppet.features.stubs(:posix).returns true
+        Puppet.features.stubs(:microsoft_windows?).returns false
+      end
+
+      %w[/ /foo /foo/../bar].each do |path|
+        it "should not replace / in #{path} with %2F" do
+          expect(Puppet::Util.uri_encode(path)).to eq(path)
+        end
+      end
+    end
+
+    describe "with fragment support" do
+      context "disabled by default" do
+        it "should encode # as %23 in path" do
+          encoded = Puppet::Util.uri_encode("/foo bar#fragment")
+          expect(encoded).to eq("/foo%20bar%23fragment")
+        end
+
+        it "should encode # as %23 in query" do
+          encoded = Puppet::Util.uri_encode("/foo bar?baz+qux#fragment")
+          expect(encoded).to eq("/foo%20bar?baz%2Bqux%23fragment")
+        end
+      end
+
+      context "optionally enabled" do
+        it "should leave fragment delimiter # after encoded paths" do
+          encoded = Puppet::Util.uri_encode("/foo bar#fragment", { :allow_fragment => true })
+          expect(encoded).to eq("/foo%20bar#fragment")
+        end
+
+        it "should leave fragment delimiter # after encoded query" do
+          encoded = Puppet::Util.uri_encode("/foo bar?baz+qux#fragment", { :allow_fragment => true })
+          expect(encoded).to eq("/foo%20bar?baz%2Bqux#fragment")
+        end
+      end
+    end
+
+    describe "when using platform :windows" do
+      before :each do
+        Puppet.features.stubs(:posix).returns false
+        Puppet.features.stubs(:microsoft_windows?).returns true
+      end
+
+      it "should url encode \\ as %5C, but not replace : as %3F" do
+        expect(Puppet::Util.uri_encode('c:\\foo\\bar\\baz')).to eq('c:%5Cfoo%5Cbar%5Cbaz')
+      end
+
+      %w[C:/ C:/foo/bar].each do |path|
+        it "should not replace / in #{path} with %2F" do
+          expect(Puppet::Util.uri_encode(path)).to eq(path)
         end
       end
     end
@@ -349,6 +558,13 @@ describe Puppet::Util do
   describe ".uri_to_path" do
     require 'uri'
 
+    # different UTF-8 widths
+    # 1-byte A
+    # 2-byte ۿ - http://www.fileformat.info/info/unicode/char/06ff/index.htm - 0xDB 0xBF / 219 191
+    # 3-byte ᚠ - http://www.fileformat.info/info/unicode/char/16A0/index.htm - 0xE1 0x9A 0xA0 / 225 154 160
+    # 4-byte 𠜎 - http://www.fileformat.info/info/unicode/char/2070E/index.htm - 0xF0 0xA0 0x9C 0x8E / 240 160 156 142
+    let (:mixed_utf8) { "A\u06FF\u16A0\u{2070E}" } # Aۿᚠ𠜎
+
     it "should strip host component" do
       expect(Puppet::Util.uri_to_path(URI.parse('http://foo/bar'))).to eq('/bar')
     end
@@ -361,6 +577,19 @@ describe Puppet::Util do
       expect(Puppet::Util.uri_to_path(URI.parse('http://foo/bar%20baz'))).to eq('/bar baz')
     end
 
+
+    [
+      "http://foo/A%DB%BF%E1%9A%A0%F0%A0%9C%8E",
+      "http://foo/A%DB%BF%E1%9A%A0%F0%A0%9C%8E".force_encoding(Encoding::ASCII)
+    ].each do |uri_string|
+      it "should return paths as UTF-8" do
+        path = Puppet::Util.uri_to_path(URI.parse(uri_string))
+
+        expect(path).to eq("/#{mixed_utf8}")
+        expect(path.encoding).to eq(Encoding::UTF_8)
+      end
+    end
+
     it "should be nil-safe" do
       expect(Puppet::Util.uri_to_path(nil)).to be_nil
     end

data/tasks/parallel.rake

@@ -156,17 +156,21 @@ else
 
       #
       # Responsible for parallelizing spec testing.
+      # Optional options list will be passed to rspec.
       #
       class Parallelizer
         # Number of processes to use
         attr_reader :process_count
         # Approximate size of each group of tests
         attr_reader :group_size
+        # Options list for rspec
+        attr_reader :options
 
-        def initialize(process_count, group_size, color)
+        def initialize(process_count, group_size, color, options = [])
           @process_count = process_count
           @group_size = group_size
           @color = color
+          @options = options
         end
 
         def color?
@@ -180,7 +184,7 @@ else
           fail red('error: no specs were found') if groups.length == 0
 
           begin
-            run_specs groups
+            run_specs(groups, options)
           ensure
             groups.each do |file|
               File.unlink(file)
@@ -211,7 +215,7 @@ else
           spec_group_files
         end
 
-        def run_specs(groups)
+        def run_specs(groups, options)
           puts "Processing #{groups.length} spec group(s) with #{@process_count} worker(s)"
 
           interrupted = false
@@ -246,7 +250,8 @@ else
                 break unless group && !interrupted
 
                 # Spawn the worker process with redirected output
-                io = IO.popen("ruby util/rspec_runner #{group}")
+                options_string = options ? options.join(' ') : ''
+                io = IO.popen("ruby util/rspec_runner #{group} #{options_string}")
                 pids[thread_id] = io.pid
 
                 # TODO: make the buffer pluggable to handle other output formats like documentation
@@ -391,15 +396,15 @@ else
       config.color
     end
 
-    desc 'Runs specs in parallel.'
-    task 'spec', :process_count, :group_size do |_, args|
+    desc 'Runs specs in parallel. Extra args are passed to rspec.'
+    task 'spec', [:process_count, :group_size] do |_, args|
       # Default group size in rspec examples
       DEFAULT_GROUP_SIZE = 1000
 
       process_count = [(args[:process_count] || Facter.value("processorcount")).to_i, 1].max
       group_size = [(args[:group_size] || DEFAULT_GROUP_SIZE).to_i, 1].max
 
-      abort unless Parallel::RSpec::Parallelizer.new(process_count, group_size, color_output?).run
+      abort unless Parallel::RSpec::Parallelizer.new(process_count, group_size, color_output?, args.extras).run
     end
   end
 end

metadata

@@ -1,134 +1,120 @@
 --- !ruby/object:Gem::Specification
 name: puppet
 version: !ruby/object:Gem::Version
-  version: 4.10.4
-  prerelease: 
+  version: 4.10.5
 platform: x64-mingw32
 authors:
 - Puppet Labs
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2017-06-19 00:00:00.000000000 Z
+date: 2017-07-26 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: facter
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>'
+    - - ">"
       - !ruby/object:Gem::Version
         version: '2.0'
-    - - <
+    - - "<"
       - !ruby/object:Gem::Version
         version: '4'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>'
+    - - ">"
       - !ruby/object:Gem::Version
         version: '2.0'
-    - - <
+    - - "<"
       - !ruby/object:Gem::Version
         version: '4'
 - !ruby/object:Gem::Dependency
   name: hiera
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '2.0'
-    - - <
+    - - "<"
       - !ruby/object:Gem::Version
         version: '4'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '2.0'
-    - - <
+    - - "<"
       - !ruby/object:Gem::Version
         version: '4'
 - !ruby/object:Gem::Dependency
   name: json_pure
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: '1.8'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: '1.8'
 - !ruby/object:Gem::Dependency
   name: gettext-setup
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0.10'
-    - - <
+    - - "<"
       - !ruby/object:Gem::Version
         version: '1'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0.10'
-    - - <
+    - - "<"
       - !ruby/object:Gem::Version
         version: '1'
 - !ruby/object:Gem::Dependency
   name: locale
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: '2.1'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: '2.1'
 - !ruby/object:Gem::Dependency
   name: ffi
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: 1.9.6
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: 1.9.6
 - !ruby/object:Gem::Dependency
   name: win32-dir
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
     - - '='
       - !ruby/object:Gem::Version
@@ -136,7 +122,6 @@ dependencies:
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
     - - '='
       - !ruby/object:Gem::Version
@@ -144,7 +129,6 @@ dependencies:
 - !ruby/object:Gem::Dependency
   name: win32-eventlog
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
     - - '='
       - !ruby/object:Gem::Version
@@ -152,7 +136,6 @@ dependencies:
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
     - - '='
       - !ruby/object:Gem::Version
@@ -160,7 +143,6 @@ dependencies:
 - !ruby/object:Gem::Dependency
   name: win32-process
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
     - - '='
       - !ruby/object:Gem::Version
@@ -168,7 +150,6 @@ dependencies:
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
     - - '='
       - !ruby/object:Gem::Version
@@ -176,7 +157,6 @@ dependencies:
 - !ruby/object:Gem::Dependency
   name: win32-security
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
     - - '='
       - !ruby/object:Gem::Version
@@ -184,7 +164,6 @@ dependencies:
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
     - - '='
       - !ruby/object:Gem::Version
@@ -192,7 +171,6 @@ dependencies:
 - !ruby/object:Gem::Dependency
   name: win32-service
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
     - - '='
       - !ruby/object:Gem::Version
@@ -200,7 +178,6 @@ dependencies:
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
     - - '='
       - !ruby/object:Gem::Version
@@ -208,17 +185,15 @@ dependencies:
 - !ruby/object:Gem::Dependency
   name: minitar
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: 0.6.1
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: 0.6.1
 description: Puppet, an automated configuration management tool
@@ -235,9 +210,154 @@ files:
 - MAINTAINERS
 - README.md
 - Rakefile
-- install.rb
 - bin/extlookup2hiera
 - bin/puppet
+- conf/auth.conf
+- conf/environment.conf
+- conf/fileserver.conf
+- conf/puppet.conf
+- examples/hiera/README.md
+- examples/hiera/etc/hiera.yaml
+- examples/hiera/etc/hieradb/common.yaml
+- examples/hiera/etc/hieradb/dc1.yaml
+- examples/hiera/etc/hieradb/development.yaml
+- examples/hiera/etc/puppet.conf
+- examples/hiera/modules/data/manifests/common.pp
+- examples/hiera/modules/ntp/manifests/config.pp
+- examples/hiera/modules/ntp/manifests/data.pp
+- examples/hiera/modules/ntp/templates/ntp.conf.erb
+- examples/hiera/modules/users/manifests/common.pp
+- examples/hiera/modules/users/manifests/dc1.pp
+- examples/hiera/modules/users/manifests/development.pp
+- examples/hiera/site.pp
+- ext/README.environment
+- ext/autotest/Rakefile
+- ext/autotest/config
+- ext/autotest/readme.rst
+- ext/build_defaults.yaml
+- ext/cert_inspector
+- ext/dbfix.sql
+- ext/debian/README.Debian
+- ext/debian/README.source
+- ext/debian/TODO.Debian
+- ext/debian/changelog.erb
+- ext/debian/compat
+- ext/debian/control
+- ext/debian/copyright
+- ext/debian/docs
+- ext/debian/fileserver.conf
+- ext/debian/puppet-common.dirs
+- ext/debian/puppet-common.install
+- ext/debian/puppet-common.lintian-overrides
+- ext/debian/puppet-common.manpages
+- ext/debian/puppet-common.postinst
+- ext/debian/puppet-common.postrm
+- ext/debian/puppet-el.dirs
+- ext/debian/puppet-el.emacsen-install
+- ext/debian/puppet-el.emacsen-remove
+- ext/debian/puppet-el.emacsen-startup
+- ext/debian/puppet-el.install
+- ext/debian/puppet-testsuite.install
+- ext/debian/puppet-testsuite.lintian-overrides
+- ext/debian/puppet.default
+- ext/debian/puppet.init
+- ext/debian/puppet.lintian-overrides
+- ext/debian/puppet.logrotate
+- ext/debian/puppet.postinst
+- ext/debian/puppet.postrm
+- ext/debian/puppet.preinst
+- ext/debian/puppetmaster-common.install
+- ext/debian/puppetmaster-common.manpages
+- ext/debian/puppetmaster-common.postinst
+- ext/debian/puppetmaster-passenger.dirs
+- ext/debian/puppetmaster-passenger.postinst
+- ext/debian/puppetmaster-passenger.postrm
+- ext/debian/puppetmaster.README.debian
+- ext/debian/puppetmaster.default
+- ext/debian/puppetmaster.init
+- ext/debian/puppetmaster.lintian-overrides
+- ext/debian/puppetmaster.postinst
+- ext/debian/puppetmaster.postrm
+- ext/debian/puppetmaster.preinst
+- ext/debian/rules
+- ext/debian/source/format
+- ext/debian/source/options
+- ext/debian/vim-puppet.README.Debian
+- ext/debian/vim-puppet.dirs
+- ext/debian/vim-puppet.yaml
+- ext/debian/watch
+- ext/emacs/puppet-mode-init.el
+- ext/emacs/puppet-mode.el
+- ext/envpuppet
+- ext/envpuppet.bat
+- ext/freebsd/puppetd
+- ext/freebsd/puppetmasterd
+- ext/gentoo/conf.d/puppet
+- ext/gentoo/conf.d/puppetmaster
+- ext/gentoo/init.d/puppet
+- ext/gentoo/init.d/puppetmaster
+- ext/gentoo/puppet/fileserver.conf
+- ext/ips/puppet-agent
+- ext/ips/puppet-master
+- ext/ips/puppet.p5m.erb
+- ext/ips/puppetagent.xml
+- ext/ips/puppetmaster.xml
+- ext/ips/rules
+- ext/ips/transforms
+- ext/ldap/puppet.schema
+- ext/logcheck/puppet
+- ext/nagios/check_puppet.rb
+- ext/osx/file_mapping.yaml
+- ext/osx/postflight.erb
+- ext/osx/preflight.erb
+- ext/osx/prototype.plist.erb
+- ext/osx/puppet.plist
+- ext/project_data.yaml
+- ext/puppet-test
+- ext/pure_ruby_dsl/dsl_test.rb
+- ext/rack/config.ru
+- ext/rack/example-passenger-vhost.conf
+- ext/redhat/client.init
+- ext/redhat/client.sysconfig
+- ext/redhat/fileserver.conf
+- ext/redhat/logrotate
+- ext/redhat/puppet.spec.erb
+- ext/redhat/server.init
+- ext/redhat/server.sysconfig
+- ext/regexp_nodes/classes/databases
+- ext/regexp_nodes/classes/webservers
+- ext/regexp_nodes/environment/development
+- ext/regexp_nodes/parameters/service/prod
+- ext/regexp_nodes/parameters/service/qa
+- ext/regexp_nodes/parameters/service/sandbox
+- ext/regexp_nodes/regexp_nodes.rb
+- ext/solaris/pkginfo
+- ext/solaris/smf/puppet
+- ext/solaris/smf/puppet.xml
+- ext/solaris/smf/puppetd.xml
+- ext/solaris/smf/puppetmasterd.xml
+- ext/solaris/smf/svc-puppetd
+- ext/solaris/smf/svc-puppetmasterd
+- ext/suse/client.init
+- ext/suse/puppet.spec
+- ext/suse/server.init
+- ext/systemd/puppet.service
+- ext/upload_facts.rb
+- ext/vim/README
+- ext/vim/ftdetect/puppet.vim
+- ext/vim/ftplugin/puppet.vim
+- ext/vim/indent/puppet.vim
+- ext/vim/syntax/puppet.vim
+- ext/windows/eventlog/Rakefile
+- ext/windows/eventlog/puppetres.dll
+- ext/windows/eventlog/puppetres.mc
+- ext/windows/puppet_interactive.bat
+- ext/windows/puppet_shell.bat
+- ext/windows/run_puppet_interactive.bat
+- ext/windows/service/daemon.bat
+- ext/windows/service/daemon.rb
+- ext/yaml_nodes.rb
+- install.rb
 - lib/hiera/puppet_function.rb
 - lib/hiera/scope.rb
 - lib/hiera_puppet.rb
@@ -1509,10 +1629,8 @@ files:
 - lib/puppet/version.rb
 - lib/puppet_x.rb
 - lib/semver.rb
-- conf/auth.conf
-- conf/environment.conf
-- conf/fileserver.conf
-- conf/puppet.conf
+- locales/config.yaml
+- locales/puppet.pot
 - man/man5/puppet.conf.5
 - man/man8/extlookup2hiera.8
 - man/man8/puppet-agent.8
@@ -1545,155 +1663,6 @@ files:
 - man/man8/puppet-resource_type.8
 - man/man8/puppet-status.8
 - man/man8/puppet.8
-- examples/hiera/README.md
-- examples/hiera/etc/hiera.yaml
-- examples/hiera/etc/hieradb/common.yaml
-- examples/hiera/etc/hieradb/dc1.yaml
-- examples/hiera/etc/hieradb/development.yaml
-- examples/hiera/etc/puppet.conf
-- examples/hiera/modules/data/manifests/common.pp
-- examples/hiera/modules/ntp/manifests/config.pp
-- examples/hiera/modules/ntp/manifests/data.pp
-- examples/hiera/modules/ntp/templates/ntp.conf.erb
-- examples/hiera/modules/users/manifests/common.pp
-- examples/hiera/modules/users/manifests/dc1.pp
-- examples/hiera/modules/users/manifests/development.pp
-- examples/hiera/site.pp
-- ext/README.environment
-- ext/autotest/Rakefile
-- ext/autotest/config
-- ext/autotest/readme.rst
-- ext/build_defaults.yaml
-- ext/cert_inspector
-- ext/dbfix.sql
-- ext/debian/README.Debian
-- ext/debian/README.source
-- ext/debian/TODO.Debian
-- ext/debian/changelog.erb
-- ext/debian/compat
-- ext/debian/control
-- ext/debian/copyright
-- ext/debian/docs
-- ext/debian/fileserver.conf
-- ext/debian/puppet-common.dirs
-- ext/debian/puppet-common.install
-- ext/debian/puppet-common.lintian-overrides
-- ext/debian/puppet-common.manpages
-- ext/debian/puppet-common.postinst
-- ext/debian/puppet-common.postrm
-- ext/debian/puppet-el.dirs
-- ext/debian/puppet-el.emacsen-install
-- ext/debian/puppet-el.emacsen-remove
-- ext/debian/puppet-el.emacsen-startup
-- ext/debian/puppet-el.install
-- ext/debian/puppet-testsuite.install
-- ext/debian/puppet-testsuite.lintian-overrides
-- ext/debian/puppet.default
-- ext/debian/puppet.init
-- ext/debian/puppet.lintian-overrides
-- ext/debian/puppet.logrotate
-- ext/debian/puppet.postinst
-- ext/debian/puppet.postrm
-- ext/debian/puppet.preinst
-- ext/debian/puppetmaster-common.install
-- ext/debian/puppetmaster-common.manpages
-- ext/debian/puppetmaster-common.postinst
-- ext/debian/puppetmaster-passenger.dirs
-- ext/debian/puppetmaster-passenger.postinst
-- ext/debian/puppetmaster-passenger.postrm
-- ext/debian/puppetmaster.README.debian
-- ext/debian/puppetmaster.default
-- ext/debian/puppetmaster.init
-- ext/debian/puppetmaster.lintian-overrides
-- ext/debian/puppetmaster.postinst
-- ext/debian/puppetmaster.postrm
-- ext/debian/puppetmaster.preinst
-- ext/debian/rules
-- ext/debian/source/format
-- ext/debian/source/options
-- ext/debian/vim-puppet.README.Debian
-- ext/debian/vim-puppet.dirs
-- ext/debian/vim-puppet.yaml
-- ext/debian/watch
-- ext/emacs/puppet-mode-init.el
-- ext/emacs/puppet-mode.el
-- ext/envpuppet
-- ext/envpuppet.bat
-- ext/freebsd/puppetd
-- ext/freebsd/puppetmasterd
-- ext/gentoo/conf.d/puppet
-- ext/gentoo/conf.d/puppetmaster
-- ext/gentoo/init.d/puppet
-- ext/gentoo/init.d/puppetmaster
-- ext/gentoo/puppet/fileserver.conf
-- ext/ips/puppet-agent
-- ext/ips/puppet-master
-- ext/ips/puppet.p5m.erb
-- ext/ips/puppetagent.xml
-- ext/ips/puppetmaster.xml
-- ext/ips/rules
-- ext/ips/transforms
-- ext/ldap/puppet.schema
-- ext/logcheck/puppet
-- ext/nagios/check_puppet.rb
-- ext/osx/file_mapping.yaml
-- ext/osx/postflight.erb
-- ext/osx/preflight.erb
-- ext/osx/prototype.plist.erb
-- ext/osx/puppet.plist
-- ext/project_data.yaml
-- ext/puppet-test
-- ext/pure_ruby_dsl/dsl_test.rb
-- ext/rack/config.ru
-- ext/rack/example-passenger-vhost.conf
-- ext/redhat/client.init
-- ext/redhat/client.sysconfig
-- ext/redhat/fileserver.conf
-- ext/redhat/logrotate
-- ext/redhat/puppet.spec.erb
-- ext/redhat/server.init
-- ext/redhat/server.sysconfig
-- ext/regexp_nodes/classes/databases
-- ext/regexp_nodes/classes/webservers
-- ext/regexp_nodes/environment/development
-- ext/regexp_nodes/parameters/service/prod
-- ext/regexp_nodes/parameters/service/qa
-- ext/regexp_nodes/parameters/service/sandbox
-- ext/regexp_nodes/regexp_nodes.rb
-- ext/solaris/pkginfo
-- ext/solaris/smf/puppet
-- ext/solaris/smf/puppet.xml
-- ext/solaris/smf/puppetd.xml
-- ext/solaris/smf/puppetmasterd.xml
-- ext/solaris/smf/svc-puppetd
-- ext/solaris/smf/svc-puppetmasterd
-- ext/suse/client.init
-- ext/suse/puppet.spec
-- ext/suse/server.init
-- ext/systemd/puppet.service
-- ext/upload_facts.rb
-- ext/vim/README
-- ext/vim/ftdetect/puppet.vim
-- ext/vim/ftplugin/puppet.vim
-- ext/vim/indent/puppet.vim
-- ext/vim/syntax/puppet.vim
-- ext/windows/eventlog/Rakefile
-- ext/windows/eventlog/puppetres.dll
-- ext/windows/eventlog/puppetres.mc
-- ext/windows/puppet_interactive.bat
-- ext/windows/puppet_shell.bat
-- ext/windows/run_puppet_interactive.bat
-- ext/windows/service/daemon.bat
-- ext/windows/service/daemon.rb
-- ext/yaml_nodes.rb
-- tasks/benchmark.rake
-- tasks/cfpropertylist.rake
-- tasks/ci.rake
-- tasks/manpages.rake
-- tasks/memwalk.rake
-- tasks/parallel.rake
-- tasks/parser.rake
-- tasks/yard.rake
 - spec/fixtures/faulty_face/puppet/face/syntax.rb
 - spec/fixtures/hiera.yaml
 - spec/fixtures/integration/node/environment/sitedir/00_a.pp
@@ -2325,6 +2294,7 @@ files:
 - spec/unit/file_system/uniquefile_spec.rb
 - spec/unit/file_system_spec.rb
 - spec/unit/forge/errors_spec.rb
+- spec/unit/forge/forge_spec.rb
 - spec/unit/forge/module_release_spec.rb
 - spec/unit/forge/repository_spec.rb
 - spec/unit/forge_spec.rb
@@ -2944,36 +2914,41 @@ files:
 - spec/unit/util_spec.rb
 - spec/unit/version_spec.rb
 - spec/watchr.rb
-- locales/config.yaml
-- locales/puppet.pot
+- tasks/benchmark.rake
+- tasks/cfpropertylist.rake
+- tasks/ci.rake
+- tasks/manpages.rake
+- tasks/memwalk.rake
+- tasks/parallel.rake
+- tasks/parser.rake
+- tasks/yard.rake
 homepage: https://github.com/puppetlabs/puppet
 licenses: []
+metadata: {}
 post_install_message: 
 rdoc_options:
-- --title
+- "--title"
 - Puppet - Configuration Management
-- --main
+- "--main"
 - README.md
-- --line-numbers
+- "--line-numbers"
 require_paths:
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement
-  none: false
   requirements:
-  - - ! '>='
+  - - ">="
     - !ruby/object:Gem::Version
       version: 1.9.3
 required_rubygems_version: !ruby/object:Gem::Requirement
-  none: false
   requirements:
-  - - ! '>'
+  - - ">"
     - !ruby/object:Gem::Version
       version: 1.3.1
 requirements: []
 rubyforge_project: puppet
-rubygems_version: 1.8.23
+rubygems_version: 2.4.8
 signing_key: 
-specification_version: 3
+specification_version: 4
 summary: Puppet, an automated configuration management tool
 test_files:
 - spec/fixtures/faulty_face/puppet/face/syntax.rb
@@ -3607,6 +3582,7 @@ test_files:
 - spec/unit/file_system/uniquefile_spec.rb
 - spec/unit/file_system_spec.rb
 - spec/unit/forge/errors_spec.rb
+- spec/unit/forge/forge_spec.rb
 - spec/unit/forge/module_release_spec.rb
 - spec/unit/forge/repository_spec.rb
 - spec/unit/forge_spec.rb