puppet 4.6.2-x86-mingw32 → 4.7.0-x86-mingw32

data/Rakefile

@@ -77,10 +77,15 @@ end
 
 desc "verify that commit messages match CONTRIBUTING.md requirements"
 task(:commits) do
-  # This git command looks at the summary from every commit from this branch not in master.
-  # Ideally this would compare against the branch that a PR is submitted against, but I don't
-  # know how to get that information. Absent that, comparing with master should work in most cases.
-  %x{git log --no-merges --pretty=%s master..$HEAD}.each_line do |commit_summary|
+  # This rake task looks at the summary from every commit from this branch not
+  # in the branch targeted for a PR. This is accomplished by using the
+  # TRAVIS_COMMIT_RANGE environment variable, which is present in travis CI and
+  # populated with the range of commits the PR contains. If not available, this
+  # falls back to `master..HEAD` as a next best bet as `master` is unlikely to
+  # ever be absent.
+  commit_range = ENV['TRAVIS_COMMIT_RANGE'].nil? ? 'master..HEAD' : ENV['TRAVIS_COMMIT_RANGE']
+  puts "Checking commits..."
+  %x{git log --no-merges --pretty=%s #{commit_range}}.each_line do |commit_summary|
     # This regex tests for the currently supported commit summary tokens: maint, doc, packaging, or pup-<number>.
     # The exception tries to explain it in more full.
     if /^\((maint|doc|docs|packaging|pup-\d+)\)|revert/i.match(commit_summary).nil?
@@ -92,6 +97,9 @@ task(:commits) do
         "\t\t(maint)\n" \
         "\t\t(packaging)\n" \
         "\n\tThis test for the commit summary is case-insensitive.\n\n\n"
+    else
+      puts "#{commit_summary}"
     end
+    puts "...passed"
   end
 end

data/ext/build_defaults.yaml

@@ -2,7 +2,7 @@
 packaging_url: 'git://github.com/puppetlabs/packaging.git --branch=master'
 packaging_repo: 'packaging'
 packager: 'puppetlabs'
-gpg_key: '4BD6EC30'
+gpg_key: '7F438280EF8D349F'
 
 # These are the build targets used by the packaging repo. Uncomment to allow use.
 #final_mocks: 'pl-el-5-i386 pl-el-6-i386 pl-el-7-x86_64'

data/lib/puppet/network/http/api/master/v3.rb

@@ -16,7 +16,7 @@ class Puppet::Network::HTTP::API::Master::V3
   end)
 
   ENVIRONMENT = Puppet::Network::HTTP::Route.
-      path(%r{/environment/[^/]+$}).get(AUTHZ.wrap do
+      path(%r{^/environment/[^/]+$}).get(AUTHZ.wrap do
     Environment.new
   end)
 

data/lib/puppet/version.rb

@@ -7,7 +7,7 @@
 
 
 module Puppet
-  PUPPETVERSION = '4.6.2'
+  PUPPETVERSION = '4.7.0'
 
   ##
   # version is a public API method intended to always provide a fast and

data/spec/integration/provider/service/windows_spec.rb

@@ -26,11 +26,12 @@ describe Puppet::Type.type(:service).provider(:windows), '(integration)',
 
   context 'should return valid values when querying a service that does exist' do
     let(:service) do
+      # This service should be ubiquitous across all supported Windows platforms
       Puppet::Type.type(:service).new(:name => 'lmhosts')
     end
 
-    it "with a valid boolean when asked if enabled" do
-      expect([:true, :false]).to include(service.provider.enabled?)
+    it "with a valid enabled? value when asked if enabled" do
+      expect([:true, :false, :manual]).to include(service.provider.enabled?)
     end
 
     it "with a valid status when asked about status" do

data/spec/unit/network/http/api/master/v3_spec.rb

@@ -22,6 +22,21 @@ describe Puppet::Network::HTTP::API::Master::V3 do
     expect(response.code).to eq(200)
   end
 
+  it "mounts the environment endpoint" do
+    request = Puppet::Network::HTTP::Request.from_hash(:path => "#{master_url_prefix}/environment/production")
+    master_routes.process(request, response)
+
+    expect(response.code).to eq(200)
+  end
+
+  it "matches only complete routes" do
+    request = Puppet::Network::HTTP::Request.from_hash(:path => "#{master_url_prefix}/foo/environments")
+    expect { master_routes.process(request, response) }.to raise_error(Puppet::Network::HTTP::Error::HTTPNotFoundError)
+
+    request = Puppet::Network::HTTP::Request.from_hash(:path => "#{master_url_prefix}/foo/environment/production")
+    expect { master_routes.process(request, response) }.to raise_error(Puppet::Network::HTTP::Error::HTTPNotFoundError)
+  end
+
   it "mounts indirected routes" do
     request = Puppet::Network::HTTP::Request.
         from_hash(:path => "#{master_url_prefix}/node/foo",

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: puppet
 version: !ruby/object:Gem::Version
-  version: 4.6.2
+  version: 4.7.0
   prerelease: 
 platform: x86-mingw32
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-09-02 00:00:00.000000000 Z
+date: 2016-09-22 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: facter