cmueller/ansible
1
0
Fork 0
Code Issues Pull requests Projects Releases Wiki Activity

Clean up how we initialize the result psobject

Browse source
This commit is contained in:
Matt Martz 2014-06-18 10:57:27 -05:00
parent bf400d3c23
commit 51a50dee3e
3 changed files with 21 additions and 16 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
library/windows/slurp.ps1
View file

@ -39,7 +39,9 @@ If (-not $src)
$bytes = [System.IO.File]::ReadAllBytes($src); $bytes = [System.IO.File]::ReadAllBytes($src);
$content = [System.Convert]::ToBase64String($bytes); $content = [System.Convert]::ToBase64String($bytes);
$result = New-Object psobject; $result = New-Object psobject @{
changed = $false
encoding = "base64"
};
Set-Attr $result "content" $content; Set-Attr $result "content" $content;
Set-Attr $result "encoding" "base64";
echo $result | ConvertTo-Json; echo $result | ConvertTo-Json;

6
library/windows/win_ping.ps1
View file

@ -25,6 +25,8 @@ If ($params.data.GetType)
$data = $params.data; $data = $params.data;
} }
$result = New-Object psobject; $result = New-Object psobject @{
Set-Attr $result "ping" $data; changed = $false
ping = $data
};
echo $result | ConvertTo-Json; echo $result | ConvertTo-Json;

25
library/windows/win_stat.ps1
View file

@ -28,36 +28,37 @@ If ($params.path.GetType)
$get_md5 = $TRUE; $get_md5 = $TRUE;
If ($params.get_md5.GetType) If ($params.get_md5.GetType)
{ {
$get_md5 = $params.get_md5; $get_md5 = $params.get_md5;
} }
$stat = New-Object psobject; $result = New-Object psobject @{
stat = New-Object psobject
changed = $false
};
If (Test-Path $path) If (Test-Path $path)
{ {
Set-Attr $stat "exists" $TRUE; Set-Attr $result.stat "exists" $TRUE;
$info = Get-Item $path; $info = Get-Item $path;
If ($info.Directory) # Only files have the .Directory attribute. If ($info.Directory) # Only files have the .Directory attribute.
{ {
Set-Attr $stat "isdir" $FALSE; Set-Attr $result.stat "isdir" $FALSE;
Set-Attr $stat "size" $info.Length; Set-Attr $result.stat "size" $info.Length;
} }
Else Else
{ {
Set-Attr $stat "isdir" $TRUE; Set-Attr $result.stat "isdir" $TRUE;
} }
} }
Else Else
{ {
Set-Attr $stat "exists" $FALSE; Set-Attr $result.stat "exists" $FALSE;
} }
If ($get_md5 -and $stat.exists -and -not $stat.isdir) If ($get_md5 -and $result.stat.exists -and -not $result.stat.isdir)
{ {
$path_md5 = (Get-FileHash -Path $path -Algorithm MD5).Hash.ToLower(); $path_md5 = (Get-FileHash -Path $path -Algorithm MD5).Hash.ToLower();
Set-Attr $stat "md5" $path_md5; Set-Attr $result.stat "md5" $path_md5;
} }
$result = New-Object psobject;
Set-Attr $result "stat" $stat;
Set-Attr $result "changed" $FALSE;
echo $result | ConvertTo-Json; echo $result | ConvertTo-Json;