specinfra 0.5.5 → 0.5.6

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 7217cd76bb32ea14d335ad1f82a572c5e5a67f82
-  data.tar.gz: d1fde8f39d7c4af54603e79275f595d0aaed0fd8
+  metadata.gz: 3fbfc9272049c0efc0e7b3430719d72547ec5bd1
+  data.tar.gz: 16b88cf1fd04e29eff60421b60f688fe80496948
 SHA512:
-  metadata.gz: 066e834d27e47eefe0e332808d529dd1bf1a48f845859edf31e9fd97b392add75c7058307f3b204b824af3448c191098c389330dbfa7a9dae4417ceff8a85567
-  data.tar.gz: d23345ce8d33603f067a107f559506058926a0a0ec0423c8837e5853c87cefd0ae31b9522971a18ea1d3f133d2f837142f8b70bf2018cc3fe2d854b95d50a164
+  metadata.gz: 065a3f9ece6c188b117a378e826a5b1b7aaabb2f7b17f67c07a9e4fa5bb999fb8d8f3e91e72763e6ae5119a3b0c0485b0b17867109159b18adc7fdf9e854acf8
+  data.tar.gz: 565a0f1febe195e6cdbe6cab501e1cdf88cfa2c92dcd7c0469e215f4c9b29f91e8075b67a1e987999ac1042fd8e54022453ff5c6e29616026736895e1af76343

data/lib/specinfra/backend/powershell/support/list_windows_features.ps1

@@ -1,26 +1,45 @@
 function ListWindowsFeatures
 {    
-    $cachepath =  "${env:temp}/ListWindowsFeatures.xml"
+
+param(
+        [string]$feature,
+        [string]$provider="dism"
+         )
+
+    $cachepath =  "${env:temp}/ListWindowsFeatures-${provider}.xml"
     $maxAge = 2
 
     $cache =  Get-Item $cachepath -erroraction SilentlyContinue
 
     if($cache -ne $null -and ((get-date) - $cache.LastWriteTime).minutes -lt $maxage){
-        return Import-Clixml $cachepath
+        $features = Import-Clixml $cachepath |  Select *| Where-Object {(($_.name -like $feature) -or ($_.displayName -like $feature)) -and (($_.installed -eq $true) -or ($_.state -eq "Enabled"))}
+        return $features
     }
     else{
-        try
+
+        switch($provider)
         {
-            $dism = DISM /Online /Get-Features /Format:List | Where-Object {$_}     
+            "dism" { return features_dism | Select * | Where-Object {($_.name -eq $feature) -and ($_.state -eq "Enabled")}  }
+            "powershell" { return features_powershell | Select * | Where-Object {(($_.name -like $feature) -or ($_.displayName -like $feature)) -and ($_.installed -eq $true)} }
+            default {throw "Unsupported provider"}
+        }
+
+    }
+}
+
+function features_dism{
+      try
+        {
+            $out = DISM /Online /Get-Features /Format:List | Where-Object {$_}     
 
             if($LASTEXITCODE -ne 0)
             {
-                Write-Error $dism
+                Write-Error $out
                 Break
             }
 
-            $f = $dism[4..($dism.length-2)]
-            $feature = for($i=0; $i -lt $f.length;$i+=2)
+            $f = $out[4..($out.length-2)]
+            $features = for($i=0; $i -lt $f.length;$i+=2)
             {
                 $tmp = $f[$i],$f[$i+1] -replace '^([^:]+:\s)'
                 
@@ -30,14 +49,20 @@ function ListWindowsFeatures
                 }
             }
 
-            $feature | Export-Clixml $cachepath
+            $features | Export-Clixml $cachepath
 
-            return $feature
+            return $features
         }
         catch
         {
             Throw
         }
+}
 
-    }
+function features_powershell{
+    $ProgressPreference = "SilentlyContinue"
+     import-module servermanager
+     $features = Get-WindowsFeature
+     $features | Export-Clixml $cachepath
+     return Get-WindowsFeature 
 }

data/lib/specinfra/command/windows.rb

@@ -203,13 +203,23 @@ module SpecInfra
           end
       end
 
-      def check_windows_feature_enabled(name)
- 
-         Backend::PowerShell::Command.new do
-           using 'list_windows_features.ps1'
-           exec "@(ListWindowsFeatures | Where-Object {($_.name -eq '#{name}')  -and ($_.State -eq 'enabled')}).count -gt 0"
-         end
+      def check_windows_feature_enabled(name,provider)
  
+        if provider.nil?
+          cmd =  "@(ListWindowsFeatures -feature #{name}).count -gt 0"
+        else
+          cmd =  "@(ListWindowsFeatures -feature #{name} -provider #{provider}).count -gt 0"
+        end
+
+        Backend::PowerShell::Command.new do
+          using 'list_windows_features.ps1'
+          exec cmd
+        end
+       end
+
+       def check_file_version(name,version)
+          cmd = "((Get-Command '#{name}').FileVersionInfo.ProductVersion -eq '#{version}') -or ((Get-Command '#{name}').FileVersionInfo.FileVersion -eq '#{version}')"
+          Backend::PowerShell::Command.new { exec cmd }
        end
 
       private

data/lib/specinfra/version.rb

@@ -1,3 +1,3 @@
 module Specinfra
-  VERSION = "0.5.5"
+  VERSION = "0.5.6"
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: specinfra
 version: !ruby/object:Gem::Version
-  version: 0.5.5
+  version: 0.5.6
 platform: ruby
 authors:
 - Gosuke Miyashita