puppet 6.0.10-x64-mingw32 → 6.1.0-x64-mingw32

data/spec/unit/application/config_spec.rb

@@ -1,3 +1,4 @@
+#! /usr/bin/env ruby
 require 'spec_helper'
 require 'puppet/application/config'
 

data/spec/unit/application/describe_spec.rb

@@ -1,3 +1,4 @@
+#! /usr/bin/env ruby
 require 'spec_helper'
 
 require 'puppet/application/describe'
@@ -21,7 +22,7 @@ describe Puppet::Application::Describe do
     end
 
     it "should store argument value when calling handle_#{option}" do
-      expect(@describe.options).to receive(:[]=).with("#{option}".to_sym, 'arg')
+      @describe.options.expects(:[]=).with("#{option}".to_sym, 'arg')
       @describe.send("handle_#{option}".to_sym, 'arg')
     end
   end
@@ -45,7 +46,7 @@ describe Puppet::Application::Describe do
 
   describe "during setup" do
     it "should collect arguments in options[:types]" do
-      allow(@describe.command_line).to receive(:args).and_return(['1','2'])
+      @describe.command_line.stubs(:args).returns(['1','2'])
       @describe.setup
 
       expect(@describe.options[:types]).to eq(['1','2'])
@@ -55,14 +56,14 @@ describe Puppet::Application::Describe do
   describe "when running" do
 
     before :each do
-      @typedoc = double('type_doc')
-      allow(TypeDoc).to receive(:new).and_return(@typedoc)
+      @typedoc = stub 'type_doc'
+      TypeDoc.stubs(:new).returns(@typedoc)
     end
 
     it "should call list_types if options list is set" do
       @describe.options[:list] = true
 
-      expect(@typedoc).to receive(:list_types)
+      @typedoc.expects(:list_types)
 
       @describe.run_command
     end
@@ -71,7 +72,7 @@ describe Puppet::Application::Describe do
       @describe.options[:list] = false
       @describe.options[:types] = ['type']
 
-      expect(@typedoc).to receive(:format_type).with('type', @describe.options)
+      @typedoc.expects(:format_type).with('type', @describe.options)
       @describe.run_command
     end
   end

data/spec/unit/application/device_spec.rb

@@ -1,601 +1,625 @@
+#! /usr/bin/env ruby
 require 'spec_helper'
 
-require 'ostruct'
-require 'puppet/application/apply'
 require 'puppet/application/device'
-require 'puppet/configurer'
 require 'puppet/util/network_device/config'
+require 'ostruct'
+require 'puppet/configurer'
+require 'puppet/application/apply'
 
 describe Puppet::Application::Device do
   include PuppetSpec::Files
 
-  let(:device) do
-    dev = Puppet::Application[:device]
-    allow(dev).to receive(:trap)
-    allow(Signal).to receive(:trap)
-    dev.preinit
-    dev
-  end
-  let(:ssl_host) { instance_double(Puppet::SSL::Host, 'ssl_host') }
-  let(:ssl_localhost) { instance_double(Puppet::SSL::Host, 'ssl_localhost') }
-
-  before do
-    allow(Puppet::Node::Facts.indirection).to receive(:terminus_class=)
-    allow(Puppet::Node.indirection).to receive(:cache_class=)
-    allow(Puppet::Node.indirection).to receive(:terminus_class=)
-    allow(Puppet::Resource::Catalog.indirection).to receive(:cache_class=)
-    allow(Puppet::Resource::Catalog.indirection).to receive(:terminus_class=)
-    allow(Puppet::Transaction::Report.indirection).to receive(:terminus_class=)
-
-    allow(Puppet::Util::Log).to receive(:newdestination)
-
-    allow(ssl_host).to receive(:wait_for_cert).and_return(nil)
-    allow(Puppet::SSL::Host).to receive(:new).with(instance_of(String), boolean).and_return(ssl_host)
-
-    allow(ssl_localhost).to receive(:generate)
-    allow(ssl_localhost).to receive(:certificate)
-    allow(ssl_localhost).to receive(:key)
-    allow(Puppet::SSL::Host).to receive(:new).with(no_args).and_return(ssl_localhost)
+  before :each do
+    @device = Puppet::Application[:device]
+    @device.preinit
+    Puppet::Util::Log.stubs(:newdestination)
+
+    Puppet::Node.indirection.stubs(:terminus_class=)
+    Puppet::Node.indirection.stubs(:cache_class=)
+    Puppet::Node::Facts.indirection.stubs(:terminus_class=)
   end
 
-  it "operates in agent run_mode" do
-    expect(device.class.run_mode.name).to eq(:agent)
+  it "should operate in agent run_mode" do
+    expect(@device.class.run_mode.name).to eq(:agent)
   end
 
-  it "declares a main command" do
-    expect(device).to respond_to(:main)
+  it "should declare a main command" do
+    expect(@device).to respond_to(:main)
   end
 
-  it "declares a preinit block" do
-    expect(device).to respond_to(:preinit)
+  it "should declare a preinit block" do
+    expect(@device).to respond_to(:preinit)
   end
 
   describe "in preinit" do
-    before do
+    before :each do
+      @device.stubs(:trap)
     end
 
-    it "catches INT" do
-      device
+    it "should catch INT" do
+      Signal.expects(:trap).with { |arg,block| arg == :INT }
 
-      expect(Signal).to have_received(:trap).with(:INT)
+      @device.preinit
     end
 
-    it "inits waitforcert to nil" do
-      expect(device.options[:waitforcert]).to be_nil
+    it "should init waitforcert to nil" do
+      @device.preinit
+
+      expect(@device.options[:waitforcert]).to be_nil
     end
 
-    it "inits target to nil" do
-      expect(device.options[:target]).to be_nil
+    it "should init target to nil" do
+      @device.preinit
+
+      expect(@device.options[:target]).to be_nil
     end
   end
 
   describe "when handling options" do
     before do
-      Puppet[:certname] = 'device.example.com'
-      allow(device.command_line).to receive(:args).and_return([])
+      @device.command_line.stubs(:args).returns([])
     end
 
     [:centrallogging, :debug, :verbose,].each do |option|
       it "should declare handle_#{option} method" do
-        expect(device).to respond_to("handle_#{option}".to_sym)
+        expect(@device).to respond_to("handle_#{option}".to_sym)
       end
 
       it "should store argument value when calling handle_#{option}" do
-        allow(device.options).to receive(:[]=).with(option, 'arg')
-        device.send("handle_#{option}".to_sym, 'arg')
+        @device.options.expects(:[]=).with(option, 'arg')
+        @device.send("handle_#{option}".to_sym, 'arg')
       end
     end
 
-    context 'when setting --onetime' do
-      before do
-        Puppet[:onetime] = true
-      end
-
-      context 'without --waitforcert' do
-        it "defaults waitforcert to 0" do
-          device.setup_host('device.example.com')
-
-          expect(ssl_host).to have_received(:wait_for_cert).with(0)
-        end
-      end
-
-      context 'with --waitforcert=60' do
-        it "uses supplied waitforcert" do
-          device.handle_waitforcert(60)
-          device.setup_host('device.example.com')
-
-          expect(ssl_host).to have_received(:wait_for_cert).with(60)
-        end
-      end
+    it "should set waitforcert to 0 with --onetime and if --waitforcert wasn't given" do
+      Puppet[:onetime] = true
+      Puppet::SSL::Host.any_instance.expects(:wait_for_cert).with(0)
+      @device.setup_host('device.example.com')
     end
 
-    context 'without setting --onetime' do
-      before do
-        Puppet[:onetime] = false
-      end
+    it "should use supplied waitforcert when --onetime is specified" do
+      Puppet[:onetime] = true
+      @device.handle_waitforcert(60)
+      Puppet::SSL::Host.any_instance.expects(:wait_for_cert).with(60)
+      @device.setup_host('device.example.com')
+    end
 
-      it "uses a default value for waitforcert when --onetime and --waitforcert are not specified" do
-        device.setup_host('device.example.com')
-        expect(ssl_host).to have_received(:wait_for_cert).with(120)
-      end
+    it "should use a default value for waitforcert when --onetime and --waitforcert are not specified" do
+      Puppet::SSL::Host.any_instance.expects(:wait_for_cert).with(120)
+      @device.setup_host('device.example.com')
+    end
 
-      it "uses the waitforcert setting when checking for a signed certificate" do
-        Puppet[:waitforcert] = 10
-        device.setup_host('device.example.com')
-        expect(ssl_host).to have_received(:wait_for_cert).with(10)
-      end
+    it "should use the waitforcert setting when checking for a signed certificate" do
+      Puppet[:waitforcert] = 10
+      Puppet::SSL::Host.any_instance.expects(:wait_for_cert).with(10)
+      @device.setup_host('device.example.com')
     end
 
-    it "sets the log destination with --logdest" do
-      allow(device.options).to receive(:[]=).with(:setdest, anything)
-      expect(Puppet::Log).to receive(:newdestination).with("console")
+    it "should set the log destination with --logdest" do
+      @device.options.stubs(:[]=).with { |opt,val| opt == :setdest }
+      Puppet::Log.expects(:newdestination).with("console")
 
-      device.handle_logdest("console")
+      @device.handle_logdest("console")
     end
 
-    it "puts the setdest options to true" do
-      expect(device.options).to receive(:[]=).with(:setdest, true)
+    it "should put the setdest options to true" do
+      @device.options.expects(:[]=).with(:setdest,true)
 
-      device.handle_logdest("console")
+      @device.handle_logdest("console")
     end
 
-    it "parses the log destination from the command line" do
-      allow(device.command_line).to receive(:args).and_return(%w{--logdest /my/file})
+    it "should parse the log destination from the command line" do
+      @device.command_line.stubs(:args).returns(%w{--logdest /my/file})
 
-      expect(Puppet::Util::Log).to receive(:newdestination).with("/my/file")
+      Puppet::Util::Log.expects(:newdestination).with("/my/file")
 
-      device.parse_options
+      @device.parse_options
     end
 
-    it "stores the waitforcert options with --waitforcert" do
-      expect(device.options).to receive(:[]=).with(:waitforcert,42)
+    it "should store the waitforcert options with --waitforcert" do
+      @device.options.expects(:[]=).with(:waitforcert,42)
 
-      device.handle_waitforcert("42")
+      @device.handle_waitforcert("42")
     end
 
-    it "sets args[:Port] with --port" do
-      device.handle_port("42")
-      expect(device.args[:Port]).to eq("42")
+    it "should set args[:Port] with --port" do
+      @device.handle_port("42")
+      expect(@device.args[:Port]).to eq("42")
     end
 
-    it "stores the target options with --target" do
-      expect(device.options).to receive(:[]=).with(:target,'test123')
+    it "should store the target options with --target" do
+      @device.options.expects(:[]=).with(:target,'test123')
 
-      device.handle_target('test123')
+      @device.handle_target('test123')
     end
 
-    it "stores the resource options with --resource" do
-      expect(device.options).to receive(:[]=).with(:resource,true)
+    it "should store the resource options with --resource" do
+      @device.options.expects(:[]=).with(:resource,true)
 
-      device.handle_resource(true)
+      @device.handle_resource(true)
     end
 
-    it "stores the facts options with --facts" do
-      expect(device.options).to receive(:[]=).with(:facts,true)
+    it "should store the facts options with --facts" do
+      @device.options.expects(:[]=).with(:facts,true)
 
-      device.handle_facts(true)
+      @device.handle_facts(true)
     end
   end
 
   describe "during setup" do
-    before do
-      allow(device.options).to receive(:[])
+    before :each do
+      @device.options.stubs(:[])
       Puppet[:libdir] = "/dev/null/lib"
+      Puppet::Transaction::Report.indirection.stubs(:terminus_class=)
+      Puppet::Resource::Catalog.indirection.stubs(:terminus_class=)
+      Puppet::Resource::Catalog.indirection.stubs(:cache_class=)
+      Puppet::Node::Facts.indirection.stubs(:terminus_class=)
+      @host = stub_everything 'host'
+      Puppet::SSL::Host.stubs(:new).returns(@host)
+      Puppet.stubs(:settraps)
     end
 
-    it "calls setup_logs" do
-      expect(device).to receive(:setup_logs)
-      device.setup
+    it "should call setup_logs" do
+      @device.expects(:setup_logs)
+      @device.setup
     end
 
     describe "when setting up logs" do
-      before do
-        allow(Puppet::Util::Log).to receive(:newdestination)
+      before :each do
+        Puppet::Util::Log.stubs(:newdestination)
       end
 
-      it "sets log level to debug if --debug was passed" do
-        allow(device.options).to receive(:[]).with(:debug).and_return(true)
-        device.setup_logs
+      it "should set log level to debug if --debug was passed" do
+        @device.options.stubs(:[]).with(:debug).returns(true)
+        @device.setup_logs
         expect(Puppet::Util::Log.level).to eq(:debug)
       end
 
-      it "sets log level to info if --verbose was passed" do
-        allow(device.options).to receive(:[]).with(:verbose).and_return(true)
-        device.setup_logs
+      it "should set log level to info if --verbose was passed" do
+        @device.options.stubs(:[]).with(:verbose).returns(true)
+        @device.setup_logs
         expect(Puppet::Util::Log.level).to eq(:info)
       end
 
       [:verbose, :debug].each do |level|
         it "should set console as the log destination with level #{level}" do
-          allow(device.options).to receive(:[]).with(level).and_return(true)
+          @device.options.stubs(:[]).with(level).returns(true)
 
-          expect(Puppet::Util::Log).to receive(:newdestination).with(:console)
+          Puppet::Util::Log.expects(:newdestination).with(:console)
 
-          device.setup_logs
+          @device.setup_logs
         end
       end
 
-      it "sets a default log destination if no --logdest" do
-        allow(device.options).to receive(:[]).with(:setdest).and_return(false)
+      it "should set a default log destination if no --logdest" do
+        @device.options.stubs(:[]).with(:setdest).returns(false)
 
-        expect(Puppet::Util::Log).to receive(:setup_default)
+        Puppet::Util::Log.expects(:setup_default)
 
-        device.setup_logs
+        @device.setup_logs
       end
+
     end
 
-    it "sets a central log destination with --centrallogs" do
-      allow(device.options).to receive(:[]).with(:centrallogs).and_return(true)
-      Puppet[:server] = "puppet.example.com"
-      allow(Puppet::Util::Log).to receive(:newdestination).with(:syslog)
+    it "should set a central log destination with --centrallogs" do
+      @device.options.stubs(:[]).with(:centrallogs).returns(true)
+      Puppet[:server] = "puppet.reductivelabs.com"
+      Puppet::Util::Log.stubs(:newdestination).with(:syslog)
 
-      expect(Puppet::Util::Log).to receive(:newdestination).with("puppet.example.com")
+      Puppet::Util::Log.expects(:newdestination).with("puppet.reductivelabs.com")
 
-      device.setup
+      @device.setup
     end
 
-    it "uses :main, :agent, :device and :ssl config" do
-      expect(Puppet.settings).to receive(:use).with(:main, :agent, :device, :ssl)
+    it "should use :main, :agent, :device and :ssl config" do
+      Puppet.settings.expects(:use).with(:main, :agent, :device, :ssl)
 
-      device.setup
+      @device.setup
     end
 
-    it "tells the report handler to use REST" do
-      device.setup
-      expect(Puppet::Transaction::Report.indirection).to have_received(:terminus_class=).with(:rest)
+    it "should tell the report handler to use REST" do
+      Puppet::Transaction::Report.indirection.expects(:terminus_class=).with(:rest)
+
+      @device.setup
     end
 
-    it "defaults the catalog_terminus setting to 'rest'" do
-      device.initialize_app_defaults
+    it "should default the catalog_terminus setting to 'rest'" do
+      @device.initialize_app_defaults
       expect(Puppet[:catalog_terminus]).to eq(:rest)
     end
 
-    it "defaults the node_terminus setting to 'rest'" do
-      device.initialize_app_defaults
+    it "should default the node_terminus setting to 'rest'" do
+      @device.initialize_app_defaults
       expect(Puppet[:node_terminus]).to eq(:rest)
     end
 
     it "has an application default :catalog_cache_terminus setting of 'json'" do
-      expect(Puppet::Resource::Catalog.indirection).to receive(:cache_class=).with(:json)
+      Puppet::Resource::Catalog.indirection.expects(:cache_class=).with(:json)
 
-      device.initialize_app_defaults
-      device.setup
+      @device.initialize_app_defaults
+      @device.setup
     end
 
-    it "tells the catalog cache class based on the :catalog_cache_terminus setting" do
+    it "should tell the catalog cache class based on the :catalog_cache_terminus setting" do
       Puppet[:catalog_cache_terminus] = "yaml"
-      expect(Puppet::Resource::Catalog.indirection).to receive(:cache_class=).with(:yaml)
+      Puppet::Resource::Catalog.indirection.expects(:cache_class=).with(:yaml)
 
-      device.initialize_app_defaults
-      device.setup
+      @device.initialize_app_defaults
+      @device.setup
     end
 
-    it "does not set catalog cache class if :catalog_cache_terminus is explicitly nil" do
+    it "should not set catalog cache class if :catalog_cache_terminus is explicitly nil" do
       Puppet[:catalog_cache_terminus] = nil
-      expect(Puppet::Resource::Catalog.indirection).not_to receive(:cache_class=)
+      Puppet::Resource::Catalog.indirection.expects(:cache_class=).never
 
-      device.initialize_app_defaults
-      device.setup
+      @device.initialize_app_defaults
+      @device.setup
     end
 
-    it "defaults the facts_terminus setting to 'network_device'" do
-      device.initialize_app_defaults
+    it "should default the facts_terminus setting to 'network_device'" do
+      @device.initialize_app_defaults
       expect(Puppet[:facts_terminus]).to eq(:network_device)
     end
   end
 
-  describe "when initializing SSL" do
-    context 'with one host' do
-      it "creates a new ssl host" do
-        device.setup_host('device.example.com')
+  describe "when initializing each devices SSL" do
+    before(:each) do
+      @host = stub_everything 'host'
+      Puppet::SSL::Host.stubs(:new).returns(@host)
+    end
 
-        expect(Puppet::SSL::Host).to have_received(:new).with('device.example.com', true)
-      end
+    it "should create a new ssl host" do
+      Puppet::SSL::Host.expects(:new).returns(@host)
+      @device.setup_host('device.example.com')
+    end
 
-      it "waits for a certificate" do
-        allow(device.options).to receive(:[]).with(:waitforcert).and_return(123)
+    it "should wait for a certificate" do
+      @device.options.stubs(:[]).with(:waitforcert).returns(123)
+      @host.expects(:wait_for_cert).with(123)
 
-        device.setup_host('device.example.com')
-        expect(ssl_host).to have_received(:wait_for_cert).with(123)
-      end
+      @device.setup_host('device.example.com')
     end
   end
 
   describe "when running" do
-    let(:device_hash) { {} }
-    let(:plugin_handler) { instance_double(Puppet::Configurer::PluginHandler, 'plugin_handler') }
-
-    before do
-      allow(device.options).to receive(:[]).with(:fingerprint).and_return(false)
-      allow(Puppet).to receive(:notice)
-      allow(device.options).to receive(:[]).with(:detailed_exitcodes).and_return(false)
-      allow(device.options).to receive(:[]).with(:target).and_return(nil)
-      allow(device.options).to receive(:[]).with(:apply).and_return(nil)
-      allow(device.options).to receive(:[]).with(:facts).and_return(false)
-      allow(device.options).to receive(:[]).with(:resource).and_return(false)
-      allow(device.options).to receive(:[]).with(:to_yaml).and_return(false)
-      allow(device.options).to receive(:[]).with(:libdir).and_return(nil)
-      allow(device.options).to receive(:[]).with(:client)
-      allow(device.command_line).to receive(:args).and_return([])
-      allow(Puppet::Util::NetworkDevice::Config).to receive(:devices).and_return(device_hash)
-      allow(Puppet::Configurer::PluginHandler).to receive(:new).and_return(plugin_handler)
+    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(: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(:libdir).returns(nil)
+      @device.options.stubs(:[]).with(:client)
+      @device.command_line.stubs(:args).returns([])
+      Puppet::Util::NetworkDevice::Config.stubs(:devices).returns({})
     end
 
-    it "dispatches to main" do
-      allow(device).to receive(:main)
-      device.run_command
+    it "should dispatch to main" do
+      @device.stubs(:main)
+      @device.run_command
     end
 
-    it "errors if resource is requested without target" do
-      allow(device.options).to receive(:[]).with(:resource).and_return(true)
-      expect { device.main }.to raise_error(RuntimeError, "resource command requires target")
+    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 "errors if facts is requested without target" do
-      allow(device.options).to receive(:[]).with(:facts).and_return(true)
-      expect { device.main }.to raise_error(RuntimeError, "facts command requires target")
+    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 "gets the device list" do
-      expect(Puppet::Util::NetworkDevice::Config).to receive(:devices).and_return(device_hash)
-      expect { device.main }.to exit_with 1
+    it "should get the device list" do
+      device_hash = stub_everything 'device hash'
+      Puppet::Util::NetworkDevice::Config.expects(:devices).returns(device_hash)
+      expect { @device.main }.to exit_with 1
     end
 
-    it "errors when an invalid target parameter is passed" do
-      allow(device.options).to receive(:[]).with(:target).and_return('bla')
-      expect(Puppet).not_to receive(:info).with(/starting applying configuration to/)
-      expect { device.main }.to raise_error(RuntimeError, /Target device \/ certificate 'bla' not found in .*\.conf/)
+    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)
+      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
 
-    it "errors if target is passed and the apply path is incorrect" do
-      allow(device.options).to receive(:[]).with(:apply).and_return('file.pp')
-      allow(device.options).to receive(:[]).with(:target).and_return('device1')
+    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"),
+      }
 
-      expect(File).to receive(:file?).and_return(false)
-      expect { device.main }.to raise_error(RuntimeError, /does not exist, cannot apply/)
+      Puppet::Util::NetworkDevice::Config.expects(:devices).returns(device_hash)
+      Puppet.expects(:info).with(regexp_matches(/starting applying configuration to/)).never
+      expect { @device.main }.to raise_error(RuntimeError, /Target device \/ certificate 'bla' not found in .*\.conf/)
     end
 
-    it "exits if the device list is empty" do
-      expect { device.main }.to exit_with 1
+    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
 
-    context 'with some devices configured' do
-      let(:configurer) { instance_double(Puppet::Configurer, 'configurer') }
-      let(: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"),
-        }
+    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)
 
-      before do
-        Puppet[:vardir] = make_absolute("/dummy")
-        Puppet[:confdir] = make_absolute("/dummy")
-        Puppet[:certname] = "certname"
+      ::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
 
-        allow(Puppet).to receive(:[]=)
-        allow(Puppet.settings).to receive(:use)
+      Puppet::Util::CommandLine.expects(:new).once
+      Puppet::Application::Apply.expects(:new).once
 
-        allow(device).to receive(:setup_host)
-        allow(Puppet::Util::NetworkDevice).to receive(:init)
+      Puppet::Configurer.expects(:new).never
+      expect { @device.main }.to exit_with 1
+    end
 
-        allow(configurer).to receive(:run)
-        allow(Puppet::Configurer).to receive(:new).and_return(configurer)
+    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
 
-        allow(plugin_handler).to receive(:download_plugins)
-      end
+      Puppet::Util::CommandLine.expects(:new).once
+      Puppet::Application::Apply.expects(:new).once
 
-      it "sets vardir to the device vardir" do
-        expect(Puppet).to receive(:[]=).with(:vardir, make_absolute("/dummy/devices/device1"))
-        expect { device.main }.to exit_with 1
-      end
+      Puppet::Configurer.expects(:new).never
+      expect { @device.main }.to exit_with 1
+    end
 
-      it "sets confdir to the device confdir" do
-        expect(Puppet).to receive(:[]=).with(:confdir, make_absolute("/dummy/devices/device1"))
-        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
 
-      it "sets certname to the device certname" do
-        expect(Puppet).to receive(:[]=).with(:certname, "device1")
-        expect(Puppet).to receive(:[]=).with(:certname, "device2")
-        expect { device.main }.to exit_with 1
+    describe "for each device" do
+      before(:each) do
+        Puppet[:vardir] = make_absolute("/dummy")
+        Puppet[:confdir] = make_absolute("/dummy")
+        Puppet[:certname] = "certname"
+        @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.stubs(:devices).returns(@device_hash)
+        Puppet.stubs(:[]=)
+        Puppet.settings.stubs(:use)
+        @device.stubs(:setup_host)
+        Puppet::Util::NetworkDevice.stubs(:init)
+        @configurer = stub_everything 'configurer'
+        Puppet::Configurer.stubs(:new).returns(@configurer)
       end
 
-      context 'with --target=device1' do
-        it "manages the specified target" do
-          allow(device.options).to receive(:[]).with(:target).and_return('device1')
-
-          expect(URI).to receive(:parse).with("ssh://user:pass@testhost")
-          expect(URI).not_to receive(:parse).with("https://user:pass@testhost/some/path")
-          expect { device.main }.to exit_with 1
-        end
+      it "should set vardir to the device vardir" do
+        Puppet.expects(:[]=).with(:vardir, make_absolute("/dummy/devices/device1"))
+        expect { @device.main }.to exit_with 1
       end
 
-      context 'when running --resource' do
-        before do
-          allow(device.options).to receive(:[]).with(:resource).and_return(true)
-          allow(device.options).to receive(:[]).with(:target).and_return('device1')
-        end
+      it "should set confdir to the device confdir" do
+        Puppet.expects(:[]=).with(:confdir, make_absolute("/dummy/devices/device1"))
+        expect { @device.main }.to exit_with 1
+      end
 
-        it "raises an error if no type is given" do
-          allow(device.command_line).to receive(:args).and_return([])
-          expect(Puppet).to receive(:log_exception) { |e| expect(e.message).to eq("You must specify the type to display") }
-          expect { device.main }.to exit_with 1
-        end
+      it "should set certname to the device certname" do
+        Puppet.expects(:[]=).with(:certname, "device1")
+        Puppet.expects(:[]=).with(:certname, "device2")
+        expect { @device.main }.to exit_with 1
+      end
 
-        it "raises an error if the type is not found" do
-          allow(device.command_line).to receive(:args).and_return(['nope'])
-          expect(Puppet).to receive(:log_exception) { |e| expect(e.message).to eq("Could not find type nope") }
-          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 "retrieves all resources of a type" do
-          allow(device.command_line).to receive(:args).and_return(['user'])
-          expect(Puppet::Resource.indirection).to receive(:search).with('user/', {}).and_return([])
-          expect { device.main }.to exit_with 0
-        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 "retrieves named resources of a type" do
-          resource = Puppet::Type.type(:user).new(:name => "jim").to_resource
-          allow(device.command_line).to receive(:args).and_return(['user', 'jim'])
-          expect(Puppet::Resource.indirection).to receive(:find).with('user/jim').and_return(resource)
-          expect(device).to receive(:puts).with("user { 'jim':\n}")
-          expect { device.main }.to exit_with 0
-        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 "outputs resources as YAML" do
-          resources = [
-            Puppet::Type.type(:user).new(:name => "title").to_resource,
-          ]
-          allow(device.options).to receive(:[]).with(:to_yaml).and_return(true)
-          allow(device.command_line).to receive(:args).and_return(['user'])
-          expect(Puppet::Resource.indirection).to receive(:search).with('user/', {}).and_return(resources)
-          expect(device).to receive(:puts).with("user:\n  title:\n")
-          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
 
-      context 'when running --facts' do
-        before do
-          allow(device.options).to receive(:[]).with(:facts).and_return(true)
-          allow(device.options).to receive(:[]).with(:target).and_return('device1')
-        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 "retrieves facts" do
-          indirection_fact_values = {"operatingsystem"=>"cisco_ios","clientcert"=>"3750"}
-          indirection_facts = Puppet::Node::Facts.new("nil", indirection_fact_values)
-          expect(Puppet::Node::Facts.indirection).to receive(:find).with(nil, anything()).and_return(indirection_facts)
-          expect(device).to receive(:puts).with(/name.*3750.*\n.*values.*\n.*operatingsystem.*cisco_ios/)
-          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
 
-      context 'when running in agent mode' do
-        it "makes sure all the required folders and files are created" do
-          expect(Puppet.settings).to receive(:use).with(:main, :agent, :ssl).twice
-          expect { device.main }.to exit_with 1
-        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
+      end
 
-        it "initializes the device singleton" do
-          expect(Puppet::Util::NetworkDevice).to receive(:init).with(device_hash["device1"]).ordered
-          expect(Puppet::Util::NetworkDevice).to receive(:init).with(device_hash["device2"]).ordered
-          expect { device.main }.to exit_with 1
-        end
+      it "should initialize the device singleton" do
+        Puppet::Util::NetworkDevice.expects(:init).with(@device_hash["device1"]).then.with(@device_hash["device2"])
+        expect { @device.main }.to exit_with 1
+      end
 
-        it "retrieves plugins and print the device url scheme, host, and port" do
-          allow(Puppet).to receive(:info)
-          expect(plugin_handler).to receive(:download_plugins).twice
-          expect(Puppet).to receive(:info).with("starting applying configuration to device1 at ssh://testhost")
-          expect(Puppet).to receive(:info).with("starting applying configuration to device2 at https://testhost:443/some/path")
-          expect { device.main }.to exit_with 1
-        end
+      it "should retrieve plugins and print the device url scheme, host, and port" do
+        Puppet.stubs(:info)
+        Puppet.expects(:info).with "Retrieving pluginfacts"
+        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"
+        expect { @device.main }.to exit_with 1
+      end
 
-        it "setups the SSL context before pluginsync" do
-          expect(device).to receive(:setup_host).ordered
-          expect(plugin_handler).to receive(:download_plugins).ordered
-          expect(device).to receive(:setup_host).ordered
-          expect(plugin_handler).to receive(:download_plugins).ordered
-          expect { device.main }.to exit_with 1
-        end
+      it "should setup the SSL context" do
+        @device.expects(:setup_host).twice
+        expect { @device.main }.to exit_with 1
+      end
 
-        it "launches a configurer for this device" do
-          expect(configurer).to receive(:run).twice
-          expect { device.main }.to exit_with 1
-        end
+      it "should launch a configurer for this device" do
+        @configurer.expects(:run).twice
+        expect { @device.main }.to exit_with 1
+      end
 
-        it "exits 1 when configurer raises error" do
-          expect(configurer).to receive(:run).and_raise(Puppet::Error).ordered
-          expect(configurer).to receive(:run).and_return(0).ordered
-          expect { device.main }.to exit_with 1
-        end
+      it "exits 1 when configurer raises error" do
+        @configurer.stubs(:run).raises(Puppet::Error).then.returns(0)
+        expect { @device.main }.to exit_with 1
+      end
 
-        it "exits 0 when run happens without puppet errors but with failed run" do
-          allow(configurer).to receive(:run).and_return(6, 2)
-          expect { device.main }.to exit_with 0
-        end
+      it "exits 0 when run happens without puppet errors but with failed run" do
+        @configurer.stubs(:run).returns(6,2)
+        expect { @device.main }.to exit_with 0
+      end
 
-        it "makes the Puppet::Pops::Loaders available" do
-          expect(configurer).to receive(:run).with(:network_device => true, :pluginsync => false) do
-            fail('Loaders not available') unless Puppet.lookup(:loaders) { nil }.is_a?(Puppet::Pops::Loaders)
-            true
-          end.and_return(6, 2)
-          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
-          allow(device.options).to receive(:[]).with(:detailed_exitcodes).and_return(true)
-          allow(configurer).to receive(:run).and_return(0, 2)
-          expect { device.main }.to exit_with 2
-        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)
+        expect { @device.main }.to exit_with 2
+      end
 
-        it "exits 1 when --detailed-exitcodes and failed parse" do
-          allow(Puppet::Configurer).to receive(:new).and_return(configurer)
-          allow(device.options).to receive(:[]).with(:detailed_exitcodes).and_return(true)
-          allow(configurer).to receive(:run).and_return(6, 1)
-          expect { device.main }.to exit_with 7
-        end
+      it "exits 1 when --detailed-exitcodes and failed parse" do
+        @configurer = stub_everything 'configurer'
+        Puppet::Configurer.stubs(:new).returns(@configurer)
+        @device.options.stubs(:[]).with(:detailed_exitcodes).returns(true)
+        @configurer.stubs(:run).returns(6,1)
+        expect { @device.main }.to exit_with 7
+      end
 
-        it "exits 6 when --detailed-exitcodes and failed run" do
-          allow(Puppet::Configurer).to receive(:new).and_return(configurer)
-          allow(device.options).to receive(:[]).with(:detailed_exitcodes).and_return(true)
-          allow(configurer).to receive(:run).and_return(6, 2)
-          expect { device.main }.to exit_with 6
-        end
+      it "exits 6 when --detailed-exitcodes and failed run" do
+        @configurer = stub_everything 'configurer'
+        Puppet::Configurer.stubs(:new).returns(@configurer)
+        @device.options.stubs(:[]).with(:detailed_exitcodes).returns(true)
+        @configurer.stubs(:run).returns(6,2)
+        expect { @device.main }.to exit_with 6
+      end
 
-        [:vardir, :confdir].each do |setting|
-          it "resets the #{setting} setting after the run" do
-            all_devices = Set.new(device_hash.keys.map do |device_name| make_absolute("/dummy/devices/#{device_name}") end)
-            found_devices = Set.new()
+      [:vardir, :confdir].each do |setting|
+        it "should cleanup the #{setting} setting after the run" do
+          all_devices = Set.new(@device_hash.keys.map do |device_name| make_absolute("/dummy/devices/#{device_name}") end)
+          found_devices = Set.new()
 
-            # a block to use in a few places later to validate the updated settings
-            p = Proc.new do |my_setting, my_value|
-              expect(all_devices).to include(my_value)
+          # a block to use in a few places later to validate the updated settings
+          p = Proc.new do |my_setting, my_value|
+            if my_setting == setting && all_devices.include?(my_value)
               found_devices.add(my_value)
+              true
+            else
+              false
             end
+          end
 
-            all_devices.size.times do
-              ## one occurrence of set / run / set("/dummy") for each device
-              expect(Puppet).to receive(:[]=, &p).with(setting, anything).ordered
-              expect(configurer).to receive(:run).ordered
-              expect(Puppet).to receive(:[]=).with(setting, make_absolute("/dummy")).ordered
-            end
-
-            expect { device.main }.to exit_with 1
+          seq = sequence("clean up dirs")
 
-            expect(found_devices).to eq(all_devices)
+          all_devices.size.times do
+            ## one occurrence of set / run / set("/dummy") for each device
+            Puppet.expects(:[]=).with(&p).in_sequence(seq)
+            @configurer.expects(:run).in_sequence(seq)
+            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)
         end
+      end
 
-        it "resets the certname setting after the run" do
-          all_devices = Set.new(device_hash.keys)
-          found_devices = Set.new()
+      it "should cleanup the certname setting after the run" do
+        all_devices = Set.new(@device_hash.keys)
+        found_devices = Set.new()
 
-          # a block to use in a few places later to validate the updated settings
-          p = Proc.new do |my_setting, my_value|
-            expect(all_devices).to include(my_value)
+        # a block to use in a few places later to validate the updated settings
+        p = Proc.new do |my_setting, my_value|
+          if my_setting == :certname && all_devices.include?(my_value)
             found_devices.add(my_value)
+            true
+          else
+            false
           end
+        end
 
-          allow(Puppet).to receive(:[]=)
-          all_devices.size.times do
-            ## one occurrence of set / run / set("certname") for each device
-            expect(Puppet).to receive(:[]=, &p).with(:certname, anything).ordered
-            expect(configurer).to receive(:run).ordered
-            expect(Puppet).to receive(:[]=).with(:certname, "certname").ordered
-          end
+        seq = sequence("clean up certname")
 
+        all_devices.size.times do
+          ## one occurrence of set / run / set("certname") for each device
+          Puppet.expects(:[]=).with(&p).in_sequence(seq)
+          @configurer.expects(:run).in_sequence(seq)
+          Puppet.expects(:[]=).with(:certname, "certname").in_sequence(seq)
+        end
 
-          expect { device.main }.to exit_with 1
 
-          # make sure that we were called with each of the defined devices
-          expect(found_devices).to eq(all_devices)
-        end
+        expect { @device.main }.to exit_with 1
 
-        it "expires all cached attributes" do
-          expect(Puppet::SSL::Host).to receive(:reset).twice
+        # make sure that we were called with each of the defined devices
+        expect(found_devices).to eq(all_devices)
+      end
 
-          expect { device.main }.to exit_with 1
-        end
+      it "should expire all cached attributes" do
+        Puppet::SSL::Host.expects(:reset).twice
+
+        expect { @device.main }.to exit_with 1
       end
     end
   end