specinfra 2.35.0 → 2.35.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: f71af3de0c2dd150a9ccb225f2d5a64c26d218d7
-  data.tar.gz: dd953b030f50b05dafef1c93fcb05ca6b96f2660
+  metadata.gz: 14e06d19c0a3038546153e4085ad0becd03b94f9
+  data.tar.gz: ccc0e91ca160daf01e681b277f82976d76edfd46
 SHA512:
-  metadata.gz: 6a42296f05370abc91650698bc4238cd4cf6fc529b03d9a4a8a0ed927639deeba1a368bb44b4d6478183bae15438c1ba69003126a3b0e7cf6d2532a47fe0b881
-  data.tar.gz: 4d797f54fd069f295ce0d86735a4b1380114ffff951c768af2862351bac9926386da3c04fac7784c52b07ade2ebe52b54d9bca062ad0d278ac39663430c0a1b5
+  metadata.gz: 8ea4a629909c618faf67f9b9c3a4e966059f3e066db749b290a18620f7b90c5bdf4eca337e677a196ee174ffd6fec8b5427bdccdc0a770b2e6a5a486c61834a7
+  data.tar.gz: c436115f88456d1c30b4fcc62a377a5f4f6bf4052cc6248f9b2361436eb97594d98a0d389e5b0db45d575b79396ce5948ab16379ce1fceee70c96a3d455cf183

data/lib/specinfra/command/windows/base.rb

@@ -5,6 +5,13 @@ class Specinfra::Command::Windows::Base
     end
 
     private
+    def create_command(command, using_ps1 = nil)
+      Backend::PowerShell::Command.new do
+        using using_ps1 if using_ps1
+        exec command
+      end
+    end
+
     def windows_account account
       match = /((.+)\\)?(.+)/.match account
       domain = match[2]

data/lib/specinfra/command/windows/base/registry_key.rb

@@ -11,18 +11,18 @@ class Specinfra::Command::Windows::Base::RegistryKey < Specinfra::Command::Windo
 
     def check_exists(key_name)
       cmd = "(Get-Item 'Registry::#{key_name}') -ne $null"
-      Backend::PowerShell::Command.new { exec cmd }
+      create_command cmd
     end
 
     def check_has_property(key_name, key_property)
-      cmd = "(Get-Item 'Registry::#{key_name}').GetValueKind('#{key_property[:name]}') -eq '#{get_key_type([key_property[:type]])}'"
-      Backend::PowerShell::Command.new { exec cmd }
+      cmd = "(Get-Item 'Registry::#{key_name}').GetValueKind('#{key_property[:name]}') -eq '#{get_key_type(key_property[:type])}'"
+      create_command cmd
     end
 
     def check_has_value(key_name, key_property)
       value = convert_key_property_value key_property
       cmd = "(Compare-Object (Get-Item 'Registry::#{key_name}').GetValue('#{key_property[:name]}') #{value}) -eq $null"
-      Backend::PowerShell::Command.new { exec cmd }
+      create_command cmd
     end
 
     private
@@ -31,11 +31,11 @@ class Specinfra::Command::Windows::Base::RegistryKey < Specinfra::Command::Windo
     end
 
     def get_key_type(key_type)
-       REGISTRY_KEY_TYPES[key_type.to_s.gsub("_converted").to_sym]
+       REGISTRY_KEY_TYPES[key_type.to_s.gsub("_converted",'').to_sym]
     end
 
     def convert_key_property_value property
-      return property if do_not_convert? property[:type]
+      return property[:value] if do_not_convert? property[:type]
       case property[:type]
       when :type_binary
         byte_array = [property[:value]].pack('H*').bytes.to_a

data/lib/specinfra/version.rb

@@ -1,3 +1,3 @@
 module Specinfra
-  VERSION = "2.35.0"
+  VERSION = "2.35.1"
 end

data/spec/command/windows/registry_key_spec.rb

@@ -0,0 +1,36 @@
+require 'spec_helper'
+
+RSpec.describe Specinfra::Command::Windows::Base::RegistryKey do
+  let(:key_path) { "HKLM\\Software\\Microsoft\\Windows" }
+
+  def stub_exec (command)
+    expect(described_class).to receive(:create_command).with(command)
+  end
+
+  describe 'has_property?' do
+    it {
+      stub_exec "(Get-Item 'Registry::#{key_path}') -ne $null"
+      described_class.check_exists(key_path)
+    }
+  end
+
+  [:type_dword, :type_dword_converted].each do |reg_type|
+    it "has_property_value #{reg_type}" do
+      prop = {:name => 'CurrentVersion', :type => reg_type}
+      stub_exec "(Get-Item 'Registry::#{key_path}').GetValueKind('CurrentVersion') -eq 'DWord'"
+      described_class.check_has_property key_path, prop
+    end
+  end
+  [:type_dword, :type_dword_converted].each do |reg_type|
+    describe 'check_has_value' do
+      it {
+        value = reg_type == :type_dword_converted ? "23" : "17"
+        prop = {:name => 'CurrentVersion', :type => reg_type, :value => value}
+        cmd = "(Compare-Object (Get-Item 'Registry::#{key_path}').GetValue('CurrentVersion') 23) -eq $null"
+        stub_exec cmd
+        described_class.check_has_value key_path, prop
+      }
+    end
+  end
+
+end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: specinfra
 version: !ruby/object:Gem::Version
-  version: 2.35.0
+  version: 2.35.1
 platform: ruby
 authors:
 - Gosuke Miyashita
@@ -423,6 +423,7 @@ files:
 - spec/command/redhat/service_spec.rb
 - spec/command/redhat7/service_spec.rb
 - spec/command/ubuntu/ppa_spec.rb
+- spec/command/windows/registry_key_spec.rb
 - spec/configuration_spec.rb
 - spec/helper/detect_os/esxi_spec.rb
 - spec/helper/os_spec.rb
@@ -488,6 +489,7 @@ test_files:
 - spec/command/redhat/service_spec.rb
 - spec/command/redhat7/service_spec.rb
 - spec/command/ubuntu/ppa_spec.rb
+- spec/command/windows/registry_key_spec.rb
 - spec/configuration_spec.rb
 - spec/helper/detect_os/esxi_spec.rb
 - spec/helper/os_spec.rb