puppet 4.10.0 → 5.0.0

data/spec/lib/matchers/json.rb

@@ -5,11 +5,11 @@ module JSONMatchers
     end
 
     def format
-      @format ||= Puppet::Network::FormatHandler.format('pson')
+      @format ||= Puppet::Network::FormatHandler.format('json')
     end
 
     def json(instance)
-      PSON.parse(instance.to_pson)
+      JSON.parse(instance.to_json)
     end
 
     def attr_value(attrs, instance)
@@ -59,7 +59,7 @@ module JSONMatchers
     end
 
     def format
-      @format ||= Puppet::Network::FormatHandler.format('pson')
+      @format ||= Puppet::Network::FormatHandler.format('json')
     end
 
     def from(value)

data/spec/lib/puppet/face/1.0.0/huzzah.rb

@@ -1,6 +1,6 @@
 require 'puppet/face'
 Puppet::Face.define(:huzzah, '1.0.0') do
-  copyright "Puppet Labs", 2011
+  copyright "Puppet Inc.", 2011
   license   "Apache 2 license; see COPYING"
   summary "life is a thing for celebration"
   action(:obsolete_in_core) { when_invoked { |_| "you are in obsolete core now!" } }

data/spec/lib/puppet/face/basetest.rb

@@ -1,7 +1,7 @@
 require 'puppet/face'
 
 Puppet::Face.define(:basetest, '0.0.1') do
-  copyright "Puppet Labs", 2011
+  copyright "Puppet Inc.", 2011
   license   "Apache 2 license; see COPYING"
   summary "This is just so tests don't fail"
 

data/spec/lib/puppet/face/huzzah.rb

@@ -1,6 +1,6 @@
 require 'puppet/face'
 Puppet::Face.define(:huzzah, '2.0.1') do
-  copyright "Puppet Labs", 2011
+  copyright "Puppet Inc.", 2011
   license   "Apache 2 license; see COPYING"
   summary "life is a thing for celebration"
   action(:bar) { when_invoked { |options| "is where beer comes from" } }

data/spec/lib/puppet/face/version_matching.rb

@@ -4,7 +4,7 @@ require 'puppet/face'
 # change this you need to ensure that is still correct. --daniel 2011-04-21
 ['1.0.0', '1.0.1', '1.1.0', '1.1.1', '2.0.0'].each do |version|
   Puppet::Face.define(:version_matching, version) do
-    copyright "Puppet Labs", 2011
+    copyright "Puppet Inc.", 2011
     license   "Apache 2 license; see COPYING"
     summary "version matching face #{version}"
     action(:version) { when_invoked { |options| version } }

data/spec/lib/puppet/indirector_testing.rb

@@ -21,6 +21,10 @@ class Puppet::IndirectorTesting
     new(data['value'])
   end
 
+  def to_binary
+    value
+  end
+
   def to_data_hash
     { 'value' => value }
   end

data/spec/lib/puppet_spec/character_encoding.rb

@@ -0,0 +1,12 @@
+# A support module for testing character encoding
+module PuppetSpec::CharacterEncoding
+  def self.with_external_encoding(encoding, &blk)
+    original_encoding = Encoding.default_external
+    begin
+      Encoding.default_external = encoding
+      yield
+    ensure
+      Encoding.default_external = original_encoding
+    end
+  end
+end

data/spec/lib/puppet_spec/compiler.rb

@@ -7,6 +7,13 @@ module PuppetSpec::Compiler
     Puppet::Parser::Compiler.compile(node).filter { |r| r.virtual? }
   end
 
+  # Does not removed virtual resources in compiled catalog (i.e. keeps unrealized)
+  def compile_to_catalog_unfiltered(string, node = Puppet::Node.new('test'))
+    Puppet[:code] = string
+    # see lib/puppet/indirector/catalog/compiler.rb#filter
+    Puppet::Parser::Compiler.compile(node)
+  end
+
   def compile_to_ral(manifest, node = Puppet::Node.new('test'))
     catalog = compile_to_catalog(manifest, node)
     ral = catalog.to_ral
@@ -27,7 +34,7 @@ module PuppetSpec::Compiler
       catalog.resources.each { |res| yield res }
     end
     transaction = Puppet::Transaction.new(catalog,
-                                         Puppet::Transaction::Report.new("apply"),
+                                         Puppet::Transaction::Report.new,
                                          prioritizer)
     transaction.evaluate
     transaction.report.finalize_report

data/spec/lib/puppet_spec/modules.rb

@@ -16,7 +16,7 @@ module PuppetSpec::Modules
         metadata[:name] = "#{metadata[:author]}/#{name}"
 
         File.open(File.join(module_dir, 'metadata.json'), 'w') do |f|
-          f.write(metadata.to_pson)
+          f.write(metadata.to_json)
         end
       end
 
@@ -29,7 +29,7 @@ module PuppetSpec::Modules
 
       if metadata = options[:metadata]
         File.open(File.join(module_dir, 'metadata.json'), 'w') do |f|
-          f.write(metadata.to_pson)
+          f.write(metadata.to_json)
         end
       end
     end

data/spec/lib/puppet_spec/network.rb

@@ -25,6 +25,10 @@ module PuppetSpec::Network
     Puppet::Network::HTTP::Error::HTTPMethodNotAllowedError
   end
 
+  def unsupported_media_type_error
+    Puppet::Network::HTTP::Error::HTTPUnsupportedMediaTypeError
+  end
+
   def params
     { :environment => "production" }
   end
@@ -41,7 +45,7 @@ module PuppetSpec::Network
     Puppet::Network::HTTP::Request.from_hash({
       :headers => {
         'accept' => request[:accept_header],
-        'content-type' => "text/pson"
+        'content-type' => "application/json"
       },
       :method => "HEAD",
       :path => "#{master_url_prefix}/#{data.class.indirection.name}/#{data.value}",
@@ -53,12 +57,12 @@ module PuppetSpec::Network
     Puppet::Network::HTTP::Request.from_hash({
       :headers => {
         'accept' => request[:accept_header],
-        'content-type' => request[:content_type_header] || "text/pson"
+        'content-type' => request[:content_type_header] || "application/json"
       },
       :method => "PUT",
       :path => "#{master_url_prefix}/#{data.class.indirection.name}/#{data.value}",
       :params => params,
-      :body => request[:body].nil? ? data.render("pson") : request[:body]
+      :body => request[:body].nil? ? data.render("json") : request[:body]
     })
   end
 
@@ -66,7 +70,7 @@ module PuppetSpec::Network
     Puppet::Network::HTTP::Request.from_hash({
       :headers => {
         'accept' => request[:accept_header],
-        'content-type' => "text/pson"
+        'content-type' => "application/json"
       },
       :method => "DELETE",
       :path => "#{master_url_prefix}/#{data.class.indirection.name}/#{data.value}",
@@ -79,7 +83,7 @@ module PuppetSpec::Network
     Puppet::Network::HTTP::Request.from_hash({
       :headers => {
         'accept' => request[:accept_header],
-        'content-type' => "text/pson"
+        'content-type' => "application/json"
       },
       :method => "GET",
       :path => "#{master_url_prefix}/#{data.class.indirection.name}/#{data.value}",
@@ -92,7 +96,7 @@ module PuppetSpec::Network
     Puppet::Network::HTTP::Request.from_hash({
       :headers => {
         'accept' => request[:accept_header],
-        'content-type' => "text/pson"
+        'content-type' => "application/json"
       },
       :method => "GET",
       :path => "#{master_url_prefix}/#{data.class.indirection.name}s/#{data.name}",

data/spec/shared_contexts/types_setup.rb

@@ -1,12 +1,12 @@
 shared_context 'types_setup' do
 
   # Do not include the special type Unit in this list
-  def all_types
+  def self.all_types
     [ Puppet::Pops::Types::PAnyType,
       Puppet::Pops::Types::PUndefType,
       Puppet::Pops::Types::PNotUndefType,
-      Puppet::Pops::Types::PDataType,
       Puppet::Pops::Types::PScalarType,
+      Puppet::Pops::Types::PScalarDataType,
       Puppet::Pops::Types::PStringType,
       Puppet::Pops::Types::PNumericType,
       Puppet::Pops::Types::PIntegerType,
@@ -40,11 +40,32 @@ shared_context 'types_setup' do
       Puppet::Pops::Types::PBinaryType,
     ]
   end
+  def all_types
+    self.class.all_types
+  end
 
-  def scalar_types
+  def self.scalar_data_types
+    # PVariantType is also scalar data, if its types are all ScalarData
+    [
+      Puppet::Pops::Types::PScalarDataType,
+      Puppet::Pops::Types::PStringType,
+      Puppet::Pops::Types::PNumericType,
+      Puppet::Pops::Types::PIntegerType,
+      Puppet::Pops::Types::PFloatType,
+      Puppet::Pops::Types::PBooleanType,
+      Puppet::Pops::Types::PEnumType,
+    ]
+  end
+  def scalar_data_types
+    self.class.scalar_data_types
+  end
+
+
+  def self.scalar_types
     # PVariantType is also scalar, if its types are all Scalar
     [
       Puppet::Pops::Types::PScalarType,
+      Puppet::Pops::Types::PScalarDataType,
       Puppet::Pops::Types::PStringType,
       Puppet::Pops::Types::PNumericType,
       Puppet::Pops::Types::PIntegerType,
@@ -54,13 +75,15 @@ shared_context 'types_setup' do
       Puppet::Pops::Types::PPatternType,
       Puppet::Pops::Types::PEnumType,
       Puppet::Pops::Types::PSemVerType,
-      Puppet::Pops::Types::PSemVerRangeType,
       Puppet::Pops::Types::PTimespanType,
       Puppet::Pops::Types::PTimestampType,
     ]
   end
+  def scalar_types
+    self.class.scalar_types
+  end
 
-  def numeric_types
+  def self.numeric_types
     # PVariantType is also numeric, if its types are all numeric
     [
       Puppet::Pops::Types::PNumericType,
@@ -68,8 +91,11 @@ shared_context 'types_setup' do
       Puppet::Pops::Types::PFloatType,
     ]
   end
+  def numeric_types
+    self.class.numeric_types
+  end
 
-  def string_types
+  def self.string_types
     # PVariantType is also string type, if its types are all compatible
     [
       Puppet::Pops::Types::PStringType,
@@ -77,8 +103,11 @@ shared_context 'types_setup' do
       Puppet::Pops::Types::PEnumType,
     ]
   end
+  def string_types
+    self.class.string_types
+  end
 
-  def collection_types
+  def self.collection_types
     # PVariantType is also string type, if its types are all compatible
     [
       Puppet::Pops::Types::PCollectionType,
@@ -88,19 +117,27 @@ shared_context 'types_setup' do
       Puppet::Pops::Types::PTupleType,
     ]
   end
+  def collection_types
+    self.class.collection_types
+  end
 
-  def data_compatible_types
-    result = scalar_types
-    result << Puppet::Pops::Types::PDataType
-    result << array_t(types::PDataType::DEFAULT)
-    result << types::TypeFactory.hash_of_data
+  def self.data_compatible_types
+    result = scalar_data_types
+    result << Puppet::Pops::Types::PArrayType.new(Puppet::Pops::Types::PScalarDataType::DEFAULT)
+    result << Puppet::Pops::Types::PHashType.new(Puppet::Pops::Types::PStringType::DEFAULT, Puppet::Pops::Types::PScalarDataType::DEFAULT)
     result << Puppet::Pops::Types::PUndefType
-    result << not_undef_t(types::PDataType.new)
-    result << constrained_tuple_t(range_t(0, nil), types::PDataType::DEFAULT)
+    result << Puppet::Pops::Types::PNotUndefType.new(Puppet::Pops::Types::PScalarDataType::DEFAULT)
+    result << Puppet::Pops::Types::PTupleType.new([Puppet::Pops::Types::PScalarDataType::DEFAULT])
     result
   end
+  def data_compatible_types
+    self.class.data_compatible_types
+  end
 
-  def type_from_class(c)
+  def self.type_from_class(c)
     c.is_a?(Class) ? c::DEFAULT : c
   end
+  def type_from_class(c)
+    self.class.type_from_class(c)
+  end
 end

data/spec/shared_examples/rhel_package_provider.rb

@@ -178,7 +178,7 @@ shared_examples "RHEL package provider" do |provider_class, provider_name|
           {'--enablerepo' => 'centosplus'},
         ]
         provider.stubs(:properties).returns({:ensure => '3.4.5'})
-        described_class.expects(:latest_package_version).with(name, ['contrib', 'centosplus'], [], [])
+        described_class.expects(:latest_package_version).with(name, [], ['contrib', 'centosplus'], [])
         provider.latest
       end
       it "passes the value of disablerepo install_options when querying" do
@@ -187,7 +187,7 @@ shared_examples "RHEL package provider" do |provider_class, provider_name|
           {'--disablerepo' => 'centosplus'},
         ]
         provider.stubs(:properties).returns({:ensure => '3.4.5'})
-        described_class.expects(:latest_package_version).with(name, [], ['updates', 'centosplus'], [])
+        described_class.expects(:latest_package_version).with(name, ['updates', 'centosplus'], [], [])
         provider.latest
       end
       it "passes the value of disableexcludes install_options when querying" do
@@ -270,15 +270,15 @@ shared_examples "RHEL package provider" do |provider_class, provider_name|
           expect(version).to eq mypackage_version
         }
       end
-      it "caches separate lists for each combination of 'enablerepo' and 'disablerepo' and 'disableexcludes'" do
+      it "caches separate lists for each combination of 'disablerepo' and 'enablerepo' and 'disableexcludes'" do
         described_class.expects(:check_updates).with([], [], []).once.returns(latest_versions)
-        described_class.expects(:check_updates).with(['enabled'], ['disabled'], ['disableexcludes']).once.returns(enabled_versions)
+        described_class.expects(:check_updates).with(['disabled'], ['enabled'], ['disableexcludes']).once.returns(enabled_versions)
         2.times {
           version = described_class.latest_package_version(name, [], [], [])
           expect(version).to eq mypackage_version
         }
         2.times {
-          version = described_class.latest_package_version(name, ['enabled'], ['disabled'], ['disableexcludes'])
+          version = described_class.latest_package_version(name, ['disabled'], ['enabled'], ['disableexcludes'])
           expect(version).to eq(mypackage_newerversion)
         }
       end
@@ -288,19 +288,19 @@ shared_examples "RHEL package provider" do |provider_class, provider_name|
         Puppet::Util::Execution.expects(:execute).with do |args, *rest|
           expect(args).to eq %W[/usr/bin/#{provider_name} check-update --enablerepo=updates --enablerepo=centosplus]
         end.returns(stub(:exitstatus => 0))
-        described_class.check_updates(%W[updates centosplus], [], [])
+        described_class.check_updates([], %W[updates centosplus], [])
       end
       it "passes repos to disable to '#{provider_name} check-update'" do
         Puppet::Util::Execution.expects(:execute).with do |args, *rest|
           expect(args).to eq %W[/usr/bin/#{provider_name} check-update --disablerepo=updates --disablerepo=centosplus]
         end.returns(stub(:exitstatus => 0))
-        described_class.check_updates([],%W[updates centosplus], [])
+        described_class.check_updates(%W[updates centosplus], [], [])
       end
       it "passes a combination of repos to enable and disable to '#{provider_name} check-update'" do
         Puppet::Util::Execution.expects(:execute).with do |args, *rest|
-          expect(args).to eq %W[/usr/bin/#{provider_name} check-update --enablerepo=os --enablerepo=contrib --disablerepo=updates --disablerepo=centosplus]
+          expect(args).to eq %W[/usr/bin/#{provider_name} check-update --disablerepo=updates --disablerepo=centosplus --enablerepo=os --enablerepo=contrib ]
         end.returns(stub(:exitstatus => 0))
-        described_class.check_updates(%W[os contrib], %W[updates centosplus], [])
+        described_class.check_updates(%W[updates centosplus], %W[os contrib], [])
       end
       it "passes disableexcludes to '#{provider_name} check-update'" do
         Puppet::Util::Execution.expects(:execute).with do |args, *rest|
@@ -310,8 +310,7 @@ shared_examples "RHEL package provider" do |provider_class, provider_name|
       end
       it "passes all options to '#{provider_name} check-update'" do
         Puppet::Util::Execution.expects(:execute).with do |args, *rest|
-          expect(args).to eq %W[/usr/bin/#{provider_name} check-update --enablerepo=a --enablerepo=b --disablerepo=c
-                                --disablerepo=d --disableexcludes=e --disableexcludes=f]
+          expect(args).to eq %W[/usr/bin/#{provider_name} check-update --disablerepo=a --disablerepo=b --enablerepo=c --enablerepo=d --disableexcludes=e --disableexcludes=f]
         end.returns(stub(:exitstatus => 0))
         described_class.check_updates(%W[a b], %W[c d], %W[e f])
       end

data/spec/spec_helper.rb

@@ -84,17 +84,6 @@ RSpec.configure do |config|
   oldtmpdir = Puppet::FileSystem.expand_path(Dir.tmpdir())
   ENV['TMPDIR'] = tmpdir
 
-  if Puppet::Util::Platform.windows?
-    config.output_stream = $stdout
-    config.error_stream = $stderr
-
-    config.formatters.each do |f|
-      if not f.instance_variable_get(:@output).kind_of?(::File)
-        f.instance_variable_set(:@output, $stdout)
-      end
-    end
-  end
-
   Puppet::Test::TestHelper.initialize
 
   config.before :all do

data/spec/unit/agent_spec.rb

@@ -66,7 +66,7 @@ describe Puppet::Agent do
   it "should initialize the client's transaction_uuid if passed as a client_option" do
     client = mock 'client'
     transaction_uuid = 'foo'
-    AgentTestClient.expects(:new).with(anything, transaction_uuid).returns client
+    AgentTestClient.expects(:new).with(anything, transaction_uuid, nil).returns client
 
     client.expects(:run)
 
@@ -74,6 +74,17 @@ describe Puppet::Agent do
     @agent.run(:transaction_uuid => transaction_uuid)
   end
 
+  it "should initialize the client's job_id if passed as a client_option" do
+    client = mock 'client'
+    job_id = '289'
+    AgentTestClient.expects(:new).with(anything, anything, job_id).returns client
+
+    client.expects(:run)
+
+    @agent.stubs(:disabled?).returns false
+    @agent.run(:job_id => job_id)
+  end
+
   it "should be considered running if the lock file is locked" do
     lockfile = mock 'lockfile'
 

data/spec/unit/application/agent_spec.rb

@@ -530,6 +530,13 @@ describe Puppet::Application::Agent do
         expect { execute_agent }.to exit_with 0
       end
 
+      it "should run the agent with the supplied job_id" do
+        @puppetd.options[:job_id] = 'special id'
+        @agent.expects(:run).with(:job_id => 'special id').returns(:report)
+
+        expect { execute_agent }.to exit_with 0
+      end
+
       it "should stop the daemon" do
         @daemon.expects(:stop).with(:exit => false)
 

data/spec/unit/application/apply_spec.rb

@@ -279,6 +279,15 @@ describe Puppet::Application::Apply do
         expect { @apply.main }.to exit_with 0
       end
 
+      it 'should make the Puppet::Pops::Loaders available when applying the compiled catalog' do
+        Puppet::Resource::Catalog.indirection.expects(:find).returns(@catalog)
+        @apply.expects(:apply_catalog).with(@catalog) do
+          fail('Loaders not found') unless Puppet.lookup(:loaders) { nil }.is_a?(Puppet::Pops::Loaders)
+          true
+        end.returns(0)
+        expect { @apply.main }.to exit_with 0
+      end
+
       it "should transform the catalog to ral" do
 
         @catalog.expects(:to_ral).returns(@catalog)
@@ -322,7 +331,7 @@ describe Puppet::Application::Apply do
 
       it "should save the last run summary" do
         Puppet[:noop] = false
-        report = Puppet::Transaction::Report.new("apply")
+        report = Puppet::Transaction::Report.new
         Puppet::Transaction::Report.stubs(:new).returns(report)
 
         Puppet::Configurer.any_instance.expects(:save_last_run_summary).with(report)
@@ -404,7 +413,7 @@ describe Puppet::Application::Apply do
       # We want this memoized, and to be able to adjust the content, so we
       # have to do it ourselves.
       def temporary_catalog(content = '"something"')
-        @tempfile = Tempfile.new('catalog.pson')
+        @tempfile = Tempfile.new('catalog.json')
         @tempfile.write(content)
         @tempfile.close
         @tempfile.path
@@ -413,7 +422,7 @@ describe Puppet::Application::Apply do
       it "should read the catalog in from disk if a file name is provided" do
         @apply.options[:catalog] = temporary_catalog
         catalog = Puppet::Resource::Catalog.new("testing", Puppet::Node::Environment::NONE)
-        Puppet::Resource::Catalog.stubs(:convert_from).with(:pson,'"something"').returns(catalog)
+        Puppet::Resource::Catalog.stubs(:convert_from).with(:json,'"something"').returns(catalog)
         @apply.apply
       end
 
@@ -421,7 +430,7 @@ describe Puppet::Application::Apply do
         @apply.options[:catalog] = "-"
         $stdin.expects(:read).returns '"something"'
         catalog = Puppet::Resource::Catalog.new("testing", Puppet::Node::Environment::NONE)
-        Puppet::Resource::Catalog.stubs(:convert_from).with(:pson,'"something"').returns(catalog)
+        Puppet::Resource::Catalog.stubs(:convert_from).with(:json,'"something"').returns(catalog)
         @apply.apply
       end
 
@@ -438,18 +447,10 @@ describe Puppet::Application::Apply do
         expect { @apply.apply }.to raise_error(Puppet::Error)
       end
 
-      it "should convert plain data structures into a catalog if deserialization does not do so" do
-        @apply.options[:catalog] = temporary_catalog
-        Puppet::Resource::Catalog.stubs(:convert_from).with(:pson,'"something"').returns({:foo => "bar"})
-        catalog = Puppet::Resource::Catalog.new("testing", Puppet::Node::Environment::NONE)
-        Puppet::Resource::Catalog.expects(:pson_create).with({:foo => "bar"}).returns(catalog)
-        @apply.apply
-      end
-
       it "should convert the catalog to a RAL catalog and use a Configurer instance to apply it" do
         @apply.options[:catalog] = temporary_catalog
         catalog = Puppet::Resource::Catalog.new("testing", Puppet::Node::Environment::NONE)
-        Puppet::Resource::Catalog.stubs(:convert_from).with(:pson,'"something"').returns catalog
+        Puppet::Resource::Catalog.stubs(:convert_from).with(:json,'"something"').returns catalog
         catalog.expects(:to_ral).returns "mycatalog"
 
         configurer = stub 'configurer'
@@ -459,6 +460,20 @@ describe Puppet::Application::Apply do
 
         @apply.apply
       end
+
+      it 'should make the Puppet::Pops::Loaders available when applying a catalog' do
+        @apply.options[:catalog] = temporary_catalog
+        catalog = Puppet::Resource::Catalog.new("testing", Puppet::Node::Environment::NONE)
+        @apply.expects(:read_catalog).with('something') do
+          fail('Loaders not found') unless Puppet.lookup(:loaders) { nil }.is_a?(Puppet::Pops::Loaders)
+          true
+        end.returns(catalog)
+        @apply.expects(:apply_catalog).with(catalog) do
+          fail('Loaders not found') unless Puppet.lookup(:loaders) { nil }.is_a?(Puppet::Pops::Loaders)
+          true
+        end
+        expect { @apply.apply }.not_to raise_error
+      end
     end
   end
 

data/spec/unit/application/describe_spec.rb

@@ -76,4 +76,23 @@ describe Puppet::Application::Describe do
       @describe.run_command
     end
   end
+
+  it "should format text with long non-space runs without garbling" do
+    @f = Formatter.new(76)
+
+    @teststring = <<TESTSTRING
+. 12345678901234567890123456789012345678901234567890123456789012345678901234567890123456789012345678901234567890 nick@magpie.puppetlabs.lan
+**this part should not repeat!**
+TESTSTRING
+
+    @expected_result = <<EXPECTED
+.
+1234567890123456789012345678901234567890123456789012345678901234567890123456
+7890123456789012345678901234567890 nick@magpie.puppetlabs.lan
+**this part should not repeat!**
+EXPECTED
+
+    result = @f.wrap(@teststring, {:indent => 0, :scrub => true})
+    expect(result).to eql(@expected_result)
+  end
 end

data/spec/unit/application/device_spec.rb

@@ -47,6 +47,12 @@ describe Puppet::Application::Device do
 
       expect(@device.options[:waitforcert]).to be_nil
     end
+
+    it "should init target to nil" do
+      @device.preinit
+
+      expect(@device.options[:target]).to be_nil
+    end
   end
 
   describe "when handling options" do
@@ -265,12 +271,12 @@ describe Puppet::Application::Device do
     end
   end
 
-
   describe "when running" do
     before :each do
       @device.options.stubs(:[]).with(:fingerprint).returns(false)
       Puppet.stubs(:notice)
       @device.options.stubs(:[]).with(:detailed_exitcodes).returns(false)
+      @device.options.stubs(:[]).with(:target).returns(nil)
       @device.options.stubs(:[]).with(:client)
       Puppet::Util::NetworkDevice::Config.stubs(:devices).returns({})
     end
@@ -286,6 +292,32 @@ describe Puppet::Application::Device do
       expect { @device.main }.to exit_with 1
     end
 
+    it "should get a single device, when a valid target parameter is passed" do
+      @device.options.stubs(:[]).with(:target).returns('device1')
+
+      device_hash = {
+        "device1" => OpenStruct.new(:name => "device1", :url => "ssh://user:pass@testhost", :provider => "cisco"),
+        "device2" => OpenStruct.new(:name => "device2", :url => "https://user:pass@testhost/some/path", :provider => "rest"),
+      }
+
+      Puppet::Util::NetworkDevice::Config.expects(:devices).returns(device_hash)
+      Puppet.expects(:info).with("starting applying configuration to device1 at ssh://testhost")
+      Puppet.expects(:info).with("starting applying configuration to device2 at https://testhost:443/some/path").never
+      expect { @device.main }.to exit_with 1
+    end
+
+    it "should exit, when an invalid target parameter is passed" do
+      @device.options.stubs(:[]).with(:target).returns('bla')
+      device_hash = {
+        "device1" => OpenStruct.new(:name => "device1", :url => "ssh://user:pass@testhost", :provider => "cisco"),
+      }
+
+      Puppet::Util::NetworkDevice::Config.expects(:devices).returns(device_hash)
+      Puppet.expects(:info).with(regexp_matches(/starting applying configuration to/)).never
+      Puppet.expects(:err).with(regexp_matches(/Target device \/ certificate 'bla' not found in .*\.conf/))
+      expect { @device.main }.to exit_with 1
+    end
+
     it "should exit if the device list is empty" do
       expect { @device.main }.to exit_with 1
     end
@@ -360,6 +392,14 @@ describe Puppet::Application::Device do
         expect { @device.main }.to exit_with 0
       end
 
+      it "should make the Puppet::Pops::Loaaders available" do
+        @configurer.expects(:run).with(:network_device => true, :pluginsync => true) do
+          fail('Loaders not available') unless Puppet.lookup(:loaders) { nil }.is_a?(Puppet::Pops::Loaders)
+          true
+        end.at_least_once.returns(6,2)
+        expect { @device.main }.to exit_with 0
+      end
+
       it "exits 2 when --detailed-exitcodes and successful runs" do
         @device.options.stubs(:[]).with(:detailed_exitcodes).returns(true)
         @configurer.stubs(:run).returns(0,2)
@@ -406,7 +446,6 @@ describe Puppet::Application::Device do
             Puppet.expects(:[]=).with(setting, make_absolute("/dummy")).in_sequence(seq)
           end
 
-
           expect { @device.main }.to exit_with 1
 
           expect(found_devices).to eq(all_devices)