puppet 3.5.0.rc3-x86-mingw32 → 3.5.1.rc1-x86-mingw32

data/lib/puppet/version.rb

@@ -7,7 +7,7 @@
 
 
 module Puppet
-  PUPPETVERSION = '3.5.0-rc3'
+  PUPPETVERSION = '3.5.1-rc1'
 
   ##
   # version is a public API method intended to always provide a fast and

data/spec/integration/application/apply_spec.rb

@@ -39,7 +39,7 @@ describe "apply" do
       EOF
     end
 
-    special = Puppet::Node::Environment.create(:special, [], '')
+    special = Puppet::Node::Environment.create(:special, [])
     Puppet.override(:current_environment => special) do
       Puppet[:environment] = 'special'
       puppet = Puppet::Application[:apply]
@@ -64,6 +64,8 @@ describe "apply" do
         }
         EOF
       end
+      environmentdir = Dir.mktmpdir('environments')
+      Puppet[:environmentpath] = environmentdir
       create_default_directory_environment
     end
 

data/spec/integration/directory_environments_spec.rb

@@ -10,7 +10,8 @@ describe "directory environments" do
 
   context "with a single directory environmentpath" do
     before(:each) do
-      environmentdir = Puppet[:environmentpath].split(File::PATH_SEPARATOR).first
+      environmentdir = PuppetSpec::Files.tmpdir('envpath')
+      Puppet[:environmentpath] = environmentdir
       FileUtils.mkdir_p(environmentdir + "/direnv/modules")
     end
 

data/spec/integration/indirector/file_content/file_server_spec.rb

@@ -28,7 +28,7 @@ describe Puppet::Indirector::FileContent::FileServer, " when finding files" do
 
     Puppet.settings[:modulepath] = "/no/such/file"
 
-    env = Puppet::Node::Environment.create(:foo, [path], '')
+    env = Puppet::Node::Environment.create(:foo, [path])
 
     result = Puppet::FileServing::Content.indirection.search("plugins", :environment => env, :recurse => true)
 

data/spec/integration/node/environment_spec.rb

@@ -29,7 +29,7 @@ describe Puppet::Node::Environment do
       mods["mod#{num}"] = a_module_in("mod#{num}", dir)
     end
 
-    environment = Puppet::Node::Environment.create(:foo, dirs, '')
+    environment = Puppet::Node::Environment.create(:foo, dirs)
 
     environment.modules.each do |mod|
       mod.environment.should == environment
@@ -49,7 +49,7 @@ describe Puppet::Node::Environment do
       a_module_in("mod", dir)
     end
 
-    environment = Puppet::Node::Environment.create(:foo, dirs, '')
+    environment = Puppet::Node::Environment.create(:foo, dirs)
 
     mods = environment.modules
     mods.length.should == 1

data/spec/integration/resource/type_collection_spec.rb

@@ -12,7 +12,7 @@ describe Puppet::Resource::TypeCollection do
       @dir = tmpfile("autoload_testing")
       FileUtils.mkdir_p @dir
 
-      environment = Puppet::Node::Environment.create(:env, [@dir], '')
+      environment = Puppet::Node::Environment.create(:env, [@dir])
       @code = environment.known_resource_types
     end
 

data/spec/unit/application/apply_spec.rb

@@ -201,7 +201,7 @@ describe Puppet::Application::Apply do
 
       around :each do |example|
         Puppet.override(:current_environment =>
-                        Puppet::Node::Environment.create(:production, [], '')) do
+                        Puppet::Node::Environment.create(:production, [])) do
           example.run
         end
       end

data/spec/unit/environments_spec.rb

@@ -10,42 +10,6 @@ describe Puppet::Environments do
   FS = Puppet::FileSystem
 
   describe "directories loader" do
-
-    RSpec::Matchers.define :environment do |name|
-      match do |env|
-        env.name == name &&
-          (!@manifest || @manifest == env.manifest) &&
-          (!@modulepath || @modulepath == env.modulepath)
-      end
-
-      chain :with_manifest do |manifest|
-        @manifest = manifest
-      end
-
-      chain :with_modulepath do |modulepath|
-        @modulepath = modulepath
-      end
-
-      description do
-        "environment #{expected}" +
-          (@manifest ? " with manifest #{@manifest}" : "") +
-          (@modulepath ? " with modulepath [#{@modulepath.join(', ')}]" : "")
-      end
-
-      failure_message_for_should do |env|
-        "expected <#{env.name}: modulepath = [#{env.modulepath.join(', ')}], manifest = #{env.manifest}> to be #{description}"
-      end
-    end
-
-    def loader_from(options, &block)
-      FS.overlay(*options[:filesystem]) do
-        yield Puppet::Environments::Directories.new(
-          options[:directory],
-          options[:modulepath] || []
-        )
-      end
-    end
-
     it "lists environments" do
       global_path_1_location = File.expand_path("global_path_1")
       global_path_2_location = File.expand_path("global_path_2")
@@ -123,4 +87,39 @@ describe Puppet::Environments do
       end
     end
   end
+
+  RSpec::Matchers.define :environment do |name|
+    match do |env|
+      env.name == name &&
+        (!@manifest || @manifest == env.manifest) &&
+        (!@modulepath || @modulepath == env.modulepath)
+    end
+
+    chain :with_manifest do |manifest|
+      @manifest = manifest
+    end
+
+    chain :with_modulepath do |modulepath|
+      @modulepath = modulepath
+    end
+
+    description do
+      "environment #{expected}" +
+        (@manifest ? " with manifest #{@manifest}" : "") +
+        (@modulepath ? " with modulepath [#{@modulepath.join(', ')}]" : "")
+    end
+
+    failure_message_for_should do |env|
+      "expected <#{env.name}: modulepath = [#{env.modulepath.join(', ')}], manifest = #{env.manifest}> to be #{description}"
+    end
+  end
+
+  def loader_from(options, &block)
+    FS.overlay(*options[:filesystem]) do
+      yield Puppet::Environments::Directories.new(
+        options[:directory],
+        options[:modulepath] || []
+      )
+    end
+  end
 end

data/spec/unit/face/module/install_spec.rb

@@ -15,7 +15,7 @@ describe "puppet module install" do
     let(:fakedirpath)    { make_absolute("/my/fake/path") }
     let(:options) { {} }
     let(:environment) do
-      Puppet::Node::Environment.create(:env, [fakefirstpath, fakesecondpath], '')
+      Puppet::Node::Environment.create(:env, [fakefirstpath, fakesecondpath])
     end
     let(:expected_options) do
       {

data/spec/unit/face/module/list_spec.rb

@@ -39,7 +39,7 @@ describe "puppet module list" do
     barmod1 = PuppetSpec::Modules.create('bar', @modpath1)
     foomod2 = PuppetSpec::Modules.create('foo', @modpath2)
 
-    usedenv = Puppet::Node::Environment.create(:useme, [@modpath1, @modpath2], '')
+    usedenv = Puppet::Node::Environment.create(:useme, [@modpath1, @modpath2])
 
     Puppet.override(:environments => Puppet::Environments::Static.new(usedenv)) do
       Puppet::Face[:module, :current].list(:environment => 'useme').should == {
@@ -56,7 +56,7 @@ describe "puppet module list" do
     foomod = PuppetSpec::Modules.create('foo', @modpath1)
     barmod = PuppetSpec::Modules.create('bar', @modpath1)
 
-    usedenv = Puppet::Node::Environment.create(:useme, [@modpath1, @modpath2], '')
+    usedenv = Puppet::Node::Environment.create(:useme, [@modpath1, @modpath2])
 
     Puppet.override(:environments => Puppet::Environments::Static.new(usedenv)) do
       Puppet::Face[:module, :current].list(:environment => 'useme').should == {
@@ -87,7 +87,7 @@ describe "puppet module list" do
   it "prefers a given modulepath over the modulepath from the given environment" do
     foomod = PuppetSpec::Modules.create('foo', @modpath1)
     barmod = PuppetSpec::Modules.create('bar', @modpath2)
-    env = Puppet::Node::Environment.create(:myenv, ['/tmp/notused'], '')
+    env = Puppet::Node::Environment.create(:myenv, ['/tmp/notused'])
     Puppet[:modulepath] = ""
 
     modules = Puppet::Face[:module, :current].list(:environment => 'myenv', :modulepath => "#{@modpath1}#{File::PATH_SEPARATOR}#{@modpath2}")

data/spec/unit/face/module/uninstall_spec.rb

@@ -10,7 +10,7 @@ describe "puppet module uninstall" do
   end
   let(:modulepath) { File.expand_path('/module/path') }
   let(:environment) do
-    Puppet::Node::Environment.create(:env, [modulepath], '')
+    Puppet::Node::Environment.create(:env, [modulepath])
   end
   let(:expected_options) do
     {

data/spec/unit/face/parser_spec.rb

@@ -41,7 +41,7 @@ describe Puppet::Face[:parser, :current] do
       manifest = file_containing('test.pp', "{ invalid =>")
 
       env_loader = Puppet::Environments::Static.new(
-        Puppet::Node::Environment.create(:special, [], '')
+        Puppet::Node::Environment.create(:special, [])
       )
       Puppet.override(:environments => env_loader) do
         Puppet[:environment] = 'special'

data/spec/unit/indirector/node/active_record_spec.rb

@@ -9,7 +9,7 @@ describe "Puppet::Node::ActiveRecord", :if => Puppet.features.rails? && Puppet.f
   let(:nodename) { "mynode" }
   let(:fact_values) { {:afact => "a value"} }
   let(:facts) { Puppet::Node::Facts.new(nodename, fact_values) }
-  let(:environment) { Puppet::Node::Environment.create(:myenv, [], '') }
+  let(:environment) { Puppet::Node::Environment.create(:myenv, []) }
   let(:request) { Puppet::Indirector::Request.new(:node, :find, nodename, nil, :environment => environment) }
   let(:node_indirection) { Puppet::Node::ActiveRecord.new }
 

data/spec/unit/indirector/node/ldap_spec.rb

@@ -6,7 +6,7 @@ require 'puppet/indirector/node/ldap'
 describe Puppet::Node::Ldap do
   let(:nodename) { "mynode.domain.com" }
   let(:node_indirection) { Puppet::Node::Ldap.new }
-  let(:environment) { Puppet::Node::Environment.create(:myenv, [], '') }
+  let(:environment) { Puppet::Node::Environment.create(:myenv, []) }
   let(:fact_values) { {:afact => "a value", "one" => "boo"} }
   let(:facts) { Puppet::Node::Facts.new(nodename, fact_values) }
 
@@ -176,7 +176,7 @@ describe Puppet::Node::Ldap do
       end
 
       it "should set the node's environment to the environment of the results" do
-        result_env = Puppet::Node::Environment.create(:local_test, [], '')
+        result_env = Puppet::Node::Environment.create(:local_test, [])
         Puppet::Node::Facts.indirection.stubs(:find).with(nodename, :environment => result_env).returns(facts)
         @result[:environment] = "local_test"
 
@@ -259,7 +259,7 @@ describe Puppet::Node::Ldap do
         end
 
         it "should use the parent's environment if the node has none" do
-          env = Puppet::Node::Environment.create(:parent, [], '')
+          env = Puppet::Node::Environment.create(:parent, [])
           @entry[:parent] = "parent"
 
           @parent[:environment] = "parent"
@@ -272,7 +272,7 @@ describe Puppet::Node::Ldap do
         end
 
         it "should prefer the node's environment to the parent's" do
-          child_env = Puppet::Node::Environment.create(:child, [], '')
+          child_env = Puppet::Node::Environment.create(:child, [])
           @entry[:parent] = "parent"
           @entry[:environment] = "child"
 

data/spec/unit/indirector/node/plain_spec.rb

@@ -7,7 +7,7 @@ describe Puppet::Node::Plain do
   let(:nodename) { "mynode" }
   let(:fact_values) { {:afact => "a value"} }
   let(:facts) { Puppet::Node::Facts.new(nodename, fact_values) }
-  let(:environment) { Puppet::Node::Environment.create(:myenv, [], '') }
+  let(:environment) { Puppet::Node::Environment.create(:myenv, []) }
   let(:request) { Puppet::Indirector::Request.new(:node, :find, nodename, nil, :environment => environment) }
   let(:node_indirection) { Puppet::Node::Plain.new }
 

data/spec/unit/indirector/request_spec.rb

@@ -219,7 +219,7 @@ describe Puppet::Indirector::Request do
   end
 
   it "should set its environment to an environment instance when a string is specified as its environment" do
-    env = Puppet::Node::Environment.create(:foo, [], '')
+    env = Puppet::Node::Environment.create(:foo, [])
 
     Puppet.override(:environments => Puppet::Environments::Static.new(env)) do
       Puppet::Indirector::Request.new(:myind, :find, "my key", nil, :environment => "foo").environment.should == env
@@ -227,13 +227,13 @@ describe Puppet::Indirector::Request do
   end
 
   it "should use any passed in environment instances as its environment" do
-    env = Puppet::Node::Environment.create(:foo, [], '')
+    env = Puppet::Node::Environment.create(:foo, [])
 
     Puppet::Indirector::Request.new(:myind, :find, "my key", nil, :environment => env).environment.should equal(env)
   end
 
   it "should use the configured environment when none is provided" do
-    configured = Puppet::Node::Environment.create(:foo, [], '')
+    configured = Puppet::Node::Environment.create(:foo, [])
 
     Puppet[:environment] = "foo"
 

data/spec/unit/module_spec.rb

@@ -138,7 +138,7 @@ describe Puppet::Module do
     end
 
     it "should list modules with unmet version requirement" do
-      env = Puppet::Node::Environment.create(:testing, [@modpath], '')
+      env = Puppet::Node::Environment.create(:testing, [@modpath])
 
       mod = PuppetSpec::Modules.create(
         'test_gte_req',
@@ -189,7 +189,7 @@ describe Puppet::Module do
     end
 
     it "should consider a dependency without a version requirement to be satisfied" do
-      env = Puppet::Node::Environment.create(:testing, [@modpath], '')
+      env = Puppet::Node::Environment.create(:testing, [@modpath])
 
       mod = PuppetSpec::Modules.create(
         'foobar',
@@ -215,7 +215,7 @@ describe Puppet::Module do
     end
 
     it "should consider a dependency without a semantic version to be unmet" do
-      env = Puppet::Node::Environment.create(:testing, [@modpath], '')
+      env = Puppet::Node::Environment.create(:testing, [@modpath])
 
       mod = PuppetSpec::Modules.create(
         'foobar',
@@ -259,7 +259,7 @@ describe Puppet::Module do
     end
 
     it "should only list unmet dependencies" do
-      env = Puppet::Node::Environment.create(:testing, [@modpath], '')
+      env = Puppet::Node::Environment.create(:testing, [@modpath])
 
       mod = PuppetSpec::Modules.create(
         name,
@@ -298,7 +298,7 @@ describe Puppet::Module do
     end
 
     it "should be empty when all dependencies are met" do
-      env = Puppet::Node::Environment.create(:testing, [@modpath], '')
+      env = Puppet::Node::Environment.create(:testing, [@modpath])
 
       mod = PuppetSpec::Modules.create(
         'mymod2',
@@ -662,7 +662,7 @@ describe Puppet::Module do
   end
 
   it "should know what other modules require it" do
-    env = Puppet::Node::Environment.create(:testing, [@modpath], '')
+    env = Puppet::Node::Environment.create(:testing, [@modpath])
 
     dependable = PuppetSpec::Modules.create(
       'dependable',

data/spec/unit/module_tool/applications/installer_spec.rb

@@ -18,7 +18,7 @@ describe Puppet::ModuleTool::Applications::Installer do
     FileUtils.touch(mod)
     mod
   end
-  let(:env)             { Puppet::Node::Environment.create(:env, [modpath1], '') }
+  let(:env)             { Puppet::Node::Environment.create(:env, [modpath1]) }
   let(:options)         do
     {
       :target_dir => modpath1,

data/spec/unit/module_tool/applications/uninstaller_spec.rb

@@ -23,7 +23,7 @@ describe Puppet::ModuleTool::Applications::Uninstaller do
     let(:working_dir) { tmpdir("uninstaller") }
     let(:modpath1) { create_temp_dir("modpath1") }
     let(:modpath2) { create_temp_dir("modpath2") }
-    let(:env) { Puppet::Node::Environment.create(:env, [modpath1, modpath2], '') }
+    let(:env) { Puppet::Node::Environment.create(:env, [modpath1, modpath2]) }
     let(:options)  { { :environment_instance => env } }
     let(:uninstaller) { Puppet::ModuleTool::Applications::Uninstaller.new("puppetlabs-foo", options) }
 

data/spec/unit/module_tool_spec.rb

@@ -156,7 +156,7 @@ TREE
   describe '.set_option_defaults' do
     let(:options) { {} }
     let(:modulepath) { [File.expand_path('/env/module/path'), File.expand_path('/global/module/path')] }
-    let(:environment) { Puppet::Node::Environment.create('current', modulepath, '') }
+    let(:environment) { Puppet::Node::Environment.create('current', modulepath) }
     around(:each) do |example|
       Puppet.override(:current_environment => environment) do
         example.run

data/spec/unit/network/http/api/v1_spec.rb

@@ -282,7 +282,7 @@ describe Puppet::Network::HTTP::API::V1 do
       expect(response.code).to eq(not_authorized_code)
     end
 
-    it "should return an error code if the indirection does not support remote requests" do
+    it "should return 'not found' if the indirection does not support remote requests" do
       request = a_request_that_heads(Puppet::IndirectorTesting.new("my data"))
 
       indirection.expects(:allow_remote_requests?).returns(false)
@@ -292,6 +292,16 @@ describe Puppet::Network::HTTP::API::V1 do
       expect(response.code).to eq(not_found_code)
     end
 
+    it "should return 'not found' if the environment does not exist" do
+      Puppet.override(:environments => Puppet::Environments::Static.new()) do
+        request = a_request_that_heads(Puppet::IndirectorTesting.new("my data"))
+
+        handler.call(request, response)
+
+        expect(response.code).to eq(not_found_code)
+      end
+    end
+
     it "should serialize a controller exception when an exception is thrown while finding the model instance" do
       request = a_request_that_finds(Puppet::IndirectorTesting.new("key"))
       handler.expects(:do_find).raises(ArgumentError, "The exception")

data/spec/unit/network/http/api/v2/environments_spec.rb

@@ -31,7 +31,7 @@ describe Puppet::Network::HTTP::API::V2::Environments do
   end
 
   it "the response conforms to the environments schema" do
-    environment = Puppet::Node::Environment.create(:production, [], '')
+    environment = Puppet::Node::Environment.create(:production, [])
     handler = Puppet::Network::HTTP::API::V2::Environments.new(Puppet::Environments::Static.new(environment))
     response = Puppet::Network::HTTP::MemoryResponse.new
 

data/spec/unit/node/environment_spec.rb

@@ -174,7 +174,7 @@ describe Puppet::Node::Environment do
 
       it "should return nil if asked for a module that does not exist in its path" do
         modpath = tmpdir('modpath')
-        env = Puppet::Node::Environment.create(:testing, [modpath], '')
+        env = Puppet::Node::Environment.create(:testing, [modpath])
 
         env.module("one").should be_nil
       end

data/spec/unit/node_spec.rb

@@ -5,7 +5,7 @@ require 'matchers/json'
 describe Puppet::Node do
   include JSONMatchers
 
-  let(:environment) { Puppet::Node::Environment.create(:bar, [], '') }
+  let(:environment) { Puppet::Node::Environment.create(:bar, []) }
   let(:env_loader) { Puppet::Environments::Static.new(environment) }
 
   it "should register its document type as Node" do