Merge branch 'master' into stable

* master:
  (FM-5240) Prevent powershell_manager DSC conflict
  (MODULES-2634) Verify try/catch with PowerShell module

Author: glennsarti

lib/puppet/provider/exec/powershell.rb

@@ -1,5 +1,5 @@
 require 'puppet/provider/exec'
-require_relative '../../../puppet_x/puppetlabs/powershell_manager'
+require_relative '../../../puppet_x/puppetlabs/powershell/powershell_manager'
 
 Puppet::Type.type(:exec).provide :powershell, :parent => Puppet::Provider::Exec do
   confine :operatingsystem => :windows

lib/puppet_x/puppetlabs/powershell_manager.rb renamed to lib/puppet_x/puppetlabs/powershell/powershell_manager.rb

@@ -87,7 +87,7 @@ def exit
       end
 
       def template_path
-        File.expand_path('../../templates', __FILE__)
+        File.expand_path('../../../templates', __FILE__)
       end
 
       def make_ps_code(powershell_code, output_ready_event_name, timeout_ms = 300 * 1000)

spec/acceptance/exec_powershell_spec.rb

@@ -34,6 +34,31 @@
 
   end
 
+  describe 'should handle a try/catch successfully' do
+
+    powershell_cmd = <<-CMD
+try{
+ $foo = ls
+ $count = $foo.count
+ $count
+}catch{
+ Write-Error "foo"
+}
+    CMD
+
+    p1 = <<-MANIFEST
+      exec{'TestPowershell':
+        command  => '#{powershell_cmd}',
+        provider  => powershell,
+      }
+    MANIFEST
+
+    it 'should not error' do
+      apply_manifest(p1, :expect_changes => true, :future_parser => FUTURE_PARSER)
+    end
+
+  end
+
   describe 'should run commands that exit session' do
 
     exit_pp = <<-MANIFEST

spec/integration/puppet_x/puppetlabs/powershell_manager_spec.rb

@@ -1,6 +1,6 @@
 require 'spec_helper'
 require 'puppet/type'
-require 'puppet_x/puppetlabs/powershell_manager'
+require 'puppet_x/puppetlabs/powershell/powershell_manager'
 
 module PuppetX
   module PowerShell
@@ -89,6 +89,22 @@ class PowerShellManager; end
       expect(result[:exitcode]).to eq(0)
     end
 
+   it "should execute code with a try/catch" do
+     result = manager.execute(<<-CODE
+try{
+ $foo = ls
+ $count = $foo.count
+ $count
+}catch{
+ Write-Error "foo"
+}
+     CODE
+     )
+
+     expect(result[:stdout]).not_to eq(nil)
+     expect(result[:exitcode]).to eq(0)
+   end
+
     it "should reuse the same PowerShell process for multiple calls" do
       first_pid = manager.execute('[Diagnostics.Process]::GetCurrentProcess().Id')[:stdout]
       second_pid = manager.execute('[Diagnostics.Process]::GetCurrentProcess().Id')[:stdout]

spec/unit/provider/exec/powershell_spec.rb

@@ -1,7 +1,7 @@
 #! /usr/bin/env ruby
 require 'spec_helper'
 require 'puppet/util'
-require 'puppet_x/puppetlabs/powershell_manager'
+require 'puppet_x/puppetlabs/powershell/powershell_manager'
 
 describe Puppet::Type.type(:exec).provider(:powershell) do