bolt 1.5.0 → 1.6.0

data/lib/bolt/transport/winrm/connection.rb

@@ -97,195 +97,7 @@ module Bolt
 
         def shell_init
           return nil if @shell_initialized
-          result = execute(<<-PS)
-$ENV:PATH += ";${ENV:ProgramFiles}\\Puppet Labs\\Puppet\\bin\\;" +
-"${ENV:ProgramFiles}\\Puppet Labs\\Puppet\\puppet\\bin;" +
-"${ENV:ProgramFiles}\\Puppet Labs\\Puppet\\sys\\ruby\\bin\\"
-$ENV:RUBYLIB = "${ENV:ProgramFiles}\\Puppet Labs\\Puppet\\puppet\\lib;" +
-"${ENV:ProgramFiles}\\Puppet Labs\\Puppet\\facter\\lib;" +
-"${ENV:ProgramFiles}\\Puppet Labs\\Puppet\\hiera\\lib;" +
-$ENV:RUBYLIB
-
-Add-Type -AssemblyName System.ServiceModel.Web, System.Runtime.Serialization
-$utf8 = [System.Text.Encoding]::UTF8
-
-function Write-Stream {
-PARAM(
-  [Parameter(Position=0)] $stream,
-  [Parameter(ValueFromPipeline=$true)] $string
-)
-PROCESS {
-  $bytes = $utf8.GetBytes($string)
-  $stream.Write( $bytes, 0, $bytes.Length )
-}
-}
-
-function Convert-JsonToXml {
-PARAM([Parameter(ValueFromPipeline=$true)] [string[]] $json)
-BEGIN {
-  $mStream = New-Object System.IO.MemoryStream
-}
-PROCESS {
-  $json | Write-Stream -Stream $mStream
-}
-END {
-  $mStream.Position = 0
-  try {
-    $jsonReader = [System.Runtime.Serialization.Json.JsonReaderWriterFactory]::CreateJsonReader($mStream,[System.Xml.XmlDictionaryReaderQuotas]::Max)
-    $xml = New-Object Xml.XmlDocument
-    $xml.Load($jsonReader)
-    $xml
-  } finally {
-    $jsonReader.Close()
-    $mStream.Dispose()
-  }
-}
-}
-
-Function ConvertFrom-Xml {
-[CmdletBinding(DefaultParameterSetName="AutoType")]
-PARAM(
-  [Parameter(ValueFromPipeline=$true,Mandatory=$true,Position=1)] [Xml.XmlNode] $xml,
-  [Parameter(Mandatory=$true,ParameterSetName="ManualType")] [Type] $Type,
-  [Switch] $ForceType
-)
-PROCESS{
-  if (Get-Member -InputObject $xml -Name root) {
-    return $xml.root.Objects | ConvertFrom-Xml
-  } elseif (Get-Member -InputObject $xml -Name Objects) {
-    return $xml.Objects | ConvertFrom-Xml
-  }
-  $propbag = @{}
-  foreach ($name in Get-Member -InputObject $xml -MemberType Properties | Where-Object{$_.Name -notmatch "^__|type"} | Select-Object -ExpandProperty name) {
-    Write-Debug "$Name Type: $($xml.$Name.type)" -Debug:$false
-    $propbag."$Name" = Convert-Properties $xml."$name"
-  }
-  if (!$Type -and $xml.HasAttribute("__type")) { $Type = $xml.__Type }
-  if ($ForceType -and $Type) {
-    try {
-      $output = New-Object $Type -Property $propbag
-    } catch {
-      $output = New-Object PSObject -Property $propbag
-      $output.PsTypeNames.Insert(0, $xml.__type)
-    }
-  } elseif ($propbag.Count -ne 0) {
-    $output = New-Object PSObject -Property $propbag
-    if ($Type) {
-      $output.PsTypeNames.Insert(0, $Type)
-    }
-  }
-  return $output
-}
-}
-
-Function Convert-Properties {
-PARAM($InputObject)
-switch ($InputObject.type) {
-  "object" {
-    return (ConvertFrom-Xml -Xml $InputObject)
-  }
-  "string" {
-    $MightBeADate = $InputObject.get_InnerText() -as [DateTime]
-    ## Strings that are actually dates (*grumble* JSON is crap)
-    if ($MightBeADate -and $propbag."$Name" -eq $MightBeADate.ToString("G")) {
-      return $MightBeADate
-    } else {
-      return $InputObject.get_InnerText()
-    }
-  }
-  "number" {
-    $number = $InputObject.get_InnerText()
-    if ($number -eq ($number -as [int])) {
-      return $number -as [int]
-    } elseif ($number -eq ($number -as [double])) {
-      return $number -as [double]
-    } else {
-      return $number -as [decimal]
-    }
-  }
-  "boolean" {
-    return [bool]::parse($InputObject.get_InnerText())
-  }
-  "null" {
-    return $null
-  }
-  "array" {
-    [object[]]$Items = $(foreach( $item in $InputObject.GetEnumerator() ) {
-      Convert-Properties $item
-    })
-    return $Items
-  }
-  default {
-    return $InputObject
-  }
-}
-}
-
-Function ConvertFrom-Json2 {
-[CmdletBinding()]
-PARAM(
-  [Parameter(ValueFromPipeline=$true,Mandatory=$true,Position=1)] [string] $InputObject,
-  [Parameter(Mandatory=$true)] [Type] $Type,
-  [Switch] $ForceType
-)
-PROCESS {
-  $null = $PSBoundParameters.Remove("InputObject")
-  [Xml.XmlElement]$xml = (Convert-JsonToXml $InputObject).Root
-  if ($xml) {
-    if ($xml.Objects) {
-      $xml.Objects.Item.GetEnumerator() | ConvertFrom-Xml @PSBoundParameters
-    } elseif ($xml.Item -and $xml.Item -isnot [System.Management.Automation.PSParameterizedProperty]) {
-      $xml.Item | ConvertFrom-Xml @PSBoundParameters
-    } else {
-      $xml | ConvertFrom-Xml @PSBoundParameters
-    }
-  } else {
-    Write-Error "Failed to parse JSON with JsonReader" -Debug:$false
-  }
-}
-}
-
-function ConvertFrom-PSCustomObject
-{
-PARAM([Parameter(ValueFromPipeline = $true)] $InputObject)
-PROCESS {
-  if ($null -eq $InputObject) { return $null }
-
-  if ($InputObject -is [System.Collections.IEnumerable] -and $InputObject -isnot [string]) {
-    $collection = @(
-      foreach ($object in $InputObject) { ConvertFrom-PSCustomObject $object }
-    )
-
-    $collection
-  } elseif ($InputObject -is [System.Management.Automation.PSCustomObject]) {
-    $hash = @{}
-    foreach ($property in $InputObject.PSObject.Properties) {
-      $hash[$property.Name] = ConvertFrom-PSCustomObject $property.Value
-    }
-
-    $hash
-  } else {
-    $InputObject
-  }
-}
-}
-
-function Get-ContentAsJson
-{
-[CmdletBinding()]
-PARAM(
-  [Parameter(Mandatory = $true)] $Text,
-  [Parameter(Mandatory = $false)] [Text.Encoding] $Encoding = [Text.Encoding]::UTF8
-)
-
-# using polyfill cmdlet on PS2, so pass type info
-if ($PSVersionTable.PSVersion -lt [Version]'3.0') {
-  $Text | ConvertFrom-Json2 -Type PSObject | ConvertFrom-PSCustomObject
-} else {
-  $Text | ConvertFrom-Json | ConvertFrom-PSCustomObject
-}
-}
-PS
+          result = execute(Powershell.shell_init)
           if result.exit_code != 0
             raise BaseError.new("Could not initialize shell: #{result.stderr.string}", "SHELL_INIT_ERROR")
           end
@@ -316,26 +128,11 @@ PS
         end
 
         def execute_process(path = '', arguments = [], stdin = nil)
-          quoted_args = arguments.map do |arg|
-            "'" + arg.gsub("'", "''") + "'"
-          end.join(' ')
-
-          exec_cmd =
-            if stdin.nil?
-              "& #{path} #{quoted_args}"
-            else
-              "@'\n#{stdin}\n'@ | & #{path} #{quoted_args}"
-            end
-          execute(<<-PS)
-$OutputEncoding = [Console]::OutputEncoding
-#{exec_cmd}
-if (-not $? -and ($LASTEXITCODE -eq $null)) { exit 1 }
-exit $LASTEXITCODE
-PS
+          execute(Powershell.execute_process(path, arguments, stdin))
         end
 
         def mkdirs(dirs)
-          result = execute("mkdir -Force #{dirs.uniq.sort.join(',')}")
+          result = execute(Powershell.mkdirs(dirs))
           if result.exit_code != 0
             message = "Could not create directories: #{result.stderr}"
             raise Bolt::Node::FileError.new(message, 'MKDIR_ERROR')
@@ -351,13 +148,7 @@ PS
 
         def make_tempdir
           find_parent = target.options['tmpdir'] ? "\"#{target.options['tmpdir']}\"" : '[System.IO.Path]::GetTempPath()'
-          result = execute(<<-PS)
-$parent = #{find_parent}
-$name = [System.IO.Path]::GetRandomFileName()
-$path = Join-Path $parent $name
-New-Item -ItemType Directory -Path $path | Out-Null
-$path
-PS
+          result = execute(Powershell.make_tempdir(find_parent))
           if result.exit_code != 0
             raise Bolt::Node::FileError.new("Could not make tempdir: #{result.stderr}", 'TEMPDIR_ERROR')
           end
@@ -368,9 +159,7 @@ PS
           dir = make_tempdir
           yield dir
         ensure
-          execute(<<-PS)
-Remove-Item -Force -Recurse -Path "#{dir}"
-PS
+          execute(Powershell.rmdir(dir))
         end
 
         def validate_extensions(ext)

data/lib/bolt/version.rb

@@ -1,5 +1,5 @@
 # frozen_string_literal: true
 
 module Bolt
-  VERSION = '1.5.0'
+  VERSION = '1.6.0'
 end

data/lib/bolt_server/file_cache.rb

@@ -166,7 +166,7 @@ module BoltServer
       expired_time = Time.now - purge_ttl
       @cache_dir_mutex.with_write_lock do
         Dir.glob(File.join(@cache_dir, '*')).select { |f| File.directory?(f) }.each do |dir|
-          if (mtime = File.mtime(dir)) < expired_time
+          if (mtime = File.mtime(dir)) < expired_time && dir != tmppath
             @logger.debug("Removing #{dir}, last used at #{mtime}")
             FileUtils.remove_dir(dir)
           end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: bolt
 version: !ruby/object:Gem::Version
-  version: 1.5.0
+  version: 1.6.0
 platform: ruby
 authors:
 - Puppet
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2018-12-06 00:00:00.000000000 Z
+date: 2018-12-13 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: addressable
@@ -156,6 +156,20 @@ dependencies:
     - - "<"
       - !ruby/object:Gem::Version
         version: '7'
+- !ruby/object:Gem::Dependency
+  name: puppet-resource_api
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: r10k
   requirement: !ruby/object:Gem::Requirement
@@ -338,6 +352,7 @@ files:
 - lib/bolt/target.rb
 - lib/bolt/task.rb
 - lib/bolt/task/puppet_server.rb
+- lib/bolt/task/remote.rb
 - lib/bolt/transport/base.rb
 - lib/bolt/transport/docker.rb
 - lib/bolt/transport/docker/connection.rb
@@ -345,6 +360,8 @@ files:
 - lib/bolt/transport/local/shell.rb
 - lib/bolt/transport/orch.rb
 - lib/bolt/transport/orch/connection.rb
+- lib/bolt/transport/powershell.rb
+- lib/bolt/transport/remote.rb
 - lib/bolt/transport/ssh.rb
 - lib/bolt/transport/ssh/connection.rb
 - lib/bolt/transport/winrm.rb