puppet 5.0.0 → 6.0.0

data/spec/shared_contexts/digests.rb

@@ -11,7 +11,7 @@
 # automatically based on the rspec metadata selected with
 # `with_digest_algorithms`.
 
-DIGEST_ALGORITHMS_TO_TRY = ['md5', 'sha256']
+DIGEST_ALGORITHMS_TO_TRY = ['md5', 'sha256', 'sha384', 'sha512', 'sha224']
 
 shared_context('with supported digest algorithms', :uses_checksums => true) do
 
@@ -53,3 +53,48 @@ shared_context("when digest_algorithm is set to md5", :digest_algorithm => 'md5'
     Puppet::Util::Checksums.md5(content)
   end
 end
+
+shared_context("when digest_algorithm is set to sha512", :digest_algorithm => 'sha512') do
+  before { Puppet[:digest_algorithm] = 'sha512' }
+  after { Puppet[:digest_algorithm] = nil }
+
+  let(:digest_algorithm) { 'sha512' }
+
+  let(:plaintext) { "my\r\ncontents" }
+  let(:checksum) { 'ed9b62ae313c8e4e3e6a96f937101e85f8f8af8d51dea7772177244087e5d6152778605ad6bdb42886ff1436abaec4fa44acbfe171fda755959b52b0e4e015d4' }
+  let(:bucket_dir) { 'e/d/9/b/6/2/a/e/ed9b62ae313c8e4e3e6a96f937101e85f8f8af8d51dea7772177244087e5d6152778605ad6bdb42886ff1436abaec4fa44acbfe171fda755959b52b0e4e015d4' }
+
+  def digest(content)
+    Puppet::Util::Checksums.sha512(content)
+  end
+end
+
+shared_context("when digest_algorithm is set to sha384", :digest_algorithm => 'sha384') do
+  before { Puppet[:digest_algorithm] = 'sha384' }
+  after { Puppet[:digest_algorithm] = nil }
+
+  let(:digest_algorithm) { 'sha384' }
+
+  let(:plaintext) { "my\r\ncontents" }
+  let(:checksum) { 'f40debfec135e4f2b9fb92110c53aadb8e9bda28bb05f09901480fd70126fe3b70f9f074ce6182ec8184eb1bcabe4440' }
+  let(:bucket_dir) { 'f/4/0/d/e/b/f/e/f40debfec135e4f2b9fb92110c53aadb8e9bda28bb05f09901480fd70126fe3b70f9f074ce6182ec8184eb1bcabe4440' }
+
+  def digest(content)
+    Puppet::Util::Checksums.sha384(content)
+  end
+end
+
+shared_context("when digest_algorithm is set to sha224", :digest_algorithm => 'sha224') do
+  before { Puppet[:digest_algorithm] = 'sha224' }
+  after { Puppet[:digest_algorithm] = nil }
+
+  let(:digest_algorithm) { 'sha224' }
+
+  let(:plaintext) { "my\r\ncontents" }
+  let(:checksum) { 'b8c05079b24c37a0e03f03e611167a3ea24455db3ad638a3a0c7e9cb' }
+  let(:bucket_dir) { 'b/8/c/0/5/0/7/9/b8c05079b24c37a0e03f03e611167a3ea24455db3ad638a3a0c7e9cb' }
+
+  def digest(content)
+    Puppet::Util::Checksums.sha224(content)
+  end
+end

data/spec/shared_contexts/types_setup.rb

@@ -1,6 +1,7 @@
 shared_context 'types_setup' do
 
   # Do not include the special type Unit in this list
+  # Do not include the type Variant in this list as it needs to be parameterized to be meaningful
   def self.all_types
     [ Puppet::Pops::Types::PAnyType,
       Puppet::Pops::Types::PUndefType,
@@ -19,15 +20,14 @@ shared_context 'types_setup' do
       Puppet::Pops::Types::PIterableType,
       Puppet::Pops::Types::PIteratorType,
       Puppet::Pops::Types::PRuntimeType,
-      Puppet::Pops::Types::PHostClassType,
+      Puppet::Pops::Types::PClassType,
       Puppet::Pops::Types::PResourceType,
       Puppet::Pops::Types::PPatternType,
       Puppet::Pops::Types::PEnumType,
-      Puppet::Pops::Types::PVariantType,
       Puppet::Pops::Types::PStructType,
       Puppet::Pops::Types::PTupleType,
       Puppet::Pops::Types::PCallableType,
-      Puppet::Pops::Types::PType,
+      Puppet::Pops::Types::PTypeType,
       Puppet::Pops::Types::POptionalType,
       Puppet::Pops::Types::PDefaultType,
       Puppet::Pops::Types::PTypeReferenceType,
@@ -38,12 +38,54 @@ shared_context 'types_setup' do
       Puppet::Pops::Types::PTimestampType,
       Puppet::Pops::Types::PSensitiveType,
       Puppet::Pops::Types::PBinaryType,
+      Puppet::Pops::Types::PInitType,
+      Puppet::Pops::Types::PURIType,
     ]
   end
   def all_types
     self.class.all_types
   end
 
+  # Do not include the Variant type in this list - while it is abstract it is also special in that
+  # it must be parameterized to be meaningful.
+  #
+  def self.abstract_types
+    [ Puppet::Pops::Types::PAnyType,
+      Puppet::Pops::Types::PCallableType,
+      Puppet::Pops::Types::PEnumType,
+      Puppet::Pops::Types::PClassType,
+      Puppet::Pops::Types::PDefaultType,
+      Puppet::Pops::Types::PCollectionType,
+      Puppet::Pops::Types::PInitType,
+      Puppet::Pops::Types::PIterableType,
+      Puppet::Pops::Types::PIteratorType,
+      Puppet::Pops::Types::PNotUndefType,
+      Puppet::Pops::Types::PResourceType,
+      Puppet::Pops::Types::PRuntimeType,
+      Puppet::Pops::Types::POptionalType,
+      Puppet::Pops::Types::PPatternType,
+      Puppet::Pops::Types::PScalarType,
+      Puppet::Pops::Types::PScalarDataType,
+      Puppet::Pops::Types::PUndefType,
+      Puppet::Pops::Types::PTypeReferenceType,
+      Puppet::Pops::Types::PTypeAliasType,
+    ]
+  end
+  def abstract_types
+    self.class.abstract_types
+  end
+
+  # Internal types. Not meaningful in pp
+  def self.internal_types
+    [ Puppet::Pops::Types::PTypeReferenceType,
+      Puppet::Pops::Types::PTypeAliasType,
+    ]
+  end
+  def internal_types
+    self.class.internal_types
+  end
+
+
   def self.scalar_data_types
     # PVariantType is also scalar data, if its types are all ScalarData
     [
@@ -54,6 +96,7 @@ shared_context 'types_setup' do
       Puppet::Pops::Types::PFloatType,
       Puppet::Pops::Types::PBooleanType,
       Puppet::Pops::Types::PEnumType,
+      Puppet::Pops::Types::PPatternType,
     ]
   end
   def scalar_data_types
@@ -122,18 +165,34 @@ shared_context 'types_setup' do
   end
 
   def self.data_compatible_types
+    tf = Puppet::Pops::Types::TypeFactory
     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::PArrayType.new(tf.data)
+    result << Puppet::Pops::Types::PHashType.new(Puppet::Pops::Types::PStringType::DEFAULT, tf.data)
     result << Puppet::Pops::Types::PUndefType
-    result << Puppet::Pops::Types::PNotUndefType.new(Puppet::Pops::Types::PScalarDataType::DEFAULT)
-    result << Puppet::Pops::Types::PTupleType.new([Puppet::Pops::Types::PScalarDataType::DEFAULT])
+    result << Puppet::Pops::Types::PTupleType.new([tf.data])
     result
   end
   def data_compatible_types
     self.class.data_compatible_types
   end
 
+  def self.rich_data_compatible_types
+    tf = Puppet::Pops::Types::TypeFactory
+    result = scalar_types
+    result << Puppet::Pops::Types::PArrayType.new(tf.rich_data)
+    result << Puppet::Pops::Types::PHashType.new(tf.rich_data_key, tf.rich_data)
+    result << Puppet::Pops::Types::PUndefType
+    result << Puppet::Pops::Types::PDefaultType
+    result << Puppet::Pops::Types::PURIType
+    result << Puppet::Pops::Types::PTupleType.new([tf.rich_data])
+    result << Puppet::Pops::Types::PObjectType
+    result
+  end
+  def rich_data_compatible_types
+    self.class.rich_data_compatible_types
+  end
+
   def self.type_from_class(c)
     c.is_a?(Class) ? c::DEFAULT : c
   end

data/spec/shared_examples/rhel_package_provider.rb

@@ -68,7 +68,7 @@ shared_examples "RHEL package provider" do |provider_class, provider_name|
       before(:each) do
         Puppet::Util.stubs(:which).with("rpm").returns("/bin/rpm")
         provider.stubs(:which).with("rpm").returns("/bin/rpm")
-        Puppet::Util::Execution.expects(:execute).with(["/bin/rpm", "--version"], {:combine => true, :custom_environment => {}, :failonfail => true}).returns("4.10.1\n").at_most_once
+        Puppet::Util::Execution.expects(:execute).with(["/bin/rpm", "--version"], {:combine => true, :custom_environment => {}, :failonfail => true}).returns(Puppet::Util::Execution::ProcessOutput.new("4.10.1\n", 0)).at_most_once
         Facter.stubs(:value).with(:operatingsystemmajrelease).returns('6')
       end
       it "should call #{provider_name} install for :installed" do
@@ -84,7 +84,7 @@ shared_examples "RHEL package provider" do |provider_class, provider_name|
           end
           it "should catch #{provider_name} install failures when status code is wrong" do
             resource.stubs(:should).with(:ensure).returns :installed
-            Puppet::Util::Execution.expects(:execute).with(["/usr/bin/#{provider_name}", '-e', error_level, '-y', :install, name]).returns("No package #{name} available.")
+            Puppet::Util::Execution.expects(:execute).with(["/usr/bin/#{provider_name}", '-e', error_level, '-y', :install, name]).returns(Puppet::Util::Execution::ProcessOutput.new("No package #{name} available.", 0))
             expect {
               provider.install
             }.to raise_error(Puppet::Error, "Could not find package #{name}")

data/spec/spec_helper.rb

@@ -8,19 +8,18 @@ $LOAD_PATH.unshift File.join(dir, 'lib')
 # Don't want puppet getting the command line arguments for rake or autotest
 ARGV.clear
 
-# Stub out gettext's `_` method, which attempts to load translations.
-# Several of our mocks (mostly around file system interaction) are broken by
-# FastGettext's implementation of this method.
-def _(msg)
-  msg
-end
-
 begin
   require 'rubygems'
 rescue LoadError
 end
 
 require 'puppet'
+
+# Stub out gettext's `_` and `n_()` methods, which attempt to load translations.
+# Several of our mocks (mostly around file system interaction) are broken by
+# FastGettext's implementation of these methods.
+require 'puppet/gettext/stubs'
+
 gem 'rspec', '>=3.1.0'
 require 'rspec/expectations'
 require 'rspec/its'
@@ -28,7 +27,7 @@ require 'rspec/collection_matchers'
 
 # So everyone else doesn't have to include this base constant.
 module PuppetSpec
-  FIXTURE_DIR = File.join(dir = File.expand_path(File.dirname(__FILE__)), "fixtures") unless defined?(FIXTURE_DIR)
+  FIXTURE_DIR = File.join(File.expand_path(File.dirname(__FILE__)), "fixtures") unless defined?(FIXTURE_DIR)
 end
 
 require 'pathname'
@@ -113,12 +112,6 @@ RSpec.configure do |config|
     # some platforms *cough* windows *cough* that are a little slower.
     GC.disable
 
-    # REVISIT: I think this conceals other bad tests, but I don't have time to
-    # fully diagnose those right now.  When you read this, please come tell me
-    # I suck for letting this float. --daniel 2011-04-21
-    Signal.stubs(:trap)
-
-
     # TODO: in a more sane world, we'd move this logging redirection into our TestHelper class.
     #  Without doing so, external projects will all have to roll their own solution for
     #  redirecting logging, and for validating expected log messages.  However, because the

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, nil).returns client
+    AgentTestClient.expects(:new).with(transaction_uuid, nil).returns client
 
     client.expects(:run)
 
@@ -77,7 +77,7 @@ describe Puppet::Agent do
   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
+    AgentTestClient.expects(:new).with(anything, job_id).returns client
 
     client.expects(:run)
 
@@ -184,7 +184,7 @@ describe Puppet::Agent do
       expect(@agent.run).to eq(:result)
     end
 
-    describe "when should_fork is true", :if => Puppet.features.posix? do
+    describe "when should_fork is true", :if => Puppet.features.posix? && RUBY_PLATFORM != 'java' do
       before do
         @agent = Puppet::Agent.new(AgentTestClient, true)
 
@@ -217,6 +217,17 @@ describe Puppet::Agent do
         @agent.run
       end
 
+      it 'should exit with 1 if an exception is raised' do
+        client = AgentTestClient.new
+        AgentTestClient.expects(:new).returns client
+
+        client.expects(:run).raises(StandardError)
+
+        Kernel.expects(:fork).yields
+        @agent.expects(:exit).with(1)
+        @agent.run
+      end
+
       it "should re-raise exit happening in the child" do
         Process.stubs(:waitpid2).returns [123, (stub 'process::status', :exitstatus => -1)]
         expect { @agent.run }.to raise_error(SystemExit)
@@ -241,12 +252,45 @@ describe Puppet::Agent do
       end
     end
 
-    describe "on Windows", :if => Puppet.features.microsoft_windows? do
+    describe "on Windows", :if => Puppet::Util::Platform.windows? do
       it "should never fork" do
         agent = Puppet::Agent.new(AgentTestClient, true)
         expect(agent.should_fork).to be_falsey
       end
     end
+
+    describe 'when runtimeout is set' do
+      before(:each) do
+        Puppet[:runtimeout] = 1
+      end
+
+      it 'times out when a run exceeds the set limit' do
+        client = AgentTestClient.new
+        client.instance_eval do
+          # Stub methods used to set test expectations.
+          def processing; end
+          def handling; end
+
+          def run(client_options = {})
+            # Simulate a hanging agent operation that also traps errors.
+            begin
+              ::Kernel.sleep(5)
+              processing()
+            rescue
+              handling()
+            end
+          end
+        end
+
+        AgentTestClient.expects(:new).returns client
+
+        client.expects(:processing).never
+        client.expects(:handling).never
+        Puppet.expects(:log_exception).with(instance_of(Puppet::Agent::RunTimeoutError), anything)
+
+        expect(@agent.run).to eq(1)
+      end
+    end
   end
 
   describe "when checking execution state" do

data/spec/unit/application/agent_spec.rb

@@ -3,7 +3,6 @@ require 'spec_helper'
 
 require 'puppet/agent'
 require 'puppet/application/agent'
-require 'puppet/network/server'
 require 'puppet/daemon'
 
 describe Puppet::Application::Agent do
@@ -271,7 +270,7 @@ describe Puppet::Application::Agent do
     end
 
     it "should print puppet config if asked to in Puppet config" do
-      Puppet[:configprint] = "pluginsync"
+      Puppet[:configprint] = "plugindest"
       Puppet.settings.expects(:print_configs).returns true
       expect { execute_agent }.to exit_with 0
     end
@@ -291,15 +290,9 @@ describe Puppet::Application::Agent do
       @puppetd.setup
     end
 
-    it "should install a remote ca location" do
-      Puppet::SSL::Host.expects(:ca_location=).with(:remote)
-
-      @puppetd.setup
-    end
-
-    it "should install a none ca location in fingerprint mode" do
+    it "should setup an agent in fingerprint mode" do
       @puppetd.options[:fingerprint] = true
-      Puppet::SSL::Host.expects(:ca_location=).with(:none)
+      @puppetd.expects(:setup_agent).never
 
       @puppetd.setup
     end
@@ -350,15 +343,6 @@ describe Puppet::Application::Agent do
       @puppetd.setup
     end
 
-    it "should set catalog cache class to nil during a noop run" do
-      Puppet[:catalog_cache_terminus] = "json"
-      Puppet[:noop] = true
-      Puppet::Resource::Catalog.indirection.expects(:cache_class=).with(nil)
-
-      @puppetd.initialize_app_defaults
-      @puppetd.setup
-    end
-
     it "should default facts_terminus setting to 'facter'" do
       @puppetd.initialize_app_defaults
       expect(Puppet[:facts_terminus]).to eq(:facter)
@@ -414,8 +398,9 @@ describe Puppet::Application::Agent do
     end
 
     it "should daemonize if needed" do
-      Puppet.features.stubs(:microsoft_windows?).returns false
+      Puppet::Util::Platform.stubs(:windows?).returns false
       Puppet[:daemonize] = true
+      Signal.stubs(:trap)
 
       @daemon.expects(:daemonize)
 

data/spec/unit/application/apply_spec.rb

@@ -419,10 +419,11 @@ describe Puppet::Application::Apply do
         @tempfile.path
       end
 
+      let(:default_format) { Puppet::Resource::Catalog.default_format }
       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(:json,'"something"').returns(catalog)
+        Puppet::Resource::Catalog.stubs(:convert_from).with(default_format, '"something"').returns(catalog)
         @apply.apply
       end
 
@@ -430,7 +431,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(:json,'"something"').returns(catalog)
+        Puppet::Resource::Catalog.stubs(:convert_from).with(default_format, '"something"').returns(catalog)
         @apply.apply
       end
 
@@ -450,7 +451,7 @@ describe Puppet::Application::Apply do
       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(:json,'"something"').returns catalog
+        Puppet::Resource::Catalog.stubs(:convert_from).with(default_format, '"something"').returns catalog
         catalog.expects(:to_ral).returns "mycatalog"
 
         configurer = stub 'configurer'
@@ -493,13 +494,4 @@ describe Puppet::Application::Apply do
     @apply.initialize_app_defaults
     @apply.setup
   end
-
-  it "should set catalog cache class to nil during a noop run" do
-    Puppet[:catalog_cache_terminus] = "json"
-    Puppet[:noop] = true
-    Puppet::Resource::Catalog.indirection.expects(:cache_class=).with(nil)
-
-    @apply.initialize_app_defaults
-    @apply.setup
-  end
 end

data/spec/unit/application/config_spec.rb

@@ -6,4 +6,8 @@ describe Puppet::Application::Config do
   it "should be a subclass of Puppet::Application::FaceBase" do
     expect(Puppet::Application::Config.superclass).to equal(Puppet::Application::FaceBase)
   end
+
+  it "should set `environment_mode` to :not_required" do
+    expect(Puppet::Application::Config.get_environment_mode).to equal(:not_required)
+  end
 end

data/spec/unit/application/device_spec.rb

@@ -5,6 +5,7 @@ require 'puppet/application/device'
 require 'puppet/util/network_device/config'
 require 'ostruct'
 require 'puppet/configurer'
+require 'puppet/application/apply'
 
 describe Puppet::Application::Device do
   include PuppetSpec::Files
@@ -127,13 +128,29 @@ describe Puppet::Application::Device do
       expect(@device.args[:Port]).to eq("42")
     end
 
+    it "should store the target options with --target" do
+      @device.options.expects(:[]=).with(:target,'test123')
+
+      @device.handle_target('test123')
+    end
+
+    it "should store the resource options with --resource" do
+      @device.options.expects(:[]=).with(:resource,true)
+
+      @device.handle_resource(true)
+    end
+
+    it "should store the facts options with --facts" do
+      @device.options.expects(:[]=).with(:facts,true)
+
+      @device.handle_facts(true)
+    end
   end
 
   describe "during setup" do
     before :each do
       @device.options.stubs(:[])
       Puppet[:libdir] = "/dev/null/lib"
-      Puppet::SSL::Host.stubs(:ca_location=)
       Puppet::Transaction::Report.indirection.stubs(:terminus_class=)
       Puppet::Resource::Catalog.indirection.stubs(:terminus_class=)
       Puppet::Resource::Catalog.indirection.stubs(:cache_class=)
@@ -201,12 +218,6 @@ describe Puppet::Application::Device do
       @device.setup
     end
 
-    it "should install a remote ca location" do
-      Puppet::SSL::Host.expects(:ca_location=).with(:remote)
-
-      @device.setup
-    end
-
     it "should tell the report handler to use REST" do
       Puppet::Transaction::Report.indirection.expects(:terminus_class=).with(:rest)
 
@@ -277,7 +288,12 @@ describe Puppet::Application::Device do
       Puppet.stubs(:notice)
       @device.options.stubs(:[]).with(:detailed_exitcodes).returns(false)
       @device.options.stubs(:[]).with(:target).returns(nil)
+      @device.options.stubs(:[]).with(:apply).returns(nil)
+      @device.options.stubs(:[]).with(:facts).returns(false)
+      @device.options.stubs(:[]).with(:resource).returns(false)
+      @device.options.stubs(:[]).with(:to_yaml).returns(false)
       @device.options.stubs(:[]).with(:client)
+      @device.command_line.stubs(:args).returns([])
       Puppet::Util::NetworkDevice::Config.stubs(:devices).returns({})
     end
 
@@ -286,6 +302,16 @@ describe Puppet::Application::Device do
       @device.run_command
     end
 
+    it "should exit if resource is requested without target" do
+      @device.options.stubs(:[]).with(:resource).returns(true)
+      expect { @device.main }.to raise_error(RuntimeError, "resource command requires target")
+    end
+
+    it "should exit if facts is requested without target" do
+      @device.options.stubs(:[]).with(:facts).returns(true)
+      expect { @device.main }.to raise_error(RuntimeError, "facts command requires target")
+    end
+
     it "should get the device list" do
       device_hash = stub_everything 'device hash'
       Puppet::Util::NetworkDevice::Config.expects(:devices).returns(device_hash)
@@ -301,8 +327,8 @@ describe Puppet::Application::Device do
       }
 
       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
+      URI.expects(:parse).with("ssh://user:pass@testhost")
+      URI.expects(:parse).with("https://user:pass@testhost/some/path").never
       expect { @device.main }.to exit_with 1
     end
 
@@ -314,7 +340,55 @@ describe Puppet::Application::Device do
 
       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 raise_error(RuntimeError, /Target device \/ certificate 'bla' not found in .*\.conf/)
+    end
+
+    it "should error if target is passed and the apply path is incorrect" do
+      @device.options.stubs(:[]).with(:apply).returns('file.pp')
+      @device.options.stubs(:[]).with(:target).returns('device1')
+
+      File.expects(:file?).returns(false)
+      expect { @device.main }.to raise_error(RuntimeError, /does not exist, cannot apply/)
+    end
+
+    it "should run an apply, and not create the state folder" do
+      @device.options.stubs(:[]).with(:apply).returns('file.pp')
+      @device.options.stubs(:[]).with(:target).returns('device1')
+      device_hash = {
+        "device1" => OpenStruct.new(:name => "device1", :url => "ssh://user:pass@testhost", :provider => "cisco"),
+      }
+      Puppet::Util::NetworkDevice::Config.expects(:devices).returns(device_hash)
+      Puppet::Util::NetworkDevice.stubs(:init)
+      File.expects(:file?).returns(true)
+
+      ::File.stubs(:directory?).returns false
+      state_path = tmpfile('state')
+      Puppet[:statedir] = state_path
+      File.expects(:directory?).with(state_path).returns true
+      FileUtils.expects(:mkdir_p).with(state_path).never
+
+      Puppet::Util::CommandLine.expects(:new).once
+      Puppet::Application::Apply.expects(:new).once
+
+      Puppet::Configurer.expects(:new).never
+      expect { @device.main }.to exit_with 1
+    end
+
+    it "should run an apply, and create the state folder" do
+      @device.options.stubs(:[]).with(:apply).returns('file.pp')
+      @device.options.stubs(:[]).with(:target).returns('device1')
+      device_hash = {
+        "device1" => OpenStruct.new(:name => "device1", :url => "ssh://user:pass@testhost", :provider => "cisco"),
+      }
+      Puppet::Util::NetworkDevice::Config.expects(:devices).returns(device_hash)
+      Puppet::Util::NetworkDevice.stubs(:init)
+      File.expects(:file?).returns(true)
+      FileUtils.expects(:mkdir_p).once
+
+      Puppet::Util::CommandLine.expects(:new).once
+      Puppet::Application::Apply.expects(:new).once
+
+      Puppet::Configurer.expects(:new).never
       expect { @device.main }.to exit_with 1
     end
 
@@ -356,6 +430,63 @@ describe Puppet::Application::Device do
         expect { @device.main }.to exit_with 1
       end
 
+      it "should raise an error if no type is given" do
+        @device.options.stubs(:[]).with(:resource).returns(true)
+        @device.options.stubs(:[]).with(:target).returns('device1')
+        @device.command_line.stubs(:args).returns([])
+        Puppet.expects(:log_exception).with {|e| e.message == "You must specify the type to display"}
+        expect { @device.main }.to exit_with 1
+      end
+
+      it "should raise an error if the type is not found" do
+        @device.options.stubs(:[]).with(:resource).returns(true)
+        @device.options.stubs(:[]).with(:target).returns('device1')
+        @device.command_line.stubs(:args).returns(['nope'])
+        Puppet.expects(:log_exception).with {|e| e.message == "Could not find type nope"}
+        expect { @device.main }.to exit_with 1
+      end
+
+      it "should retrieve all resources of a type" do
+        @device.options.stubs(:[]).with(:resource).returns(true)
+        @device.options.stubs(:[]).with(:target).returns('device1')
+        @device.command_line.stubs(:args).returns(['user'])
+        Puppet::Resource.indirection.expects(:search).with('user/', {}).returns([])
+        expect { @device.main }.to exit_with 0
+      end
+
+      it "should retrieve named resources of a type" do
+        resource = Puppet::Type.type(:user).new(:name => "jim").to_resource
+        @device.options.stubs(:[]).with(:resource).returns(true)
+        @device.options.stubs(:[]).with(:target).returns('device1')
+        @device.command_line.stubs(:args).returns(['user', 'jim'])
+        Puppet::Resource.indirection.expects(:find).with('user/jim').returns(resource)
+        @device.expects(:puts).with("user { 'jim':\n}")
+        expect { @device.main }.to exit_with 0
+      end
+
+      it "should output resources as YAML" do
+        resources = [
+          Puppet::Type.type(:user).new(:name => "title").to_resource,
+        ]
+        @device.options.stubs(:[]).with(:resource).returns(true)
+        @device.options.stubs(:[]).with(:target).returns('device1')
+        @device.options.stubs(:[]).with(:to_yaml).returns(true)
+        @device.command_line.stubs(:args).returns(['user'])
+        Puppet::Resource.indirection.expects(:search).with('user/', {}).returns(resources)
+        @device.expects(:puts).with("user:\n  title:\n")
+        expect { @device.main }.to exit_with 0
+      end
+
+      it "should retrieve facts" do
+        indirection_fact_values = {"operatingsystem"=>"cisco_ios","clientcert"=>"3750"}
+        indirection_facts = Puppet::Node::Facts.new("nil", indirection_fact_values)
+        @device.options.stubs(:[]).with(:facts).returns(true)
+        @device.options.stubs(:[]).with(:target).returns('device1')
+        Puppet::Node::Facts.indirection.expects(:find).with(nil, anything()).returns(indirection_facts)
+        @device.expects(:puts).with(regexp_matches(/name.*3750.*\n.*values.*\n.*operatingsystem.*cisco_ios/))
+        expect { @device.main }.to exit_with 0
+      end
+
       it "should make sure all the required folders and files are created" do
         Puppet.settings.expects(:use).with(:main, :agent, :ssl).twice
         expect { @device.main }.to exit_with 1